From fd2235e678c58cebd6255b5e658e704ee5138591 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 11 Jun 2016 21:30:05 -0700 Subject: sync engine code with pokeyellow --- engine/HoF_room_pc.asm | 6 +- engine/battle/animations.asm | 25 +-- engine/battle/core.asm | 290 +++++++++++++++--------------- engine/battle/decrement_pp.asm | 2 +- engine/battle/experience.asm | 4 +- engine/battle/get_trainer_name.asm | 10 +- engine/battle/link_battle_versus_text.asm | 4 +- engine/battle/trainer_ai.asm | 2 +- engine/cable_club.asm | 12 +- engine/hall_of_fame.asm | 8 +- engine/hidden_object_functions14.asm | 12 +- engine/hidden_object_functions3.asm | 10 +- engine/hidden_object_functions7.asm | 22 +-- engine/hp_bar.asm | 5 +- engine/in_game_trades.asm | 2 +- engine/intro.asm | 2 +- engine/menu/bills_pc.asm | 2 +- engine/menu/naming_screen.asm | 10 +- engine/menu/oaks_pc.asm | 4 +- engine/menu/pc.asm | 10 +- engine/menu/pokedex.asm | 22 +++ engine/menu/prize_menu.asm | 64 +++---- engine/menu/start_sub_menus.asm | 4 +- engine/menu/status_screen.asm | 10 +- engine/menu/vending_machine.asm | 9 +- engine/mon_party_sprites.asm | 4 +- engine/oak_speech.asm | 4 +- engine/overworld/card_key.asm | 2 +- engine/overworld/cut.asm | 2 +- engine/overworld/elevator.asm | 4 +- engine/overworld/emotion_bubbles.asm | 8 +- engine/overworld/hidden_items.asm | 20 +-- engine/overworld/movement.asm | 19 +- engine/overworld/oam.asm | 2 +- engine/overworld/player_animations.asm | 2 +- engine/overworld/pokemart.asm | 2 +- engine/overworld/trainers.asm | 54 +++--- engine/predefs.asm | 14 +- engine/save.asm | 6 +- engine/slot_machine.asm | 3 +- engine/titlescreen.asm | 2 +- engine/titlescreen2.asm | 2 +- engine/town_map.asm | 14 +- engine/trade.asm | 10 +- home.asm | 4 +- text.asm | 4 +- wram.asm | 2 +- 47 files changed, 385 insertions(+), 350 deletions(-) diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 09c8d5af..82aa6d52 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -18,7 +18,7 @@ HallOfFamePC: call FillFourRowsWithBlack coord hl, 0, 14 call FillFourRowsWithBlack - ld a, $c0 + ld a, %11000000 ld [rBGP], a call EnableLCD ld a, $ff @@ -36,13 +36,13 @@ HallOfFamePC: FadeInCreditsText: ld hl, HoFGBPalettes ld b, 4 -.asm_740bf +.loop ld a, [hli] ld [rBGP], a ld c, 5 call DelayFrames dec b - jr nz, .asm_740bf + jr nz, .loop ret DisplayCreditsMon: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 2578ee28..373136a8 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -383,29 +383,29 @@ MoveAnimation: call SetAnimationPalette ld a,[wAnimationID] and a - jr z,.AnimationFinished + jr z, .animationFinished ; if throwing a Poké Ball, skip the regular animation code cp a,TOSS_ANIM - jr nz,.MoveAnimation - ld de,.AnimationFinished + jr nz, .moveAnimation + ld de, .animationFinished push de jp TossBallAnimation -.MoveAnimation +.moveAnimation ; check if battle animations are disabled in the options ld a,[wOptions] bit 7,a - jr nz,.AnimationsDisabled + jr nz, .animationsDisabled call ShareMoveAnimations call PlayAnimation jr .next4 -.AnimationsDisabled +.animationsDisabled ld c,30 call DelayFrames .next4 call PlayApplyingAttackAnimation ; shake the screen or flash the pic in and out (to show damage) -.AnimationFinished +.animationFinished call WaitForSoundToFinish xor a ld [wSubAnimSubEntryAddr],a @@ -431,13 +431,13 @@ ShareMoveAnimations: cp a,AMNESIA ld b,CONF_ANIM - jr z,.Replace + jr z, .replaceAnim cp a,REST ld b,SLP_ANIM ret nz -.Replace +.replaceAnim ld a,b ld [wAnimationID],a ret @@ -1845,13 +1845,13 @@ AnimationMinimizeMon: ld hl, wTempPic push hl xor a - ld bc, $310 + ld bc, 7 * 7 * $10 call FillMemory pop hl ld de, $194 add hl, de ld de, MinimizedMonSprite - ld c, $5 + ld c, MinimizedMonSpriteEnd - MinimizedMonSprite .loop ld a, [de] ld [hli], a @@ -1865,6 +1865,7 @@ AnimationMinimizeMon: MinimizedMonSprite: INCBIN "gfx/minimized_mon_sprite.1bpp" +MinimizedMonSpriteEnd: AnimationSlideMonDownAndHide: ; Slides the mon's sprite down and disappears. Used in Acid Armor. @@ -2308,7 +2309,6 @@ GetMoveSoundB: ld b, a ret -; get the sound of the (move id - 1) in a GetMoveSound: ld hl,MoveSoundTable ld e,a @@ -2363,6 +2363,7 @@ IsCryMove: ret MoveSoundTable: + ; ID, pitch mod, tempo mod db SFX_POUND, $00,$80 ; POUND db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 3b474584..9d300588 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -443,7 +443,7 @@ MainInBattleLoop: ; the link battle enemy has switched mons ld a, [wPlayerBattleStatus1] bit UsingTrappingMove, a ; check if using multi-turn move like Wrap - jr z, .asm_3c2dd + jr z, .specialMoveNotUsed ld a, [wPlayerMoveListIndex] ld hl, wBattleMonMoves ld c, a @@ -452,9 +452,9 @@ MainInBattleLoop: ld a, [hl] cp METRONOME ; a MIRROR MOVE check is missing, might lead to a desync in link battles ; when combined with multi-turn moves - jr nz, .asm_3c2dd + jr nz, .specialMoveNotUsed ld [wPlayerSelectedMove], a -.asm_3c2dd +.specialMoveNotUsed callab SwitchEnemyMon .noLinkBattle ld a, [wPlayerSelectedMove] @@ -665,7 +665,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: and a jr z, .playersTurn ld hl, wEnemyBattleStatus3 - ld de, wEnemyToxcCounter + ld de, wEnemyToxicCounter .playersTurn bit BadlyPoisoned, [hl] jr z, .noToxic @@ -884,6 +884,8 @@ FaintEnemyPokemon: ld a, MUSIC_DEFEATED_WILD_MON call PlayBattleVictoryMusic .sfxplayed +; bug: win sfx is played for wild battles before checking for player mon HP +; this can lead to odd scenarios where both player and enemy faint, as the win sfx plays yet the player never won the battle ld hl, wBattleMonHP ld a, [hli] or [hl] @@ -1285,7 +1287,7 @@ SlideDownFaintedMonPic: call CopyData pop de pop hl - ld bc, -20 + ld bc, -SCREEN_WIDTH add hl, bc push hl ld h, d @@ -1297,7 +1299,7 @@ SlideDownFaintedMonPic: pop bc dec b jr nz, .rowLoop - ld bc, 20 + ld bc, SCREEN_WIDTH add hl, bc ld de, SevenSpacesText call PlaceString @@ -1925,9 +1927,9 @@ DrawPlayerHUDAndHPBar: ld de, wLoadedMonStatus call PrintStatusConditionNotFainted pop hl - jr nz, .asm_3cdae + jr nz, .doNotPrintLevel call PrintLevel -.asm_3cdae +.doNotPrintLevel ld a, [wLoadedMonSpecies] ld [wcf91], a coord hl, 10, 9 @@ -1939,14 +1941,14 @@ DrawPlayerHUDAndHPBar: ld hl, wBattleMonHP ld a, [hli] or [hl] - jr z, .asm_3cdd9 + jr z, .fainted ld a, [wLowHealthAlarmDisabled] and a ; has the alarm been disabled because the player has already won? ret nz ; if so, return ld a, [wPlayerHPBarColor] cp HP_BAR_RED - jr z, .asm_3cde6 -.asm_3cdd9 + jr z, .setLowHealthAlarm +.fainted ld hl, wLowHealthAlarm bit 7, [hl] ;low health alarm enabled? ld [hl], $0 @@ -1954,7 +1956,7 @@ DrawPlayerHUDAndHPBar: xor a ld [wChannelSoundIDs + CH4], a ret -.asm_3cde6 +.setLowHealthAlarm ld hl, wLowHealthAlarm set 7, [hl] ;enable low health alarm ret @@ -2572,9 +2574,10 @@ MoveSelectionMenu: ld hl, wBattleMonMoves call .loadmoves coord hl, 4, 12 - ld b, $4 - ld c, $e - di + ld b, 4 + ld c, 14 + di ; out of pure coincidence, it is possible for vblank to occur between the di and ei + ; so it is necessary to put the di ei block to not cause tearing call TextBoxBorder coord hl, 4, 12 ld [hl], $7a @@ -2590,8 +2593,8 @@ MoveSelectionMenu: ld hl, wEnemyMonMoves call .loadmoves coord hl, 0, 7 - ld b, $4 - ld c, $e + ld b, 4 + ld c, 14 call TextBoxBorder coord hl, 2, 8 call .writemoves @@ -2605,8 +2608,8 @@ MoveSelectionMenu: call AddNTimes call .loadmoves coord hl, 4, 7 - ld b, $4 - ld c, $e + ld b, 4 + ld c, 14 call TextBoxBorder coord hl, 6, 8 call .writemoves @@ -2688,9 +2691,9 @@ SelectMenuItem: ld hl, hFlags_0xFFF6 res 1, [hl] bit 6, a - jp nz, CursorUp ; up + jp nz, SelectMenuItem_CursorUp ; up bit 7, a - jp nz, CursorDown ; down + jp nz, SelectMenuItem_CursorDown ; down bit 2, a jp nz, SwapMovesInMenu ; select bit 1, a ; B, but was it reset above? @@ -2703,10 +2706,10 @@ SelectMenuItem: ld b, a ld a, [wMoveMenuType] dec a ; if not mimic - jr nz, .nob + jr nz, .notB pop af ret -.nob +.notB dec a ld a, b ld [wPlayerMoveListIndex], a @@ -2723,7 +2726,7 @@ SelectMenuItem: add hl, bc ld a, [hl] and $3f - jr z, .nopp + jr z, .noPP ld a, [wPlayerDisabledMove] swap a and $f @@ -2746,7 +2749,7 @@ SelectMenuItem: .disabled ld hl, MoveDisabledText jr .print -.nopp +.noPP ld hl, MoveNoPPText .print call PrintText @@ -2764,7 +2767,7 @@ MoveDisabledText: WhichTechniqueString: db "WHICH TECHNIQUE?@" -CursorUp: +SelectMenuItem_CursorUp: ld a, [wCurrentMenuItem] and a jp nz, SelectMenuItem @@ -2774,7 +2777,7 @@ CursorUp: ld [wCurrentMenuItem], a jp SelectMenuItem -CursorDown: +SelectMenuItem_CursorDown: ld a, [wCurrentMenuItem] ld b, a ld a, [wNumMovesMinusOne] @@ -2794,7 +2797,7 @@ AnyMoveToSelect: ld a, [wPlayerDisabledMove] and a ld hl, wBattleMonPP - jr nz, .asm_3d40e + jr nz, .handleDisabledMove ld a, [hli] or [hl] inc hl @@ -2803,26 +2806,26 @@ AnyMoveToSelect: or [hl] and $3f ret nz - jr .asm_3d423 -.asm_3d40e + jr .noMovesLeft +.handleDisabledMove swap a - and $f + and $f ; get disabled move ld b, a - ld d, $5 + ld d, NUM_MOVES + 1 xor a -.asm_3d416 +.handleDisabledMovePPLoop dec d - jr z, .asm_3d421 - ld c, [hl] + jr z, .allMovesChecked + ld c, [hl] ; get move PP inc hl - dec b - jr z, .asm_3d416 + dec b ; is this the disabled move? + jr z, .handleDisabledMovePPLoop ; if so, ignore its PP value or c - jr .asm_3d416 -.asm_3d421 - and a - ret nz -.asm_3d423 + jr .handleDisabledMovePPLoop +.allMovesChecked + and a ; any PP left? + ret nz ; return if a move has PP left +.noMovesLeft ld hl, NoMovesLeftText call PrintText ld c, 60 @@ -2914,8 +2917,8 @@ PrintMenuItem: xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 8 - ld b, $3 - ld c, $9 + ld b, 3 + ld c, 9 call TextBoxBorder ld a, [wPlayerDisabledMove] and a @@ -2997,7 +3000,7 @@ SelectEnemyMove: call LoadScreenTilesFromBuffer1 ld a, [wSerialExchangeNybbleReceiveData] cp $e - jp z, .asm_3d601 + jp z, .linkedOpponentUsedStruggle cp $d jr z, .unableToSelectMove cp $4 @@ -3075,7 +3078,7 @@ SelectEnemyMove: .done ld [wEnemySelectedMove], a ret -.asm_3d601 +.linkedOpponentUsedStruggle ld a, STRUGGLE jr .done @@ -3205,7 +3208,7 @@ PlayerCalcMoveDamage: call RandomizeDamage .moveHitTest call MoveHitTest -handleIfPlayerMoveMissed +handleIfPlayerMoveMissed: ld a,[wMoveMissed] and a jr z,getPlayerAnimationType @@ -3213,13 +3216,13 @@ handleIfPlayerMoveMissed sub a,EXPLODE_EFFECT jr z,playPlayerMoveAnimation ; don't play any animation if the move missed, unless it was EXPLODE_EFFECT jr playerCheckIfFlyOrChargeEffect -getPlayerAnimationType +getPlayerAnimationType: ld a,[wPlayerMoveEffect] and a ld a,4 ; move has no effect other than dealing damage jr z,playPlayerMoveAnimation ld a,5 ; move has effect -playPlayerMoveAnimation +playPlayerMoveAnimation: push af ld a,[wPlayerBattleStatus2] bit HasSubstituteUp,a @@ -3238,7 +3241,7 @@ playPlayerMoveAnimation ld b,BANK(ReshowSubstituteAnim) call nz,Bankswitch jr MirrorMoveCheck -playerCheckIfFlyOrChargeEffect +playerCheckIfFlyOrChargeEffect: ld c,30 call DelayFrames ld a,[wPlayerMoveEffect] @@ -3252,7 +3255,7 @@ playerCheckIfFlyOrChargeEffect ld [wAnimationType],a ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation -MirrorMoveCheck +MirrorMoveCheck: ld a,[wPlayerMoveEffect] cp a,MIRROR_MOVE_EFFECT jr nz,.metronomeCheck @@ -3785,10 +3788,10 @@ MonName1Text: and a ld a, [wPlayerMoveNum] ld hl, wPlayerUsedMove - jr z, .asm_3db11 + jr z, .playerTurn ld a, [wEnemyMoveNum] ld hl, wEnemyUsedMove -.asm_3db11 +.playerTurn ld [hl], a ld [wd11e], a call DetermineExclamationPointTextNum @@ -4682,9 +4685,9 @@ CriticalHitTest: ld a, [H_WHOSETURN] and a ld a, [wEnemyMonSpecies] - jr nz, .asm_3e032 + jr nz, .handleEnemy ld a, [wBattleMonSpecies] -.asm_3e032 +.handleEnemy ld [wd0b5], a call GetMonHeader ld a, [wMonHBaseSpeed] @@ -5051,7 +5054,7 @@ ApplyDamageToPlayerPokemon: ld a,$01 ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening -ApplyAttackToPlayerPokemonDone +ApplyAttackToPlayerPokemonDone: jp DrawHUDsAndHPBars AttackSubstitute: @@ -5751,12 +5754,12 @@ EnemyMoveHitTest: handleIfEnemyMoveMissed: ld a, [wMoveMissed] and a - jr z, .asm_3e791 + jr z, .moveDidNotMiss ld a, [wEnemyMoveEffect] cp EXPLODE_EFFECT - jr z, asm_3e7a0 + jr z, handleExplosionMiss jr EnemyCheckIfFlyOrChargeEffect -.asm_3e791 +.moveDidNotMiss call SwapPlayerAndEnemyLevels GetEnemyAnimationType: @@ -5766,7 +5769,7 @@ GetEnemyAnimationType: jr z, playEnemyMoveAnimation ld a, $2 jr playEnemyMoveAnimation -asm_3e7a0: +handleExplosionMiss: call SwapPlayerAndEnemyLevels xor a playEnemyMoveAnimation: @@ -5824,19 +5827,19 @@ EnemyCheckIfMirrorMoveEffect: jp c, JumpMoveEffect ld a, [wMoveMissed] and a - jr z, .asm_3e82b + jr z, .moveDidNotMiss call PrintMoveFailureText ld a, [wEnemyMoveEffect] cp EXPLODE_EFFECT - jr z, .asm_3e83e + jr z, .handleExplosionMiss jp ExecuteEnemyMoveDone -.asm_3e82b +.moveDidNotMiss call ApplyAttackToPlayerPokemon call PrintCriticalOHKOText callab DisplayEffectiveness ld a, 1 ld [wMoveDidntMiss], a -.asm_3e83e +.handleExplosionMiss ld a, [wEnemyMoveEffect] ld hl, AlwaysHappenSideEffects ld de, $1 @@ -5850,7 +5853,7 @@ EnemyCheckIfMirrorMoveEffect: call HandleBuildingRage ld hl, wEnemyBattleStatus1 bit AttackingMultipleTimes, [hl] ; is mon hitting multiple times? (example: double kick) - jr z, .asm_3e873 + jr z, .notMultiHitMove push hl ld hl, wEnemyNumAttacksLeft dec [hl] @@ -5861,7 +5864,7 @@ EnemyCheckIfMirrorMoveEffect: call PrintText xor a ld [wEnemyNumHits], a -.asm_3e873 +.notMultiHitMove ld a, [wEnemyMoveEffect] and a jr z, ExecuteEnemyMoveDone @@ -6801,16 +6804,16 @@ HandleExplodingAnimation: ld hl, wEnemyMonType1 ld de, wEnemyBattleStatus1 ld a, [wPlayerMoveNum] - jr z, .asm_3eeea + jr z, .player ld hl, wBattleMonType1 ld de, wEnemyBattleStatus1 ld a, [wEnemyMoveNum] -.asm_3eeea +.player cp SELFDESTRUCT - jr z, .asm_3eef1 + jr z, .isExplodingMove cp EXPLOSION ret nz -.asm_3eef1 +.isExplodingMove ld a, [de] bit Invulnerable, a ; fly/dig ret nz @@ -7333,7 +7336,7 @@ PoisonEffect: jr nz, .ok ld b, ANIM_A9 ld hl, wEnemyBattleStatus3 - ld de, wEnemyToxcCounter + ld de, wEnemyToxicCounter .ok cp TOXIC jr nz, .normalPoison ; done if move is not Toxic @@ -7341,18 +7344,18 @@ PoisonEffect: xor a ld [de], a ld hl, BadlyPoisonedText - jr .asm_3f2c0 + jr .continue .normalPoison ld hl, PoisonedText -.asm_3f2c0 +.continue pop de ld a, [de] cp POISON_EFFECT - jr z, .asm_3f2cd + jr z, .regularPoisonEffect ld a, b call PlayBattleAnimation2 jp PrintText -.asm_3f2cd +.regularPoisonEffect call PlayCurrentMoveAnimation2 jp PrintText .noEffect @@ -7717,9 +7720,9 @@ MonsStatsRoseText: ld a, [H_WHOSETURN] and a ld a, [wPlayerMoveEffect] - jr z, .asm_3f53b + jr z, .playerTurn ld a, [wEnemyMoveEffect] -.asm_3f53b +.playerTurn cp ATTACK_DOWN1_EFFECT ret nc ld hl, RoseText @@ -7728,7 +7731,7 @@ MonsStatsRoseText: GreatlyRoseText: db $0a TX_FAR _GreatlyRoseText - +; fallthrough RoseText: TX_FAR _RoseText db "@" @@ -7817,9 +7820,9 @@ StatModifierDownEffect: ld a, c add e ld e, a - jr nc, .asm_3f5e4 + jr nc, .noCarry inc d ; de = unmodified stat -.asm_3f5e4 +.noCarry pop bc ld a, [hld] sub $1 ; can't lower stat below 1 (-6) @@ -7919,12 +7922,13 @@ MonsStatsFellText: ld a, [H_WHOSETURN] and a ld a, [wPlayerMoveEffect] - jr z, .asm_3f674 + jr z, .playerTurn ld a, [wEnemyMoveEffect] -.asm_3f674 - cp $1a +.playerTurn +; check if the move's effect decreases a stat by 2 + cp BIDE_EFFECT ret c - cp $44 + cp ATTACK_DOWN_SIDE_EFFECT ret nc ld hl, GreatlyFellText ret @@ -7932,7 +7936,7 @@ MonsStatsFellText: GreatlyFellText: db $0a TX_FAR _GreatlyFellText - +; fallthrough FellText: TX_FAR _FellText db "@" @@ -7940,15 +7944,15 @@ FellText: PrintStatText: ld hl, StatsTextStrings ld c, "@" -.asm_3f68d +.findStatName_outer dec b - jr z, .asm_3f696 -.asm_3f690 + jr z, .foundStatName +.findStatName_inner ld a, [hli] cp c - jr z, .asm_3f68d - jr .asm_3f690 -.asm_3f696 + jr z, .findStatName_outer + jr .findStatName_inner +.foundStatName ld de, wcf4b ld bc, $a jp CopyData @@ -8026,41 +8030,42 @@ ThrashPetalDanceEffect: SwitchAndTeleportEffect: ld a, [H_WHOSETURN] and a - jr nz, .asm_3f791 + jr nz, .handleEnemy ld a, [wIsInBattle] dec a - jr nz, .asm_3f77e + jr nz, .notWildBattle1 ld a, [wCurEnemyLVL] ld b, a ld a, [wBattleMonLevel] - cp b - jr nc, .asm_3f76e + cp b ; is the player's level greater than the enemy's level? + jr nc, .playerMoveWasSuccessful ; if so, teleport will always succeed add b ld c, a - inc c -.asm_3f751 + inc c ; c = sum of player level and enemy level +.rejectionSampleLoop1 call BattleRandom - cp c - jr nc, .asm_3f751 + cp c ; get a random number between 0 and c + jr nc, .rejectionSampleLoop1 srl b - srl b - cp b - jr nc, .asm_3f76e + srl b ; b = enemy level * 4 +; bug: does not account for overflow, so levels above 63 can lead to erroneousness results + cp b ; is rand[0, playerLevel + enemyLevel] > enemyLevel? + jr nc, .playerMoveWasSuccessful ; if so, allow teleporting ld c, 50 call DelayFrames ld a, [wPlayerMoveNum] cp TELEPORT jp nz, PrintDidntAffectText jp PrintButItFailedText_ -.asm_3f76e +.playerMoveWasSuccessful call ReadPlayerMonCurHPAndStatus xor a ld [wAnimationType], a inc a ld [wEscapedFromBattle], a ld a, [wPlayerMoveNum] - jr .asm_3f7e4 -.asm_3f77e + jr .playAnimAndPrintText +.notWildBattle1 ld c, 50 call DelayFrames ld hl, IsUnaffectedText @@ -8068,41 +8073,41 @@ SwitchAndTeleportEffect: cp TELEPORT jp nz, PrintText jp PrintButItFailedText_ -.asm_3f791 +.handleEnemy ld a, [wIsInBattle] dec a - jr nz, .asm_3f7d1 + jr nz, .notWildBattle2 ld a, [wBattleMonLevel] ld b, a ld a, [wCurEnemyLVL] cp b - jr nc, .asm_3f7c1 + jr nc, .enemyMoveWasSuccessful add b ld c, a inc c -.asm_3f7a4 +.rejectionSampleLoop2 call BattleRandom cp c - jr nc, .asm_3f7a4 + jr nc, .rejectionSampleLoop2 srl b srl b cp b - jr nc, .asm_3f7c1 + jr nc, .enemyMoveWasSuccessful ld c, 50 call DelayFrames ld a, [wEnemyMoveNum] cp TELEPORT jp nz, PrintDidntAffectText jp PrintButItFailedText_ -.asm_3f7c1 +.enemyMoveWasSuccessful call ReadPlayerMonCurHPAndStatus xor a ld [wAnimationType], a inc a ld [wEscapedFromBattle], a ld a, [wEnemyMoveNum] - jr .asm_3f7e4 -.asm_3f7d1 + jr .playAnimAndPrintText +.notWildBattle2 ld c, 50 call DelayFrames ld hl, IsUnaffectedText @@ -8110,7 +8115,7 @@ SwitchAndTeleportEffect: cp TELEPORT jp nz, PrintText jp ConditionalPrintButItFailed -.asm_3f7e4 +.playAnimAndPrintText push af call PlayBattleAnimation ld c, 20 @@ -8118,12 +8123,12 @@ SwitchAndTeleportEffect: pop af ld hl, RanFromBattleText cp TELEPORT - jr z, .asm_3f7ff + jr z, .printText ld hl, RanAwayScaredText cp ROAR - jr z, .asm_3f7ff + jr z, .printText ld hl, WasBlownAwayText -.asm_3f7ff +.printText jp PrintText RanFromBattleText: @@ -8168,10 +8173,11 @@ TwoToFiveAttacksEffect: call BattleRandom and $3 cp $2 - jr c, .asm_3f851 + jr c, .gotNumHits +; if the number of hits was greater than 2, re-roll again for a lower chance call BattleRandom and $3 -.asm_3f851 +.gotNumHits inc a inc a .saveNumberOfHits @@ -8250,22 +8256,22 @@ ChargeMoveEffectText: ld a, [wChargeMoveNum] cp RAZOR_WIND ld hl, MadeWhirlwindText - jr z, .asm_3f8f8 + jr z, .gotText cp SOLARBEAM ld hl, TookInSunlightText - jr z, .asm_3f8f8 + jr z, .gotText cp SKULL_BASH ld hl, LoweredItsHeadText - jr z, .asm_3f8f8 + jr z, .gotText cp SKY_ATTACK ld hl, SkyAttackGlowingText - jr z, .asm_3f8f8 + jr z, .gotText cp FLY ld hl, FlewUpHighText - jr z, .asm_3f8f8 + jr z, .gotText cp DIG ld hl, DugAHoleText -.asm_3f8f8 +.gotText ret MadeWhirlwindText: @@ -8328,7 +8334,7 @@ RecoilEffect: ConfusionSideEffect: call BattleRandom - cp $19 + cp $19 ; ~10% chance ret nc jr ConfusionSideEffectSuccess @@ -8398,9 +8404,9 @@ ClearHyperBeam: ld hl, wEnemyBattleStatus2 ld a, [H_WHOSETURN] and a - jr z, .asm_3f9db + jr z, .playerTurn ld hl, wPlayerBattleStatus2 -.asm_3f9db +.playerTurn res NeedsToRecharge, [hl] ; mon no longer needs to recharge pop hl ret @@ -8421,21 +8427,21 @@ MimicEffect: call MoveHitTest ld a, [wMoveMissed] and a - jr nz, .asm_3fa74 + jr nz, .mimicMissed ld a, [H_WHOSETURN] and a ld hl, wBattleMonMoves ld a, [wPlayerBattleStatus1] - jr nz, .asm_3fa13 + jr nz, .enemyTurn ld a, [wLinkState] cp LINK_STATE_BATTLING - jr nz, .asm_3fa3a + jr nz, .letPlayerChooseMove ld hl, wEnemyMonMoves ld a, [wEnemyBattleStatus1] -.asm_3fa13 +.enemyTurn bit Invulnerable, a - jr nz, .asm_3fa74 -.asm_3fa17 + jr nz, .mimicMissed +.getRandomMove push hl call BattleRandom and $3 @@ -8445,20 +8451,20 @@ MimicEffect: ld a, [hl] pop hl and a - jr z, .asm_3fa17 + jr z, .getRandomMove ld d, a ld a, [H_WHOSETURN] and a ld hl, wBattleMonMoves ld a, [wPlayerMoveListIndex] - jr z, .asm_3fa5f + jr z, .playerTurn ld hl, wEnemyMonMoves ld a, [wEnemyMoveListIndex] - jr .asm_3fa5f -.asm_3fa3a + jr .playerTurn +.letPlayerChooseMove ld a, [wEnemyBattleStatus1] bit Invulnerable, a - jr nz, .asm_3fa74 + jr nz, .mimicMissed ld a, [wCurrentMenuItem] push af ld a, $1 @@ -8473,7 +8479,7 @@ MimicEffect: ld d, [hl] pop af ld hl, wBattleMonMoves -.asm_3fa5f +.playerTurn ld c, a ld b, $0 add hl, bc @@ -8484,7 +8490,7 @@ MimicEffect: call PlayCurrentMoveAnimation ld hl, MimicLearnedMoveText jp PrintText -.asm_3fa74 +.mimicMissed jp PrintButItFailedText_ MimicLearnedMoveText: diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index 984af087..e23a85ba 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -33,7 +33,7 @@ DecrementPP: ld a, [wPlayerMonNumber] ; which mon in party is active ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ; calculate address of the mon to modify -.DecrementPP +.DecrementPP: ld a, [wPlayerMoveListIndex] ; which move (0, 1, 2, 3) did we use? ld c, a ld b, 0 diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index c1914806..f73f1d5a 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -49,11 +49,11 @@ GainExperience: ld [de], a .nextBaseStat dec c - jr z, .asm_552a1 + jr z, .statExpDone inc de inc de jr .gainStatExpLoop -.asm_552a1 +.statExpDone xor a ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND + 1], a diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index deed8e95..36ca019e 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -2,15 +2,15 @@ GetTrainerName_: ld hl, wGrassRate ld a, [wLinkState] and a - jr nz, .rival + jr nz, .foundName ld hl, wRivalName ld a, [wTrainerClass] cp SONY1 - jr z, .rival + jr z, .foundName cp SONY2 - jr z, .rival + jr z, .foundName cp SONY3 - jr z, .rival + jr z, .foundName ld [wd0b5], a ld a, TRAINER_NAME ld [wNameListType], a @@ -18,7 +18,7 @@ GetTrainerName_: ld [wPredefBank], a call GetName ld hl, wcd6d -.rival +.foundName ld de, wTrainerName ld bc, $d jp CopyData diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 57e7f1bb..76559117 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -2,8 +2,8 @@ DisplayLinkBattleVersusTextBox: call LoadTextBoxTilePatterns coord hl, 3, 4 - ld b, $7 - ld c, $c + ld b, 7 + ld c, 12 call TextBoxBorder coord hl, 4, 5 ld de, wPlayerName diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 7999a7a0..b175fcaf 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -182,7 +182,7 @@ AIMoveChoiceModification2: jr c, .preferMove jr .nextMove .preferMove - dec [hl] ; sligthly encourage this move + dec [hl] ; slightly encourage this move jr .nextMove ; encourages moves that are effective against the player's mon (even if non-damaging). diff --git a/engine/cable_club.asm b/engine/cable_club.asm index bd9ed683..9d72d220 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -27,10 +27,10 @@ CableClub_DoBattleOrTradeAgain: ld hl, wSerialPlayerDataBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 6 -.writePlayeDataBlockPreambleLoop +.writePlayerDataBlockPreambleLoop ld [hli], a dec b - jr nz, .writePlayeDataBlockPreambleLoop + jr nz, .writePlayerDataBlockPreambleLoop ld hl, wSerialRandomNumberListBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 7 @@ -271,7 +271,7 @@ CableClub_DoBattleOrTradeAgain: cp LINK_STATE_START_BATTLE ld a, LINK_STATE_TRADING ld [wLinkState], a - jr nz, .asm_5506 + jr nz, .trading ld a, LINK_STATE_BATTLING ld [wLinkState], a ld a, OPP_SONY1 @@ -283,7 +283,7 @@ CableClub_DoBattleOrTradeAgain: predef InitOpponent predef HealParty jp ReturnToCableClubRoom -.asm_5506 +.trading ld c, BANK(Music_GameCorner) ld a, MUSIC_GAME_CORNER call PlayMusic @@ -964,8 +964,8 @@ CableClub_TextBoxBorder: ; c = width CableClub_DrawHorizontalLine: ld d, c -.asm_5ae1 +.loop ld [hli], a dec d - jr nz, .asm_5ae1 + jr nz, .loop ret diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 0e35f709..dc1026a8 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -210,12 +210,12 @@ HoFDisplayPlayerStats: SetEvent EVENT_HALL_OF_FAME_DEX_RATING predef DisplayDexRating coord hl, 0, 4 - ld b, $6 - ld c, $a + ld b, 6 + ld c, 10 call TextBoxBorder coord hl, 5, 0 - ld b, $2 - ld c, $9 + ld b, 2 + ld c, 9 call TextBoxBorder coord hl, 7, 2 ld de, wPlayerName diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index 7591fac0..fcc79f6d 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -66,18 +66,18 @@ ViridianSchoolNotebookText4: PrintFightingDojoText2: call EnableAutoTextBoxDrawing - tx_pre_jump FightingDojoText_52a10 + tx_pre_jump EnemiesOnEverySideText -FightingDojoText_52a10: - TX_FAR _FightingDojoText_52a10 +EnemiesOnEverySideText: + TX_FAR _EnemiesOnEverySideText db "@" PrintFightingDojoText3: call EnableAutoTextBoxDrawing - tx_pre_jump FightingDojoText_52a1d + tx_pre_jump WhatGoesAroundComesAroundText -FightingDojoText_52a1d: - TX_FAR _FightingDojoText_52a1d +WhatGoesAroundComesAroundText: + TX_FAR _WhatGoesAroundComesAroundText db "@" PrintFightingDojoText: diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index efdbd081..84ce6d53 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -81,9 +81,9 @@ IndigoPlateauStatues: ld a, [wXCoord] bit 0, a ld hl, IndigoPlateauStatuesText2 - jr nz, .asm_fbd3 + jr nz, .ok ld hl, IndigoPlateauStatuesText3 -.asm_fbd3 +.ok call PrintText jp TextScriptEnd @@ -104,12 +104,12 @@ BookOrSculptureText: ld hl, PokemonBooksText ld a, [wCurMapTileset] cp MANSION ; Celadon Mansion tileset - jr nz, .asm_fbfd + jr nz, .ok aCoord 8, 6 cp $38 - jr nz, .asm_fbfd + jr nz, .ok ld hl, DiglettSculptureText -.asm_fbfd +.ok call PrintText jp TextScriptEnd diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 9b1532bc..556fe791 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -70,10 +70,10 @@ SafariZoneGameOver: ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic -.asm_1e9c2 +.waitForMusicToPlay ld a, [wChannelSoundIDs + CH4] - cp $b9 - jr nz, .asm_1e9c2 + cp SFX_SAFARI_ZONE_PA + jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -100,10 +100,10 @@ SafariGameOverText: TX_ASM ld a, [wNumSafariBalls] and a - jr z, .asm_1ea04 + jr z, .noMoreSafariBalls ld hl, TimesUpText call PrintText -.asm_1ea04 +.noMoreSafariBalls ld hl, GameOverText call PrintText jp TextScriptEnd @@ -326,14 +326,14 @@ BillsHousePC: cp SPRITE_FACING_UP ret nz CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING - jr nz, .asm_1ebd2 + jr nz, .displayBillsHousePokemonList CheckEventReuseA EVENT_USED_CELL_SEPARATOR_ON_BILL - jr nz, .asm_1eb86 + jr nz, .displayBillsHouseMonitorText CheckEventReuseA EVENT_BILL_SAID_USE_CELL_SEPARATOR - jr nz, .asm_1eb8b -.asm_1eb86 + jr nz, .doCellSeparator +.displayBillsHouseMonitorText tx_pre_jump BillsHouseMonitorText -.asm_1eb8b +.doCellSeparator ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a tx_pre BillsHouseInitiatedText @@ -360,7 +360,7 @@ BillsHousePC: call PlayDefaultMusic SetEvent EVENT_USED_CELL_SEPARATOR_ON_BILL ret -.asm_1ebd2 +.displayBillsHousePokemonList ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a tx_pre BillsHousePokemonList diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index 3fa01208..221bd7a9 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -87,6 +87,7 @@ UpdateHPBar2: call UpdateHPBar_CompareNewHPToOldHP jr z, .animateHPBarDone jr nc, .HPIncrease +; HP decrease dec bc ; subtract 1 HP ld a, c ld [wHPBarNewHP], a @@ -95,7 +96,7 @@ UpdateHPBar2: call UpdateHPBar_CalcOldNewHPBarPixels ld a, e sub d ; calc pixel difference - jr .asm_fa7e + jr .ok .HPIncrease inc bc ; add 1 HP ld a, c @@ -105,7 +106,7 @@ UpdateHPBar2: call UpdateHPBar_CalcOldNewHPBarPixels ld a, d sub e ; calc pixel difference -.asm_fa7e +.ok call UpdateHPBar_PrintHPNumber and a jr z, .noPixelDifference diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index bacf531b..f1d12ce1 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -21,7 +21,7 @@ DoInGameTradeDialogue: call CopyData pop af ld l,a - ld h,$0 + ld h,0 ld de,InGameTradeTextPointers add hl,hl add hl,de diff --git a/engine/intro.asm b/engine/intro.asm index 320267c7..ed532681 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -305,7 +305,7 @@ PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles - ld a, $e4 + ld a, %11100100 ld [rBGP], a ld c, 180 call DelayFrames diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index f6865b6c..85a546e1 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -248,7 +248,7 @@ BillsPCDeposit: add "1" .next ld [hli], a - ld [hl], $50 + ld [hl], "@" ld hl, MonWasStoredText call PrintText jp BillsPCMenu diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 217d6e54..758a2d8d 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -7,7 +7,7 @@ AskName: coord hl, 0, 0 ld b, 4 ld c, 11 - call z, ClearScreenArea ; only if in wild batle + call z, ClearScreenArea ; only if in wild battle ld a, [wcf91] ld [wd11e], a call GetMonName @@ -40,7 +40,7 @@ AskName: pop af ld [wUpdateSpritesEnabled], a ld a, [wcf4b] - cp $50 + cp "@" ret nz .declinedNickname ld d, h @@ -108,7 +108,7 @@ DisplayNamingScreen: ld [wMenuWatchedKeys], a ld a, 7 ld [wMaxMenuItem], a - ld a, $50 + ld a, "@" ld [wcf4b], a xor a ld hl, wNamingScreenSubmitName @@ -153,7 +153,7 @@ DisplayNamingScreen: ld h, [hl] ld l, a push de - jp [hl] + jp hl .submitNickname pop de @@ -259,7 +259,7 @@ DisplayNamingScreen: .addLetter ld a, [wNamingScreenLetter] ld [hli], a - ld [hl], $50 + ld [hl], "@" ld a, SFX_PRESS_AB call PlaySound ret diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index 55852b63..e4172ec7 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -7,9 +7,9 @@ OpenOaksPC: call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_1e932 + jr nz, .closePC predef DisplayDexRating -.asm_1e932 +.closePC ld hl, ClosedOaksPCText call PrintText jp LoadScreenTilesFromBuffer2 diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index 8ec31226..c9e2cf08 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -121,18 +121,18 @@ RemoveItemByID: ld b, a xor a ld [hItemToRemoveIndex], a -.asm_17f40 +.loop ld a, [hli] - cp $ff + cp -1 ; reached terminator? ret z cp b - jr z, .asm_17f4f + jr z, .foundItem inc hl ld a, [hItemToRemoveIndex] inc a ld [hItemToRemoveIndex], a - jr .asm_17f40 -.asm_17f4f + jr .loop +.foundItem ld a, $1 ld [wItemQuantity], a ld a, [hItemToRemoveIndex] diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 3078f1a9..45acec58 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -125,6 +125,7 @@ HandlePokedexSideMenu: call DrawTileLine ; cover up the menu cursor in the pokemon list pop bc ret + .buttonBPressed push bc coord hl, 15, 10 @@ -133,16 +134,19 @@ HandlePokedexSideMenu: call DrawTileLine ; cover up the menu cursor in the side menu pop bc jr .exitSideMenu + .choseData call ShowPokedexDataInternal ld b,0 jr .exitSideMenu + ; play pokemon cry .choseCry ld a,[wd11e] call GetCryData call PlaySound jr .handleMenuInput + .choseArea predef LoadTownMap_Nest ; display pokemon areas ld b,0 @@ -206,6 +210,7 @@ HandlePokedexListMenu: dec c jr nz,.maxSeenPokemonInnerLoop jr .maxSeenPokemonLoop + .storeMaxSeenPokemon ld a,b ld [wDexMaxSeenMon],a @@ -409,20 +414,25 @@ ShowPokedexDataInternal: push af xor a ld [hTilesetType],a + coord hl, 0, 0 ld de,1 lb bc, $64, SCREEN_WIDTH call DrawTileLine ; draw top border + coord hl, 0, 17 ld b, $6f call DrawTileLine ; draw bottom border + coord hl, 0, 1 ld de,20 lb bc, $66, $10 call DrawTileLine ; draw left border + coord hl, 19, 1 ld b,$67 call DrawTileLine ; draw right border + ld a,$63 ; upper left corner tile Coorda 0, 0 ld a,$65 ; upper right corner tile @@ -431,15 +441,19 @@ ShowPokedexDataInternal: Coorda 0, 17 ld a,$6e ; lower right corner tile Coorda 19, 17 + coord hl, 0, 9 ld de,PokedexDataDividerLine call PlaceString ; draw horizontal divider line + coord hl, 9, 6 ld de,HeightWeightText call PlaceString + call GetMonName coord hl, 9, 2 call PlaceString + ld hl,PokedexEntryPointers ld a,[wd11e] dec a @@ -450,14 +464,17 @@ ShowPokedexDataInternal: ld a,[hli] ld e,a ld d,[hl] ; de = address of pokedex entry + coord hl, 9, 4 call PlaceString ; print species name + ld h,b ld l,c push de ld a,[wd11e] push af call IndexToPokedex + coord hl, 2, 8 ld a, "№" ld [hli],a @@ -466,6 +483,7 @@ ShowPokedexDataInternal: ld de,wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print pokedex number + ld hl,wPokedexOwned call IsPokemonBitSet pop af @@ -473,10 +491,12 @@ ShowPokedexDataInternal: ld a,[wcf91] ld [wd0b5],a pop de + push af push bc push de push hl + call Delay3 call GBPalNormal call GetMonHeader ; load pokemon picture location @@ -484,10 +504,12 @@ ShowPokedexDataInternal: call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture ld a,[wcf91] call PlayCry ; play pokemon cry + pop hl pop de pop bc pop af + ld a,c and a jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index b48fa99c..a1ef81e8 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -23,8 +23,8 @@ CeladonPrizeMenu: ld [wTopMenuItemX],a call PrintPrizePrice coord hl, 0, 2 - ld b,$08 - ld c,$10 + ld b, 8 + ld c, 16 call TextBoxBorder call GetPrizeMenuId call UpdateSprites @@ -32,12 +32,12 @@ CeladonPrizeMenu: call PrintText call HandleMenuInput ; menu choice handler bit 1,a ; keypress = B (Cancel) - jr nz,.NoChoice + jr nz, .noChoice ld a,[wCurrentMenuItem] - cp a,$03 ; "NO,THANKS" choice - jr z,.NoChoice + cp 3 ; "NO,THANKS" choice + jr z, .noChoice call HandlePrizeChoice -.NoChoice +.noChoice ld hl,wd730 res 6,[hl] ret @@ -65,7 +65,7 @@ GetPrizeMenuId: ; (distinguishing between Pokemon names ; and Items (specifically TMs) names) ld a,[hSpriteIndexOrTextID] - sub a,3 ; prize-texts' id are 3, 4 and 5 + sub 3 ; prize-texts' id are 3, 4 and 5 ld [wWhichPrizeWindow],a ; prize-texts' id (relative, i.e. 0, 1 or 2) add a add a @@ -88,7 +88,7 @@ GetPrizeMenuId: ld bc,6 call CopyData ld a,[wWhichPrizeWindow] - cp a,$02 ;is TM_menu? + cp 2 ;is TM_menu? jr nz,.putMonName ld a,[wPrize1] ld [wd11e],a @@ -138,7 +138,7 @@ GetPrizeMenuId: call PrintBCDNumber ld de,wPrize2Price coord hl, 13, 7 - ld c,(%1 << 7 | 2) + ld c,(1 << 7 | 2) call PrintBCDNumber ld de,wPrize3Price coord hl, 13, 9 @@ -149,15 +149,15 @@ INCLUDE "data/prizes.asm" PrintPrizePrice: coord hl, 11, 0 - ld b,$01 - ld c,$07 + ld b, 1 + ld c, 7 call TextBoxBorder call UpdateSprites coord hl, 12, 0 - ld de,.CoinText + ld de, .CoinString call PlaceString coord hl, 13, 1 - ld de,.SixSpacesText + ld de, .SixSpacesString call PlaceString coord hl, 13, 1 ld de,wPlayerCoins @@ -165,10 +165,10 @@ PrintPrizePrice: call PrintBCDNumber ret -.CoinText +.CoinString: db "COIN@" -.SixSpacesText +.SixSpacesString: db " @" LoadCoinsToSubtract: @@ -196,33 +196,33 @@ HandlePrizeChoice: ld a,[hl] ld [wd11e],a ld a,[wWhichPrizeWindow] - cp a,$02 ; is prize a TM? - jr nz,.GetMonName + cp 2 ; is prize a TM? + jr nz, .getMonName call GetItemName - jr .GivePrize -.GetMonName + jr .givePrize +.getMonName call GetMonName -.GivePrize +.givePrize ld hl,SoYouWantPrizeTextPtr call PrintText call YesNoChoice ld a,[wCurrentMenuItem] ; yes/no answer (Y=0, N=1) and a - jr nz,.PrintOhFineThen + jr nz, .printOhFineThen call LoadCoinsToSubtract call HasEnoughCoins - jr c,.NotEnoughCoins + jr c, .notEnoughCoins ld a,[wWhichPrizeWindow] - cp a,$02 - jr nz,.GiveMon + cp $02 + jr nz, .giveMon ld a,[wd11e] ld b,a ld a,1 ld c,a call GiveItem - jr nc,.BagFull - jr .SubtractCoins -.GiveMon + jr nc, .bagFull + jr .subtractCoins +.giveMon ld a,[wd11e] ld [wcf91],a push af @@ -243,24 +243,24 @@ HandlePrizeChoice: ; were full), return without subtracting coins. ret nc -.SubtractCoins +.subtractCoins call LoadCoinsToSubtract ld hl,hCoins + 1 ld de,wPlayerCoins + 1 ld c,$02 ; how many bytes predef SubBCDPredef jp PrintPrizePrice -.BagFull +.bagFull ld hl,PrizeRoomBagIsFullTextPtr jp PrintText -.NotEnoughCoins +.notEnoughCoins ld hl,SorryNeedMoreCoinsText jp PrintText -.PrintOhFineThen +.printOhFineThen ld hl,OhFineThenTextPtr jp PrintText -UnknownData52951: +UnknownPrizeData: ; XXX what's this? db $00,$01,$00,$01,$00,$01,$00,$00,$01 diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 9ae6cbe5..bc4afdc6 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -34,7 +34,7 @@ StartMenu_Pokemon: ld [wTextBoxID],a call DisplayTextBoxID ; display pokemon menu options ld hl,wFieldMoves - lb bc, $02, $0c ; max menu item ID, top menu item Y + lb bc, 2, 12 ; max menu item ID, top menu item Y ld e,5 .adjustMenuVariablesLoop dec e @@ -222,7 +222,7 @@ StartMenu_Pokemon: res 4,[hl] ld c,60 call DelayFrames - call GBPalWhiteOutWithDelay3 ; zero all three palettes and wait 3 V-blanks + call GBPalWhiteOutWithDelay3 jp .goBackToMap .warpToLastPokemonCenterText TX_FAR _WarpToLastPokemonCenterText diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index a7076d35..3b01d5ab 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -249,16 +249,16 @@ PrintStatsBox: and a ; a is 0 from the status screen jr nz, .DifferentBox coord hl, 0, 8 - ld b, $8 - ld c, $8 + ld b, 8 + ld c, 8 call TextBoxBorder ; Draws the box coord hl, 1, 9 ; Start printing stats from here ld bc, $0019 ; Number offset jr .PrintStats .DifferentBox coord hl, 9, 2 - ld b, $8 - ld c, $9 + ld b, 8 + ld c, 9 call TextBoxBorder coord hl, 11, 3 ld bc, $0018 @@ -279,7 +279,7 @@ PrintStatsBox: call PrintStat ld de, wLoadedMonSpecial jp PrintNumber -PrintStat +PrintStat: push hl call PrintNumber pop hl diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index b32568f9..a80d1643 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -130,6 +130,9 @@ LoadVendingMachineItem: ret VendingPrices: - db FRESH_WATER,$00,$02,$00 - db SODA_POP, $00,$03,$00 - db LEMONADE, $00,$03,$50 + db FRESH_WATER + money 200 + db SODA_POP + money 300 + db LEMONADE + money 350 diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index aa9bdaeb..864ac136 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -132,7 +132,7 @@ LoadMonPartySpriteGfxWithLCDDisabled: ld hl, MonPartySpritePointers ld a, $1c ld bc, $0 -.asm_7179c +.loop push af push bc push hl @@ -159,7 +159,7 @@ LoadMonPartySpriteGfxWithLCDDisabled: ld c, a pop af dec a - jr nz, .asm_7179c + jr nz, .loop jp EnableLCD MonPartySpritePointers: diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 31c00fd0..f786e3c1 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -6,7 +6,7 @@ SetDefaultNames: ld a, [wd732] push af ld hl, wPlayerName - ld bc, $d8a + ld bc, wBoxDataEnd - wPlayerName xor a call FillMemory ld hl, wSpriteStateData1 @@ -195,7 +195,7 @@ MovePicLeft: ld [rWX],a call DelayFrame - ld a,$E4 + ld a,%11100100 ld [rBGP],a .next call DelayFrame diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 61e512de..afc55902 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -73,7 +73,7 @@ SilphCoMapList: CardKeySuccessText: TX_FAR _CardKeySuccessText1 - db $0b + TX_SFX_ITEM TX_FAR _CardKeySuccessText2 db "@" diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 2f13dfba..f6ae6468 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -74,7 +74,7 @@ UsedCutText: InitCutAnimOAM: xor a ld [wWhichAnimationOffsets], a - ld a, $e4 + ld a, %11100100 ld [rOBP1], a ld a, [wCutTile] cp $52 diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 4ec34922..929e4f22 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -34,7 +34,7 @@ ShakeElevator: call PlayMusic .musicLoop ld a, [wChannelSoundIDs + CH4] - cp $b9 + cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites jp PlayDefaultMusic @@ -56,7 +56,7 @@ ShakeElevatorRedrawRow: add hl, de ld a, h and $3 - or $98 + or vBGMap0 / $100 ld d, a ld a, l pop hl diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 4df8b6f6..ac4276bd 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -17,11 +17,11 @@ EmotionBubble: ld [wUpdateSpritesEnabled], a ld a, [wd736] bit 6, a ; are the last 4 OAM entries reserved for a shadow or fishing rod? - ld hl, wOAMBuffer + $8f - ld de, wOAMBuffer + $9f + ld hl, wOAMBuffer + 4 * 35 + $3 ; $8f + ld de, wOAMBuffer + 4 * 39 + $3 ; $9f jr z, .next - ld hl, wOAMBuffer + $7f - ld de, wOAMBuffer + $8f + ld hl, wOAMBuffer + 4 * 31 + $3 ; $7f + ld de, wOAMBuffer + 4 * 35 + $3 ; $8f ; Copy OAM data 16 bytes forward to make room for emotion bubble OAM data at the ; start of the OAM buffer. diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 11e6ad55..dae85c28 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -27,7 +27,7 @@ FoundHiddenItemText: ld b, a ld c, 1 call GiveItem - jr nc, .BagFull + jr nc, .bagFull ld hl, wObtainedHiddenItemsFlags ld a, [wHiddenItemOrCoinsIndex] ld c, a @@ -37,7 +37,7 @@ FoundHiddenItemText: call PlaySoundWaitForCurrent call WaitForSoundToFinish jp TextScriptEnd -.BagFull +.bagFull call WaitForTextScrollButtonPress ; wait for button press xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -77,24 +77,24 @@ HiddenCoins: cp 20 jr z, .bcd20 cp 40 - jr z, .bcd20 + jr z, .bcd20 ; should be bcd40 jr .bcd100 .bcd10 ld a, $10 ld [hCoins + 1], a - jr .bcddone + jr .bcdDone .bcd20 ld a, $20 ld [hCoins + 1], a - jr .bcddone + jr .bcdDone .bcd40 ; due to a typo, this is never used ld a, $40 ld [hCoins + 1], a - jr .bcddone + jr .bcdDone .bcd100 ld a, $1 ld [hCoins], a -.bcddone +.bcdDone ld de, wPlayerCoins + 1 ld hl, hCoins + 1 ld c, $2 @@ -107,13 +107,13 @@ HiddenCoins: call EnableAutoTextBoxDrawing ld a, [wPlayerCoins] cp $99 - jr nz, .RoomInCoinCase + jr nz, .roomInCoinCase ld a, [wPlayerCoins + 1] cp $99 - jr nz, .RoomInCoinCase + jr nz, .roomInCoinCase tx_pre_id DroppedHiddenCoinsText jr .done -.RoomInCoinCase +.roomInCoinCase tx_pre_id FoundHiddenCoinsText .done jp PrintPredefTextID diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index e60f820a..9302b6e3 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -393,7 +393,7 @@ UpdateSpriteMovementDelay: ld l, a ld [hl], $1 ; c1x1 = 1 (mark as ready to move) notYetMoving: - ld h, $c1 + ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $8 ld l, a @@ -408,7 +408,6 @@ MakeNPCFacePlayer: ld a, [wd72d] bit 5, a jr nz, notYetMoving - res 7, [hl] ld a, [wPlayerDirection] bit PLAYER_DIR_BIT_UP, a @@ -449,7 +448,7 @@ InitializeSpriteStatus: ; calculates the spprite's scrren position form its map position and the player position InitializeSpriteScreenPosition: - ld h, $c2 + ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $4 ld l, a @@ -477,7 +476,7 @@ CheckSpriteAvailability: ld a, [$ffe5] and a jp nz, .spriteInvisible - ld h, $c2 + ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $6 ld l, a @@ -525,7 +524,7 @@ CheckSpriteAvailability: cp d jr c, .spriteVisible ; standing on tile with ID >=$60 (top right tile) .spriteInvisible - ld h, $c1 + ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $2 ld l, a @@ -579,7 +578,7 @@ UpdateSpriteImage: ; e: X movement delta (-1, 0 or 1) ; set carry on failure, clears carry on success CanWalkOntoTile: - ld h, $c2 + ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $6 ld l, a @@ -607,7 +606,7 @@ CanWalkOntoTile: ld a, [hl] ; $c2x6 (movement byte 1) inc a jr z, .impassable ; if $ff, no movement allowed (however, changing direction is) - ld h, $c1 + ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $4 ld l, a @@ -626,14 +625,14 @@ CanWalkOntoTile: call DetectCollisionBetweenSprites pop bc pop de - ld h, $c1 + ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $c ld l, a ld a, [hl] ; c1xc (directions in which sprite collision would occur) and b ; check against chosen direction (1,2,4 or 8) jr nz, .impassable ; collision between sprites, don't go there - ld h, $c2 + ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $2 ld l, a @@ -690,7 +689,7 @@ CanWalkOntoTile: ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer GetTileSpriteStandsOn: - ld h, $c1 + ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] add $4 ld l, a diff --git a/engine/overworld/oam.asm b/engine/overworld/oam.asm index 94082beb..2c2a3dff 100644 --- a/engine/overworld/oam.asm +++ b/engine/overworld/oam.asm @@ -6,7 +6,7 @@ PrepareOAMData: dec a jr z, .updateEnabled - cp 0 - 1 + cp -1 ret nz ld [wUpdateSpritesEnabled], a jp HideSprites diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index f7b63aaa..a17e67bd 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -388,7 +388,7 @@ FishingAnim: set 6, [hl] ; reserve the last 4 OAM entries ld de, RedSprite ld hl, vNPCSprites - lb bc, BANK(RedSprite), $0c + lb bc, BANK(RedSprite), $c call CopyVideoData ld a, $4 ld hl, RedFishingTiles diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index e50c508e..823939b1 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -85,7 +85,7 @@ DisplayPokemartDialogue_: lb bc, 14, 1 ; location that PrintText always prints to, this is useless call PrintText coord hl, 14, 7 - lb bc, 08, 15 + lb bc, 8, 15 ld a,TWO_OPTION_MENU ld [wTextBoxID],a call DisplayTextBoxID ; yes/no menu diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 1d0340c9..655c6b2a 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -4,16 +4,16 @@ _GetSpritePosition1: ld a, [wSpriteIndex] ld [H_SPRITEINDEX], a call GetSpriteDataPointer - ld a, [hli] + ld a, [hli] ; c1x4 (screen Y pos) ld [$ffeb], a inc hl - ld a, [hl] + ld a, [hl] ; c1x6 (screen X pos) ld [$ffec], a - ld de, $fe + ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) add hl, de - ld a, [hli] + ld a, [hli] ; c2x4 (map Y pos) ld [$ffed], a - ld a, [hl] + ld a, [hl] ; c2x5 (map X pos) ld [$ffee], a ret @@ -28,7 +28,7 @@ _GetSpritePosition2: inc hl ld a, [hl] ; c1x6 (screen X pos) ld [wSavedSpriteScreenX], a - ld de, $104 - $6 + ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) add hl, de ld a, [hli] ; c2x4 (map Y pos) ld [wSavedSpriteMapY], a @@ -47,7 +47,7 @@ _SetSpritePosition1: inc hl ld a, [$ffec] ; c1x6 (screen X pos) ld [hl], a - ld de, $104 - $6 + ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) add hl, de ld a, [$ffed] ; c2x4 (map Y pos) ld [hli], a @@ -57,21 +57,21 @@ _SetSpritePosition1: _SetSpritePosition2: ld hl, wSpriteStateData1 - ld de, $0004 + ld de, 4 ld a, [wSpriteIndex] ld [H_SPRITEINDEX], a call GetSpriteDataPointer ld a, [wSavedSpriteScreenY] - ld [hli], a + ld [hli], a ; c1x4 (screen Y pos) inc hl ld a, [wSavedSpriteScreenX] - ld [hl], a - ld de, $00fe + ld [hl], a ; c1x6 (screen X pos) + ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) add hl, de ld a, [wSavedSpriteMapY] - ld [hli], a + ld [hli], a ; c2x4 (map Y pos) ld a, [wSavedSpriteMapX] - ld [hl], a + ld [hl], a ; c2x5 (map X pos) ret TrainerWalkUpToPlayer: @@ -80,11 +80,11 @@ TrainerWalkUpToPlayer: ld [wTrainerSpriteOffset], a call ReadTrainerScreenPosition ld a, [wTrainerFacingDirection] - and a + and a ; SPRITE_FACING_DOWN jr z, .facingDown - cp $4 + cp SPRITE_FACING_UP jr z, .facingUp - cp $8 + cp SPRITE_FACING_LEFT jr z, .facingLeft jr .facingRight .facingDown @@ -148,7 +148,7 @@ TrainerWalkUpToPlayer: jp MoveSprite_ ; input: de = offset within sprite entry -; output: de = pointer to sprite data +; output: hl = pointer to sprite data GetSpriteDataPointer: push de add hl, de @@ -225,7 +225,7 @@ TrainerEngage: set 0, [hl] call EngageMapTrainer ld a, $ff -.noEngage: +.noEngage ld [wTrainerSpriteOffset], a pop de pop hl @@ -239,7 +239,7 @@ ReadTrainerScreenPosition: ld e, a ld hl, wSpriteStateData1 add hl, de - ld a, [hl] + ld a, [hl] ; c1x4 (sprite Y pos) ld [wTrainerScreenY], a ld a, [wTrainerSpriteOffset] add $6 @@ -247,7 +247,7 @@ ReadTrainerScreenPosition: ld e, a ld hl, wSpriteStateData1 add hl, de - ld a, [hl] + ld a, [hl] ; c1x6 (sprite X pos) ld [wTrainerScreenX], a ret @@ -262,13 +262,13 @@ CheckSpriteCanSeePlayer: jr .notInLine ; player too far away .checkIfLinedUp ld a, [wTrainerFacingDirection] ; sprite facing direction - cp $0 ; down + cp SPRITE_FACING_DOWN jr z, .checkXCoord - cp $4 ; up + cp SPRITE_FACING_UP jr z, .checkXCoord - cp $8 ; left + cp SPRITE_FACING_LEFT jr z, .checkYCoord - cp $c ; right + cp SPRITE_FACING_RIGHT jr z, .checkYCoord jr .notInLine .checkXCoord @@ -315,21 +315,21 @@ CheckPlayerIsInFrontOfSprite: ld a, [hl] ; c1x6 (sprite screen X pos) ld [wTrainerScreenX], a ld a, [wTrainerFacingDirection] ; facing direction - cp $0 + cp SPRITE_FACING_DOWN jr nz, .notFacingDown ld a, [wTrainerScreenY] ; sprite screen Y pos cp $3c jr c, .engage ; sprite above player jr .noEngage ; sprite below player .notFacingDown - cp $4 + cp SPRITE_FACING_UP jr nz, .notFacingUp ld a, [wTrainerScreenY] ; sprite screen Y pos cp $3c jr nc, .engage ; sprite below player jr .noEngage ; sprite above player .notFacingUp - cp $8 + cp SPRITE_FACING_LEFT jr nz, .notFacingLeft ld a, [wTrainerScreenX] ; sprite screen X pos cp $40 diff --git a/engine/predefs.asm b/engine/predefs.asm index fd11475b..7b0be1e9 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -27,10 +27,10 @@ GetPredefPointer: add a add e ld e,a - jr nc,.next + jr nc, .nocarry inc d -.next +.nocarry add hl,de ld d,h ld e,l @@ -60,7 +60,7 @@ PredefPointers:: add_predef CopyDownscaledMonTiles add_predef LoadMissableObjects add_predef HealParty - add_predef MoveAnimation; 08 play move animation + add_predef MoveAnimation add_predef DivideBCDPredef add_predef DivideBCDPredef2 add_predef AddBCDPredef @@ -81,8 +81,8 @@ PredefPointers:: add_predef LearnMoveFromLevelUp add_predef LearnMove add_predef GetQuantityOfItemInBag - dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0 - dbw $03,GiveItem + dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; home bank + dbw $03,GiveItem ; home bank add_predef ChangeBGPalColor0_4Frames add_predef FindPathToPlayer add_predef PredefShakeScreenVertically @@ -122,7 +122,7 @@ PredefPointers:: add_predef CanLearnTM add_predef TMToMove add_predef _RunPaletteCommand - add_predef StarterDex ; 46 + add_predef StarterDex add_predef _AddPartyMon add_predef UpdateHPBar2 add_predef DrawEnemyHUDAndHPBar @@ -147,7 +147,7 @@ PredefPointers:: add_predef PickUpItem add_predef PrintMoveType add_predef LoadMovePPs - add_predef DrawHP ; 5F + add_predef DrawHP add_predef DrawHP2 add_predef DisplayElevatorFloorMenu add_predef OaksAideScript diff --git a/engine/save.asm b/engine/save.asm index 58326187..4fb2c4c8 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -638,7 +638,7 @@ SaveHallOfFameTeams: ld a, [wNumHoFTeams] dec a cp HOF_TEAM_CAPACITY - jr nc, .asm_73b28 + jr nc, .shiftHOFTeams ld hl, sHallOfFame ld bc, HOF_TEAM call AddNTimes @@ -648,7 +648,9 @@ SaveHallOfFameTeams: ld bc, HOF_TEAM jr HallOfFame_Copy -.asm_73b28 +.shiftHOFTeams +; if the space designated for HOF teams is full, then shift all HOF teams to the next slot, making space for the new HOF team +; this deletes the last HOF team though ld hl, sHallOfFame + HOF_TEAM ld de, sHallOfFame ld bc, HOF_TEAM * (HOF_TEAM_CAPACITY - 1) diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 733cc29c..fb845c45 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -864,7 +864,7 @@ LoadSlotMachineTiles: call FarCopyData2 ld hl, SlotMachineMap coord de, 0, 0 - ld bc, $00f0 + ld bc, SlotMachineMapEnd - SlotMachineMap call CopyData call EnableLCD ld hl, wSlotMachineWheel1Offset @@ -878,6 +878,7 @@ LoadSlotMachineTiles: SlotMachineMap: INCBIN "gfx/tilemaps/slotmachine.map" +SlotMachineMapEnd: INCLUDE "data/slot_machine_wheels.asm" diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index ecccbf32..e1a6e015 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -169,7 +169,7 @@ ENDC db -1,2 db 0 ; terminate list with 0 -.ScrollTitleScreenPokemonLogo +.ScrollTitleScreenPokemonLogo: ; Scrolls the Pokemon logo on the title screen to create the bouncing effect ; Scrolls d pixels e times call DelayFrame diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index 6f47b080..2346fcc5 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -67,7 +67,7 @@ _TitleScroll: pop bc jr _TitleScroll -.ScrollBetween +.ScrollBetween: .wait ld a, [rLY] ; rLY cp l diff --git a/engine/town_map.asm b/engine/town_map.asm index b2f1e656..dcf50a42 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -141,7 +141,7 @@ LoadTownMap_Fly: call LoadFontTilePatterns ld de, BirdSprite ld hl, vSprites + $40 - lb bc, BANK(BirdSprite), $0c + lb bc, BANK(BirdSprite), $c call CopyVideoData ld de, TownMapUpArrow ld hl, vChars1 + $6d0 @@ -179,7 +179,7 @@ LoadTownMap_Fly: ld c, 15 call DelayFrames coord hl, 18, 0 - ld [hl], $ed + ld [hl], "▶" coord hl, 19, 0 ld [hl], $ee pop hl @@ -355,12 +355,12 @@ DrawPlayerOrBirdSprite: call WritePlayerOrBirdSpriteOAM pop hl ld de, wcd6d -.asm_711dc +.loop ld a, [hli] ld [de], a inc de - cp $50 - jr nz, .asm_711dc + cp "@" + jr nz, .loop ld hl, wOAMBuffer ld de, wTileMapBackup ld bc, $a0 @@ -397,8 +397,8 @@ DisplayWildLocations: jr nz, .drawPlayerSprite ; if no OAM entries were written, print area unknown text coord hl, 1, 7 - ld b, $2 - ld c, $f + ld b, 2 + ld c, 15 call TextBoxBorder coord hl, 2, 9 ld de, AreaUnknownText diff --git a/engine/trade.asm b/engine/trade.asm index 78444cf6..c3913a7e 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -305,7 +305,7 @@ Trade_AnimateBallEnteringLinkCable: ld [rOBP0], a xor a ld [wLinkCableAnimBulgeToggle], a - ld bc, $2060 + lb bc, $20, $60 .moveBallInsideLinkCableLoop push bc xor a @@ -380,7 +380,7 @@ Trade_AnimLeftToRight: call Trade_InitGameboyTransferGfx ld a, $1 ld [wTradedMonMovingRight], a - ld a, $e4 + ld a, %11100100 ld [rOBP0], a ld a, $54 ld [wBaseCoordX], a @@ -466,7 +466,7 @@ Trade_DrawLeftGameboy: ld a, $5d ld [hli], a ld a, $5e - ld c, $8 + ld c, 8 .loop ld [hli], a dec c @@ -526,8 +526,8 @@ Trade_DrawRightGameboy: ; draw text box with enemy name above link cable coord hl, 6, 0 - ld b, $2 - ld c, $7 + ld b, 2 + ld c, 7 call TextBoxBorder coord hl, 7, 2 ld de, wLinkEnemyTrainerName diff --git a/home.asm b/home.asm index d5ecbaed..8d3c7207 100644 --- a/home.asm +++ b/home.asm @@ -4710,8 +4710,8 @@ TextPredefs:: add_tx_pre LinkCableHelp ; 34 add_tx_pre TMNotebook ; 35 add_tx_pre FightingDojoText ; 36 - add_tx_pre FightingDojoText_52a10 ; 37 - add_tx_pre FightingDojoText_52a1d ; 38 + add_tx_pre EnemiesOnEverySideText ; 37 + add_tx_pre WhatGoesAroundComesAroundText ; 38 add_tx_pre NewBicycleText ; 39 add_tx_pre IndigoPlateauStatues ; 3A add_tx_pre VermilionGymTrashSuccessText1 ; 3B diff --git a/text.asm b/text.asm index 6e31fb03..49c246ee 100644 --- a/text.asm +++ b/text.asm @@ -781,12 +781,12 @@ _ViridianSchoolNotebookText4:: line "#MON LEAGUE!" prompt -_FightingDojoText_52a10:: +_EnemiesOnEverySideText:: text "Enemies on every" line "side!" done -_FightingDojoText_52a1d:: +_WhatGoesAroundComesAroundText:: text "What goes around" line "comes around!" done diff --git a/wram.asm b/wram.asm index 644617fd..d5d6a025 100755 --- a/wram.asm +++ b/wram.asm @@ -1778,7 +1778,7 @@ wEnemyNumAttacksLeft:: ; d06f wEnemyConfusedCounter:: ; d070 ds 1 -wEnemyToxcCounter:: ; d071 +wEnemyToxicCounter:: ; d071 ds 1 wEnemyDisabledMove:: ; d072 -- cgit v1.2.3 From 61ee39678695479816feff4b58baaa6953ff219f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jun 2016 00:51:59 -0700 Subject: more syncing with pokeyellow --- engine/hidden_object_functions18.asm | 24 +++--- engine/hidden_object_functions3.asm | 34 ++++---- home/text.asm | 161 ++++++++++++++++------------------- macros.asm | 132 +++++++++++++++++++++------- 4 files changed, 206 insertions(+), 145 deletions(-) diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index 6ce582ed..c6fb3109 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -73,29 +73,29 @@ PrintBenchGuyText: ; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable BenchGuyTextPointers: db VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT - db (ViridianCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre ViridianCityPokecenterBenchGuyText db PEWTER_POKECENTER, SPRITE_FACING_LEFT - db (PewterCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre PewterCityPokecenterBenchGuyText db CERULEAN_POKECENTER, SPRITE_FACING_LEFT - db (CeruleanCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre CeruleanCityPokecenterBenchGuyText db LAVENDER_POKECENTER, SPRITE_FACING_LEFT - db (LavenderCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre LavenderCityPokecenterBenchGuyText db VERMILION_POKECENTER, SPRITE_FACING_LEFT - db (VermilionCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre VermilionCityPokecenterBenchGuyText db CELADON_POKECENTER, SPRITE_FACING_LEFT - db (CeladonCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre CeladonCityPokecenterBenchGuyText db CELADON_HOTEL, SPRITE_FACING_LEFT - db (CeladonCityHotelText_id - TextPredefs) / 2 + 1 + db_tx_pre CeladonCityHotelText db FUCHSIA_POKECENTER, SPRITE_FACING_LEFT - db (FuchsiaCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre FuchsiaCityPokecenterBenchGuyText db CINNABAR_POKECENTER, SPRITE_FACING_LEFT - db (CinnabarIslandPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre CinnabarIslandPokecenterBenchGuyText db SAFFRON_POKECENTER, SPRITE_FACING_LEFT - db (SaffronCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre SaffronCityPokecenterBenchGuyText db MT_MOON_POKECENTER, SPRITE_FACING_LEFT - db (MtMoonPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre MtMoonPokecenterBenchGuyText db ROCK_TUNNEL_POKECENTER,SPRITE_FACING_LEFT - db (RockTunnelPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre RockTunnelPokecenterBenchGuyText db $FF ViridianCityPokecenterBenchGuyText: diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index 84ce6d53..6b349a00 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -39,39 +39,39 @@ PrintBookshelfText: ; format: db tileset id, bookshelf tile id, text id BookshelfTileIDs: db PLATEAU, $30 - db (IndigoPlateauStatues_id - TextPredefs) / 2 + 1 + db_tx_pre IndigoPlateauStatues db HOUSE, $3D - db (TownMapText_id - TextPredefs) / 2 + 1 + db_tx_pre TownMapText db HOUSE, $1E - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db MANSION, $32 - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db REDS_HOUSE_1, $32 - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db LAB, $28 - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db LOBBY, $16 - db (ElevatorText_id - TextPredefs) / 2 + 1 + db_tx_pre ElevatorText db GYM, $1D - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db DOJO, $1D - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db GATE, $22 - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db MART, $54 - db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db_tx_pre PokemonStuffText db MART, $55 - db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db_tx_pre PokemonStuffText db POKECENTER, $54 - db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db_tx_pre PokemonStuffText db POKECENTER, $55 - db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db_tx_pre PokemonStuffText db LOBBY, $50 - db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db_tx_pre PokemonStuffText db LOBBY, $52 - db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db_tx_pre PokemonStuffText db SHIP, $36 - db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db_tx_pre BookOrSculptureText db $FF IndigoPlateauStatues: diff --git a/home/text.asm b/home/text.asm index e9c0efdd..893e6826 100644 --- a/home/text.asm +++ b/home/text.asm @@ -52,28 +52,28 @@ PlaceNextChar:: ld a,[de] cp "@" - jr nz,.PlaceText + jr nz, Char4ETest ld b,h ld c,l pop hl ret -.PlaceText - cp $4E - jr nz,.next - ld bc,SCREEN_WIDTH * 2 +Char4ETest:: + cp $4E ; next + jr nz, .char4FTest + ld bc, 2 * SCREEN_WIDTH ld a,[hFlags_0xFFF6] bit 2,a - jr z,.next2 + jr z,.ok ld bc,SCREEN_WIDTH -.next2 +.ok pop hl add hl,bc push hl jp PlaceNextChar_inc -.next - cp $4F +.char4FTest + cp $4F ; line jr nz,.next3 pop hl coord hl, 1, 16 @@ -81,46 +81,36 @@ PlaceNextChar:: jp PlaceNextChar_inc .next3 ; Check against a dictionary +dict: macro +if \1 == 0 and a - jp z,Char00 - cp $4C - jp z,Char4C - cp $4B - jp z,Char4B - cp $51 - jp z,Char51 - cp $49 - jp z,Char49 - cp $52 - jp z,Char52 - cp $53 - jp z,Char53 - cp $54 - jp z,Char54 - cp $5B - jp z,Char5B - cp $5E - jp z,Char5E - cp $5C - jp z,Char5C - cp $5D - jp z,Char5D - cp $55 - jp z,Char55 - cp $56 - jp z,Char56 - cp $57 - jp z,Char57 - cp $58 - jp z,Char58 - cp $4A - jp z,Char4A - cp $5F - jp z,Char5F - cp $59 - jp z,Char59 - cp $5A - jp z,Char5A +else + cp \1 +endc + jp z, \2 +endm + + dict $00, Char00 ; error + dict $4C, Char4C ; autocont + dict $4B, Char4B ; cont_ + dict $51, Char51 ; para + dict $49, Char49 ; page + dict $52, Char52 ; player + dict $53, Char53 ; rival + dict $54, Char54 ; POKé + dict $5B, Char5B ; PC + dict $5E, Char5E ; ROCKET + dict $5C, Char5C ; TM + dict $5D, Char5D ; TRAINER + dict $55, Char55 ; cont + dict $56, Char56 ; 6 dots + dict $57, Char57 ; done + dict $58, Char58 ; prompt + dict $4A, Char4A ; PKMN + dict $5F, Char5F ; dex + dict $59, Char59 ; TARGET + dict $5A, Char5A ; USER + ld [hli],a call PrintLetterDelay PlaceNextChar_inc:: @@ -211,7 +201,6 @@ MonsterNameCharsCommon:: ; print “Enemy ” ld de,Char5AText call PlaceString - ld h,b ld l,c ld de,wEnemyMonNick ; enemy active monster name @@ -264,36 +253,36 @@ Char5F:: pop hl ret -Char58:: +Char58:: ; prompt ld a,[wLinkState] cp LINK_STATE_BATTLING - jp z,Next1AA2 - ld a,$EE + jp z, .ok + ld a, $EE Coorda 18, 16 -Next1AA2:: +.ok call ProtectedDelay3 call ManualTextScroll ld a, " " Coorda 18, 16 -Char57:: +Char57:: ; done pop hl - ld de,Char58Text + ld de, Char58Text dec de ret Char58Text:: db "@" -Char51:: +Char51:: ; para push de - ld a,$EE + ld a, $EE Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll coord hl, 1, 13 lb bc, 4, 18 call ClearScreenArea - ld c,20 + ld c, 20 call DelayFrames pop de coord hl, 1, 14 @@ -328,13 +317,13 @@ Char4B:: ;fall through Char4C:: push de - call Next1B18 - call Next1B18 + call ScrollTextUpOneLine + call ScrollTextUpOneLine coord hl, 1, 16 pop de jp PlaceNextChar_inc -Next1B18:: +ScrollTextUpOneLine:: coord hl, 0, 14 coord de, 0, 13 ld b,60 @@ -372,7 +361,7 @@ TextCommandProcessor:: push af set 1,a ld e,a - ld a,[$fff4] + ld a, [$fff4] xor e ld [wLetterPrintingDelayFlags],a ld a,c @@ -389,22 +378,22 @@ NextTextCommand:: ret .doTextCommand push hl - cp a,$17 - jp z,TextCommand17 - cp a,$0e + cp a, $17 + jp z, TextCommand17 + cp a, $0e jp nc,TextCommand0B ; if a != 0x17 and a >= 0xE, go to command 0xB ; if a < 0xE, use a jump table ld hl,TextCommandJumpTable push bc add a - ld b,$00 - ld c,a - add hl,bc + ld b, 0 + ld c, a + add hl, bc pop bc - ld a,[hli] - ld h,[hl] - ld l,a - jp [hl] + ld a, [hli] + ld h, [hl] + ld l, a + jp hl ; draw box ; 04AAAABBCC @@ -523,10 +512,10 @@ TextCommand06:: ; 07 ; (no arguments) TextCommand07:: - ld a," " + ld a, " " Coorda 18, 16 ; place blank space in lower right corner of dialogue text box - call Next1B18 ; scroll up text - call Next1B18 + call ScrollTextUpOneLine + call ScrollTextUpOneLine pop hl coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand @@ -537,7 +526,7 @@ TextCommand08:: pop hl ld de,NextTextCommand push de ; return address - jp [hl] + jp hl ; print decimal number (converted from binary number) ; 09AAAABB @@ -626,16 +615,16 @@ TextCommand0B:: ; format: text command ID, sound ID or cry ID TextCommandSounds:: - db $0B,SFX_GET_ITEM_1 - db $12,SFX_CAUGHT_MON - db $0E,SFX_POKEDEX_RATING - db $0F,SFX_GET_ITEM_1 - db $10,SFX_GET_ITEM_2 - db $11,SFX_GET_KEY_ITEM - db $13,SFX_DEX_PAGE_ADDED - db $14,NIDORINA ; used in OakSpeech - db $15,PIDGEOT ; used in SaffronCityText12 - db $16,DEWGONG ; unused? + db $0B, SFX_GET_ITEM_1 + db $12, SFX_CAUGHT_MON + db $0E, SFX_POKEDEX_RATING + db $0F, SFX_GET_ITEM_1 + db $10, SFX_GET_ITEM_2 + db $11, SFX_GET_KEY_ITEM + db $13, SFX_DEX_PAGE_ADDED + db $14, NIDORINA ; used in OakSpeech + db $15, PIDGEOT ; used in SaffronCityText12 + db $16, DEWGONG ; unused? ; draw ellipses ; 0CAA diff --git a/macros.asm b/macros.asm index 8475582c..661fde0c 100644 --- a/macros.asm +++ b/macros.asm @@ -81,29 +81,62 @@ bcd3: MACRO coins equs "bcd2" money equs "bcd3" +validateCoords: MACRO + if \1 >= SCREEN_WIDTH + fail "x coord out of range" + endc + if \2 >= SCREEN_HEIGHT + fail "y coord out of range" + endc + endm + ;\1 = r ;\2 = X ;\3 = Y +;\4 = which tilemap (optional) coord: MACRO - ld \1, wTileMap + 20 * \3 + \2 + validateCoords \2, \3 +if _NARG >= 4 + ld \1, \4 + SCREEN_WIDTH * \3 + \2 +else + ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 +endc ENDM ;\1 = X ;\2 = Y +;\3 = which tilemap (optional) aCoord: MACRO - ld a, [wTileMap + 20 * \2 + \1] + validateCoords \1, \2 +if _NARG >= 3 + ld a, [\3 + SCREEN_WIDTH * \2 + \1] +else + ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] +endc ENDM ;\1 = X ;\2 = Y +;\3 = which tilemap (optional) Coorda: MACRO - ld [wTileMap + 20 * \2 + \1], a + validateCoords \1, \2 +if _NARG >= 3 + ld [\3 + SCREEN_WIDTH * \2 + \1], a +else + ld [wTileMap + SCREEN_WIDTH * \2 + \1], a +endc ENDM ;\1 = X ;\2 = Y +;\3 = which tilemap (optional) dwCoord: MACRO - dw wTileMap + 20 * \2 + \1 + validateCoords \1, \2 +if _NARG >= 3 + dw \3 + SCREEN_WIDTH * \2 + \1 +else + dw wTileMap + SCREEN_WIDTH * \2 + \1 +endc ENDM ;\1 = r @@ -134,7 +167,7 @@ EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer ; nybble: y-coordinate ; nybble: x-coordinate ; word : pointer to map name - db (\1 + (\2 << 4)) + dn \2, \1 dw \3 ENDM @@ -146,7 +179,7 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer ; nybble: x-coordinate ; word : pointer to map name db \1 + 1 - db \2 + \3 << 4 + dn \3, \2 dw \4 ENDM @@ -174,28 +207,30 @@ dbw: MACRO dw \2 ENDM -; data format macros -RGB: MACRO - dw (\3 << 10 | \2 << 5 | \1) +dba: MACRO + dbw BANK(\1), \1 ENDM -; text macros -TX_NUM: MACRO -; print a big-endian decimal number. -; \1: address to read from -; \2: number of bytes to read -; \3: number of digits to display - db $09 +dwb: MACRO dw \1 - db \2 << 4 | \3 + db \2 ENDM -TX_FAR: MACRO - db $17 - dw \1 - db BANK(\1) +dab: MACRO + dwb \1, BANK(\1) ENDM +dbbw: MACRO + db \1, \2 + dw \3 + ENDM + +; data format macros +RGB: MACRO + dw (\3 << 10 | \2 << 5 | \1) + ENDM + +; text macros ; text engine command $1 TX_RAM: MACRO ; prints text to screen @@ -212,32 +247,62 @@ TX_BCD: MACRO db \2 ENDM -TX_MART: MACRO - db $FE, _NARG - rept _NARG - db \1 - shift - endr - db $FF +TX_CURSOR: MACRO +; Move cursor to (\1, \2) +; \1: X coord (0 - 19) +; \2: Y coord (0 - 17) + db $3 + dwCoord \1, \2 ENDM TX_LINE EQUS "db $05" TX_BUTTON_SOUND EQUS "db $06" TX_ASM EQUS "db $08" + +TX_NUM: MACRO +; print a big-endian decimal number. +; \1: address to read from +; \2: number of bytes to read +; \3: number of digits to display + db $09 + dw \1 + db \2 << 4 | \3 + ENDM + TX_SFX_ITEM EQUS "db $0b" TX_WAIT_BUTTON EQUS "db $0d" TX_SFX_CONGRATS EQUS "db $10" TX_SFX_KEY_ITEM EQUS "db $11" +TX_FAR: MACRO +; 17AAAABB (call text at BB:AAAA) + db $17 + dab \1 + ENDM + TX_VENDING_MACHINE EQUS "db $f5" TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" TX_PRIZE_VENDOR EQUS "db $f7" TX_POKECENTER_PC EQUS "db $f9" TX_PLAYERS_PC EQUS "db $fc" TX_BILLS_PC EQUS "db $fd" + +TX_MART: MACRO + db $FE, _NARG + rept _NARG + db \1 + shift + endr + db $FF + ENDM + TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. +predef_const: MACRO + const \1PredefID + ENDM + add_predef: MACRO \1Predef:: db BANK(\1) @@ -258,11 +323,18 @@ predef_jump: MACRO jp Predef ENDM +tx_pre_const: MACRO + const \1_id + ENDM add_tx_pre: MACRO \1_id:: dw \1 ENDM +db_tx_pre: MACRO + db (\1_id - TextPredefs) / 2 + 1 +ENDM + tx_pre_id: MACRO ld a, (\1_id - TextPredefs) / 2 + 1 ENDM @@ -674,9 +746,9 @@ ENDM tmlearn: MACRO x = 0 rept _NARG -if \1 != 0 +IF \1 != 0 x = x | (1 << ((\1 - 1) % 8)) -endc +ENDC shift endr db x -- cgit v1.2.3 From bcb251261dae3cd9ba423fc139c7db4433a1a802 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jun 2016 01:06:27 -0700 Subject: sync tileset WRAM labels --- engine/cable_club.asm | 10 +++++----- engine/items/items.asm | 2 +- engine/overworld/movement.asm | 4 ++-- home/overworld.asm | 18 +++++++++--------- main.asm | 4 ++-- wram.asm | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 9d72d220..c3a5e235 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -900,16 +900,16 @@ CableClub_Run: call CableClub_DoBattleOrTrade ld hl, Club_GFX ld a, h - ld [wTileSetGFXPtr + 1], a + ld [wTilesetGfxPtr + 1], a ld a, l - ld [wTileSetGFXPtr], a + ld [wTilesetGfxPtr], a ld a, Bank(Club_GFX) - ld [wTileSetBank], a + ld [wTilesetBank], a ld hl, Club_Coll ld a, h - ld [wTileSetCollisionPtr + 1], a + ld [wTilesetCollisionPtr + 1], a ld a, l - ld [wTileSetCollisionPtr], a + ld [wTilesetCollisionPtr], a xor a ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB diff --git a/engine/items/items.asm b/engine/items/items.asm index a6717494..24489690 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -695,7 +695,7 @@ ItemUseSurfboard: ld hl,TilePairCollisionsWater call CheckForTilePairCollisions jr c,.cannotStopSurfing - ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles + ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a ; hl now points to passable tiles diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 9302b6e3..6d05859e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -589,9 +589,9 @@ CanWalkOntoTile: and a ret .notScripted - ld a, [wTileSetCollisionPtr] + ld a, [wTilesetCollisionPtr] ld l, a - ld a, [wTileSetCollisionPtr+1] + ld a, [wTilesetCollisionPtr+1] ld h, a .tilePassableLoop ld a, [hli] diff --git a/home/overworld.asm b/home/overworld.asm index fad9f29d..8ec457c1 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -854,13 +854,13 @@ INCLUDE "data/bike_riding_tilesets.asm" ; load the tile pattern data of the current tileset into VRAM LoadTilesetTilePatternData:: - ld a,[wTileSetGFXPtr] + ld a,[wTilesetGfxPtr] ld l,a - ld a,[wTileSetGFXPtr + 1] + ld a,[wTilesetGfxPtr + 1] ld h,a ld de,vTileset ld bc,$600 - ld a,[wTileSetBank] + ld a,[wTilesetBank] jp FarCopyData2 ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8 @@ -1100,7 +1100,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC .extendRangeOverCounter predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player in c - ld hl,wTileSetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) + ld hl,wTilesetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) ld b,3 ld d,$20 ; talking range in pixels (long range) .counterTilesLoop @@ -1242,7 +1242,7 @@ CheckTilePassable:: predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player ld a,[wTileInFrontOfPlayer] ; tile in front of player ld c,a - ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles + ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a ; hl now points to passable tiles @@ -1354,7 +1354,7 @@ TilePairCollisionsWater:: LoadCurrentMapView:: ld a,[H_LOADEDROMBANK] push af - ld a,[wTileSetBank] ; tile data ROM bank + ld a,[wTilesetBank] ; tile data ROM bank ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a ; switch to ROM bank that contains tile data ld a,[wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view @@ -1784,9 +1784,9 @@ ScheduleWestColumnRedraw:: ; Input: c = tile block ID, hl = destination address DrawTileBlock:: push hl - ld a,[wTileSetBlocksPtr] ; pointer to tiles + ld a,[wTilesetBlocksPtr] ; pointer to tiles ld l,a - ld a,[wTileSetBlocksPtr + 1] + ld a,[wTilesetBlocksPtr + 1] ld h,a ld a,c swap a @@ -1915,7 +1915,7 @@ CollisionCheckOnWater:: jr z,.noCollision ; keep surfing ; check if the [land] tile in front of the player is passable .checkIfNextTileIsPassable - ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles + ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles ld a,[hli] ld h,[hl] ld l,a diff --git a/main.asm b/main.asm index 6c51de59..53d2dfdb 100755 --- a/main.asm +++ b/main.asm @@ -2435,7 +2435,7 @@ GetTileTwoStepsInFrontOfPlayer: CheckForCollisionWhenPushingBoulder: call GetTileTwoStepsInFrontOfPlayer - ld hl, wTileSetCollisionPtr + ld hl, wTilesetCollisionPtr ld a, [hli] ld h, [hl] ld l, a @@ -2665,7 +2665,7 @@ LoadTilesetHeader: ld e, a ld hl, Tilesets add hl, de - ld de, wTileSetBank + ld de, wTilesetBank ld c, $b .copyTilesetHeaderLoop ld a, [hli] diff --git a/wram.asm b/wram.asm index d5d6a025..0321545c 100755 --- a/wram.asm +++ b/wram.asm @@ -2637,21 +2637,21 @@ wPlayerDirection:: ; d52a ; if the player is not moving, the last the direction in which the player moved ds 1 -wTileSetBank:: ; d52b +wTilesetBank:: ; d52b ds 1 -wTileSetBlocksPtr:: ; d52c +wTilesetBlocksPtr:: ; d52c ; maps blocks (4x4 tiles) to tiles ds 2 -wTileSetGFXPtr:: ; d52e +wTilesetGfxPtr:: ; d52e ds 2 -wTileSetCollisionPtr:: ; d530 +wTilesetCollisionPtr:: ; d530 ; list of all walkable tiles ds 2 -wTileSetTalkingOverTiles:: ; d532 +wTilesetTalkingOverTiles:: ; d532 ds 3 wGrassTile:: ; d535 -- cgit v1.2.3 From 3a6a300da48c98ab844ddc4d209abf51adf2aa44 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jun 2016 10:11:31 -0700 Subject: sync text --- charmap.asm | 8 + constants.asm | 1 + constants/misc_constants.asm | 24 ++- constants/text_constants.asm | 14 ++ engine/gamefreak.asm | 1 - engine/hall_of_fame.asm | 4 +- text.asm | 305 ++++++++++++++++++------------------ text/maps/bike_shop.asm | 2 +- text/maps/celadon_dept_store_3f.asm | 2 +- text/maps/fan_club.asm | 6 +- text/maps/hall_of_fame.asm | 6 +- text/maps/lance.asm | 2 +- text/maps/museum_1f.asm | 2 +- text/maps/oaks_lab.asm | 64 ++++---- text/maps/reds_house_1f.asm | 2 +- text/maps/route_22.asm | 6 +- text/maps/silph_co_11f.asm | 2 +- text/maps/vermilion_city.asm | 6 +- text/oakspeech.asm | 1 - 19 files changed, 238 insertions(+), 220 deletions(-) create mode 100644 constants/text_constants.asm diff --git a/charmap.asm b/charmap.asm index 980c79a3..8f57a130 100644 --- a/charmap.asm +++ b/charmap.asm @@ -147,9 +147,16 @@ charmap "ゅ", $E1 charmap "ょ", $E2 charmap "ー", $E3 +charmap "", $4A ; PkMn charmap "@", $50 +charmap "", $52 +charmap "", $53 charmap "#", $54 ;charmap "POKé", $54 +charmap "", $59 +charmap "", $5A +charmap "′", $71 +charmap "″", $73 charmap "…", $75 charmap "┌", $79 @@ -233,6 +240,7 @@ charmap "'m", $E5 charmap "?", $E6 charmap "!", $E7 charmap ".", $E8 +charmap "▷", $EC charmap "▶", $ED charmap "♂", $EF charmap "¥", $F0 diff --git a/constants.asm b/constants.asm index 8bca86eb..d4e453ec 100644 --- a/constants.asm +++ b/constants.asm @@ -30,3 +30,4 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" +INCLUDE "constants/text_constants.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index de777c5d..cc10de70 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -29,6 +29,16 @@ D_LEFT EQU %00100000 D_UP EQU %01000000 D_DOWN EQU %10000000 +const_value set 0 + const BIT_A_BUTTON + const BIT_B_BUTTON + const BIT_SELECT + const BIT_START + const BIT_D_RIGHT + const BIT_D_LEFT + const BIT_D_UP + const BIT_D_DOWN + SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 @@ -152,20 +162,6 @@ FLAG_RESET EQU 0 FLAG_SET EQU 1 FLAG_TEST EQU 2 -; special text IDs -TEXT_MON_FAINTED EQU $d0 -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) - ; HP bar HP_BAR_GREEN EQU 0 HP_BAR_YELLOW EQU 1 diff --git a/constants/text_constants.asm b/constants/text_constants.asm new file mode 100644 index 00000000..3cddce26 --- /dev/null +++ b/constants/text_constants.asm @@ -0,0 +1,14 @@ +; special text IDs +TEXT_MON_FAINTED EQU $d0 +TEXT_BLACKED_OUT EQU $d1 +TEXT_REPEL_WORE_OFF EQU $d2 +TEXT_SAFARI_GAME_OVER EQU $d3 + +; PrintNumber +BIT_MONEY_SIGN EQU 5 +BIT_LEFT_ALIGN EQU 6 +BIT_LEADING_ZEROES EQU 7 + +MONEY_SIGN EQU (1 << BIT_MONEY_SIGN) +LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) +LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 69c059ff..5226072b 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -199,7 +199,6 @@ MoveDownSmallStars: add hl, de dec c jr nz, .innerLoop - ; Toggle the palette so that the lower star in the small stars tile blinks in ; and out. ld a, [rOBP1] diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index dc1026a8..9eb4edc5 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -58,8 +58,8 @@ AnimateHallOfFame: ld c, 80 call DelayFrames coord hl, 2, 13 - ld b, $3 - ld c, $e + ld b, 3 + ld c, 14 call TextBoxBorder coord hl, 4, 15 ld de, HallOfFameText diff --git a/text.asm b/text.asm index 49c246ee..866d4a7f 100644 --- a/text.asm +++ b/text.asm @@ -1,4 +1,5 @@ - +INCLUDE "charmap.asm" +INCLUDE "constants/text_constants.asm" TEXT_1 EQU $20 TEXT_2 EQU TEXT_1 + 1 TEXT_3 EQU TEXT_2 + 1 @@ -15,7 +16,6 @@ POKEDEX_TEXT EQU TEXT_11 + 1 MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" -INCLUDE "charmap.asm" INCLUDE "hram.asm" @@ -25,7 +25,7 @@ _CardKeySuccessText1:: text "Bingo!@@" _CardKeySuccessText2:: - db $0 + text "" line "The CARD KEY" cont "opened the door!" done @@ -79,7 +79,7 @@ _PokeCenterSignText:: done _FoundItemText:: - text $52, " found" + text " found" line "@" TX_RAM wcf4b text "!@@" @@ -96,7 +96,7 @@ _OaksAideHiText:: para "If you caught @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds of #MON," cont "I'm supposed to" cont "give you an" @@ -104,7 +104,7 @@ _OaksAideHiText:: TX_RAM wOaksAideRewardItemName text "!" - para "So, ", $52, "! Have" + para "So, ! Have" line "you caught at" cont "least @" TX_NUM hOaksAideRequirement, 1, 3 @@ -117,7 +117,7 @@ _OaksAideUhOhText:: line "Uh-oh! You have" cont "caught only @" TX_NUM hOaksAideNumMonsOwned, 1, 3 - db $0 + text "" cont "kinds of #MON!" para "You need @" @@ -134,7 +134,7 @@ _OaksAideComeBackText:: para "When you get @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds, come back" cont "for @" TX_RAM wOaksAideRewardItemName @@ -153,7 +153,7 @@ _OaksAideHereYouGoText:: prompt _OaksAideGotItemText:: - text $52, " got the" + text " got the" line "@" TX_RAM wOaksAideRewardItemName text "!@@" @@ -239,10 +239,10 @@ _AIBattleWithdrawText:: _AIBattleUseItemText:: TX_RAM wTrainerName - db $0 + text "" line "used @" TX_RAM wcd6d - db $0 + text "" cont "on @" TX_RAM wEnemyMonNick text "!" @@ -257,7 +257,7 @@ _TradeWentToText:: done _TradeForText:: - text "For ", $52, "'s" + text "For 's" line "@" TX_RAM wcf4b text "," @@ -295,11 +295,11 @@ _TradeWillTradeText:: text " will" line "trade @" TX_RAM wcd6d - db $0 + text "" done _TradeforText:: - text "for ", $52, "'s" + text "for 's" line "@" TX_RAM wcf4b text "." @@ -351,7 +351,7 @@ _YeahText:: _DexSeenOwnedText:: text "#DEX Seen:@" TX_NUM wDexRatingNumMonsSeen, 1, 3 - db $0 + text "" line " Owned:@" TX_NUM wDexRatingNumMonsOwned, 1, 3 db "@" @@ -362,27 +362,27 @@ _DexRatingText:: _GymStatueText1:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 + line "" done _GymStatueText2:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 - cont $52 + line "" + cont "" done _ViridianCityPokecenterGuyText:: @@ -627,7 +627,7 @@ _BillsHouseMonitorText:: done _BillsHouseInitiatedText:: - text $52, " initiated" + text " initiated" line "TELEPORTER's Cell" cont "Separator!@@" @@ -801,7 +801,7 @@ _IndigoPlateauHQText:: done _RedBedroomSNESText:: - text $52, " is" + text " is" line "playing the SNES!" cont "...Okay!" cont "It's time to go!" @@ -972,31 +972,31 @@ _VermilionGymTrashFailText:: cont "locks were reset!@@" _FoundHiddenItemText:: - text $52, " found" + text " found" line "@" TX_RAM wcd6d text "!@@" _HiddenItemBagFullText:: - text "But, ", $52, " has" + text "But, has" line "no more room for" cont "other items!" done _FoundHiddenCoinsText:: - text $52, " found" + text " found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _FoundHiddenCoins2Text:: - text $52, " found" + text " found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _DroppedHiddenCoinsText:: - db $0 + text "" para "Oops! Dropped" line "some coins!" done @@ -1050,48 +1050,48 @@ _OutOfSafariBallsText:: _WildRanText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _EnemyRanText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _HurtByPoisonText:: - text $5a, "'s" + text "'s" line "hurt by poison!" prompt _HurtByBurnText:: - text $5a, "'s" + text "'s" line "hurt by the burn!" prompt _HurtByLeechSeedText:: text "LEECH SEED saps" - line $5a, "!" + line "!" prompt _EnemyMonFaintedText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "fainted!" prompt _MoneyForWinningText:: - text $52, " got ¥@" - TX_BCD wAmountMoneyWon, $c3 - db $0 + text " got ¥@" + TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text "" line "for winning!" prompt _TrainerDefeatedText:: - text $52, " defeated" + text " defeated" line "@" TX_RAM wTrainerName text "!" @@ -1099,7 +1099,7 @@ _TrainerDefeatedText:: _PlayerMonFaintedText:: TX_RAM wBattleMonNick - db $0 + text "" line "fainted!" prompt @@ -1108,20 +1108,20 @@ _UseNextMonText:: done _Sony1WinText:: - text $53, ": Yeah! Am" + text ": Yeah! Am" line "I great or what?" prompt _PlayerBlackedOutText2:: - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " blacked" + para " blacked" line "out!" prompt _LinkBattleLostText:: - text $52, " lost to" + text " lost to" line "@" TX_RAM wTrainerName text "!" @@ -1135,7 +1135,7 @@ _TrainerAboutToUseText:: TX_RAM wEnemyMonNick text "!" - para "Will ", $52 + para "Will " line "change #MON?" done @@ -1212,42 +1212,42 @@ _GetOutText:: prompt _FastAsleepText:: - text $5A + text "" line "is fast asleep!" prompt _WokeUpText:: - text $5A + text "" line "woke up!" prompt _IsFrozenText:: - text $5A + text "" line "is frozen solid!" prompt _FullyParalyzedText:: - text $5A,"'s" + text "'s" line "fully paralyzed!" prompt _FlinchedText:: - text $5A + text "" line "flinched!" prompt _MustRechargeText:: - text $5A + text "" line "must recharge!" prompt _DisabledNoMoreText:: - text $5A,"'s" + text "'s" line "disabled no more!" prompt _IsConfusedText:: - text $5A + text "" line "is confused!" prompt @@ -1257,37 +1257,37 @@ _HurtItselfText:: prompt _ConfusedNoMoreText:: - text $5A,"'s" + text "'s" line "confused no more!" prompt _SavingEnergyText:: - text $5A + text "" line "is saving energy!" prompt _UnleashedEnergyText:: - text $5A + text "" line "unleashed energy!" prompt _ThrashingAboutText:: - text $5A,"'s" + text "'s" line "thrashing about!" done _AttackContinuesText:: - text $5A,"'s" + text "'s" line "attack continues!" done _CantMoveText:: - text $5A + text "" line "can't move!" prompt _MoveIsDisabledText:: - text $5a, "'s" + text "'s" line "@" TX_RAM wcd6d text " is" @@ -1295,14 +1295,14 @@ _MoveIsDisabledText:: prompt _MonName1Text:: - text $5a, "@@" + text "@@" _Used1Text:: - db $0 + text "" line "used @@" _Used2Text:: - db $0 + text "" line "used @@" _InsteadText:: @@ -1334,24 +1334,24 @@ _ExclamationPoint5Text:: done _AttackMissedText:: - text $5a, "'s" + text "'s" line "attack missed!" prompt _KeptGoingAndCrashedText:: - text $5a + text "" line "kept going and" cont "crashed!" prompt _UnaffectedText:: - text $59, "'s" + text "'s" line "unaffected!" prompt _DoesntAffectMonText:: text "It doesn't affect" - line $59, "!" + line "!" prompt _CriticalHitText:: @@ -1388,23 +1388,23 @@ _TurnedAwayText:: _IgnoredOrdersText:: TX_RAM wBattleMonNick - db $0 + text "" line "ignored orders!" prompt _SubstituteTookDamageText:: text "The SUBSTITUTE" line "took damage for" - cont $59, "!" + cont "!" prompt _SubstituteBrokeText:: - text $59, "'s" + text "'s" line "SUBSTITUTE broke!" prompt _BuildingRageText:: - text $5a, "'s" + text "'s" line "RAGE is building!" prompt @@ -1431,6 +1431,7 @@ _WithExpAllText:: _BoostedText:: text "a boosted" cont "@@" + _ExpPointsText:: TX_NUM wExpAmountGained, 2, 4 text " EXP. Points!" @@ -1446,7 +1447,7 @@ _GrewLevelText:: _WildMonAppearedText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1454,13 +1455,13 @@ _HookedMonAttackedText:: text "The hooked" line "@" TX_RAM wEnemyMonNick - db $0 + text "" cont "attacked!" prompt _EnemyAppearedText:: TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1513,7 +1514,7 @@ _GoodText:: text "good!@@" _ComeBackText:: - db $0 + text "" line "Come back!" done @@ -1543,9 +1544,9 @@ _SafariZoneAngryText:: ; money related _PickUpPayDayMoneyText:: - text $52, " picked up" + text " picked up" line "¥@" - TX_BCD wTotalPayDayMoney, $c3 + TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text "!" prompt @@ -1585,7 +1586,7 @@ _PartyMenuSwapMonText:: _PotionText:: TX_RAM wcd6d - db $0 + text "" line "recovered by @" TX_NUM wHPBarHPDifference, 2, 3 text "!" @@ -1617,7 +1618,7 @@ _IceHealText:: _AwakeningText:: TX_RAM wcd6d - db $0 + text "" line "woke up!" done @@ -1629,7 +1630,7 @@ _FullHealText:: _ReviveText:: TX_RAM wcd6d - db $0 + text "" line "is revitalized!" done @@ -1637,11 +1638,11 @@ _RareCandyText:: TX_RAM wcd6d text " grew" line "to level @" - TX_NUM wCurEnemyLVL, $1,$3 + TX_NUM wCurEnemyLVL, 1, 3 text "!@@" _TurnedOnPC1Text:: - text $52, " turned on" + text " turned on" line "the PC." prompt @@ -1669,7 +1670,7 @@ _AccessedMyPCText:: prompt _TurnedOnPC2Text:: - text $52, " turned on" + text " turned on" line "the PC." prompt @@ -1902,13 +1903,13 @@ _DoYouWantToNicknameText:: _YourNameIsText:: text "Right! So your" - line "name is ", $52, "!" + line "name is !" prompt _HisNameIsText:: text "That's right! I" line "remember now! His" - cont "name is ", $53, "!" + cont "name is !" prompt _WillBeTradedText:: @@ -2011,7 +2012,7 @@ _WouldYouLikeToSaveText:: done _GameSavedText:: - text $52, " saved" + text " saved" line "the game!" done @@ -2031,7 +2032,7 @@ _WhenYouChangeBoxText:: _ChooseABoxText:: text "Choose a" - line $4a, " BOX.@@" + line " BOX.@@" _EvolvedText:: TX_RAM wcf4b @@ -2039,7 +2040,7 @@ _EvolvedText:: done _IntoText:: - db $0 + text "" line "into @" TX_RAM wcd6d text "!" @@ -2048,54 +2049,54 @@ _IntoText:: _StoppedEvolvingText:: text "Huh? @" TX_RAM wcf4b - db $0 + text "" line "stopped evolving!" prompt _IsEvolvingText:: text "What? @" TX_RAM wcf4b - db $0 + text "" line "is evolving!" done _FellAsleepText:: - text $59 + text "" line "fell asleep!" prompt _AlreadyAsleepText:: - text $59, "'s" + text "'s" line "already asleep!" prompt _PoisonedText:: - text $59 + text "" line "was poisoned!" prompt _BadlyPoisonedText:: - text $59, "'s" + text "'s" line "badly poisoned!" prompt _BurnedText:: - text $59 + text "" line "was burned!" prompt _FrozenText:: - text $59 + text "" line "was frozen solid!" prompt _FireDefrostedText:: text "Fire defrosted" - line $59, "!" + line "!" prompt _MonsStatsRoseText:: - text $5a, "'s" + text "'s" line "@" TX_RAM wcf4b text "@@" @@ -2108,7 +2109,7 @@ _RoseText:: prompt _MonsStatsFellText:: - text $59, "'s" + text "'s" line "@" TX_RAM wcf4b text "@@" @@ -2121,60 +2122,60 @@ _FellText:: prompt _RanFromBattleText:: - text $5a + text "" line "ran from battle!" prompt _RanAwayScaredText:: - text $59 + text "" line "ran away scared!" prompt _WasBlownAwayText:: - text $59 + text "" line "was blown away!" prompt _ChargeMoveEffectText:: - text $5a, "@@" + text "@@" _MadeWhirlwindText:: - db $0 + text "" line "made a whirlwind!" prompt _TookInSunlightText:: - db $0 + text "" line "took in sunlight!" prompt _LoweredItsHeadText:: - db $0 + text "" line "lowered its head!" prompt _SkyAttackGlowingText:: - db $0 + text "" line "is glowing!" prompt _FlewUpHighText:: - db $0 + text "" line "flew up high!" prompt _DugAHoleText:: - db $0 + text "" line "dug a hole!" prompt _BecameConfusedText:: - text $59 + text "" line "became confused!" prompt _MimicLearnedMoveText:: - text $5a + text "" line "learned" cont "@" TX_RAM wcd6d @@ -2182,7 +2183,7 @@ _MimicLearnedMoveText:: prompt _MoveWasDisabledText:: - text $59, "'s" + text "'s" line "@" TX_RAM wcd6d text " was" @@ -2203,16 +2204,16 @@ _ButItFailedText:: _DidntAffectText:: text "It didn't affect" - line $59, "!" + line "!" prompt _IsUnaffectedText:: - text $59 + text "" line "is unaffected!" prompt _ParalyzedMayNotAttackText:: - text $59, "'s" + text "'s" line "paralyzed! It may" cont "not attack!" prompt @@ -2223,7 +2224,7 @@ _SubstituteText:: prompt _HasSubstituteText:: - text $5a + text "" line "has a SUBSTITUTE!" prompt @@ -2243,23 +2244,23 @@ _GettingPumpedText:: prompt _WasSeededText:: - text $59 + text "" line "was seeded!" prompt _EvadedAttackText:: - text $59 + text "" line "evaded attack!" prompt _HitWithRecoilText:: - text $5a, "'s" + text "'s" line "hit with recoil!" prompt _ConvertedTypeText:: text "Converted type to" - line $59, "'s!" + line "'s!" prompt _StatusChangesEliminatedText:: @@ -2268,23 +2269,23 @@ _StatusChangesEliminatedText:: prompt _StartedSleepingEffect:: - text $5a + text "" line "started sleeping!" done _FellAsleepBecameHealthyText:: - text $5a + text "" line "fell asleep and" cont "became healthy!" done _RegainedHealthText:: - text $5a + text "" line "regained health!" prompt _TransformedText:: - text $5a + text "" line "transformed into" cont "@" TX_RAM wcd6d @@ -2292,28 +2293,28 @@ _TransformedText:: prompt _LightScreenProtectedText:: - text $5a, "'s" + text "'s" line "protected against" cont "special attacks!" prompt _ReflectGainedArmorText:: - text $5a + text "" line "gained armor!" prompt _ShroudedInMistText:: - text $5a, "'s" + text "'s" line "shrouded in mist!" prompt _SuckedHealthText:: text "Sucked health from" - line $59, "!" + line "!" prompt _DreamWasEatenText:: - text $59, "'s" + text "'s" line "dream was eaten!" prompt @@ -2433,15 +2434,15 @@ _PokemartGreetingText:: _PokemonFaintedText:: TX_RAM wcd6d - db $0 + text "" line "fainted!" done _PlayerBlackedOutText:: - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " blacked" + para " blacked" line "out!" prompt @@ -2459,7 +2460,7 @@ _PokemartTellBuyPriceText:: text "?" line "That will be" cont "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text ". OK?" done @@ -2486,7 +2487,7 @@ _PokemonSellingGreetingText:: _PokemartTellSellPriceText:: text "I can pay you" line "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text " for that." done @@ -2530,7 +2531,7 @@ _AbandonLearningText:: _DidNotLearnText:: TX_RAM wLearnMoveMonName - db $0 + text "" line "did not learn" cont "@" TX_RAM wcf4b @@ -2547,7 +2548,7 @@ _TryingToLearnText:: para "But, @" TX_RAM wLearnMoveMonName - db $0 + text "" line "can't learn more" cont "than 4 moves!" @@ -2565,7 +2566,7 @@ _PoofText:: text " Poof!@@" _ForgotAndText:: - db $0 + text "" para "@" TX_RAM wLearnMoveMonName text " forgot" @@ -2721,7 +2722,7 @@ _CannotGetOffHereText:: prompt _GotMonText:: - text $52, " got" + text " got" line "@" TX_RAM wcd6d text "!@@" @@ -2818,7 +2819,7 @@ _ItemUseBallText06:: text "!@@" _SurfingGotOnText:: - text $52, " got on" + text " got on" line "@" TX_RAM wcd6d text "!" @@ -2843,12 +2844,12 @@ _VitaminNoEffectText:: prompt _ThrewBaitText:: - text $52, " threw" + text " threw" line "some BAIT." done _ThrewRockText:: - text $52, " threw a" + text " threw a" line "ROCK." done @@ -2866,13 +2867,13 @@ _FluteWokeUpText:: prompt _PlayedFluteHadEffectText:: - text $52, " played the" + text " played the" line "# FLUTE.@@" _CoinCaseNumCoinsText:: text "Coins" line "@" - TX_BCD wPlayerCoins, $c2 + TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " " prompt @@ -2929,7 +2930,7 @@ _TeachMachineMoveText:: para "Teach @" TX_RAM wcf4b - db $0 + text "" line "to a #MON?" done @@ -2948,7 +2949,7 @@ _MonCannotLearnMachineMoveText:: prompt _ItemUseNotTimeText:: - text "OAK: ", $52, "!" + text "OAK: !" line "This isn't the" cont "time to use that! " prompt @@ -2994,7 +2995,7 @@ _BoxFullCannotThrowBallText:: SECTION "Text 11", ROMX, BANK[TEXT_11] _ItemUseText001:: - text $52," used@@" + text " used@@" _ItemUseText002:: TX_RAM wcf4b @@ -3002,7 +3003,7 @@ _ItemUseText002:: done _GotOnBicycleText1:: - text $52, " got on the@@" + text " got on the@@" _GotOnBicycleText2:: TX_RAM wcf4b @@ -3010,7 +3011,7 @@ _GotOnBicycleText2:: prompt _GotOffBicycleText1:: - text $52, " got off@@" + text " got off@@" _GotOffBicycleText2:: text "the @" @@ -3051,7 +3052,7 @@ _ConnectCableText:: prompt _TradedForText:: - text $52, " traded" + text " traded" line "@" TX_RAM wInGameTradeGiveMonName text " for" @@ -3103,7 +3104,7 @@ _WannaTrade2Text:: para "your @" TX_RAM wInGameTradeGiveMonName - db $0 + text "" line "for @" TX_RAM wInGameTradeReceiveMonName text "?" diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 33f53ee9..86799865 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -25,7 +25,7 @@ _BikeShopText_1d81f:: prompt _BikeShopText_1d824:: - text $52, " exchanged" + text " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@@" diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 1aad756f..8211750d 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -8,7 +8,7 @@ _TM18PreReceiveText:: prompt _ReceivedTM18Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 7477405c..4827f2e8 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -83,13 +83,13 @@ FanClubChairStoryText:: prompt ReceivedBikeVoucherText:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" ExplainBikeVoucherText:: - db $0 + text "" para "Exchange that for" line "a BICYCLE!" @@ -111,7 +111,7 @@ FanClubNoStoryText:: done FanClubChairFinalText:: - text "Hello, ", $52, "!" + text "Hello, !" para "Did you come see" line "me about my" diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index 6c5dd40e..c799268b 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,7 +1,7 @@ _HallofFameRoomText1:: text "OAK: Er-hem!" line "Congratulations" - cont $52, "!" + cont "!" para "This floor is the" line "#MON HALL OF" @@ -16,13 +16,13 @@ _HallofFameRoomText1:: line "also recorded in" cont "the HALL OF FAME!" - para $52, "! You have" + para "! You have" line "endeavored hard" cont "to become the new" cont "LEAGUE champion!" para "Congratulations," - line $52, ", you and" + line ", you and" cont "your #MON are" cont "HALL OF FAMERs!" done diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 3c75ce47..0313b158 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you ", $52, "!" + line "you !" para "I lead the ELITE" line "FOUR! You can" diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 46b4484c..16431bda 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -81,7 +81,7 @@ _Museum1FText_5c28e:: prompt _ReceivedOldAmberText:: - text $52, " received" + text " received" line "OLD AMBER!@@" _Museum1FText_5c299:: diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 52af450d..1f02c355 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,11 +1,11 @@ _OaksLabGaryText1:: - text $53,": Yo" - line $52,"! Gramps" + text ": Yo" + line "! Gramps" cont "isn't around!" done _OaksLabText40:: - text $53,": Heh, I" + text ": Heh, I" line "don't need to be" cont "greedy like you!" @@ -14,7 +14,7 @@ _OaksLabText40:: done _OaksLabText41:: - text $53,": My" + text ": My" line "#MON looks a" cont "lot stronger." done @@ -60,7 +60,7 @@ _OaksLabLastMonText:: done _OaksLabText_1d2f0:: - text "OAK: Now, ", $52, "," + text "OAK: Now, ," line "which #MON do" cont "you want?" done @@ -73,14 +73,14 @@ _OaksLabText_1d2f5:: done _OaksLabText_1d2fa:: - text "OAK: ", $52, "," + text "OAK: ," line "raise your young" cont "#MON by making" cont "it fight!" done _OaksLabDeliverParcelText1:: - text "OAK: Oh, ", $52, "!" + text "OAK: Oh, !" para "How is my old" line "#MON?" @@ -95,11 +95,11 @@ _OaksLabDeliverParcelText1:: para "What? You have" line "something for me?" - para $52, " delivered" + para " delivered" line "OAK's PARCEL.@@" _OaksLabDeliverParcelText2:: - db $0 + text "" para "Ah! This is the" line "custom # BALL" cont "I ordered!" @@ -109,7 +109,7 @@ _OaksLabDeliverParcelText2:: _OaksLabAroundWorldText:: text "#MON around the" line "world wait for" - cont "you, ", $52, "!" + cont "you, !" done _OaksLabGivePokeballsText1:: @@ -123,11 +123,11 @@ _OaksLabGivePokeballsText1:: cont "to capture wild" cont "#MON." - para $52, " got 5" + para " got 5" line "# BALLs!@@" _OaksLabGivePokeballsText2:: - db $0 + text "" para "When a wild" line "#MON appears," cont "it's fair game." @@ -182,20 +182,20 @@ _OaksLabText_1d340:: done _OaksLabRivalWaitingText:: - text $53, ": Gramps!" + text ": Gramps!" line "I'm fed up with" cont "waiting!" done _OaksLabChooseMonText:: - text "OAK: ", $53, "?" + text "OAK: ?" line "Let me think..." para "Oh, that's right," line "I told you to" cont "come! Just wait!" - para "Here, ", $52, "!" + para "Here, !" para "There are 3" line "#MON here!" @@ -216,14 +216,14 @@ _OaksLabChooseMonText:: done _OaksLabRivalInterjectionText:: - text $53, ": Hey!" + text ": Hey!" line "Gramps! What" cont "about me?" done _OaksLabBePatientText:: text "OAK: Be patient!" - line $53, ", you can" + line ", you can" cont "have one too!" done @@ -233,19 +233,19 @@ _OaksLabLeavingText:: done _OaksLabRivalPickingMonText:: - text $53, ": I'll take" + text ": I'll take" line "this one, then!" done _OaksLabRivalReceivedMonText:: - text $53, " received" + text " received" line "a @" TX_RAM wcd6d text "!@@" _OaksLabRivalChallengeText:: - text $53, ": Wait" - line $52, "!" + text ": Wait" + line "!" cont "Let's check out" cont "our #MON!" @@ -261,26 +261,26 @@ _OaksLabText_1d3be:: prompt _OaksLabText_1d3c3:: - text $53, ": Yeah! Am" + text ": Yeah! Am" line "I great or what?" prompt _OaksLabRivalToughenUpText:: - text $53, ": Okay!" + text ": Okay!" line "I'll make my" cont "#MON fight to" cont "toughen it up!" - para $52, "! Gramps!" + para "! Gramps!" line "Smell you later!" done _OaksLabText21:: - text $53, ": Gramps!" + text ": Gramps!" done _OaksLabText22:: - text $53, ": What did" + text ": What did" line "you call me for?" done @@ -305,11 +305,11 @@ _OaksLabText24:: done _OaksLabText25:: - text "OAK: ", $52, " and" - line $53, "! Take" + text "OAK: and" + line "! Take" cont "these with you!" - para $52, " got" + para " got" line "#DEX from OAK!@@" _OaksLabText26:: @@ -336,11 +336,11 @@ _OaksLabText26:: done _OaksLabText27:: - text $53, ": Alright" + text ": Alright" line "Gramps! Leave it" cont "all to me!" - para $52, ", I hate to" + para ", I hate to" line "say it, but I" cont "don't need you!" @@ -350,7 +350,7 @@ _OaksLabText27:: para "I'll tell her not" line "to lend you one," - cont $52, "! Hahaha!" + cont "! Hahaha!" done _OaksLabText_1d405:: diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 8b82f2de..07768af9 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -10,7 +10,7 @@ _MomWakeUpText:: done _MomHealText1:: - text "MOM: ",$52,"!" + text "MOM: !" line "You should take a" cont "quick rest." prompt diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index f2d7ae96..ac4141eb 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -60,7 +60,7 @@ _Route22RivalBeforeBattleText2:: cont "That's cool!" para "Then I'll whip you" - line $52, " as a" + line " as a" cont "warm up for" cont "#MON LEAGUE!" @@ -88,8 +88,8 @@ _Route22RivalDefeatedText2:: prompt _Route22Text_511d0:: - text $53, ": Hahaha!" - line $52, "! That's" + text ": Hahaha!" + line "! That's" cont "your best? You're" cont "nowhere near as" cont "good as me, pal!" diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 7fccab4f..8e7a3848 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,7 +58,7 @@ _SilphCo11Text2:: done _SilphCo11Text3:: - text "Ah ", $52, "!" + text "Ah !" line "So we meet again!" para "The PRESIDENT and" diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index ff90cbef..b060a123 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -35,7 +35,7 @@ _SSAnneWelcomeText9:: prompt _SSAnneFlashedTicketText:: - text $52, " flashed" + text " flashed" line "the S.S.TICKET!" para "Great! Welcome to" @@ -43,7 +43,7 @@ _SSAnneFlashedTicketText:: done _SSAnneNoTicketText:: - text $52, " doesn't" + text " doesn't" line "have the needed" cont "S.S.TICKET." @@ -71,7 +71,7 @@ _VermilionCityText5:: line "Gogogoh!@@" _VermilionCityText14:: - db $0 + text "" para "A MACHOP is" line "stomping the land" cont "flat." diff --git a/text/oakspeech.asm b/text/oakspeech.asm index 91aaf5c3..5911092c 100644 --- a/text/oakspeech.asm +++ b/text/oakspeech.asm @@ -53,4 +53,3 @@ _OakSpeechText3:: cont "with #MON" cont "awaits! Let's go!" done - -- cgit v1.2.3 From 3ab3f4273b1288883a43b64cae4191dfa6d2313e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jun 2016 11:35:21 -0700 Subject: sync home --- home.asm | 126 ++++++++++++++++++++++++++--------------------------- home/fade.asm | 2 +- home/overworld.asm | 105 ++++++++++++++++++++++++++------------------ home/pic.asm | 4 +- home/serial.asm | 40 ++++++++--------- home/vblank.asm | 2 +- home/vcopy.asm | 2 +- 7 files changed, 150 insertions(+), 131 deletions(-) diff --git a/home.asm b/home.asm index 8d3c7207..bce51e4f 100644 --- a/home.asm +++ b/home.asm @@ -117,7 +117,6 @@ INCLUDE "home/joypad.asm" INCLUDE "data/map_header_pointers.asm" INCLUDE "home/overworld.asm" - CheckForUserInterruption:: ; Return carry if Up+Select+B, Start or A are pressed in c frames. ; Used only in the intro and title screen. @@ -255,7 +254,6 @@ DrawHPBar:: LoadMonData:: jpab LoadMonData_ - OverwritewMoves:: ; Write c to [wMoves + b]. Unused. ld hl, wMoves @@ -327,7 +325,7 @@ GetCryData:: add hl, bc add hl, bc - ld a, Bank(CryData) + ld a, BANK(CryData) call BankswitchHome ld a, [hli] ld b, a ; cry id @@ -347,7 +345,6 @@ GetCryData:: add c ret - DisplayPartyMenu:: ld a,[hTilesetType] push af @@ -497,6 +494,7 @@ PrintStatusCondition:: ld [hl],"T" and a ret + PrintStatusConditionNotFainted: ld a,[H_LOADEDROMBANK] push af @@ -519,7 +517,7 @@ PrintLevel:: ld [hli],a ld c,2 ; number of digits ld a,[wLoadedMonLevel] ; level - cp a,100 + cp 100 jr c,PrintLevelCommon ; if level at least 100, write over the ":L" tile dec hl @@ -569,25 +567,25 @@ GetMonHeader:: ld [wd11e],a ld de,FossilKabutopsPic ld b,$66 ; size of Kabutops fossil and Ghost sprites - cp a,FOSSIL_KABUTOPS ; Kabutops fossil + cp FOSSIL_KABUTOPS ; Kabutops fossil jr z,.specialID ld de,GhostPic - cp a,MON_GHOST ; Ghost + cp MON_GHOST ; Ghost jr z,.specialID ld de,FossilAerodactylPic ld b,$77 ; size of Aerodactyl fossil sprite - cp a,FOSSIL_AERODACTYL ; Aerodactyl fossil + cp FOSSIL_AERODACTYL ; Aerodactyl fossil jr z,.specialID cp a,MEW jr z,.mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a,[wd11e] dec a - ld bc,MonBaseStatsEnd - MonBaseStats + ld bc, MonBaseStatsEnd - MonBaseStats ld hl,BaseStats call AddNTimes ld de,wMonHeader - ld bc,MonBaseStatsEnd - MonBaseStats + ld bc, MonBaseStatsEnd - MonBaseStats call CopyData jr .done .specialID @@ -703,7 +701,7 @@ PrintBCDDigit:: .skipCurrencySymbol res 7,b ; unset 7 to indicate that a nonzero digit has been reached .outputDigit - add a,"0" + add "0" ld [hli],a jp PrintLetterDelay .zeroDigit @@ -968,7 +966,6 @@ PokeCenterSignText:: db "@" PickUpItemText:: -; XXX better label (what does predef $5C do?) TX_ASM predef PickUpItem jp TextScriptEnd @@ -1000,15 +997,15 @@ ResetPlayerSpriteData_ClearSpriteData:: FadeOutAudio:: ld a, [wAudioFadeOutControl] - and a - jr nz, .asm_28dc + and a ; currently fading out audio? + jr nz, .fadingOut ld a, [wd72c] bit 1, a ret nz ld a, $77 ld [rNR50], a ret -.asm_28dc +.fadingOut ld a, [wAudioFadeOutCounter] and a jr z, .counterReachedZero @@ -1019,8 +1016,8 @@ FadeOutAudio:: ld a, [wAudioFadeOutCounterReloadValue] ld [wAudioFadeOutCounter], a ld a, [rNR50] - and a - jr z, .asm_2903 + and a ; has the volume reached 0? + jr z, .fadeOutComplete ld b, a and $f dec a @@ -1033,7 +1030,7 @@ FadeOutAudio:: or c ld [rNR50], a ret -.asm_2903 +.fadeOutComplete ld a, [wAudioFadeOutControl] ld b, a xor a @@ -1071,13 +1068,13 @@ DisplayTextID:: ld [wSpriteIndex],a and a jp z,DisplayStartMenu - cp a,TEXT_SAFARI_GAME_OVER + cp TEXT_SAFARI_GAME_OVER jp z,DisplaySafariGameOverText - cp a,TEXT_MON_FAINTED + cp TEXT_MON_FAINTED jp z,DisplayPokemonFaintedText - cp a,TEXT_BLACKED_OUT + cp TEXT_BLACKED_OUT jp z,DisplayPlayerBlackedOutText - cp a,TEXT_REPEL_WORE_OFF + cp TEXT_REPEL_WORE_OFF jp z,DisplayRepelWoreOffText ld a,[wNumSprites] ld e,a @@ -1116,24 +1113,24 @@ DisplayTextID:: ld l,a ; hl = address of the text ld a,[hl] ; a = first byte of text ; check first byte of text for special cases - cp a,$fe ; Pokemart NPC + cp $fe ; Pokemart NPC jp z,DisplayPokemartDialogue - cp a,$ff ; Pokemon Center NPC + cp $ff ; Pokemon Center NPC jp z,DisplayPokemonCenterDialogue - cp a,$fc ; Item Storage PC + cp $fc ; Item Storage PC jp z,FuncTX_ItemStoragePC - cp a,$fd ; Bill's PC + cp $fd ; Bill's PC jp z,FuncTX_BillsPC - cp a,$f9 ; Pokemon Center PC + cp $f9 ; Pokemon Center PC jp z,FuncTX_PokemonCenterPC - cp a,$f5 ; Vending Machine + cp $f5 ; Vending Machine jr nz,.notVendingMachine callba VendingMachineMenu ; jump banks to vending machine routine jr AfterDisplayingTextID .notVendingMachine - cp a,$f7 ; slot machine - jp z,FuncTX_SlotMachine - cp a,$f6 ; cable connection NPC in Pokemon Center + cp $f7 ; prize menu + jp z, FuncTX_GameCornerPrizeMenu + cp $f6 ; cable connection NPC in Pokemon Center jr nz,.notSpecialCase callab CableClubNPC jr AfterDisplayingTextID @@ -1228,7 +1225,7 @@ LoadItemList:: ld a,[hli] ld [de],a inc de - cp a,$ff + cp $ff jr nz,.loop ret @@ -1382,7 +1379,7 @@ DisplayListMenuID:: ld a,$01 ; hardcoded bank jr .bankswitch .specialBattleType ; Old Man battle - ld a, Bank(DisplayBattleMenu) + ld a, BANK(DisplayBattleMenu) .bankswitch call BankswitchHome ld hl,wd730 @@ -1411,7 +1408,7 @@ DisplayListMenuID:: ld a,1 ; max menu item ID is 1 if the list has less than 2 entries ld [wMenuWatchMovingOutOfBounds],a ld a,[wListCount] - cp a,2 ; does the list have less than 2 entries? + cp 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 .setMenuVariables @@ -1481,7 +1478,7 @@ DisplayListMenuIDLoop:: ld a,c ld [wWhichPokemon],a ld a,[wListMenuID] - cp a,ITEMLISTMENU + cp ITEMLISTMENU jr nz,.skipMultiplying ; if it's an item menu sla c ; item entries are 2 bytes long, so multiply by 2 @@ -1502,7 +1499,7 @@ DisplayListMenuIDLoop:: call GetItemPrice pop hl ld a,[wListMenuID] - cp a,ITEMLISTMENU + cp ITEMLISTMENU jr nz,.skipGettingQuantity ; if it's an item menu inc hl @@ -1548,7 +1545,7 @@ DisplayListMenuIDLoop:: jr z,.upPressed .downPressed ld a,[hl] - add a,3 + add 3 ld b,a ld a,[wListCount] cp b ; will going down scroll past the Cancel button? @@ -1568,7 +1565,7 @@ DisplayChooseQuantityMenu:: ld b,1 ; height ld c,3 ; width ld a,[wListMenuID] - cp a,PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz,.drawTextBox ; text box dimensions/coordinates for quantity and price coord hl, 7, 9 @@ -1578,7 +1575,7 @@ DisplayChooseQuantityMenu:: call TextBoxBorder coord hl, 16, 10 ld a,[wListMenuID] - cp a,PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz,.printInitialQuantity coord hl, 8, 10 .printInitialQuantity @@ -1622,7 +1619,7 @@ DisplayChooseQuantityMenu:: .handleNewQuantity coord hl, 17, 10 ld a,[wListMenuID] - cp a,PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz,.printQuantity .printPrice ld c,$03 @@ -1716,7 +1713,7 @@ PrintListMenuEntries:: ld a,[wListScrollOffset] ld c,a ld a,[wListMenuID] - cp a,ITEMLISTMENU + cp ITEMLISTMENU ld a,c jr nz,.skipMultiplying ; if it's an item menu @@ -1736,7 +1733,7 @@ PrintListMenuEntries:: ld [wWhichPokemon],a ld a,[de] ld [wd11e],a - cp a,$ff + cp $ff jp z,.printCancelMenuItem push bc push de @@ -1746,7 +1743,7 @@ PrintListMenuEntries:: ld a,[wListMenuID] and a jr z,.pokemonPCMenu - cp a,$01 + cp MOVESLISTMENU jr z,.movesMenu .itemMenu call GetItemName @@ -1834,7 +1831,7 @@ PrintListMenuEntries:: pop de inc de ld a,[wListMenuID] - cp a,ITEMLISTMENU + cp ITEMLISTMENU jr nz,.nextListEntry .printItemQuantity ld a,[wd11e] @@ -1991,7 +1988,6 @@ GetMachineName:: inc de ld a,"@" ld [de],a - pop af ld [wd11e],a pop bc @@ -2007,9 +2003,9 @@ HiddenPrefix:: ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID IsItemHM:: - cp a,HM_01 + cp HM_01 jr c,.notHM - cp a,TM_01 + cp TM_01 ret .notHM and a @@ -2189,6 +2185,7 @@ RunNPCMovementScript:: ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ret + .NPCMovementScriptPointerTables dw PalletMovementScriptPointerTable dw PewterMuseumGuyMovementScriptPointerTable @@ -2679,7 +2676,7 @@ FuncTX_BillsPC:: ld hl, BillsPC_ jr bankswitchAndContinue -FuncTX_SlotMachine:: +FuncTX_GameCornerPrizeMenu:: ; XXX find a better name for this function ; special_F7 ld b,BANK(CeladonPrizeMenu) @@ -2752,7 +2749,7 @@ CheckCoords:: ld [wCoordIndex],a .loop ld a,[hli] - cp a,$ff ; reached terminator? + cp $ff ; reached terminator? jr z,.notInArray push hl ld hl,wCoordIndex @@ -2871,7 +2868,7 @@ GetSpriteMovementByte1Pointer:: ld h,$C2 ld a,[H_SPRITEINDEX] swap a - add a,6 + add 6 ld l,a ret @@ -2924,7 +2921,6 @@ GetTrainerInformation:: GetTrainerName:: jpba GetTrainerName_ - HasEnoughMoney:: ; Check if the player has at least as much ; money as the 3-byte BCD value at hMoney. @@ -3006,12 +3002,13 @@ YesNoChoicePokeCenter:: lb bc, 8, 12 jr DisplayYesNoChoice -Func_361a:: +WideYesNoChoice:: ; unused call SaveScreenTilesToBuffer1 ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a coord hl, 12, 7 lb bc, 8, 13 + DisplayYesNoChoice:: ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -3045,7 +3042,7 @@ MoveSprite_:: ld [hli],a inc de inc c - cp a,$FF ; have we reached the end of the movement data? + cp $FF ; have we reached the end of the movement data? jr nz,.loop ld a,c @@ -3066,7 +3063,7 @@ MoveSprite_:: ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] DivideBytes:: push hl - ld hl, $ffe7 + ld hl, hQuotient2 xor a ld [hld], a ld a, [hld] @@ -3157,7 +3154,6 @@ UncompressSpriteFromDE:: ld [hl], d jp UncompressSpriteData - SaveScreenTilesToBuffer2:: coord hl, 0, 0 ld de, wTileMapBackup2 @@ -3199,7 +3195,7 @@ LoadScreenTilesFromBuffer1:: ret DelayFrames:: -; wait n frames, where n is the value in c +; wait c frames call DelayFrame dec c jr nz,DelayFrames @@ -3300,7 +3296,7 @@ GetName:: ld e,l .nextChar ld a,[hli] - cp a, "@" + cp "@" jr nz,.nextChar inc c ;entry counter ld a,b ;wanted entry @@ -3332,9 +3328,9 @@ GetItemPrice:: ld a, [wListMenuID] cp MOVESLISTMENU ld a, BANK(ItemPrices) - jr nz, .asm_37ed + jr nz, .ok ld a, $f ; hardcoded Bank -.asm_37ed +.ok ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ld hl, wItemPrices @@ -3345,10 +3341,10 @@ GetItemPrice:: cp HM_01 jr nc, .getTMPrice ld bc, $3 -.asm_3802 +.loop add hl, bc dec a - jr nz, .asm_3802 + jr nz, .loop dec hl ld a, [hld] ld [hItemPrice + 2], a @@ -3356,13 +3352,13 @@ GetItemPrice:: ld [hItemPrice + 1], a ld a, [hl] ld [hItemPrice], a - jr .asm_381c + jr .done .getTMPrice ld a, Bank(GetMachinePrice) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a call GetMachinePrice -.asm_381c +.done ld de, hItemPrice pop af ld [H_LOADEDROMBANK], a @@ -4075,7 +4071,7 @@ PlaceMenuCursor:: jr nz,.currentMenuItemLoop .checkForArrow2 ld a,[hl] - cp a,"▶" ; has the right arrow already been placed? + cp "▶" ; has the right arrow already been placed? jr z,.skipSavingTile ; if so, don't lose the saved tile ld [wTileBehindCursor],a ; save tile before overwriting with right arrow .skipSavingTile @@ -4656,6 +4652,8 @@ SetMapTextPointer:: ret TextPredefs:: +const_value = 1 + add_tx_pre CardKeySuccessText ; 01 add_tx_pre CardKeyFailText ; 02 add_tx_pre RedBedroomPCText ; 03 diff --git a/home/fade.asm b/home/fade.asm index 08e087b4..9482fcb0 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,7 +1,7 @@ ; These routines manage gradual fading ; (e.g., entering a doorway) LoadGBPal:: - ld a, [wMapPalOffset] ;tells if cur.map is dark (requires HM5_FLASH?) + ld a, [wMapPalOffset] ;tells if wCurMap is dark (requires HM5_FLASH?) ld b, a ld hl, FadePal4 ld a, l diff --git a/home/overworld.asm b/home/overworld.asm index 8ec457c1..f71bb68a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -59,7 +59,7 @@ OverworldLoopLessDelay:: res 3,[hl] jp nz,WarpFound2 ld a,[wd732] - and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp + and 1 << 4 | 1 << 3 ; fly warp or dungeon warp jp nz,HandleFlyWarpOrDungeonWarp ld a,[wCurOpponent] and a @@ -133,7 +133,7 @@ OverworldLoopLessDelay:: ld hl,wFlags_0xcd60 res 2,[hl] call UpdateSprites - ld a,1 + ld a, 1 ld [wCheckFor180DegreeTurn],a ld a,[wPlayerMovingDirection] ; the direction that was pressed last time and a @@ -143,6 +143,7 @@ OverworldLoopLessDelay:: xor a ld [wPlayerMovingDirection],a ; zero the direction jp OverworldLoop + .checkIfDownButtonIsPressed ld a,[hJoyHeld] ; current joypad state bit 7,a ; down button @@ -151,6 +152,7 @@ OverworldLoopLessDelay:: ld [wSpriteStateData1 + 3],a ; delta Y ld a,PLAYER_DIR_DOWN jr .handleDirectionButtonPress + .checkIfUpButtonIsPressed bit 6,a ; up button jr z,.checkIfLeftButtonIsPressed @@ -158,6 +160,7 @@ OverworldLoopLessDelay:: ld [wSpriteStateData1 + 3],a ; delta Y ld a,PLAYER_DIR_UP jr .handleDirectionButtonPress + .checkIfLeftButtonIsPressed bit 5,a ; left button jr z,.checkIfRightButtonIsPressed @@ -165,11 +168,14 @@ OverworldLoopLessDelay:: ld [wSpriteStateData1 + 5],a ; delta X ld a,PLAYER_DIR_LEFT jr .handleDirectionButtonPress + .checkIfRightButtonIsPressed bit 4,a ; right button jr z,.noDirectionButtonsPressed - ld a,1 ; PLAYER_DIR_RIGHT + ld a, 1 ld [wSpriteStateData1 + 5],a ; delta X + + .handleDirectionButtonPress ld [wPlayerDirection],a ; new direction ld a,[wd730] @@ -226,12 +232,13 @@ OverworldLoopLessDelay:: call NewBattle jp c,.battleOccurred jp OverworldLoop + .noDirectionChange ld a,[wPlayerDirection] ; current direction ld [wPlayerMovingDirection],a ; save direction call UpdateSprites ld a,[wWalkBikeSurfState] - cp a,$02 ; surfing + cp $02 ; surfing jr z,.surfing ; not surfing call CollisionCheckOnLand @@ -248,20 +255,24 @@ OverworldLoopLessDelay:: pop hl jp c,CheckWarpsCollision jp OverworldLoop + .surfing call CollisionCheckOnWater jp c,OverworldLoop + .noCollision ld a,$08 ld [wWalkCounter],a jr .moveAhead2 + .moveAhead ld a,[wd736] bit 7,a jr z,.noSpinning - callba LoadSpinnerArrowTiles ; spin while moving + callba LoadSpinnerArrowTiles .noSpinning call UpdateSprites + .moveAhead2 ld hl,wFlags_0xcd60 res 2,[hl] @@ -271,7 +282,7 @@ OverworldLoopLessDelay:: ld a,[wd736] bit 6,a ; jumping a ledge? jr nz,.normalPlayerSpriteAdvancement - call BikeSpeedup ; if riding a bike and not jumping a ledge + call DoBikeSpeedup .normalPlayerSpriteAdvancement call AdvancePlayerSprite ld a,[wWalkCounter] @@ -323,14 +334,14 @@ OverworldLoopLessDelay:: xor a ld [hJoyHeld],a ld a,[wCurMap] - cp a,CINNABAR_GYM + cp CINNABAR_GYM jr nz,.notCinnabarGym SetEvent EVENT_2A7 .notCinnabarGym ld hl,wd72e set 5,[hl] ld a,[wCurMap] - cp a,OAKS_LAB + cp OAKS_LAB jp z,.noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab callab AnyPartyAlive ld a,d @@ -363,15 +374,15 @@ NewBattle:: ret ; function to make bikes twice as fast as walking -BikeSpeedup:: +DoBikeSpeedup:: ld a,[wNPCMovementScriptPointerTableNum] and a ret nz ld a,[wCurMap] - cp a,ROUTE_17 ; Cycling Road + cp ROUTE_17 ; Cycling Road jr nz,.goFaster ld a,[hJoyHeld] - and a,D_UP | D_LEFT | D_RIGHT + and D_UP | D_LEFT | D_RIGHT ret nz .goFaster jp AdvancePlayerSprite @@ -421,7 +432,7 @@ CheckWarpsNoCollisionLoop:: pop bc pop de ld a,[hJoyHeld] - and a,D_DOWN | D_UP | D_LEFT | D_RIGHT + and D_DOWN | D_UP | D_LEFT | D_RIGHT jr z,CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp jr WarpFound1 @@ -483,7 +494,7 @@ WarpFound2:: ld [wUnusedD366],a ; not read ld a,[hWarpDestinationMap] ld [wCurMap],a - cp a,ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1 jr nz,.notRockTunnel ld a,$06 ld [wMapPalOffset],a @@ -491,10 +502,12 @@ WarpFound2:: .notRockTunnel call PlayMapChangeSound 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 + +; 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,[hWarpDestinationMap] ; destination map - cp a,$ff + cp $ff jr z,.goBackOutside ; if not going back to the previous map ld [wCurMap],a @@ -535,7 +548,7 @@ ContinueCheckWarpsNoCollisionLoop:: CheckMapConnections:: .checkWestMap ld a,[wXCoord] - cp a,$ff + cp $ff jr nz,.checkEastMap ld a,[wMapConn3Ptr] ld [wCurMap],a @@ -555,7 +568,7 @@ CheckMapConnections:: jr z,.savePointer1 .pointerAdjustmentLoop1 ld a,[wWestConnectedMapWidth] ; width of connected map - add a,MAP_BORDER * 2 + add MAP_BORDER * 2 ld e,a ld d,0 ld b,0 @@ -568,6 +581,7 @@ CheckMapConnections:: ld a,h ld [wCurrentTileBlockMapViewPointer + 1],a jp .loadNewMap + .checkEastMap ld b,a ld a,[wCurrentMapWidth2] ; map width @@ -591,7 +605,7 @@ CheckMapConnections:: jr z,.savePointer2 .pointerAdjustmentLoop2 ld a,[wEastConnectedMapWidth] - add a,MAP_BORDER * 2 + add MAP_BORDER * 2 ld e,a ld d,0 ld b,0 @@ -604,9 +618,10 @@ CheckMapConnections:: ld a,h ld [wCurrentTileBlockMapViewPointer + 1],a jp .loadNewMap + .checkNorthMap ld a,[wYCoord] - cp a,$ff + cp $ff jr nz,.checkSouthMap ld a,[wMapConn1Ptr] ld [wCurMap],a @@ -630,6 +645,7 @@ CheckMapConnections:: ld a,h ld [wCurrentTileBlockMapViewPointer + 1],a jp .loadNewMap + .checkSouthMap ld b,a ld a,[wCurrentMapHeight2] @@ -666,13 +682,14 @@ CheckMapConnections:: callba InitMapSprites call LoadTileBlockMap jp OverworldLoopLessDelay + .didNotEnterConnectedMap jp OverworldLoop ; function to play a sound when changing maps PlayMapChangeSound:: aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on - cp a,$0b ; door tile in tileset 0 + cp $0b ; door tile in tileset 0 jr nz,.didNotGoThroughDoor ld a,SFX_GO_INSIDE jr .playSound @@ -883,7 +900,7 @@ LoadTileBlockMap:: ld hl,wOverworldMap ld a,[wCurMapWidth] ld [hMapWidth],a - add a,MAP_BORDER * 2 ; east and west + add MAP_BORDER * 2 ; east and west ld [hMapStride],a ; map width + border ld b,0 ld c,a @@ -921,7 +938,7 @@ LoadTileBlockMap:: jr nz,.rowLoop .northConnection ld a,[wMapConn1Ptr] - cp a,$ff + cp $ff jr z,.southConnection call SwitchToMapRomBank ld a,[wNorthConnectionStripSrc] @@ -939,7 +956,7 @@ LoadTileBlockMap:: call LoadNorthSouthConnectionsTileMap .southConnection ld a,[wMapConn2Ptr] - cp a,$ff + cp $ff jr z,.westConnection call SwitchToMapRomBank ld a,[wSouthConnectionStripSrc] @@ -957,7 +974,7 @@ LoadTileBlockMap:: call LoadNorthSouthConnectionsTileMap .westConnection ld a,[wMapConn3Ptr] - cp a,$ff + cp $ff jr z,.eastConnection call SwitchToMapRomBank ld a,[wWestConnectionStripSrc] @@ -975,7 +992,7 @@ LoadTileBlockMap:: call LoadEastWestConnectionsTileMap .eastConnection ld a,[wMapConn4Ptr] - cp a,$ff + cp $ff jr z,.done call SwitchToMapRomBank ld a,[wEastConnectionStripSrc] @@ -1016,7 +1033,7 @@ LoadNorthSouthConnectionsTileMap:: inc h .noCarry1 ld a,[wCurMapWidth] - add a,MAP_BORDER * 2 + add MAP_BORDER * 2 add e ld e,a jr nc,.noCarry2 @@ -1045,7 +1062,7 @@ LoadEastWestConnectionsTileMap:: inc h .noCarry1 ld a,[wCurMapWidth] - add a,MAP_BORDER * 2 + add MAP_BORDER * 2 add e ld e,a jr nc,.noCarry2 @@ -1126,6 +1143,7 @@ IsSpriteInFrontOfPlayer2:: ld b,a ld a,PLAYER_DIR_UP jr .doneCheckingDirection + .checkIfPlayerFacingDown cp SPRITE_FACING_DOWN jr nz,.checkIfPlayerFacingRight @@ -1135,6 +1153,7 @@ IsSpriteInFrontOfPlayer2:: ld b,a ld a,PLAYER_DIR_DOWN jr .doneCheckingDirection + .checkIfPlayerFacingRight cp SPRITE_FACING_RIGHT jr nz,.playerFacingLeft @@ -1144,6 +1163,7 @@ IsSpriteInFrontOfPlayer2:: ld c,a ld a,PLAYER_DIR_RIGHT jr .doneCheckingDirection + .playerFacingLeft ; facing left ld a,c @@ -1225,7 +1245,7 @@ CollisionCheckOnLand:: jr nc,.noCollision .collision ld a,[wChannelSoundIDs + CH4] - cp a,SFX_COLLISION ; check if collision sound is already playing + cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) @@ -1287,7 +1307,7 @@ CheckForTilePairCollisions:: ld a,[wCurMapTileset] ; tileset number ld b,a ld a,[hli] - cp a,$ff + cp $ff jr z,.noMatch cp b jr z,.tilesetMatches @@ -1387,7 +1407,7 @@ LoadCurrentMapView:: ; update tile block map pointer to next row's address pop de ld a,[wCurMapWidth] - add a,MAP_BORDER * 2 + add MAP_BORDER * 2 add e ld e,a jr nc,.noCarry @@ -1722,8 +1742,8 @@ ScheduleSouthRowRedraw:: ld bc,$0200 add hl,bc ld a,h - and a,$03 - or a,$98 + and $03 + or $98 ld [hRedrawRowOrColumnDest + 1],a ld a,l ld [hRedrawRowOrColumnDest],a @@ -1736,11 +1756,11 @@ ScheduleEastColumnRedraw:: call ScheduleColumnRedrawHelper ld a,[wMapViewVRAMPointer] ld c,a - and a,$e0 + and $e0 ld b,a ld a,c - add a,18 - and a,$1f + add 18 + and $1f or b ld [hRedrawRowOrColumnDest],a ld a,[wMapViewVRAMPointer + 1] @@ -1791,10 +1811,10 @@ DrawTileBlock:: ld a,c swap a ld b,a - and a,$f0 + and $f0 ld c,a ld a,b - and a,$0f + and $0f ld b,a ; bc = tile block ID * 0x10 add hl,bc ld d,h @@ -1833,10 +1853,10 @@ JoypadOverworld:: bit 3,a ; check if a trainer wants a challenge jr nz,.notForcedDownwards ld a,[wCurMap] - cp a,ROUTE_17 ; Cycling Road + cp ROUTE_17 ; Cycling Road jr nz,.notForcedDownwards ld a,[hJoyHeld] - and a,D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON + and D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON jr nz,.notForcedDownwards ld a,D_DOWN ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press @@ -1868,6 +1888,7 @@ JoypadOverworld:: ld [hJoyPressed],a ld [hJoyReleased],a ret + ; if done simulating button presses .doneSimulating xor a @@ -1878,7 +1899,7 @@ JoypadOverworld:: ld [hJoyHeld],a ld hl,wd736 ld a,[hl] - and a,$f8 + and $f8 ld [hl],a ld hl,wd730 res 7,[hl] @@ -1928,7 +1949,7 @@ CollisionCheckOnWater:: jr .loop .collision ld a,[wChannelSoundIDs + CH4] - cp a,SFX_COLLISION ; check if collision sound is already playing + cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) @@ -2386,7 +2407,7 @@ IgnoreInputForHalfSecond: ld [wIgnoreInputCounter], a ld hl, wd730 ld a, [hl] - or $26 + or %00100110 ld [hl], a ; set ignore input bit ret diff --git a/home/pic.asm b/home/pic.asm index 15ee53ad..444a9f05 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -531,9 +531,9 @@ ReverseNybble:: ld de, NybbleReverseTable add e ld e, a - jr nc, .asm_283f + jr nc, .noCarry inc d -.asm_283f +.noCarry ld a, [de] ret diff --git a/home/serial.asm b/home/serial.asm index 7a515118..6c412239 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -91,79 +91,79 @@ Serial_ExchangeByte:: ld [hSerialReceivedNewData], a ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK - jr nz, .asm_21a7 + jr nz, .loop ld a, START_TRANSFER_INTERNAL_CLOCK ld [rSC], a -.asm_21a7 +.loop ld a, [hSerialReceivedNewData] and a - jr nz, .asm_21f1 + jr nz, .ok ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK - jr nz, .asm_21cc + jr nz, .doNotIncrementUnknownCounter call IsUnknownCounterZero - jr z, .asm_21cc + jr z, .doNotIncrementUnknownCounter call WaitLoop_15Iterations push hl ld hl, wUnknownSerialCounter + 1 inc [hl] - jr nz, .asm_21c3 + jr nz, .noCarry dec hl inc [hl] -.asm_21c3 +.noCarry pop hl call IsUnknownCounterZero - jr nz, .asm_21a7 + jr nz, .loop jp SetUnknownCounterToFFFF -.asm_21cc +.doNotIncrementUnknownCounter ld a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) cp (1 << SERIAL) - jr nz, .asm_21a7 + jr nz, .loop ld a, [wUnknownSerialCounter2] dec a ld [wUnknownSerialCounter2], a - jr nz, .asm_21a7 + jr nz, .loop ld a, [wUnknownSerialCounter2 + 1] dec a ld [wUnknownSerialCounter2 + 1], a - jr nz, .asm_21a7 + jr nz, .loop ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK - jr z, .asm_21f1 + jr z, .ok ld a, 255 .waitLoop dec a jr nz, .waitLoop -.asm_21f1 +.ok xor a ld [hSerialReceivedNewData], a ld a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) sub (1 << SERIAL) - jr nz, .asm_2204 + jr nz, .skipReloadingUnknownCounter2 ld [wUnknownSerialCounter2], a ld a, $50 ld [wUnknownSerialCounter2 + 1], a -.asm_2204 +.skipReloadingUnknownCounter2 ld a, [hSerialReceiveData] cp SERIAL_NO_DATA_BYTE ret nz call IsUnknownCounterZero - jr z, .asm_221f + jr z, .done push hl ld hl, wUnknownSerialCounter + 1 ld a, [hl] dec a ld [hld], a inc a - jr nz, .asm_2219 + jr nz, .noBorrow dec [hl] -.asm_2219 +.noBorrow pop hl call IsUnknownCounterZero jr z, SetUnknownCounterToFFFF -.asm_221f +.done ld a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) cp (1 << SERIAL) diff --git a/home/vblank.asm b/home/vblank.asm index f69d4a86..e80fba75 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -27,7 +27,7 @@ VBlank:: call VBlankCopyDouble call UpdateMovingBgTiles call $ff80 ; hOAMDMA - ld a, Bank(PrepareOAMData) + ld a, BANK(PrepareOAMData) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a call PrepareOAMData diff --git a/home/vcopy.asm b/home/vcopy.asm index b7fb099e..3fe19745 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -33,13 +33,13 @@ ClearBgMap:: jr nz,.loop ret -RedrawRowOrColumn:: ; This function redraws a BG row of height 2 or a BG column of width 2. ; One of its main uses is redrawing the row or column that will be exposed upon ; scrolling the BG when the player takes a step. Redrawing only the exposed ; row or column is more efficient than redrawing the entire screen. ; However, this function is also called repeatedly to redraw the whole screen ; when necessary. It is also used in trade animation and elevator code. +RedrawRowOrColumn:: ld a,[hRedrawRowOrColumnMode] and a ret z -- cgit v1.2.3 From fc474c8ee740acbe662b06db0d9cab8edc6680e9 Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 1 Jul 2016 17:06:55 -0400 Subject: Use pattern variables in the makefile. This means dependency scanning only happens as required. --- Makefile | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index cf3983f4..12532d73 100644 --- a/Makefile +++ b/Makefile @@ -6,19 +6,8 @@ MD5 := md5sum -c --quiet pic := $(PYTHON) extras/pokemontools/pic.py compress includes := $(PYTHON) extras/pokemontools/scan_includes.py -base_obj := \ - audio.o \ - main.o \ - text.o \ - wram.o - -red_obj := $(base_obj:.o=_red.o) -blue_obj := $(base_obj:.o=_blue.o) -all_obj := $(red_obj) $(blue_obj) - -$(foreach obj, $(base_obj:.o=), \ - $(eval $(obj)_dep := $(shell $(includes) $(obj).asm)) \ -) +pokered_obj := audio_red.o main_red.o text_red.o wram_red.o +pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o .SUFFIXES: .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic @@ -38,21 +27,24 @@ compare: red blue @$(MD5) roms.md5 clean: - rm -f $(roms) $(all_obj) $(roms:.gbc=.sym) + rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + %.asm: ; -$(red_obj): %_red.o: %.asm $$(%_dep) - rgbasm -D "_RED" -h -o $@ $*.asm -$(blue_obj): %_blue.o: %.asm $$(%_dep) - rgbasm -D "_BLUE" -h -o $@ $*.asm -dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -red_opt = $(dmg_opt) -t "POKEMON RED" -blue_opt = $(dmg_opt) -t "POKEMON BLUE" +%_red.o: dep = $(shell $(includes) $(@D)/$*.asm) +$(pokered_obj): %_red.o: %.asm $$(dep) + rgbasm -D _RED -h -o $@ $*.asm + +%_blue.o: dep = $(shell $(includes) $(@D)/$*.asm) +$(pokeblue_obj): %_blue.o: %.asm $$(dep) + rgbasm -D _BLUE -h -o $@ $*.asm + +pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" +pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" -poke%.gbc: $$(%_obj) - rgblink -n poke$*.sym -o $@ $^ +%.gbc: $$(%_obj) + rgblink -n $*.sym -o $@ $^ rgbfix $($*_opt) $@ %.png: ; -- cgit v1.2.3 From 80bae03975a84dadf080c79f52216866dd410cf8 Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 18 Jul 2016 01:17:03 -0500 Subject: Clean up text commands --- charmap.asm | 10 ++- engine/battle/core.asm | 8 +- engine/battle/experience.asm | 2 +- engine/battle/moveEffects/focus_energy_effect.asm | 2 +- engine/cable_club.asm | 6 +- engine/give_pokemon.asm | 2 +- engine/hidden_object_functions14.asm | 4 +- engine/hidden_object_functions3.asm | 2 +- engine/hidden_object_functions7.asm | 6 +- engine/in_game_trades.asm | 4 +- engine/items/items.asm | 14 ++-- engine/learn_move.asm | 8 +- engine/menu/main_menu.asm | 10 +-- engine/menu/oaks_pc.asm | 3 +- engine/menu/party_menu.asm | 8 +- engine/menu/pokedex.asm | 11 +-- engine/menu/prize_menu.asm | 10 +-- engine/menu/start_sub_menus.asm | 2 +- engine/menu/status_screen.asm | 5 +- engine/menu/vending_machine.asm | 3 +- engine/oak_speech.asm | 2 +- engine/overworld/cable_club_npc.asm | 3 +- engine/overworld/card_key.asm | 2 +- engine/overworld/hidden_items.asm | 5 +- engine/overworld/item.asm | 2 +- engine/overworld/oaks_aide.asm | 2 +- engine/overworld/pokecenter.asm | 4 +- engine/slot_machine.asm | 5 +- engine/town_map.asm | 4 +- engine/trade2.asm | 7 +- home.asm | 7 +- home/text.asm | 50 ++++++------ macros.asm | 92 +++++++++++++---------- main.asm | 21 ++++-- scripts/bikeshop.asm | 3 +- scripts/billshouse.asm | 2 +- scripts/celadoncity.asm | 3 +- scripts/celadondiner.asm | 3 +- scripts/celadongamecorner.asm | 6 +- scripts/celadongym.asm | 2 +- scripts/celadonmansion3.asm | 2 +- scripts/celadonmart3.asm | 3 +- scripts/celadonmartroof.asm | 22 +++--- scripts/ceruleancity.asm | 15 ++-- scripts/ceruleangym.asm | 7 +- scripts/cinnabargym.asm | 6 +- scripts/copycatshouse2f.asm | 8 +- scripts/fanclub.asm | 2 +- scripts/fuchsiagym.asm | 2 +- scripts/fuchsiahouse2.asm | 5 +- scripts/fuchsiahouse3.asm | 2 +- scripts/lab3.asm | 3 +- scripts/lavenderhouse1.asm | 2 +- scripts/mtmoon3.asm | 10 ++- scripts/museum1f.asm | 3 +- scripts/pewtergym.asm | 4 +- scripts/rockethideout1.asm | 3 +- scripts/rockethideoutelevator.asm | 3 +- scripts/route1.asm | 3 +- scripts/route12gateupstairs.asm | 3 +- scripts/route12house.asm | 2 +- scripts/route16house.asm | 3 +- scripts/route22gate.asm | 3 +- scripts/route23.asm | 2 +- scripts/route24.asm | 6 +- scripts/route5gate.asm | 2 +- scripts/safarizoneentrance.asm | 2 +- scripts/safarizonesecrethouse.asm | 3 +- scripts/saffroncity.asm | 3 +- scripts/saffrongym.asm | 6 +- scripts/saffronhouse2.asm | 3 +- scripts/silphco11.asm | 3 +- scripts/silphco2.asm | 3 +- scripts/ssanne7.asm | 3 +- scripts/vermiliongym.asm | 2 +- scripts/vermilionhouse2.asm | 2 +- scripts/viridiancity.asm | 3 +- scripts/viridiangym.asm | 8 +- scripts/viridianmart.asm | 2 +- 79 files changed, 293 insertions(+), 221 deletions(-) diff --git a/charmap.asm b/charmap.asm index 980c79a3..52db1d9a 100644 --- a/charmap.asm +++ b/charmap.asm @@ -150,6 +150,7 @@ charmap "ー", $E3 charmap "@", $50 charmap "#", $54 ;charmap "POKé", $54 +charmap "№", $74 charmap "…", $75 charmap "┌", $79 @@ -159,8 +160,6 @@ charmap "│", $7C charmap "└", $7D charmap "┘", $7E -charmap "№", $74 - charmap " ", $7F charmap "A", $80 charmap "B", $81 @@ -226,17 +225,24 @@ charmap "'l", $BC charmap "'s", $BD charmap "'t", $BE charmap "'v", $BF + charmap "'", $E0 + charmap "-", $E3 charmap "'r", $E4 charmap "'m", $E5 charmap "?", $E6 charmap "!", $E7 charmap ".", $E8 + +charmap "▷", $EC charmap "▶", $ED +charmap "▲", $ED +charmap "▼", $EE charmap "♂", $EF charmap "¥", $F0 charmap "×", $F1 +charmap "⠄", $F2 charmap "/", $F3 charmap ",", $F4 charmap "♀", $F5 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 3b474584..75a119cc 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2127,7 +2127,7 @@ DisplayBattleMenu: ld [hl], "▶" ld c, 50 call DelayFrames - ld [hl], $ec + ld [hl], "▷" ld a, $2 ; select the "ITEM" menu jp .upperLeftMenuItemWasNotSelected .oldManName @@ -2680,7 +2680,7 @@ SelectMenuItem: dec a ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], $ec + ld [hl], "▷" .select ld hl, hFlags_0xFFF6 set 1, [hl] @@ -7726,7 +7726,7 @@ MonsStatsRoseText: ret GreatlyRoseText: - db $0a + TX_DELAY TX_FAR _GreatlyRoseText RoseText: @@ -7930,7 +7930,7 @@ MonsStatsFellText: ret GreatlyFellText: - db $0a + TX_DELAY TX_FAR _GreatlyFellText FellText: diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index c1914806..e6cdf9ac 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -368,5 +368,5 @@ ExpPointsText: GrewLevelText: TX_FAR _GrewLevelText - db $0b + TX_SFX_LEVEL_UP db "@" diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index 9ba0ade0..69301d8e 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -17,6 +17,6 @@ FocusEnergyEffect_: jpab PrintButItFailedText_ GettingPumpedText: - db $0a + TX_DELAY TX_FAR _GettingPumpedText db "@" diff --git a/engine/cable_club.asm b/engine/cable_club.asm index bd9ed683..2458abd4 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -547,7 +547,7 @@ TradeCenter_SelectMon: ld a, " " ld [hl], a .cancelMenuItem_Loop - ld a, $ed ; filled arrow cursor + ld a, "▶" ; filled arrow cursor Coorda 1, 16 .cancelMenuItem_JoypadLoop call JoypadLowSensitivity @@ -566,7 +566,7 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a jp .playerMonMenu .cancelMenuItem_APressed - ld a, $ec ; unfilled arrow cursor + ld a, "▷" ; unfilled arrow cursor Coorda 1, 16 ld a, $f ld [wSerialExchangeNybbleSendData], a @@ -616,7 +616,7 @@ TradeCenter_PlaceSelectedEnemyMonMenuCursor: coord hl, 1, 9 ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], $ec ; cursor + ld [hl], "▷" ; cursor ret TradeCenter_DisplayStats: diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 549a042d..49596782 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -70,7 +70,7 @@ SetPokedexOwnedFlag: GotMonText: TX_FAR _GotMonText - db $0b + TX_SFX_ITEM_1 db "@" SetToBoxText: diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index 7591fac0..744419af 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -7,7 +7,7 @@ PrintNotebookText: TMNotebook: TX_FAR TMNotebookText - db $0d + TX_WAIT db "@" ViridianSchoolNotebook: @@ -45,7 +45,7 @@ TurnPageText: ViridianSchoolNotebookText5: TX_FAR _ViridianSchoolNotebookText5 - db $0d + TX_WAIT db "@" ViridianSchoolNotebookText1: diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index efdbd081..ca2543a3 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -127,7 +127,7 @@ ElevatorText: TownMapText: TX_FAR _TownMapText - db $06 + TX_BLINK TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 9b1532bc..8c6f2351 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -235,9 +235,9 @@ CinnabarGymQuiz_1ea92: ret CinnabarGymQuizCorrectText: - db $0b + TX_SFX_ITEM_1 TX_FAR _CinnabarGymQuizCorrectText - db $06 + TX_BLINK TX_ASM ld a, [$ffe0] @@ -372,7 +372,7 @@ BillsHouseMonitorText: BillsHouseInitiatedText: TX_FAR _BillsHouseInitiatedText - db $06 + TX_BLINK TX_ASM ld a, $ff ld [wNewSoundID], a diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index bacf531b..355a26a2 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -265,7 +265,9 @@ ConnectCableText: TradedForText: TX_FAR _TradedForText - db $11, $a, "@" + TX_SFX_KEY_ITEM + TX_DELAY + db "@" WannaTrade1Text: TX_FAR _WannaTrade1Text diff --git a/engine/items/items.asm b/engine/items/items.asm index a6717494..d3255c0d 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -608,7 +608,8 @@ ItemUseBallText05: ;"All right! {MonName} was caught!" ;play sound TX_FAR _ItemUseBallText05 - db $12,$06 + TX_SFX_CAUGHT_MON + TX_BLINK db "@" ItemUseBallText07: ;"X was transferred to Bill's PC" @@ -623,7 +624,8 @@ ItemUseBallText06: ;"New DEX data will be added..." ;play sound TX_FAR _ItemUseBallText06 - db $13,$06 + TX_SFX_DEX_PAGE_ADDED + TX_BLINK db "@" ItemUseTownMap: @@ -1836,7 +1838,7 @@ FluteWokeUpText: PlayedFluteHadEffectText: TX_FAR _PlayedFluteHadEffectText - db $06 + TX_BLINK TX_ASM ld a,[wIsInBattle] and a @@ -2395,19 +2397,19 @@ BoxFullCannotThrowBallText: ItemUseText00: TX_FAR _ItemUseText001 - db $05 + TX_LINE TX_FAR _ItemUseText002 db "@" GotOnBicycleText: TX_FAR _GotOnBicycleText1 - db $05 + TX_LINE TX_FAR _GotOnBicycleText2 db "@" GotOffBicycleText: TX_FAR _GotOffBicycleText1 - db $05 + TX_LINE TX_FAR _GotOffBicycleText2 db "@" diff --git a/engine/learn_move.asm b/engine/learn_move.asm index 5fa6df08..ba73d4c0 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -185,7 +185,9 @@ TryingToLearn: LearnedMove1Text: TX_FAR _LearnedMove1Text - db $b,6,"@" + TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the pary menu (rare candy) and plays SFX_LEVEL_UP in battle + TX_BLINK + db "@" WhichMoveToForgetText: TX_FAR _WhichMoveToForgetText @@ -205,7 +207,7 @@ TryingToLearnText: OneTwoAndText: TX_FAR _OneTwoAndText - db $a + TX_DELAY TX_ASM ld a, SFX_SWAP call PlaySoundWaitForCurrent @@ -214,7 +216,7 @@ OneTwoAndText: PoofText: TX_FAR _PoofText - db $a + TX_DELAY ForgotAndText: TX_FAR _ForgotAndText db "@" diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index d3152e4e..cd4198b6 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -332,13 +332,13 @@ ContinueText: db "CONTINUE", $4e NewGameText: - db "NEW GAME", $4e - db "OPTION@" + db "NEW GAME" + next "OPTION@" CableClubOptionsText: - db "TRADE CENTER", $4e - db "COLOSSEUM", $4e - db "CANCEL@" + db "TRADE CENTER" + next "COLOSSEUM" + next "CANCEL@" DisplayContinueGameInfo: xor a diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index 55852b63..f8444688 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -20,7 +20,8 @@ GetDexRatedText: ClosedOaksPCText: TX_FAR _ClosedOaksPCText - db $0d,"@" + TX_WAIT + db "@" AccessedOaksPCText: TX_FAR _AccessedOaksPCText diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 7ef14232..a35524ed 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -70,7 +70,7 @@ RedrawPartyMenu_: dec hl dec hl dec hl - ld a,$EC ; unfilled right arrow menu cursor + ld a,"▷" ; unfilled right arrow menu cursor ld [hli],a ; place the cursor inc hl inc hl @@ -87,7 +87,7 @@ RedrawPartyMenu_: call PrintStatusCondition pop hl push hl - ld bc,20 + 1 ; down 1 row and right 1 column + ld bc,SCREEN_WIDTH + 1 ; down 1 row and right 1 column ld a,[hFlags_0xFFF6] set 0,a ld [hFlags_0xFFF6],a @@ -307,8 +307,8 @@ ReviveText: RareCandyText: TX_FAR _RareCandyText - db $0B - db $06 + TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded + TX_BLINK db "@" SetPartyMenuHPBarColor: diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 3078f1a9..438722bc 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -155,7 +155,7 @@ HandlePokedexListMenu: ld [H_AUTOBGTRANSFERENABLED],a ; draw the horizontal line separating the seen and owned amounts from the menu coord hl, 15, 8 - ld a,$7a ; horizontal line tile + ld a,"─" ld [hli],a ld [hli],a ld [hli],a @@ -267,7 +267,7 @@ HandlePokedexListMenu: inc hl call PlaceString pop hl - ld bc,2 * 20 + ld bc,2 * SCREEN_WIDTH add hl,bc pop de pop af @@ -344,7 +344,7 @@ HandlePokedexListMenu: DrawPokedexVerticalLine: ld c,9 ; height of line - ld de,20 ; width of screen + ld de,SCREEN_WIDTH ld a,$71 ; vertical line tile .loop ld [hl],a @@ -568,7 +568,8 @@ ShowPokedexDataInternal: ret HeightWeightText: - db "HT ?",$60,"??",$61,$4E,"WT ???lb@" + db "HT ?",$60,"??",$61 + next "WT ???lb@" ; XXX does anything point to this? PokeText: @@ -580,7 +581,7 @@ PokedexDataDividerLine: db $69,$6B,$69,$6B,$6B db $6B,$6B,$69,$6B,$69 db $6B,$69,$6B,$69,$6A - db $50 + db "@" ; draws a line of tiles ; INPUT: diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index b48fa99c..4a819ff7 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -44,7 +44,7 @@ CeladonPrizeMenu: RequireCoinCaseTextPtr: TX_FAR _RequireCoinCaseText - db $0D + TX_WAIT db "@" ExchangeCoinsForPrizesTextPtr: @@ -266,7 +266,7 @@ UnknownData52951: HereYouGoTextPtr: TX_FAR _HereYouGoText - db $0D + TX_WAIT db "@" SoYouWantPrizeTextPtr: @@ -275,17 +275,17 @@ SoYouWantPrizeTextPtr: SorryNeedMoreCoinsText: TX_FAR _SorryNeedMoreCoinsText - db $0D + TX_WAIT db "@" PrizeRoomBagIsFullTextPtr: TX_FAR _OopsYouDontHaveEnoughRoomText - db $0D + TX_WAIT db "@" OhFineThenTextPtr: TX_FAR _OhFineThenText - db $0D ; wait keypress (A/B) without blink + TX_WAIT db "@" GetPrizeMonLevel: diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 9ae6cbe5..685c9a96 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -675,7 +675,7 @@ TrainerInfo_NextTextBoxRow: ; hl = address of top tile in the line ; a = tile ID TrainerInfo_DrawVerticalLine: - ld de,20 + ld de,SCREEN_WIDTH ld c,8 .loop ld [hl],a diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index a7076d35..80e95123 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -211,10 +211,11 @@ Type2Text: db "TYPE2/", $4e IDNoText: - db $73, "№", "/", $4e + db $73, "№/", $4e OTText: - db "OT/", $4e, "@" + db "OT/" + next "@" StatusText: db "STATUS/@" diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index b32568f9..e57a8a6e 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -93,7 +93,8 @@ DrinkText: DrinkPriceText: db "¥200" next "¥300" - next "¥350",$4E,"@" + next "¥350" + next "@" VendingMachineText4: TX_FAR _VendingMachineText4 diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 31c00fd0..d6257368 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -157,7 +157,7 @@ OakSpeechText1: db "@" OakSpeechText2: TX_FAR _OakSpeechText2A - db $14 ; play NIDORINA cry from TextCommandSounds + TX_CRY_NIDORINA TX_FAR _OakSpeechText2B db "@" IntroducePlayerText: diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index 70b499a0..08067412 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -123,7 +123,8 @@ CableClubNPCPleaseApplyHereHaveToSaveText: CableClubNPCPleaseWaitText: TX_FAR _CableClubNPCPleaseWaitText - db $a, "@" + TX_DELAY + db "@" CableClubNPCLinkClosedBecauseOfInactivityText: TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 61e512de..35495c82 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -73,7 +73,7 @@ SilphCoMapList: CardKeySuccessText: TX_FAR _CardKeySuccessText1 - db $0b + TX_SFX_ITEM_1 TX_FAR _CardKeySuccessText2 db "@" diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 11e6ad55..9ad760bb 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -122,11 +122,12 @@ INCLUDE "data/hidden_coins.asm" FoundHiddenCoinsText: TX_FAR _FoundHiddenCoinsText - db $10,"@" + TX_SFX_ITEM_2 + db "@" DroppedHiddenCoinsText: TX_FAR _FoundHiddenCoins2Text - db $10 + TX_SFX_ITEM_2 TX_FAR _DroppedHiddenCoinsText db "@" diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index 63eecef9..9f19100a 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -46,7 +46,7 @@ PickUpItem: FoundItemText: TX_FAR _FoundItemText - db $0B + TX_SFX_ITEM_1 db "@" NoMoreRoomForItemText: diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index 54ba6b7a..f5068fda 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -63,7 +63,7 @@ OaksAideHereYouGoText: OaksAideGotItemText: TX_FAR _OaksAideGotItemText - db $0b + TX_SFX_ITEM_1 db "@" OaksAideNoRoomText: diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 3a302d70..f26bedf8 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -50,7 +50,7 @@ PokemonCenterWelcomeText: db "@" ShallWeHealYourPokemonText: - db $a + TX_DELAY TX_FAR _ShallWeHealYourPokemonText db "@" @@ -63,6 +63,6 @@ PokemonFightingFitText: db "@" PokemonCenterFarewellText: - db $a + TX_DELAY TX_FAR _PokemonCenterFarewellText db "@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 733cc29c..0a8b5cb9 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -610,7 +610,8 @@ SlotReward300Func: YeahText: TX_FAR _YeahText - db $0a, "@" + TX_DELAY + db "@" SlotMachine_PrintWinningSymbol: ; prints winning symbol and down arrow in text box @@ -627,7 +628,7 @@ SlotMachine_PrintWinningSymbol: inc a ld [hl], a coord hl, 18, 16 - ld [hl], $ee ; down arrow + ld [hl], "▼" ret SlotMachine_SubtractBetFromPlayerCoins: diff --git a/engine/town_map.asm b/engine/town_map.asm index b2f1e656..c73b27c8 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -179,9 +179,9 @@ LoadTownMap_Fly: ld c, 15 call DelayFrames coord hl, 18, 0 - ld [hl], $ed + ld [hl], "▲" coord hl, 19, 0 - ld [hl], $ee + ld [hl], "▼" pop hl .inputLoop push hl diff --git a/engine/trade2.asm b/engine/trade2.asm index 16d07b17..062d5285 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -43,7 +43,6 @@ Trade_PrintEnemyMonInfoText: jp PrintNumber Trade_MonInfoText: - db "──",$74,$F2,$4E - db $4E - db "OT/",$4E - db $73,"№",$F2,"@" + db "──№⠄",$4E + next "OT/" + next $73,"№⠄","@" diff --git a/home.asm b/home.asm index d5ecbaed..0d1d0b6c 100644 --- a/home.asm +++ b/home.asm @@ -968,7 +968,6 @@ PokeCenterSignText:: db "@" PickUpItemText:: -; XXX better label (what does predef $5C do?) TX_ASM predef PickUpItem jp TextScriptEnd @@ -1885,7 +1884,7 @@ PrintListMenuEntries:: jp nz,.loop ld bc,-8 add hl,bc - ld a,$ee ; down arrow + ld a,"▼" ld [hl],a ret .printCancelMenuItem @@ -4123,7 +4122,7 @@ EraseMenuCursor:: HandleDownArrowBlinkTiming:: ld a,[hl] ld b,a - ld a,$ee ; down arrow + ld a,"▼" cp b jr nz,.downArrowOff .downArrowOn @@ -4157,7 +4156,7 @@ HandleDownArrowBlinkTiming:: ret nz ld a,$06 ld [H_DOWNARROWBLINKCNT2],a - ld a,$ee ; down arrow + ld a,"▼" ld [hl],a ret diff --git a/home/text.asm b/home/text.asm index e9c0efdd..88db9377 100644 --- a/home/text.asm +++ b/home/text.asm @@ -11,7 +11,7 @@ TextBoxBorder:: ld [hl], a pop hl - ld de, 20 + ld de, SCREEN_WIDTH add hl, de ; middle rows @@ -24,7 +24,7 @@ TextBoxBorder:: ld [hl], "│" pop hl - ld de, 20 + ld de, SCREEN_WIDTH add hl, de dec b jr nz, .next @@ -268,7 +268,7 @@ Char58:: ld a,[wLinkState] cp LINK_STATE_BATTLING jp z,Next1AA2 - ld a,$EE + ld a,"▼" Coorda 18, 16 Next1AA2:: call ProtectedDelay3 @@ -286,7 +286,7 @@ Char58Text:: Char51:: push de - ld a,$EE + ld a,"▼" Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll @@ -301,7 +301,7 @@ Char51:: Char49:: push de - ld a,$EE + ld a,"▼" Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll @@ -317,7 +317,7 @@ Char49:: jp PlaceNextChar_inc Char4B:: - ld a,$EE + ld a,"▼" Coorda 18, 16 call ProtectedDelay3 push de @@ -328,29 +328,33 @@ Char4B:: ;fall through Char4C:: push de - call Next1B18 - call Next1B18 + call ScrollTextUp + call ScrollTextUp coord hl, 1, 16 pop de jp PlaceNextChar_inc -Next1B18:: - coord hl, 0, 14 - coord de, 0, 13 - ld b,60 -.next +; move both rows of text in the normal text box up one row +; always called twice in a row +; first time, copy the two rows of text to the "in between" rows that are usually emtpy +; second time, copy the bottom row of text into the top row of text +ScrollTextUp:: + coord hl, 0, 14 ; top row of text + coord de, 0, 13 ; empty line above text + ld b, SCREEN_WIDTH * 3 +.copyText ld a,[hli] ld [de],a inc de dec b - jr nz,.next + jr nz,.copyText coord hl, 1, 16 ld a, " " ld b,SCREEN_WIDTH - 2 -.next2 +.clearText ld [hli],a dec b - jr nz,.next2 + jr nz,.clearText ; wait five frames ld b,5 @@ -509,7 +513,7 @@ TextCommand06:: ld a,[wLinkState] cp a,LINK_STATE_BATTLING jp z,TextCommand0D - ld a,$ee ; down arrow + ld a,"▼" Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box push bc call ManualTextScroll ; blink arrow and wait for A or B to be pressed @@ -525,8 +529,8 @@ TextCommand06:: TextCommand07:: ld a," " Coorda 18, 16 ; place blank space in lower right corner of dialogue text box - call Next1B18 ; scroll up text - call Next1B18 + call ScrollTextUp + call ScrollTextUp pop hl coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand @@ -626,10 +630,10 @@ TextCommand0B:: ; format: text command ID, sound ID or cry ID TextCommandSounds:: - db $0B,SFX_GET_ITEM_1 + db $0B,SFX_GET_ITEM_1 ; actually plays SFX_LEVEL_UP when the battle music engine is loaded db $12,SFX_CAUGHT_MON - db $0E,SFX_POKEDEX_RATING - db $0F,SFX_GET_ITEM_1 + db $0E,SFX_POKEDEX_RATING ; unused? + db $0F,SFX_GET_ITEM_1 ; unused? db $10,SFX_GET_ITEM_2 db $11,SFX_GET_KEY_ITEM db $13,SFX_DEX_PAGE_ADDED @@ -648,7 +652,7 @@ TextCommand0C:: ld h,b ld l,c .loop - ld a,$75 ; ellipsis + ld a,"…" ld [hli],a push de call Joypad diff --git a/macros.asm b/macros.asm index 8475582c..481f9494 100644 --- a/macros.asm +++ b/macros.asm @@ -1,16 +1,4 @@ -text EQUS "db $00," ; Start writing text. -next EQUS "db $4e," ; Move a line down. -line EQUS "db $4f," ; Start writing at the bottom line. -para EQUS "db $51," ; Start a new paragraph. -cont EQUS "db $55," ; Scroll to the next line. -done EQUS "db $57" ; End a text box. -prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). - -page EQUS "db $49," ; Start a new Pokedex page. -dex EQUS "db $5f, $50" ; End a Pokedex entry. - - percent EQUS "* $ff / 100" lb: MACRO ; r, hi, lo @@ -180,23 +168,17 @@ RGB: MACRO ENDM ; text macros -TX_NUM: MACRO -; print a big-endian decimal number. -; \1: address to read from -; \2: number of bytes to read -; \3: number of digits to display - db $09 - dw \1 - db \2 << 4 | \3 - ENDM +text EQUS "db $00," ; Start writing text. +next EQUS "db $4e," ; Move a line down. +line EQUS "db $4f," ; Start writing at the bottom line. +para EQUS "db $51," ; Start a new paragraph. +cont EQUS "db $55," ; Scroll to the next line. +done EQUS "db $57" ; End a text box. +prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). -TX_FAR: MACRO - db $17 - dw \1 - db BANK(\1) - ENDM +page EQUS "db $49," ; Start a new Pokedex page. +dex EQUS "db $5f, $50" ; End a Pokedex entry. -; text engine command $1 TX_RAM: MACRO ; prints text to screen ; \1: RAM address to read from @@ -212,22 +194,40 @@ TX_BCD: MACRO db \2 ENDM -TX_MART: MACRO - db $FE, _NARG - rept _NARG - db \1 - shift - endr - db $FF +TX_LINE EQUS "db $05" +TX_BLINK EQUS "db $06" +;TX_SCROLL EQUS "db $07" +TX_ASM EQUS "db $08" + +TX_NUM: MACRO +; print a big-endian decimal number. +; \1: address to read from +; \2: number of bytes to read +; \3: number of digits to display + db $09 + dw \1 + db \2 << 4 | \3 ENDM -TX_LINE EQUS "db $05" -TX_BUTTON_SOUND EQUS "db $06" -TX_ASM EQUS "db $08" -TX_SFX_ITEM EQUS "db $0b" -TX_WAIT_BUTTON EQUS "db $0d" -TX_SFX_CONGRATS EQUS "db $10" -TX_SFX_KEY_ITEM EQUS "db $11" +TX_DELAY EQUS "db $0a" +TX_SFX_ITEM_1 EQUS "db $0b" +TX_SFX_LEVEL_UP EQUS "db $0b" +;TX_ELLIPSES EQUS "db $0c" +TX_WAIT EQUS "db $0d" +;TX_SFX_DEX_RATING EQUS "db $0e" +TX_SFX_ITEM_2 EQUS "db $10" +TX_SFX_KEY_ITEM EQUS "db $11" +TX_SFX_CAUGHT_MON EQUS "db $12" +TX_SFX_DEX_PAGE_ADDED EQUS "db $13" +TX_CRY_NIDORINA EQUS "db $14" +TX_CRY_PIDGEOT EQUS "db $15" +;TX_CRY_DEWGONG EQUS "db $16" + +TX_FAR: MACRO + db $17 + dw \1 + db BANK(\1) + ENDM TX_VENDING_MACHINE EQUS "db $f5" TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" @@ -235,6 +235,16 @@ TX_PRIZE_VENDOR EQUS "db $f7" TX_POKECENTER_PC EQUS "db $f9" TX_PLAYERS_PC EQUS "db $fc" TX_BILLS_PC EQUS "db $fd" + +TX_MART: MACRO + db $FE, _NARG + rept _NARG + db \1 + shift + endr + db $FF + ENDM + TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. diff --git a/main.asm b/main.asm index 6c51de59..9ec59437 100755 --- a/main.asm +++ b/main.asm @@ -1702,19 +1702,26 @@ TwoOptionMenuStrings: dw .NoYesMenu .NoYesMenu - db "NO",$4E,"YES@" + db "NO" + next "YES@" .YesNoMenu - db "YES",$4E,"NO@" + db "YES" + next "NO@" .NorthWestMenu - db "NORTH",$4E,"WEST@" + db "NORTH" + next "WEST@" .SouthEastMenu - db "SOUTH",$4E,"EAST@" + db "SOUTH" + next "EAST@" .NorthEastMenu - db "NORTH",$4E,"EAST@" + db "NORTH" + next "EAST@" .TradeCancelMenu - db "TRADE",$4E,"CANCEL@" + db "TRADE" + next "CANCEL@" .HealCancelMenu - db "HEAL",$4E,"CANCEL@" + db "HEAL" + next "CANCEL@" DisplayFieldMoveMonMenu: xor a diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 866c04b0..4d6853be 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -103,7 +103,8 @@ BikeShopText_1d81f: BikeShopText_1d824: TX_FAR _BikeShopText_1d824 - db $11, "@" + TX_SFX_KEY_ITEM + db "@" BikeShopComeAgainText: TX_FAR _BikeShopComeAgainText diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index c2d10f0e..2b60ef8c 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -192,7 +192,7 @@ BillThankYouText: SSTicketReceivedText: TX_FAR _SSTicketReceivedText TX_SFX_KEY_ITEM - TX_BUTTON_SOUND + TX_BLINK db "@" SSTicketNoRoomText: diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index d904f484..6ef679dc 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -69,7 +69,8 @@ TM41PreText: ReceivedTM41Text: TX_FAR _ReceivedTM41Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM41ExplanationText: TX_FAR _TM41ExplanationText diff --git a/scripts/celadondiner.asm b/scripts/celadondiner.asm index 55263560..6fd594f7 100755 --- a/scripts/celadondiner.asm +++ b/scripts/celadondiner.asm @@ -54,7 +54,8 @@ CeladonDinerText_491a7: ReceivedCoinCaseText: TX_FAR _ReceivedCoinCaseText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" CoinCaseNoRoomText: TX_FAR _CoinCaseNoRoomText diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 0c4fd963..09d2df37 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -267,7 +267,7 @@ CeladonGameCornerText_48d9c: Received10CoinsText: TX_FAR _Received10CoinsText - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48da7: @@ -345,7 +345,7 @@ CeladonGameCornerText_48e26: Received20CoinsText: TX_FAR _Received20CoinsText - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48e31: @@ -397,7 +397,7 @@ CeladonGameCornerText_48e88: CeladonGameCornerText_48e8d: TX_FAR _CeladonGameCornerText_48e8d - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48e93: diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 903ef508..8f6e9e53 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -201,7 +201,7 @@ CeladonGymText9: TM21Text: TX_FAR _ReceivedTM21Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM21ExplanationText db "@" diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 7b5d5294..a1fe048b 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -47,7 +47,7 @@ DirectorText: .CompletedDexText TX_FAR _CompletedDexText - db $6 + TX_BLINK TX_ASM callab DisplayDiploma ld a, $1 diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 7b9940fa..6af58f21 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -47,7 +47,8 @@ TM18PreReceiveText: ReceivedTM18Text: TX_FAR _ReceivedTM18Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM18ExplanationText: TX_FAR _TM18ExplanationText diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 1f3bcb64..9034e8fc 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -139,48 +139,48 @@ CeladonMartRoofText_484ee: CeladonMartRoofText_484f3: TX_FAR _CeladonMartRoofText_484f3 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_484f9: TX_FAR _CeladonMartRoofText_484f9 - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _CeladonMartRoofText_484fe - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_48504: TX_FAR _CeladonMartRoofText_48504 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_4850a: TX_FAR _CeladonMartRoofText_4850a - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _CeladonMartRoofText_4850f - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_48515: TX_FAR _CeladonMartRoofText_48515 - TX_WAIT_BUTTON + TX_WAIT db "@" ReceivedTM49Text: TX_FAR _ReceivedTM49Text - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _CeladonMartRoofText_48520 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_48526: TX_FAR _CeladonMartRoofText_48526 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_4852c: TX_FAR _CeladonMartRoofText_4852c - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofScript_PrintDrinksInBag: diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 94f90f2b..d6269a64 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -320,9 +320,10 @@ CeruleanCityText_196d9: ReceivedTM28Text: TX_FAR _ReceivedTM28Text - db $0B + TX_SFX_ITEM_1 TX_FAR _ReceivedTM28Text2 - db $0D, "@" + TX_WAIT + db "@" TM28NoRoomText: TX_FAR _TM28NoRoomText @@ -356,13 +357,13 @@ CeruleanCityText6: CeruleanCityText7: TX_ASM ld a, [hRandomAdd] - cp $b4 + cp 180 jr c, .asm_e9fc9 ld hl, CeruleanCityText_19730 call PrintText jr .asm_d486e .asm_e9fc9 - cp $64 + cp 100 jr c, .asm_df99b ld hl, CeruleanCityText_19735 call PrintText @@ -388,19 +389,19 @@ CeruleanCityText_1973a: CeruleanCityText8: TX_ASM ld a, [hRandomAdd] - cp $b4 + cp 180 jr c, .asm_e28da ld hl, CeruleanCityText_1976f call PrintText jr .asm_f2f38 .asm_e28da - cp $78 + cp 120 jr c, .asm_15d08 ld hl, CeruleanCityText_19774 call PrintText jr .asm_f2f38 .asm_15d08 - cp $3c + cp 60 jr c, .asm_d7fea ld hl, CeruleanCityText_19779 call PrintText diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index ee71595f..fe6a163e 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -150,7 +150,8 @@ CeruleanGymText5: CeruleanGymText6: ReceivedTM11Text: TX_FAR _ReceivedTM11Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" CeruleanGymText7: TX_FAR _CeruleanGymText_5c7d3 @@ -158,7 +159,9 @@ CeruleanGymText7: CeruleanGymText_5c7d8: TX_FAR _CeruleanGymText_5c7d8 - db $11, $6, "@" + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK + db "@" CeruleanGymText2: TX_ASM diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 4cae9989..8af7bbd3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -233,8 +233,8 @@ BlaineBattleText: BlaineEndBattleText: TX_FAR _BlaineEndBattleText - db $11 - db $d + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_WAIT db "@" BlaineFireBlastText: @@ -247,7 +247,7 @@ BlaineBadgeText: ReceivedTM38Text: TX_FAR _ReceivedTM38Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM38ExplanationText db "@" diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index 830bad50..87946b8f 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -53,10 +53,11 @@ TM31PreReceiveText: ReceivedTM31Text: TX_FAR _ReceivedTM31Text - db $0B + TX_SFX_ITEM_1 TM31ExplanationText1: TX_FAR _TM31ExplanationText1 - db $d, "@" + TX_WAIT + db "@" TM31ExplanationText2: TX_FAR _TM31ExplanationText2 @@ -64,7 +65,8 @@ TM31ExplanationText2: TM31NoRoomText: TX_FAR _TM31NoRoomText - db $d, "@" + TX_WAIT + db "@" CopycatsHouse2FText2: TX_FAR _CopycatsHouse2FText2 diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index f4244e46..b6d65586 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -144,7 +144,7 @@ FanClubText5: .receivedvouchertext TX_FAR ReceivedBikeVoucherText - db $11 + TX_SFX_KEY_ITEM TX_FAR ExplainBikeVoucherText db "@" diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 8268930d..5f9823ad 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -193,7 +193,7 @@ FuchsiaGymText9: FuchsiaGymText10: TX_FAR _ReceivedTM06Text - db $11 + TX_SFX_KEY_ITEM TM06ExplanationText: TX_FAR _TM06ExplanationText diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 7e90aa84..f9307c04 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -69,7 +69,7 @@ WardenGibberishText3: WardenTeethText1: TX_FAR _WardenTeethText1 - db $0b + TX_SFX_ITEM_1 WardenTeethText2: TX_FAR _WardenTeethText2 @@ -81,7 +81,8 @@ WardenThankYouText: ReceivedHM04Text: TX_FAR _ReceivedHM04Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" HM04ExplanationText: TX_FAR _HM04ExplanationText diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm index fe1da024..586d62f5 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/fuchsiahouse3.asm @@ -49,7 +49,7 @@ FuchsiaHouse3Text_561bd: FuchsiaHouse3Text_561c2: TX_FAR _FuchsiaHouse3Text_561c2 - db $0B + TX_SFX_ITEM_1 db "@" UnusedText_561c8: diff --git a/scripts/lab3.asm b/scripts/lab3.asm index dbd0913d..b533d162 100755 --- a/scripts/lab3.asm +++ b/scripts/lab3.asm @@ -37,7 +37,8 @@ TM35PreReceiveText: ReceivedTM35Text: TX_FAR _ReceivedTM35Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM35ExplanationText: TX_FAR _TM35ExplanationText diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm index 65637018..91b9286b 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/lavenderhouse1.asm @@ -95,7 +95,7 @@ LavenderHouse1Text_1d94c: ReceivedFluteText: TX_FAR _ReceivedFluteText - db $11 + TX_SFX_KEY_ITEM TX_FAR _FluteExplanationText db "@" diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 27651ef9..de36db4f 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -323,7 +323,9 @@ MtMoon3Script_49f69: MtMoon3Text_49f6f: TX_FAR _MtMoon3Text_49f6f - db $11, $d, "@" + TX_SFX_KEY_ITEM + TX_WAIT + db "@" MtMoon3Script_49f76: ld hl, MtMoon3Text_49f7f @@ -332,7 +334,8 @@ MtMoon3Script_49f76: MtMoon3Text_49f7f: TX_FAR _MtMoon3Text_49f7f - db $d, "@" + TX_WAIT + db "@" MtMoon3Text_49f85: TX_FAR _MtMoon3Text_49f85 @@ -352,7 +355,8 @@ MtMoon3Text_49f94: MtMoon3Text_49f99: TX_FAR _MtMoon3Text_49f99 - db $11, "@" + TX_SFX_KEY_ITEM + db "@" MtMoon3BattleText2: TX_FAR _MtMoon3BattleText2 diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index f24cc2c3..35bfb446 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -215,7 +215,8 @@ Museum1FText_5c28e: ReceivedOldAmberText: TX_FAR _ReceivedOldAmberText - db $0B, "@" + TX_SFX_ITEM_1 + db "@" Museum1FText_5c299: TX_FAR _Museum1FText_5c299 diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 7e5becf2..ac035550 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -149,7 +149,7 @@ PewterGymText4: PewterGymText5: TX_FAR _ReceivedTM34Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM34ExplanationText db "@" @@ -159,7 +159,7 @@ PewterGymText6: PewterGymText_5c4bc: TX_FAR _PewterGymText_5c4bc - db $0B + TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded TX_FAR _PewterGymText_5c4c1 db "@" diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 35c9026a..6aa7c813 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -130,7 +130,8 @@ RocketHideout1EndBattleText6: ret RocketHideout1Text_44c9f: - db $6, "@" + TX_BLINK + db "@" RocketHideout1BattleText2: TX_FAR _RocketHideout1BattleText2 diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 526ac3cc..aed0f0cf 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -81,4 +81,5 @@ RocketHideoutElevatorText1: RocketHideoutElevatorText_4578b: TX_FAR _RocketElevatorText_4578b - db $d, "@" + TX_WAIT + db "@" diff --git a/scripts/route1.asm b/scripts/route1.asm index a4d6cde5..7f988fab 100755 --- a/scripts/route1.asm +++ b/scripts/route1.asm @@ -32,7 +32,8 @@ Route1ViridianMartSampleText: Route1Text_1cae8: TX_FAR _Route1Text_1cae8 - db $0b,"@" + TX_SFX_ITEM_1 + db "@" Route1Text_1caee: TX_FAR _Route1Text_1caee diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index 3c6c6231..cd355265 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -35,7 +35,8 @@ TM39PreReceiveText: ReceivedTM39Text: TX_FAR _ReceivedTM39Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM39ExplanationText: TX_FAR _TM39ExplanationText diff --git a/scripts/route12house.asm b/scripts/route12house.asm index 7ee86731..4b93395f 100755 --- a/scripts/route12house.asm +++ b/scripts/route12house.asm @@ -40,7 +40,7 @@ Route12HouseText_564c0: Route12HouseText_564c5: TX_FAR _Route12HouseText_564c5 - db $0B + TX_SFX_ITEM_1 TX_FAR _Route12HouseText_564ca db "@" diff --git a/scripts/route16house.asm b/scripts/route16house.asm index d8c9d5ed..5359248c 100755 --- a/scripts/route16house.asm +++ b/scripts/route16house.asm @@ -30,7 +30,8 @@ Route16HouseText3: ReceivedHM02Text: TX_FAR _ReceivedHM02Text - db $11, "@" + TX_SFX_KEY_ITEM + db "@" HM02ExplanationText: TX_FAR _HM02ExplanationText diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index ae9952a5..ee2e5b6b 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -89,4 +89,5 @@ Route22GateText_1e715: Route22GateText_1e71a: TX_FAR _Route22GateText_1e71a - db $0B, "@" + TX_SFX_ITEM_1 + db "@" diff --git a/scripts/route23.asm b/scripts/route23.asm index ed94d95c..4eb6b5f7 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -227,7 +227,7 @@ VictoryRoadGuardText1: VictoryRoadGuardText2: TX_FAR _VictoryRoadGuardText2 - db $b + TX_SFX_ITEM_1 TX_FAR _VictoryRoadGuardText_513a3 db "@" diff --git a/scripts/route24.asm b/scripts/route24.asm index 711fb1ea..7f1400f2 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -185,13 +185,15 @@ Route24Text1: Route24Text_51510: TX_FAR _Route24Text_51510 - db $0B + TX_SFX_ITEM_1 TX_FAR _Route24Text_51515 db "@" Route24Text_5151a: TX_FAR _Route24Text_5151a - db $0B, $6, "@" + TX_SFX_ITEM_1 + TX_BLINK + db "@" Route24Text_51521: TX_FAR _Route24Text_51521 diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index ae75aff2..6072f943 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -106,7 +106,7 @@ Route7GateText3: Route6GateText3: Route5GateText3: TX_FAR _SaffronGateText_8aaa9 - db $11 + TX_SFX_KEY_ITEM TX_FAR _SaffronGateText_1dff1 db "@" diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 5f800987..80551e69 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -209,7 +209,7 @@ SafariZoneEntranceTextPointers: .MakePaymentText TX_FAR SafariZoneEntranceText_9e747 - db $b + TX_SFX_ITEM_1 TX_FAR _SafariZoneEntranceText_75360 db "@" diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm index 37013b3b..44c89281 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/safarizonesecrethouse.asm @@ -33,7 +33,8 @@ SafariZoneSecretHouseText_4a350: ReceivedHM03Text: TX_FAR _ReceivedHM03Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" HM03ExplanationText: TX_FAR _HM03ExplanationText diff --git a/scripts/saffroncity.asm b/scripts/saffroncity.asm index 4653f150..57a1a3a5 100755 --- a/scripts/saffroncity.asm +++ b/scripts/saffroncity.asm @@ -74,7 +74,8 @@ SaffronCityText11: SaffronCityText12: TX_FAR _SaffronCityText12 - db $15, "@" ; play PIDGEOT cry from TextCommandSounds + TX_CRY_PIDGEOT + db "@" SaffronCityText13: TX_FAR _SaffronCityText13 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 146d31f9..6adb6d52 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -189,8 +189,8 @@ SaffronGymText_5d162: SaffronGymText_5d167: TX_FAR _SaffronGymText_5d167 - db $11 ; play same sound as red giving oak parcel - db $6 ; wait for keypress + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK db "@" SaffronGymText_5d16e: @@ -203,7 +203,7 @@ SaffronGymText10: SaffronGymText11: TX_FAR ReceivedTM46Text - db $b + TX_SFX_ITEM_1 TX_FAR _TM46ExplanationText db "@" diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm index b4f6e31c..10c3d29e 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/saffronhouse2.asm @@ -33,7 +33,8 @@ TM29PreReceiveText: ReceivedTM29Text: TX_FAR _ReceivedTM29Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM29ExplanationText: TX_FAR _TM29ExplanationText diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 994cd215..5f924bfc 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -330,7 +330,8 @@ SilphCoPresidentText: ReceivedSilphCoMasterBallText: TX_FAR _ReceivedSilphCoMasterBallText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" SilphCo10Text_6231c: TX_FAR _SilphCo10Text_6231c diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index 3a5d3650..c8d72689 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -162,7 +162,8 @@ SilphCo2Text_59ded: ReceivedTM36Text: TX_FAR _ReceivedTM36Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM36ExplanationText: TX_FAR _TM36ExplanationText diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index a2fb1387..0df842c2 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -73,7 +73,8 @@ ReceivingHM01Text: ReceivedHM01Text: TX_FAR _ReceivedHM01Text - db $11, "@" + TX_SFX_KEY_ITEM + db "@" SSAnne7Text_61932: TX_FAR _SSAnne7Text_61932 diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index eb726831..99bd4008 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -179,7 +179,7 @@ VermilionGymText6: VermilionGymText7: TX_FAR _ReceivedTM24Text - db $11 + TX_SFX_KEY_ITEM TX_FAR _TM24ExplanationText db "@" diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm index 007df5ec..c0735f32 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/vermilionhouse2.asm @@ -40,7 +40,7 @@ VermilionHouse2Text_560b1: VermilionHouse2Text_560b6: TX_FAR _VermilionHouse2Text_560b6 - db $0B + TX_SFX_ITEM_1 TX_FAR _VermilionHouse2Text_560bb db "@" diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index cd629d7e..3ccdc509 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -258,7 +258,8 @@ ViridianCityText_191ca: ReceivedTM42Text: TX_FAR _ReceivedTM42Text - db $10, "@" + TX_SFX_ITEM_2 + db "@" TM42Explanation: TX_FAR _TM42Explanation diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 1557f68a..3d845c2a 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -307,11 +307,13 @@ ViridianGymText_74ace: ViridianGymText_74ad3: TX_FAR _ViridianGymText_74ad3 - db $0b, "@" + TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + db "@" ViridianGymText_74ad9: TX_FAR _ViridianGymText_74ad9 - db $0d, "@" + TX_WAIT + db "@" ViridianGymText12: TX_FAR _ViridianGymText12 @@ -319,7 +321,7 @@ ViridianGymText12: ViridianGymText13: TX_FAR _ReceivedTM27Text - db $0b + TX_SFX_ITEM_1 TM27ExplanationText: TX_FAR _TM27ExplanationText diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 542040a6..451ab989 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -81,7 +81,7 @@ ViridianMartText4: ViridianMartText5: TX_FAR ViridianMartParcelQuestText - db $11 + TX_SFX_KEY_ITEM db "@" ViridianMartText2: -- cgit v1.2.3 From 25c27785aa83a12330ea58e1e35b2fec90dd84f4 Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 18 Jul 2016 01:48:34 -0500 Subject: A few missed hardcoded decimal points --- engine/menu/naming_screen.asm | 4 ++-- engine/menu/pokedex.asm | 4 ++-- engine/menu/status_screen.asm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 758a2d8d..2628da48 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -366,10 +366,10 @@ PrintAlphabet: jp Delay3 LowerCaseAlphabet: - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@" + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@" + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" PrintNicknameAndUnderscores: call CalcStringLength diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index e689b713..2da3a0f6 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -478,7 +478,7 @@ ShowPokedexDataInternal: coord hl, 2, 8 ld a, "№" ld [hli],a - ld a,$f2 + ld a,"⠄" ld [hli],a ld de,wd11e lb bc, LEADING_ZEROES | 1, 3 @@ -558,7 +558,7 @@ ShowPokedexDataInternal: inc hl ld a,[hli] ld [hld],a ; make space for the decimal point by moving the last digit forward one tile - ld [hl],$f2 ; decimal point tile + ld [hl],"⠄" ; decimal point tile pop af ld [hDexWeight + 1],a ; restore original value of [hDexWeight + 1] pop af diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index d37648a6..ef94f13c 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -110,7 +110,7 @@ StatusScreen: call DrawLineBox ; Draws the box around name, HP and status ld de, -6 add hl, de - ld [hl], $f2 ; . after No ("." is a different one) + ld [hl], "⠄" ; . after No ("." is a different one) dec hl ld [hl], "№" coord hl, 19, 9 -- cgit v1.2.3 From 70dde9d96b0e3025c72ae29783e94c56fa5cbe1c Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 20 Jul 2016 00:40:04 -0500 Subject: Clean up redundant labels fix trainer header numbering --- constants/event_constants.asm | 212 +++++++++++++++++++++--------------------- home.asm | 1 - scripts/agatha.asm | 3 +- scripts/bruno.asm | 3 +- scripts/celadongym.asm | 53 ++++++----- scripts/ceruleangym.asm | 4 +- scripts/fightingdojo.asm | 3 +- scripts/fuchsiagym.asm | 45 +++++---- scripts/lance.asm | 3 +- scripts/lorelei.asm | 3 +- scripts/mansion1.asm | 3 +- scripts/mansion2.asm | 3 +- scripts/mansion3.asm | 9 +- scripts/mansion4.asm | 9 +- scripts/mtmoon1.asm | 49 +++++----- scripts/mtmoon3.asm | 25 +++-- scripts/pewtercity.asm | 4 +- scripts/pewtergym.asm | 3 +- scripts/pokemontower3.asm | 3 +- scripts/pokemontower4.asm | 3 +- scripts/pokemontower5.asm | 3 +- scripts/pokemontower6.asm | 3 +- scripts/pokemontower7.asm | 3 +- scripts/powerplant.asm | 3 +- scripts/rockethideout1.asm | 39 ++++---- scripts/rockethideout2.asm | 3 +- scripts/rockethideout3.asm | 11 +-- scripts/rockethideout4.asm | 19 ++-- scripts/rocktunnel1.asm | 59 ++++++------ scripts/rocktunnel2.asm | 59 ++++++------ scripts/route10.asm | 3 +- scripts/route11.asm | 3 +- scripts/route12.asm | 3 +- scripts/route13.asm | 75 ++++++++------- scripts/route14.asm | 3 +- scripts/route15.asm | 3 +- scripts/route16.asm | 3 +- scripts/route17.asm | 3 +- scripts/route18.asm | 3 +- scripts/route19.asm | 3 +- scripts/route20.asm | 73 +++++++-------- scripts/route21.asm | 3 +- scripts/route24.asm | 43 +++++---- scripts/route25.asm | 67 +++++++------ scripts/route3.asm | 57 ++++++------ scripts/route4.asm | 3 +- scripts/route6.asm | 3 +- scripts/route8.asm | 3 +- scripts/route9.asm | 67 +++++++------ scripts/saffrongym.asm | 1 - scripts/silphco10.asm | 3 +- scripts/silphco11.asm | 3 +- scripts/silphco2.asm | 3 +- scripts/silphco3.asm | 3 +- scripts/silphco4.asm | 19 ++-- scripts/silphco5.asm | 31 +++--- scripts/silphco6.asm | 19 ++-- scripts/silphco7.asm | 27 +++--- scripts/silphco8.asm | 1 - scripts/silphco9.asm | 3 +- scripts/ssanne10.asm | 3 +- scripts/ssanne5.asm | 1 - scripts/ssanne8.asm | 3 +- scripts/ssanne9.asm | 3 +- scripts/unknowndungeon3.asm | 3 +- scripts/vermiliongym.asm | 1 - scripts/victoryroad1.asm | 3 +- scripts/victoryroad2.asm | 35 ++++--- scripts/victoryroad3.asm | 27 +++--- scripts/viridianforest.asm | 3 +- scripts/viridiangym.asm | 3 +- text/maps/pewter_city.asm | 2 +- 72 files changed, 596 insertions(+), 668 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 47448d09..5b73012b 100755 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -427,12 +427,12 @@ const_value = 0 const EVENT_GOT_TM21 ; 1A8, (D77C, bit 0) const EVENT_BEAT_ERIKA ; 1A9, (D77C, bit 1) const EVENT_BEAT_CELADON_GYM_TRAINER_0 ; 1AA, (D77C, bit 2) - const EVENT_BEAT_CELADON_GYM_TRAINER_2 ; 1AB, (D77C, bit 3) - const EVENT_BEAT_CELADON_GYM_TRAINER_3 ; 1AC, (D77C, bit 4) - const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AD, (D77C, bit 5) - const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AE, (D77C, bit 6) - const EVENT_BEAT_CELADON_GYM_TRAINER_6 ; 1AF, (D77C, bit 7) - const EVENT_BEAT_CELADON_GYM_TRAINER_7 ; 1B0, (D77D, bit 0) + const EVENT_BEAT_CELADON_GYM_TRAINER_1 ; 1AB, (D77C, bit 3) + const EVENT_BEAT_CELADON_GYM_TRAINER_2 ; 1AC, (D77C, bit 4) + const EVENT_BEAT_CELADON_GYM_TRAINER_3 ; 1AD, (D77C, bit 5) + const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AE, (D77C, bit 6) + const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AF, (D77C, bit 7) + const EVENT_BEAT_CELADON_GYM_TRAINER_6 ; 1B0, (D77D, bit 0) const EVENT_1B1 ; 1B1, (D77D, bit 1) const EVENT_1B2 ; 1B2, (D77D, bit 2) const EVENT_1B3 ; 1B3, (D77D, bit 3) @@ -603,11 +603,11 @@ const_value = 0 const EVENT_GOT_TM06 ; 258, (D792, bit 0) const EVENT_BEAT_KOGA ; 259, (D792, bit 1) const EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 ; 25A, (D792, bit 2) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 ; 25B, (D792, bit 3) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 ; 25C, (D792, bit 4) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25D, (D792, bit 5) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 ; 25E, (D792, bit 6) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 ; 25F, (D792, bit 7) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 ; 25B, (D792, bit 3) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 ; 25C, (D792, bit 4) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 ; 25D, (D792, bit 5) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25E, (D792, bit 6) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 ; 25F, (D792, bit 7) const EVENT_260 ; 260, (D793, bit 0) const EVENT_261 ; 261, (D793, bit 1) const EVENT_262 ; 262, (D793, bit 2) @@ -995,13 +995,13 @@ const_value = 0 const EVENT_3E0 ; 3E0, (D7C3, bit 0) const EVENT_3E1 ; 3E1, (D7C3, bit 1) const EVENT_BEAT_ROUTE_3_TRAINER_0 ; 3E2, (D7C3, bit 2) - const EVENT_BEAT_ROUTE_3_TRAINER_2 ; 3E3, (D7C3, bit 3) - const EVENT_BEAT_ROUTE_3_TRAINER_3 ; 3E4, (D7C3, bit 4) - const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E5, (D7C3, bit 5) - const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E6, (D7C3, bit 6) - const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E7, (D7C3, bit 7) - const EVENT_BEAT_ROUTE_3_TRAINER_7 ; 3E8, (D7C4, bit 0) - const EVENT_BEAT_ROUTE_3_TRAINER_8 ; 3E9, (D7C4, bit 1) + const EVENT_BEAT_ROUTE_3_TRAINER_1 ; 3E3, (D7C3, bit 3) + const EVENT_BEAT_ROUTE_3_TRAINER_2 ; 3E4, (D7C3, bit 4) + const EVENT_BEAT_ROUTE_3_TRAINER_3 ; 3E5, (D7C3, bit 5) + const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E6, (D7C3, bit 6) + const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E7, (D7C3, bit 7) + const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E8, (D7C4, bit 0) + const EVENT_BEAT_ROUTE_3_TRAINER_7 ; 3E9, (D7C4, bit 1) const EVENT_3EA ; 3EA, (D7C4, bit 2) const EVENT_3EB ; 3EB, (D7C4, bit 3) const EVENT_3EC ; 3EC, (D7C4, bit 4) @@ -1090,14 +1090,14 @@ const_value = 0 const EVENT_43F ; 43F, (D7CE, bit 7) const EVENT_440 ; 440, (D7CF, bit 0) const EVENT_BEAT_ROUTE_9_TRAINER_0 ; 441, (D7CF, bit 1) - const EVENT_BEAT_ROUTE_9_TRAINER_2 ; 442, (D7CF, bit 2) - const EVENT_BEAT_ROUTE_9_TRAINER_3 ; 443, (D7CF, bit 3) - const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 444, (D7CF, bit 4) - const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 445, (D7CF, bit 5) - const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 446, (D7CF, bit 6) - const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 447, (D7CF, bit 7) - const EVENT_BEAT_ROUTE_9_TRAINER_8 ; 448, (D7D0, bit 0) - const EVENT_BEAT_ROUTE_9_TRAINER_9 ; 449, (D7D0, bit 1) + const EVENT_BEAT_ROUTE_9_TRAINER_1 ; 442, (D7CF, bit 2) + const EVENT_BEAT_ROUTE_9_TRAINER_2 ; 443, (D7CF, bit 3) + const EVENT_BEAT_ROUTE_9_TRAINER_3 ; 444, (D7CF, bit 4) + const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 445, (D7CF, bit 5) + const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 446, (D7CF, bit 6) + const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 447, (D7CF, bit 7) + const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 448, (D7D0, bit 0) + const EVENT_BEAT_ROUTE_9_TRAINER_8 ; 449, (D7D0, bit 1) const EVENT_44A ; 44A, (D7D0, bit 2) const EVENT_44B ; 44B, (D7D0, bit 3) const EVENT_44C ; 44C, (D7D0, bit 4) @@ -1113,13 +1113,13 @@ const_value = 0 const EVENT_BEAT_ROUTE_10_TRAINER_5 ; 456, (D7D1, bit 6) const EVENT_457 ; 457, (D7D1, bit 7) const EVENT_458 ; 458, (D7D2, bit 0) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 ; 459, (D7D2, bit 1) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 ; 45A, (D7D2, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45B, (D7D2, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45C, (D7D2, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45D, (D7D2, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 ; 459, (D7D2, bit 1) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 ; 45A, (D7D2, bit 2) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 ; 45B, (D7D2, bit 3) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45C, (D7D2, bit 4) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45D, (D7D2, bit 5) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45E, (D7D2, bit 6) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45F, (D7D2, bit 7) const EVENT_460 ; 460, (D7D3, bit 0) const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1) const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2) @@ -1170,15 +1170,15 @@ const_value = 0 const EVENT_BEAT_ROUTE12_SNORLAX ; 48F, (D7D8, bit 7) const EVENT_490 ; 490, (D7D9, bit 0) const EVENT_BEAT_ROUTE_13_TRAINER_0 ; 491, (D7D9, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_2 ; 492, (D7D9, bit 2) - const EVENT_BEAT_ROUTE_13_TRAINER_3 ; 493, (D7D9, bit 3) - const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 494, (D7D9, bit 4) - const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 495, (D7D9, bit 5) - const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 496, (D7D9, bit 6) - const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 497, (D7D9, bit 7) - const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 498, (D7DA, bit 0) - const EVENT_BEAT_ROUTE_13_TRAINER_9 ; 499, (D7DA, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_10 ; 49A, (D7DA, bit 2) + const EVENT_BEAT_ROUTE_13_TRAINER_1 ; 492, (D7D9, bit 2) + const EVENT_BEAT_ROUTE_13_TRAINER_2 ; 493, (D7D9, bit 3) + const EVENT_BEAT_ROUTE_13_TRAINER_3 ; 494, (D7D9, bit 4) + const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 495, (D7D9, bit 5) + const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 496, (D7D9, bit 6) + const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 497, (D7D9, bit 7) + const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 498, (D7DA, bit 0) + const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 499, (D7DA, bit 1) + const EVENT_BEAT_ROUTE_13_TRAINER_9 ; 49A, (D7DA, bit 2) const EVENT_49B ; 49B, (D7DA, bit 3) const EVENT_49C ; 49C, (D7DA, bit 4) const EVENT_49D ; 49D, (D7DA, bit 5) @@ -1282,15 +1282,15 @@ const_value = 0 const EVENT_4FF ; 4FF, (D7E6, bit 7) const EVENT_IN_SEAFOAM_ISLANDS ; 500, (D7E7, bit 0) const EVENT_BEAT_ROUTE_20_TRAINER_0 ; 501, (D7E7, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_2 ; 502, (D7E7, bit 2) - const EVENT_BEAT_ROUTE_20_TRAINER_3 ; 503, (D7E7, bit 3) - const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 504, (D7E7, bit 4) - const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 505, (D7E7, bit 5) - const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 506, (D7E7, bit 6) - const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 507, (D7E7, bit 7) - const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 508, (D7E8, bit 0) - const EVENT_BEAT_ROUTE_20_TRAINER_9 ; 509, (D7E8, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_10 ; 50A, (D7E8, bit 2) + const EVENT_BEAT_ROUTE_20_TRAINER_1 ; 502, (D7E7, bit 2) + const EVENT_BEAT_ROUTE_20_TRAINER_2 ; 503, (D7E7, bit 3) + const EVENT_BEAT_ROUTE_20_TRAINER_3 ; 504, (D7E7, bit 4) + const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 505, (D7E7, bit 5) + const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 506, (D7E7, bit 6) + const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 507, (D7E7, bit 7) + const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 508, (D7E8, bit 0) + const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 509, (D7E8, bit 1) + const EVENT_BEAT_ROUTE_20_TRAINER_9 ; 50A, (D7E8, bit 2) const EVENT_50B ; 50B, (D7E8, bit 3) const EVENT_50C ; 50C, (D7E8, bit 4) const EVENT_50D ; 50D, (D7E8, bit 5) @@ -1338,20 +1338,20 @@ const_value = 0 const EVENT_537 ; 537, (D7ED, bit 7) const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ; 538, (D7EE, bit 0) const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 ; 539, (D7EE, bit 1) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 ; 53A, (D7EE, bit 2) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53B, (D7EE, bit 3) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 ; 53A, (D7EE, bit 2) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 ; 53B, (D7EE, bit 3) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53C, (D7EE, bit 4) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53D, (D7EE, bit 5) const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6) const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7) const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0) const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1) const EVENT_BEAT_ROUTE_24_TRAINER_0 ; 542, (D7EF, bit 2) - const EVENT_BEAT_ROUTE_24_TRAINER_2 ; 543, (D7EF, bit 3) - const EVENT_BEAT_ROUTE_24_TRAINER_3 ; 544, (D7EF, bit 4) - const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 545, (D7EF, bit 5) - const EVENT_BEAT_ROUTE_24_TRAINER_5 ; 546, (D7EF, bit 6) - const EVENT_BEAT_ROUTE_24_TRAINER_6 ; 547, (D7EF, bit 7) + const EVENT_BEAT_ROUTE_24_TRAINER_1 ; 543, (D7EF, bit 3) + const EVENT_BEAT_ROUTE_24_TRAINER_2 ; 544, (D7EF, bit 4) + const EVENT_BEAT_ROUTE_24_TRAINER_3 ; 545, (D7EF, bit 5) + const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 546, (D7EF, bit 6) + const EVENT_BEAT_ROUTE_24_TRAINER_5 ; 547, (D7EF, bit 7) const EVENT_548 ; 548, (D7F0, bit 0) const EVENT_NUGGET_REWARD_AVAILABLE ; 549, (D7F0, bit 1) const EVENT_54A ; 54A, (D7F0, bit 2) @@ -1362,14 +1362,14 @@ const_value = 0 const EVENT_54F ; 54F, (D7F0, bit 7) const EVENT_MET_BILL ; 550, (D7F1, bit 0) const EVENT_BEAT_ROUTE_25_TRAINER_0 ; 551, (D7F1, bit 1) - const EVENT_BEAT_ROUTE_25_TRAINER_2 ; 552, (D7F1, bit 2) - const EVENT_BEAT_ROUTE_25_TRAINER_3 ; 553, (D7F1, bit 3) - const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 554, (D7F1, bit 4) - const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 555, (D7F1, bit 5) - const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 556, (D7F1, bit 6) - const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 557, (D7F1, bit 7) - const EVENT_BEAT_ROUTE_25_TRAINER_8 ; 558, (D7F2, bit 0) - const EVENT_BEAT_ROUTE_25_TRAINER_9 ; 559, (D7F2, bit 1) + const EVENT_BEAT_ROUTE_25_TRAINER_1 ; 552, (D7F1, bit 2) + const EVENT_BEAT_ROUTE_25_TRAINER_2 ; 553, (D7F1, bit 3) + const EVENT_BEAT_ROUTE_25_TRAINER_3 ; 554, (D7F1, bit 4) + const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 555, (D7F1, bit 5) + const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 556, (D7F1, bit 6) + const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 557, (D7F1, bit 7) + const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 558, (D7F2, bit 0) + const EVENT_BEAT_ROUTE_25_TRAINER_8 ; 559, (D7F2, bit 1) const EVENT_55A ; 55A, (D7F2, bit 2) const EVENT_USED_CELL_SEPARATOR_ON_BILL ; 55B, (D7F2, bit 3) const EVENT_GOT_SS_TICKET ; 55C, (D7F2, bit 4) @@ -1394,18 +1394,18 @@ const_value = 0 const EVENT_56F ; 56F, (D7F4, bit 7) const EVENT_570 ; 570, (D7F5, bit 0) const EVENT_BEAT_MT_MOON_1_TRAINER_0 ; 571, (D7F5, bit 1) - const EVENT_BEAT_MT_MOON_1_TRAINER_2 ; 572, (D7F5, bit 2) - const EVENT_BEAT_MT_MOON_1_TRAINER_3 ; 573, (D7F5, bit 3) - const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 574, (D7F5, bit 4) - const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 575, (D7F5, bit 5) - const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 576, (D7F5, bit 6) - const EVENT_BEAT_MT_MOON_1_TRAINER_7 ; 577, (D7F5, bit 7) + const EVENT_BEAT_MT_MOON_1_TRAINER_1 ; 572, (D7F5, bit 2) + const EVENT_BEAT_MT_MOON_1_TRAINER_2 ; 573, (D7F5, bit 3) + const EVENT_BEAT_MT_MOON_1_TRAINER_3 ; 574, (D7F5, bit 4) + const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 575, (D7F5, bit 5) + const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 576, (D7F5, bit 6) + const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 577, (D7F5, bit 7) const EVENT_578 ; 578, (D7F6, bit 0) const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ; 579, (D7F6, bit 1) const EVENT_BEAT_MT_MOON_3_TRAINER_0 ; 57A, (D7F6, bit 2) - const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57B, (D7F6, bit 3) - const EVENT_BEAT_MT_MOON_3_TRAINER_3 ; 57C, (D7F6, bit 4) - const EVENT_BEAT_MT_MOON_3_TRAINER_4 ; 57D, (D7F6, bit 5) + const EVENT_BEAT_MT_MOON_3_TRAINER_1 ; 57B, (D7F6, bit 3) + const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57C, (D7F6, bit 4) + const EVENT_BEAT_MT_MOON_3_TRAINER_3 ; 57D, (D7F6, bit 5) const EVENT_GOT_DOME_FOSSIL ; 57E, (D7F6, bit 6) const EVENT_GOT_HELIX_FOSSIL ; 57F, (D7F6, bit 7) const EVENT_580 ; 580, (D7F7, bit 0) @@ -1634,9 +1634,9 @@ const_value = 0 const EVENT_65F ; 65F, (D812, bit 7) const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ; 660, (D813, bit 0) const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 ; 661, (D813, bit 1) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 ; 662, (D813, bit 2) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 ; 663, (D813, bit 3) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 ; 664, (D813, bit 4) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 ; 662, (D813, bit 2) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 ; 663, (D813, bit 3) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 ; 664, (D813, bit 4) const EVENT_665 ; 665, (D813, bit 5) const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 ; 666, (D813, bit 6) const EVENT_667 ; 667, (D813, bit 7) @@ -1650,10 +1650,10 @@ const_value = 0 const EVENT_66F ; 66F, (D814, bit 7) const EVENT_670 ; 670, (D815, bit 0) const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 ; 671, (D815, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 ; 672, (D815, bit 2) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 ; 673, (D815, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ; 674, (D815, bit 4) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 ; 675, (D815, bit 5) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 ; 672, (D815, bit 2) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 ; 673, (D815, bit 3) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 ; 674, (D815, bit 4) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ; 675, (D815, bit 5) const EVENT_676 ; 676, (D815, bit 6) const EVENT_677 ; 677, (D815, bit 7) const EVENT_678 ; 678, (D816, bit 0) @@ -1682,7 +1682,7 @@ const_value = 0 const EVENT_68F ; 68F, (D818, bit 7) const EVENT_690 ; 690, (D819, bit 0) const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 ; 691, (D819, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 ; 692, (D819, bit 2) + const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 ; 692, (D819, bit 2) const EVENT_693 ; 693, (D819, bit 3) const EVENT_694 ; 694, (D819, bit 4) const EVENT_695 ; 695, (D819, bit 5) @@ -1699,8 +1699,8 @@ const_value = 0 const EVENT_6A0 ; 6A0, (D81B, bit 0) const EVENT_6A1 ; 6A1, (D81B, bit 1) const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 ; 6A2, (D81B, bit 2) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 ; 6A3, (D81B, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 ; 6A4, (D81B, bit 4) + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 ; 6A3, (D81B, bit 3) + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 ; 6A4, (D81B, bit 4) const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED ; 6A5, (D81B, bit 5) const EVENT_ROCKET_DROPPED_LIFT_KEY ; 6A6, (D81B, bit 6) const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI ; 6A7, (D81B, bit 7) @@ -1811,8 +1811,8 @@ const_value = 0 const EVENT_710 ; 710, (D829, bit 0) const EVENT_711 ; 711, (D829, bit 1) const EVENT_BEAT_SILPH_CO_4F_TRAINER_0 ; 712, (D829, bit 2) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_2 ; 713, (D829, bit 3) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_3 ; 714, (D829, bit 4) + const EVENT_BEAT_SILPH_CO_4F_TRAINER_1 ; 713, (D829, bit 3) + const EVENT_BEAT_SILPH_CO_4F_TRAINER_2 ; 714, (D829, bit 4) const EVENT_715 ; 715, (D829, bit 5) const EVENT_716 ; 716, (D829, bit 6) const EVENT_717 ; 717, (D829, bit 7) @@ -1827,9 +1827,9 @@ const_value = 0 const EVENT_720 ; 720, (D82B, bit 0) const EVENT_721 ; 721, (D82B, bit 1) const EVENT_BEAT_SILPH_CO_5F_TRAINER_0 ; 722, (D82B, bit 2) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 ; 723, (D82B, bit 3) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_3 ; 724, (D82B, bit 4) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_4 ; 725, (D82B, bit 5) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_1 ; 723, (D82B, bit 3) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 ; 724, (D82B, bit 4) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_3 ; 725, (D82B, bit 5) const EVENT_726 ; 726, (D82B, bit 6) const EVENT_727 ; 727, (D82B, bit 7) const EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ; 728, (D82C, bit 0) @@ -1847,8 +1847,8 @@ const_value = 0 const EVENT_734 ; 734, (D82D, bit 4) const EVENT_735 ; 735, (D82D, bit 5) const EVENT_BEAT_SILPH_CO_6F_TRAINER_0 ; 736, (D82D, bit 6) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_2 ; 737, (D82D, bit 7) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_3 ; 738, (D82E, bit 0) + const EVENT_BEAT_SILPH_CO_6F_TRAINER_1 ; 737, (D82D, bit 7) + const EVENT_BEAT_SILPH_CO_6F_TRAINER_2 ; 738, (D82E, bit 0) const EVENT_739 ; 739, (D82E, bit 1) const EVENT_73A ; 73A, (D82E, bit 2) const EVENT_73B ; 73B, (D82E, bit 3) @@ -1862,9 +1862,9 @@ const_value = 0 const EVENT_743 ; 743, (D82F, bit 3) const EVENT_744 ; 744, (D82F, bit 4) const EVENT_BEAT_SILPH_CO_7F_TRAINER_0 ; 745, (D82F, bit 5) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 ; 746, (D82F, bit 6) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_3 ; 747, (D82F, bit 7) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_4 ; 748, (D830, bit 0) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_1 ; 746, (D82F, bit 6) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 ; 747, (D82F, bit 7) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_3 ; 748, (D830, bit 0) const EVENT_749 ; 749, (D830, bit 1) const EVENT_74A ; 74A, (D830, bit 2) const EVENT_74B ; 74B, (D830, bit 3) @@ -2066,7 +2066,7 @@ const_value = 0 const EVENT_80F ; 80F, (D848, bit 7) const EVENT_810 ; 810, (D849, bit 0) const EVENT_BEAT_MANSION_3_TRAINER_0 ; 811, (D849, bit 1) - const EVENT_BEAT_MANSION_3_TRAINER_2 ; 812, (D849, bit 2) + const EVENT_BEAT_MANSION_3_TRAINER_1 ; 812, (D849, bit 2) const EVENT_813 ; 813, (D849, bit 3) const EVENT_814 ; 814, (D849, bit 4) const EVENT_815 ; 815, (D849, bit 5) @@ -2082,7 +2082,7 @@ const_value = 0 const EVENT_81F ; 81F, (D84A, bit 7) const EVENT_820 ; 820, (D84B, bit 0) const EVENT_BEAT_MANSION_4_TRAINER_0 ; 821, (D84B, bit 1) - const EVENT_BEAT_MANSION_4_TRAINER_2 ; 822, (D84B, bit 2) + const EVENT_BEAT_MANSION_4_TRAINER_1 ; 822, (D84B, bit 2) const EVENT_823 ; 823, (D84B, bit 3) const EVENT_824 ; 824, (D84B, bit 4) const EVENT_825 ; 825, (D84B, bit 5) @@ -2482,13 +2482,13 @@ const_value = 0 const EVENT_9AF ; 9AF, (D87C, bit 7) const EVENT_9B0 ; 9B0, (D87D, bit 0) const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 ; 9B1, (D87D, bit 1) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 ; 9B2, (D87D, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 ; 9B3, (D87D, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B4, (D87D, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B5, (D87D, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B6, (D87D, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 ; 9B7, (D87D, bit 7) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8 ; 9B8, (D87E, bit 0) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 ; 9B2, (D87D, bit 2) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 ; 9B3, (D87D, bit 3) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 ; 9B4, (D87D, bit 4) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B5, (D87D, bit 5) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B6, (D87D, bit 6) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B7, (D87D, bit 7) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 ; 9B8, (D87E, bit 0) const EVENT_9B9 ; 9B9, (D87E, bit 1) const EVENT_9BA ; 9BA, (D87E, bit 2) const EVENT_9BB ; 9BB, (D87E, bit 3) diff --git a/home.asm b/home.asm index e531c0a1..62a176c2 100644 --- a/home.asm +++ b/home.asm @@ -4408,7 +4408,6 @@ endm CallFunctionInTable:: -JumpTable:: ; Call function a in jumptable hl. ; de is not preserved. push hl diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 26068977..88d6a8de 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -1,7 +1,7 @@ AgathaScript: call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, AgathaTrainerHeaders + ld hl, AgathaTrainerHeader0 ld de, AgathaScriptPointers ld a, [wAgathaCurScript] call ExecuteCurMapScriptInTable @@ -120,7 +120,6 @@ AgathaTextPointers: dw AgathaText1 dw AgathaDontRunAwayText -AgathaTrainerHeaders: AgathaTrainerHeader0: dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 4a7ecdaf..02ceebf2 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -1,7 +1,7 @@ BrunoScript: call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, BrunoTrainerHeaders + ld hl, BrunoTrainerHeader0 ld de, BrunoScriptPointers ld a, [wBrunoCurScript] call ExecuteCurMapScriptInTable @@ -117,7 +117,6 @@ BrunoTextPointers: dw BrunoText1 dw BrunoDontRunAwayText -BrunoTrainerHeaders: BrunoTrainerHeader0: dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 8f6e9e53..ae7e6846 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -4,7 +4,7 @@ CeladonGymScript: res 6, [hl] call nz, CeladonGymScript_48927 call EnableAutoTextBoxDrawing - ld hl, CeladonGymTrainerHeaders + ld hl, CeladonGymTrainerHeader0 ld de, CeladonGymScriptPointers ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable @@ -66,7 +66,7 @@ CeladonGymText_48963: set 3, [hl] ; deactivate gym trainers - SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_7 + SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 jp CeladonGymText_48943 @@ -83,7 +83,6 @@ CeladonGymTextPointers: dw TM21Text dw TM21NoRoomText -CeladonGymTrainerHeaders: CeladonGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -93,55 +92,55 @@ CeladonGymTrainerHeader0: dw CeladonGymEndBattleText2 ; TextEndBattle dw CeladonGymEndBattleText2 ; TextEndBattle -CeladonGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 +CeladonGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1 dw CeladonGymBattleText3 ; TextBeforeBattle dw CeladonGymAfterBattleText3 ; TextAfterBattle dw CeladonGymEndBattleText3 ; TextEndBattle dw CeladonGymEndBattleText3 ; TextEndBattle -CeladonGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 +CeladonGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 dw CeladonGymBattleText4 ; TextBeforeBattle dw CeladonGymAfterBattleText4 ; TextAfterBattle dw CeladonGymEndBattleText4 ; TextEndBattle dw CeladonGymEndBattleText4 ; TextEndBattle -CeladonGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 +CeladonGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 dw CeladonGymBattleText5 ; TextBeforeBattle dw CeladonGymAfterBattleText5 ; TextAfterBattle dw CeladonGymEndBattleText5 ; TextEndBattle dw CeladonGymEndBattleText5 ; TextEndBattle -CeladonGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 +CeladonGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 dw CeladonGymBattleText6 ; TextBeforeBattle dw CeladonGymAfterBattleText6 ; TextAfterBattle dw CeladonGymEndBattleText6 ; TextEndBattle dw CeladonGymEndBattleText6 ; TextEndBattle -CeladonGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6 +CeladonGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 dw CeladonGymBattleText7 ; TextBeforeBattle dw CeladonGymAfterBattleText7 ; TextAfterBattle dw CeladonGymEndBattleText7 ; TextEndBattle dw CeladonGymEndBattleText7 ; TextEndBattle -CeladonGymTrainerHeader7: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1 +CeladonGymTrainerHeader6: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 dw CeladonGymBattleText8 ; TextBeforeBattle dw CeladonGymAfterBattleText8 ; TextAfterBattle dw CeladonGymEndBattleText8 ; TextEndBattle @@ -229,7 +228,7 @@ CeladonGymAfterBattleText2: CeladonGymText3: TX_ASM - ld hl, CeladonGymTrainerHeader2 + ld hl, CeladonGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -247,7 +246,7 @@ CeladonGymAfterBattleText3: CeladonGymText4: TX_ASM - ld hl, CeladonGymTrainerHeader3 + ld hl, CeladonGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -265,7 +264,7 @@ CeladonGymAfterBattleText4: CeladonGymText5: TX_ASM - ld hl, CeladonGymTrainerHeader4 + ld hl, CeladonGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -283,7 +282,7 @@ CeladonGymAfterBattleText5: CeladonGymText6: TX_ASM - ld hl, CeladonGymTrainerHeader5 + ld hl, CeladonGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -301,7 +300,7 @@ CeladonGymAfterBattleText6: CeladonGymText7: TX_ASM - ld hl, CeladonGymTrainerHeader6 + ld hl, CeladonGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -319,7 +318,7 @@ CeladonGymAfterBattleText7: CeladonGymText8: TX_ASM - ld hl, CeladonGymTrainerHeader7 + ld hl, CeladonGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index fe6a163e..b82b89f6 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -4,7 +4,7 @@ CeruleanGymScript: res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing - ld hl, CeruleanGymTrainerHeaders + ld hl, CeruleanGymTrainerHeader0 ld de, CeruleanGymScriptPointers ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable @@ -79,7 +79,6 @@ CeruleanGymTextPointers: dw CeruleanGymText6 dw CeruleanGymText7 -CeruleanGymTrainerHeaders: CeruleanGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -148,7 +147,6 @@ CeruleanGymText5: db "@" CeruleanGymText6: -ReceivedTM11Text: TX_FAR _ReceivedTM11Text TX_SFX_ITEM_1 db "@" diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 9d28046f..fa0cdca2 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -1,6 +1,6 @@ FightingDojoScript: call EnableAutoTextBoxDrawing - ld hl, FightingDojoTrainerHeaders + ld hl, FightingDojoTrainerHeader0 ld de, FightingDojoScriptPointers ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable @@ -90,7 +90,6 @@ FightingDojoTextPointers: dw FightingDojoText7 dw FightingDojoText8 -FightingDojoTrainerHeaders: FightingDojoTrainerHeader0: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 5f9823ad..3628ebc0 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -1,7 +1,7 @@ FuchsiaGymScript: call FuchsiaGymScript_75453 call EnableAutoTextBoxDrawing - ld hl, FuchsiaGymTrainerHeaders + ld hl, FuchsiaGymTrainerHeader0 ld de, FuchsiaGymScriptPointers ld a, [wFuchsiaGymCurScript] call ExecuteCurMapScriptInTable @@ -66,7 +66,7 @@ FuchsiaGymScript3_75497: set 4, [hl] ; deactivate gym trainers - SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 + SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 jp FuchsiaGymScript_75477 @@ -83,7 +83,6 @@ FuchsiaGymTextPointers: dw FuchsiaGymText10 dw FuchsiaGymText11 -FuchsiaGymTrainerHeaders: FuchsiaGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -93,46 +92,46 @@ FuchsiaGymTrainerHeader0: dw FuchsiaGymEndBattleText1 ; TextEndBattle dw FuchsiaGymEndBattleText1 ; TextEndBattle -FuchsiaGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 +FuchsiaGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 dw FuchsiaGymBattleText2 ; TextBeforeBattle dw FuchsiaGymAfterBattleText2 ; TextAfterBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle -FuchsiaGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 +FuchsiaGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 dw FuchsiaGymBattleText3 ; TextBeforeBattle dw FuchsiaGymAfterBattleText3 ; TextAfterBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle -FuchsiaGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 +FuchsiaGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 dw FuchsiaGymBattleText4 ; TextBeforeBattle dw FuchsiaGymAfterBattleText4 ; TextAfterBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle -FuchsiaGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 +FuchsiaGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 dw FuchsiaGymBattleText5 ; TextBeforeBattle dw FuchsiaGymAfterBattleText5 ; TextAfterBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle -FuchsiaGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 +FuchsiaGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 dw FuchsiaGymBattleText6 ; TextBeforeBattle dw FuchsiaGymAfterBattleText6 ; TextAfterBattle dw FuchsiaGymEndBattleText6 ; TextEndBattle @@ -223,7 +222,7 @@ FuchsiaGymAfterBattleText1: FuchsiaGymText3: TX_ASM - ld hl, FuchsiaGymTrainerHeader2 + ld hl, FuchsiaGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -241,7 +240,7 @@ FuchsiaGymAfterBattleText2: FuchsiaGymText4: TX_ASM - ld hl, FuchsiaGymTrainerHeader3 + ld hl, FuchsiaGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -259,7 +258,7 @@ FuchsiaGymAfterBattleText3: FuchsiaGymText5: TX_ASM - ld hl, FuchsiaGymTrainerHeader4 + ld hl, FuchsiaGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -277,7 +276,7 @@ FuchsiaGymAfterBattleText4: FuchsiaGymText6: TX_ASM - ld hl, FuchsiaGymTrainerHeader5 + ld hl, FuchsiaGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -295,7 +294,7 @@ FuchsiaGymAfterBattleText5: FuchsiaGymText7: TX_ASM - ld hl, FuchsiaGymTrainerHeader6 + ld hl, FuchsiaGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/lance.asm b/scripts/lance.asm index b0ec7f6a..a0b0e6e7 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -1,7 +1,7 @@ LanceScript: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing - ld hl, LanceTrainerHeaders + ld hl, LanceTrainerHeader0 ld de, LanceScriptPointers ld a, [wLanceCurScript] call ExecuteCurMapScriptInTable @@ -130,7 +130,6 @@ LanceScript3: LanceTextPointers: dw LanceText1 -LanceTrainerHeaders: LanceTrainerHeader0: dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 60be524d..ec29847a 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -1,7 +1,7 @@ LoreleiScript: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, LoreleiTrainerHeaders + ld hl, LoreleiTrainerHeader0 ld de, LoreleiScriptPointers ld a, [wLoreleiCurScript] call ExecuteCurMapScriptInTable @@ -119,7 +119,6 @@ LoreleiTextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText -LoreleiTrainerHeaders: LoreleiTrainerHeader0: dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index e37a09cd..2fdc18c6 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -1,7 +1,7 @@ Mansion1Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing - ld hl, Mansion1TrainerHeaders + ld hl, Mansion1TrainerHeader0 ld de, Mansion1ScriptPointers ld a, [wMansion1CurScript] call ExecuteCurMapScriptInTable @@ -66,7 +66,6 @@ Mansion1TextPointers: dw PickUpItemText dw Mansion1Text4 -Mansion1TrainerHeaders: Mansion1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index a9f9ffec..ddc1ff7a 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -1,7 +1,7 @@ Mansion2Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing - ld hl, Mansion2TrainerHeaders + ld hl, Mansion2TrainerHeader0 ld de, Mansion2ScriptPointers ld a, [wMansion2CurScript] call ExecuteCurMapScriptInTable @@ -63,7 +63,6 @@ Mansion2TextPointers: dw Mansion2Text4 dw Mansion2Text5 -Mansion2TrainerHeaders: Mansion2TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index afb46671..abe76df8 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -90,7 +90,6 @@ Mansion3TextPointers: dw Mansion3Text5 dw Mansion3Text6 -Mansion3TrainerHeaders: Mansion3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -100,10 +99,10 @@ Mansion3TrainerHeader0: dw Mansion3EndBattleText1 ; TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle -Mansion3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2 +Mansion3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 dw Mansion3BattleText2 ; TextBeforeBattle dw Mansion3AfterBattleText2 ; TextAfterBattle dw Mansion3EndBattleText2 ; TextEndBattle @@ -119,7 +118,7 @@ Mansion3Text1: Mansion3Text2: TX_ASM - ld hl, Mansion3TrainerHeader2 + ld hl, Mansion3TrainerHeader1 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 5ae3fea2..de8a5d58 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -69,7 +69,6 @@ Mansion4TextPointers: dw PickUpItemText dw Mansion3Text6 -Mansion4TrainerHeaders: Mansion4TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -79,10 +78,10 @@ Mansion4TrainerHeader0: dw Mansion4EndBattleText1 ; TextEndBattle dw Mansion4EndBattleText1 ; TextEndBattle -Mansion4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2 +Mansion4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 dw Mansion4BattleText2 ; TextBeforeBattle dw Mansion4AfterBattleText2 ; TextAfterBattle dw Mansion4EndBattleText2 ; TextEndBattle @@ -98,7 +97,7 @@ Mansion4Text1: Mansion4Text2: TX_ASM - ld hl, Mansion4TrainerHeader2 + ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 11f7e2e4..5ee3d025 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -28,7 +28,6 @@ MtMoon1TextPointers: dw PickUpItemText dw MtMoon1Text14 -MtMoon1TrainerHeaders: MtMoon1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -38,55 +37,55 @@ MtMoon1TrainerHeader0: dw MtMoon1EndBattleText2 ; TextEndBattle dw MtMoon1EndBattleText2 ; TextEndBattle -MtMoon1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 +MtMoon1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1 dw MtMoon1BattleText3 ; TextBeforeBattle dw MtMoon1AfterBattleText3 ; TextAfterBattle dw MtMoon1EndBattleText3 ; TextEndBattle dw MtMoon1EndBattleText3 ; TextEndBattle -MtMoon1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 +MtMoon1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 dw MtMoon1BattleText4 ; TextBeforeBattle dw MtMoon1AfterBattleText4 ; TextAfterBattle dw MtMoon1EndBattleText4 ; TextEndBattle dw MtMoon1EndBattleText4 ; TextEndBattle -MtMoon1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 +MtMoon1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 dw MtMoon1BattleText5 ; TextBeforeBattle dw MtMoon1AfterBattleText5 ; TextAfterBattle dw MtMoon1EndBattleText5 ; TextEndBattle dw MtMoon1EndBattleText5 ; TextEndBattle -MtMoon1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 +MtMoon1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 dw MtMoon1BattleText6 ; TextBeforeBattle dw MtMoon1AfterBattleText6 ; TextAfterBattle dw MtMoon1EndBattleText6 ; TextEndBattle dw MtMoon1EndBattleText6 ; TextEndBattle -MtMoon1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 +MtMoon1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 dw MtMoon1BattleText7 ; TextBeforeBattle dw MtMoon1AfterBattleText7 ; TextAfterBattle dw MtMoon1EndBattleText7 ; TextEndBattle dw MtMoon1EndBattleText7 ; TextEndBattle -MtMoon1TrainerHeader7: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7 +MtMoon1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 dw MtMoon1BattleText8 ; TextBeforeBattle dw MtMoon1AfterBattleText8 ; TextAfterBattle dw MtMoon1EndBattleText8 ; TextEndBattle @@ -102,37 +101,37 @@ MtMoon1Text1: MtMoon1Text2: TX_ASM - ld hl, MtMoon1TrainerHeader2 + ld hl, MtMoon1TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon1Text3: TX_ASM - ld hl, MtMoon1TrainerHeader3 + ld hl, MtMoon1TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon1Text4: TX_ASM - ld hl, MtMoon1TrainerHeader4 + ld hl, MtMoon1TrainerHeader3 call TalkToTrainer jp TextScriptEnd MtMoon1Text5: TX_ASM - ld hl, MtMoon1TrainerHeader5 + ld hl, MtMoon1TrainerHeader4 call TalkToTrainer jp TextScriptEnd MtMoon1Text6: TX_ASM - ld hl, MtMoon1TrainerHeader6 + ld hl, MtMoon1TrainerHeader5 call TalkToTrainer jp TextScriptEnd MtMoon1Text7: TX_ASM - ld hl, MtMoon1TrainerHeader7 + ld hl, MtMoon1TrainerHeader6 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index de36db4f..60cd1ab8 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -166,7 +166,6 @@ MtMoon3TextPointers: dw PickUpItemText dw MtMoon3Text_49f99 -MtMoon3TrainerHeaders: MtMoon3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -176,28 +175,28 @@ MtMoon3TrainerHeader0: dw MtMoon3EndBattleText2 ; TextEndBattle dw MtMoon3EndBattleText2 ; TextEndBattle -MtMoon3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 +MtMoon3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1 dw MtMoon3BattleText3 ; TextBeforeBattle dw MtMoon3AfterBattleText3 ; TextAfterBattle dw MtMoon3EndBattleText3 ; TextEndBattle dw MtMoon3EndBattleText3 ; TextEndBattle -MtMoon3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 +MtMoon3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 dw MtMoon3BattleText4 ; TextBeforeBattle dw MtMoon3AfterBattleText4 ; TextAfterBattle dw MtMoon3EndBattleText4 ; TextEndBattle dw MtMoon3EndBattleText4 ; TextEndBattle -MtMoon3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4 +MtMoon3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 dw MtMoon3BattleText5 ; TextBeforeBattle dw MtMoon3AfterBattleText5 ; TextAfterBattle dw MtMoon3EndBattleText5 ; TextEndBattle @@ -245,19 +244,19 @@ MtMoon3Text2: MtMoon3Text3: TX_ASM - ld hl, MtMoon3TrainerHeader2 + ld hl, MtMoon3TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon3Text4: TX_ASM - ld hl, MtMoon3TrainerHeader3 + ld hl, MtMoon3TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon3Text5: TX_ASM - ld hl, MtMoon3TrainerHeader4 + ld hl, MtMoon3TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 5ee83f34..80acede8 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -298,9 +298,7 @@ PewterCityText_1945d: db "@" PewterCityText14: - -PewterCityText_19462: - TX_FAR _PewterCityText_19462 + TX_FAR _PewterCityText14 db "@" PewterCityText6: diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index ac035550..2cfee6c0 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -4,7 +4,7 @@ PewterGymScript: res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing - ld hl, PewterGymTrainerHeaders + ld hl, PewterGymTrainerHeader0 ld de, PewterGymScriptPointers ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable @@ -87,7 +87,6 @@ PewterGymTextPointers: dw PewterGymText5 dw PewterGymText6 -PewterGymTrainerHeaders: PewterGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 db ($5 << 4) ; trainer's view range diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 8be15c9e..6027b450 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -1,6 +1,6 @@ PokemonTower3Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower3TrainerHeaders + ld hl, PokemonTower3TrainerHeader0 ld de, PokemonTower3ScriptPointers ld a, [wPokemonTower3CurScript] call ExecuteCurMapScriptInTable @@ -18,7 +18,6 @@ PokemonTower3TextPointers: dw PokemonTower3Text3 dw PickUpItemText -PokemonTower3TrainerHeaders: PokemonTower3TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index fe7a4e08..a8307c01 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -1,6 +1,6 @@ PokemonTower4Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower4TrainerHeaders + ld hl, PokemonTower4TrainerHeader0 ld de, PokemonTower4ScriptPointers ld a, [wPokemonTower4CurScript] call ExecuteCurMapScriptInTable @@ -20,7 +20,6 @@ PokemonTower4TextPointers: dw PickUpItemText dw PickUpItemText -PokemonTower4TrainerHeaders: PokemonTower4TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 82b912b5..9a13f286 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -1,6 +1,6 @@ PokemonTower5Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower5TrainerHeaders + ld hl, PokemonTower5TrainerHeader0 ld de, PokemonTower5ScriptPointers ld a, [wPokemonTower5CurScript] call ExecuteCurMapScriptInTable @@ -57,7 +57,6 @@ PokemonTower5TextPointers: dw PickUpItemText dw PokemonTower5Text7 -PokemonTower5TrainerHeaders: PokemonTower5TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 82c39a41..c3118f62 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -1,6 +1,6 @@ PokemonTower6Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower6TrainerHeaders + ld hl, PokemonTower6TrainerHeader0 ld de, PokemonTower6ScriptPointers ld a, [wPokemonTower6CurScript] call ExecuteCurMapScriptInTable @@ -103,7 +103,6 @@ PokemonTower6TextPointers: dw PokemonTower6Text6 dw PokemonTower6Text7 -PokemonTower6TrainerHeaders: PokemonTower6TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 348534b4..88c62c53 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,6 +1,6 @@ PokemonTower7Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower7TrainerHeaders + ld hl, PokemonTower7TrainerHeader0 ld de, PokemonTower7ScriptPointers ld a, [wPokemonTower7CurScript] call ExecuteCurMapScriptInTable @@ -204,7 +204,6 @@ PokemonTower7TextPointers: dw PokemonTower7Text3 dw PokemonTower7FujiText -PokemonTower7TrainerHeaders: PokemonTower7TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index c7a5625f..5391585d 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -1,6 +1,6 @@ PowerPlantScript: call EnableAutoTextBoxDrawing - ld hl, PowerPlantTrainerHeaders + ld hl, Voltorb0TrainerHeader ld de, .ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable @@ -28,7 +28,6 @@ PowerPlantTextPointers: dw PickUpItemText dw PickUpItemText -PowerPlantTrainerHeaders: Voltorb0TrainerHeader: dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 db 0 ; view range diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 6aa7c813..88b3a7e9 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -1,7 +1,7 @@ RocketHideout1Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing - ld hl, RocketHideout1TrainerHeaders + ld hl, RocketHideout1TrainerHeader0 ld de, RocketHideout1ScriptPointers ld a, [wRocketHideout1CurScript] call ExecuteCurMapScriptInTable @@ -15,7 +15,7 @@ RocketHideout1Script_44be0: ret z CheckEvent EVENT_677 jr nz, .asm_44c01 - CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 jr nz, .asm_44bf7 ld a, $54 jr .asm_44c03 @@ -44,7 +44,6 @@ RocketHideout1TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout1TrainerHeaders: RocketHideout1TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -54,37 +53,37 @@ RocketHideout1TrainerHeader0: dw RocketHideout1EndBattleText2 ; TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle -RocketHideout1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 +RocketHideout1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 dw RocketHideout1BattleText3 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle dw RocketHideout1EndBattleText3 ; TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle -RocketHideout1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 +RocketHideout1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 dw RocketHideout1BattleText4 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle dw RocketHideout1EndBattleText4 ; TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle -RocketHideout1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 +RocketHideout1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 dw RocketHideout1BattleText5 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle dw RocketHideout1EndBattleText5 ; TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle -RocketHideout1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 +RocketHideout1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 dw RocketHideout1BattleText6 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle dw RocketHideout1EndBattleText6 ; TextEndBattle @@ -100,32 +99,32 @@ RocketHideout1Text1: RocketHideout1Text2: TX_ASM - ld hl, RocketHideout1TrainerHeader2 + ld hl, RocketHideout1TrainerHeader1 call TalkToTrainer jp TextScriptEnd RocketHideout1Text3: TX_ASM - ld hl, RocketHideout1TrainerHeader3 + ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd RocketHideout1Text4: TX_ASM - ld hl, RocketHideout1TrainerHeader4 + ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd RocketHideout1Text5: TX_ASM - ld hl, RocketHideout1TrainerHeader5 + ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd RocketHideout1EndBattleText6: TX_FAR _RocketHideout1EndBattleText6 TX_ASM - SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ld hl, RocketHideout1Text_44c9f ret diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index b29e5396..c5f026d5 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -1,6 +1,6 @@ RocketHideout2Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout2TrainerHeaders + ld hl, RocketHideout2TrainerHeader0 ld de, RocketHideout2ScriptPointers ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable @@ -420,7 +420,6 @@ RocketHideout2TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout2TrainerHeaders: RocketHideout2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index ac08e868..00a61568 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -1,6 +1,6 @@ RocketHideout3Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout3TrainerHeaders + ld hl, RocketHideout3TrainerHeader0 ld de, RocketHideout3ScriptPointers ld a, [wRocketHideout3CurScript] call ExecuteCurMapScriptInTable @@ -149,7 +149,6 @@ RocketHideout3TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout3TrainerHeaders: RocketHideout3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -159,10 +158,10 @@ RocketHideout3TrainerHeader0: dw RocketHideout3EndBattleText2 ; TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle -RocketHideout3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 +RocketHideout3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 dw RocketHideout3BattleTxt ; TextBeforeBattle dw RocketHideout3AfterBattleText3 ; TextAfterBattle dw RocketHideout3EndBattleText3 ; TextEndBattle @@ -190,7 +189,7 @@ RocketHideout3AfterBattleTxt2: RocketHideout3Text2: TX_ASM - ld hl, RocketHideout3TrainerHeader2 + ld hl, RocketHideout3TrainerHeader1 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 49da07b3..e8361988 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -15,7 +15,7 @@ RocketHideout4Script_45473: ret z CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED jr nz, .asm_45496 - CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1 + CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1 jr z, .asm_4548c ld a, $2d jr .asm_45498 @@ -84,7 +84,6 @@ RocketHideout4TextPointers: dw PickUpItemText dw RocketHideout4Text10 -RocketHideout4TrainerHeaders: RocketHideout4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -94,19 +93,19 @@ RocketHideout4TrainerHeader0: dw RocketHideout4EndBattleText2 ; TextEndBattle dw RocketHideout4EndBattleText2 ; TextEndBattle -RocketHideout4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 +RocketHideout4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 dw RocketHideout4BattleText3 ; TextBeforeBattle dw RocketHideout4AfterBattleText3 ; TextAfterBattle dw RocketHideout4EndBattleText3 ; TextEndBattle dw RocketHideout4EndBattleText3 ; TextEndBattle -RocketHideout4TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 +RocketHideout4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 dw RocketHideout4BattleText4 ; TextBeforeBattle dw RocketHideout4AfterBattleText4 ; TextAfterBattle dw RocketHideout4EndBattleText4 ; TextEndBattle @@ -174,7 +173,7 @@ RocketHideout4AfterBattleText2: RocketHideout4Text3: TX_ASM - ld hl, RocketHideout4TrainerHeader2 + ld hl, RocketHideout4TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -192,7 +191,7 @@ RocketHideout4AfterBattleText3: RocketHideout4Text4: TX_ASM - ld hl, RocketHideout4TrainerHeader3 + ld hl, RocketHideout4TrainerHeader2 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index 2819c350..390330e8 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -1,6 +1,6 @@ RockTunnel1Script: call EnableAutoTextBoxDrawing - ld hl, RockTunnel1TrainerHeaders + ld hl, RockTunnel1TrainerHeader0 ld de, RockTunnel1ScriptPointers ld a, [wRockTunnel1CurScript] call ExecuteCurMapScriptInTable @@ -22,65 +22,64 @@ RockTunnel1TextPointers: dw RockTunnel1Text7 dw RockTunnel1Text8 -RockTunnel1TrainerHeaders: -RockTunnel1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 +RockTunnel1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 dw RockTunnel1BattleText1 ; TextBeforeBattle dw RockTunnel1AfterBattleText1 ; TextAfterBattle dw RockTunnel1EndBattleText1 ; TextEndBattle dw RockTunnel1EndBattleText1 ; TextEndBattle -RockTunnel1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 +RockTunnel1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 dw RockTunnel1BattleText2 ; TextBeforeBattle dw RockTunnel1AfterBattleText2 ; TextAfterBattle dw RockTunnel1EndBattleText2 ; TextEndBattle dw RockTunnel1EndBattleText2 ; TextEndBattle -RockTunnel1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 +RockTunnel1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 dw RockTunnel1BattleText3 ; TextBeforeBattle dw RockTunnel1AfterBattleText3 ; TextAfterBattle dw RockTunnel1EndBattleText3 ; TextEndBattle dw RockTunnel1EndBattleText3 ; TextEndBattle -RockTunnel1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 +RockTunnel1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 dw RockTunnel1BattleText4 ; TextBeforeBattle dw RockTunnel1AfterBattleText4 ; TextAfterBattle dw RockTunnel1EndBattleText4 ; TextEndBattle dw RockTunnel1EndBattleText4 ; TextEndBattle -RockTunnel1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 +RockTunnel1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 dw RockTunnel1BattleText5 ; TextBeforeBattle dw RockTunnel1AfterBattleText5 ; TextAfterBattle dw RockTunnel1EndBattleText5 ; TextEndBattle dw RockTunnel1EndBattleText5 ; TextEndBattle -RockTunnel1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 +RockTunnel1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 dw RockTunnel1BattleText6 ; TextBeforeBattle dw RockTunnel1AfterBattleText6 ; TextAfterBattle dw RockTunnel1EndBattleText6 ; TextEndBattle dw RockTunnel1EndBattleText6 ; TextEndBattle -RockTunnel1TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 +RockTunnel1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 dw RockTunnel1BattleText7 ; TextBeforeBattle dw RockTunnel1AfterBattleText7 ; TextAfterBattle dw RockTunnel1EndBattleText7 ; TextEndBattle @@ -90,37 +89,37 @@ RockTunnel1TrainerHeader7: RockTunnel1Text1: TX_ASM - ld hl, RockTunnel1TrainerHeader1 + ld hl, RockTunnel1TrainerHeader0 jr RockTunnel1TalkToTrainer RockTunnel1Text2: TX_ASM - ld hl, RockTunnel1TrainerHeader2 + ld hl, RockTunnel1TrainerHeader1 jr RockTunnel1TalkToTrainer RockTunnel1Text3: TX_ASM - ld hl, RockTunnel1TrainerHeader3 + ld hl, RockTunnel1TrainerHeader2 jr RockTunnel1TalkToTrainer RockTunnel1Text4: TX_ASM - ld hl, RockTunnel1TrainerHeader4 + ld hl, RockTunnel1TrainerHeader3 jr RockTunnel1TalkToTrainer RockTunnel1Text5: TX_ASM - ld hl, RockTunnel1TrainerHeader5 + ld hl, RockTunnel1TrainerHeader4 jr RockTunnel1TalkToTrainer RockTunnel1Text6: TX_ASM - ld hl, RockTunnel1TrainerHeader6 + ld hl, RockTunnel1TrainerHeader5 jr RockTunnel1TalkToTrainer RockTunnel1Text7: TX_ASM - ld hl, RockTunnel1TrainerHeader7 + ld hl, RockTunnel1TrainerHeader6 RockTunnel1TalkToTrainer: call TalkToTrainer jp TextScriptEnd diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index 7ac3f426..4385b5f7 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -1,6 +1,6 @@ RockTunnel2Script: call EnableAutoTextBoxDrawing - ld hl, RockTunnel2TrainerHeaders + ld hl, RockTunnel2TrainerHeader0 ld de, RockTunnel2ScriptPointers ld a, [wRockTunnel2CurScript] call ExecuteCurMapScriptInTable @@ -22,7 +22,6 @@ RockTunnel2TextPointers: dw RockTunnel2Text7 dw RockTunnel2Text8 -RockTunnel2TrainerHeaders: RockTunnel2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -32,64 +31,64 @@ RockTunnel2TrainerHeader0: dw RockTunnel2EndBattleText2 ; TextEndBattle dw RockTunnel2EndBattleText2 ; TextEndBattle -RockTunnel2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 +RockTunnel2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 dw RockTunnel2BattleText3 ; TextBeforeBattle dw RockTunnel2AfterBattleText3 ; TextAfterBattle dw RockTunnel2EndBattleText3 ; TextEndBattle dw RockTunnel2EndBattleText3 ; TextEndBattle -RockTunnel2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 +RockTunnel2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 dw RockTunnel2BattleText4 ; TextBeforeBattle dw RockTunnel2AfterBattleText4 ; TextAfterBattle dw RockTunnel2EndBattleText4 ; TextEndBattle dw RockTunnel2EndBattleText4 ; TextEndBattle -RockTunnel2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 +RockTunnel2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 dw RockTunnel2BattleText5 ; TextBeforeBattle dw RockTunnel2AfterBattleText5 ; TextAfterBattle dw RockTunnel2EndBattleText5 ; TextEndBattle dw RockTunnel2EndBattleText5 ; TextEndBattle -RockTunnel2TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 +RockTunnel2TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 dw RockTunnel2BattleText6 ; TextBeforeBattle dw RockTunnel2AfterBattleText6 ; TextAfterBattle dw RockTunnel2EndBattleText6 ; TextEndBattle dw RockTunnel2EndBattleText6 ; TextEndBattle -RockTunnel2TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 +RockTunnel2TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 dw RockTunnel2BattleText7 ; TextBeforeBattle dw RockTunnel2AfterBattleText7 ; TextAfterBattle dw RockTunnel2EndBattleText7 ; TextEndBattle dw RockTunnel2EndBattleText7 ; TextEndBattle -RockTunnel2TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 +RockTunnel2TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 dw RockTunnel2BattleText8 ; TextBeforeBattle dw RockTunnel2AfterBattleText8 ; TextAfterBattle dw RockTunnel2EndBattleText8 ; TextEndBattle dw RockTunnel2EndBattleText8 ; TextEndBattle -RockTunnel2TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1 +RockTunnel2TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 dw RockTunnel2BattleText9 ; TextBeforeBattle dw RockTunnel2AfterBattleText9 ; TextAfterBattle dw RockTunnel2EndBattleText9 ; TextEndBattle @@ -105,43 +104,43 @@ RockTunnel2Text1: RockTunnel2Text2: TX_ASM - ld hl, RockTunnel2TrainerHeader2 + ld hl, RockTunnel2TrainerHeader1 call TalkToTrainer jp TextScriptEnd RockTunnel2Text3: TX_ASM - ld hl, RockTunnel2TrainerHeader3 + ld hl, RockTunnel2TrainerHeader2 call TalkToTrainer jp TextScriptEnd RockTunnel2Text4: TX_ASM - ld hl, RockTunnel2TrainerHeader4 + ld hl, RockTunnel2TrainerHeader3 call TalkToTrainer jp TextScriptEnd RockTunnel2Text5: TX_ASM - ld hl, RockTunnel2TrainerHeader5 + ld hl, RockTunnel2TrainerHeader4 call TalkToTrainer jp TextScriptEnd RockTunnel2Text6: TX_ASM - ld hl, RockTunnel2TrainerHeader6 + ld hl, RockTunnel2TrainerHeader5 call TalkToTrainer jp TextScriptEnd RockTunnel2Text7: TX_ASM - ld hl, RockTunnel2TrainerHeader7 + ld hl, RockTunnel2TrainerHeader6 call TalkToTrainer jp TextScriptEnd RockTunnel2Text8: TX_ASM - ld hl, RockTunnel2TrainerHeader8 + ld hl, RockTunnel2TrainerHeader7 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route10.asm b/scripts/route10.asm index ca0ab190..03a1e818 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -1,6 +1,6 @@ Route10Script: call EnableAutoTextBoxDrawing - ld hl, Route10TrainerHeaders + ld hl, Route10TrainerHeader0 ld de, Route10ScriptPointers ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable @@ -24,7 +24,6 @@ Route10TextPointers: dw Route10Text9 dw Route10Text10 -Route10TrainerHeaders: Route10TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route11.asm b/scripts/route11.asm index ab3509c5..afedfc32 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -1,6 +1,6 @@ Route11Script: call EnableAutoTextBoxDrawing - ld hl, Route11TrainerHeaders + ld hl, Route11TrainerHeader0 ld de, Route11ScriptPointers ld a, [wRoute11CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route11TextPointers: dw Route11Text10 dw Route11Text11 -Route11TrainerHeaders: Route11TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route12.asm b/scripts/route12.asm index e61f41c0..07b5833b 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -1,6 +1,6 @@ Route12Script: call EnableAutoTextBoxDrawing - ld hl, Route12TrainerHeaders + ld hl, Route12TrainerHeader0 ld de, Route12ScriptPointers ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable @@ -76,7 +76,6 @@ Route12TextPointers: dw Route12Text13 dw Route12Text14 -Route12TrainerHeaders: Route12TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route13.asm b/scripts/route13.asm index 61f43ee9..54fb9d68 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -1,6 +1,6 @@ Route13Script: call EnableAutoTextBoxDrawing - ld hl, Route13TrainerHeaders + ld hl, Route13TrainerHeader0 ld de, Route13ScriptPointers ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable @@ -27,7 +27,6 @@ Route13TextPointers: dw Route13Text12 dw Route13Text13 -Route13TrainerHeaders: Route13TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -37,82 +36,82 @@ Route13TrainerHeader0: dw Route13EndBattleText2 ; TextEndBattle dw Route13EndBattleText2 ; TextEndBattle -Route13TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 +Route13TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1 dw Route13BattleText3 ; TextBeforeBattle dw Route13AfterBattleText3 ; TextAfterBattle dw Route13EndBattleText3 ; TextEndBattle dw Route13EndBattleText3 ; TextEndBattle -Route13TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 +Route13TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 dw Route13BattleText4 ; TextBeforeBattle dw Route13AfterBattleText4 ; TextAfterBattle dw Route13EndBattleText4 ; TextEndBattle dw Route13EndBattleText4 ; TextEndBattle -Route13TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 +Route13TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 dw Route13BattleText5 ; TextBeforeBattle dw Route13AfterBattleText5 ; TextAfterBattle dw Route13EndBattleText5 ; TextEndBattle dw Route13EndBattleText5 ; TextEndBattle -Route13TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 +Route13TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 dw Route13BattleText6 ; TextBeforeBattle dw Route13AfterBattleText6 ; TextAfterBattle dw Route13EndBattleText6 ; TextEndBattle dw Route13EndBattleText6 ; TextEndBattle -Route13TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 +Route13TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 dw Route13BattleText7 ; TextBeforeBattle dw Route13AfterBattleText7 ; TextAfterBattle dw Route13EndBattleText7 ; TextEndBattle dw Route13EndBattleText7 ; TextEndBattle -Route13TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7 +Route13TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 dw Route13BattleText8 ; TextBeforeBattle dw Route13AfterBattleText8 ; TextAfterBattle dw Route13EndBattleText8 ; TextEndBattle dw Route13EndBattleText8 ; TextEndBattle -Route13TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 +Route13TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1 dw Route13BattleText9 ; TextBeforeBattle dw Route13AfterBattleText9 ; TextAfterBattle dw Route13EndBattleText9 ; TextEndBattle dw Route13EndBattleText9 ; TextEndBattle -Route13TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 +Route13TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 dw Route13BattleText10 ; TextBeforeBattle dw Route13AfterBattleText10 ; TextAfterBattle dw Route13EndBattleText10 ; TextEndBattle dw Route13EndBattleText10 ; TextEndBattle -Route13TrainerHeader10: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1 +Route13TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 dw Route13BattleText11 ; TextBeforeBattle dw Route13AfterBattleText11 ; TextAfterBattle dw Route13EndBattleText11 ; TextEndBattle @@ -140,7 +139,7 @@ Route13AfterBattleText2: Route13Text2: TX_ASM - ld hl, Route13TrainerHeader2 + ld hl, Route13TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -158,7 +157,7 @@ Route13AfterBattleText3: Route13Text3: TX_ASM - ld hl, Route13TrainerHeader3 + ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -176,7 +175,7 @@ Route13AfterBattleText4: Route13Text4: TX_ASM - ld hl, Route13TrainerHeader4 + ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -194,7 +193,7 @@ Route13AfterBattleText5: Route13Text5: TX_ASM - ld hl, Route13TrainerHeader5 + ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -212,7 +211,7 @@ Route13AfterBattleText6: Route13Text6: TX_ASM - ld hl, Route13TrainerHeader6 + ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -230,7 +229,7 @@ Route13AfterBattleText7: Route13Text7: TX_ASM - ld hl, Route13TrainerHeader7 + ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd @@ -248,7 +247,7 @@ Route13AfterBattleText8: Route13Text8: TX_ASM - ld hl, Route13TrainerHeader8 + ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd @@ -266,7 +265,7 @@ Route13AfterBattleText9: Route13Text9: TX_ASM - ld hl, Route13TrainerHeader9 + ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd @@ -284,7 +283,7 @@ Route13AfterBattleText10: Route13Text10: TX_ASM - ld hl, Route13TrainerHeader10 + ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route14.asm b/scripts/route14.asm index 70f747c5..c929451f 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -1,6 +1,6 @@ Route14Script: call EnableAutoTextBoxDrawing - ld hl, Route14TrainerHeaders + ld hl, Route14TrainerHeader0 ld de, Route14ScriptPointers ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route14TextPointers: dw Route14Text10 dw Route14Text11 -Route14TrainerHeaders: Route14TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/route15.asm b/scripts/route15.asm index e3329ab4..58c5d0ab 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -1,6 +1,6 @@ Route15Script: call EnableAutoTextBoxDrawing - ld hl, Route15TrainerHeaders + ld hl, Route15TrainerHeader0 ld de, Route15ScriptPointers ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable @@ -26,7 +26,6 @@ Route15TextPointers: dw PickUpItemText dw Route15Text12 -Route15TrainerHeaders: Route15TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/route16.asm b/scripts/route16.asm index fe38fac4..20431608 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -1,6 +1,6 @@ Route16Script: call EnableAutoTextBoxDrawing - ld hl, Route16TrainerHeaders + ld hl, Route16TrainerHeader0 ld de, Route16ScriptPointers ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable @@ -74,7 +74,6 @@ Route16TextPointers: dw Route16Text10 dw Route16Text11 -Route16TrainerHeaders: Route16TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route17.asm b/scripts/route17.asm index ddf92c2d..fb9f4cd8 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -1,6 +1,6 @@ Route17Script: call EnableAutoTextBoxDrawing - ld hl, Route17TrainerHeaders + ld hl, Route17TrainerHeader0 ld de, Route17ScriptPointers ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable @@ -30,7 +30,6 @@ Route17TextPointers: dw Route17Text15 dw Route17Text16 -Route17TrainerHeaders: Route17TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route18.asm b/scripts/route18.asm index b89e2613..687b269c 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -1,6 +1,6 @@ Route18Script: call EnableAutoTextBoxDrawing - ld hl, Route18TrainerHeaders + ld hl, Route18TrainerHeader0 ld de, Route18ScriptPointers ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable @@ -19,7 +19,6 @@ Route18TextPointers: dw Route18Text4 dw Route18Text5 -Route18TrainerHeaders: Route18TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route19.asm b/scripts/route19.asm index 7b6aa8f0..01ea5dce 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -1,6 +1,6 @@ Route19Script: call EnableAutoTextBoxDrawing - ld hl, Route19TrainerHeaders + ld hl, Route19TrainerHeader0 ld de, Route19ScriptPointers ld a, [wRoute19CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route19TextPointers: dw Route19Text10 dw Route19Text11 -Route19TrainerHeaders: Route19TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route20.asm b/scripts/route20.asm index 012c9c53..53ff5e55 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -75,7 +75,6 @@ Route20TextPointers: dw Route20Text11 dw Route20Text12 -Route20TrainerHeaders: Route20TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -85,82 +84,82 @@ Route20TrainerHeader0: dw Route20EndBattleText1 ; TextEndBattle dw Route20EndBattleText1 ; TextEndBattle -Route20TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 +Route20TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1 dw Route20BattleText2 ; TextBeforeBattle dw Route20AfterBattleText2 ; TextAfterBattle dw Route20EndBattleText2 ; TextEndBattle dw Route20EndBattleText2 ; TextEndBattle -Route20TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 +Route20TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 dw Route20BattleText3 ; TextBeforeBattle dw Route20AfterBattleText3 ; TextAfterBattle dw Route20EndBattleText3 ; TextEndBattle dw Route20EndBattleText3 ; TextEndBattle -Route20TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 +Route20TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 dw Route20BattleText4 ; TextBeforeBattle dw Route20AfterBattleText4 ; TextAfterBattle dw Route20EndBattleText4 ; TextEndBattle dw Route20EndBattleText4 ; TextEndBattle -Route20TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 +Route20TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 dw Route20BattleText5 ; TextBeforeBattle dw Route20AfterBattleText5 ; TextAfterBattle dw Route20EndBattleText5 ; TextEndBattle dw Route20EndBattleText5 ; TextEndBattle -Route20TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 +Route20TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 dw Route20BattleText6 ; TextBeforeBattle dw Route20AfterBattleText6 ; TextAfterBattle dw Route20EndBattleText6 ; TextEndBattle dw Route20EndBattleText6 ; TextEndBattle -Route20TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7 +Route20TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 dw Route20BattleText7 ; TextBeforeBattle dw Route20AfterBattleText7 ; TextAfterBattle dw Route20EndBattleText7 ; TextEndBattle dw Route20EndBattleText7 ; TextEndBattle -Route20TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 +Route20TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1 dw Route20BattleText8 ; TextBeforeBattle dw Route20AfterBattleText8 ; TextAfterBattle dw Route20EndBattleText8 ; TextEndBattle dw Route20EndBattleText8 ; TextEndBattle -Route20TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 +Route20TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 dw Route20BattleText9 ; TextBeforeBattle dw Route20AfterBattleText9 ; TextAfterBattle dw Route20EndBattleText9 ; TextEndBattle dw Route20EndBattleText9 ; TextEndBattle -Route20TrainerHeader10: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1 +Route20TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 dw Route20BattleText10 ; TextBeforeBattle dw Route20AfterBattleText10 ; TextAfterBattle dw Route20EndBattleText10 ; TextEndBattle @@ -176,55 +175,55 @@ Route20Text1: Route20Text2: TX_ASM - ld hl, Route20TrainerHeader2 + ld hl, Route20TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route20Text3: TX_ASM - ld hl, Route20TrainerHeader3 + ld hl, Route20TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route20Text4: TX_ASM - ld hl, Route20TrainerHeader4 + ld hl, Route20TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route20Text5: TX_ASM - ld hl, Route20TrainerHeader5 + ld hl, Route20TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route20Text6: TX_ASM - ld hl, Route20TrainerHeader6 + ld hl, Route20TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route20Text7: TX_ASM - ld hl, Route20TrainerHeader7 + ld hl, Route20TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route20Text8: TX_ASM - ld hl, Route20TrainerHeader8 + ld hl, Route20TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route20Text9: TX_ASM - ld hl, Route20TrainerHeader9 + ld hl, Route20TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route20Text10: TX_ASM - ld hl, Route20TrainerHeader10 + ld hl, Route20TrainerHeader9 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route21.asm b/scripts/route21.asm index 89874e58..dcdc8022 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -1,6 +1,6 @@ Route21Script: call EnableAutoTextBoxDrawing - ld hl, Route21TrainerHeaders + ld hl, Route21TrainerHeader0 ld de, Route21ScriptPointers ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable @@ -23,7 +23,6 @@ Route21TextPointers: dw Route21Text8 dw Route21Text9 -Route21TrainerHeaders: Route21TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/route24.asm b/scripts/route24.asm index 7f1400f2..f55d2268 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -1,6 +1,6 @@ Route24Script: call EnableAutoTextBoxDrawing - ld hl, Route24TrainerHeaders + ld hl, Route24TrainerHeader0 ld de, Route24ScriptPointers ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable @@ -85,7 +85,6 @@ Route24TextPointers: dw Route24Text7 dw PickUpItemText -Route24TrainerHeaders: Route24TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -95,46 +94,46 @@ Route24TrainerHeader0: dw Route24EndBattleText1 ; TextEndBattle dw Route24EndBattleText1 ; TextEndBattle -Route24TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 +Route24TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1 dw Route24BattleText2 ; TextBeforeBattle dw Route24AfterBattleText2 ; TextAfterBattle dw Route24EndBattleText2 ; TextEndBattle dw Route24EndBattleText2 ; TextEndBattle -Route24TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 +Route24TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 dw Route24BattleText3 ; TextBeforeBattle dw Route24AfterBattleText3 ; TextAfterBattle dw Route24EndBattleText3 ; TextEndBattle dw Route24EndBattleText3 ; TextEndBattle -Route24TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 +Route24TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 dw Route24BattleText4 ; TextBeforeBattle dw Route24AfterBattleText4 ; TextAfterBattle dw Route24EndBattleText4 ; TextEndBattle dw Route24EndBattleText4 ; TextEndBattle -Route24TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 +Route24TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 dw Route24BattleText5 ; TextBeforeBattle dw Route24AfterBattleText5 ; TextAfterBattle dw Route24EndBattleText5 ; TextEndBattle dw Route24EndBattleText5 ; TextEndBattle -Route24TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6 +Route24TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 dw Route24BattleText6 ; TextBeforeBattle dw Route24AfterBattleText6 ; TextAfterBattle dw Route24EndBattleText6 ; TextEndBattle @@ -219,31 +218,31 @@ Route24Text2: Route24Text3: TX_ASM - ld hl, Route24TrainerHeader2 + ld hl, Route24TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route24Text4: TX_ASM - ld hl, Route24TrainerHeader3 + ld hl, Route24TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route24Text5: TX_ASM - ld hl, Route24TrainerHeader4 + ld hl, Route24TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route24Text6: TX_ASM - ld hl, Route24TrainerHeader5 + ld hl, Route24TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route24Text7: TX_ASM - ld hl, Route24TrainerHeader6 + ld hl, Route24TrainerHeader5 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route25.asm b/scripts/route25.asm index 7ebfaff6..c83c725b 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -1,7 +1,7 @@ Route25Script: call Route25Script_515e1 call EnableAutoTextBoxDrawing - ld hl, Route25TrainerHeaders + ld hl, Route25TrainerHeader0 ld de, Route25ScriptPointers ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable @@ -53,7 +53,6 @@ Route25TextPointers: dw PickUpItemText dw Route25Text11 -Route25TrainerHeaders: Route25TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -63,73 +62,73 @@ Route25TrainerHeader0: dw Route25EndBattleText1 ; TextEndBattle dw Route25EndBattleText1 ; TextEndBattle -Route25TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 +Route25TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1 dw Route25BattleText2 ; TextBeforeBattle dw Route25AfterBattleText2 ; TextAfterBattle dw Route25EndBattleText2 ; TextEndBattle dw Route25EndBattleText2 ; TextEndBattle -Route25TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 +Route25TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 dw Route25BattleText3 ; TextBeforeBattle dw Route25AfterBattleText3 ; TextAfterBattle dw Route25EndBattleText3 ; TextEndBattle dw Route25EndBattleText3 ; TextEndBattle -Route25TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 +Route25TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 dw Route25BattleText4 ; TextBeforeBattle dw Route25AfterBattleText4 ; TextAfterBattle dw Route25EndBattleText4 ; TextEndBattle dw Route25EndBattleText4 ; TextEndBattle -Route25TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 +Route25TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 dw Route25BattleText5 ; TextBeforeBattle dw Route25AfterBattleText5 ; TextAfterBattle dw Route25EndBattleText5 ; TextEndBattle dw Route25EndBattleText5 ; TextEndBattle -Route25TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 +Route25TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 dw Route25BattleText6 ; TextBeforeBattle dw Route25AfterBattleText6 ; TextAfterBattle dw Route25EndBattleText6 ; TextEndBattle dw Route25EndBattleText6 ; TextEndBattle -Route25TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7 +Route25TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 dw Route25BattleText7 ; TextBeforeBattle dw Route25AfterBattleText7 ; TextAfterBattle dw Route25EndBattleText7 ; TextEndBattle dw Route25EndBattleText7 ; TextEndBattle -Route25TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 +Route25TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1 dw Route25BattleText8 ; TextBeforeBattle dw Route25AfterBattleText8 ; TextAfterBattle dw Route25EndBattleText8 ; TextEndBattle dw Route25EndBattleText8 ; TextEndBattle -Route25TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1 +Route25TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 dw Route25BattleText9 ; TextBeforeBattle dw Route25AfterBattleText9 ; TextAfterBattle dw Route25EndBattleText9 ; TextEndBattle @@ -145,49 +144,49 @@ Route25Text1: Route25Text2: TX_ASM - ld hl, Route25TrainerHeader2 + ld hl, Route25TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route25Text3: TX_ASM - ld hl, Route25TrainerHeader3 + ld hl, Route25TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route25Text4: TX_ASM - ld hl, Route25TrainerHeader4 + ld hl, Route25TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route25Text5: TX_ASM - ld hl, Route25TrainerHeader5 + ld hl, Route25TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route25Text6: TX_ASM - ld hl, Route25TrainerHeader6 + ld hl, Route25TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route25Text7: TX_ASM - ld hl, Route25TrainerHeader7 + ld hl, Route25TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route25Text8: TX_ASM - ld hl, Route25TrainerHeader8 + ld hl, Route25TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route25Text9: TX_ASM - ld hl, Route25TrainerHeader9 + ld hl, Route25TrainerHeader8 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route3.asm b/scripts/route3.asm index b2c5de3e..e4748b8c 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -24,7 +24,6 @@ Route3TextPointers: dw Route3Text9 dw Route3Text10 -Route3TrainerHeaders: Route3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -34,64 +33,64 @@ Route3TrainerHeader0: dw Route3EndBattleText1 ; TextEndBattle dw Route3EndBattleText1 ; TextEndBattle -Route3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 +Route3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1 dw Route3BattleText2 ; TextBeforeBattle dw Route3AfterBattleText2 ; TextAfterBattle dw Route3EndBattleText2 ; TextEndBattle dw Route3EndBattleText2 ; TextEndBattle -Route3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 +Route3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 dw Route3BattleText3 ; TextBeforeBattle dw Route3AfterBattleText3 ; TextAfterBattle dw Route3EndBattleText3 ; TextEndBattle dw Route3EndBattleText3 ; TextEndBattle -Route3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 +Route3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 dw Route3BattleText4 ; TextBeforeBattle dw Route3AfterBattleText4 ; TextAfterBattle dw Route3EndBattleText4 ; TextEndBattle dw Route3EndBattleText4 ; TextEndBattle -Route3TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 +Route3TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 dw Route3BattleText5 ; TextBeforeBattle dw Route3AfterBattleText5 ; TextAfterBattle dw Route3EndBattleText5 ; TextEndBattle dw Route3EndBattleText5 ; TextEndBattle -Route3TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6 +Route3TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 dw Route3BattleText6 ; TextBeforeBattle dw Route3AfterBattleText6 ; TextAfterBattle dw Route3EndBattleText6 ; TextEndBattle dw Route3EndBattleText6 ; TextEndBattle -Route3TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 +Route3TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1 dw Route3BattleText7 ; TextBeforeBattle dw Route3AfterBattleText7 ; TextAfterBattle dw Route3EndBattleText7 ; TextEndBattle dw Route3EndBattleText7 ; TextEndBattle -Route3TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1 +Route3TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 dw Route3BattleText8 ; TextBeforeBattle dw Route3AfterBattleText8 ; TextAfterBattle dw Route3EndBattleText8 ; TextEndBattle @@ -123,7 +122,7 @@ Route3AfterBattleText1: Route3Text3: TX_ASM - ld hl, Route3TrainerHeader2 + ld hl, Route3TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -141,7 +140,7 @@ Route3AfterBattleText2: Route3Text4: TX_ASM - ld hl, Route3TrainerHeader3 + ld hl, Route3TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -159,7 +158,7 @@ Route3AfterBattleText3: Route3Text5: TX_ASM - ld hl, Route3TrainerHeader4 + ld hl, Route3TrainerHeader3 call TalkToTrainer jp TextScriptEnd @@ -177,7 +176,7 @@ Route3AfterBattleText4: Route3Text6: TX_ASM - ld hl, Route3TrainerHeader5 + ld hl, Route3TrainerHeader4 call TalkToTrainer jp TextScriptEnd @@ -195,7 +194,7 @@ Route3AfterBattleText5: Route3Text7: TX_ASM - ld hl, Route3TrainerHeader6 + ld hl, Route3TrainerHeader5 call TalkToTrainer jp TextScriptEnd @@ -213,7 +212,7 @@ Route3AfterBattleText6: Route3Text8: TX_ASM - ld hl, Route3TrainerHeader7 + ld hl, Route3TrainerHeader6 call TalkToTrainer jp TextScriptEnd @@ -231,7 +230,7 @@ Route3AfterBattleText7: Route3Text9: TX_ASM - ld hl, Route3TrainerHeader8 + ld hl, Route3TrainerHeader7 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/route4.asm b/scripts/route4.asm index 559f2006..ee9e2cdf 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -1,6 +1,6 @@ Route4Script: call EnableAutoTextBoxDrawing - ld hl, Route4TrainerHeaders + ld hl, Route4TrainerHeader0 ld de, Route4ScriptPointers ld a, [wRoute4CurScript] call ExecuteCurMapScriptInTable @@ -20,7 +20,6 @@ Route4TextPointers: dw Route4Text5 dw Route4Text6 -Route4TrainerHeaders: Route4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/route6.asm b/scripts/route6.asm index 53653b39..ba727adc 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -1,6 +1,6 @@ Route6Script: call EnableAutoTextBoxDrawing - ld hl, Route6TrainerHeaders + ld hl, Route6TrainerHeader0 ld de, Route6ScriptPointers ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable @@ -21,7 +21,6 @@ Route6TextPointers: dw Route6Text6 dw Route6Text7 -Route6TrainerHeaders: Route6TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 db ($0 << 4) ; trainer's view range diff --git a/scripts/route8.asm b/scripts/route8.asm index 34e6aba4..e05508bb 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -1,6 +1,6 @@ Route8Script: call EnableAutoTextBoxDrawing - ld hl, Route8TrainerHeaders + ld hl, Route8TrainerHeader0 ld de, Route8ScriptPointers ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable @@ -24,7 +24,6 @@ Route8TextPointers: dw Route8Text9 dw Route8Text10 -Route8TrainerHeaders: Route8TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/route9.asm b/scripts/route9.asm index 5776d4e6..c965d853 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -1,6 +1,6 @@ Route9Script: call EnableAutoTextBoxDrawing - ld hl, Route9TrainerHeaders + ld hl, Route9TrainerHeader0 ld de, Route9ScriptPointers ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ Route9TextPointers: dw PickUpItemText dw Route9Text11 -Route9TrainerHeaders: Route9TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -35,73 +34,73 @@ Route9TrainerHeader0: dw Route9EndBattleText1 ; TextEndBattle dw Route9EndBattleText1 ; TextEndBattle -Route9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 +Route9TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1 dw Route9BattleText2 ; TextBeforeBattle dw Route9AfterBattleText2 ; TextAfterBattle dw Route9EndBattleText2 ; TextEndBattle dw Route9EndBattleText2 ; TextEndBattle -Route9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 +Route9TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 dw Route9BattleText3 ; TextBeforeBattle dw Route9AfterBattleText3 ; TextAfterBattle dw Route9EndBattleText3 ; TextEndBattle dw Route9EndBattleText3 ; TextEndBattle -Route9TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 +Route9TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 dw Route9BattleText4 ; TextBeforeBattle dw Route9AfterBattleText4 ; TextAfterBattle dw Route9EndBattleText4 ; TextEndBattle dw Route9EndBattleText4 ; TextEndBattle -Route9TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 +Route9TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 dw Route9BattleText5 ; TextBeforeBattle dw Route9AfterBattleText5 ; TextAfterBattle dw Route9EndBattleText5 ; TextEndBattle dw Route9EndBattleText5 ; TextEndBattle -Route9TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 +Route9TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 dw Route9BattleText6 ; TextBeforeBattle dw Route9AfterBattleText6 ; TextAfterBattle dw Route9EndBattleText6 ; TextEndBattle dw Route9EndBattleText6 ; TextEndBattle -Route9TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7 +Route9TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 dw Route9BattleText7 ; TextBeforeBattle dw Route9AfterBattleText7 ; TextAfterBattle dw Route9EndBattleText7 ; TextEndBattle dw Route9EndBattleText7 ; TextEndBattle -Route9TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 +Route9TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1 dw Route9BattleText8 ; TextBeforeBattle dw Route9AfterBattleText8 ; TextAfterBattle dw Route9EndBattleText8 ; TextEndBattle dw Route9EndBattleText8 ; TextEndBattle -Route9TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1 +Route9TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1 + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 dw Route9BattleText9 ; TextBeforeBattle dw Route9AfterBattleText9 ; TextAfterBattle dw Route9EndBattleText9 ; TextEndBattle @@ -116,42 +115,42 @@ Route9Text1: Route9Text2: TX_ASM - ld hl, Route9TrainerHeader2 + ld hl, Route9TrainerHeader1 jr Route9TalkToTrainer Route9Text3: TX_ASM - ld hl, Route9TrainerHeader3 + ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer Route9Text4: TX_ASM - ld hl, Route9TrainerHeader4 + ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer Route9Text5: TX_ASM - ld hl, Route9TrainerHeader5 + ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer Route9Text6: TX_ASM - ld hl, Route9TrainerHeader6 + ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer Route9Text7: TX_ASM - ld hl, Route9TrainerHeader7 + ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer Route9Text8: TX_ASM - ld hl, Route9TrainerHeader8 + ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer Route9Text9: TX_ASM - ld hl, Route9TrainerHeader9 + ld hl, Route9TrainerHeader8 Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 6adb6d52..cbf935e7 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -84,7 +84,6 @@ SaffronGymTextPointers: dw SaffronGymText11 dw SaffronGymText12 -SaffronGymTrainerHeaders: SaffronGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 6b35a05a..5cfb92b2 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -1,7 +1,7 @@ SilphCo10Script: call SilphCo10Script_5a14f call EnableAutoTextBoxDrawing - ld hl, SilphCo10TrainerHeaders + ld hl, SilphCo10TrainerHeader0 ld de, SilphCo10ScriptPointers ld a, [wSilphCo10CurScript] call ExecuteCurMapScriptInTable @@ -47,7 +47,6 @@ SilphCo10TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo10TrainerHeaders: SilphCo10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 5f924bfc..342fef07 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -1,7 +1,7 @@ SilphCo11Script: call SilphCo11Script_62110 call EnableAutoTextBoxDrawing - ld hl, SilphCo11TrainerHeaders + ld hl, SilphCo11TrainerHeader0 ld de, SilphCo11ScriptPointers ld a, [wSilphCo11CurScript] call ExecuteCurMapScriptInTable @@ -280,7 +280,6 @@ SilphCo11TextPointers: dw SilphCo11Text5 dw SilphCo11Text6 -SilphCo11TrainerHeaders: SilphCo11TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index c8d72689..e77c45dd 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -1,7 +1,7 @@ SilphCo2Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing - ld hl, SilphCo2TrainerHeaders + ld hl, SilphCo2TrainerHeader0 ld de, SilphCo2ScriptPointers ld a, [wSilphCo2CurScript] call ExecuteCurMapScriptInTable @@ -98,7 +98,6 @@ SilphCo2TextPointers: dw SilphCo2Text4 dw SilphCo2Text5 -SilphCo2TrainerHeaders: SilphCo2TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index b8dfb7fb..0d12b768 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -1,7 +1,7 @@ SilphCo3Script: call SilphCo3Script_59f71 call EnableAutoTextBoxDrawing - ld hl, SilphCo3TrainerHeaders + ld hl, SilphCo3TrainerHeader0 ld de, SilphCo3ScriptPointers ld a, [wSilphCo3CurScript] call ExecuteCurMapScriptInTable @@ -61,7 +61,6 @@ SilphCo3TextPointers: dw SilphCo3Text3 dw PickUpItemText -SilphCo3TrainerHeaders: SilphCo3TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index a0682c8d..1cfd1ceb 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -1,7 +1,7 @@ SilphCo4Script: call SilphCo4Script_19d21 call EnableAutoTextBoxDrawing - ld hl, SilphCo4TrainerHeaders + ld hl, SilphCo4TrainerHeader0 ld de, SilphCo4ScriptPointers ld a, [wSilphCo4CurScript] call ExecuteCurMapScriptInTable @@ -100,7 +100,6 @@ SilphCo4TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo4TrainerHeaders: SilphCo4TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -110,19 +109,19 @@ SilphCo4TrainerHeader0: dw SilphCo4EndBattleText2 ; TextEndBattle dw SilphCo4EndBattleText2 ; TextEndBattle -SilphCo4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 +SilphCo4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1 dw SilphCo4BattleText3 ; TextBeforeBattle dw SilphCo4AfterBattleText3 ; TextAfterBattle dw SilphCo4EndBattleText3 ; TextEndBattle dw SilphCo4EndBattleText3 ; TextEndBattle -SilphCo4TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3 +SilphCo4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 dw SilphCo4BattleText4 ; TextBeforeBattle dw SilphCo4AfterBattleText4 ; TextAfterBattle dw SilphCo4EndBattleText4 ; TextEndBattle @@ -165,7 +164,7 @@ SilphCo4AfterBattleText2: SilphCo4Text3: TX_ASM - ld hl, SilphCo4TrainerHeader2 + ld hl, SilphCo4TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -183,7 +182,7 @@ SilphCo4AfterBattleText3: SilphCo4Text4: TX_ASM - ld hl, SilphCo4TrainerHeader3 + ld hl, SilphCo4TrainerHeader2 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 42577498..45a81b68 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -1,7 +1,7 @@ SilphCo5Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing - ld hl, SilphCo5TrainerHeaders + ld hl, SilphCo5TrainerHeader0 ld de, SilphCo5ScriptPointers ld a, [wSilphCo5CurScript] call ExecuteCurMapScriptInTable @@ -83,8 +83,7 @@ SilphCo5TextPointers: dw SilphCo5Text10 dw SilphCo5Text11 -SilphCo5TrainerHeaders: -Silphco5TrainerHeader0: +SilphCo5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 @@ -93,28 +92,28 @@ Silphco5TrainerHeader0: dw SilphCo5EndBattleText2 ; TextEndBattle dw SilphCo5EndBattleText2 ; TextEndBattle -Silphco5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 +SilphCo5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 dw SilphCo5BattleText3 ; TextBeforeBattle dw SilphCo5AfterBattleText3 ; TextAfterBattle dw SilphCo5EndBattleText3 ; TextEndBattle dw SilphCo5EndBattleText3 ; TextEndBattle -Silphco5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 +SilphCo5TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 dw SilphCo5BattleText4 ; TextBeforeBattle dw SilphCo5AfterBattleText4 ; TextAfterBattle dw SilphCo5EndBattleText4 ; TextEndBattle dw SilphCo5EndBattleText4 ; TextEndBattle -Silphco5TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4 +SilphCo5TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 dw SilphCo5BattleText5 ; TextBeforeBattle dw SilphCo5AfterBattleText5 ; TextAfterBattle dw SilphCo5EndBattleText5 ; TextEndBattle @@ -139,7 +138,7 @@ SilphCo5Text_1a015: SilphCo5Text2: TX_ASM - ld hl, Silphco5TrainerHeader0 + ld hl, SilphCo5TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -157,7 +156,7 @@ SilphCo5AfterBattleText2: SilphCo5Text3: TX_ASM - ld hl, Silphco5TrainerHeader2 + ld hl, SilphCo5TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -175,7 +174,7 @@ SilphCo5AfterBattleText3: SilphCo5Text4: TX_ASM - ld hl, Silphco5TrainerHeader3 + ld hl, SilphCo5TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -193,7 +192,7 @@ SilphCo5AfterBattleText4: SilphCo5Text5: TX_ASM - ld hl, Silphco5TrainerHeader4 + ld hl, SilphCo5TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index c40c7d70..240b6793 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -1,7 +1,7 @@ SilphCo6Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing - ld hl, SilphCo6TrainerHeaders + ld hl, SilphCo6TrainerHeader0 ld de, SilphCo6ScriptPointers ld a, [wSilphCo6CurScript] call ExecuteCurMapScriptInTable @@ -51,7 +51,6 @@ SilphCo6TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo6TrainerHeaders: SilphCo6TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -61,19 +60,19 @@ SilphCo6TrainerHeader0: dw SilphCo6EndBattleText2 ; TextEndBattle dw SilphCo6EndBattleText2 ; TextEndBattle -SilphCo6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2 +SilphCo6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 dw SilphCo6BattleText3 ; TextBeforeBattle dw SilphCo6AfterBattleText3 ; TextAfterBattle dw SilphCo6EndBattleText3 ; TextEndBattle dw SilphCo6EndBattleText3 ; TextEndBattle -SilphCo6TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 +SilphCo6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 dw SilphCo6BattleText4 ; TextBeforeBattle dw SilphCo6AfterBattleText4 ; TextAfterBattle dw SilphCo6EndBattleText4 ; TextEndBattle @@ -186,7 +185,7 @@ SilphCo6AfterBattleText2: SilphCo6Text7: TX_ASM - ld hl, SilphCo6TrainerHeader2 + ld hl, SilphCo6TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -204,7 +203,7 @@ SilphCo6AfterBattleText3: SilphCo6Text8: TX_ASM - ld hl, SilphCo6TrainerHeader3 + ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 9469d294..b211c8a9 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -1,7 +1,7 @@ SilphCo7Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing - ld hl, SilphCo7TrainerHeaders + ld hl, SilphCo7TrainerHeader0 ld de, SilphCo7ScriptPointers ld a, [wSilphCo7CurScript] call ExecuteCurMapScriptInTable @@ -279,7 +279,6 @@ SilphCo7TextPointers: dw SilphCo7Text14 dw SilphCo7Text15 -SilphCo7TrainerHeaders: SilphCo7TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -289,28 +288,28 @@ SilphCo7TrainerHeader0: dw SilphCo7EndBattleText1 ; TextEndBattle dw SilphCo7EndBattleText1 ; TextEndBattle -SilphCo7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 +SilphCo7TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1 dw SilphCo7BattleText2 ; TextBeforeBattle dw SilphCo7AfterBattleText2 ; TextAfterBattle dw SilphCo7EndBattleText2 ; TextEndBattle dw SilphCo7EndBattleText2 ; TextEndBattle -SilphCo7TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3 +SilphCo7TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 dw SilphCo7BattleText3 ; TextBeforeBattle dw SilphCo7AfterBattleText3 ; TextAfterBattle dw SilphCo7EndBattleText3 ; TextEndBattle dw SilphCo7EndBattleText3 ; TextEndBattle -SilphCo7TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 +SilphCo7TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 dw SilphCo7BattleText4 ; TextBeforeBattle dw SilphCo7AfterBattleText4 ; TextAfterBattle dw SilphCo7EndBattleText4 ; TextEndBattle @@ -449,7 +448,7 @@ SilphCo7AfterBattleText1: SilphCo7Text6: TX_ASM - ld hl, SilphCo7TrainerHeader2 + ld hl, SilphCo7TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -467,7 +466,7 @@ SilphCo7AfterBattleText2: SilphCo7Text7: TX_ASM - ld hl, SilphCo7TrainerHeader3 + ld hl, SilphCo7TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -485,7 +484,7 @@ SilphCo7AfterBattleText3: SilphCo7Text8: TX_ASM - ld hl, SilphCo7TrainerHeader4 + ld hl, SilphCo7TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 399f7bd5..498fd569 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -81,7 +81,6 @@ SilphCo8TextPointers: dw SilphCo8Text3 dw SilphCo8Text4 -SilphCo8TrainerHeaders: SilphCo8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 6757eb49..57b8bc89 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -1,7 +1,7 @@ SilphCo9Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing - ld hl, SilphCo9TrainerHeaders + ld hl, SilphCo9TrainerHeader0 ld de, SilphCo9ScriptPointers ld a, [wSilphCo9CurScript] call ExecuteCurMapScriptInTable @@ -129,7 +129,6 @@ SilphCo9TextPointers: dw SilphCo9Text3 dw SilphCo9Text4 -SilphCo9TrainerHeaders: SilphCo9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 45c8dba5..12433732 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -1,6 +1,6 @@ SSAnne10Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne10TrainerHeaders + ld hl, SSAnne10TrainerHeader0 ld de, SSAnne10ScriptPointers ld a, [wSSAnne10CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ SSAnne10TextPointers: dw PickUpItemText dw PickUpItemText -SSAnne10TrainerHeaders: SSAnne10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index a398a381..0cfef9f4 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -19,7 +19,6 @@ SSAnne5TextPointers: dw SSAnne5Text4 dw SSAnne5Text5 -SSAnne5TrainerHeaders: SSAnne5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index e7cbef3e..c684f84b 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -1,6 +1,6 @@ SSAnne8Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne8TrainerHeaders + ld hl, SSAnne8TrainerHeader0 ld de, SSAnne8ScriptPointers ld a, [wSSAnne8CurScript] call ExecuteCurMapScriptInTable @@ -25,7 +25,6 @@ SSAnne8TextPointers: dw PickUpItemText dw SSAnne8Text11 -SSAnne8TrainerHeaders: SSAnne8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 789b0fa8..1f965e0d 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -3,7 +3,7 @@ SSAnne9Script: ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, SSAnne9TrainerHeaders + ld hl, SSAnne9TrainerHeader0 ld de, SSAnne9ScriptPointers ld a, [wSSAnne9CurScript] call ExecuteCurMapScriptInTable @@ -30,7 +30,6 @@ SSAnne9TextPointers: dw SSAnne9Text12 dw SSAnne9Text13 -SSAnne9TrainerHeaders: SSAnne9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 2790694b..78b1ab80 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -1,6 +1,6 @@ UnknownDungeon3Script: call EnableAutoTextBoxDrawing - ld hl, UnknownDungeon3TrainerHeaders + ld hl, MewtwoTrainerHeader ld de, .ScriptPointers ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable @@ -17,7 +17,6 @@ UnknownDungeon3TextPointers: dw PickUpItemText dw PickUpItemText -UnknownDungeon3TrainerHeaders: MewtwoTrainerHeader: dbEventFlagBit EVENT_BEAT_MEWTWO db ($0 << 4) ; trainer's view range diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 99bd4008..c22ce9ce 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -99,7 +99,6 @@ VermilionGymTextPointers: dw VermilionGymText7 dw VermilionGymText8 -VermilionGymTrainerHeaders: VermilionGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 8ec6725b..5409d733 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -4,7 +4,7 @@ VictoryRoad1Script: res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing - ld hl, VictoryRoad1TrainerHeaders + ld hl, VictoryRoad1TrainerHeader0 ld de, VictoryRoad1ScriptPointers ld a, [wVictoryRoad1CurScript] call ExecuteCurMapScriptInTable @@ -46,7 +46,6 @@ VictoryRoad1TextPointers: dw BoulderText dw BoulderText -VictoryRoad1TrainerHeaders: VictoryRoad1TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 db ($2 << 4) ; trainer's view range diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 5a3413ee..847573d8 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -8,7 +8,7 @@ VictoryRoad2Script: res 5, [hl] call nz, VictoryRoad2Script_517c9 call EnableAutoTextBoxDrawing - ld hl, VictoryRoad2TrainerHeaders + ld hl, VictoryRoad2TrainerHeader0 ld de, VictoryRoad2ScriptPointers ld a, [wVictoryRoad2CurScript] call ExecuteCurMapScriptInTable @@ -83,7 +83,6 @@ VictoryRoad2TextPointers: dw BoulderText dw BoulderText -VictoryRoad2TrainerHeaders: VictoryRoad2TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -93,37 +92,37 @@ VictoryRoad2TrainerHeader0: dw VictoryRoad2EndBattleText1 ; TextEndBattle dw VictoryRoad2EndBattleText1 ; TextEndBattle -VictoryRoad2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 +VictoryRoad2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 dw VictoryRoad2BattleText2 ; TextBeforeBattle dw VictoryRoad2AfterBattleText2 ; TextAfterBattle dw VictoryRoad2EndBattleText2 ; TextEndBattle dw VictoryRoad2EndBattleText2 ; TextEndBattle -VictoryRoad2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 +VictoryRoad2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 dw VictoryRoad2BattleText3 ; TextBeforeBattle dw VictoryRoad2AfterBattleText3 ; TextAfterBattle dw VictoryRoad2EndBattleText3 ; TextEndBattle dw VictoryRoad2EndBattleText3 ; TextEndBattle -VictoryRoad2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 +VictoryRoad2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 dw VictoryRoad2BattleText4 ; TextBeforeBattle dw VictoryRoad2AfterBattleText4 ; TextAfterBattle dw VictoryRoad2EndBattleText4 ; TextEndBattle dw VictoryRoad2EndBattleText4 ; TextEndBattle -VictoryRoad2TrainerHeader5: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 +VictoryRoad2TrainerHeader4: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 dw VictoryRoad2BattleText5 ; TextBeforeBattle dw VictoryRoad2AfterBattleText5 ; TextAfterBattle dw VictoryRoad2EndBattleText5 ; TextEndBattle @@ -148,25 +147,25 @@ VictoryRoad2Text1: VictoryRoad2Text2: TX_ASM - ld hl, VictoryRoad2TrainerHeader2 + ld hl, VictoryRoad2TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text3: TX_ASM - ld hl, VictoryRoad2TrainerHeader3 + ld hl, VictoryRoad2TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text4: TX_ASM - ld hl, VictoryRoad2TrainerHeader4 + ld hl, VictoryRoad2TrainerHeader3 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text5: TX_ASM - ld hl, VictoryRoad2TrainerHeader5 + ld hl, VictoryRoad2TrainerHeader4 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index ef638a0f..c615091b 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -1,7 +1,7 @@ VictoryRoad3Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing - ld hl, VictoryRoad3TrainerHeaders + ld hl, VictoryRoad3TrainerHeader0 ld de, VictoryRoad3ScriptPointers ld a, [wVictoryRoad3CurScript] call ExecuteCurMapScriptInTable @@ -86,7 +86,6 @@ VictoryRoad3TextPointers: dw BoulderText dw BoulderText -VictoryRoad3TrainerHeaders: VictoryRoad3TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 db ($1 << 4) ; trainer's view range @@ -96,28 +95,28 @@ VictoryRoad3TrainerHeader0: dw VictoryRoad3EndBattleText2 ; TextEndBattle dw VictoryRoad3EndBattleText2 ; TextEndBattle -VictoryRoad3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 +VictoryRoad3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 dw VictoryRoad3BattleText3 ; TextBeforeBattle dw VictoryRoad3AfterBattleText3 ; TextAfterBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle -VictoryRoad3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 +VictoryRoad3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 dw VictoryRoad3BattleText4 ; TextBeforeBattle dw VictoryRoad3AfterBattleText4 ; TextAfterBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle -VictoryRoad3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 +VictoryRoad3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 dw VictoryRoad3BattleText5 ; TextBeforeBattle dw VictoryRoad3AfterBattleText5 ; TextAfterBattle dw VictoryRoad3EndBattleText5 ; TextEndBattle @@ -133,19 +132,19 @@ VictoryRoad3Text1: VictoryRoad3Text2: TX_ASM - ld hl, VictoryRoad3TrainerHeader2 + ld hl, VictoryRoad3TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text3: TX_ASM - ld hl, VictoryRoad3TrainerHeader3 + ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text4: TX_ASM - ld hl, VictoryRoad3TrainerHeader4 + ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 3dbfd8dd..bce093a9 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -1,6 +1,6 @@ ViridianForestScript: call EnableAutoTextBoxDrawing - ld hl, ViridianForestTrainerHeaders + ld hl, ViridianForestTrainerHeader0 ld de, ViridianForestScriptPointers ld a, [wViridianForestCurScript] call ExecuteCurMapScriptInTable @@ -28,7 +28,6 @@ ViridianForestTextPointers: dw ViridianForestText13 dw ViridianForestText14 -ViridianForestTrainerHeaders: ViridianForestTrainerHeader0: dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 3d845c2a..cc8dcb90 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -3,7 +3,7 @@ ViridianGymScript: ld de, Gym8LeaderName call LoadGymLeaderAndCityName call EnableAutoTextBoxDrawing - ld hl, ViridianGymTrainerHeaders + ld hl, ViridianGymTrainerHeader0 ld de, ViridianGymScriptPointers ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable @@ -184,7 +184,6 @@ ViridianGymTextPointers: dw ViridianGymText13 dw ViridianGymText14 -ViridianGymTrainerHeaders: ViridianGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 db ($4 << 4) ; trainer's view range diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm index 03dfcc91..14240c9e 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/pewter_city.asm @@ -70,7 +70,7 @@ _PewterCityText_1945d:: cont "Follow me!" done -_PewterCityText_19462:: +_PewterCityText14:: text "If you have the" line "right stuff, go" cont "take on BROCK!" -- cgit v1.2.3 From 84c7985e67b0838fce04e49a0916aa5a873131b3 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 19:30:57 -0500 Subject: Fix sound effect channel numbering mostly so that sound effects that only use the noise channel are labelled 'Ch7' instead of 'Ch1' --- audio.asm | 10 +- audio/headers/sfxheaders1.asm | 370 +++++++++++++++---------------- audio/headers/sfxheaders2.asm | 466 +++++++++++++++++++-------------------- audio/headers/sfxheaders3.asm | 388 ++++++++++++++++---------------- audio/sfx/59_1.asm | 4 +- audio/sfx/59_3.asm | 4 +- audio/sfx/arrow_tiles_1.asm | 2 +- audio/sfx/arrow_tiles_3.asm | 2 +- audio/sfx/ball_poof.asm | 4 +- audio/sfx/ball_toss.asm | 4 +- audio/sfx/battle_09.asm | 2 +- audio/sfx/battle_0b.asm | 2 +- audio/sfx/battle_0c.asm | 2 +- audio/sfx/battle_0d.asm | 2 +- audio/sfx/battle_0e.asm | 2 +- audio/sfx/battle_0f.asm | 2 +- audio/sfx/battle_12.asm | 4 +- audio/sfx/battle_13.asm | 2 +- audio/sfx/battle_14.asm | 2 +- audio/sfx/battle_16.asm | 2 +- audio/sfx/battle_17.asm | 2 +- audio/sfx/battle_18.asm | 2 +- audio/sfx/battle_19.asm | 2 +- audio/sfx/battle_1b.asm | 2 +- audio/sfx/battle_1c.asm | 2 +- audio/sfx/battle_1e.asm | 4 +- audio/sfx/battle_20.asm | 2 +- audio/sfx/battle_21.asm | 2 +- audio/sfx/battle_22.asm | 2 +- audio/sfx/battle_23.asm | 2 +- audio/sfx/battle_24.asm | 4 +- audio/sfx/battle_25.asm | 2 +- audio/sfx/battle_26.asm | 2 +- audio/sfx/battle_27.asm | 8 +- audio/sfx/battle_28.asm | 12 +- audio/sfx/battle_29.asm | 8 +- audio/sfx/battle_2a.asm | 12 +- audio/sfx/battle_2b.asm | 8 +- audio/sfx/battle_2c.asm | 12 +- audio/sfx/battle_2e.asm | 12 +- audio/sfx/battle_2f.asm | 12 +- audio/sfx/battle_31.asm | 4 +- audio/sfx/battle_32.asm | 4 +- audio/sfx/battle_33.asm | 4 +- audio/sfx/battle_34.asm | 6 +- audio/sfx/battle_35.asm | 4 +- audio/sfx/battle_36.asm | 8 +- audio/sfx/caught_mon.asm | 6 +- audio/sfx/collision_1.asm | 2 +- audio/sfx/collision_3.asm | 2 +- audio/sfx/cry00_1.asm | 6 +- audio/sfx/cry00_2.asm | 6 +- audio/sfx/cry00_3.asm | 6 +- audio/sfx/cry01_1.asm | 6 +- audio/sfx/cry01_2.asm | 6 +- audio/sfx/cry01_3.asm | 6 +- audio/sfx/cry02_1.asm | 6 +- audio/sfx/cry02_2.asm | 6 +- audio/sfx/cry02_3.asm | 6 +- audio/sfx/cry03_1.asm | 6 +- audio/sfx/cry03_2.asm | 6 +- audio/sfx/cry03_3.asm | 6 +- audio/sfx/cry04_1.asm | 6 +- audio/sfx/cry04_2.asm | 6 +- audio/sfx/cry04_3.asm | 6 +- audio/sfx/cry05_1.asm | 6 +- audio/sfx/cry05_2.asm | 6 +- audio/sfx/cry05_3.asm | 6 +- audio/sfx/cry06_1.asm | 6 +- audio/sfx/cry06_2.asm | 6 +- audio/sfx/cry06_3.asm | 6 +- audio/sfx/cry07_1.asm | 6 +- audio/sfx/cry07_2.asm | 6 +- audio/sfx/cry07_3.asm | 6 +- audio/sfx/cry08_1.asm | 6 +- audio/sfx/cry08_2.asm | 6 +- audio/sfx/cry08_3.asm | 6 +- audio/sfx/cry09_1.asm | 6 +- audio/sfx/cry09_2.asm | 6 +- audio/sfx/cry09_3.asm | 6 +- audio/sfx/cry0a_1.asm | 6 +- audio/sfx/cry0a_2.asm | 6 +- audio/sfx/cry0a_3.asm | 6 +- audio/sfx/cry0b_1.asm | 6 +- audio/sfx/cry0b_2.asm | 6 +- audio/sfx/cry0b_3.asm | 6 +- audio/sfx/cry0c_1.asm | 6 +- audio/sfx/cry0c_2.asm | 6 +- audio/sfx/cry0c_3.asm | 6 +- audio/sfx/cry0d_1.asm | 8 +- audio/sfx/cry0d_2.asm | 8 +- audio/sfx/cry0d_3.asm | 8 +- audio/sfx/cry0e_1.asm | 6 +- audio/sfx/cry0e_2.asm | 6 +- audio/sfx/cry0e_3.asm | 6 +- audio/sfx/cry0f_1.asm | 6 +- audio/sfx/cry0f_2.asm | 6 +- audio/sfx/cry0f_3.asm | 6 +- audio/sfx/cry10_1.asm | 6 +- audio/sfx/cry10_2.asm | 6 +- audio/sfx/cry10_3.asm | 6 +- audio/sfx/cry11_1.asm | 6 +- audio/sfx/cry11_2.asm | 6 +- audio/sfx/cry11_3.asm | 6 +- audio/sfx/cry12_1.asm | 6 +- audio/sfx/cry12_2.asm | 6 +- audio/sfx/cry12_3.asm | 6 +- audio/sfx/cry13_1.asm | 6 +- audio/sfx/cry13_2.asm | 6 +- audio/sfx/cry13_3.asm | 6 +- audio/sfx/cry14_1.asm | 6 +- audio/sfx/cry14_2.asm | 6 +- audio/sfx/cry14_3.asm | 6 +- audio/sfx/cry15_1.asm | 6 +- audio/sfx/cry15_2.asm | 6 +- audio/sfx/cry15_3.asm | 6 +- audio/sfx/cry16_1.asm | 6 +- audio/sfx/cry16_2.asm | 6 +- audio/sfx/cry16_3.asm | 6 +- audio/sfx/cry17_1.asm | 6 +- audio/sfx/cry17_2.asm | 6 +- audio/sfx/cry17_3.asm | 6 +- audio/sfx/cry18_1.asm | 6 +- audio/sfx/cry18_2.asm | 6 +- audio/sfx/cry18_3.asm | 6 +- audio/sfx/cry19_1.asm | 6 +- audio/sfx/cry19_2.asm | 6 +- audio/sfx/cry19_3.asm | 6 +- audio/sfx/cry1a_1.asm | 6 +- audio/sfx/cry1a_2.asm | 6 +- audio/sfx/cry1a_3.asm | 6 +- audio/sfx/cry1b_1.asm | 6 +- audio/sfx/cry1b_2.asm | 6 +- audio/sfx/cry1b_3.asm | 6 +- audio/sfx/cry1c_1.asm | 6 +- audio/sfx/cry1c_2.asm | 6 +- audio/sfx/cry1c_3.asm | 6 +- audio/sfx/cry1d_1.asm | 6 +- audio/sfx/cry1d_2.asm | 6 +- audio/sfx/cry1d_3.asm | 6 +- audio/sfx/cry1e_1.asm | 6 +- audio/sfx/cry1e_2.asm | 6 +- audio/sfx/cry1e_3.asm | 6 +- audio/sfx/cry1f_1.asm | 6 +- audio/sfx/cry1f_2.asm | 6 +- audio/sfx/cry1f_3.asm | 6 +- audio/sfx/cry20_1.asm | 6 +- audio/sfx/cry20_2.asm | 6 +- audio/sfx/cry20_3.asm | 6 +- audio/sfx/cry21_1.asm | 6 +- audio/sfx/cry21_2.asm | 6 +- audio/sfx/cry21_3.asm | 6 +- audio/sfx/cry22_1.asm | 6 +- audio/sfx/cry22_2.asm | 6 +- audio/sfx/cry22_3.asm | 6 +- audio/sfx/cry23_1.asm | 6 +- audio/sfx/cry23_2.asm | 6 +- audio/sfx/cry23_3.asm | 6 +- audio/sfx/cry24_1.asm | 6 +- audio/sfx/cry24_2.asm | 6 +- audio/sfx/cry24_3.asm | 6 +- audio/sfx/cry25_1.asm | 6 +- audio/sfx/cry25_2.asm | 6 +- audio/sfx/cry25_3.asm | 6 +- audio/sfx/cut_1.asm | 2 +- audio/sfx/cut_3.asm | 2 +- audio/sfx/cymbal1_1.asm | 2 +- audio/sfx/cymbal1_2.asm | 2 +- audio/sfx/cymbal1_3.asm | 2 +- audio/sfx/cymbal2_1.asm | 2 +- audio/sfx/cymbal2_2.asm | 2 +- audio/sfx/cymbal2_3.asm | 2 +- audio/sfx/cymbal3_1.asm | 2 +- audio/sfx/cymbal3_2.asm | 2 +- audio/sfx/cymbal3_3.asm | 2 +- audio/sfx/damage.asm | 2 +- audio/sfx/denied_1.asm | 4 +- audio/sfx/denied_3.asm | 4 +- audio/sfx/dex_page_added.asm | 4 +- audio/sfx/doubleslap.asm | 2 +- audio/sfx/enter_pc_1.asm | 2 +- audio/sfx/enter_pc_3.asm | 2 +- audio/sfx/faint_fall.asm | 2 +- audio/sfx/faint_thud.asm | 4 +- audio/sfx/fly_1.asm | 2 +- audio/sfx/fly_3.asm | 2 +- audio/sfx/get_item1_1.asm | 6 +- audio/sfx/get_item1_3.asm | 6 +- audio/sfx/get_item2_1.asm | 6 +- audio/sfx/get_item2_2.asm | 6 +- audio/sfx/get_item2_3.asm | 6 +- audio/sfx/get_key_item_1.asm | 6 +- audio/sfx/get_key_item_3.asm | 6 +- audio/sfx/go_inside_1.asm | 2 +- audio/sfx/go_inside_3.asm | 2 +- audio/sfx/go_outside_1.asm | 2 +- audio/sfx/go_outside_3.asm | 2 +- audio/sfx/heal_ailment_1.asm | 2 +- audio/sfx/heal_ailment_2.asm | 2 +- audio/sfx/heal_ailment_3.asm | 2 +- audio/sfx/heal_hp_1.asm | 2 +- audio/sfx/heal_hp_2.asm | 2 +- audio/sfx/heal_hp_3.asm | 2 +- audio/sfx/healing_machine_1.asm | 2 +- audio/sfx/healing_machine_3.asm | 2 +- audio/sfx/horn_drill.asm | 2 +- audio/sfx/intro_crash.asm | 2 +- audio/sfx/intro_hip.asm | 2 +- audio/sfx/intro_hop.asm | 2 +- audio/sfx/intro_lunge.asm | 2 +- audio/sfx/intro_raise.asm | 2 +- audio/sfx/intro_whoosh.asm | 2 +- audio/sfx/ledge_1.asm | 2 +- audio/sfx/ledge_3.asm | 2 +- audio/sfx/level_up.asm | 6 +- audio/sfx/muted_snare1_1.asm | 2 +- audio/sfx/muted_snare1_2.asm | 2 +- audio/sfx/muted_snare1_3.asm | 2 +- audio/sfx/muted_snare2_1.asm | 2 +- audio/sfx/muted_snare2_2.asm | 2 +- audio/sfx/muted_snare2_3.asm | 2 +- audio/sfx/muted_snare3_1.asm | 2 +- audio/sfx/muted_snare3_2.asm | 2 +- audio/sfx/muted_snare3_3.asm | 2 +- audio/sfx/muted_snare4_1.asm | 2 +- audio/sfx/muted_snare4_2.asm | 2 +- audio/sfx/muted_snare4_3.asm | 2 +- audio/sfx/not_very_effective.asm | 2 +- audio/sfx/peck.asm | 2 +- audio/sfx/poisoned_1.asm | 4 +- audio/sfx/poisoned_3.asm | 4 +- audio/sfx/pokedex_rating_1.asm | 6 +- audio/sfx/pokedex_rating_3.asm | 6 +- audio/sfx/pokeflute.asm | 2 +- audio/sfx/pokeflute_ch1_ch2.asm | 14 -- audio/sfx/pokeflute_ch3.asm | 13 -- audio/sfx/pokeflute_ch4_ch5.asm | 14 ++ audio/sfx/pokeflute_ch6.asm | 13 ++ audio/sfx/pound.asm | 2 +- audio/sfx/press_ab_1.asm | 2 +- audio/sfx/press_ab_2.asm | 2 +- audio/sfx/press_ab_3.asm | 2 +- audio/sfx/psybeam.asm | 12 +- audio/sfx/psychic_m.asm | 6 +- audio/sfx/purchase_1.asm | 4 +- audio/sfx/purchase_3.asm | 4 +- audio/sfx/push_boulder_1.asm | 2 +- audio/sfx/push_boulder_3.asm | 2 +- audio/sfx/run.asm | 2 +- audio/sfx/safari_zone_pa.asm | 2 +- audio/sfx/save_1.asm | 4 +- audio/sfx/save_3.asm | 4 +- audio/sfx/shooting_star.asm | 2 +- audio/sfx/shrink_1.asm | 2 +- audio/sfx/shrink_3.asm | 2 +- audio/sfx/silph_scope.asm | 2 +- audio/sfx/slots_new_spin.asm | 4 +- audio/sfx/slots_reward.asm | 2 +- audio/sfx/slots_stop_wheel.asm | 2 +- audio/sfx/snare1_1.asm | 2 +- audio/sfx/snare1_2.asm | 2 +- audio/sfx/snare1_3.asm | 2 +- audio/sfx/snare2_1.asm | 2 +- audio/sfx/snare2_2.asm | 2 +- audio/sfx/snare2_3.asm | 2 +- audio/sfx/snare3_1.asm | 2 +- audio/sfx/snare3_2.asm | 2 +- audio/sfx/snare3_3.asm | 2 +- audio/sfx/snare4_1.asm | 2 +- audio/sfx/snare4_2.asm | 2 +- audio/sfx/snare4_3.asm | 2 +- audio/sfx/snare5_1.asm | 2 +- audio/sfx/snare5_2.asm | 2 +- audio/sfx/snare5_3.asm | 2 +- audio/sfx/snare6_1.asm | 2 +- audio/sfx/snare6_2.asm | 2 +- audio/sfx/snare6_3.asm | 2 +- audio/sfx/snare7_1.asm | 2 +- audio/sfx/snare7_2.asm | 2 +- audio/sfx/snare7_3.asm | 2 +- audio/sfx/snare8_1.asm | 2 +- audio/sfx/snare8_2.asm | 2 +- audio/sfx/snare8_3.asm | 2 +- audio/sfx/snare9_1.asm | 2 +- audio/sfx/snare9_2.asm | 2 +- audio/sfx/snare9_3.asm | 2 +- audio/sfx/ss_anne_horn_1.asm | 4 +- audio/sfx/ss_anne_horn_3.asm | 4 +- audio/sfx/start_menu_1.asm | 2 +- audio/sfx/start_menu_2.asm | 2 +- audio/sfx/start_menu_3.asm | 2 +- audio/sfx/super_effective.asm | 2 +- audio/sfx/swap_1.asm | 4 +- audio/sfx/swap_3.asm | 4 +- audio/sfx/switch_1.asm | 2 +- audio/sfx/switch_3.asm | 2 +- audio/sfx/teleport_enter1_1.asm | 2 +- audio/sfx/teleport_enter1_3.asm | 2 +- audio/sfx/teleport_enter2_1.asm | 2 +- audio/sfx/teleport_enter2_3.asm | 2 +- audio/sfx/teleport_exit1_1.asm | 2 +- audio/sfx/teleport_exit1_3.asm | 2 +- audio/sfx/teleport_exit2_1.asm | 2 +- audio/sfx/teleport_exit2_3.asm | 2 +- audio/sfx/tink_1.asm | 2 +- audio/sfx/tink_2.asm | 2 +- audio/sfx/tink_3.asm | 2 +- audio/sfx/trade_machine_1.asm | 2 +- audio/sfx/trade_machine_3.asm | 2 +- audio/sfx/triangle1_1.asm | 2 +- audio/sfx/triangle1_2.asm | 2 +- audio/sfx/triangle1_3.asm | 2 +- audio/sfx/triangle2_1.asm | 2 +- audio/sfx/triangle2_2.asm | 2 +- audio/sfx/triangle2_3.asm | 2 +- audio/sfx/triangle3_1.asm | 2 +- audio/sfx/triangle3_2.asm | 2 +- audio/sfx/triangle3_3.asm | 2 +- audio/sfx/turn_off_pc_1.asm | 2 +- audio/sfx/turn_off_pc_3.asm | 2 +- audio/sfx/turn_on_pc_1.asm | 2 +- audio/sfx/turn_on_pc_3.asm | 2 +- audio/sfx/unused2_2.asm | 6 +- audio/sfx/unused_1.asm | 6 +- audio/sfx/unused_2.asm | 6 +- audio/sfx/unused_3.asm | 6 +- audio/sfx/vine_whip.asm | 2 +- audio/sfx/withdraw_deposit_1.asm | 2 +- audio/sfx/withdraw_deposit_3.asm | 2 +- 329 files changed, 1298 insertions(+), 1298 deletions(-) delete mode 100755 audio/sfx/pokeflute_ch1_ch2.asm delete mode 100755 audio/sfx/pokeflute_ch3.asm create mode 100755 audio/sfx/pokeflute_ch4_ch5.asm create mode 100755 audio/sfx/pokeflute_ch6.asm diff --git a/audio.asm b/audio.asm index 6df4cfbc..5842b87c 100644 --- a/audio.asm +++ b/audio.asm @@ -162,7 +162,7 @@ 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/pokeflute_ch3.asm" +INCLUDE "audio/sfx/pokeflute_ch6.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -543,11 +543,11 @@ Music_PokeFluteInBattle:: call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers ld hl, wChannelCommandPointers + CH4 * 2 - ld de, SFX_08_PokeFlute_Ch1 + ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch2 + ld de, SFX_08_PokeFlute_Ch5 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch3 + ld de, SFX_08_PokeFlute_Ch6 Audio2_OverwriteChannelPointer: ld a, e @@ -632,7 +632,7 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" +INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 57c62e1c..9234211a 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -3,560 +3,560 @@ SFX_Headers_1:: SFX_Snare1_1:: db CH7 - dw SFX_Snare1_1_Ch1 + dw SFX_Snare1_1_Ch7 SFX_Snare2_1:: db CH7 - dw SFX_Snare2_1_Ch1 + dw SFX_Snare2_1_Ch7 SFX_Snare3_1:: db CH7 - dw SFX_Snare3_1_Ch1 + dw SFX_Snare3_1_Ch7 SFX_Snare4_1:: db CH7 - dw SFX_Snare4_1_Ch1 + dw SFX_Snare4_1_Ch7 SFX_Snare5_1:: db CH7 - dw SFX_Snare5_1_Ch1 + dw SFX_Snare5_1_Ch7 SFX_Triangle1_1:: db CH7 - dw SFX_Triangle1_1_Ch1 + dw SFX_Triangle1_1_Ch7 SFX_Triangle2_1:: db CH7 - dw SFX_Triangle2_1_Ch1 + dw SFX_Triangle2_1_Ch7 SFX_Snare6_1:: db CH7 - dw SFX_Snare6_1_Ch1 + dw SFX_Snare6_1_Ch7 SFX_Snare7_1:: db CH7 - dw SFX_Snare7_1_Ch1 + dw SFX_Snare7_1_Ch7 SFX_Snare8_1:: db CH7 - dw SFX_Snare8_1_Ch1 + dw SFX_Snare8_1_Ch7 SFX_Snare9_1:: db CH7 - dw SFX_Snare9_1_Ch1 + dw SFX_Snare9_1_Ch7 SFX_Cymbal1_1:: db CH7 - dw SFX_Cymbal1_1_Ch1 + dw SFX_Cymbal1_1_Ch7 SFX_Cymbal2_1:: db CH7 - dw SFX_Cymbal2_1_Ch1 + dw SFX_Cymbal2_1_Ch7 SFX_Cymbal3_1:: db CH7 - dw SFX_Cymbal3_1_Ch1 + dw SFX_Cymbal3_1_Ch7 SFX_Muted_Snare1_1:: db CH7 - dw SFX_Muted_Snare1_1_Ch1 + dw SFX_Muted_Snare1_1_Ch7 SFX_Triangle3_1:: db CH7 - dw SFX_Triangle3_1_Ch1 + dw SFX_Triangle3_1_Ch7 SFX_Muted_Snare2_1:: db CH7 - dw SFX_Muted_Snare2_1_Ch1 + dw SFX_Muted_Snare2_1_Ch7 SFX_Muted_Snare3_1:: db CH7 - dw SFX_Muted_Snare3_1_Ch1 + dw SFX_Muted_Snare3_1_Ch7 SFX_Muted_Snare4_1:: db CH7 - dw SFX_Muted_Snare4_1_Ch1 + dw SFX_Muted_Snare4_1_Ch7 SFX_Cry00_1:: db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch1 + dw SFX_Cry00_1_Ch4 db CH5 - dw SFX_Cry00_1_Ch2 + dw SFX_Cry00_1_Ch5 db CH7 - dw SFX_Cry00_1_Ch3 + dw SFX_Cry00_1_Ch7 SFX_Cry01_1:: db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch1 + dw SFX_Cry01_1_Ch4 db CH5 - dw SFX_Cry01_1_Ch2 + dw SFX_Cry01_1_Ch5 db CH7 - dw SFX_Cry01_1_Ch3 + dw SFX_Cry01_1_Ch7 SFX_Cry02_1:: db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch1 + dw SFX_Cry02_1_Ch4 db CH5 - dw SFX_Cry02_1_Ch2 + dw SFX_Cry02_1_Ch5 db CH7 - dw SFX_Cry02_1_Ch3 + dw SFX_Cry02_1_Ch7 SFX_Cry03_1:: db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch1 + dw SFX_Cry03_1_Ch4 db CH5 - dw SFX_Cry03_1_Ch2 + dw SFX_Cry03_1_Ch5 db CH7 - dw SFX_Cry03_1_Ch3 + dw SFX_Cry03_1_Ch7 SFX_Cry04_1:: db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch1 + dw SFX_Cry04_1_Ch4 db CH5 - dw SFX_Cry04_1_Ch2 + dw SFX_Cry04_1_Ch5 db CH7 - dw SFX_Cry04_1_Ch3 + dw SFX_Cry04_1_Ch7 SFX_Cry05_1:: db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch1 + dw SFX_Cry05_1_Ch4 db CH5 - dw SFX_Cry05_1_Ch2 + dw SFX_Cry05_1_Ch5 db CH7 - dw SFX_Cry05_1_Ch3 + dw SFX_Cry05_1_Ch7 SFX_Cry06_1:: db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch1 + dw SFX_Cry06_1_Ch4 db CH5 - dw SFX_Cry06_1_Ch2 + dw SFX_Cry06_1_Ch5 db CH7 - dw SFX_Cry06_1_Ch3 + dw SFX_Cry06_1_Ch7 SFX_Cry07_1:: db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch1 + dw SFX_Cry07_1_Ch4 db CH5 - dw SFX_Cry07_1_Ch2 + dw SFX_Cry07_1_Ch5 db CH7 - dw SFX_Cry07_1_Ch3 + dw SFX_Cry07_1_Ch7 SFX_Cry08_1:: db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch1 + dw SFX_Cry08_1_Ch4 db CH5 - dw SFX_Cry08_1_Ch2 + dw SFX_Cry08_1_Ch5 db CH7 - dw SFX_Cry08_1_Ch3 + dw SFX_Cry08_1_Ch7 SFX_Cry09_1:: db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch1 + dw SFX_Cry09_1_Ch4 db CH5 - dw SFX_Cry09_1_Ch2 + dw SFX_Cry09_1_Ch5 db CH7 - dw SFX_Cry09_1_Ch3 + dw SFX_Cry09_1_Ch7 SFX_Cry0A_1:: db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch1 + dw SFX_Cry0A_1_Ch4 db CH5 - dw SFX_Cry0A_1_Ch2 + dw SFX_Cry0A_1_Ch5 db CH7 - dw SFX_Cry0A_1_Ch3 + dw SFX_Cry0A_1_Ch7 SFX_Cry0B_1:: db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch1 + dw SFX_Cry0B_1_Ch4 db CH5 - dw SFX_Cry0B_1_Ch2 + dw SFX_Cry0B_1_Ch5 db CH7 - dw SFX_Cry0B_1_Ch3 + dw SFX_Cry0B_1_Ch7 SFX_Cry0C_1:: db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch1 + dw SFX_Cry0C_1_Ch4 db CH5 - dw SFX_Cry0C_1_Ch2 + dw SFX_Cry0C_1_Ch5 db CH7 - dw SFX_Cry0C_1_Ch3 + dw SFX_Cry0C_1_Ch7 SFX_Cry0D_1:: db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch1 + dw SFX_Cry0D_1_Ch4 db CH5 - dw SFX_Cry0D_1_Ch2 + dw SFX_Cry0D_1_Ch5 db CH7 - dw SFX_Cry0D_1_Ch3 + dw SFX_Cry0D_1_Ch7 SFX_Cry0E_1:: db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch1 + dw SFX_Cry0E_1_Ch4 db CH5 - dw SFX_Cry0E_1_Ch2 + dw SFX_Cry0E_1_Ch5 db CH7 - dw SFX_Cry0E_1_Ch3 + dw SFX_Cry0E_1_Ch7 SFX_Cry0F_1:: db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch1 + dw SFX_Cry0F_1_Ch4 db CH5 - dw SFX_Cry0F_1_Ch2 + dw SFX_Cry0F_1_Ch5 db CH7 - dw SFX_Cry0F_1_Ch3 + dw SFX_Cry0F_1_Ch7 SFX_Cry10_1:: db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch1 + dw SFX_Cry10_1_Ch4 db CH5 - dw SFX_Cry10_1_Ch2 + dw SFX_Cry10_1_Ch5 db CH7 - dw SFX_Cry10_1_Ch3 + dw SFX_Cry10_1_Ch7 SFX_Cry11_1:: db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch1 + dw SFX_Cry11_1_Ch4 db CH5 - dw SFX_Cry11_1_Ch2 + dw SFX_Cry11_1_Ch5 db CH7 - dw SFX_Cry11_1_Ch3 + dw SFX_Cry11_1_Ch7 SFX_Cry12_1:: db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch1 + dw SFX_Cry12_1_Ch4 db CH5 - dw SFX_Cry12_1_Ch2 + dw SFX_Cry12_1_Ch5 db CH7 - dw SFX_Cry12_1_Ch3 + dw SFX_Cry12_1_Ch7 SFX_Cry13_1:: db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch1 + dw SFX_Cry13_1_Ch4 db CH5 - dw SFX_Cry13_1_Ch2 + dw SFX_Cry13_1_Ch5 db CH7 - dw SFX_Cry13_1_Ch3 + dw SFX_Cry13_1_Ch7 SFX_Cry14_1:: db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch1 + dw SFX_Cry14_1_Ch4 db CH5 - dw SFX_Cry14_1_Ch2 + dw SFX_Cry14_1_Ch5 db CH7 - dw SFX_Cry14_1_Ch3 + dw SFX_Cry14_1_Ch7 SFX_Cry15_1:: db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch1 + dw SFX_Cry15_1_Ch4 db CH5 - dw SFX_Cry15_1_Ch2 + dw SFX_Cry15_1_Ch5 db CH7 - dw SFX_Cry15_1_Ch3 + dw SFX_Cry15_1_Ch7 SFX_Cry16_1:: db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch1 + dw SFX_Cry16_1_Ch4 db CH5 - dw SFX_Cry16_1_Ch2 + dw SFX_Cry16_1_Ch5 db CH7 - dw SFX_Cry16_1_Ch3 + dw SFX_Cry16_1_Ch7 SFX_Cry17_1:: db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch1 + dw SFX_Cry17_1_Ch4 db CH5 - dw SFX_Cry17_1_Ch2 + dw SFX_Cry17_1_Ch5 db CH7 - dw SFX_Cry17_1_Ch3 + dw SFX_Cry17_1_Ch7 SFX_Cry18_1:: db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch1 + dw SFX_Cry18_1_Ch4 db CH5 - dw SFX_Cry18_1_Ch2 + dw SFX_Cry18_1_Ch5 db CH7 - dw SFX_Cry18_1_Ch3 + dw SFX_Cry18_1_Ch7 SFX_Cry19_1:: db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch1 + dw SFX_Cry19_1_Ch4 db CH5 - dw SFX_Cry19_1_Ch2 + dw SFX_Cry19_1_Ch5 db CH7 - dw SFX_Cry19_1_Ch3 + dw SFX_Cry19_1_Ch7 SFX_Cry1A_1:: db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch1 + dw SFX_Cry1A_1_Ch4 db CH5 - dw SFX_Cry1A_1_Ch2 + dw SFX_Cry1A_1_Ch5 db CH7 - dw SFX_Cry1A_1_Ch3 + dw SFX_Cry1A_1_Ch7 SFX_Cry1B_1:: db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch1 + dw SFX_Cry1B_1_Ch4 db CH5 - dw SFX_Cry1B_1_Ch2 + dw SFX_Cry1B_1_Ch5 db CH7 - dw SFX_Cry1B_1_Ch3 + dw SFX_Cry1B_1_Ch7 SFX_Cry1C_1:: db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch1 + dw SFX_Cry1C_1_Ch4 db CH5 - dw SFX_Cry1C_1_Ch2 + dw SFX_Cry1C_1_Ch5 db CH7 - dw SFX_Cry1C_1_Ch3 + dw SFX_Cry1C_1_Ch7 SFX_Cry1D_1:: db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch1 + dw SFX_Cry1D_1_Ch4 db CH5 - dw SFX_Cry1D_1_Ch2 + dw SFX_Cry1D_1_Ch5 db CH7 - dw SFX_Cry1D_1_Ch3 + dw SFX_Cry1D_1_Ch7 SFX_Cry1E_1:: db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch1 + dw SFX_Cry1E_1_Ch4 db CH5 - dw SFX_Cry1E_1_Ch2 + dw SFX_Cry1E_1_Ch5 db CH7 - dw SFX_Cry1E_1_Ch3 + dw SFX_Cry1E_1_Ch7 SFX_Cry1F_1:: db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch1 + dw SFX_Cry1F_1_Ch4 db CH5 - dw SFX_Cry1F_1_Ch2 + dw SFX_Cry1F_1_Ch5 db CH7 - dw SFX_Cry1F_1_Ch3 + dw SFX_Cry1F_1_Ch7 SFX_Cry20_1:: db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch1 + dw SFX_Cry20_1_Ch4 db CH5 - dw SFX_Cry20_1_Ch2 + dw SFX_Cry20_1_Ch5 db CH7 - dw SFX_Cry20_1_Ch3 + dw SFX_Cry20_1_Ch7 SFX_Cry21_1:: db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch1 + dw SFX_Cry21_1_Ch4 db CH5 - dw SFX_Cry21_1_Ch2 + dw SFX_Cry21_1_Ch5 db CH7 - dw SFX_Cry21_1_Ch3 + dw SFX_Cry21_1_Ch7 SFX_Cry22_1:: db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch1 + dw SFX_Cry22_1_Ch4 db CH5 - dw SFX_Cry22_1_Ch2 + dw SFX_Cry22_1_Ch5 db CH7 - dw SFX_Cry22_1_Ch3 + dw SFX_Cry22_1_Ch7 SFX_Cry23_1:: db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch1 + dw SFX_Cry23_1_Ch4 db CH5 - dw SFX_Cry23_1_Ch2 + dw SFX_Cry23_1_Ch5 db CH7 - dw SFX_Cry23_1_Ch3 + dw SFX_Cry23_1_Ch7 SFX_Cry24_1:: db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch1 + dw SFX_Cry24_1_Ch4 db CH5 - dw SFX_Cry24_1_Ch2 + dw SFX_Cry24_1_Ch5 db CH7 - dw SFX_Cry24_1_Ch3 + dw SFX_Cry24_1_Ch7 SFX_Cry25_1:: db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch1 + dw SFX_Cry25_1_Ch4 db CH5 - dw SFX_Cry25_1_Ch2 + dw SFX_Cry25_1_Ch5 db CH7 - dw SFX_Cry25_1_Ch3 + dw SFX_Cry25_1_Ch7 SFX_Get_Item1_1:: db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch1 + dw SFX_Get_Item1_1_Ch4 db CH5 - dw SFX_Get_Item1_1_Ch2 + dw SFX_Get_Item1_1_Ch5 db CH6 - dw SFX_Get_Item1_1_Ch3 + dw SFX_Get_Item1_1_Ch6 SFX_Get_Item2_1:: db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch1 + dw SFX_Get_Item2_1_Ch4 db CH5 - dw SFX_Get_Item2_1_Ch2 + dw SFX_Get_Item2_1_Ch5 db CH6 - dw SFX_Get_Item2_1_Ch3 + dw SFX_Get_Item2_1_Ch6 SFX_Tink_1:: db CH4 - dw SFX_Tink_1_Ch1 + dw SFX_Tink_1_Ch4 SFX_Heal_HP_1:: db CH4 - dw SFX_Heal_HP_1_Ch1 + dw SFX_Heal_HP_1_Ch4 SFX_Heal_Ailment_1:: db CH4 - dw SFX_Heal_Ailment_1_Ch1 + dw SFX_Heal_Ailment_1_Ch4 SFX_Start_Menu_1:: db CH7 - dw SFX_Start_Menu_1_Ch1 + dw SFX_Start_Menu_1_Ch7 SFX_Press_AB_1:: db CH4 - dw SFX_Press_AB_1_Ch1 + dw SFX_Press_AB_1_Ch4 SFX_Pokedex_Rating_1:: db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch1 + dw SFX_Pokedex_Rating_1_Ch4 db CH5 - dw SFX_Pokedex_Rating_1_Ch2 + dw SFX_Pokedex_Rating_1_Ch5 db CH6 - dw SFX_Pokedex_Rating_1_Ch3 + dw SFX_Pokedex_Rating_1_Ch6 SFX_Get_Key_Item_1:: db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch1 + dw SFX_Get_Key_Item_1_Ch4 db CH5 - dw SFX_Get_Key_Item_1_Ch2 + dw SFX_Get_Key_Item_1_Ch5 db CH6 - dw SFX_Get_Key_Item_1_Ch3 + dw SFX_Get_Key_Item_1_Ch6 SFX_Poisoned_1:: db CH4 - dw SFX_Poisoned_1_Ch1 + dw SFX_Poisoned_1_Ch4 SFX_Trade_Machine_1:: db CH4 - dw SFX_Trade_Machine_1_Ch1 + dw SFX_Trade_Machine_1_Ch4 SFX_Turn_On_PC_1:: db CH4 - dw SFX_Turn_On_PC_1_Ch1 + dw SFX_Turn_On_PC_1_Ch4 SFX_Turn_Off_PC_1:: db CH4 - dw SFX_Turn_Off_PC_1_Ch1 + dw SFX_Turn_Off_PC_1_Ch4 SFX_Enter_PC_1:: db CH4 - dw SFX_Enter_PC_1_Ch1 + dw SFX_Enter_PC_1_Ch4 SFX_Shrink_1:: db CH4 - dw SFX_Shrink_1_Ch1 + dw SFX_Shrink_1_Ch4 SFX_Switch_1:: db CH4 - dw SFX_Switch_1_Ch1 + dw SFX_Switch_1_Ch4 SFX_Healing_Machine_1:: db CH4 - dw SFX_Healing_Machine_1_Ch1 + dw SFX_Healing_Machine_1_Ch4 SFX_Teleport_Exit1_1:: db CH4 - dw SFX_Teleport_Exit1_1_Ch1 + dw SFX_Teleport_Exit1_1_Ch4 SFX_Teleport_Enter1_1:: db CH4 - dw SFX_Teleport_Enter1_1_Ch1 + dw SFX_Teleport_Enter1_1_Ch4 SFX_Teleport_Exit2_1:: db CH4 - dw SFX_Teleport_Exit2_1_Ch1 + dw SFX_Teleport_Exit2_1_Ch4 SFX_Ledge_1:: db CH4 - dw SFX_Ledge_1_Ch1 + dw SFX_Ledge_1_Ch4 SFX_Teleport_Enter2_1:: db CH7 - dw SFX_Teleport_Enter2_1_Ch1 + dw SFX_Teleport_Enter2_1_Ch7 SFX_Fly_1:: db CH7 - dw SFX_Fly_1_Ch1 + dw SFX_Fly_1_Ch7 SFX_Denied_1:: db ( $40 | CH4 ) - dw SFX_Denied_1_Ch1 + dw SFX_Denied_1_Ch4 db CH5 - dw SFX_Denied_1_Ch2 + dw SFX_Denied_1_Ch5 SFX_Arrow_Tiles_1:: db CH4 - dw SFX_Arrow_Tiles_1_Ch1 + dw SFX_Arrow_Tiles_1_Ch4 SFX_Push_Boulder_1:: db CH7 - dw SFX_Push_Boulder_1_Ch1 + dw SFX_Push_Boulder_1_Ch7 SFX_SS_Anne_Horn_1:: db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch1 + dw SFX_SS_Anne_Horn_1_Ch4 db CH5 - dw SFX_SS_Anne_Horn_1_Ch2 + dw SFX_SS_Anne_Horn_1_Ch5 SFX_Withdraw_Deposit_1:: db CH4 - dw SFX_Withdraw_Deposit_1_Ch1 + dw SFX_Withdraw_Deposit_1_Ch4 SFX_Cut_1:: db CH7 - dw SFX_Cut_1_Ch1 + dw SFX_Cut_1_Ch7 SFX_Go_Inside_1:: db CH7 - dw SFX_Go_Inside_1_Ch1 + dw SFX_Go_Inside_1_Ch7 SFX_Swap_1:: db ( $40 | CH4 ) - dw SFX_Swap_1_Ch1 + dw SFX_Swap_1_Ch4 db CH5 - dw SFX_Swap_1_Ch2 + dw SFX_Swap_1_Ch5 SFX_59_1:: db ( $40 | CH4 ) - dw SFX_59_1_Ch1 + dw SFX_59_1_Ch4 db CH5 - dw SFX_59_1_Ch2 + dw SFX_59_1_Ch5 SFX_Purchase_1:: db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch1 + dw SFX_Purchase_1_Ch4 db CH5 - dw SFX_Purchase_1_Ch2 + dw SFX_Purchase_1_Ch5 SFX_Collision_1:: db CH4 - dw SFX_Collision_1_Ch1 + dw SFX_Collision_1_Ch4 SFX_Go_Outside_1:: db CH7 - dw SFX_Go_Outside_1_Ch1 + dw SFX_Go_Outside_1_Ch7 SFX_Save_1:: db ( $40 | CH4 ) - dw SFX_Save_1_Ch1 + dw SFX_Save_1_Ch4 db CH5 - dw SFX_Save_1_Ch2 + dw SFX_Save_1_Ch5 SFX_Pokeflute:: db CH2 - dw SFX_Pokeflute_Ch1 + dw SFX_Pokeflute_Ch2 SFX_Safari_Zone_PA:: db CH4 - dw SFX_Safari_Zone_PA_Ch1 + dw SFX_Safari_Zone_PA_Ch4 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1b6f8a5c..f54f37f8 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -3,704 +3,704 @@ SFX_Headers_2:: SFX_Snare1_2:: db CH7 - dw SFX_Snare1_2_Ch1 + dw SFX_Snare1_2_Ch7 SFX_Snare2_2:: db CH7 - dw SFX_Snare2_2_Ch1 + dw SFX_Snare2_2_Ch7 SFX_Snare3_2:: db CH7 - dw SFX_Snare3_2_Ch1 + dw SFX_Snare3_2_Ch7 SFX_Snare4_2:: db CH7 - dw SFX_Snare4_2_Ch1 + dw SFX_Snare4_2_Ch7 SFX_Snare5_2:: db CH7 - dw SFX_Snare5_2_Ch1 + dw SFX_Snare5_2_Ch7 SFX_Triangle1_2:: db CH7 - dw SFX_Triangle1_2_Ch1 + dw SFX_Triangle1_2_Ch7 SFX_Triangle2_2:: db CH7 - dw SFX_Triangle2_2_Ch1 + dw SFX_Triangle2_2_Ch7 SFX_Snare6_2:: db CH7 - dw SFX_Snare6_2_Ch1 + dw SFX_Snare6_2_Ch7 SFX_Snare7_2:: db CH7 - dw SFX_Snare7_2_Ch1 + dw SFX_Snare7_2_Ch7 SFX_Snare8_2:: db CH7 - dw SFX_Snare8_2_Ch1 + dw SFX_Snare8_2_Ch7 SFX_Snare9_2:: db CH7 - dw SFX_Snare9_2_Ch1 + dw SFX_Snare9_2_Ch7 SFX_Cymbal1_2:: db CH7 - dw SFX_Cymbal1_2_Ch1 + dw SFX_Cymbal1_2_Ch7 SFX_Cymbal2_2:: db CH7 - dw SFX_Cymbal2_2_Ch1 + dw SFX_Cymbal2_2_Ch7 SFX_Cymbal3_2:: db CH7 - dw SFX_Cymbal3_2_Ch1 + dw SFX_Cymbal3_2_Ch7 SFX_Muted_Snare1_2:: db CH7 - dw SFX_Muted_Snare1_2_Ch1 + dw SFX_Muted_Snare1_2_Ch7 SFX_Triangle3_2:: db CH7 - dw SFX_Triangle3_2_Ch1 + dw SFX_Triangle3_2_Ch7 SFX_Muted_Snare2_2:: db CH7 - dw SFX_Muted_Snare2_2_Ch1 + dw SFX_Muted_Snare2_2_Ch7 SFX_Muted_Snare3_2:: db CH7 - dw SFX_Muted_Snare3_2_Ch1 + dw SFX_Muted_Snare3_2_Ch7 SFX_Muted_Snare4_2:: db CH7 - dw SFX_Muted_Snare4_2_Ch1 + dw SFX_Muted_Snare4_2_Ch7 SFX_Cry00_2:: db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch1 + dw SFX_Cry00_2_Ch4 db CH5 - dw SFX_Cry00_2_Ch2 + dw SFX_Cry00_2_Ch5 db CH7 - dw SFX_Cry00_2_Ch3 + dw SFX_Cry00_2_Ch7 SFX_Cry01_2:: db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch1 + dw SFX_Cry01_2_Ch4 db CH5 - dw SFX_Cry01_2_Ch2 + dw SFX_Cry01_2_Ch5 db CH7 - dw SFX_Cry01_2_Ch3 + dw SFX_Cry01_2_Ch7 SFX_Cry02_2:: db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch1 + dw SFX_Cry02_2_Ch4 db CH5 - dw SFX_Cry02_2_Ch2 + dw SFX_Cry02_2_Ch5 db CH7 - dw SFX_Cry02_2_Ch3 + dw SFX_Cry02_2_Ch7 SFX_Cry03_2:: db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch1 + dw SFX_Cry03_2_Ch4 db CH5 - dw SFX_Cry03_2_Ch2 + dw SFX_Cry03_2_Ch5 db CH7 - dw SFX_Cry03_2_Ch3 + dw SFX_Cry03_2_Ch7 SFX_Cry04_2:: db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch1 + dw SFX_Cry04_2_Ch4 db CH5 - dw SFX_Cry04_2_Ch2 + dw SFX_Cry04_2_Ch5 db CH7 - dw SFX_Cry04_2_Ch3 + dw SFX_Cry04_2_Ch7 SFX_Cry05_2:: db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch1 + dw SFX_Cry05_2_Ch4 db CH5 - dw SFX_Cry05_2_Ch2 + dw SFX_Cry05_2_Ch5 db CH7 - dw SFX_Cry05_2_Ch3 + dw SFX_Cry05_2_Ch7 SFX_Cry06_2:: db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch1 + dw SFX_Cry06_2_Ch4 db CH5 - dw SFX_Cry06_2_Ch2 + dw SFX_Cry06_2_Ch5 db CH7 - dw SFX_Cry06_2_Ch3 + dw SFX_Cry06_2_Ch7 SFX_Cry07_2:: db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch1 + dw SFX_Cry07_2_Ch4 db CH5 - dw SFX_Cry07_2_Ch2 + dw SFX_Cry07_2_Ch5 db CH7 - dw SFX_Cry07_2_Ch3 + dw SFX_Cry07_2_Ch7 SFX_Cry08_2:: db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch1 + dw SFX_Cry08_2_Ch4 db CH5 - dw SFX_Cry08_2_Ch2 + dw SFX_Cry08_2_Ch5 db CH7 - dw SFX_Cry08_2_Ch3 + dw SFX_Cry08_2_Ch7 SFX_Cry09_2:: db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch1 + dw SFX_Cry09_2_Ch4 db CH5 - dw SFX_Cry09_2_Ch2 + dw SFX_Cry09_2_Ch5 db CH7 - dw SFX_Cry09_2_Ch3 + dw SFX_Cry09_2_Ch7 SFX_Cry0A_2:: db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch1 + dw SFX_Cry0A_2_Ch4 db CH5 - dw SFX_Cry0A_2_Ch2 + dw SFX_Cry0A_2_Ch5 db CH7 - dw SFX_Cry0A_2_Ch3 + dw SFX_Cry0A_2_Ch7 SFX_Cry0B_2:: db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch1 + dw SFX_Cry0B_2_Ch4 db CH5 - dw SFX_Cry0B_2_Ch2 + dw SFX_Cry0B_2_Ch5 db CH7 - dw SFX_Cry0B_2_Ch3 + dw SFX_Cry0B_2_Ch7 SFX_Cry0C_2:: db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch1 + dw SFX_Cry0C_2_Ch4 db CH5 - dw SFX_Cry0C_2_Ch2 + dw SFX_Cry0C_2_Ch5 db CH7 - dw SFX_Cry0C_2_Ch3 + dw SFX_Cry0C_2_Ch7 SFX_Cry0D_2:: db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch1 + dw SFX_Cry0D_2_Ch4 db CH5 - dw SFX_Cry0D_2_Ch2 + dw SFX_Cry0D_2_Ch5 db CH7 - dw SFX_Cry0D_2_Ch3 + dw SFX_Cry0D_2_Ch7 SFX_Cry0E_2:: db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch1 + dw SFX_Cry0E_2_Ch4 db CH5 - dw SFX_Cry0E_2_Ch2 + dw SFX_Cry0E_2_Ch5 db CH7 - dw SFX_Cry0E_2_Ch3 + dw SFX_Cry0E_2_Ch7 SFX_Cry0F_2:: db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch1 + dw SFX_Cry0F_2_Ch4 db CH5 - dw SFX_Cry0F_2_Ch2 + dw SFX_Cry0F_2_Ch5 db CH7 - dw SFX_Cry0F_2_Ch3 + dw SFX_Cry0F_2_Ch7 SFX_Cry10_2:: db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch1 + dw SFX_Cry10_2_Ch4 db CH5 - dw SFX_Cry10_2_Ch2 + dw SFX_Cry10_2_Ch5 db CH7 - dw SFX_Cry10_2_Ch3 + dw SFX_Cry10_2_Ch7 SFX_Cry11_2:: db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch1 + dw SFX_Cry11_2_Ch4 db CH5 - dw SFX_Cry11_2_Ch2 + dw SFX_Cry11_2_Ch5 db CH7 - dw SFX_Cry11_2_Ch3 + dw SFX_Cry11_2_Ch7 SFX_Cry12_2:: db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch1 + dw SFX_Cry12_2_Ch4 db CH5 - dw SFX_Cry12_2_Ch2 + dw SFX_Cry12_2_Ch5 db CH7 - dw SFX_Cry12_2_Ch3 + dw SFX_Cry12_2_Ch7 SFX_Cry13_2:: db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch1 + dw SFX_Cry13_2_Ch4 db CH5 - dw SFX_Cry13_2_Ch2 + dw SFX_Cry13_2_Ch5 db CH7 - dw SFX_Cry13_2_Ch3 + dw SFX_Cry13_2_Ch7 SFX_Cry14_2:: db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch1 + dw SFX_Cry14_2_Ch4 db CH5 - dw SFX_Cry14_2_Ch2 + dw SFX_Cry14_2_Ch5 db CH7 - dw SFX_Cry14_2_Ch3 + dw SFX_Cry14_2_Ch7 SFX_Cry15_2:: db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch1 + dw SFX_Cry15_2_Ch4 db CH5 - dw SFX_Cry15_2_Ch2 + dw SFX_Cry15_2_Ch5 db CH7 - dw SFX_Cry15_2_Ch3 + dw SFX_Cry15_2_Ch7 SFX_Cry16_2:: db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch1 + dw SFX_Cry16_2_Ch4 db CH5 - dw SFX_Cry16_2_Ch2 + dw SFX_Cry16_2_Ch5 db CH7 - dw SFX_Cry16_2_Ch3 + dw SFX_Cry16_2_Ch7 SFX_Cry17_2:: db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch1 + dw SFX_Cry17_2_Ch4 db CH5 - dw SFX_Cry17_2_Ch2 + dw SFX_Cry17_2_Ch5 db CH7 - dw SFX_Cry17_2_Ch3 + dw SFX_Cry17_2_Ch7 SFX_Cry18_2:: db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch1 + dw SFX_Cry18_2_Ch4 db CH5 - dw SFX_Cry18_2_Ch2 + dw SFX_Cry18_2_Ch5 db CH7 - dw SFX_Cry18_2_Ch3 + dw SFX_Cry18_2_Ch7 SFX_Cry19_2:: db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch1 + dw SFX_Cry19_2_Ch4 db CH5 - dw SFX_Cry19_2_Ch2 + dw SFX_Cry19_2_Ch5 db CH7 - dw SFX_Cry19_2_Ch3 + dw SFX_Cry19_2_Ch7 SFX_Cry1A_2:: db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch1 + dw SFX_Cry1A_2_Ch4 db CH5 - dw SFX_Cry1A_2_Ch2 + dw SFX_Cry1A_2_Ch5 db CH7 - dw SFX_Cry1A_2_Ch3 + dw SFX_Cry1A_2_Ch7 SFX_Cry1B_2:: db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch1 + dw SFX_Cry1B_2_Ch4 db CH5 - dw SFX_Cry1B_2_Ch2 + dw SFX_Cry1B_2_Ch5 db CH7 - dw SFX_Cry1B_2_Ch3 + dw SFX_Cry1B_2_Ch7 SFX_Cry1C_2:: db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch1 + dw SFX_Cry1C_2_Ch4 db CH5 - dw SFX_Cry1C_2_Ch2 + dw SFX_Cry1C_2_Ch5 db CH7 - dw SFX_Cry1C_2_Ch3 + dw SFX_Cry1C_2_Ch7 SFX_Cry1D_2:: db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch1 + dw SFX_Cry1D_2_Ch4 db CH5 - dw SFX_Cry1D_2_Ch2 + dw SFX_Cry1D_2_Ch5 db CH7 - dw SFX_Cry1D_2_Ch3 + dw SFX_Cry1D_2_Ch7 SFX_Cry1E_2:: db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch1 + dw SFX_Cry1E_2_Ch4 db CH5 - dw SFX_Cry1E_2_Ch2 + dw SFX_Cry1E_2_Ch5 db CH7 - dw SFX_Cry1E_2_Ch3 + dw SFX_Cry1E_2_Ch7 SFX_Cry1F_2:: db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch1 + dw SFX_Cry1F_2_Ch4 db CH5 - dw SFX_Cry1F_2_Ch2 + dw SFX_Cry1F_2_Ch5 db CH7 - dw SFX_Cry1F_2_Ch3 + dw SFX_Cry1F_2_Ch7 SFX_Cry20_2:: db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch1 + dw SFX_Cry20_2_Ch4 db CH5 - dw SFX_Cry20_2_Ch2 + dw SFX_Cry20_2_Ch5 db CH7 - dw SFX_Cry20_2_Ch3 + dw SFX_Cry20_2_Ch7 SFX_Cry21_2:: db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch1 + dw SFX_Cry21_2_Ch4 db CH5 - dw SFX_Cry21_2_Ch2 + dw SFX_Cry21_2_Ch5 db CH7 - dw SFX_Cry21_2_Ch3 + dw SFX_Cry21_2_Ch7 SFX_Cry22_2:: db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch1 + dw SFX_Cry22_2_Ch4 db CH5 - dw SFX_Cry22_2_Ch2 + dw SFX_Cry22_2_Ch5 db CH7 - dw SFX_Cry22_2_Ch3 + dw SFX_Cry22_2_Ch7 SFX_Cry23_2:: db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch1 + dw SFX_Cry23_2_Ch4 db CH5 - dw SFX_Cry23_2_Ch2 + dw SFX_Cry23_2_Ch5 db CH7 - dw SFX_Cry23_2_Ch3 + dw SFX_Cry23_2_Ch7 SFX_Cry24_2:: db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch1 + dw SFX_Cry24_2_Ch4 db CH5 - dw SFX_Cry24_2_Ch2 + dw SFX_Cry24_2_Ch5 db CH7 - dw SFX_Cry24_2_Ch3 + dw SFX_Cry24_2_Ch7 SFX_Cry25_2:: db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch1 + dw SFX_Cry25_2_Ch4 db CH5 - dw SFX_Cry25_2_Ch2 + dw SFX_Cry25_2_Ch5 db CH7 - dw SFX_Cry25_2_Ch3 + dw SFX_Cry25_2_Ch7 SFX_Level_Up:: db ( $80 | CH4 ) - dw SFX_Level_Up_Ch1 + dw SFX_Level_Up_Ch4 db CH5 - dw SFX_Level_Up_Ch2 + dw SFX_Level_Up_Ch5 db CH6 - dw SFX_Level_Up_Ch3 + dw SFX_Level_Up_Ch6 SFX_Get_Item2_2:: db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch1 + dw SFX_Get_Item2_2_Ch4 db CH5 - dw SFX_Get_Item2_2_Ch2 + dw SFX_Get_Item2_2_Ch5 db CH6 - dw SFX_Get_Item2_2_Ch3 + dw SFX_Get_Item2_2_Ch6 SFX_Tink_2:: db CH4 - dw SFX_Tink_2_Ch1 + dw SFX_Tink_2_Ch4 SFX_Heal_HP_2:: db CH4 - dw SFX_Heal_HP_2_Ch1 + dw SFX_Heal_HP_2_Ch4 SFX_Heal_Ailment_2:: db CH4 - dw SFX_Heal_Ailment_2_Ch1 + dw SFX_Heal_Ailment_2_Ch4 SFX_Start_Menu_2:: db CH7 - dw SFX_Start_Menu_2_Ch1 + dw SFX_Start_Menu_2_Ch7 SFX_Press_AB_2:: db CH4 - dw SFX_Press_AB_2_Ch1 + dw SFX_Press_AB_2_Ch4 SFX_Ball_Toss:: db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch1 + dw SFX_Ball_Toss_Ch4 db CH5 - dw SFX_Ball_Toss_Ch2 + dw SFX_Ball_Toss_Ch5 SFX_Ball_Poof:: db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch1 + dw SFX_Ball_Poof_Ch4 db CH7 - dw SFX_Ball_Poof_Ch2 + dw SFX_Ball_Poof_Ch7 SFX_Faint_Thud:: db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch1 + dw SFX_Faint_Thud_Ch4 db CH7 - dw SFX_Faint_Thud_Ch2 + dw SFX_Faint_Thud_Ch7 SFX_Run:: db CH7 - dw SFX_Run_Ch1 + dw SFX_Run_Ch7 SFX_Dex_Page_Added:: db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch1 + dw SFX_Dex_Page_Added_Ch4 db CH5 - dw SFX_Dex_Page_Added_Ch2 + dw SFX_Dex_Page_Added_Ch5 SFX_Caught_Mon:: db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch1 + dw SFX_Caught_Mon_Ch4 db CH5 - dw SFX_Caught_Mon_Ch2 + dw SFX_Caught_Mon_Ch5 db CH6 - dw SFX_Caught_Mon_Ch3 + dw SFX_Caught_Mon_Ch6 SFX_Peck:: db CH7 - dw SFX_Peck_Ch1 + dw SFX_Peck_Ch7 SFX_Faint_Fall:: db CH4 - dw SFX_Faint_Fall_Ch1 + dw SFX_Faint_Fall_Ch4 SFX_Battle_09:: db CH4 - dw SFX_Battle_09_Ch1 + dw SFX_Battle_09_Ch4 SFX_Pound:: db CH7 - dw SFX_Pound_Ch1 + dw SFX_Pound_Ch7 SFX_Battle_0B:: db CH7 - dw SFX_Battle_0B_Ch1 + dw SFX_Battle_0B_Ch7 SFX_Battle_0C:: db CH7 - dw SFX_Battle_0C_Ch1 + dw SFX_Battle_0C_Ch7 SFX_Battle_0D:: db CH7 - dw SFX_Battle_0D_Ch1 + dw SFX_Battle_0D_Ch7 SFX_Battle_0E:: db CH7 - dw SFX_Battle_0E_Ch1 + dw SFX_Battle_0E_Ch7 SFX_Battle_0F:: db CH7 - dw SFX_Battle_0F_Ch1 + dw SFX_Battle_0F_Ch7 SFX_Damage:: db CH7 - dw SFX_Damage_Ch1 + dw SFX_Damage_Ch7 SFX_Not_Very_Effective:: db CH7 - dw SFX_Not_Very_Effective_Ch1 + dw SFX_Not_Very_Effective_Ch7 SFX_Battle_12:: db CH7 - dw SFX_Battle_12_Ch1 + dw SFX_Battle_12_Ch7 SFX_Battle_13:: db CH7 - dw SFX_Battle_13_Ch1 + dw SFX_Battle_13_Ch7 SFX_Battle_14:: db CH7 - dw SFX_Battle_14_Ch1 + dw SFX_Battle_14_Ch7 SFX_Vine_Whip:: db CH7 - dw SFX_Vine_Whip_Ch1 + dw SFX_Vine_Whip_Ch7 SFX_Battle_16:: db CH7 - dw SFX_Battle_16_Ch1 + dw SFX_Battle_16_Ch7 SFX_Battle_17:: db CH7 - dw SFX_Battle_17_Ch1 + dw SFX_Battle_17_Ch7 SFX_Battle_18:: db CH7 - dw SFX_Battle_18_Ch1 + dw SFX_Battle_18_Ch7 SFX_Battle_19:: db CH7 - dw SFX_Battle_19_Ch1 + dw SFX_Battle_19_Ch7 SFX_Super_Effective:: db CH7 - dw SFX_Super_Effective_Ch1 + dw SFX_Super_Effective_Ch7 SFX_Battle_1B:: db CH7 - dw SFX_Battle_1B_Ch1 + dw SFX_Battle_1B_Ch7 SFX_Battle_1C:: db CH7 - dw SFX_Battle_1C_Ch1 + dw SFX_Battle_1C_Ch7 SFX_Doubleslap:: db CH7 - dw SFX_Doubleslap_Ch1 + dw SFX_Doubleslap_Ch7 SFX_Battle_1E:: db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch1 + dw SFX_Battle_1E_Ch4 db CH7 - dw SFX_Battle_1E_Ch2 + dw SFX_Battle_1E_Ch7 SFX_Horn_Drill:: db CH7 - dw SFX_Horn_Drill_Ch1 + dw SFX_Horn_Drill_Ch7 SFX_Battle_20:: db CH7 - dw SFX_Battle_20_Ch1 + dw SFX_Battle_20_Ch7 SFX_Battle_21:: db CH7 - dw SFX_Battle_21_Ch1 + dw SFX_Battle_21_Ch7 SFX_Battle_22:: db CH7 - dw SFX_Battle_22_Ch1 + dw SFX_Battle_22_Ch7 SFX_Battle_23:: db CH7 - dw SFX_Battle_23_Ch1 + dw SFX_Battle_23_Ch7 SFX_Battle_24:: db ( $40 | CH4 ) - dw SFX_Battle_24_Ch1 + dw SFX_Battle_24_Ch4 db CH7 - dw SFX_Battle_24_Ch2 + dw SFX_Battle_24_Ch7 SFX_Battle_25:: db CH7 - dw SFX_Battle_25_Ch1 + dw SFX_Battle_25_Ch7 SFX_Battle_26:: db CH7 - dw SFX_Battle_26_Ch1 + dw SFX_Battle_26_Ch7 SFX_Battle_27:: db ( $80 | CH4 ) - dw SFX_Battle_27_Ch1 + dw SFX_Battle_27_Ch4 db CH5 - dw SFX_Battle_27_Ch2 + dw SFX_Battle_27_Ch5 db CH7 - dw SFX_Battle_27_Ch3 + dw SFX_Battle_27_Ch7 SFX_Battle_28:: db ( $80 | CH4 ) - dw SFX_Battle_28_Ch1 + dw SFX_Battle_28_Ch4 db CH5 - dw SFX_Battle_28_Ch2 + dw SFX_Battle_28_Ch5 db CH7 - dw SFX_Battle_28_Ch3 + dw SFX_Battle_28_Ch7 SFX_Battle_29:: db ( $40 | CH4 ) - dw SFX_Battle_29_Ch1 + dw SFX_Battle_29_Ch4 db CH7 - dw SFX_Battle_29_Ch2 + dw SFX_Battle_29_Ch7 SFX_Battle_2A:: db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch1 + dw SFX_Battle_2A_Ch4 db CH5 - dw SFX_Battle_2A_Ch2 + dw SFX_Battle_2A_Ch5 db CH7 - dw SFX_Battle_2A_Ch3 + dw SFX_Battle_2A_Ch7 SFX_Battle_2B:: db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch1 + dw SFX_Battle_2B_Ch4 db CH7 - dw SFX_Battle_2B_Ch2 + dw SFX_Battle_2B_Ch7 SFX_Battle_2C:: db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch1 + dw SFX_Battle_2C_Ch4 db CH5 - dw SFX_Battle_2C_Ch2 + dw SFX_Battle_2C_Ch5 db CH7 - dw SFX_Battle_2C_Ch3 + dw SFX_Battle_2C_Ch7 SFX_Psybeam:: db ( $80 | CH4 ) - dw SFX_Psybeam_Ch1 + dw SFX_Psybeam_Ch4 db CH5 - dw SFX_Psybeam_Ch2 + dw SFX_Psybeam_Ch5 db CH7 - dw SFX_Psybeam_Ch3 + dw SFX_Psybeam_Ch7 SFX_Battle_2E:: db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch1 + dw SFX_Battle_2E_Ch4 db CH5 - dw SFX_Battle_2E_Ch2 + dw SFX_Battle_2E_Ch5 db CH7 - dw SFX_Battle_2E_Ch3 + dw SFX_Battle_2E_Ch7 SFX_Battle_2F:: db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch1 + dw SFX_Battle_2F_Ch4 db CH5 - dw SFX_Battle_2F_Ch2 + dw SFX_Battle_2F_Ch5 db CH7 - dw SFX_Battle_2F_Ch3 + dw SFX_Battle_2F_Ch7 SFX_Psychic_M:: db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch1 + dw SFX_Psychic_M_Ch4 db CH5 - dw SFX_Psychic_M_Ch2 + dw SFX_Psychic_M_Ch5 db CH7 - dw SFX_Psychic_M_Ch3 + dw SFX_Psychic_M_Ch7 SFX_Battle_31:: db ( $40 | CH4 ) - dw SFX_Battle_31_Ch1 + dw SFX_Battle_31_Ch4 db CH5 - dw SFX_Battle_31_Ch2 + dw SFX_Battle_31_Ch5 SFX_Battle_32:: db ( $40 | CH4 ) - dw SFX_Battle_32_Ch1 + dw SFX_Battle_32_Ch4 db CH5 - dw SFX_Battle_32_Ch2 + dw SFX_Battle_32_Ch5 SFX_Battle_33:: db ( $40 | CH4 ) - dw SFX_Battle_33_Ch1 + dw SFX_Battle_33_Ch4 db CH5 - dw SFX_Battle_33_Ch2 + dw SFX_Battle_33_Ch5 SFX_Battle_34:: db ( $80 | CH4 ) - dw SFX_Battle_34_Ch1 + dw SFX_Battle_34_Ch4 db CH5 - dw SFX_Battle_34_Ch2 + dw SFX_Battle_34_Ch5 db CH7 - dw SFX_Battle_34_Ch3 + dw SFX_Battle_34_Ch7 SFX_Battle_35:: db ( $40 | CH4 ) - dw SFX_Battle_35_Ch1 + dw SFX_Battle_35_Ch4 db CH5 - dw SFX_Battle_35_Ch2 + dw SFX_Battle_35_Ch5 SFX_Battle_36:: db ( $80 | CH4 ) - dw SFX_Battle_36_Ch1 + dw SFX_Battle_36_Ch4 db CH5 - dw SFX_Battle_36_Ch2 + dw SFX_Battle_36_Ch5 db CH7 - dw SFX_Battle_36_Ch3 + dw SFX_Battle_36_Ch7 SFX_Silph_Scope:: db CH4 - dw SFX_Silph_Scope_Ch1 + dw SFX_Silph_Scope_Ch4 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 0472afa6..a49a6728 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -3,594 +3,594 @@ SFX_Headers_3:: SFX_Snare1_3:: db CH7 - dw SFX_Snare1_3_Ch1 + dw SFX_Snare1_3_Ch7 SFX_Snare2_3:: db CH7 - dw SFX_Snare2_3_Ch1 + dw SFX_Snare2_3_Ch7 SFX_Snare3_3:: db CH7 - dw SFX_Snare3_3_Ch1 + dw SFX_Snare3_3_Ch7 SFX_Snare4_3:: db CH7 - dw SFX_Snare4_3_Ch1 + dw SFX_Snare4_3_Ch7 SFX_Snare5_3:: db CH7 - dw SFX_Snare5_3_Ch1 + dw SFX_Snare5_3_Ch7 SFX_Triangle1_3:: db CH7 - dw SFX_Triangle1_3_Ch1 + dw SFX_Triangle1_3_Ch7 SFX_Triangle2_3:: db CH7 - dw SFX_Triangle2_3_Ch1 + dw SFX_Triangle2_3_Ch7 SFX_Snare6_3:: db CH7 - dw SFX_Snare6_3_Ch1 + dw SFX_Snare6_3_Ch7 SFX_Snare7_3:: db CH7 - dw SFX_Snare7_3_Ch1 + dw SFX_Snare7_3_Ch7 SFX_Snare8_3:: db CH7 - dw SFX_Snare8_3_Ch1 + dw SFX_Snare8_3_Ch7 SFX_Snare9_3:: db CH7 - dw SFX_Snare9_3_Ch1 + dw SFX_Snare9_3_Ch7 SFX_Cymbal1_3:: db CH7 - dw SFX_Cymbal1_3_Ch1 + dw SFX_Cymbal1_3_Ch7 SFX_Cymbal2_3:: db CH7 - dw SFX_Cymbal2_3_Ch1 + dw SFX_Cymbal2_3_Ch7 SFX_Cymbal3_3:: db CH7 - dw SFX_Cymbal3_3_Ch1 + dw SFX_Cymbal3_3_Ch7 SFX_Muted_Snare1_3:: db CH7 - dw SFX_Muted_Snare1_3_Ch1 + dw SFX_Muted_Snare1_3_Ch7 SFX_Triangle3_3:: db CH7 - dw SFX_Triangle3_3_Ch1 + dw SFX_Triangle3_3_Ch7 SFX_Muted_Snare2_3:: db CH7 - dw SFX_Muted_Snare2_3_Ch1 + dw SFX_Muted_Snare2_3_Ch7 SFX_Muted_Snare3_3:: db CH7 - dw SFX_Muted_Snare3_3_Ch1 + dw SFX_Muted_Snare3_3_Ch7 SFX_Muted_Snare4_3:: db CH7 - dw SFX_Muted_Snare4_3_Ch1 + dw SFX_Muted_Snare4_3_Ch7 SFX_Cry00_3:: db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch1 + dw SFX_Cry00_3_Ch4 db CH5 - dw SFX_Cry00_3_Ch2 + dw SFX_Cry00_3_Ch5 db CH7 - dw SFX_Cry00_3_Ch3 + dw SFX_Cry00_3_Ch7 SFX_Cry01_3:: db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch1 + dw SFX_Cry01_3_Ch4 db CH5 - dw SFX_Cry01_3_Ch2 + dw SFX_Cry01_3_Ch5 db CH7 - dw SFX_Cry01_3_Ch3 + dw SFX_Cry01_3_Ch7 SFX_Cry02_3:: db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch1 + dw SFX_Cry02_3_Ch4 db CH5 - dw SFX_Cry02_3_Ch2 + dw SFX_Cry02_3_Ch5 db CH7 - dw SFX_Cry02_3_Ch3 + dw SFX_Cry02_3_Ch7 SFX_Cry03_3:: db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch1 + dw SFX_Cry03_3_Ch4 db CH5 - dw SFX_Cry03_3_Ch2 + dw SFX_Cry03_3_Ch5 db CH7 - dw SFX_Cry03_3_Ch3 + dw SFX_Cry03_3_Ch7 SFX_Cry04_3:: db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch1 + dw SFX_Cry04_3_Ch4 db CH5 - dw SFX_Cry04_3_Ch2 + dw SFX_Cry04_3_Ch5 db CH7 - dw SFX_Cry04_3_Ch3 + dw SFX_Cry04_3_Ch7 SFX_Cry05_3:: db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch1 + dw SFX_Cry05_3_Ch4 db CH5 - dw SFX_Cry05_3_Ch2 + dw SFX_Cry05_3_Ch5 db CH7 - dw SFX_Cry05_3_Ch3 + dw SFX_Cry05_3_Ch7 SFX_Cry06_3:: db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch1 + dw SFX_Cry06_3_Ch4 db CH5 - dw SFX_Cry06_3_Ch2 + dw SFX_Cry06_3_Ch5 db CH7 - dw SFX_Cry06_3_Ch3 + dw SFX_Cry06_3_Ch7 SFX_Cry07_3:: db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch1 + dw SFX_Cry07_3_Ch4 db CH5 - dw SFX_Cry07_3_Ch2 + dw SFX_Cry07_3_Ch5 db CH7 - dw SFX_Cry07_3_Ch3 + dw SFX_Cry07_3_Ch7 SFX_Cry08_3:: db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch1 + dw SFX_Cry08_3_Ch4 db CH5 - dw SFX_Cry08_3_Ch2 + dw SFX_Cry08_3_Ch5 db CH7 - dw SFX_Cry08_3_Ch3 + dw SFX_Cry08_3_Ch7 SFX_Cry09_3:: db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch1 + dw SFX_Cry09_3_Ch4 db CH5 - dw SFX_Cry09_3_Ch2 + dw SFX_Cry09_3_Ch5 db CH7 - dw SFX_Cry09_3_Ch3 + dw SFX_Cry09_3_Ch7 SFX_Cry0A_3:: db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch1 + dw SFX_Cry0A_3_Ch4 db CH5 - dw SFX_Cry0A_3_Ch2 + dw SFX_Cry0A_3_Ch5 db CH7 - dw SFX_Cry0A_3_Ch3 + dw SFX_Cry0A_3_Ch7 SFX_Cry0B_3:: db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch1 + dw SFX_Cry0B_3_Ch4 db CH5 - dw SFX_Cry0B_3_Ch2 + dw SFX_Cry0B_3_Ch5 db CH7 - dw SFX_Cry0B_3_Ch3 + dw SFX_Cry0B_3_Ch7 SFX_Cry0C_3:: db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch1 + dw SFX_Cry0C_3_Ch4 db CH5 - dw SFX_Cry0C_3_Ch2 + dw SFX_Cry0C_3_Ch5 db CH7 - dw SFX_Cry0C_3_Ch3 + dw SFX_Cry0C_3_Ch7 SFX_Cry0D_3:: db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch1 + dw SFX_Cry0D_3_Ch4 db CH5 - dw SFX_Cry0D_3_Ch2 + dw SFX_Cry0D_3_Ch5 db CH7 - dw SFX_Cry0D_3_Ch3 + dw SFX_Cry0D_3_Ch7 SFX_Cry0E_3:: db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch1 + dw SFX_Cry0E_3_Ch4 db CH5 - dw SFX_Cry0E_3_Ch2 + dw SFX_Cry0E_3_Ch5 db CH7 - dw SFX_Cry0E_3_Ch3 + dw SFX_Cry0E_3_Ch7 SFX_Cry0F_3:: db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch1 + dw SFX_Cry0F_3_Ch4 db CH5 - dw SFX_Cry0F_3_Ch2 + dw SFX_Cry0F_3_Ch5 db CH7 - dw SFX_Cry0F_3_Ch3 + dw SFX_Cry0F_3_Ch7 SFX_Cry10_3:: db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch1 + dw SFX_Cry10_3_Ch4 db CH5 - dw SFX_Cry10_3_Ch2 + dw SFX_Cry10_3_Ch5 db CH7 - dw SFX_Cry10_3_Ch3 + dw SFX_Cry10_3_Ch7 SFX_Cry11_3:: db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch1 + dw SFX_Cry11_3_Ch4 db CH5 - dw SFX_Cry11_3_Ch2 + dw SFX_Cry11_3_Ch5 db CH7 - dw SFX_Cry11_3_Ch3 + dw SFX_Cry11_3_Ch7 SFX_Cry12_3:: db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch1 + dw SFX_Cry12_3_Ch4 db CH5 - dw SFX_Cry12_3_Ch2 + dw SFX_Cry12_3_Ch5 db CH7 - dw SFX_Cry12_3_Ch3 + dw SFX_Cry12_3_Ch7 SFX_Cry13_3:: db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch1 + dw SFX_Cry13_3_Ch4 db CH5 - dw SFX_Cry13_3_Ch2 + dw SFX_Cry13_3_Ch5 db CH7 - dw SFX_Cry13_3_Ch3 + dw SFX_Cry13_3_Ch7 SFX_Cry14_3:: db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch1 + dw SFX_Cry14_3_Ch4 db CH5 - dw SFX_Cry14_3_Ch2 + dw SFX_Cry14_3_Ch5 db CH7 - dw SFX_Cry14_3_Ch3 + dw SFX_Cry14_3_Ch7 SFX_Cry15_3:: db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch1 + dw SFX_Cry15_3_Ch4 db CH5 - dw SFX_Cry15_3_Ch2 + dw SFX_Cry15_3_Ch5 db CH7 - dw SFX_Cry15_3_Ch3 + dw SFX_Cry15_3_Ch7 SFX_Cry16_3:: db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch1 + dw SFX_Cry16_3_Ch4 db CH5 - dw SFX_Cry16_3_Ch2 + dw SFX_Cry16_3_Ch5 db CH7 - dw SFX_Cry16_3_Ch3 + dw SFX_Cry16_3_Ch7 SFX_Cry17_3:: db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch1 + dw SFX_Cry17_3_Ch4 db CH5 - dw SFX_Cry17_3_Ch2 + dw SFX_Cry17_3_Ch5 db CH7 - dw SFX_Cry17_3_Ch3 + dw SFX_Cry17_3_Ch7 SFX_Cry18_3:: db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch1 + dw SFX_Cry18_3_Ch4 db CH5 - dw SFX_Cry18_3_Ch2 + dw SFX_Cry18_3_Ch5 db CH7 - dw SFX_Cry18_3_Ch3 + dw SFX_Cry18_3_Ch7 SFX_Cry19_3:: db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch1 + dw SFX_Cry19_3_Ch4 db CH5 - dw SFX_Cry19_3_Ch2 + dw SFX_Cry19_3_Ch5 db CH7 - dw SFX_Cry19_3_Ch3 + dw SFX_Cry19_3_Ch7 SFX_Cry1A_3:: db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch1 + dw SFX_Cry1A_3_Ch4 db CH5 - dw SFX_Cry1A_3_Ch2 + dw SFX_Cry1A_3_Ch5 db CH7 - dw SFX_Cry1A_3_Ch3 + dw SFX_Cry1A_3_Ch7 SFX_Cry1B_3:: db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch1 + dw SFX_Cry1B_3_Ch4 db CH5 - dw SFX_Cry1B_3_Ch2 + dw SFX_Cry1B_3_Ch5 db CH7 - dw SFX_Cry1B_3_Ch3 + dw SFX_Cry1B_3_Ch7 SFX_Cry1C_3:: db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch1 + dw SFX_Cry1C_3_Ch4 db CH5 - dw SFX_Cry1C_3_Ch2 + dw SFX_Cry1C_3_Ch5 db CH7 - dw SFX_Cry1C_3_Ch3 + dw SFX_Cry1C_3_Ch7 SFX_Cry1D_3:: db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch1 + dw SFX_Cry1D_3_Ch4 db CH5 - dw SFX_Cry1D_3_Ch2 + dw SFX_Cry1D_3_Ch5 db CH7 - dw SFX_Cry1D_3_Ch3 + dw SFX_Cry1D_3_Ch7 SFX_Cry1E_3:: db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch1 + dw SFX_Cry1E_3_Ch4 db CH5 - dw SFX_Cry1E_3_Ch2 + dw SFX_Cry1E_3_Ch5 db CH7 - dw SFX_Cry1E_3_Ch3 + dw SFX_Cry1E_3_Ch7 SFX_Cry1F_3:: db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch1 + dw SFX_Cry1F_3_Ch4 db CH5 - dw SFX_Cry1F_3_Ch2 + dw SFX_Cry1F_3_Ch5 db CH7 - dw SFX_Cry1F_3_Ch3 + dw SFX_Cry1F_3_Ch7 SFX_Cry20_3:: db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch1 + dw SFX_Cry20_3_Ch4 db CH5 - dw SFX_Cry20_3_Ch2 + dw SFX_Cry20_3_Ch5 db CH7 - dw SFX_Cry20_3_Ch3 + dw SFX_Cry20_3_Ch7 SFX_Cry21_3:: db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch1 + dw SFX_Cry21_3_Ch4 db CH5 - dw SFX_Cry21_3_Ch2 + dw SFX_Cry21_3_Ch5 db CH7 - dw SFX_Cry21_3_Ch3 + dw SFX_Cry21_3_Ch7 SFX_Cry22_3:: db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch1 + dw SFX_Cry22_3_Ch4 db CH5 - dw SFX_Cry22_3_Ch2 + dw SFX_Cry22_3_Ch5 db CH7 - dw SFX_Cry22_3_Ch3 + dw SFX_Cry22_3_Ch7 SFX_Cry23_3:: db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch1 + dw SFX_Cry23_3_Ch4 db CH5 - dw SFX_Cry23_3_Ch2 + dw SFX_Cry23_3_Ch5 db CH7 - dw SFX_Cry23_3_Ch3 + dw SFX_Cry23_3_Ch7 SFX_Cry24_3:: db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch1 + dw SFX_Cry24_3_Ch4 db CH5 - dw SFX_Cry24_3_Ch2 + dw SFX_Cry24_3_Ch5 db CH7 - dw SFX_Cry24_3_Ch3 + dw SFX_Cry24_3_Ch7 SFX_Cry25_3:: db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch1 + dw SFX_Cry25_3_Ch4 db CH5 - dw SFX_Cry25_3_Ch2 + dw SFX_Cry25_3_Ch5 db CH7 - dw SFX_Cry25_3_Ch3 + dw SFX_Cry25_3_Ch7 SFX_Get_Item1_3:: db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch1 + dw SFX_Get_Item1_3_Ch4 db CH5 - dw SFX_Get_Item1_3_Ch2 + dw SFX_Get_Item1_3_Ch5 db CH6 - dw SFX_Get_Item1_3_Ch3 + dw SFX_Get_Item1_3_Ch6 SFX_Get_Item2_3:: db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch1 + dw SFX_Get_Item2_3_Ch4 db CH5 - dw SFX_Get_Item2_3_Ch2 + dw SFX_Get_Item2_3_Ch5 db CH6 - dw SFX_Get_Item2_3_Ch3 + dw SFX_Get_Item2_3_Ch6 SFX_Tink_3:: db CH4 - dw SFX_Tink_3_Ch1 + dw SFX_Tink_3_Ch4 SFX_Heal_HP_3:: db CH4 - dw SFX_Heal_HP_3_Ch1 + dw SFX_Heal_HP_3_Ch4 SFX_Heal_Ailment_3:: db CH4 - dw SFX_Heal_Ailment_3_Ch1 + dw SFX_Heal_Ailment_3_Ch4 SFX_Start_Menu_3:: db CH7 - dw SFX_Start_Menu_3_Ch1 + dw SFX_Start_Menu_3_Ch7 SFX_Press_AB_3:: db CH4 - dw SFX_Press_AB_3_Ch1 + dw SFX_Press_AB_3_Ch4 SFX_Pokedex_Rating_3:: db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch1 + dw SFX_Pokedex_Rating_3_Ch4 db CH5 - dw SFX_Pokedex_Rating_3_Ch2 + dw SFX_Pokedex_Rating_3_Ch5 db CH6 - dw SFX_Pokedex_Rating_3_Ch3 + dw SFX_Pokedex_Rating_3_Ch6 SFX_Get_Key_Item_3:: db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch1 + dw SFX_Get_Key_Item_3_Ch4 db CH5 - dw SFX_Get_Key_Item_3_Ch2 + dw SFX_Get_Key_Item_3_Ch5 db CH6 - dw SFX_Get_Key_Item_3_Ch3 + dw SFX_Get_Key_Item_3_Ch6 SFX_Poisoned_3:: db CH4 - dw SFX_Poisoned_3_Ch1 + dw SFX_Poisoned_3_Ch4 SFX_Trade_Machine_3:: db CH4 - dw SFX_Trade_Machine_3_Ch1 + dw SFX_Trade_Machine_3_Ch4 SFX_Turn_On_PC_3:: db CH4 - dw SFX_Turn_On_PC_3_Ch1 + dw SFX_Turn_On_PC_3_Ch4 SFX_Turn_Off_PC_3:: db CH4 - dw SFX_Turn_Off_PC_3_Ch1 + dw SFX_Turn_Off_PC_3_Ch4 SFX_Enter_PC_3:: db CH4 - dw SFX_Enter_PC_3_Ch1 + dw SFX_Enter_PC_3_Ch4 SFX_Shrink_3:: db CH4 - dw SFX_Shrink_3_Ch1 + dw SFX_Shrink_3_Ch4 SFX_Switch_3:: db CH4 - dw SFX_Switch_3_Ch1 + dw SFX_Switch_3_Ch4 SFX_Healing_Machine_3:: db CH4 - dw SFX_Healing_Machine_3_Ch1 + dw SFX_Healing_Machine_3_Ch4 SFX_Teleport_Exit1_3:: db CH4 - dw SFX_Teleport_Exit1_3_Ch1 + dw SFX_Teleport_Exit1_3_Ch4 SFX_Teleport_Enter1_3:: db CH4 - dw SFX_Teleport_Enter1_3_Ch1 + dw SFX_Teleport_Enter1_3_Ch4 SFX_Teleport_Exit2_3:: db CH4 - dw SFX_Teleport_Exit2_3_Ch1 + dw SFX_Teleport_Exit2_3_Ch4 SFX_Ledge_3:: db CH4 - dw SFX_Ledge_3_Ch1 + dw SFX_Ledge_3_Ch4 SFX_Teleport_Enter2_3:: db CH7 - dw SFX_Teleport_Enter2_3_Ch1 + dw SFX_Teleport_Enter2_3_Ch7 SFX_Fly_3:: db CH7 - dw SFX_Fly_3_Ch1 + dw SFX_Fly_3_Ch7 SFX_Denied_3:: db ( $40 | CH4 ) - dw SFX_Denied_3_Ch1 + dw SFX_Denied_3_Ch4 db CH5 - dw SFX_Denied_3_Ch2 + dw SFX_Denied_3_Ch5 SFX_Arrow_Tiles_3:: db CH4 - dw SFX_Arrow_Tiles_3_Ch1 + dw SFX_Arrow_Tiles_3_Ch4 SFX_Push_Boulder_3:: db CH7 - dw SFX_Push_Boulder_3_Ch1 + dw SFX_Push_Boulder_3_Ch7 SFX_SS_Anne_Horn_3:: db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch1 + dw SFX_SS_Anne_Horn_3_Ch4 db CH5 - dw SFX_SS_Anne_Horn_3_Ch2 + dw SFX_SS_Anne_Horn_3_Ch5 SFX_Withdraw_Deposit_3:: db CH4 - dw SFX_Withdraw_Deposit_3_Ch1 + dw SFX_Withdraw_Deposit_3_Ch4 SFX_Cut_3:: db CH7 - dw SFX_Cut_3_Ch1 + dw SFX_Cut_3_Ch7 SFX_Go_Inside_3:: db CH7 - dw SFX_Go_Inside_3_Ch1 + dw SFX_Go_Inside_3_Ch7 SFX_Swap_3:: db ( $40 | CH4 ) - dw SFX_Swap_3_Ch1 + dw SFX_Swap_3_Ch4 db CH5 - dw SFX_Swap_3_Ch2 + dw SFX_Swap_3_Ch5 SFX_59_3:: db ( $40 | CH4 ) - dw SFX_59_3_Ch1 + dw SFX_59_3_Ch4 db CH5 - dw SFX_59_3_Ch2 + dw SFX_59_3_Ch5 SFX_Purchase_3:: db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch1 + dw SFX_Purchase_3_Ch4 db CH5 - dw SFX_Purchase_3_Ch2 + dw SFX_Purchase_3_Ch5 SFX_Collision_3:: db CH4 - dw SFX_Collision_3_Ch1 + dw SFX_Collision_3_Ch4 SFX_Go_Outside_3:: db CH7 - dw SFX_Go_Outside_3_Ch1 + dw SFX_Go_Outside_3_Ch7 SFX_Save_3:: db ( $40 | CH4 ) - dw SFX_Save_3_Ch1 + dw SFX_Save_3_Ch4 db CH5 - dw SFX_Save_3_Ch2 + dw SFX_Save_3_Ch5 SFX_Intro_Lunge:: db CH7 - dw SFX_Intro_Lunge_Ch1 + dw SFX_Intro_Lunge_Ch7 SFX_Intro_Hip:: db CH4 - dw SFX_Intro_Hip_Ch1 + dw SFX_Intro_Hip_Ch4 SFX_Intro_Hop:: db CH4 - dw SFX_Intro_Hop_Ch1 + dw SFX_Intro_Hop_Ch4 SFX_Intro_Raise:: db CH7 - dw SFX_Intro_Raise_Ch1 + dw SFX_Intro_Raise_Ch7 SFX_Intro_Crash:: db CH7 - dw SFX_Intro_Crash_Ch1 + dw SFX_Intro_Crash_Ch7 SFX_Intro_Whoosh:: db CH7 - dw SFX_Intro_Whoosh_Ch1 + dw SFX_Intro_Whoosh_Ch7 SFX_Slots_Stop_Wheel:: db CH4 - dw SFX_Slots_Stop_Wheel_Ch1 + dw SFX_Slots_Stop_Wheel_Ch4 SFX_Slots_Reward:: db CH4 - dw SFX_Slots_Reward_Ch1 + dw SFX_Slots_Reward_Ch4 SFX_Slots_New_Spin:: db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch1 + dw SFX_Slots_New_Spin_Ch4 db CH5 - dw SFX_Slots_New_Spin_Ch2 + dw SFX_Slots_New_Spin_Ch5 SFX_Shooting_Star:: db CH4 - dw SFX_Shooting_Star_Ch1 + dw SFX_Shooting_Star_Ch4 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index c14be83e..f36f9e1e 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,10 +1,10 @@ -SFX_59_1_Ch1: +SFX_59_1_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_1_Ch2: +SFX_59_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 3b817f2f..559318ba 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,10 +1,10 @@ -SFX_59_3_Ch1: +SFX_59_3_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_3_Ch2: +SFX_59_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 6c3959c9..c9ef1564 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_1_Ch1: +SFX_Arrow_Tiles_1_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 8ff79858..f88b9c83 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_3_Ch1: +SFX_Arrow_Tiles_3_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 6cd9701b..7068c66c 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_Ball_Poof_Ch1: +SFX_Ball_Poof_Ch4: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: endchannel -SFX_Ball_Poof_Ch2: +SFX_Ball_Poof_Ch7: unknownnoise0x20 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 49176db3..e9beac77 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: +SFX_Ball_Toss_Ch4: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_Ball_Toss_Ch2: +SFX_Ball_Toss_Ch5: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 8b92fc50..11f156cb 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,4 +1,4 @@ -SFX_Battle_09_Ch1: +SFX_Battle_09_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 27909666..d6feba8e 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: +SFX_Battle_0B_Ch7: unknownnoise0x20 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 7aa009ba..f193fc20 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,4 +1,4 @@ -SFX_Battle_0C_Ch1: +SFX_Battle_0C_Ch7: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 1b69e13f..f9d423ad 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,4 +1,4 @@ -SFX_Battle_0D_Ch1: +SFX_Battle_0D_Ch7: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index ff60cb9e..92a660b2 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: +SFX_Battle_0E_Ch7: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 3827a5a6..846a9053 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,4 +1,4 @@ -SFX_Battle_0F_Ch1: +SFX_Battle_0F_Ch7: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 7d301053..77be75c0 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch1: +SFX_Battle_12_Ch7: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_Battle_12_Ch1 + loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 89b8c555..81e1a0ef 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,4 +1,4 @@ -SFX_Battle_13_Ch1: +SFX_Battle_13_Ch7: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index acc064f7..8cecfb37 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,4 +1,4 @@ -SFX_Battle_14_Ch1: +SFX_Battle_14_Ch7: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index 3aa31247..dcc7014d 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,4 +1,4 @@ -SFX_Battle_16_Ch1: +SFX_Battle_16_Ch7: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 2ff4bd6d..82bb2117 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,4 +1,4 @@ -SFX_Battle_17_Ch1: +SFX_Battle_17_Ch7: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 81fa2178..14aac5c1 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: +SFX_Battle_18_Ch7: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 9981f5e4..6bc1804d 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,4 +1,4 @@ -SFX_Battle_19_Ch1: +SFX_Battle_19_Ch7: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 9f89e449..a4d8992b 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: +SFX_Battle_1B_Ch7: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 3827b34c..05cdd091 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,4 +1,4 @@ -SFX_Battle_1C_Ch1: +SFX_Battle_1C_Ch7: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index f4e9bdc8..8d3f4745 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_Battle_1E_Ch1: +SFX_Battle_1E_Ch4: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: endchannel -SFX_Battle_1E_Ch2: +SFX_Battle_1E_Ch7: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index e8a4d9f3..f7413e63 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: +SFX_Battle_20_Ch7: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index b59f5833..a6b63a6c 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,4 +1,4 @@ -SFX_Battle_21_Ch1: +SFX_Battle_21_Ch7: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 66cd218d..6a20c3ae 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: +SFX_Battle_22_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 7203dcf2..e532cf08 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,4 +1,4 @@ -SFX_Battle_23_Ch1: +SFX_Battle_23_Ch7: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 7c81b40b..46e9d29f 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_Battle_24_Ch1: +SFX_Battle_24_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: endchannel -SFX_Battle_24_Ch2: +SFX_Battle_24_Ch7: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index b1f4fc54..3a46e505 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,4 +1,4 @@ -SFX_Battle_25_Ch1: +SFX_Battle_25_Ch7: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index c656264b..ce1ac2f9 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_Battle_26_Ch1: +SFX_Battle_26_Ch7: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index af86c33f..1e662c29 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,4 +1,4 @@ -SFX_Battle_27_Ch1: +SFX_Battle_27_Ch4: duty 2 unknownsfx0x20 15, 63, 192, 7 @@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a: endchannel -SFX_Battle_27_Ch2: +SFX_Battle_27_Ch5: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 @@ -20,8 +20,8 @@ SFX_Battle_27_branch_2063d: endchannel -SFX_Battle_27_Ch3: +SFX_Battle_27_Ch7: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_Battle_27_Ch3 + loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 1c974e85..298ddb7a 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch1: +SFX_Battle_28_Ch4: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_Battle_28_Ch1 + loopchannel 12, SFX_Battle_28_Ch4 endchannel -SFX_Battle_28_Ch2: +SFX_Battle_28_Ch5: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_Battle_28_Ch2 + loopchannel 12, SFX_Battle_28_Ch5 endchannel -SFX_Battle_28_Ch3: +SFX_Battle_28_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_Battle_28_Ch3 + loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index d0abb3cb..e36c18dc 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,17 +1,17 @@ -SFX_Battle_29_Ch1: +SFX_Battle_29_Ch4: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_Battle_29_Ch1 + loopchannel 5, SFX_Battle_29_Ch4 unknownsfx0x20 8, 227, 48, 1 unknownsfx0x20 15, 194, 16, 1 endchannel -SFX_Battle_29_Ch2: +SFX_Battle_29_Ch7: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_Battle_29_Ch2 + loopchannel 4, SFX_Battle_29_Ch7 unknownnoise0x20 12, 244, 188 unknownnoise0x20 12, 245, 156 unknownnoise0x20 15, 244, 172 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index ab01bf85..710a45f1 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch1: +SFX_Battle_2A_Ch4: 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 + loopchannel 3, SFX_Battle_2A_Ch4 unknownsfx0x20 8, 209, 0, 6 endchannel -SFX_Battle_2A_Ch2: +SFX_Battle_2A_Ch5: 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 + loopchannel 3, SFX_Battle_2A_Ch5 endchannel -SFX_Battle_2A_Ch3: +SFX_Battle_2A_Ch7: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_Battle_2A_Ch3 + loopchannel 2, SFX_Battle_2A_Ch7 endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 6eddfa76..da57c7a7 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch1: +SFX_Battle_2B_Ch4: 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 + loopchannel 5, SFX_Battle_2B_Ch4 unknownsfx0x20 8, 129, 0, 4 endchannel -SFX_Battle_2B_Ch2: +SFX_Battle_2B_Ch7: 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 + loopchannel 5, SFX_Battle_2B_Ch7 unknownnoise0x20 8, 129, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 9cd9bd16..2f8bdc49 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch1: +SFX_Battle_2C_Ch4: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_Battle_2C_Ch1 + loopchannel 3, SFX_Battle_2C_Ch4 endchannel -SFX_Battle_2C_Ch2: +SFX_Battle_2C_Ch5: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_Battle_2C_Ch2 + loopchannel 4, SFX_Battle_2C_Ch5 endchannel -SFX_Battle_2C_Ch3: +SFX_Battle_2C_Ch7: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_Battle_2C_Ch3 + loopchannel 3, SFX_Battle_2C_Ch7 endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index a0841ccf..20c86033 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch1: +SFX_Battle_2E_Ch4: 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 + loopchannel 8, SFX_Battle_2E_Ch4 endchannel -SFX_Battle_2E_Ch2: +SFX_Battle_2E_Ch5: 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 + loopchannel 8, SFX_Battle_2E_Ch5 endchannel -SFX_Battle_2E_Ch3: +SFX_Battle_2E_Ch7: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_Battle_2E_Ch3 + loopchannel 9, SFX_Battle_2E_Ch7 endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index ad607993..fb4c7a14 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch1: +SFX_Battle_2F_Ch4: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_Battle_2F_Ch1 + loopchannel 8, SFX_Battle_2F_Ch4 endchannel -SFX_Battle_2F_Ch2: +SFX_Battle_2F_Ch5: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_Battle_2F_Ch2 + loopchannel 9, SFX_Battle_2F_Ch5 endchannel -SFX_Battle_2F_Ch3: +SFX_Battle_2F_Ch7: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_Battle_2F_Ch3 + loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index c88cc476..cc1169eb 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_Battle_31_Ch1: +SFX_Battle_31_Ch4: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: endchannel -SFX_Battle_31_Ch2: +SFX_Battle_31_Ch5: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index a85d4334..c7bff4b2 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_Battle_32_Ch1: +SFX_Battle_32_Ch4: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: endchannel -SFX_Battle_32_Ch2: +SFX_Battle_32_Ch5: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 25b1ee42..c92b5482 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_Battle_33_Ch1: +SFX_Battle_33_Ch4: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: endchannel -SFX_Battle_33_Ch2: +SFX_Battle_33_Ch5: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 14718916..38576ecb 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_Battle_34_Ch1: +SFX_Battle_34_Ch4: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: endchannel -SFX_Battle_34_Ch2: +SFX_Battle_34_Ch5: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: endchannel -SFX_Battle_34_Ch3: +SFX_Battle_34_Ch7: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 2fe57bc4..7ce3afb4 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_Battle_35_Ch1: +SFX_Battle_35_Ch4: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_Battle_35_Ch1: endchannel -SFX_Battle_35_Ch2: +SFX_Battle_35_Ch5: executemusic vibrato 10, 2, 3 duty 2 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index dcf9c56e..df23fb37 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_Battle_36_Ch1: +SFX_Battle_36_Ch4: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930: endchannel -SFX_Battle_36_Ch2: +SFX_Battle_36_Ch5: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -40,8 +40,8 @@ SFX_Battle_36_Ch2: endchannel -SFX_Battle_36_Ch3: +SFX_Battle_36_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_Battle_36_Ch3 + loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d4f3e858..b844a54a 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_Caught_Mon_Ch1: +SFX_Caught_Mon_Ch4: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1: endchannel -SFX_Caught_Mon_Ch2: +SFX_Caught_Mon_Ch5: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2: endchannel -SFX_Caught_Mon_Ch3: +SFX_Caught_Mon_Ch6: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 7a45bdf4..241a5e68 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,4 +1,4 @@ -SFX_Collision_1_Ch1: +SFX_Collision_1_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 601670d5..649792eb 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,4 +1,4 @@ -SFX_Collision_3_Ch1: +SFX_Collision_3_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 4fc82294..98920dfc 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_Cry00_1_Ch1: +SFX_Cry00_1_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1: endchannel -SFX_Cry00_1_Ch2: +SFX_Cry00_1_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2: endchannel -SFX_Cry00_1_Ch3: +SFX_Cry00_1_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index ccce6943..17a9207e 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_Cry00_2_Ch1: +SFX_Cry00_2_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1: endchannel -SFX_Cry00_2_Ch2: +SFX_Cry00_2_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2: endchannel -SFX_Cry00_2_Ch3: +SFX_Cry00_2_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 9b8b6fda..81ad7edf 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_Cry00_3_Ch1: +SFX_Cry00_3_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1: endchannel -SFX_Cry00_3_Ch2: +SFX_Cry00_3_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2: endchannel -SFX_Cry00_3_Ch3: +SFX_Cry00_3_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index d684af6f..392adbe3 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_Cry01_1_Ch1: +SFX_Cry01_1_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1: endchannel -SFX_Cry01_1_Ch2: +SFX_Cry01_1_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2: endchannel -SFX_Cry01_1_Ch3: +SFX_Cry01_1_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 0e1030e1..a7397fd8 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_Cry01_2_Ch1: +SFX_Cry01_2_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1: endchannel -SFX_Cry01_2_Ch2: +SFX_Cry01_2_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2: endchannel -SFX_Cry01_2_Ch3: +SFX_Cry01_2_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index be084d7e..19235f9e 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_Cry01_3_Ch1: +SFX_Cry01_3_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1: endchannel -SFX_Cry01_3_Ch2: +SFX_Cry01_3_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2: endchannel -SFX_Cry01_3_Ch3: +SFX_Cry01_3_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index d4b520c9..62834724 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_Cry02_1_Ch1: +SFX_Cry02_1_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1: endchannel -SFX_Cry02_1_Ch2: +SFX_Cry02_1_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_1_Ch3: +SFX_Cry02_1_Ch7: endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 526e8c48..ae40372a 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_Cry02_2_Ch1: +SFX_Cry02_2_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1: endchannel -SFX_Cry02_2_Ch2: +SFX_Cry02_2_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_2_Ch3: +SFX_Cry02_2_Ch7: endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 2366ff97..32be5608 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_Cry02_3_Ch1: +SFX_Cry02_3_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1: endchannel -SFX_Cry02_3_Ch2: +SFX_Cry02_3_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_3_Ch3: +SFX_Cry02_3_Ch7: endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 72ea5d38..706d2325 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_Cry03_1_Ch1: +SFX_Cry03_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1: endchannel -SFX_Cry03_1_Ch2: +SFX_Cry03_1_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2: endchannel -SFX_Cry03_1_Ch3: +SFX_Cry03_1_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index de043909..89e98ae4 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_Cry03_2_Ch1: +SFX_Cry03_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1: endchannel -SFX_Cry03_2_Ch2: +SFX_Cry03_2_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2: endchannel -SFX_Cry03_2_Ch3: +SFX_Cry03_2_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 467745f9..d472d37b 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_Cry03_3_Ch1: +SFX_Cry03_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1: endchannel -SFX_Cry03_3_Ch2: +SFX_Cry03_3_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2: endchannel -SFX_Cry03_3_Ch3: +SFX_Cry03_3_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 2c34f1c6..d1bb26c6 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_Cry04_1_Ch1: +SFX_Cry04_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1: endchannel -SFX_Cry04_1_Ch2: +SFX_Cry04_1_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2: endchannel -SFX_Cry04_1_Ch3: +SFX_Cry04_1_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index 38bfbf63..aa5baf29 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_Cry04_2_Ch1: +SFX_Cry04_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1: endchannel -SFX_Cry04_2_Ch2: +SFX_Cry04_2_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2: endchannel -SFX_Cry04_2_Ch3: +SFX_Cry04_2_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index bd73c271..b4d9cf2e 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_Cry04_3_Ch1: +SFX_Cry04_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1: endchannel -SFX_Cry04_3_Ch2: +SFX_Cry04_3_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2: endchannel -SFX_Cry04_3_Ch3: +SFX_Cry04_3_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 8de5bf02..dc68e77d 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_Cry05_1_Ch1: +SFX_Cry05_1_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1: endchannel -SFX_Cry05_1_Ch2: +SFX_Cry05_1_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_1_Ch3: +SFX_Cry05_1_Ch7: endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 28879677..f7e09dcc 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_Cry05_2_Ch1: +SFX_Cry05_2_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1: endchannel -SFX_Cry05_2_Ch2: +SFX_Cry05_2_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_2_Ch3: +SFX_Cry05_2_Ch7: endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 261492af..2e8839c9 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_Cry05_3_Ch1: +SFX_Cry05_3_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1: endchannel -SFX_Cry05_3_Ch2: +SFX_Cry05_3_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_3_Ch3: +SFX_Cry05_3_Ch7: endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index e171b025..d3b051c8 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_Cry06_1_Ch1: +SFX_Cry06_1_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_1_Ch2: +SFX_Cry06_1_Ch5: endchannel -SFX_Cry06_1_Ch3: +SFX_Cry06_1_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 5e6e9e6a..6a46246c 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_Cry06_2_Ch1: +SFX_Cry06_2_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_2_Ch2: +SFX_Cry06_2_Ch5: endchannel -SFX_Cry06_2_Ch3: +SFX_Cry06_2_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 5d2994f1..692cd1cf 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_Cry06_3_Ch1: +SFX_Cry06_3_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_3_Ch2: +SFX_Cry06_3_Ch5: endchannel -SFX_Cry06_3_Ch3: +SFX_Cry06_3_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index e48a50a2..2eebb7f9 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_Cry07_1_Ch1: +SFX_Cry07_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1: endchannel -SFX_Cry07_1_Ch2: +SFX_Cry07_1_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2: endchannel -SFX_Cry07_1_Ch3: +SFX_Cry07_1_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index ab902a30..e0381424 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_Cry07_2_Ch1: +SFX_Cry07_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1: endchannel -SFX_Cry07_2_Ch2: +SFX_Cry07_2_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2: endchannel -SFX_Cry07_2_Ch3: +SFX_Cry07_2_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 40fad544..92a401a9 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_Cry07_3_Ch1: +SFX_Cry07_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1: endchannel -SFX_Cry07_3_Ch2: +SFX_Cry07_3_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2: endchannel -SFX_Cry07_3_Ch3: +SFX_Cry07_3_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 6ec5ca3c..91901faa 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_Cry08_1_Ch1: +SFX_Cry08_1_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1: endchannel -SFX_Cry08_1_Ch2: +SFX_Cry08_1_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2: endchannel -SFX_Cry08_1_Ch3: +SFX_Cry08_1_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 9c154b1c..45d12f38 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_Cry08_2_Ch1: +SFX_Cry08_2_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1: endchannel -SFX_Cry08_2_Ch2: +SFX_Cry08_2_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2: endchannel -SFX_Cry08_2_Ch3: +SFX_Cry08_2_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 95fea40e..8f1ec3fb 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_Cry08_3_Ch1: +SFX_Cry08_3_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1: endchannel -SFX_Cry08_3_Ch2: +SFX_Cry08_3_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2: endchannel -SFX_Cry08_3_Ch3: +SFX_Cry08_3_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 46aae33c..11b4ab55 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_Cry09_1_Ch1: +SFX_Cry09_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1: endchannel -SFX_Cry09_1_Ch2: +SFX_Cry09_1_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2: endchannel -SFX_Cry09_1_Ch3: +SFX_Cry09_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 8ce97609..ac4b1f74 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_Cry09_2_Ch1: +SFX_Cry09_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1: endchannel -SFX_Cry09_2_Ch2: +SFX_Cry09_2_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2: endchannel -SFX_Cry09_2_Ch3: +SFX_Cry09_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index a6b40dde..1d3856cc 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_Cry09_3_Ch1: +SFX_Cry09_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1: endchannel -SFX_Cry09_3_Ch2: +SFX_Cry09_3_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2: endchannel -SFX_Cry09_3_Ch3: +SFX_Cry09_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 4264e858..051a5d73 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_1_Ch1: +SFX_Cry0A_1_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1: endchannel -SFX_Cry0A_1_Ch2: +SFX_Cry0A_1_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2: endchannel -SFX_Cry0A_1_Ch3: +SFX_Cry0A_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 42a8e603..d7fdd264 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_2_Ch1: +SFX_Cry0A_2_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1: endchannel -SFX_Cry0A_2_Ch2: +SFX_Cry0A_2_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2: endchannel -SFX_Cry0A_2_Ch3: +SFX_Cry0A_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index f8576fa1..e16287c4 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_3_Ch1: +SFX_Cry0A_3_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1: endchannel -SFX_Cry0A_3_Ch2: +SFX_Cry0A_3_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2: endchannel -SFX_Cry0A_3_Ch3: +SFX_Cry0A_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index d0da6c2e..5ee9b81c 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_1_Ch1: +SFX_Cry0B_1_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1: endchannel -SFX_Cry0B_1_Ch2: +SFX_Cry0B_1_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2: endchannel -SFX_Cry0B_1_Ch3: +SFX_Cry0B_1_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 0fe7840a..f762ea02 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_2_Ch1: +SFX_Cry0B_2_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1: endchannel -SFX_Cry0B_2_Ch2: +SFX_Cry0B_2_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2: endchannel -SFX_Cry0B_2_Ch3: +SFX_Cry0B_2_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index ff761b85..22420974 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_3_Ch1: +SFX_Cry0B_3_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1: endchannel -SFX_Cry0B_3_Ch2: +SFX_Cry0B_3_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2: endchannel -SFX_Cry0B_3_Ch3: +SFX_Cry0B_3_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 4ff72662..dfbf0283 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_1_Ch1: +SFX_Cry0C_1_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1: endchannel -SFX_Cry0C_1_Ch2: +SFX_Cry0C_1_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_1_Ch3: +SFX_Cry0C_1_Ch7: endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 8fb925da..11e0d06a 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_2_Ch1: +SFX_Cry0C_2_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1: endchannel -SFX_Cry0C_2_Ch2: +SFX_Cry0C_2_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_2_Ch3: +SFX_Cry0C_2_Ch7: endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 149b585d..6fc798f2 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_3_Ch1: +SFX_Cry0C_3_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1: endchannel -SFX_Cry0C_3_Ch2: +SFX_Cry0C_3_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_3_Ch3: +SFX_Cry0C_3_Ch7: endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index dccccb4e..2864fa01 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_1_Ch1: +SFX_Cry0D_1_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_1_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_1_Ch1 + loopchannel 2, SFX_Cry0D_1_Ch4 endchannel -SFX_Cry0D_1_Ch2: +SFX_Cry0D_1_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2: endchannel -SFX_Cry0D_1_Ch3: +SFX_Cry0D_1_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 718364dd..ef4a0eb6 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_2_Ch1: +SFX_Cry0D_2_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_2_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_2_Ch1 + loopchannel 2, SFX_Cry0D_2_Ch4 endchannel -SFX_Cry0D_2_Ch2: +SFX_Cry0D_2_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2: endchannel -SFX_Cry0D_2_Ch3: +SFX_Cry0D_2_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index ce26e7e5..1fbc40b5 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_3_Ch1: +SFX_Cry0D_3_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_3_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_3_Ch1 + loopchannel 2, SFX_Cry0D_3_Ch4 endchannel -SFX_Cry0D_3_Ch2: +SFX_Cry0D_3_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2: endchannel -SFX_Cry0D_3_Ch3: +SFX_Cry0D_3_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index c30aaf20..37cabb7c 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_1_Ch1: +SFX_Cry0E_1_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1: endchannel -SFX_Cry0E_1_Ch2: +SFX_Cry0E_1_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2: endchannel -SFX_Cry0E_1_Ch3: +SFX_Cry0E_1_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 194fb04b..5f6f481f 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_2_Ch1: +SFX_Cry0E_2_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1: endchannel -SFX_Cry0E_2_Ch2: +SFX_Cry0E_2_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2: endchannel -SFX_Cry0E_2_Ch3: +SFX_Cry0E_2_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 062e8970..13cf9405 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_3_Ch1: +SFX_Cry0E_3_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1: endchannel -SFX_Cry0E_3_Ch2: +SFX_Cry0E_3_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2: endchannel -SFX_Cry0E_3_Ch3: +SFX_Cry0E_3_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 1646d4b5..81abdc09 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_1_Ch1: +SFX_Cry0F_1_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1: endchannel -SFX_Cry0F_1_Ch2: +SFX_Cry0F_1_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2: endchannel -SFX_Cry0F_1_Ch3: +SFX_Cry0F_1_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 6058e7cc..112b9e8b 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_2_Ch1: +SFX_Cry0F_2_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1: endchannel -SFX_Cry0F_2_Ch2: +SFX_Cry0F_2_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2: endchannel -SFX_Cry0F_2_Ch3: +SFX_Cry0F_2_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 113f5ed1..08abd131 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_3_Ch1: +SFX_Cry0F_3_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1: endchannel -SFX_Cry0F_3_Ch2: +SFX_Cry0F_3_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2: endchannel -SFX_Cry0F_3_Ch3: +SFX_Cry0F_3_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 5199b973..eef13d3d 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_Cry10_1_Ch1: +SFX_Cry10_1_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1: endchannel -SFX_Cry10_1_Ch2: +SFX_Cry10_1_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2: endchannel -SFX_Cry10_1_Ch3: +SFX_Cry10_1_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 789c61b1..dd468979 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_Cry10_2_Ch1: +SFX_Cry10_2_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1: endchannel -SFX_Cry10_2_Ch2: +SFX_Cry10_2_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2: endchannel -SFX_Cry10_2_Ch3: +SFX_Cry10_2_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 83980fc7..e9a5200d 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_Cry10_3_Ch1: +SFX_Cry10_3_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1: endchannel -SFX_Cry10_3_Ch2: +SFX_Cry10_3_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2: endchannel -SFX_Cry10_3_Ch3: +SFX_Cry10_3_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index d7e0b0f9..f7c314ef 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_Cry11_1_Ch1: +SFX_Cry11_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1: endchannel -SFX_Cry11_1_Ch2: +SFX_Cry11_1_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2: endchannel -SFX_Cry11_1_Ch3: +SFX_Cry11_1_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index f46580eb..0009a0ec 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_Cry11_2_Ch1: +SFX_Cry11_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1: endchannel -SFX_Cry11_2_Ch2: +SFX_Cry11_2_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2: endchannel -SFX_Cry11_2_Ch3: +SFX_Cry11_2_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index c07e01a5..a8af19f6 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_Cry11_3_Ch1: +SFX_Cry11_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1: endchannel -SFX_Cry11_3_Ch2: +SFX_Cry11_3_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2: endchannel -SFX_Cry11_3_Ch3: +SFX_Cry11_3_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index 62956626..29d93eff 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_Cry12_1_Ch1: +SFX_Cry12_1_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1: endchannel -SFX_Cry12_1_Ch2: +SFX_Cry12_1_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2: endchannel -SFX_Cry12_1_Ch3: +SFX_Cry12_1_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4acb8911..90f373c0 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_Cry12_2_Ch1: +SFX_Cry12_2_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1: endchannel -SFX_Cry12_2_Ch2: +SFX_Cry12_2_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2: endchannel -SFX_Cry12_2_Ch3: +SFX_Cry12_2_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index bb433ac9..f2c012ae 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_Cry12_3_Ch1: +SFX_Cry12_3_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1: endchannel -SFX_Cry12_3_Ch2: +SFX_Cry12_3_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2: endchannel -SFX_Cry12_3_Ch3: +SFX_Cry12_3_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 7f9ef226..703db728 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_Cry13_1_Ch1: +SFX_Cry13_1_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1: endchannel -SFX_Cry13_1_Ch2: +SFX_Cry13_1_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2: endchannel -SFX_Cry13_1_Ch3: +SFX_Cry13_1_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 35d723dd..7d75853c 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_Cry13_2_Ch1: +SFX_Cry13_2_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1: endchannel -SFX_Cry13_2_Ch2: +SFX_Cry13_2_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2: endchannel -SFX_Cry13_2_Ch3: +SFX_Cry13_2_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index a298e5ff..53296f1a 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_Cry13_3_Ch1: +SFX_Cry13_3_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1: endchannel -SFX_Cry13_3_Ch2: +SFX_Cry13_3_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2: endchannel -SFX_Cry13_3_Ch3: +SFX_Cry13_3_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index b3cb43b9..fa8964de 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_Cry14_1_Ch1: +SFX_Cry14_1_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1: endchannel -SFX_Cry14_1_Ch2: +SFX_Cry14_1_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2: endchannel -SFX_Cry14_1_Ch3: +SFX_Cry14_1_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index d243bcbd..1f70dca8 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_Cry14_2_Ch1: +SFX_Cry14_2_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1: endchannel -SFX_Cry14_2_Ch2: +SFX_Cry14_2_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2: endchannel -SFX_Cry14_2_Ch3: +SFX_Cry14_2_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index b1a32bc4..3bab2100 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_Cry14_3_Ch1: +SFX_Cry14_3_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1: endchannel -SFX_Cry14_3_Ch2: +SFX_Cry14_3_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2: endchannel -SFX_Cry14_3_Ch3: +SFX_Cry14_3_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 4ebd4963..0220ad4f 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_Cry15_1_Ch1: +SFX_Cry15_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1: endchannel -SFX_Cry15_1_Ch2: +SFX_Cry15_1_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2: endchannel -SFX_Cry15_1_Ch3: +SFX_Cry15_1_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 77807203..2ebd7ab0 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_Cry15_2_Ch1: +SFX_Cry15_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1: endchannel -SFX_Cry15_2_Ch2: +SFX_Cry15_2_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2: endchannel -SFX_Cry15_2_Ch3: +SFX_Cry15_2_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 2c24d658..39ba7a74 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_Cry15_3_Ch1: +SFX_Cry15_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1: endchannel -SFX_Cry15_3_Ch2: +SFX_Cry15_3_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2: endchannel -SFX_Cry15_3_Ch3: +SFX_Cry15_3_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 8a7ee4c1..34d6f6d9 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_Cry16_1_Ch1: +SFX_Cry16_1_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1: endchannel -SFX_Cry16_1_Ch2: +SFX_Cry16_1_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2: endchannel -SFX_Cry16_1_Ch3: +SFX_Cry16_1_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 46729c2a..8948cd29 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_Cry16_2_Ch1: +SFX_Cry16_2_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1: endchannel -SFX_Cry16_2_Ch2: +SFX_Cry16_2_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2: endchannel -SFX_Cry16_2_Ch3: +SFX_Cry16_2_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index a94ac495..026ee67b 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_Cry16_3_Ch1: +SFX_Cry16_3_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1: endchannel -SFX_Cry16_3_Ch2: +SFX_Cry16_3_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2: endchannel -SFX_Cry16_3_Ch3: +SFX_Cry16_3_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index ddf0967d..97dec764 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_Cry17_1_Ch1: +SFX_Cry17_1_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1: endchannel -SFX_Cry17_1_Ch2: +SFX_Cry17_1_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2: endchannel -SFX_Cry17_1_Ch3: +SFX_Cry17_1_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index f2528875..a6ab03a2 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_Cry17_2_Ch1: +SFX_Cry17_2_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1: endchannel -SFX_Cry17_2_Ch2: +SFX_Cry17_2_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2: endchannel -SFX_Cry17_2_Ch3: +SFX_Cry17_2_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index f180a3b8..53555206 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_Cry17_3_Ch1: +SFX_Cry17_3_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1: endchannel -SFX_Cry17_3_Ch2: +SFX_Cry17_3_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2: endchannel -SFX_Cry17_3_Ch3: +SFX_Cry17_3_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index c28bf7f4..8cb3283f 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_Cry18_1_Ch1: +SFX_Cry18_1_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1: endchannel -SFX_Cry18_1_Ch2: +SFX_Cry18_1_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2: endchannel -SFX_Cry18_1_Ch3: +SFX_Cry18_1_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 1c3c26b9..01dacd5f 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_Cry18_2_Ch1: +SFX_Cry18_2_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1: endchannel -SFX_Cry18_2_Ch2: +SFX_Cry18_2_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2: endchannel -SFX_Cry18_2_Ch3: +SFX_Cry18_2_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index ceeda42f..23d2d6a6 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_Cry18_3_Ch1: +SFX_Cry18_3_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1: endchannel -SFX_Cry18_3_Ch2: +SFX_Cry18_3_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2: endchannel -SFX_Cry18_3_Ch3: +SFX_Cry18_3_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 4b5b4ed0..2e6790e5 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_Cry19_1_Ch1: +SFX_Cry19_1_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1: endchannel -SFX_Cry19_1_Ch2: +SFX_Cry19_1_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_1_Ch3: +SFX_Cry19_1_Ch7: endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 9c9557a9..f412ec14 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_Cry19_2_Ch1: +SFX_Cry19_2_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1: endchannel -SFX_Cry19_2_Ch2: +SFX_Cry19_2_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_2_Ch3: +SFX_Cry19_2_Ch7: endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 71eccbf8..2baff05e 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_Cry19_3_Ch1: +SFX_Cry19_3_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1: endchannel -SFX_Cry19_3_Ch2: +SFX_Cry19_3_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_3_Ch3: +SFX_Cry19_3_Ch7: endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 7f8911c7..5d03596e 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_1_Ch1: +SFX_Cry1A_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1: endchannel -SFX_Cry1A_1_Ch2: +SFX_Cry1A_1_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2: endchannel -SFX_Cry1A_1_Ch3: +SFX_Cry1A_1_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index da54ff6e..4dcf2a42 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_2_Ch1: +SFX_Cry1A_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1: endchannel -SFX_Cry1A_2_Ch2: +SFX_Cry1A_2_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2: endchannel -SFX_Cry1A_2_Ch3: +SFX_Cry1A_2_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index d16cf035..274ce438 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_3_Ch1: +SFX_Cry1A_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1: endchannel -SFX_Cry1A_3_Ch2: +SFX_Cry1A_3_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2: endchannel -SFX_Cry1A_3_Ch3: +SFX_Cry1A_3_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index f6f03c98..562239c7 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_1_Ch1: +SFX_Cry1B_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1: endchannel -SFX_Cry1B_1_Ch2: +SFX_Cry1B_1_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2: endchannel -SFX_Cry1B_1_Ch3: +SFX_Cry1B_1_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index fe96943d..45bb41a2 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_2_Ch1: +SFX_Cry1B_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1: endchannel -SFX_Cry1B_2_Ch2: +SFX_Cry1B_2_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2: endchannel -SFX_Cry1B_2_Ch3: +SFX_Cry1B_2_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 8a034b1e..e6e31b00 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_3_Ch1: +SFX_Cry1B_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1: endchannel -SFX_Cry1B_3_Ch2: +SFX_Cry1B_3_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2: endchannel -SFX_Cry1B_3_Ch3: +SFX_Cry1B_3_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 1561353e..332b7da8 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_1_Ch1: +SFX_Cry1C_1_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1: endchannel -SFX_Cry1C_1_Ch2: +SFX_Cry1C_1_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2: endchannel -SFX_Cry1C_1_Ch3: +SFX_Cry1C_1_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index c589a24d..aee95be5 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_2_Ch1: +SFX_Cry1C_2_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1: endchannel -SFX_Cry1C_2_Ch2: +SFX_Cry1C_2_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2: endchannel -SFX_Cry1C_2_Ch3: +SFX_Cry1C_2_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 930e3368..13e687f6 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_3_Ch1: +SFX_Cry1C_3_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1: endchannel -SFX_Cry1C_3_Ch2: +SFX_Cry1C_3_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2: endchannel -SFX_Cry1C_3_Ch3: +SFX_Cry1C_3_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6b8b3f79..4e7b6308 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_1_Ch1: +SFX_Cry1D_1_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1: endchannel -SFX_Cry1D_1_Ch2: +SFX_Cry1D_1_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2: endchannel -SFX_Cry1D_1_Ch3: +SFX_Cry1D_1_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 31fccb8d..9ee56bf8 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_2_Ch1: +SFX_Cry1D_2_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1: endchannel -SFX_Cry1D_2_Ch2: +SFX_Cry1D_2_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2: endchannel -SFX_Cry1D_2_Ch3: +SFX_Cry1D_2_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index fbbe9ca5..e2e5fae3 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_3_Ch1: +SFX_Cry1D_3_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1: endchannel -SFX_Cry1D_3_Ch2: +SFX_Cry1D_3_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2: endchannel -SFX_Cry1D_3_Ch3: +SFX_Cry1D_3_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 9501a06a..56d97001 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_1_Ch1: +SFX_Cry1E_1_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1: endchannel -SFX_Cry1E_1_Ch2: +SFX_Cry1E_1_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2: endchannel -SFX_Cry1E_1_Ch3: +SFX_Cry1E_1_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index fe112101..7ed25afe 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_2_Ch1: +SFX_Cry1E_2_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1: endchannel -SFX_Cry1E_2_Ch2: +SFX_Cry1E_2_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2: endchannel -SFX_Cry1E_2_Ch3: +SFX_Cry1E_2_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index f5bdbe08..82dbdfcc 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_3_Ch1: +SFX_Cry1E_3_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1: endchannel -SFX_Cry1E_3_Ch2: +SFX_Cry1E_3_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2: endchannel -SFX_Cry1E_3_Ch3: +SFX_Cry1E_3_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 28b91c61..a38bd975 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_1_Ch1: +SFX_Cry1F_1_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1: endchannel -SFX_Cry1F_1_Ch2: +SFX_Cry1F_1_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2: endchannel -SFX_Cry1F_1_Ch3: +SFX_Cry1F_1_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 9691654f..3d261bb2 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_2_Ch1: +SFX_Cry1F_2_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1: endchannel -SFX_Cry1F_2_Ch2: +SFX_Cry1F_2_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2: endchannel -SFX_Cry1F_2_Ch3: +SFX_Cry1F_2_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 3c50327b..2bdfe24b 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_3_Ch1: +SFX_Cry1F_3_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1: endchannel -SFX_Cry1F_3_Ch2: +SFX_Cry1F_3_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2: endchannel -SFX_Cry1F_3_Ch3: +SFX_Cry1F_3_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 0e9ffb00..14ec6942 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_Cry20_1_Ch1: +SFX_Cry20_1_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1: endchannel -SFX_Cry20_1_Ch2: +SFX_Cry20_1_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2: endchannel -SFX_Cry20_1_Ch3: +SFX_Cry20_1_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 91891b4f..bcbf27a6 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_Cry20_2_Ch1: +SFX_Cry20_2_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1: endchannel -SFX_Cry20_2_Ch2: +SFX_Cry20_2_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2: endchannel -SFX_Cry20_2_Ch3: +SFX_Cry20_2_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 1fae1bb3..12e42d7f 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_Cry20_3_Ch1: +SFX_Cry20_3_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1: endchannel -SFX_Cry20_3_Ch2: +SFX_Cry20_3_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2: endchannel -SFX_Cry20_3_Ch3: +SFX_Cry20_3_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 17d1e16c..c08704d7 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_Cry21_1_Ch1: +SFX_Cry21_1_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1: endchannel -SFX_Cry21_1_Ch2: +SFX_Cry21_1_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_1_Ch3: +SFX_Cry21_1_Ch7: endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index 14856fc9..b8f68dbd 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_Cry21_2_Ch1: +SFX_Cry21_2_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1: endchannel -SFX_Cry21_2_Ch2: +SFX_Cry21_2_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_2_Ch3: +SFX_Cry21_2_Ch7: endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 40cbf7f2..4a549af9 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_Cry21_3_Ch1: +SFX_Cry21_3_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1: endchannel -SFX_Cry21_3_Ch2: +SFX_Cry21_3_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_3_Ch3: +SFX_Cry21_3_Ch7: endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index fb0c6b23..0da8dbd2 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_Cry22_1_Ch1: +SFX_Cry22_1_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1: endchannel -SFX_Cry22_1_Ch2: +SFX_Cry22_1_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2: endchannel -SFX_Cry22_1_Ch3: +SFX_Cry22_1_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 7653234e..d7456dbc 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_Cry22_2_Ch1: +SFX_Cry22_2_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1: endchannel -SFX_Cry22_2_Ch2: +SFX_Cry22_2_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2: endchannel -SFX_Cry22_2_Ch3: +SFX_Cry22_2_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 96fae832..927c174c 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_Cry22_3_Ch1: +SFX_Cry22_3_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1: endchannel -SFX_Cry22_3_Ch2: +SFX_Cry22_3_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2: endchannel -SFX_Cry22_3_Ch3: +SFX_Cry22_3_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 4aaa3bfa..cc0587d7 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_Cry23_1_Ch1: +SFX_Cry23_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1: endchannel -SFX_Cry23_1_Ch2: +SFX_Cry23_1_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2: endchannel -SFX_Cry23_1_Ch3: +SFX_Cry23_1_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 644b14cf..5d130aa5 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_Cry23_2_Ch1: +SFX_Cry23_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1: endchannel -SFX_Cry23_2_Ch2: +SFX_Cry23_2_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2: endchannel -SFX_Cry23_2_Ch3: +SFX_Cry23_2_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index d86dfcd4..8ada0c63 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_Cry23_3_Ch1: +SFX_Cry23_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1: endchannel -SFX_Cry23_3_Ch2: +SFX_Cry23_3_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2: endchannel -SFX_Cry23_3_Ch3: +SFX_Cry23_3_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index a94803c1..f79dc72c 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_Cry24_1_Ch1: +SFX_Cry24_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1: endchannel -SFX_Cry24_1_Ch2: +SFX_Cry24_1_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2: endchannel -SFX_Cry24_1_Ch3: +SFX_Cry24_1_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index cc8b2f87..aede2b95 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_Cry24_2_Ch1: +SFX_Cry24_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1: endchannel -SFX_Cry24_2_Ch2: +SFX_Cry24_2_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2: endchannel -SFX_Cry24_2_Ch3: +SFX_Cry24_2_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 37926146..cad3ada1 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_Cry24_3_Ch1: +SFX_Cry24_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1: endchannel -SFX_Cry24_3_Ch2: +SFX_Cry24_3_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2: endchannel -SFX_Cry24_3_Ch3: +SFX_Cry24_3_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index d54b8d6c..f3ae46ae 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_Cry25_1_Ch1: +SFX_Cry25_1_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1: endchannel -SFX_Cry25_1_Ch2: +SFX_Cry25_1_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2: endchannel -SFX_Cry25_1_Ch3: +SFX_Cry25_1_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 48e4d057..9b976b4e 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_Cry25_2_Ch1: +SFX_Cry25_2_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1: endchannel -SFX_Cry25_2_Ch2: +SFX_Cry25_2_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2: endchannel -SFX_Cry25_2_Ch3: +SFX_Cry25_2_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index f08c6a00..e76feb9e 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_Cry25_3_Ch1: +SFX_Cry25_3_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1: endchannel -SFX_Cry25_3_Ch2: +SFX_Cry25_3_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2: endchannel -SFX_Cry25_3_Ch3: +SFX_Cry25_3_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index a42cd660..73510fd7 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,4 +1,4 @@ -SFX_Cut_1_Ch1: +SFX_Cut_1_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 12c2366e..6e7d8951 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,4 +1,4 @@ -SFX_Cut_3_Ch1: +SFX_Cut_3_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 3f3c6d8b..35cae4df 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch1: +SFX_Cymbal1_1_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index bb1e3e3e..bffe7690 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch1: +SFX_Cymbal1_2_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 9587977f..0f03f455 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch1: +SFX_Cymbal1_3_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 2ec3fc86..ce19bb6b 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch1: +SFX_Cymbal2_1_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 8b27a0de..f45dec5b 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch1: +SFX_Cymbal2_2_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 642a336a..2d2ebf1c 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch1: +SFX_Cymbal2_3_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 3fd225e2..98f3977d 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch1: +SFX_Cymbal3_1_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index 1435b5ed..2a2cb997 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch1: +SFX_Cymbal3_2_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index b45fb03d..60b96278 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch1: +SFX_Cymbal3_3_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index ea2727d8..452fd5ed 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,4 +1,4 @@ -SFX_Damage_Ch1: +SFX_Damage_Ch7: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index d954308a..e7d5a8ca 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_Denied_1_Ch1: +SFX_Denied_1_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_1_Ch1: endchannel -SFX_Denied_1_Ch2: +SFX_Denied_1_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index ca82a739..cf3b2a20 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_Denied_3_Ch1: +SFX_Denied_3_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_3_Ch1: endchannel -SFX_Denied_3_Ch2: +SFX_Denied_3_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 6e3a0dcf..08180071 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_Dex_Page_Added_Ch1: +SFX_Dex_Page_Added_Ch4: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1: endchannel -SFX_Dex_Page_Added_Ch2: +SFX_Dex_Page_Added_Ch5: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 5cae0a4b..4e71ac36 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: +SFX_Doubleslap_Ch7: 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 index b2450ced..338c32ab 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_1_Ch1: +SFX_Enter_PC_1_Ch4: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 061068ce..f34ed9d0 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_3_Ch1: +SFX_Enter_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd1b2cdc..cd403485 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,4 +1,4 @@ -SFX_Faint_Fall_Ch1: +SFX_Faint_Fall_Ch4: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 7b6ec0a0..479efab3 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,10 +1,10 @@ -SFX_Faint_Thud_Ch1: +SFX_Faint_Thud_Ch4: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_Faint_Thud_Ch2: +SFX_Faint_Thud_Ch7: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 2b487bc2..ededef48 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_Fly_1_Ch1: +SFX_Fly_1_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index c081030d..084c8b4c 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_Fly_3_Ch1: +SFX_Fly_3_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index ba428722..2cf5e8c9 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_1_Ch1: +SFX_Get_Item1_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1: endchannel -SFX_Get_Item1_1_Ch2: +SFX_Get_Item1_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2: endchannel -SFX_Get_Item1_1_Ch3: +SFX_Get_Item1_1_Ch6: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index b30ce40c..6c4c01b5 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_3_Ch1: +SFX_Get_Item1_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1: endchannel -SFX_Get_Item1_3_Ch2: +SFX_Get_Item1_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2: endchannel -SFX_Get_Item1_3_Ch3: +SFX_Get_Item1_3_Ch6: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 67bb7bb8..01e66269 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_1_Ch1: +SFX_Get_Item2_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1: endchannel -SFX_Get_Item2_1_Ch2: +SFX_Get_Item2_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2: endchannel -SFX_Get_Item2_1_Ch3: +SFX_Get_Item2_1_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 292a74f6..27c5864d 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_2_Ch1: +SFX_Get_Item2_2_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1: endchannel -SFX_Get_Item2_2_Ch2: +SFX_Get_Item2_2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2: endchannel -SFX_Get_Item2_2_Ch3: +SFX_Get_Item2_2_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 1a833741..42d74e8e 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_3_Ch1: +SFX_Get_Item2_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1: endchannel -SFX_Get_Item2_3_Ch2: +SFX_Get_Item2_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2: endchannel -SFX_Get_Item2_3_Ch3: +SFX_Get_Item2_3_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index c8da1745..b2ae3d57 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_1_Ch1: +SFX_Get_Key_Item_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1: endchannel -SFX_Get_Key_Item_1_Ch2: +SFX_Get_Key_Item_1_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2: endchannel -SFX_Get_Key_Item_1_Ch3: +SFX_Get_Key_Item_1_Ch6: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index e6a50929..aebae361 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_3_Ch1: +SFX_Get_Key_Item_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1: endchannel -SFX_Get_Key_Item_3_Ch2: +SFX_Get_Key_Item_3_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2: endchannel -SFX_Get_Key_Item_3_Ch3: +SFX_Get_Key_Item_3_Ch6: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 5da5be86..aa523774 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: +SFX_Go_Inside_1_Ch7: 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 index 460b3b4a..9939ba6d 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: +SFX_Go_Inside_3_Ch7: 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 index 2038d299..c60bb592 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_1_Ch1: +SFX_Go_Outside_1_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index d45b8410..30b9884c 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_3_Ch1: +SFX_Go_Outside_3_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 3a292b82..ca703c09 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_1_Ch1: +SFX_Heal_Ailment_1_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 25e1bbe0..b06abe62 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_2_Ch1: +SFX_Heal_Ailment_2_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index 2719358f..c13d74fd 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_3_Ch1: +SFX_Heal_Ailment_3_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index a23db490..75400957 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_1_Ch1: +SFX_Heal_HP_1_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index f21f6712..182937cd 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_2_Ch1: +SFX_Heal_HP_2_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index 96ff391b..c238013a 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_3_Ch1: +SFX_Heal_HP_3_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ecb7c09c..ebaee990 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_1_Ch1: +SFX_Healing_Machine_1_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index ec73e139..ac11fee4 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_3_Ch1: +SFX_Healing_Machine_3_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index b1af527b..12ca5da6 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,4 +1,4 @@ -SFX_Horn_Drill_Ch1: +SFX_Horn_Drill_Ch7: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 69d6ff9b..82c58356 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: +SFX_Intro_Crash_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 3d6de9d6..0d450e21 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hip_Ch1: +SFX_Intro_Hip_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 8e077c67..1bd9faec 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hop_Ch1: +SFX_Intro_Hop_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index cb7570de..bb534a70 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_Intro_Lunge_Ch1: +SFX_Intro_Lunge_Ch7: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index 0088228f..060ef09a 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,4 +1,4 @@ -SFX_Intro_Raise_Ch1: +SFX_Intro_Raise_Ch7: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 5609bfc0..e874e773 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,4 +1,4 @@ -SFX_Intro_Whoosh_Ch1: +SFX_Intro_Whoosh_Ch7: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 72aa087e..26acaf1b 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,4 +1,4 @@ -SFX_Ledge_1_Ch1: +SFX_Ledge_1_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index a554282e..623e56ce 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,4 +1,4 @@ -SFX_Ledge_3_Ch1: +SFX_Ledge_3_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index f0890eab..5b3da83d 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_Level_Up_Ch1: +SFX_Level_Up_Ch4: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_Level_Up_Ch1: endchannel -SFX_Level_Up_Ch2: +SFX_Level_Up_Ch5: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_Level_Up_Ch2: endchannel -SFX_Level_Up_Ch3: +SFX_Level_Up_Ch6: executemusic notetype 6, 1, 0 octave 5 diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index b29a5b87..4b205470 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch1: +SFX_Muted_Snare1_1_Ch7: 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 index a7f5467f..d530bd89 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch1: +SFX_Muted_Snare1_2_Ch7: 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 index 136018ef..8b5c2c6d 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch1: +SFX_Muted_Snare1_3_Ch7: 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 index 9ad52c27..4e15e386 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch1: +SFX_Muted_Snare2_1_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 20670ec8..5107fb77 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch1: +SFX_Muted_Snare2_2_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 007d462d..043c870d 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch1: +SFX_Muted_Snare2_3_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 8db6b874..d0c689a4 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch1: +SFX_Muted_Snare3_1_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 013ea9ab..3e470ae6 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch1: +SFX_Muted_Snare3_2_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index 038a66db..c8749577 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch1: +SFX_Muted_Snare3_3_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index 99429995..ebe2ee1d 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch1: +SFX_Muted_Snare4_1_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 11ee3218..bdbe4d11 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch1: +SFX_Muted_Snare4_2_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 86223813..59d72218 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch1: +SFX_Muted_Snare4_3_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 8a4c521e..3f74c515 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,4 +1,4 @@ -SFX_Not_Very_Effective_Ch1: +SFX_Not_Very_Effective_Ch7: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c474e9b3..cca7ecaa 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: +SFX_Peck_Ch7: unknownnoise0x20 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index bfd619fd..73068b86 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch1: +SFX_Poisoned_1_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_1_Ch1 + loopchannel 4, SFX_Poisoned_1_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b972ca92..7dc973bc 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_3_Ch1: +SFX_Poisoned_3_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_3_Ch1 + loopchannel 4, SFX_Poisoned_3_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index eccf0ee5..1e0f95f5 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_1_Ch1: +SFX_Pokedex_Rating_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1: endchannel -SFX_Pokedex_Rating_1_Ch2: +SFX_Pokedex_Rating_1_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2: endchannel -SFX_Pokedex_Rating_1_Ch3: +SFX_Pokedex_Rating_1_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index ec82888e..01ac0e1c 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_3_Ch1: +SFX_Pokedex_Rating_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1: endchannel -SFX_Pokedex_Rating_3_Ch2: +SFX_Pokedex_Rating_3_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2: endchannel -SFX_Pokedex_Rating_3_Ch3: +SFX_Pokedex_Rating_3_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index cf61a6ee..272c114f 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch1: +SFX_Pokeflute_Ch2: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch1_ch2.asm deleted file mode 100755 index 84631bca..00000000 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_08_PokeFlute_Ch1: - tempo 256 - - -SFX_08_PokeFlute_Ch2: - executemusic - notetype 8, 0, 0 - rest 5 - rest 7 - rest 5 - rest 5 - rest 5 - rest 5 - endchannel diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm deleted file mode 100755 index 3c883462..00000000 --- a/audio/sfx/pokeflute_ch3.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_PokeFlute_Ch3: - executemusic - vibrato 16, 1, 4 - notetype 8, 1, 0 - octave 5 - E_ 3 - F_ 3 - G_ 7 - A_ 3 - G_ 3 - octave 6 - C_ 13 - endchannel diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm new file mode 100755 index 00000000..146488d8 --- /dev/null +++ b/audio/sfx/pokeflute_ch4_ch5.asm @@ -0,0 +1,14 @@ +SFX_08_PokeFlute_Ch4: + tempo 256 + + +SFX_08_PokeFlute_Ch5: + executemusic + notetype 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + endchannel diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm new file mode 100755 index 00000000..4d4e5bae --- /dev/null +++ b/audio/sfx/pokeflute_ch6.asm @@ -0,0 +1,13 @@ +SFX_08_PokeFlute_Ch6: + executemusic + vibrato 16, 1, 4 + notetype 8, 1, 0 + octave 5 + E_ 3 + F_ 3 + G_ 7 + A_ 3 + G_ 3 + octave 6 + C_ 13 + endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index f70f6725..fc6d292e 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: +SFX_Pound_Ch7: unknownnoise0x20 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index f68a6384..95edbf4a 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_1_Ch1: +SFX_Press_AB_1_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 83b5ccd6..0d8faa46 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_2_Ch1: +SFX_Press_AB_2_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 167c0fb1..0f11fc34 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_3_Ch1: +SFX_Press_AB_3_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 893d4334..12a1b6fc 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch1: +SFX_Psybeam_Ch4: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_Psybeam_Ch1 + loopchannel 4, SFX_Psybeam_Ch4 unknownsfx0x20 10, 241, 64, 6 endchannel -SFX_Psybeam_Ch2: +SFX_Psybeam_Ch5: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_Psybeam_Ch2 + loopchannel 4, SFX_Psybeam_Ch5 unknownsfx0x20 10, 241, 113, 5 endchannel -SFX_Psybeam_Ch3: +SFX_Psybeam_Ch7: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_Psybeam_Ch3 + loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index abaa8345..2bbde2f1 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_Psychic_M_Ch1: +SFX_Psychic_M_Ch4: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1: endchannel -SFX_Psychic_M_Ch2: +SFX_Psychic_M_Ch5: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2: endchannel -SFX_Psychic_M_Ch3: +SFX_Psychic_M_Ch7: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 767035ea..1c9490a2 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,11 +1,11 @@ -SFX_Purchase_1_Ch1: +SFX_Purchase_1_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_1_Ch2: +SFX_Purchase_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 65a22527..78929c27 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,11 +1,11 @@ -SFX_Purchase_3_Ch1: +SFX_Purchase_3_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_3_Ch2: +SFX_Purchase_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index cf43bbcf..86035278 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_1_Ch1: +SFX_Push_Boulder_1_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index 9f536964..ecaeb768 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_3_Ch1: +SFX_Push_Boulder_3_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 656d3d01..81d01467 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_Run_Ch1: +SFX_Run_Ch7: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index d385feb3..f898def0 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_Safari_Zone_PA_Ch1: +SFX_Safari_Zone_PA_Ch4: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 13cb46e5..afb1f13a 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_Save_1_Ch1: +SFX_Save_1_Ch4: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_Save_1_Ch1: endchannel -SFX_Save_1_Ch2: +SFX_Save_1_Ch5: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index ad049ec6..083e77c8 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_Save_3_Ch1: +SFX_Save_3_Ch4: duty 2 IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 @@ -16,7 +16,7 @@ ENDC endchannel -SFX_Save_3_Ch2: +SFX_Save_3_Ch5: duty 2 IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index f8b8e285..f9b03feb 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_Shooting_Star_Ch1: +SFX_Shooting_Star_Ch4: dutycycle 228 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index d69d60de..54731535 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_Shrink_1_Ch1: +SFX_Shrink_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index e5c4b7af..b03cbe55 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_Shrink_3_Ch1: +SFX_Shrink_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ad789af2..ee238262 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch1: +SFX_Silph_Scope_Ch4: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d29529e9..ae1a6d90 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_Slots_New_Spin_Ch1: +SFX_Slots_New_Spin_Ch4: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1: endchannel -SFX_Slots_New_Spin_Ch2: +SFX_Slots_New_Spin_Ch5: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index d7833f55..6923ac71 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,4 +1,4 @@ -SFX_Slots_Reward_Ch1: +SFX_Slots_Reward_Ch4: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 00641a5e..85d73daf 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,4 +1,4 @@ -SFX_Slots_Stop_Wheel_Ch1: +SFX_Slots_Stop_Wheel_Ch4: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 9f7b4138..aae0ef28 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch1: +SFX_Snare1_1_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 55fdf84a..e5013081 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch1: +SFX_Snare1_2_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index cab603c1..4ffffa7f 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch1: +SFX_Snare1_3_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index e40facb5..286e397a 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch1: +SFX_Snare2_1_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 82deb096..a3718612 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch1: +SFX_Snare2_2_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index fb5e1672..67f8c7fb 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch1: +SFX_Snare2_3_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index c2b20add..686b4561 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch1: +SFX_Snare3_1_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 16f87fc5..f8236d40 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch1: +SFX_Snare3_2_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index 6b9a006f..3b52bac9 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch1: +SFX_Snare3_3_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 2796410c..35d58dba 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch1: +SFX_Snare4_1_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index 920321ab..713f8996 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch1: +SFX_Snare4_2_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index a47c332c..231193e1 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch1: +SFX_Snare4_3_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index dd4eab3a..54106d58 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_Snare5_1_Ch1: +SFX_Snare5_1_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index fad74021..f7f55eb5 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_Snare5_2_Ch1: +SFX_Snare5_2_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index d0ca1d91..76dc3966 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_Snare5_3_Ch1: +SFX_Snare5_3_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 74bf01c7..97c0241d 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch1: +SFX_Snare6_1_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 0a96680e..797d5518 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch1: +SFX_Snare6_2_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index f3130931..28fc695a 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch1: +SFX_Snare6_3_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index ef8f80ab..1b54eefa 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch1: +SFX_Snare7_1_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 5e266b12..e480f87f 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch1: +SFX_Snare7_2_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 26db3703..b57dfc13 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch1: +SFX_Snare7_3_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 5f624177..1a0f74a3 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch1: +SFX_Snare8_1_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index cf5d5654..87619598 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch1: +SFX_Snare8_2_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 7da0e415..54076c8e 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch1: +SFX_Snare8_3_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index c511cdaf..6923bb09 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch1: +SFX_Snare9_1_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index db9aecf9..308ae7f6 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch1: +SFX_Snare9_2_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 18df2e46..ffbdc454 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch1: +SFX_Snare9_3_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 66c95262..38407f24 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_1_Ch1: +SFX_SS_Anne_Horn_1_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1: endchannel -SFX_SS_Anne_Horn_1_Ch2: +SFX_SS_Anne_Horn_1_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 070f111c..3162f664 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_3_Ch1: +SFX_SS_Anne_Horn_3_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1: endchannel -SFX_SS_Anne_Horn_3_Ch2: +SFX_SS_Anne_Horn_3_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index f509326c..3a979b44 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: +SFX_Start_Menu_1_Ch7: 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 index 92bb7558..2706f555 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: +SFX_Start_Menu_2_Ch7: 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 index 74c82cf3..4b16cea4 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: +SFX_Start_Menu_3_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 70d7014a..63ba35e8 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: +SFX_Super_Effective_Ch7: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 782dd3fb..95a31fcd 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,10 +1,10 @@ -SFX_Swap_1_Ch1: +SFX_Swap_1_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_1_Ch2: +SFX_Swap_1_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 4fc1db1d..6ed97d7d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,10 +1,10 @@ -SFX_Swap_3_Ch1: +SFX_Swap_3_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_3_Ch2: +SFX_Swap_3_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ac9fb680..ee15dc20 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_Switch_1_Ch1: +SFX_Switch_1_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 81b68d26..d98a7f29 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_Switch_3_Ch1: +SFX_Switch_3_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 0522ee16..60c87cab 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_1_Ch1: +SFX_Teleport_Enter1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 6518e416..d3dab8b4 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_3_Ch1: +SFX_Teleport_Enter1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 338c1c30..53eb3335 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_1_Ch1: +SFX_Teleport_Enter2_1_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index f6cd103c..8b7c7894 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_3_Ch1: +SFX_Teleport_Enter2_3_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index f916d539..084c116f 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_1_Ch1: +SFX_Teleport_Exit1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 67739bd1..b3a26af8 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_3_Ch1: +SFX_Teleport_Exit1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 1e1de5a5..4b168bb9 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_1_Ch1: +SFX_Teleport_Exit2_1_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 928e486e..171e59d8 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_3_Ch1: +SFX_Teleport_Exit2_3_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index e6eff9ac..c1f5f00c 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_Tink_1_Ch1: +SFX_Tink_1_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index fa06cf19..bab45323 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_Tink_2_Ch1: +SFX_Tink_2_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index d786d289..a9cf73ec 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_Tink_3_Ch1: +SFX_Tink_3_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 87993851..2f67936b 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_1_Ch1: +SFX_Trade_Machine_1_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 6b70d5da..b590455e 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_3_Ch1: +SFX_Trade_Machine_3_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 94b61fe1..957dc63f 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch1: +SFX_Triangle1_1_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 1c9c1d29..535448cd 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch1: +SFX_Triangle1_2_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index b900da7c..a13d00ea 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch1: +SFX_Triangle1_3_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 0f648237..09ba8a67 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch1: +SFX_Triangle2_1_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index cbc2a642..6512648a 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch1: +SFX_Triangle2_2_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index 44fc95dd..b0612aba 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch1: +SFX_Triangle2_3_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index f5622bd7..9fd3952f 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch1: +SFX_Triangle3_1_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 8b0b76e5..38b3198b 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch1: +SFX_Triangle3_2_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index d40779fb..138c8fac 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch1: +SFX_Triangle3_3_Ch7: 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 index ca29a4cc..6b2561fe 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_1_Ch1: +SFX_Turn_Off_PC_1_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 2ae0787b..cf6d95cd 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_3_Ch1: +SFX_Turn_Off_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 22433707..dede7c3e 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_1_Ch1: +SFX_Turn_On_PC_1_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index d97dc1c7..1ed54d3c 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_3_Ch1: +SFX_Turn_On_PC_3_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 7e0350d4..36c10ba3 100755 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: +SFX_08_unused2_Ch4: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: endchannel -SFX_08_unused2_Ch2: +SFX_08_unused2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: endchannel -SFX_08_unused2_Ch3: +SFX_08_unused2_Ch6: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index d0bbfd59..21d54fb1 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: +SFX_02_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: endchannel -SFX_02_unused_Ch2: +SFX_02_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: endchannel -SFX_02_unused_Ch3: +SFX_02_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index fd491b71..20de851f 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: +SFX_08_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: endchannel -SFX_08_unused_Ch2: +SFX_08_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: endchannel -SFX_08_unused_Ch3: +SFX_08_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index b00e55f5..d4a30539 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: +SFX_1f_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: endchannel -SFX_1f_unused_Ch2: +SFX_1f_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: endchannel -SFX_1f_unused_Ch3: +SFX_1f_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index a8445131..ad0bd40b 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_Vine_Whip_Ch1: +SFX_Vine_Whip_Ch7: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 59827ceb..d7a2f54d 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_1_Ch1: +SFX_Withdraw_Deposit_1_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 0add48e1..1fd1fe3e 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_3_Ch1: +SFX_Withdraw_Deposit_3_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 -- cgit v1.2.3 From 9984527c2c40cf3e08625098c5ad353f0daaf554 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 20:19:59 -0500 Subject: Fix music channel numbering same as previous, but for songs instead of sound effects --- audio/headers/musicheaders1.asm | 138 +++++++++++++++++++------------------- audio/headers/musicheaders2.asm | 42 ++++++------ audio/headers/musicheaders3.asm | 120 ++++++++++++++++----------------- audio/music/bikeriding.asm | 8 +-- audio/music/celadon.asm | 6 +- audio/music/cinnabar.asm | 6 +- audio/music/cinnabarmansion.asm | 8 +-- audio/music/cities1.asm | 12 ++-- audio/music/cities2.asm | 6 +- audio/music/credits.asm | 6 +- audio/music/defeatedgymleader.asm | 6 +- audio/music/defeatedtrainer.asm | 6 +- audio/music/defeatedwildmon.asm | 6 +- audio/music/dungeon1.asm | 8 +-- audio/music/dungeon2.asm | 8 +-- audio/music/dungeon3.asm | 10 +-- audio/music/finalbattle.asm | 6 +- audio/music/gamecorner.asm | 6 +- audio/music/gym.asm | 6 +- audio/music/gymleaderbattle.asm | 6 +- audio/music/halloffame.asm | 8 +-- audio/music/indigoplateau.asm | 8 +-- audio/music/introbattle.asm | 8 +-- audio/music/jigglypuffsong.asm | 4 +- audio/music/lavender.asm | 8 +-- audio/music/meeteviltrainer.asm | 6 +- audio/music/meetfemaletrainer.asm | 6 +- audio/music/meetmaletrainer.asm | 6 +- audio/music/meetprofoak.asm | 6 +- audio/music/meetrival.asm | 6 +- audio/music/museumguy.asm | 8 +-- audio/music/oakslab.asm | 6 +- audio/music/pallettown.asm | 6 +- audio/music/pkmnhealed.asm | 6 +- audio/music/pokecenter.asm | 6 +- audio/music/pokemontower.asm | 6 +- audio/music/routes1.asm | 10 +-- audio/music/routes2.asm | 10 +-- audio/music/routes3.asm | 8 +-- audio/music/routes4.asm | 8 +-- audio/music/safarizone.asm | 6 +- audio/music/silphco.asm | 6 +- audio/music/ssanne.asm | 8 +-- audio/music/surfing.asm | 6 +- audio/music/titlescreen.asm | 8 +-- audio/music/trainerbattle.asm | 6 +- audio/music/unusedsong.asm | 4 +- audio/music/vermilion.asm | 8 +-- audio/music/wildbattle.asm | 6 +- 49 files changed, 309 insertions(+), 309 deletions(-) diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 5a762b30..68807104 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,184 +1,184 @@ Music_PalletTown:: db ( $80 | CH0 ) - dw Music_PalletTown_Ch1 + dw Music_PalletTown_Ch0 db CH1 - dw Music_PalletTown_Ch2 + dw Music_PalletTown_Ch1 db CH2 - dw Music_PalletTown_Ch3 + dw Music_PalletTown_Ch2 Music_Pokecenter:: db ( $80 | CH0 ) - dw Music_Pokecenter_Ch1 + dw Music_Pokecenter_Ch0 db CH1 - dw Music_Pokecenter_Ch2 + dw Music_Pokecenter_Ch1 db CH2 - dw Music_Pokecenter_Ch3 + dw Music_Pokecenter_Ch2 Music_Gym:: db ( $80 | CH0 ) - dw Music_Gym_Ch1 + dw Music_Gym_Ch0 db CH1 - dw Music_Gym_Ch2 + dw Music_Gym_Ch1 db CH2 - dw Music_Gym_Ch3 + dw Music_Gym_Ch2 ; Viridian City, Pewter City, Saffron City Music_Cities1:: db ( $C0 | CH0 ) - dw Music_Cities1_Ch1 + dw Music_Cities1_Ch0 db CH1 - dw Music_Cities1_Ch2 + dw Music_Cities1_Ch1 db CH2 - dw Music_Cities1_Ch3 + dw Music_Cities1_Ch2 db CH3 - dw Music_Cities1_Ch4 + dw Music_Cities1_Ch3 ; Cerulean City, Fuchsia City Music_Cities2:: db ( $80 | CH0 ) - dw Music_Cities2_Ch1 + dw Music_Cities2_Ch0 db CH1 - dw Music_Cities2_Ch2 + dw Music_Cities2_Ch1 db CH2 - dw Music_Cities2_Ch3 + dw Music_Cities2_Ch2 Music_Celadon:: db ( $80 | CH0 ) - dw Music_Celadon_Ch1 + dw Music_Celadon_Ch0 db CH1 - dw Music_Celadon_Ch2 + dw Music_Celadon_Ch1 db CH2 - dw Music_Celadon_Ch3 + dw Music_Celadon_Ch2 Music_Cinnabar:: db ( $80 | CH0 ) - dw Music_Cinnabar_Ch1 + dw Music_Cinnabar_Ch0 db CH1 - dw Music_Cinnabar_Ch2 + dw Music_Cinnabar_Ch1 db CH2 - dw Music_Cinnabar_Ch3 + dw Music_Cinnabar_Ch2 Music_Vermilion:: db ( $C0 | CH0 ) - dw Music_Vermilion_Ch1 + dw Music_Vermilion_Ch0 db CH1 - dw Music_Vermilion_Ch2 + dw Music_Vermilion_Ch1 db CH2 - dw Music_Vermilion_Ch3 + dw Music_Vermilion_Ch2 db CH3 - dw Music_Vermilion_Ch4 + dw Music_Vermilion_Ch3 Music_Lavender:: db ( $C0 | CH0 ) - dw Music_Lavender_Ch1 + dw Music_Lavender_Ch0 db CH1 - dw Music_Lavender_Ch2 + dw Music_Lavender_Ch1 db CH2 - dw Music_Lavender_Ch3 + dw Music_Lavender_Ch2 db CH3 - dw Music_Lavender_Ch4 + dw Music_Lavender_Ch3 Music_SSAnne:: db ( $80 | CH0 ) - dw Music_SSAnne_Ch1 + dw Music_SSAnne_Ch0 db CH1 - dw Music_SSAnne_Ch2 + dw Music_SSAnne_Ch1 db CH2 - dw Music_SSAnne_Ch3 + dw Music_SSAnne_Ch2 Music_MeetProfOak:: db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch1 + dw Music_MeetProfOak_Ch0 db CH1 - dw Music_MeetProfOak_Ch2 + dw Music_MeetProfOak_Ch1 db CH2 - dw Music_MeetProfOak_Ch3 + dw Music_MeetProfOak_Ch2 Music_MeetRival:: db ( $80 | CH0 ) - dw Music_MeetRival_Ch1 + dw Music_MeetRival_Ch0 db CH1 - dw Music_MeetRival_Ch2 + dw Music_MeetRival_Ch1 db CH2 - dw Music_MeetRival_Ch3 + dw Music_MeetRival_Ch2 Music_MuseumGuy:: db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch1 + dw Music_MuseumGuy_Ch0 db CH1 - dw Music_MuseumGuy_Ch2 + dw Music_MuseumGuy_Ch1 db CH2 - dw Music_MuseumGuy_Ch3 + dw Music_MuseumGuy_Ch2 db CH3 - dw Music_MuseumGuy_Ch4 + dw Music_MuseumGuy_Ch3 Music_SafariZone:: db ( $80 | CH0 ) - dw Music_SafariZone_Ch1 + dw Music_SafariZone_Ch0 db CH1 - dw Music_SafariZone_Ch2 + dw Music_SafariZone_Ch1 db CH2 - dw Music_SafariZone_Ch3 + dw Music_SafariZone_Ch2 Music_PkmnHealed:: db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch1 + dw Music_PkmnHealed_Ch0 db CH1 - dw Music_PkmnHealed_Ch2 + dw Music_PkmnHealed_Ch1 db CH2 - dw Music_PkmnHealed_Ch3 + dw Music_PkmnHealed_Ch2 ; Routes 1 and 2 Music_Routes1:: db ( $C0 | CH0 ) - dw Music_Routes1_Ch1 + dw Music_Routes1_Ch0 db CH1 - dw Music_Routes1_Ch2 + dw Music_Routes1_Ch1 db CH2 - dw Music_Routes1_Ch3 + dw Music_Routes1_Ch2 db CH3 - dw Music_Routes1_Ch4 + dw Music_Routes1_Ch3 ; Routes 24 and 25 Music_Routes2:: db ( $C0 | CH0 ) - dw Music_Routes2_Ch1 + dw Music_Routes2_Ch0 db CH1 - dw Music_Routes2_Ch2 + dw Music_Routes2_Ch1 db CH2 - dw Music_Routes2_Ch3 + dw Music_Routes2_Ch2 db CH3 - dw Music_Routes2_Ch4 + dw Music_Routes2_Ch3 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: db ( $C0 | CH0 ) - dw Music_Routes3_Ch1 + dw Music_Routes3_Ch0 db CH1 - dw Music_Routes3_Ch2 + dw Music_Routes3_Ch1 db CH2 - dw Music_Routes3_Ch3 + dw Music_Routes3_Ch2 db CH3 - dw Music_Routes3_Ch4 + dw Music_Routes3_Ch3 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: db ( $C0 | CH0 ) - dw Music_Routes4_Ch1 + dw Music_Routes4_Ch0 db CH1 - dw Music_Routes4_Ch2 + dw Music_Routes4_Ch1 db CH2 - dw Music_Routes4_Ch3 + dw Music_Routes4_Ch2 db CH3 - dw Music_Routes4_Ch4 + dw Music_Routes4_Ch3 ; Route 23, Indigo Plateau Music_IndigoPlateau:: db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch1 + dw Music_IndigoPlateau_Ch0 db CH1 - dw Music_IndigoPlateau_Ch2 + dw Music_IndigoPlateau_Ch1 db CH2 - dw Music_IndigoPlateau_Ch3 + dw Music_IndigoPlateau_Ch2 db CH3 - dw Music_IndigoPlateau_Ch4 + dw Music_IndigoPlateau_Ch3 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 8adc039a..9e2be3ec 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,55 +1,55 @@ Music_GymLeaderBattle:: db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch1 + dw Music_GymLeaderBattle_Ch0 db CH1 - dw Music_GymLeaderBattle_Ch2 + dw Music_GymLeaderBattle_Ch1 db CH2 - dw Music_GymLeaderBattle_Ch3 + dw Music_GymLeaderBattle_Ch2 Music_TrainerBattle:: db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch1 + dw Music_TrainerBattle_Ch0 db CH1 - dw Music_TrainerBattle_Ch2 + dw Music_TrainerBattle_Ch1 db CH2 - dw Music_TrainerBattle_Ch3 + dw Music_TrainerBattle_Ch2 Music_WildBattle:: db ( $80 | CH0 ) - dw Music_WildBattle_Ch1 + dw Music_WildBattle_Ch0 db CH1 - dw Music_WildBattle_Ch2 + dw Music_WildBattle_Ch1 db CH2 - dw Music_WildBattle_Ch3 + dw Music_WildBattle_Ch2 Music_FinalBattle:: db ( $80 | CH0 ) - dw Music_FinalBattle_Ch1 + dw Music_FinalBattle_Ch0 db CH1 - dw Music_FinalBattle_Ch2 + dw Music_FinalBattle_Ch1 db CH2 - dw Music_FinalBattle_Ch3 + dw Music_FinalBattle_Ch2 Music_DefeatedTrainer:: db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch1 + dw Music_DefeatedTrainer_Ch0 db CH1 - dw Music_DefeatedTrainer_Ch2 + dw Music_DefeatedTrainer_Ch1 db CH2 - dw Music_DefeatedTrainer_Ch3 + dw Music_DefeatedTrainer_Ch2 Music_DefeatedWildMon:: db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch1 + dw Music_DefeatedWildMon_Ch0 db CH1 - dw Music_DefeatedWildMon_Ch2 + dw Music_DefeatedWildMon_Ch1 db CH2 - dw Music_DefeatedWildMon_Ch3 + dw Music_DefeatedWildMon_Ch2 Music_DefeatedGymLeader:: db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch1 + dw Music_DefeatedGymLeader_Ch0 db CH1 - dw Music_DefeatedGymLeader_Ch2 + dw Music_DefeatedGymLeader_Ch1 db CH2 - dw Music_DefeatedGymLeader_Ch3 + dw Music_DefeatedGymLeader_Ch2 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 1c54b266..09404e2d 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,158 +1,158 @@ Music_TitleScreen:: db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch1 + dw Music_TitleScreen_Ch0 db CH1 - dw Music_TitleScreen_Ch2 + dw Music_TitleScreen_Ch1 db CH2 - dw Music_TitleScreen_Ch3 + dw Music_TitleScreen_Ch2 db CH3 - dw Music_TitleScreen_Ch4 + dw Music_TitleScreen_Ch3 Music_Credits:: db ( $80 | CH0 ) - dw Music_Credits_Ch1 + dw Music_Credits_Ch0 db CH1 - dw Music_Credits_Ch2 + dw Music_Credits_Ch1 db CH2 - dw Music_Credits_Ch3 + dw Music_Credits_Ch2 Music_HallOfFame:: db ( $80 | CH0 ) - dw Music_HallOfFame_Ch1 + dw Music_HallOfFame_Ch0 db CH1 - dw Music_HallOfFame_Ch2 + dw Music_HallOfFame_Ch1 db CH2 - dw Music_HallOfFame_Ch3 + dw Music_HallOfFame_Ch2 Music_OaksLab:: db ( $80 | CH0 ) - dw Music_OaksLab_Ch1 + dw Music_OaksLab_Ch0 db CH1 - dw Music_OaksLab_Ch2 + dw Music_OaksLab_Ch1 db CH2 - dw Music_OaksLab_Ch3 + dw Music_OaksLab_Ch2 Music_JigglypuffSong:: db $40 - dw Music_JigglypuffSong_Ch1 + dw Music_JigglypuffSong_Ch0 db CH1 - dw Music_JigglypuffSong_Ch2 + dw Music_JigglypuffSong_Ch1 Music_BikeRiding:: db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch1 + dw Music_BikeRiding_Ch0 db CH1 - dw Music_BikeRiding_Ch2 + dw Music_BikeRiding_Ch1 db CH2 - dw Music_BikeRiding_Ch3 + dw Music_BikeRiding_Ch2 db CH3 - dw Music_BikeRiding_Ch4 + dw Music_BikeRiding_Ch3 Music_Surfing:: db ( $80 | CH0 ) - dw Music_Surfing_Ch1 + dw Music_Surfing_Ch0 db CH1 - dw Music_Surfing_Ch2 + dw Music_Surfing_Ch1 db CH2 - dw Music_Surfing_Ch3 + dw Music_Surfing_Ch2 Music_GameCorner:: db ( $80 | CH0 ) - dw Music_GameCorner_Ch1 + dw Music_GameCorner_Ch0 db CH1 - dw Music_GameCorner_Ch2 + dw Music_GameCorner_Ch1 db CH2 - dw Music_GameCorner_Ch3 + dw Music_GameCorner_Ch2 Music_IntroBattle:: db ( $C0 | CH0 ) - dw Music_IntroBattle_Ch1 + dw Music_IntroBattle_Ch0 db CH1 - dw Music_IntroBattle_Ch2 + dw Music_IntroBattle_Ch1 db CH2 - dw Music_IntroBattle_Ch3 + dw Music_IntroBattle_Ch2 db CH3 - dw Music_IntroBattle_Ch4 + dw Music_IntroBattle_Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch1 + dw Music_Dungeon1_Ch0 db CH1 - dw Music_Dungeon1_Ch2 + dw Music_Dungeon1_Ch1 db CH2 - dw Music_Dungeon1_Ch3 + dw Music_Dungeon1_Ch2 db CH3 - dw Music_Dungeon1_Ch4 + dw Music_Dungeon1_Ch3 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch1 + dw Music_Dungeon2_Ch0 db CH1 - dw Music_Dungeon2_Ch2 + dw Music_Dungeon2_Ch1 db CH2 - dw Music_Dungeon2_Ch3 + dw Music_Dungeon2_Ch2 db CH3 - dw Music_Dungeon2_Ch4 + dw Music_Dungeon2_Ch3 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch1 + dw Music_Dungeon3_Ch0 db CH1 - dw Music_Dungeon3_Ch2 + dw Music_Dungeon3_Ch1 db CH2 - dw Music_Dungeon3_Ch3 + dw Music_Dungeon3_Ch2 db CH3 - dw Music_Dungeon3_Ch4 + dw Music_Dungeon3_Ch3 Music_CinnabarMansion:: db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch1 + dw Music_CinnabarMansion_Ch0 db CH1 - dw Music_CinnabarMansion_Ch2 + dw Music_CinnabarMansion_Ch1 db CH2 - dw Music_CinnabarMansion_Ch3 + dw Music_CinnabarMansion_Ch2 db CH3 - dw Music_CinnabarMansion_Ch4 + dw Music_CinnabarMansion_Ch3 Music_PokemonTower:: db ( $80 | CH0 ) - dw Music_PokemonTower_Ch1 + dw Music_PokemonTower_Ch0 db CH1 - dw Music_PokemonTower_Ch2 + dw Music_PokemonTower_Ch1 db CH2 - dw Music_PokemonTower_Ch3 + dw Music_PokemonTower_Ch2 Music_SilphCo:: db ( $80 | CH0 ) - dw Music_SilphCo_Ch1 + dw Music_SilphCo_Ch0 db CH1 - dw Music_SilphCo_Ch2 + dw Music_SilphCo_Ch1 db CH2 - dw Music_SilphCo_Ch3 + dw Music_SilphCo_Ch2 Music_MeetEvilTrainer:: db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch1 + dw Music_MeetEvilTrainer_Ch0 db CH1 - dw Music_MeetEvilTrainer_Ch2 + dw Music_MeetEvilTrainer_Ch1 db CH2 - dw Music_MeetEvilTrainer_Ch3 + dw Music_MeetEvilTrainer_Ch2 Music_MeetFemaleTrainer:: db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch1 + dw Music_MeetFemaleTrainer_Ch0 db CH1 - dw Music_MeetFemaleTrainer_Ch2 + dw Music_MeetFemaleTrainer_Ch1 db CH2 - dw Music_MeetFemaleTrainer_Ch3 + dw Music_MeetFemaleTrainer_Ch2 Music_MeetMaleTrainer:: db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch1 + dw Music_MeetMaleTrainer_Ch0 db CH1 - dw Music_MeetMaleTrainer_Ch2 + dw Music_MeetMaleTrainer_Ch1 db CH2 - dw Music_MeetMaleTrainer_Ch3 + dw Music_MeetMaleTrainer_Ch2 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index b5378a94..87c7b5c2 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,4 +1,4 @@ -Music_BikeRiding_Ch1:: +Music_BikeRiding_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9:: loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2:: +Music_BikeRiding_Ch1:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 3 @@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75:: loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3:: +Music_BikeRiding_Ch2:: notetype 12, 1, 3 rest 2 @@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17:: loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4:: +Music_BikeRiding_Ch3:: dspeed 12 rest 2 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 3f015d8d..a1699301 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,4 +1,4 @@ -Music_Celadon_Ch1:: +Music_Celadon_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4:: loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2:: +Music_Celadon_Ch1:: duty 3 notetype 12, 12, 2 octave 4 @@ -226,7 +226,7 @@ Music_Celadon_branch_b74a:: loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3:: +Music_Celadon_Ch2:: notetype 12, 1, 3 rest 8 octave 5 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index 4fe93c31..c6b3564d 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,4 +1,4 @@ -Music_Cinnabar_Ch1:: +Music_Cinnabar_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878:: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2:: +Music_Cinnabar_Ch1:: duty 3 vibrato 10, 2, 3 @@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9:: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3:: +Music_Cinnabar_Ch2:: notetype 12, 1, 0 Music_Cinnabar_branch_b93f:: diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 438c2f18..bb54a456 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,4 +1,4 @@ -Music_CinnabarMansion_Ch1:: +Music_CinnabarMansion_Ch0:: tempo 144 volume 7, 7 vibrato 11, 2, 5 @@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19:: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2:: +Music_CinnabarMansion_Ch1:: duty 2 toggleperfectpitch vibrato 10, 2, 4 @@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c:: endchannel -Music_CinnabarMansion_Ch3:: +Music_CinnabarMansion_Ch2:: notetype 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: @@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80:: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4:: +Music_CinnabarMansion_Ch3:: dspeed 6 rest 16 rest 16 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index eb9ccde5..984202f6 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1:: +Music_Cities1_Ch0:: tempo 144 Music_Cities1_branch_aa79:: @@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a:: endchannel -Music_Cities1_Ch2:: +Music_Cities1_Ch1:: vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 @@ -357,7 +357,7 @@ Music_Cities1_Ch2:: G# 1 notetype 12, 10, 4 A_ 1 - loopchannel 0, Music_Cities1_Ch2 + loopchannel 0, Music_Cities1_Ch1 Music_Cities1_branch_ac00:: duty 2 @@ -401,7 +401,7 @@ Music_Cities1_branch_ac00:: endchannel -Music_Cities1_Ch3:: +Music_Cities1_Ch2:: notetype 12, 1, 1 toggleperfectpitch @@ -579,7 +579,7 @@ Music_Cities1_branch_acce:: endchannel -Music_Cities1_Ch4:: +Music_Cities1_Ch3:: dspeed 12 callchannel Music_Cities1_branch_ad36 @@ -609,7 +609,7 @@ Music_Cities1_branch_acf3:: triangle1 6 snare6 6 snare6 4 - loopchannel 0, Music_Cities1_Ch4 + loopchannel 0, Music_Cities1_Ch3 Music_Cities1_branch_ad36:: snare6 6 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 897fb8c9..fb167999 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,4 +1,4 @@ -Music_Cities2_Ch1:: +Music_Cities2_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -94,7 +94,7 @@ Music_Cities2_branch_b51a:: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2:: +Music_Cities2_Ch1:: duty 3 vibrato 8, 2, 3 notetype 12, 12, 2 @@ -280,7 +280,7 @@ Music_Cities2_branch_b58b:: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3:: +Music_Cities2_Ch2:: notetype 12, 1, 1 rest 16 octave 4 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index d9a5ec35..f092326b 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1:: +Music_Credits_Ch0:: tempo 140 volume 7, 7 duty 3 @@ -284,7 +284,7 @@ Music_Credits_Ch1:: endchannel -Music_Credits_Ch2:: +Music_Credits_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 5 @@ -574,7 +574,7 @@ Music_Credits_Ch2:: endchannel -Music_Credits_Ch3:: +Music_Credits_Ch2:: notetype 12, 1, 0 octave 5 C# 6 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 7f0d046d..1ea6c1ff 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,4 +1,4 @@ -Music_DefeatedGymLeader_Ch1:: +Music_DefeatedGymLeader_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc:: loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2:: +Music_DefeatedGymLeader_Ch1:: duty 2 vibrato 24, 2, 4 notetype 12, 12, 4 @@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84:: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3:: +Music_DefeatedGymLeader_Ch2:: notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 8ad51afa..87c5d2c9 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,4 +1,4 @@ -Music_DefeatedTrainer_Ch1:: +Music_DefeatedTrainer_Ch0:: tempo 224 volume 7, 7 duty 2 @@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76:: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2:: +Music_DefeatedTrainer_Ch1:: duty 2 notetype 4, 12, 3 octave 4 @@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2:: loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3:: +Music_DefeatedTrainer_Ch2:: notetype 4, 1, 0 octave 5 D_ 2 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 92326a84..ea3f733f 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1:: +Music_DefeatedWildMon_Ch0:: tempo 112 volume 7, 7 executemusic @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b:: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2:: +Music_DefeatedWildMon_Ch1:: executemusic duty 2 notetype 12, 12, 3 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce:: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3:: +Music_DefeatedWildMon_Ch2:: executemusic notetype 12, 2, 0 octave 5 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c84fc694..c6f6b105 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,4 +1,4 @@ -Music_Dungeon1_Ch1:: +Music_Dungeon1_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5:: endchannel -Music_Dungeon1_Ch2:: +Music_Dungeon1_Ch1:: vibrato 11, 1, 5 duty 3 notetype 12, 0, 15 @@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd:: endchannel -Music_Dungeon1_Ch3:: +Music_Dungeon1_Ch2:: notetype 12, 1, 1 vibrato 8, 2, 6 rest 14 @@ -596,7 +596,7 @@ Music_Dungeon1_branch_7e177:: endchannel -Music_Dungeon1_Ch4:: +Music_Dungeon1_Ch3:: dspeed 12 rest 14 cymbal1 1 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 44e9d5bf..d5f459fb 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,4 +1,4 @@ -Music_Dungeon2_Ch1:: +Music_Dungeon2_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892:: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2:: +Music_Dungeon2_Ch1:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: @@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db:: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3:: +Music_Dungeon2_Ch2:: notetype 12, 1, 3 vibrato 8, 2, 6 @@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1:: endchannel -Music_Dungeon2_Ch4:: +Music_Dungeon2_Ch3:: dspeed 12 Music_Dungeon2_branch_7e9dd:: diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 767ca626..f9742a26 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,4 +1,4 @@ -Music_Dungeon3_Ch1:: +Music_Dungeon3_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc:: endchannel -Music_Dungeon3_Ch2:: +Music_Dungeon3_Ch1:: vibrato 11, 1, 5 duty 3 @@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d:: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3:: +Music_Dungeon3_Ch2:: notetype 12, 1, 2 rest 16 rest 16 @@ -707,10 +707,10 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch3 + loopchannel 0, Music_Dungeon3_Ch2 -Music_Dungeon3_Ch4:: +Music_Dungeon3_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 9a13f00f..adb0f8b9 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,4 +1,4 @@ -Music_FinalBattle_Ch1:: +Music_FinalBattle_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429:: loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2:: +Music_FinalBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710:: endchannel -Music_FinalBattle_Ch3:: +Music_FinalBattle_Ch2:: notetype 12, 1, 1 octave 4 E_ 4 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 52b85e08..832bade6 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,4 +1,4 @@ -Music_GameCorner_Ch1:: +Music_GameCorner_Ch0:: tempo 120 volume 7, 7 duty 3 @@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222:: loopchannel 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch2:: +Music_GameCorner_Ch1:: duty 2 vibrato 10, 2, 3 notetype 12, 12, 6 @@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa:: loopchannel 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch3:: +Music_GameCorner_Ch2:: notetype 12, 1, 3 octave 5 C# 1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index b314336d..ad99bddd 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,4 +1,4 @@ -Music_Gym_Ch1:: +Music_Gym_Ch0:: tempo 138 volume 7, 7 duty 3 @@ -165,7 +165,7 @@ Music_Gym_branch_bcd8:: loopchannel 0, Music_Gym_branch_bcd8 -Music_Gym_Ch2:: +Music_Gym_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 7 @@ -288,7 +288,7 @@ Music_Gym_branch_bd82:: loopchannel 0, Music_Gym_branch_bd82 -Music_Gym_Ch3:: +Music_Gym_Ch2:: notetype 12, 1, 1 rest 16 rest 10 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 1eb2951d..6c1cffb5 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle_Ch1:: +Music_GymLeaderBattle_Ch0:: tempo 104 volume 7, 7 duty 3 @@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0:: loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2:: +Music_GymLeaderBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0:: loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3:: +Music_GymLeaderBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 3 rest 12 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 69f926f6..098c82c8 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,4 +1,4 @@ -Music_HallOfFame_Ch1:: +Music_HallOfFame_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5:: loopchannel 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch2:: +Music_HallOfFame_Ch1:: vibrato 8, 2, 5 duty 3 @@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf:: loopchannel 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch3:: +Music_HallOfFame_Ch2:: notetype 12, 1, 2 Music_HallOfFame_branch_7fbfe:: @@ -93,4 +93,4 @@ Music_HallOfFame_branch_7fbfe:: G_ 4 E_ 4 G_ 4 - loopchannel 0, Music_HallOfFame_Ch3 + loopchannel 0, Music_HallOfFame_Ch2 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 61623e39..f139775b 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,4 +1,4 @@ -Music_IndigoPlateau_Ch1:: +Music_IndigoPlateau_Ch0:: tempo 132 volume 7, 7 duty 3 @@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659:: endchannel -Music_IndigoPlateau_Ch2:: +Music_IndigoPlateau_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af:: endchannel -Music_IndigoPlateau_Ch3:: +Music_IndigoPlateau_Ch2:: notetype 12, 1, 0 octave 4 D_ 2 @@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe:: endchannel -Music_IndigoPlateau_Ch4:: +Music_IndigoPlateau_Ch3:: dspeed 6 mutedsnare2 16 mutedsnare2 16 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index fd4a8e35..2aad0d88 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,4 +1,4 @@ -Music_IntroBattle_Ch1:: +Music_IntroBattle_Ch0:: tempo 98 volume 7, 7 duty 3 @@ -90,7 +90,7 @@ Music_IntroBattle_Ch1:: endchannel -Music_IntroBattle_Ch2:: +Music_IntroBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -165,7 +165,7 @@ Music_IntroBattle_Ch2:: endchannel -Music_IntroBattle_Ch3:: +Music_IntroBattle_Ch2:: notetype 12, 1, 0 rest 8 octave 4 @@ -229,7 +229,7 @@ Music_IntroBattle_Ch3:: endchannel -Music_IntroBattle_Ch4:: +Music_IntroBattle_Ch3:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 9a01246b..0b791a30 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,4 +1,4 @@ -Music_JigglypuffSong_Ch1:: +Music_JigglypuffSong_Ch0:: tempo 144 volume 7, 7 vibrato 8, 2, 4 @@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1:: endchannel -Music_JigglypuffSong_Ch2:: +Music_JigglypuffSong_Ch1:: vibrato 5, 1, 5 duty 2 dutycycle 10 diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 7b60cc24..da58e489 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,4 +1,4 @@ -Music_Lavender_Ch1:: +Music_Lavender_Ch0:: tempo 152 volume 7, 7 duty 1 @@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b:: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2:: +Music_Lavender_Ch1:: vibrato 0, 3, 4 duty 3 notetype 12, 9, 1 @@ -76,7 +76,7 @@ Music_Lavender_branch_bba5:: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3:: +Music_Lavender_Ch2:: vibrato 4, 1, 1 notetype 12, 3, 5 rest 16 @@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9:: loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4:: +Music_Lavender_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 2378a03a..941b0c34 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,4 +1,4 @@ -Music_MeetEvilTrainer_Ch1:: +Music_MeetEvilTrainer_Ch0:: tempo 124 volume 7, 7 duty 2 @@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2:: +Music_MeetEvilTrainer_Ch1:: duty 1 notetype 12, 11, 6 octave 3 @@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3:: +Music_MeetEvilTrainer_Ch2:: notetype 12, 1, 0 rest 8 octave 4 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 0f24f99e..2a5659b4 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetFemaleTrainer_Ch1:: +Music_MeetFemaleTrainer_Ch0:: tempo 124 volume 7, 7 duty 1 @@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2:: +Music_MeetFemaleTrainer_Ch1:: duty 2 notetype 12, 12, 2 octave 3 @@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3:: +Music_MeetFemaleTrainer_Ch2:: notetype 12, 1, 0 rest 8 octave 5 diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 92047849..c13e40cb 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetMaleTrainer_Ch1:: +Music_MeetMaleTrainer_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f:: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2:: +Music_MeetMaleTrainer_Ch1:: duty 3 vibrato 24, 2, 2 notetype 12, 12, 4 @@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5:: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3:: +Music_MeetMaleTrainer_Ch2:: notetype 12, 1, 0 rest 6 octave 4 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 6532a187..5c6ea13d 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,4 +1,4 @@ -Music_MeetProfOak_Ch1:: +Music_MeetProfOak_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85:: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2:: +Music_MeetProfOak_Ch1:: vibrato 8, 1, 1 duty 2 notetype 12, 12, 4 @@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005:: loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3:: +Music_MeetProfOak_Ch2:: notetype 12, 1, 2 rest 10 octave 4 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 153523af..a6391247 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -2,7 +2,7 @@ Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1:: +Music_MeetRival_Ch0:: tempo 112 Music_MeetRival_branch_b123:: @@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5:: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2:: +Music_MeetRival_Ch1:: duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d:: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3:: +Music_MeetRival_Ch2:: notetype 12, 1, 4 octave 5 D_ 2 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index cb08fcf4..e41b37bd 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,4 +1,4 @@ -Music_MuseumGuy_Ch1:: +Music_MuseumGuy_Ch0:: tempo 128 volume 7, 7 duty 2 @@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec:: endchannel -Music_MuseumGuy_Ch2:: +Music_MuseumGuy_Ch1:: duty 2 notetype 12, 12, 1 octave 4 @@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26:: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3:: +Music_MuseumGuy_Ch2:: notetype 12, 1, 0 rest 16 octave 4 @@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1:: endchannel -Music_MuseumGuy_Ch4:: +Music_MuseumGuy_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 7214264c..87245350 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,4 +1,4 @@ -Music_OaksLab_Ch1:: +Music_OaksLab_Ch0:: tempo 140 volume 7, 7 duty 3 @@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0:: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2:: +Music_OaksLab_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 4 @@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16:: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3:: +Music_OaksLab_Ch2:: notetype 12, 1, 1 rest 2 octave 4 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 0c8b7dbc..5ad31f81 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,4 +1,4 @@ -Music_PalletTown_Ch1:: +Music_PalletTown_Ch0:: tempo 160 volume 7, 7 duty 2 @@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce:: endchannel -Music_PalletTown_Ch2:: +Music_PalletTown_Ch1:: duty 2 Music_PalletTown_branch_a861:: @@ -262,7 +262,7 @@ Music_PalletTown_branch_a861:: endchannel -Music_PalletTown_Ch3:: +Music_PalletTown_Ch2:: vibrato 24, 2, 8 notetype 12, 1, 2 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 2b7b545b..9d3cd3d0 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,4 +1,4 @@ -Music_PkmnHealed_Ch1:: +Music_PkmnHealed_Ch0:: tempo 144 volume 7, 7 duty 2 @@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1:: endchannel -Music_PkmnHealed_Ch2:: +Music_PkmnHealed_Ch1:: duty 2 notetype 12, 12, 3 octave 4 @@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2:: endchannel -Music_PkmnHealed_Ch3:: +Music_PkmnHealed_Ch2:: notetype 12, 1, 0 octave 4 E_ 2 diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 5de546ad..83d161d7 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,4 +1,4 @@ -Music_Pokecenter_Ch1:: +Music_Pokecenter_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61:: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2:: +Music_Pokecenter_Ch1:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: @@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60:: endchannel -Music_Pokecenter_Ch3:: +Music_Pokecenter_Ch2:: notetype 12, 1, 0 Music_Pokecenter_branch_bf72:: diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index afae9a75..0f17ddeb 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,4 +1,4 @@ -Music_PokemonTower_Ch1:: +Music_PokemonTower_Ch0:: tempo 152 volume 7, 7 duty 3 @@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a:: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2:: +Music_PokemonTower_Ch1:: vibrato 20, 3, 4 duty 3 notetype 12, 10, 0 @@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee:: loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3:: +Music_PokemonTower_Ch2:: vibrato 4, 1, 1 notetype 12, 1, 3 rest 8 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index bab18261..fc3227ce 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,4 +1,4 @@ -Music_Routes1_Ch1:: +Music_Routes1_Ch0:: tempo 152 volume 7, 7 vibrato 4, 2, 3 @@ -106,7 +106,7 @@ Music_Routes1_branch_9be9:: endchannel -Music_Routes1_Ch2:: +Music_Routes1_Ch1:: duty 2 Music_Routes1_branch_9c53:: @@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d:: endchannel -Music_Routes1_Ch3:: +Music_Routes1_Ch2:: vibrato 8, 2, 5 notetype 12, 1, 3 @@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd:: endchannel -Music_Routes1_Ch4:: +Music_Routes1_Ch3:: dspeed 12 rest 4 mutedsnare1 2 @@ -400,5 +400,5 @@ Music_Routes1_Ch4:: rest 2 mutedsnare1 2 mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch4 + loopchannel 0, Music_Routes1_Ch3 endchannel diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 42b4deda..ae5b22d1 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,4 +1,4 @@ -Music_Routes2_Ch1:: +Music_Routes2_Ch0:: tempo 152 volume 7, 7 vibrato 9, 2, 5 @@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3:: endchannel -Music_Routes2_Ch2:: +Music_Routes2_Ch1:: vibrato 8, 2, 6 duty 3 @@ -216,7 +216,7 @@ Music_Routes2_branch_9e54:: endchannel -Music_Routes2_Ch3:: +Music_Routes2_Ch2:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: @@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e:: endchannel -Music_Routes2_Ch4:: +Music_Routes2_Ch3:: dspeed 12 snare3 2 rest 2 @@ -421,5 +421,5 @@ Music_Routes2_Ch4:: rest 3 snare3 3 rest 3 - loopchannel 0, Music_Routes2_Ch4 + loopchannel 0, Music_Routes2_Ch3 endchannel diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index d0d1672e..b384308b 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,4 +1,4 @@ -Music_Routes3_Ch1:: +Music_Routes3_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3:: loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2:: +Music_Routes3_Ch1:: vibrato 8, 2, 3 duty 2 notetype 12, 12, 7 @@ -178,7 +178,7 @@ Music_Routes3_branch_a01a:: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3:: +Music_Routes3_Ch2:: vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 @@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3:: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4:: +Music_Routes3_Ch3:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 9bbf44ea..a9149f05 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,4 +1,4 @@ -Music_Routes4_Ch1:: +Music_Routes4_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -138,7 +138,7 @@ Music_Routes4_branch_a28a:: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2:: +Music_Routes4_Ch1:: vibrato 12, 2, 4 duty 1 notetype 12, 9, 2 @@ -288,7 +288,7 @@ Music_Routes4_branch_a325:: loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3:: +Music_Routes4_Ch2:: notetype 12, 1, 0 octave 4 E_ 1 @@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7:: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4:: +Music_Routes4_Ch3:: dspeed 12 rest 16 rest 12 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 45d84fd0..e2853646 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,4 +1,4 @@ -Music_SafariZone_Ch1:: +Music_SafariZone_Ch0:: tempo 132 volume 7, 7 vibrato 6, 3, 4 @@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f:: endchannel -Music_SafariZone_Ch2:: +Music_SafariZone_Ch1:: duty 2 vibrato 8, 2, 5 notetype 12, 10, 2 @@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89:: endchannel -Music_SafariZone_Ch3:: +Music_SafariZone_Ch2:: notetype 12, 1, 0 rest 8 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 2b6d8134..3e1ff3fc 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,4 +1,4 @@ -Music_SilphCo_Ch1:: +Music_SilphCo_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0:: endchannel -Music_SilphCo_Ch2:: +Music_SilphCo_Ch1:: vibrato 10, 3, 2 duty 3 notetype 6, 12, 3 @@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e:: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3:: +Music_SilphCo_Ch2:: vibrato 8, 1, 1 notetype 12, 1, 1 rest 12 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index ea6b1a0f..1356c8b1 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,4 +1,4 @@ -Music_SSAnne_Ch1:: +Music_SSAnne_Ch0:: tempo 128 volume 7, 7 duty 1 @@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2:: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2:: +Music_SSAnne_Ch1:: duty 0 vibrato 12, 2, 4 @@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e:: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3:: +Music_SSAnne_Ch2:: notetype 12, 1, 3 rest 16 rest 12 @@ -335,4 +335,4 @@ Music_SSAnne_Ch3:: F# 8 G# 8 B_ 8 - loopchannel 0, Music_SSAnne_Ch3 + loopchannel 0, Music_SSAnne_Ch2 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 03ebfed0..c4507a55 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,4 +1,4 @@ -Music_Surfing_Ch1:: +Music_Surfing_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30:: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2:: +Music_Surfing_Ch1:: duty 3 vibrato 16, 2, 5 notetype 12, 12, 6 @@ -203,7 +203,7 @@ Music_Surfing_branch_7faae:: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3:: +Music_Surfing_Ch2:: notetype 12, 1, 0 rest 12 octave 5 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b28474eb..2d41b082 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1:: +Music_TitleScreen_Ch0:: tempo 144 volume 7, 7 vibrato 9, 3, 4 @@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c:: endchannel -Music_TitleScreen_Ch2:: +Music_TitleScreen_Ch1:: vibrato 16, 4, 6 duty 1 notetype 12, 14, 1 @@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636:: endchannel -Music_TitleScreen_Ch3:: +Music_TitleScreen_Ch2:: notetype 12, 1, 0 octave 3 G_ 1 @@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5:: endchannel -Music_TitleScreen_Ch4:: +Music_TitleScreen_Ch3:: dspeed 6 rest 4 snare3 1 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 395f05de..5bd2c5f8 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,4 +1,4 @@ -Music_TrainerBattle_Ch1:: +Music_TrainerBattle_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962:: loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2:: +Music_TrainerBattle_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 2 @@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc:: loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3:: +Music_TrainerBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index 10ca4beb..fb541581 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,4 +1,4 @@ -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch0:: tempo 144 volume 7, 7 vibrato 5, 1, 6 @@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b:: endchannel -Music_UnusedSong_Ch2:: +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 toggleperfectpitch diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 94f87b25..c89c9b3b 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,4 +1,4 @@ -Music_Vermilion_Ch1:: +Music_Vermilion_Ch0:: tempo 156 volume 7, 7 duty 3 @@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6:: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2:: +Music_Vermilion_Ch1:: duty 3 vibrato 10, 2, 3 @@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66:: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3:: +Music_Vermilion_Ch2:: notetype 12, 1, 0 Music_Vermilion_branch_baa8:: @@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8:: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4:: +Music_Vermilion_Ch3:: dspeed 12 Music_Vermilion_branch_bb0e:: diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index 3a88678f..e9aad529 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,4 +1,4 @@ -Music_WildBattle_Ch1:: +Music_WildBattle_Ch0:: tempo 104 volume 7, 7 duty 3 @@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0:: loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2:: +Music_WildBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -462,7 +462,7 @@ Music_WildBattle_branch_23225:: loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3:: +Music_WildBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 -- cgit v1.2.3 From 4992ae2233d55a045e5e6803bc76972704c1a082 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 20:21:56 -0500 Subject: Macros to automate music and sound effect headers --- audio/headers/musicheaders1.asm | 158 ++--------- audio/headers/musicheaders2.asm | 49 +--- audio/headers/musicheaders3.asm | 138 ++-------- audio/headers/sfxheaders1.asm | 462 +++++++------------------------ audio/headers/sfxheaders2.asm | 585 ++++++++-------------------------------- audio/headers/sfxheaders3.asm | 491 +++++++-------------------------- macros.asm | 47 ++++ 7 files changed, 408 insertions(+), 1522 deletions(-) diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 68807104..703c5746 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,184 +1,66 @@ Music_PalletTown:: - db ( $80 | CH0 ) - dw Music_PalletTown_Ch0 - db CH1 - dw Music_PalletTown_Ch1 - db CH2 - dw Music_PalletTown_Ch2 + music Music_PalletTown, CH0_ | CH1_ | CH2_ Music_Pokecenter:: - db ( $80 | CH0 ) - dw Music_Pokecenter_Ch0 - db CH1 - dw Music_Pokecenter_Ch1 - db CH2 - dw Music_Pokecenter_Ch2 + music Music_Pokecenter, CH0_ | CH1_ | CH2_ Music_Gym:: - db ( $80 | CH0 ) - dw Music_Gym_Ch0 - db CH1 - dw Music_Gym_Ch1 - db CH2 - dw Music_Gym_Ch2 + music Music_Gym, CH0_ | CH1_ | CH2_ ; Viridian City, Pewter City, Saffron City Music_Cities1:: - db ( $C0 | CH0 ) - dw Music_Cities1_Ch0 - db CH1 - dw Music_Cities1_Ch1 - db CH2 - dw Music_Cities1_Ch2 - db CH3 - dw Music_Cities1_Ch3 + music Music_Cities1, CH0_ | CH1_ | CH2_ | CH3_ ; Cerulean City, Fuchsia City Music_Cities2:: - db ( $80 | CH0 ) - dw Music_Cities2_Ch0 - db CH1 - dw Music_Cities2_Ch1 - db CH2 - dw Music_Cities2_Ch2 + music Music_Cities2, CH0_ | CH1_ | CH2_ Music_Celadon:: - db ( $80 | CH0 ) - dw Music_Celadon_Ch0 - db CH1 - dw Music_Celadon_Ch1 - db CH2 - dw Music_Celadon_Ch2 + music Music_Celadon, CH0_ | CH1_ | CH2_ Music_Cinnabar:: - db ( $80 | CH0 ) - dw Music_Cinnabar_Ch0 - db CH1 - dw Music_Cinnabar_Ch1 - db CH2 - dw Music_Cinnabar_Ch2 + music Music_Cinnabar, CH0_ | CH1_ | CH2_ Music_Vermilion:: - db ( $C0 | CH0 ) - dw Music_Vermilion_Ch0 - db CH1 - dw Music_Vermilion_Ch1 - db CH2 - dw Music_Vermilion_Ch2 - db CH3 - dw Music_Vermilion_Ch3 + music Music_Vermilion, CH0_ | CH1_ | CH2_ | CH3_ Music_Lavender:: - db ( $C0 | CH0 ) - dw Music_Lavender_Ch0 - db CH1 - dw Music_Lavender_Ch1 - db CH2 - dw Music_Lavender_Ch2 - db CH3 - dw Music_Lavender_Ch3 + music Music_Lavender, CH0_ | CH1_ | CH2_ | CH3_ Music_SSAnne:: - db ( $80 | CH0 ) - dw Music_SSAnne_Ch0 - db CH1 - dw Music_SSAnne_Ch1 - db CH2 - dw Music_SSAnne_Ch2 + music Music_SSAnne, CH0_ | CH1_ | CH2_ Music_MeetProfOak:: - db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch0 - db CH1 - dw Music_MeetProfOak_Ch1 - db CH2 - dw Music_MeetProfOak_Ch2 + music Music_MeetProfOak, CH0_ | CH1_ | CH2_ Music_MeetRival:: - db ( $80 | CH0 ) - dw Music_MeetRival_Ch0 - db CH1 - dw Music_MeetRival_Ch1 - db CH2 - dw Music_MeetRival_Ch2 + music Music_MeetRival, CH0_ | CH1_ | CH2_ Music_MuseumGuy:: - db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch0 - db CH1 - dw Music_MuseumGuy_Ch1 - db CH2 - dw Music_MuseumGuy_Ch2 - db CH3 - dw Music_MuseumGuy_Ch3 + music Music_MuseumGuy, CH0_ | CH1_ | CH2_ | CH3_ Music_SafariZone:: - db ( $80 | CH0 ) - dw Music_SafariZone_Ch0 - db CH1 - dw Music_SafariZone_Ch1 - db CH2 - dw Music_SafariZone_Ch2 + music Music_SafariZone, CH0_ | CH1_ | CH2_ Music_PkmnHealed:: - db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch0 - db CH1 - dw Music_PkmnHealed_Ch1 - db CH2 - dw Music_PkmnHealed_Ch2 + music Music_PkmnHealed, CH0_ | CH1_ | CH2_ ; Routes 1 and 2 Music_Routes1:: - db ( $C0 | CH0 ) - dw Music_Routes1_Ch0 - db CH1 - dw Music_Routes1_Ch1 - db CH2 - dw Music_Routes1_Ch2 - db CH3 - dw Music_Routes1_Ch3 + music Music_Routes1, CH0_ | CH1_ | CH2_ | CH3_ ; Routes 24 and 25 Music_Routes2:: - db ( $C0 | CH0 ) - dw Music_Routes2_Ch0 - db CH1 - dw Music_Routes2_Ch1 - db CH2 - dw Music_Routes2_Ch2 - db CH3 - dw Music_Routes2_Ch3 + music Music_Routes2, CH0_ | CH1_ | CH2_ | CH3_ ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - db ( $C0 | CH0 ) - dw Music_Routes3_Ch0 - db CH1 - dw Music_Routes3_Ch1 - db CH2 - dw Music_Routes3_Ch2 - db CH3 - dw Music_Routes3_Ch3 + music Music_Routes3, CH0_ | CH1_ | CH2_ | CH3_ ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - db ( $C0 | CH0 ) - dw Music_Routes4_Ch0 - db CH1 - dw Music_Routes4_Ch1 - db CH2 - dw Music_Routes4_Ch2 - db CH3 - dw Music_Routes4_Ch3 + music Music_Routes4, CH0_ | CH1_ | CH2_ | CH3_ ; Route 23, Indigo Plateau Music_IndigoPlateau:: - db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch0 - db CH1 - dw Music_IndigoPlateau_Ch1 - db CH2 - dw Music_IndigoPlateau_Ch2 - db CH3 - dw Music_IndigoPlateau_Ch3 + music Music_IndigoPlateau, CH0_ | CH1_ | CH2_ | CH3_ diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 9e2be3ec..c03c7dc9 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,55 +1,20 @@ Music_GymLeaderBattle:: - db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch0 - db CH1 - dw Music_GymLeaderBattle_Ch1 - db CH2 - dw Music_GymLeaderBattle_Ch2 + music Music_GymLeaderBattle, CH0_ | CH1_ | CH2_ Music_TrainerBattle:: - db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch0 - db CH1 - dw Music_TrainerBattle_Ch1 - db CH2 - dw Music_TrainerBattle_Ch2 + music Music_TrainerBattle, CH0_ | CH1_ | CH2_ Music_WildBattle:: - db ( $80 | CH0 ) - dw Music_WildBattle_Ch0 - db CH1 - dw Music_WildBattle_Ch1 - db CH2 - dw Music_WildBattle_Ch2 + music Music_WildBattle, CH0_ | CH1_ | CH2_ Music_FinalBattle:: - db ( $80 | CH0 ) - dw Music_FinalBattle_Ch0 - db CH1 - dw Music_FinalBattle_Ch1 - db CH2 - dw Music_FinalBattle_Ch2 + music Music_FinalBattle, CH0_ | CH1_ | CH2_ Music_DefeatedTrainer:: - db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch0 - db CH1 - dw Music_DefeatedTrainer_Ch1 - db CH2 - dw Music_DefeatedTrainer_Ch2 + music Music_DefeatedTrainer, CH0_ | CH1_ | CH2_ Music_DefeatedWildMon:: - db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch0 - db CH1 - dw Music_DefeatedWildMon_Ch1 - db CH2 - dw Music_DefeatedWildMon_Ch2 + music Music_DefeatedWildMon, CH0_ | CH1_ | CH2_ Music_DefeatedGymLeader:: - db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch0 - db CH1 - dw Music_DefeatedGymLeader_Ch1 - db CH2 - dw Music_DefeatedGymLeader_Ch2 + music Music_DefeatedGymLeader, CH0_ | CH1_ | CH2_ diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 09404e2d..350a1618 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,158 +1,56 @@ Music_TitleScreen:: - db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch0 - db CH1 - dw Music_TitleScreen_Ch1 - db CH2 - dw Music_TitleScreen_Ch2 - db CH3 - dw Music_TitleScreen_Ch3 + music Music_TitleScreen, CH0_ | CH1_ | CH2_ | CH3_ Music_Credits:: - db ( $80 | CH0 ) - dw Music_Credits_Ch0 - db CH1 - dw Music_Credits_Ch1 - db CH2 - dw Music_Credits_Ch2 + music Music_Credits, CH0_ | CH1_ | CH2_ Music_HallOfFame:: - db ( $80 | CH0 ) - dw Music_HallOfFame_Ch0 - db CH1 - dw Music_HallOfFame_Ch1 - db CH2 - dw Music_HallOfFame_Ch2 + music Music_HallOfFame, CH0_ | CH1_ | CH2_ Music_OaksLab:: - db ( $80 | CH0 ) - dw Music_OaksLab_Ch0 - db CH1 - dw Music_OaksLab_Ch1 - db CH2 - dw Music_OaksLab_Ch2 + music Music_OaksLab, CH0_ | CH1_ | CH2_ Music_JigglypuffSong:: - db $40 - dw Music_JigglypuffSong_Ch0 - db CH1 - dw Music_JigglypuffSong_Ch1 + music Music_JigglypuffSong, CH0_ | CH1_ Music_BikeRiding:: - db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch0 - db CH1 - dw Music_BikeRiding_Ch1 - db CH2 - dw Music_BikeRiding_Ch2 - db CH3 - dw Music_BikeRiding_Ch3 + music Music_BikeRiding, CH0_ | CH1_ | CH2_ | CH3_ Music_Surfing:: - db ( $80 | CH0 ) - dw Music_Surfing_Ch0 - db CH1 - dw Music_Surfing_Ch1 - db CH2 - dw Music_Surfing_Ch2 + music Music_Surfing, CH0_ | CH1_ | CH2_ Music_GameCorner:: - db ( $80 | CH0 ) - dw Music_GameCorner_Ch0 - db CH1 - dw Music_GameCorner_Ch1 - db CH2 - dw Music_GameCorner_Ch2 + music Music_GameCorner, CH0_ | CH1_ | CH2_ Music_IntroBattle:: - db ( $C0 | CH0 ) - dw Music_IntroBattle_Ch0 - db CH1 - dw Music_IntroBattle_Ch1 - db CH2 - dw Music_IntroBattle_Ch2 - db CH3 - dw Music_IntroBattle_Ch3 + music Music_IntroBattle, CH0_ | CH1_ | CH2_ | CH3_ ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: - db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch0 - db CH1 - dw Music_Dungeon1_Ch1 - db CH2 - dw Music_Dungeon1_Ch2 - db CH3 - dw Music_Dungeon1_Ch3 + music Music_Dungeon1, CH0_ | CH1_ | CH2_ | CH3_ ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch0 - db CH1 - dw Music_Dungeon2_Ch1 - db CH2 - dw Music_Dungeon2_Ch2 - db CH3 - dw Music_Dungeon2_Ch3 + music Music_Dungeon2, CH0_ | CH1_ | CH2_ | CH3_ ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch0 - db CH1 - dw Music_Dungeon3_Ch1 - db CH2 - dw Music_Dungeon3_Ch2 - db CH3 - dw Music_Dungeon3_Ch3 + music Music_Dungeon3, CH0_ | CH1_ | CH2_ | CH3_ Music_CinnabarMansion:: - db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch0 - db CH1 - dw Music_CinnabarMansion_Ch1 - db CH2 - dw Music_CinnabarMansion_Ch2 - db CH3 - dw Music_CinnabarMansion_Ch3 + music Music_CinnabarMansion, CH0_ | CH1_ | CH2_ | CH3_ Music_PokemonTower:: - db ( $80 | CH0 ) - dw Music_PokemonTower_Ch0 - db CH1 - dw Music_PokemonTower_Ch1 - db CH2 - dw Music_PokemonTower_Ch2 + music Music_PokemonTower, CH0_ | CH1_ | CH2_ Music_SilphCo:: - db ( $80 | CH0 ) - dw Music_SilphCo_Ch0 - db CH1 - dw Music_SilphCo_Ch1 - db CH2 - dw Music_SilphCo_Ch2 + music Music_SilphCo, CH0_ | CH1_ | CH2_ Music_MeetEvilTrainer:: - db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch0 - db CH1 - dw Music_MeetEvilTrainer_Ch1 - db CH2 - dw Music_MeetEvilTrainer_Ch2 + music Music_MeetEvilTrainer, CH0_ | CH1_ | CH2_ Music_MeetFemaleTrainer:: - db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch0 - db CH1 - dw Music_MeetFemaleTrainer_Ch1 - db CH2 - dw Music_MeetFemaleTrainer_Ch2 + music Music_MeetFemaleTrainer, CH0_ | CH1_ | CH2_ Music_MeetMaleTrainer:: - db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch0 - db CH1 - dw Music_MeetMaleTrainer_Ch1 - db CH2 - dw Music_MeetMaleTrainer_Ch2 + music Music_MeetMaleTrainer, CH0_ | CH1_ | CH2_ diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 9234211a..c06370ca 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -2,561 +2,287 @@ SFX_Headers_1:: db $ff, $ff, $ff ; padding SFX_Snare1_1:: - db CH7 - dw SFX_Snare1_1_Ch7 + sfx SFX_Snare1_1, CH7_ SFX_Snare2_1:: - db CH7 - dw SFX_Snare2_1_Ch7 + sfx SFX_Snare2_1, CH7_ SFX_Snare3_1:: - db CH7 - dw SFX_Snare3_1_Ch7 + sfx SFX_Snare3_1, CH7_ SFX_Snare4_1:: - db CH7 - dw SFX_Snare4_1_Ch7 + sfx SFX_Snare4_1, CH7_ SFX_Snare5_1:: - db CH7 - dw SFX_Snare5_1_Ch7 + sfx SFX_Snare5_1, CH7_ SFX_Triangle1_1:: - db CH7 - dw SFX_Triangle1_1_Ch7 + sfx SFX_Triangle1_1, CH7_ SFX_Triangle2_1:: - db CH7 - dw SFX_Triangle2_1_Ch7 + sfx SFX_Triangle2_1, CH7_ SFX_Snare6_1:: - db CH7 - dw SFX_Snare6_1_Ch7 + sfx SFX_Snare6_1, CH7_ SFX_Snare7_1:: - db CH7 - dw SFX_Snare7_1_Ch7 + sfx SFX_Snare7_1, CH7_ SFX_Snare8_1:: - db CH7 - dw SFX_Snare8_1_Ch7 + sfx SFX_Snare8_1, CH7_ SFX_Snare9_1:: - db CH7 - dw SFX_Snare9_1_Ch7 + sfx SFX_Snare9_1, CH7_ SFX_Cymbal1_1:: - db CH7 - dw SFX_Cymbal1_1_Ch7 + sfx SFX_Cymbal1_1, CH7_ SFX_Cymbal2_1:: - db CH7 - dw SFX_Cymbal2_1_Ch7 + sfx SFX_Cymbal2_1, CH7_ SFX_Cymbal3_1:: - db CH7 - dw SFX_Cymbal3_1_Ch7 + sfx SFX_Cymbal3_1, CH7_ SFX_Muted_Snare1_1:: - db CH7 - dw SFX_Muted_Snare1_1_Ch7 + sfx SFX_Muted_Snare1_1, CH7_ SFX_Triangle3_1:: - db CH7 - dw SFX_Triangle3_1_Ch7 + sfx SFX_Triangle3_1, CH7_ SFX_Muted_Snare2_1:: - db CH7 - dw SFX_Muted_Snare2_1_Ch7 + sfx SFX_Muted_Snare2_1, CH7_ SFX_Muted_Snare3_1:: - db CH7 - dw SFX_Muted_Snare3_1_Ch7 + sfx SFX_Muted_Snare3_1, CH7_ SFX_Muted_Snare4_1:: - db CH7 - dw SFX_Muted_Snare4_1_Ch7 + sfx SFX_Muted_Snare4_1, CH7_ SFX_Cry00_1:: - db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch4 - db CH5 - dw SFX_Cry00_1_Ch5 - db CH7 - dw SFX_Cry00_1_Ch7 + sfx SFX_Cry00_1, CH4_ | CH5_ | CH7_ SFX_Cry01_1:: - db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch4 - db CH5 - dw SFX_Cry01_1_Ch5 - db CH7 - dw SFX_Cry01_1_Ch7 + sfx SFX_Cry01_1, CH4_ | CH5_ | CH7_ SFX_Cry02_1:: - db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch4 - db CH5 - dw SFX_Cry02_1_Ch5 - db CH7 - dw SFX_Cry02_1_Ch7 + sfx SFX_Cry02_1, CH4_ | CH5_ | CH7_ SFX_Cry03_1:: - db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch4 - db CH5 - dw SFX_Cry03_1_Ch5 - db CH7 - dw SFX_Cry03_1_Ch7 + sfx SFX_Cry03_1, CH4_ | CH5_ | CH7_ SFX_Cry04_1:: - db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch4 - db CH5 - dw SFX_Cry04_1_Ch5 - db CH7 - dw SFX_Cry04_1_Ch7 + sfx SFX_Cry04_1, CH4_ | CH5_ | CH7_ SFX_Cry05_1:: - db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch4 - db CH5 - dw SFX_Cry05_1_Ch5 - db CH7 - dw SFX_Cry05_1_Ch7 + sfx SFX_Cry05_1, CH4_ | CH5_ | CH7_ SFX_Cry06_1:: - db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch4 - db CH5 - dw SFX_Cry06_1_Ch5 - db CH7 - dw SFX_Cry06_1_Ch7 + sfx SFX_Cry06_1, CH4_ | CH5_ | CH7_ SFX_Cry07_1:: - db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch4 - db CH5 - dw SFX_Cry07_1_Ch5 - db CH7 - dw SFX_Cry07_1_Ch7 + sfx SFX_Cry07_1, CH4_ | CH5_ | CH7_ SFX_Cry08_1:: - db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch4 - db CH5 - dw SFX_Cry08_1_Ch5 - db CH7 - dw SFX_Cry08_1_Ch7 + sfx SFX_Cry08_1, CH4_ | CH5_ | CH7_ SFX_Cry09_1:: - db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch4 - db CH5 - dw SFX_Cry09_1_Ch5 - db CH7 - dw SFX_Cry09_1_Ch7 + sfx SFX_Cry09_1, CH4_ | CH5_ | CH7_ SFX_Cry0A_1:: - db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch4 - db CH5 - dw SFX_Cry0A_1_Ch5 - db CH7 - dw SFX_Cry0A_1_Ch7 + sfx SFX_Cry0A_1, CH4_ | CH5_ | CH7_ SFX_Cry0B_1:: - db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch4 - db CH5 - dw SFX_Cry0B_1_Ch5 - db CH7 - dw SFX_Cry0B_1_Ch7 + sfx SFX_Cry0B_1, CH4_ | CH5_ | CH7_ SFX_Cry0C_1:: - db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch4 - db CH5 - dw SFX_Cry0C_1_Ch5 - db CH7 - dw SFX_Cry0C_1_Ch7 + sfx SFX_Cry0C_1, CH4_ | CH5_ | CH7_ SFX_Cry0D_1:: - db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch4 - db CH5 - dw SFX_Cry0D_1_Ch5 - db CH7 - dw SFX_Cry0D_1_Ch7 + sfx SFX_Cry0D_1, CH4_ | CH5_ | CH7_ SFX_Cry0E_1:: - db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch4 - db CH5 - dw SFX_Cry0E_1_Ch5 - db CH7 - dw SFX_Cry0E_1_Ch7 + sfx SFX_Cry0E_1, CH4_ | CH5_ | CH7_ SFX_Cry0F_1:: - db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch4 - db CH5 - dw SFX_Cry0F_1_Ch5 - db CH7 - dw SFX_Cry0F_1_Ch7 + sfx SFX_Cry0F_1, CH4_ | CH5_ | CH7_ SFX_Cry10_1:: - db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch4 - db CH5 - dw SFX_Cry10_1_Ch5 - db CH7 - dw SFX_Cry10_1_Ch7 + sfx SFX_Cry10_1, CH4_ | CH5_ | CH7_ SFX_Cry11_1:: - db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch4 - db CH5 - dw SFX_Cry11_1_Ch5 - db CH7 - dw SFX_Cry11_1_Ch7 + sfx SFX_Cry11_1, CH4_ | CH5_ | CH7_ SFX_Cry12_1:: - db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch4 - db CH5 - dw SFX_Cry12_1_Ch5 - db CH7 - dw SFX_Cry12_1_Ch7 + sfx SFX_Cry12_1, CH4_ | CH5_ | CH7_ SFX_Cry13_1:: - db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch4 - db CH5 - dw SFX_Cry13_1_Ch5 - db CH7 - dw SFX_Cry13_1_Ch7 + sfx SFX_Cry13_1, CH4_ | CH5_ | CH7_ SFX_Cry14_1:: - db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch4 - db CH5 - dw SFX_Cry14_1_Ch5 - db CH7 - dw SFX_Cry14_1_Ch7 + sfx SFX_Cry14_1, CH4_ | CH5_ | CH7_ SFX_Cry15_1:: - db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch4 - db CH5 - dw SFX_Cry15_1_Ch5 - db CH7 - dw SFX_Cry15_1_Ch7 + sfx SFX_Cry15_1, CH4_ | CH5_ | CH7_ SFX_Cry16_1:: - db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch4 - db CH5 - dw SFX_Cry16_1_Ch5 - db CH7 - dw SFX_Cry16_1_Ch7 + sfx SFX_Cry16_1, CH4_ | CH5_ | CH7_ SFX_Cry17_1:: - db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch4 - db CH5 - dw SFX_Cry17_1_Ch5 - db CH7 - dw SFX_Cry17_1_Ch7 + sfx SFX_Cry17_1, CH4_ | CH5_ | CH7_ SFX_Cry18_1:: - db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch4 - db CH5 - dw SFX_Cry18_1_Ch5 - db CH7 - dw SFX_Cry18_1_Ch7 + sfx SFX_Cry18_1, CH4_ | CH5_ | CH7_ SFX_Cry19_1:: - db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch4 - db CH5 - dw SFX_Cry19_1_Ch5 - db CH7 - dw SFX_Cry19_1_Ch7 + sfx SFX_Cry19_1, CH4_ | CH5_ | CH7_ SFX_Cry1A_1:: - db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch4 - db CH5 - dw SFX_Cry1A_1_Ch5 - db CH7 - dw SFX_Cry1A_1_Ch7 + sfx SFX_Cry1A_1, CH4_ | CH5_ | CH7_ SFX_Cry1B_1:: - db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch4 - db CH5 - dw SFX_Cry1B_1_Ch5 - db CH7 - dw SFX_Cry1B_1_Ch7 + sfx SFX_Cry1B_1, CH4_ | CH5_ | CH7_ SFX_Cry1C_1:: - db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch4 - db CH5 - dw SFX_Cry1C_1_Ch5 - db CH7 - dw SFX_Cry1C_1_Ch7 + sfx SFX_Cry1C_1, CH4_ | CH5_ | CH7_ SFX_Cry1D_1:: - db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch4 - db CH5 - dw SFX_Cry1D_1_Ch5 - db CH7 - dw SFX_Cry1D_1_Ch7 + sfx SFX_Cry1D_1, CH4_ | CH5_ | CH7_ SFX_Cry1E_1:: - db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch4 - db CH5 - dw SFX_Cry1E_1_Ch5 - db CH7 - dw SFX_Cry1E_1_Ch7 + sfx SFX_Cry1E_1, CH4_ | CH5_ | CH7_ SFX_Cry1F_1:: - db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch4 - db CH5 - dw SFX_Cry1F_1_Ch5 - db CH7 - dw SFX_Cry1F_1_Ch7 + sfx SFX_Cry1F_1, CH4_ | CH5_ | CH7_ SFX_Cry20_1:: - db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch4 - db CH5 - dw SFX_Cry20_1_Ch5 - db CH7 - dw SFX_Cry20_1_Ch7 + sfx SFX_Cry20_1, CH4_ | CH5_ | CH7_ SFX_Cry21_1:: - db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch4 - db CH5 - dw SFX_Cry21_1_Ch5 - db CH7 - dw SFX_Cry21_1_Ch7 + sfx SFX_Cry21_1, CH4_ | CH5_ | CH7_ SFX_Cry22_1:: - db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch4 - db CH5 - dw SFX_Cry22_1_Ch5 - db CH7 - dw SFX_Cry22_1_Ch7 + sfx SFX_Cry22_1, CH4_ | CH5_ | CH7_ SFX_Cry23_1:: - db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch4 - db CH5 - dw SFX_Cry23_1_Ch5 - db CH7 - dw SFX_Cry23_1_Ch7 + sfx SFX_Cry23_1, CH4_ | CH5_ | CH7_ SFX_Cry24_1:: - db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch4 - db CH5 - dw SFX_Cry24_1_Ch5 - db CH7 - dw SFX_Cry24_1_Ch7 + sfx SFX_Cry24_1, CH4_ | CH5_ | CH7_ SFX_Cry25_1:: - db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch4 - db CH5 - dw SFX_Cry25_1_Ch5 - db CH7 - dw SFX_Cry25_1_Ch7 + sfx SFX_Cry25_1, CH4_ | CH5_ | CH7_ SFX_Get_Item1_1:: - db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch4 - db CH5 - dw SFX_Get_Item1_1_Ch5 - db CH6 - dw SFX_Get_Item1_1_Ch6 + sfx SFX_Get_Item1_1, CH4_ | CH5_ | CH6_ SFX_Get_Item2_1:: - db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch4 - db CH5 - dw SFX_Get_Item2_1_Ch5 - db CH6 - dw SFX_Get_Item2_1_Ch6 + sfx SFX_Get_Item2_1, CH4_ | CH5_ | CH6_ SFX_Tink_1:: - db CH4 - dw SFX_Tink_1_Ch4 + sfx SFX_Tink_1, CH4_ SFX_Heal_HP_1:: - db CH4 - dw SFX_Heal_HP_1_Ch4 + sfx SFX_Heal_HP_1, CH4_ SFX_Heal_Ailment_1:: - db CH4 - dw SFX_Heal_Ailment_1_Ch4 + sfx SFX_Heal_Ailment_1, CH4_ SFX_Start_Menu_1:: - db CH7 - dw SFX_Start_Menu_1_Ch7 + sfx SFX_Start_Menu_1, CH7_ SFX_Press_AB_1:: - db CH4 - dw SFX_Press_AB_1_Ch4 + sfx SFX_Press_AB_1, CH4_ SFX_Pokedex_Rating_1:: - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch4 - db CH5 - dw SFX_Pokedex_Rating_1_Ch5 - db CH6 - dw SFX_Pokedex_Rating_1_Ch6 + sfx SFX_Pokedex_Rating_1, CH4_ | CH5_ | CH6_ SFX_Get_Key_Item_1:: - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch4 - db CH5 - dw SFX_Get_Key_Item_1_Ch5 - db CH6 - dw SFX_Get_Key_Item_1_Ch6 + sfx SFX_Get_Key_Item_1, CH4_ | CH5_ | CH6_ SFX_Poisoned_1:: - db CH4 - dw SFX_Poisoned_1_Ch4 + sfx SFX_Poisoned_1, CH4_ SFX_Trade_Machine_1:: - db CH4 - dw SFX_Trade_Machine_1_Ch4 + sfx SFX_Trade_Machine_1, CH4_ SFX_Turn_On_PC_1:: - db CH4 - dw SFX_Turn_On_PC_1_Ch4 + sfx SFX_Turn_On_PC_1, CH4_ SFX_Turn_Off_PC_1:: - db CH4 - dw SFX_Turn_Off_PC_1_Ch4 + sfx SFX_Turn_Off_PC_1, CH4_ SFX_Enter_PC_1:: - db CH4 - dw SFX_Enter_PC_1_Ch4 + sfx SFX_Enter_PC_1, CH4_ SFX_Shrink_1:: - db CH4 - dw SFX_Shrink_1_Ch4 + sfx SFX_Shrink_1, CH4_ SFX_Switch_1:: - db CH4 - dw SFX_Switch_1_Ch4 + sfx SFX_Switch_1, CH4_ SFX_Healing_Machine_1:: - db CH4 - dw SFX_Healing_Machine_1_Ch4 + sfx SFX_Healing_Machine_1, CH4_ SFX_Teleport_Exit1_1:: - db CH4 - dw SFX_Teleport_Exit1_1_Ch4 + sfx SFX_Teleport_Exit1_1, CH4_ SFX_Teleport_Enter1_1:: - db CH4 - dw SFX_Teleport_Enter1_1_Ch4 + sfx SFX_Teleport_Enter1_1, CH4_ SFX_Teleport_Exit2_1:: - db CH4 - dw SFX_Teleport_Exit2_1_Ch4 + sfx SFX_Teleport_Exit2_1, CH4_ SFX_Ledge_1:: - db CH4 - dw SFX_Ledge_1_Ch4 + sfx SFX_Ledge_1, CH4_ SFX_Teleport_Enter2_1:: - db CH7 - dw SFX_Teleport_Enter2_1_Ch7 + sfx SFX_Teleport_Enter2_1, CH7_ SFX_Fly_1:: - db CH7 - dw SFX_Fly_1_Ch7 + sfx SFX_Fly_1, CH7_ SFX_Denied_1:: - db ( $40 | CH4 ) - dw SFX_Denied_1_Ch4 - db CH5 - dw SFX_Denied_1_Ch5 + sfx SFX_Denied_1, CH4_ | CH5_ SFX_Arrow_Tiles_1:: - db CH4 - dw SFX_Arrow_Tiles_1_Ch4 + sfx SFX_Arrow_Tiles_1, CH4_ SFX_Push_Boulder_1:: - db CH7 - dw SFX_Push_Boulder_1_Ch7 + sfx SFX_Push_Boulder_1, CH7_ SFX_SS_Anne_Horn_1:: - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch4 - db CH5 - dw SFX_SS_Anne_Horn_1_Ch5 + sfx SFX_SS_Anne_Horn_1, CH4_ | CH5_ SFX_Withdraw_Deposit_1:: - db CH4 - dw SFX_Withdraw_Deposit_1_Ch4 + sfx SFX_Withdraw_Deposit_1, CH4_ SFX_Cut_1:: - db CH7 - dw SFX_Cut_1_Ch7 + sfx SFX_Cut_1, CH7_ SFX_Go_Inside_1:: - db CH7 - dw SFX_Go_Inside_1_Ch7 + sfx SFX_Go_Inside_1, CH7_ SFX_Swap_1:: - db ( $40 | CH4 ) - dw SFX_Swap_1_Ch4 - db CH5 - dw SFX_Swap_1_Ch5 + sfx SFX_Swap_1, CH4_ | CH5_ SFX_59_1:: - db ( $40 | CH4 ) - dw SFX_59_1_Ch4 - db CH5 - dw SFX_59_1_Ch5 + sfx SFX_59_1, CH4_ | CH5_ SFX_Purchase_1:: - db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch4 - db CH5 - dw SFX_Purchase_1_Ch5 + sfx SFX_Purchase_1, CH4_ | CH5_ SFX_Collision_1:: - db CH4 - dw SFX_Collision_1_Ch4 + sfx SFX_Collision_1, CH4_ SFX_Go_Outside_1:: - db CH7 - dw SFX_Go_Outside_1_Ch7 + sfx SFX_Go_Outside_1, CH7_ SFX_Save_1:: - db ( $40 | CH4 ) - dw SFX_Save_1_Ch4 - db CH5 - dw SFX_Save_1_Ch5 + sfx SFX_Save_1, CH4_ | CH5_ SFX_Pokeflute:: db CH2 dw SFX_Pokeflute_Ch2 SFX_Safari_Zone_PA:: - db CH4 - dw SFX_Safari_Zone_PA_Ch4 + sfx SFX_Safari_Zone_PA, CH4_ diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index f54f37f8..825f9405 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -2,705 +2,358 @@ SFX_Headers_2:: db $ff, $ff, $ff ; padding SFX_Snare1_2:: - db CH7 - dw SFX_Snare1_2_Ch7 + sfx SFX_Snare1_2, CH7_ SFX_Snare2_2:: - db CH7 - dw SFX_Snare2_2_Ch7 + sfx SFX_Snare2_2, CH7_ SFX_Snare3_2:: - db CH7 - dw SFX_Snare3_2_Ch7 + sfx SFX_Snare3_2, CH7_ SFX_Snare4_2:: - db CH7 - dw SFX_Snare4_2_Ch7 + sfx SFX_Snare4_2, CH7_ SFX_Snare5_2:: - db CH7 - dw SFX_Snare5_2_Ch7 + sfx SFX_Snare5_2, CH7_ SFX_Triangle1_2:: - db CH7 - dw SFX_Triangle1_2_Ch7 + sfx SFX_Triangle1_2, CH7_ SFX_Triangle2_2:: - db CH7 - dw SFX_Triangle2_2_Ch7 + sfx SFX_Triangle2_2, CH7_ SFX_Snare6_2:: - db CH7 - dw SFX_Snare6_2_Ch7 + sfx SFX_Snare6_2, CH7_ SFX_Snare7_2:: - db CH7 - dw SFX_Snare7_2_Ch7 + sfx SFX_Snare7_2, CH7_ SFX_Snare8_2:: - db CH7 - dw SFX_Snare8_2_Ch7 + sfx SFX_Snare8_2, CH7_ SFX_Snare9_2:: - db CH7 - dw SFX_Snare9_2_Ch7 + sfx SFX_Snare9_2, CH7_ SFX_Cymbal1_2:: - db CH7 - dw SFX_Cymbal1_2_Ch7 + sfx SFX_Cymbal1_2, CH7_ SFX_Cymbal2_2:: - db CH7 - dw SFX_Cymbal2_2_Ch7 + sfx SFX_Cymbal2_2, CH7_ SFX_Cymbal3_2:: - db CH7 - dw SFX_Cymbal3_2_Ch7 + sfx SFX_Cymbal3_2, CH7_ SFX_Muted_Snare1_2:: - db CH7 - dw SFX_Muted_Snare1_2_Ch7 + sfx SFX_Muted_Snare1_2, CH7_ SFX_Triangle3_2:: - db CH7 - dw SFX_Triangle3_2_Ch7 + sfx SFX_Triangle3_2, CH7_ SFX_Muted_Snare2_2:: - db CH7 - dw SFX_Muted_Snare2_2_Ch7 + sfx SFX_Muted_Snare2_2, CH7_ SFX_Muted_Snare3_2:: - db CH7 - dw SFX_Muted_Snare3_2_Ch7 + sfx SFX_Muted_Snare3_2, CH7_ SFX_Muted_Snare4_2:: - db CH7 - dw SFX_Muted_Snare4_2_Ch7 + sfx SFX_Muted_Snare4_2, CH7_ SFX_Cry00_2:: - db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch4 - db CH5 - dw SFX_Cry00_2_Ch5 - db CH7 - dw SFX_Cry00_2_Ch7 + sfx SFX_Cry00_2, CH4_ | CH5_ | CH7_ SFX_Cry01_2:: - db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch4 - db CH5 - dw SFX_Cry01_2_Ch5 - db CH7 - dw SFX_Cry01_2_Ch7 + sfx SFX_Cry01_2, CH4_ | CH5_ | CH7_ SFX_Cry02_2:: - db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch4 - db CH5 - dw SFX_Cry02_2_Ch5 - db CH7 - dw SFX_Cry02_2_Ch7 + sfx SFX_Cry02_2, CH4_ | CH5_ | CH7_ SFX_Cry03_2:: - db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch4 - db CH5 - dw SFX_Cry03_2_Ch5 - db CH7 - dw SFX_Cry03_2_Ch7 + sfx SFX_Cry03_2, CH4_ | CH5_ | CH7_ SFX_Cry04_2:: - db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch4 - db CH5 - dw SFX_Cry04_2_Ch5 - db CH7 - dw SFX_Cry04_2_Ch7 + sfx SFX_Cry04_2, CH4_ | CH5_ | CH7_ SFX_Cry05_2:: - db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch4 - db CH5 - dw SFX_Cry05_2_Ch5 - db CH7 - dw SFX_Cry05_2_Ch7 + sfx SFX_Cry05_2, CH4_ | CH5_ | CH7_ SFX_Cry06_2:: - db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch4 - db CH5 - dw SFX_Cry06_2_Ch5 - db CH7 - dw SFX_Cry06_2_Ch7 + sfx SFX_Cry06_2, CH4_ | CH5_ | CH7_ SFX_Cry07_2:: - db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch4 - db CH5 - dw SFX_Cry07_2_Ch5 - db CH7 - dw SFX_Cry07_2_Ch7 + sfx SFX_Cry07_2, CH4_ | CH5_ | CH7_ SFX_Cry08_2:: - db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch4 - db CH5 - dw SFX_Cry08_2_Ch5 - db CH7 - dw SFX_Cry08_2_Ch7 + sfx SFX_Cry08_2, CH4_ | CH5_ | CH7_ SFX_Cry09_2:: - db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch4 - db CH5 - dw SFX_Cry09_2_Ch5 - db CH7 - dw SFX_Cry09_2_Ch7 + sfx SFX_Cry09_2, CH4_ | CH5_ | CH7_ SFX_Cry0A_2:: - db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch4 - db CH5 - dw SFX_Cry0A_2_Ch5 - db CH7 - dw SFX_Cry0A_2_Ch7 + sfx SFX_Cry0A_2, CH4_ | CH5_ | CH7_ SFX_Cry0B_2:: - db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch4 - db CH5 - dw SFX_Cry0B_2_Ch5 - db CH7 - dw SFX_Cry0B_2_Ch7 + sfx SFX_Cry0B_2, CH4_ | CH5_ | CH7_ SFX_Cry0C_2:: - db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch4 - db CH5 - dw SFX_Cry0C_2_Ch5 - db CH7 - dw SFX_Cry0C_2_Ch7 + sfx SFX_Cry0C_2, CH4_ | CH5_ | CH7_ SFX_Cry0D_2:: - db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch4 - db CH5 - dw SFX_Cry0D_2_Ch5 - db CH7 - dw SFX_Cry0D_2_Ch7 + sfx SFX_Cry0D_2, CH4_ | CH5_ | CH7_ SFX_Cry0E_2:: - db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch4 - db CH5 - dw SFX_Cry0E_2_Ch5 - db CH7 - dw SFX_Cry0E_2_Ch7 + sfx SFX_Cry0E_2, CH4_ | CH5_ | CH7_ SFX_Cry0F_2:: - db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch4 - db CH5 - dw SFX_Cry0F_2_Ch5 - db CH7 - dw SFX_Cry0F_2_Ch7 + sfx SFX_Cry0F_2, CH4_ | CH5_ | CH7_ SFX_Cry10_2:: - db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch4 - db CH5 - dw SFX_Cry10_2_Ch5 - db CH7 - dw SFX_Cry10_2_Ch7 + sfx SFX_Cry10_2, CH4_ | CH5_ | CH7_ SFX_Cry11_2:: - db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch4 - db CH5 - dw SFX_Cry11_2_Ch5 - db CH7 - dw SFX_Cry11_2_Ch7 + sfx SFX_Cry11_2, CH4_ | CH5_ | CH7_ SFX_Cry12_2:: - db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch4 - db CH5 - dw SFX_Cry12_2_Ch5 - db CH7 - dw SFX_Cry12_2_Ch7 + sfx SFX_Cry12_2, CH4_ | CH5_ | CH7_ SFX_Cry13_2:: - db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch4 - db CH5 - dw SFX_Cry13_2_Ch5 - db CH7 - dw SFX_Cry13_2_Ch7 + sfx SFX_Cry13_2, CH4_ | CH5_ | CH7_ SFX_Cry14_2:: - db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch4 - db CH5 - dw SFX_Cry14_2_Ch5 - db CH7 - dw SFX_Cry14_2_Ch7 + sfx SFX_Cry14_2, CH4_ | CH5_ | CH7_ SFX_Cry15_2:: - db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch4 - db CH5 - dw SFX_Cry15_2_Ch5 - db CH7 - dw SFX_Cry15_2_Ch7 + sfx SFX_Cry15_2, CH4_ | CH5_ | CH7_ SFX_Cry16_2:: - db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch4 - db CH5 - dw SFX_Cry16_2_Ch5 - db CH7 - dw SFX_Cry16_2_Ch7 + sfx SFX_Cry16_2, CH4_ | CH5_ | CH7_ SFX_Cry17_2:: - db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch4 - db CH5 - dw SFX_Cry17_2_Ch5 - db CH7 - dw SFX_Cry17_2_Ch7 + sfx SFX_Cry17_2, CH4_ | CH5_ | CH7_ SFX_Cry18_2:: - db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch4 - db CH5 - dw SFX_Cry18_2_Ch5 - db CH7 - dw SFX_Cry18_2_Ch7 + sfx SFX_Cry18_2, CH4_ | CH5_ | CH7_ SFX_Cry19_2:: - db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch4 - db CH5 - dw SFX_Cry19_2_Ch5 - db CH7 - dw SFX_Cry19_2_Ch7 + sfx SFX_Cry19_2, CH4_ | CH5_ | CH7_ SFX_Cry1A_2:: - db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch4 - db CH5 - dw SFX_Cry1A_2_Ch5 - db CH7 - dw SFX_Cry1A_2_Ch7 + sfx SFX_Cry1A_2, CH4_ | CH5_ | CH7_ SFX_Cry1B_2:: - db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch4 - db CH5 - dw SFX_Cry1B_2_Ch5 - db CH7 - dw SFX_Cry1B_2_Ch7 + sfx SFX_Cry1B_2, CH4_ | CH5_ | CH7_ SFX_Cry1C_2:: - db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch4 - db CH5 - dw SFX_Cry1C_2_Ch5 - db CH7 - dw SFX_Cry1C_2_Ch7 + sfx SFX_Cry1C_2, CH4_ | CH5_ | CH7_ SFX_Cry1D_2:: - db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch4 - db CH5 - dw SFX_Cry1D_2_Ch5 - db CH7 - dw SFX_Cry1D_2_Ch7 + sfx SFX_Cry1D_2, CH4_ | CH5_ | CH7_ SFX_Cry1E_2:: - db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch4 - db CH5 - dw SFX_Cry1E_2_Ch5 - db CH7 - dw SFX_Cry1E_2_Ch7 + sfx SFX_Cry1E_2, CH4_ | CH5_ | CH7_ SFX_Cry1F_2:: - db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch4 - db CH5 - dw SFX_Cry1F_2_Ch5 - db CH7 - dw SFX_Cry1F_2_Ch7 + sfx SFX_Cry1F_2, CH4_ | CH5_ | CH7_ SFX_Cry20_2:: - db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch4 - db CH5 - dw SFX_Cry20_2_Ch5 - db CH7 - dw SFX_Cry20_2_Ch7 + sfx SFX_Cry20_2, CH4_ | CH5_ | CH7_ SFX_Cry21_2:: - db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch4 - db CH5 - dw SFX_Cry21_2_Ch5 - db CH7 - dw SFX_Cry21_2_Ch7 + sfx SFX_Cry21_2, CH4_ | CH5_ | CH7_ SFX_Cry22_2:: - db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch4 - db CH5 - dw SFX_Cry22_2_Ch5 - db CH7 - dw SFX_Cry22_2_Ch7 + sfx SFX_Cry22_2, CH4_ | CH5_ | CH7_ SFX_Cry23_2:: - db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch4 - db CH5 - dw SFX_Cry23_2_Ch5 - db CH7 - dw SFX_Cry23_2_Ch7 + sfx SFX_Cry23_2, CH4_ | CH5_ | CH7_ SFX_Cry24_2:: - db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch4 - db CH5 - dw SFX_Cry24_2_Ch5 - db CH7 - dw SFX_Cry24_2_Ch7 + sfx SFX_Cry24_2, CH4_ | CH5_ | CH7_ SFX_Cry25_2:: - db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch4 - db CH5 - dw SFX_Cry25_2_Ch5 - db CH7 - dw SFX_Cry25_2_Ch7 + sfx SFX_Cry25_2, CH4_ | CH5_ | CH7_ SFX_Level_Up:: - db ( $80 | CH4 ) - dw SFX_Level_Up_Ch4 - db CH5 - dw SFX_Level_Up_Ch5 - db CH6 - dw SFX_Level_Up_Ch6 + sfx SFX_Level_Up, CH4_ | CH5_ | CH6_ SFX_Get_Item2_2:: - db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch4 - db CH5 - dw SFX_Get_Item2_2_Ch5 - db CH6 - dw SFX_Get_Item2_2_Ch6 + sfx SFX_Get_Item2_2, CH4_ | CH5_ | CH6_ SFX_Tink_2:: - db CH4 - dw SFX_Tink_2_Ch4 + sfx SFX_Tink_2, CH4_ SFX_Heal_HP_2:: - db CH4 - dw SFX_Heal_HP_2_Ch4 + sfx SFX_Heal_HP_2, CH4_ SFX_Heal_Ailment_2:: - db CH4 - dw SFX_Heal_Ailment_2_Ch4 + sfx SFX_Heal_Ailment_2, CH4_ SFX_Start_Menu_2:: - db CH7 - dw SFX_Start_Menu_2_Ch7 + sfx SFX_Start_Menu_2, CH7_ SFX_Press_AB_2:: - db CH4 - dw SFX_Press_AB_2_Ch4 + sfx SFX_Press_AB_2, CH4_ SFX_Ball_Toss:: - db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch4 - db CH5 - dw SFX_Ball_Toss_Ch5 + sfx SFX_Ball_Toss, CH4_ | CH5_ SFX_Ball_Poof:: - db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch4 - db CH7 - dw SFX_Ball_Poof_Ch7 + sfx SFX_Ball_Poof, CH4_ | CH7_ SFX_Faint_Thud:: - db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch4 - db CH7 - dw SFX_Faint_Thud_Ch7 + sfx SFX_Faint_Thud, CH4_ | CH7_ SFX_Run:: - db CH7 - dw SFX_Run_Ch7 + sfx SFX_Run, CH7_ SFX_Dex_Page_Added:: - db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch4 - db CH5 - dw SFX_Dex_Page_Added_Ch5 + sfx SFX_Dex_Page_Added, CH4_ | CH5_ SFX_Caught_Mon:: - db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch4 - db CH5 - dw SFX_Caught_Mon_Ch5 - db CH6 - dw SFX_Caught_Mon_Ch6 + sfx SFX_Caught_Mon, CH4_ | CH5_ | CH6_ SFX_Peck:: - db CH7 - dw SFX_Peck_Ch7 + sfx SFX_Peck, CH7_ SFX_Faint_Fall:: - db CH4 - dw SFX_Faint_Fall_Ch4 + sfx SFX_Faint_Fall, CH4_ SFX_Battle_09:: - db CH4 - dw SFX_Battle_09_Ch4 + sfx SFX_Battle_09, CH4_ SFX_Pound:: - db CH7 - dw SFX_Pound_Ch7 + sfx SFX_Pound, CH7_ SFX_Battle_0B:: - db CH7 - dw SFX_Battle_0B_Ch7 + sfx SFX_Battle_0B, CH7_ SFX_Battle_0C:: - db CH7 - dw SFX_Battle_0C_Ch7 + sfx SFX_Battle_0C, CH7_ SFX_Battle_0D:: - db CH7 - dw SFX_Battle_0D_Ch7 + sfx SFX_Battle_0D, CH7_ SFX_Battle_0E:: - db CH7 - dw SFX_Battle_0E_Ch7 + sfx SFX_Battle_0E, CH7_ SFX_Battle_0F:: - db CH7 - dw SFX_Battle_0F_Ch7 + sfx SFX_Battle_0F, CH7_ SFX_Damage:: - db CH7 - dw SFX_Damage_Ch7 + sfx SFX_Damage, CH7_ SFX_Not_Very_Effective:: - db CH7 - dw SFX_Not_Very_Effective_Ch7 + sfx SFX_Not_Very_Effective, CH7_ SFX_Battle_12:: - db CH7 - dw SFX_Battle_12_Ch7 + sfx SFX_Battle_12, CH7_ SFX_Battle_13:: - db CH7 - dw SFX_Battle_13_Ch7 + sfx SFX_Battle_13, CH7_ SFX_Battle_14:: - db CH7 - dw SFX_Battle_14_Ch7 + sfx SFX_Battle_14, CH7_ SFX_Vine_Whip:: - db CH7 - dw SFX_Vine_Whip_Ch7 + sfx SFX_Vine_Whip, CH7_ SFX_Battle_16:: - db CH7 - dw SFX_Battle_16_Ch7 + sfx SFX_Battle_16, CH7_ SFX_Battle_17:: - db CH7 - dw SFX_Battle_17_Ch7 + sfx SFX_Battle_17, CH7_ SFX_Battle_18:: - db CH7 - dw SFX_Battle_18_Ch7 + sfx SFX_Battle_18, CH7_ SFX_Battle_19:: - db CH7 - dw SFX_Battle_19_Ch7 + sfx SFX_Battle_19, CH7_ SFX_Super_Effective:: - db CH7 - dw SFX_Super_Effective_Ch7 + sfx SFX_Super_Effective, CH7_ SFX_Battle_1B:: - db CH7 - dw SFX_Battle_1B_Ch7 + sfx SFX_Battle_1B, CH7_ SFX_Battle_1C:: - db CH7 - dw SFX_Battle_1C_Ch7 + sfx SFX_Battle_1C, CH7_ SFX_Doubleslap:: - db CH7 - dw SFX_Doubleslap_Ch7 + sfx SFX_Doubleslap, CH7_ SFX_Battle_1E:: - db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch4 - db CH7 - dw SFX_Battle_1E_Ch7 + sfx SFX_Battle_1E, CH4_ | CH7_ SFX_Horn_Drill:: - db CH7 - dw SFX_Horn_Drill_Ch7 + sfx SFX_Horn_Drill, CH7_ SFX_Battle_20:: - db CH7 - dw SFX_Battle_20_Ch7 + sfx SFX_Battle_20, CH7_ SFX_Battle_21:: - db CH7 - dw SFX_Battle_21_Ch7 + sfx SFX_Battle_21, CH7_ SFX_Battle_22:: - db CH7 - dw SFX_Battle_22_Ch7 + sfx SFX_Battle_22, CH7_ SFX_Battle_23:: - db CH7 - dw SFX_Battle_23_Ch7 + sfx SFX_Battle_23, CH7_ SFX_Battle_24:: - db ( $40 | CH4 ) - dw SFX_Battle_24_Ch4 - db CH7 - dw SFX_Battle_24_Ch7 + sfx SFX_Battle_24, CH4_ | CH7_ SFX_Battle_25:: - db CH7 - dw SFX_Battle_25_Ch7 + sfx SFX_Battle_25, CH7_ SFX_Battle_26:: - db CH7 - dw SFX_Battle_26_Ch7 + sfx SFX_Battle_26, CH7_ SFX_Battle_27:: - db ( $80 | CH4 ) - dw SFX_Battle_27_Ch4 - db CH5 - dw SFX_Battle_27_Ch5 - db CH7 - dw SFX_Battle_27_Ch7 + sfx SFX_Battle_27, CH4_ | CH5_ | CH7_ SFX_Battle_28:: - db ( $80 | CH4 ) - dw SFX_Battle_28_Ch4 - db CH5 - dw SFX_Battle_28_Ch5 - db CH7 - dw SFX_Battle_28_Ch7 + sfx SFX_Battle_28, CH4_ | CH5_ | CH7_ SFX_Battle_29:: - db ( $40 | CH4 ) - dw SFX_Battle_29_Ch4 - db CH7 - dw SFX_Battle_29_Ch7 + sfx SFX_Battle_29, CH4_ | CH7_ SFX_Battle_2A:: - db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch4 - db CH5 - dw SFX_Battle_2A_Ch5 - db CH7 - dw SFX_Battle_2A_Ch7 + sfx SFX_Battle_2A, CH4_ | CH5_ | CH7_ SFX_Battle_2B:: - db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch4 - db CH7 - dw SFX_Battle_2B_Ch7 + sfx SFX_Battle_2B, CH4_ | CH7_ SFX_Battle_2C:: - db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch4 - db CH5 - dw SFX_Battle_2C_Ch5 - db CH7 - dw SFX_Battle_2C_Ch7 + sfx SFX_Battle_2C, CH4_ | CH5_ | CH7_ SFX_Psybeam:: - db ( $80 | CH4 ) - dw SFX_Psybeam_Ch4 - db CH5 - dw SFX_Psybeam_Ch5 - db CH7 - dw SFX_Psybeam_Ch7 + sfx SFX_Psybeam, CH4_ | CH5_ | CH7_ SFX_Battle_2E:: - db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch4 - db CH5 - dw SFX_Battle_2E_Ch5 - db CH7 - dw SFX_Battle_2E_Ch7 + sfx SFX_Battle_2E, CH4_ | CH5_ | CH7_ SFX_Battle_2F:: - db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch4 - db CH5 - dw SFX_Battle_2F_Ch5 - db CH7 - dw SFX_Battle_2F_Ch7 + sfx SFX_Battle_2F, CH4_ | CH5_ | CH7_ SFX_Psychic_M:: - db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch4 - db CH5 - dw SFX_Psychic_M_Ch5 - db CH7 - dw SFX_Psychic_M_Ch7 + sfx SFX_Psychic_M, CH4_ | CH5_ | CH7_ SFX_Battle_31:: - db ( $40 | CH4 ) - dw SFX_Battle_31_Ch4 - db CH5 - dw SFX_Battle_31_Ch5 + sfx SFX_Battle_31, CH4_ | CH5_ SFX_Battle_32:: - db ( $40 | CH4 ) - dw SFX_Battle_32_Ch4 - db CH5 - dw SFX_Battle_32_Ch5 + sfx SFX_Battle_32, CH4_ | CH5_ SFX_Battle_33:: - db ( $40 | CH4 ) - dw SFX_Battle_33_Ch4 - db CH5 - dw SFX_Battle_33_Ch5 + sfx SFX_Battle_33, CH4_ | CH5_ SFX_Battle_34:: - db ( $80 | CH4 ) - dw SFX_Battle_34_Ch4 - db CH5 - dw SFX_Battle_34_Ch5 - db CH7 - dw SFX_Battle_34_Ch7 + sfx SFX_Battle_34, CH4_ | CH5_ | CH7_ SFX_Battle_35:: - db ( $40 | CH4 ) - dw SFX_Battle_35_Ch4 - db CH5 - dw SFX_Battle_35_Ch5 + sfx SFX_Battle_35, CH4_ | CH5_ SFX_Battle_36:: - db ( $80 | CH4 ) - dw SFX_Battle_36_Ch4 - db CH5 - dw SFX_Battle_36_Ch5 - db CH7 - dw SFX_Battle_36_Ch7 + sfx SFX_Battle_36, CH4_ | CH5_ | CH7_ SFX_Silph_Scope:: - db CH4 - dw SFX_Silph_Scope_Ch4 + sfx SFX_Silph_Scope, CH4_ diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index a49a6728..0a713cc6 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -2,595 +2,310 @@ SFX_Headers_3:: db $ff, $ff, $ff ; padding SFX_Snare1_3:: - db CH7 - dw SFX_Snare1_3_Ch7 + sfx SFX_Snare1_3, CH7_ SFX_Snare2_3:: - db CH7 - dw SFX_Snare2_3_Ch7 + sfx SFX_Snare2_3, CH7_ SFX_Snare3_3:: - db CH7 - dw SFX_Snare3_3_Ch7 + sfx SFX_Snare3_3, CH7_ SFX_Snare4_3:: - db CH7 - dw SFX_Snare4_3_Ch7 + sfx SFX_Snare4_3, CH7_ SFX_Snare5_3:: - db CH7 - dw SFX_Snare5_3_Ch7 + sfx SFX_Snare5_3, CH7_ SFX_Triangle1_3:: - db CH7 - dw SFX_Triangle1_3_Ch7 + sfx SFX_Triangle1_3, CH7_ SFX_Triangle2_3:: - db CH7 - dw SFX_Triangle2_3_Ch7 + sfx SFX_Triangle2_3, CH7_ SFX_Snare6_3:: - db CH7 - dw SFX_Snare6_3_Ch7 + sfx SFX_Snare6_3, CH7_ SFX_Snare7_3:: - db CH7 - dw SFX_Snare7_3_Ch7 + sfx SFX_Snare7_3, CH7_ SFX_Snare8_3:: - db CH7 - dw SFX_Snare8_3_Ch7 + sfx SFX_Snare8_3, CH7_ SFX_Snare9_3:: - db CH7 - dw SFX_Snare9_3_Ch7 + sfx SFX_Snare9_3, CH7_ SFX_Cymbal1_3:: - db CH7 - dw SFX_Cymbal1_3_Ch7 + sfx SFX_Cymbal1_3, CH7_ SFX_Cymbal2_3:: - db CH7 - dw SFX_Cymbal2_3_Ch7 + sfx SFX_Cymbal2_3, CH7_ SFX_Cymbal3_3:: - db CH7 - dw SFX_Cymbal3_3_Ch7 + sfx SFX_Cymbal3_3, CH7_ SFX_Muted_Snare1_3:: - db CH7 - dw SFX_Muted_Snare1_3_Ch7 + sfx SFX_Muted_Snare1_3, CH7_ SFX_Triangle3_3:: - db CH7 - dw SFX_Triangle3_3_Ch7 + sfx SFX_Triangle3_3, CH7_ SFX_Muted_Snare2_3:: - db CH7 - dw SFX_Muted_Snare2_3_Ch7 + sfx SFX_Muted_Snare2_3, CH7_ SFX_Muted_Snare3_3:: - db CH7 - dw SFX_Muted_Snare3_3_Ch7 + sfx SFX_Muted_Snare3_3, CH7_ SFX_Muted_Snare4_3:: - db CH7 - dw SFX_Muted_Snare4_3_Ch7 + sfx SFX_Muted_Snare4_3, CH7_ SFX_Cry00_3:: - db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch4 - db CH5 - dw SFX_Cry00_3_Ch5 - db CH7 - dw SFX_Cry00_3_Ch7 + sfx SFX_Cry00_3, CH4_ | CH5_ | CH7_ SFX_Cry01_3:: - db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch4 - db CH5 - dw SFX_Cry01_3_Ch5 - db CH7 - dw SFX_Cry01_3_Ch7 + sfx SFX_Cry01_3, CH4_ | CH5_ | CH7_ SFX_Cry02_3:: - db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch4 - db CH5 - dw SFX_Cry02_3_Ch5 - db CH7 - dw SFX_Cry02_3_Ch7 + sfx SFX_Cry02_3, CH4_ | CH5_ | CH7_ SFX_Cry03_3:: - db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch4 - db CH5 - dw SFX_Cry03_3_Ch5 - db CH7 - dw SFX_Cry03_3_Ch7 + sfx SFX_Cry03_3, CH4_ | CH5_ | CH7_ SFX_Cry04_3:: - db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch4 - db CH5 - dw SFX_Cry04_3_Ch5 - db CH7 - dw SFX_Cry04_3_Ch7 + sfx SFX_Cry04_3, CH4_ | CH5_ | CH7_ SFX_Cry05_3:: - db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch4 - db CH5 - dw SFX_Cry05_3_Ch5 - db CH7 - dw SFX_Cry05_3_Ch7 + sfx SFX_Cry05_3, CH4_ | CH5_ | CH7_ SFX_Cry06_3:: - db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch4 - db CH5 - dw SFX_Cry06_3_Ch5 - db CH7 - dw SFX_Cry06_3_Ch7 + sfx SFX_Cry06_3, CH4_ | CH5_ | CH7_ SFX_Cry07_3:: - db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch4 - db CH5 - dw SFX_Cry07_3_Ch5 - db CH7 - dw SFX_Cry07_3_Ch7 + sfx SFX_Cry07_3, CH4_ | CH5_ | CH7_ SFX_Cry08_3:: - db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch4 - db CH5 - dw SFX_Cry08_3_Ch5 - db CH7 - dw SFX_Cry08_3_Ch7 + sfx SFX_Cry08_3, CH4_ | CH5_ | CH7_ SFX_Cry09_3:: - db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch4 - db CH5 - dw SFX_Cry09_3_Ch5 - db CH7 - dw SFX_Cry09_3_Ch7 + sfx SFX_Cry09_3, CH4_ | CH5_ | CH7_ SFX_Cry0A_3:: - db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch4 - db CH5 - dw SFX_Cry0A_3_Ch5 - db CH7 - dw SFX_Cry0A_3_Ch7 + sfx SFX_Cry0A_3, CH4_ | CH5_ | CH7_ SFX_Cry0B_3:: - db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch4 - db CH5 - dw SFX_Cry0B_3_Ch5 - db CH7 - dw SFX_Cry0B_3_Ch7 + sfx SFX_Cry0B_3, CH4_ | CH5_ | CH7_ SFX_Cry0C_3:: - db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch4 - db CH5 - dw SFX_Cry0C_3_Ch5 - db CH7 - dw SFX_Cry0C_3_Ch7 + sfx SFX_Cry0C_3, CH4_ | CH5_ | CH7_ SFX_Cry0D_3:: - db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch4 - db CH5 - dw SFX_Cry0D_3_Ch5 - db CH7 - dw SFX_Cry0D_3_Ch7 + sfx SFX_Cry0D_3, CH4_ | CH5_ | CH7_ SFX_Cry0E_3:: - db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch4 - db CH5 - dw SFX_Cry0E_3_Ch5 - db CH7 - dw SFX_Cry0E_3_Ch7 + sfx SFX_Cry0E_3, CH4_ | CH5_ | CH7_ SFX_Cry0F_3:: - db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch4 - db CH5 - dw SFX_Cry0F_3_Ch5 - db CH7 - dw SFX_Cry0F_3_Ch7 + sfx SFX_Cry0F_3, CH4_ | CH5_ | CH7_ SFX_Cry10_3:: - db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch4 - db CH5 - dw SFX_Cry10_3_Ch5 - db CH7 - dw SFX_Cry10_3_Ch7 + sfx SFX_Cry10_3, CH4_ | CH5_ | CH7_ SFX_Cry11_3:: - db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch4 - db CH5 - dw SFX_Cry11_3_Ch5 - db CH7 - dw SFX_Cry11_3_Ch7 + sfx SFX_Cry11_3, CH4_ | CH5_ | CH7_ SFX_Cry12_3:: - db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch4 - db CH5 - dw SFX_Cry12_3_Ch5 - db CH7 - dw SFX_Cry12_3_Ch7 + sfx SFX_Cry12_3, CH4_ | CH5_ | CH7_ SFX_Cry13_3:: - db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch4 - db CH5 - dw SFX_Cry13_3_Ch5 - db CH7 - dw SFX_Cry13_3_Ch7 + sfx SFX_Cry13_3, CH4_ | CH5_ | CH7_ SFX_Cry14_3:: - db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch4 - db CH5 - dw SFX_Cry14_3_Ch5 - db CH7 - dw SFX_Cry14_3_Ch7 + sfx SFX_Cry14_3, CH4_ | CH5_ | CH7_ SFX_Cry15_3:: - db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch4 - db CH5 - dw SFX_Cry15_3_Ch5 - db CH7 - dw SFX_Cry15_3_Ch7 + sfx SFX_Cry15_3, CH4_ | CH5_ | CH7_ SFX_Cry16_3:: - db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch4 - db CH5 - dw SFX_Cry16_3_Ch5 - db CH7 - dw SFX_Cry16_3_Ch7 + sfx SFX_Cry16_3, CH4_ | CH5_ | CH7_ SFX_Cry17_3:: - db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch4 - db CH5 - dw SFX_Cry17_3_Ch5 - db CH7 - dw SFX_Cry17_3_Ch7 + sfx SFX_Cry17_3, CH4_ | CH5_ | CH7_ SFX_Cry18_3:: - db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch4 - db CH5 - dw SFX_Cry18_3_Ch5 - db CH7 - dw SFX_Cry18_3_Ch7 + sfx SFX_Cry18_3, CH4_ | CH5_ | CH7_ SFX_Cry19_3:: - db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch4 - db CH5 - dw SFX_Cry19_3_Ch5 - db CH7 - dw SFX_Cry19_3_Ch7 + sfx SFX_Cry19_3, CH4_ | CH5_ | CH7_ SFX_Cry1A_3:: - db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch4 - db CH5 - dw SFX_Cry1A_3_Ch5 - db CH7 - dw SFX_Cry1A_3_Ch7 + sfx SFX_Cry1A_3, CH4_ | CH5_ | CH7_ SFX_Cry1B_3:: - db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch4 - db CH5 - dw SFX_Cry1B_3_Ch5 - db CH7 - dw SFX_Cry1B_3_Ch7 + sfx SFX_Cry1B_3, CH4_ | CH5_ | CH7_ SFX_Cry1C_3:: - db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch4 - db CH5 - dw SFX_Cry1C_3_Ch5 - db CH7 - dw SFX_Cry1C_3_Ch7 + sfx SFX_Cry1C_3, CH4_ | CH5_ | CH7_ SFX_Cry1D_3:: - db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch4 - db CH5 - dw SFX_Cry1D_3_Ch5 - db CH7 - dw SFX_Cry1D_3_Ch7 + sfx SFX_Cry1D_3, CH4_ | CH5_ | CH7_ SFX_Cry1E_3:: - db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch4 - db CH5 - dw SFX_Cry1E_3_Ch5 - db CH7 - dw SFX_Cry1E_3_Ch7 + sfx SFX_Cry1E_3, CH4_ | CH5_ | CH7_ SFX_Cry1F_3:: - db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch4 - db CH5 - dw SFX_Cry1F_3_Ch5 - db CH7 - dw SFX_Cry1F_3_Ch7 + sfx SFX_Cry1F_3, CH4_ | CH5_ | CH7_ SFX_Cry20_3:: - db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch4 - db CH5 - dw SFX_Cry20_3_Ch5 - db CH7 - dw SFX_Cry20_3_Ch7 + sfx SFX_Cry20_3, CH4_ | CH5_ | CH7_ SFX_Cry21_3:: - db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch4 - db CH5 - dw SFX_Cry21_3_Ch5 - db CH7 - dw SFX_Cry21_3_Ch7 + sfx SFX_Cry21_3, CH4_ | CH5_ | CH7_ SFX_Cry22_3:: - db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch4 - db CH5 - dw SFX_Cry22_3_Ch5 - db CH7 - dw SFX_Cry22_3_Ch7 + sfx SFX_Cry22_3, CH4_ | CH5_ | CH7_ SFX_Cry23_3:: - db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch4 - db CH5 - dw SFX_Cry23_3_Ch5 - db CH7 - dw SFX_Cry23_3_Ch7 + sfx SFX_Cry23_3, CH4_ | CH5_ | CH7_ SFX_Cry24_3:: - db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch4 - db CH5 - dw SFX_Cry24_3_Ch5 - db CH7 - dw SFX_Cry24_3_Ch7 + sfx SFX_Cry24_3, CH4_ | CH5_ | CH7_ SFX_Cry25_3:: - db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch4 - db CH5 - dw SFX_Cry25_3_Ch5 - db CH7 - dw SFX_Cry25_3_Ch7 + sfx SFX_Cry25_3, CH4_ | CH5_ | CH7_ SFX_Get_Item1_3:: - db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch4 - db CH5 - dw SFX_Get_Item1_3_Ch5 - db CH6 - dw SFX_Get_Item1_3_Ch6 + sfx SFX_Get_Item1_3, CH4_ | CH5_ | CH6_ SFX_Get_Item2_3:: - db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch4 - db CH5 - dw SFX_Get_Item2_3_Ch5 - db CH6 - dw SFX_Get_Item2_3_Ch6 + sfx SFX_Get_Item2_3, CH4_ | CH5_ | CH6_ SFX_Tink_3:: - db CH4 - dw SFX_Tink_3_Ch4 + sfx SFX_Tink_3, CH4_ SFX_Heal_HP_3:: - db CH4 - dw SFX_Heal_HP_3_Ch4 + sfx SFX_Heal_HP_3, CH4_ SFX_Heal_Ailment_3:: - db CH4 - dw SFX_Heal_Ailment_3_Ch4 + sfx SFX_Heal_Ailment_3, CH4_ SFX_Start_Menu_3:: - db CH7 - dw SFX_Start_Menu_3_Ch7 + sfx SFX_Start_Menu_3, CH7_ SFX_Press_AB_3:: - db CH4 - dw SFX_Press_AB_3_Ch4 + sfx SFX_Press_AB_3, CH4_ SFX_Pokedex_Rating_3:: - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch4 - db CH5 - dw SFX_Pokedex_Rating_3_Ch5 - db CH6 - dw SFX_Pokedex_Rating_3_Ch6 + sfx SFX_Pokedex_Rating_3, CH4_ | CH5_ | CH6_ SFX_Get_Key_Item_3:: - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch4 - db CH5 - dw SFX_Get_Key_Item_3_Ch5 - db CH6 - dw SFX_Get_Key_Item_3_Ch6 + sfx SFX_Get_Key_Item_3, CH4_ | CH5_ | CH6_ SFX_Poisoned_3:: - db CH4 - dw SFX_Poisoned_3_Ch4 + sfx SFX_Poisoned_3, CH4_ SFX_Trade_Machine_3:: - db CH4 - dw SFX_Trade_Machine_3_Ch4 + sfx SFX_Trade_Machine_3, CH4_ SFX_Turn_On_PC_3:: - db CH4 - dw SFX_Turn_On_PC_3_Ch4 + sfx SFX_Turn_On_PC_3, CH4_ SFX_Turn_Off_PC_3:: - db CH4 - dw SFX_Turn_Off_PC_3_Ch4 + sfx SFX_Turn_Off_PC_3, CH4_ SFX_Enter_PC_3:: - db CH4 - dw SFX_Enter_PC_3_Ch4 + sfx SFX_Enter_PC_3, CH4_ SFX_Shrink_3:: - db CH4 - dw SFX_Shrink_3_Ch4 + sfx SFX_Shrink_3, CH4_ SFX_Switch_3:: - db CH4 - dw SFX_Switch_3_Ch4 + sfx SFX_Switch_3, CH4_ SFX_Healing_Machine_3:: - db CH4 - dw SFX_Healing_Machine_3_Ch4 + sfx SFX_Healing_Machine_3, CH4_ SFX_Teleport_Exit1_3:: - db CH4 - dw SFX_Teleport_Exit1_3_Ch4 + sfx SFX_Teleport_Exit1_3, CH4_ SFX_Teleport_Enter1_3:: - db CH4 - dw SFX_Teleport_Enter1_3_Ch4 + sfx SFX_Teleport_Enter1_3, CH4_ SFX_Teleport_Exit2_3:: - db CH4 - dw SFX_Teleport_Exit2_3_Ch4 + sfx SFX_Teleport_Exit2_3, CH4_ SFX_Ledge_3:: - db CH4 - dw SFX_Ledge_3_Ch4 + sfx SFX_Ledge_3, CH4_ SFX_Teleport_Enter2_3:: - db CH7 - dw SFX_Teleport_Enter2_3_Ch7 + sfx SFX_Teleport_Enter2_3, CH7_ SFX_Fly_3:: - db CH7 - dw SFX_Fly_3_Ch7 + sfx SFX_Fly_3, CH7_ SFX_Denied_3:: - db ( $40 | CH4 ) - dw SFX_Denied_3_Ch4 - db CH5 - dw SFX_Denied_3_Ch5 + sfx SFX_Denied_3, CH4_ | CH5_ SFX_Arrow_Tiles_3:: - db CH4 - dw SFX_Arrow_Tiles_3_Ch4 + sfx SFX_Arrow_Tiles_3, CH4_ SFX_Push_Boulder_3:: - db CH7 - dw SFX_Push_Boulder_3_Ch7 + sfx SFX_Push_Boulder_3, CH7_ SFX_SS_Anne_Horn_3:: - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch4 - db CH5 - dw SFX_SS_Anne_Horn_3_Ch5 + sfx SFX_SS_Anne_Horn_3, CH4_ | CH5_ SFX_Withdraw_Deposit_3:: - db CH4 - dw SFX_Withdraw_Deposit_3_Ch4 + sfx SFX_Withdraw_Deposit_3, CH4_ SFX_Cut_3:: - db CH7 - dw SFX_Cut_3_Ch7 + sfx SFX_Cut_3, CH7_ SFX_Go_Inside_3:: - db CH7 - dw SFX_Go_Inside_3_Ch7 + sfx SFX_Go_Inside_3, CH7_ SFX_Swap_3:: - db ( $40 | CH4 ) - dw SFX_Swap_3_Ch4 - db CH5 - dw SFX_Swap_3_Ch5 + sfx SFX_Swap_3, CH4_ | CH5_ SFX_59_3:: - db ( $40 | CH4 ) - dw SFX_59_3_Ch4 - db CH5 - dw SFX_59_3_Ch5 + sfx SFX_59_3, CH4_ | CH5_ SFX_Purchase_3:: - db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch4 - db CH5 - dw SFX_Purchase_3_Ch5 + sfx SFX_Purchase_3, CH4_ | CH5_ SFX_Collision_3:: - db CH4 - dw SFX_Collision_3_Ch4 + sfx SFX_Collision_3, CH4_ SFX_Go_Outside_3:: - db CH7 - dw SFX_Go_Outside_3_Ch7 + sfx SFX_Go_Outside_3, CH7_ SFX_Save_3:: - db ( $40 | CH4 ) - dw SFX_Save_3_Ch4 - db CH5 - dw SFX_Save_3_Ch5 + sfx SFX_Save_3, CH4_ | CH5_ SFX_Intro_Lunge:: - db CH7 - dw SFX_Intro_Lunge_Ch7 + sfx SFX_Intro_Lunge, CH7_ SFX_Intro_Hip:: - db CH4 - dw SFX_Intro_Hip_Ch4 + sfx SFX_Intro_Hip, CH4_ SFX_Intro_Hop:: - db CH4 - dw SFX_Intro_Hop_Ch4 + sfx SFX_Intro_Hop, CH4_ SFX_Intro_Raise:: - db CH7 - dw SFX_Intro_Raise_Ch7 + sfx SFX_Intro_Raise, CH7_ SFX_Intro_Crash:: - db CH7 - dw SFX_Intro_Crash_Ch7 + sfx SFX_Intro_Crash, CH7_ SFX_Intro_Whoosh:: - db CH7 - dw SFX_Intro_Whoosh_Ch7 + sfx SFX_Intro_Whoosh, CH7_ SFX_Slots_Stop_Wheel:: - db CH4 - dw SFX_Slots_Stop_Wheel_Ch4 + sfx SFX_Slots_Stop_Wheel, CH4_ SFX_Slots_Reward:: - db CH4 - dw SFX_Slots_Reward_Ch4 + sfx SFX_Slots_Reward, CH4_ SFX_Slots_New_Spin:: - db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch4 - db CH5 - dw SFX_Slots_New_Spin_Ch5 + sfx SFX_Slots_New_Spin, CH4_ | CH5_ SFX_Shooting_Star:: - db CH4 - dw SFX_Shooting_Star_Ch4 + sfx SFX_Shooting_Star, CH4_ diff --git a/macros.asm b/macros.asm index 43ffa0ad..d5159005 100644 --- a/macros.asm +++ b/macros.asm @@ -406,6 +406,53 @@ CH5 EQU 5 CH6 EQU 6 CH7 EQU 7 +CH0_ EQU 1 << CH0 +CH1_ EQU 1 << CH1 +CH2_ EQU 1 << CH2 +CH3_ EQU 1 << CH3 +CH4_ EQU 1 << CH4 +CH5_ EQU 1 << CH5 +CH6_ EQU 1 << CH6 +CH7_ EQU 1 << CH7 + +music: MACRO + db ((((\2 & CH0_) >> CH0) + ((\2 & CH1_) >> CH1) + ((\2 & CH2_) >> CH2) + ((\2 & CH3_) >> CH3)) - 1) << 6 | CH0 + IF \2 & CH0_ + dw \1_Ch0 + ENDC + IF \2 & CH1_ + db CH1 + dw \1_Ch1 + ENDC + IF \2 & CH2_ + db CH2 + dw \1_Ch2 + ENDC + IF \2 & CH3_ + db CH3 + dw \1_Ch3 + ENDC +ENDM + +sfx: MACRO + IF \2 & CH4_ + db ((((\2 & CH4_) >> CH4) + ((\2 & CH5_) >> CH5) + ((\2 & CH6_) >> CH6) + ((\2 & CH7_) >> CH7)) - 1) << 6 | CH4 + dw \1_Ch4 + ENDC + IF \2 & CH5_ + db CH5 + dw \1_Ch5 + ENDC + IF \2 & CH6_ + db CH6 + dw \1_Ch6 + ENDC + IF \2 & CH7_ + db CH7 + dw \1_Ch7 + ENDC +ENDM + unknownsfx0x10: MACRO db $10 db \1 -- cgit v1.2.3 From dbe2a3b1683caeab446ece53dce8d5e8b0fd0e07 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 20:57:46 -0500 Subject: Add warnings about music/sfx macro usage These are not game limitations, just restrictions for the macros to behave properly --- audio/headers/sfxheaders1.asm | 1 + macros.asm | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index c06370ca..45dad274 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -280,6 +280,7 @@ SFX_Go_Outside_1:: SFX_Save_1:: sfx SFX_Save_1, CH4_ | CH5_ +; the Pokeflute sound effect directly hijacks channel 2 SFX_Pokeflute:: db CH2 dw SFX_Pokeflute_Ch2 diff --git a/macros.asm b/macros.asm index d5159005..ca123d97 100644 --- a/macros.asm +++ b/macros.asm @@ -415,11 +415,10 @@ CH5_ EQU 1 << CH5 CH6_ EQU 1 << CH6 CH7_ EQU 1 << CH7 +; channel 0 is not optional music: MACRO db ((((\2 & CH0_) >> CH0) + ((\2 & CH1_) >> CH1) + ((\2 & CH2_) >> CH2) + ((\2 & CH3_) >> CH3)) - 1) << 6 | CH0 - IF \2 & CH0_ - dw \1_Ch0 - ENDC + dw \1_Ch0 IF \2 & CH1_ db CH1 dw \1_Ch1 @@ -434,6 +433,7 @@ music: MACRO ENDC ENDM +; do not start a sound effect with channel 5 or 6, only channel 4 or 7 sfx: MACRO IF \2 & CH4_ db ((((\2 & CH4_) >> CH4) + ((\2 & CH5_) >> CH5) + ((\2 & CH6_) >> CH6) + ((\2 & CH7_) >> CH7)) - 1) << 6 | CH4 -- cgit v1.2.3 From 5207a14af34f9b84a9e40cc1d4988a0858a4a4e6 Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 22:08:13 -0500 Subject: Redo audio header macro --- audio.asm | 6 +- audio/engine_1.asm | 82 ++++++------- audio/engine_2.asm | 90 +++++++------- audio/engine_3.asm | 78 ++++++------ audio/headers/musicheaders1.asm | 40 +++--- audio/headers/musicheaders2.asm | 14 +-- audio/headers/musicheaders3.asm | 36 +++--- audio/headers/sfxheaders1.asm | 191 ++++++++++++++--------------- audio/headers/sfxheaders2.asm | 238 ++++++++++++++++++------------------ audio/headers/sfxheaders3.asm | 206 +++++++++++++++---------------- engine/battle/core.asm | 6 +- engine/battle/end_of_battle.asm | 2 +- engine/evolution.asm | 2 +- engine/hidden_object_functions7.asm | 2 +- engine/items/items.asm | 6 +- engine/overworld/elevator.asm | 2 +- home.asm | 2 +- home/audio.asm | 8 +- home/overworld.asm | 4 +- macros.asm | 77 ++++-------- scripts/pewterpokecenter.asm | 2 +- 21 files changed, 529 insertions(+), 565 deletions(-) diff --git a/audio.asm b/audio.asm index 5842b87c..0a344ae7 100644 --- a/audio.asm +++ b/audio.asm @@ -477,7 +477,7 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 - ld [wChannelSoundIDs + CH4], 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:: .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? + ld [wChannelSoundIDs + Ch4], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -542,7 +542,7 @@ Music_PokeFluteInBattle:: ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers - ld hl, wChannelCommandPointers + CH4 * 2 + ld hl, wChannelCommandPointers + Ch4 * 2 ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch5 diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 36f5db5a..f762da29 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,7 +1,7 @@ ; The first of three duplicated sound engines. Audio1_UpdateMusic:: - ld c, CH0 + ld c, Ch0 .loop ld b, 0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio1_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch4 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio1_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp CH7 + cp Ch7 jr nz, .loop ret @@ -46,9 +46,9 @@ Audio1_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch4 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -171,7 +171,7 @@ Audio1_endchannel: bit BIT_CHANNEL_CALL, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch3 jr nc, .noiseOrSfxChannel jr .disableChannelOutput .noiseOrSfxChannel @@ -179,7 +179,7 @@ Audio1_endchannel: ld hl, wChannelFlags2 add hl, bc res BIT_EXECUTE_MUSIC, [hl] - cp CH6 + cp Ch6 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output ld a, $0 @@ -223,19 +223,19 @@ Audio1_endchannel: and [hl] ld [rNR51], a .asm_9248 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp CRY_SFX_START jr nc, .asm_9251 jr .skipCry .asm_9251 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp CRY_SFX_END jr z, .skipCry jr c, .cry jr .skipCry .cry ld a, c - cp CH4 + cp Ch4 jr z, .asm_9265 call Audio1_GoBackOneCommandIfCry ret c @@ -336,14 +336,14 @@ Audio1_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch3 jr z, .noiseChannel ; noise channel has 0 params call Audio1_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .skipChannel3 ld hl, wSfxWaveInstrument jr .channel3 @@ -477,7 +477,7 @@ Audio1_tempo: cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel call Audio1_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -520,10 +520,10 @@ Audio1_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch7], a .skip jp Audio1_endchannel @@ -576,7 +576,7 @@ Audio1_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio1_unknownsfx0x10 ld a, c - cp CH3 ; is this a noise or sfx channel? + cp Ch3 ; is this a noise or sfx channel? jr c, Audio1_unknownsfx0x10 ; no ld b, 0 ld hl, wChannelFlags2 @@ -606,7 +606,7 @@ Audio1_unknownsfx0x20: call Audio1_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch7 ld a, 0 jr z, .skip ; Channels 1 through 3 have 2 registers that control frequency, but the noise @@ -626,7 +626,7 @@ Audio1_unknownsfx0x20: Audio1_unknownsfx0x10: ld a, c - cp CH4 + cp Ch4 jr c, Audio1_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? @@ -642,7 +642,7 @@ Audio1_unknownsfx0x10: Audio1_note: ld a, c - cp CH3 + cp Ch3 jr nz, Audio1_notelength ; if not noise channel ld a, d and $f0 @@ -690,7 +690,7 @@ Audio1_notelength: ld l, b call Audio1_MultiplyAdd ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -700,7 +700,7 @@ Audio1_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch7 jr z, .skip ; if noise channel call Audio1_SetSfxTempo ld a, [wSfxTempo] @@ -740,10 +740,10 @@ Audio1_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch4 jr nc, .next ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -751,9 +751,9 @@ Audio1_notepitch: ; fall through .next ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 .channel3 ld b, 0 @@ -789,10 +789,10 @@ Audio1_notepitch: .skipPitchBend push de ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld d, 0 ld e, a add hl, de @@ -837,12 +837,12 @@ Audio1_EnableChannelOutput: or [hl] ; set this channel's bits ld d, a ld a, c - cp CH7 + cp Ch7 jr z, .noiseChannelOrNoSfx - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -872,9 +872,9 @@ Audio1_ApplyDutyAndSoundLength: add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch2 jr z, .skipDuty ; if music channel 3 - cp CH6 + cp Ch6 jr z, .skipDuty ; if sfx channel 3 ; include duty (except on channel 3 which doesn't have it) ld a, d @@ -893,15 +893,15 @@ Audio1_ApplyDutyAndSoundLength: Audio1_ApplyWavePatternAndFrequency: ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch2 jr z, .next ld de, wSfxWaveInstrument .next @@ -1005,7 +1005,7 @@ Audio1_GoBackOneCommandIfCry: Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp CRY_SFX_START jr nc, .next jr .no @@ -1541,7 +1541,7 @@ Audio1_PlaySound:: add hl, de ld [hl], a ld a, e - cp CH4 + cp Ch4 jr nz, .asm_9a2b ld a, $8 ld [rNR10], a ; sweep off @@ -1643,7 +1643,7 @@ Audio1_PlaySound:: ld a, [wSoundID] ld [hl], a pop af - cp CH3 + cp Ch3 jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc @@ -1675,12 +1675,12 @@ Audio1_PlaySound:: jr c, .cry jr .done .cry - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer + ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx wave channel pointer ld de, Audio1_CryEndchannel ld [hl], e inc hl diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 3928d092..7fdc7a06 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,7 +1,7 @@ ; The second of three duplicated sound engines. Audio2_UpdateMusic:: - ld c, CH0 + ld c, Ch0 .loop ld b, $0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio2_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch4 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio2_UpdateMusic:: .nextChannel ld a, c inc c - cp CH7 + cp Ch7 jr nz, .loop ret @@ -52,9 +52,9 @@ Audio2_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch4 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -160,7 +160,7 @@ Audio2_PlayNextNote: res 4, [hl] res 5, [hl] ld a, c - cp CH4 + cp Ch4 jr nz, .beginChecks ld a, [wLowHealthAlarm] ;low health alarm enabled? bit 7, a @@ -180,7 +180,7 @@ Audio2_endchannel: bit 1, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch3 jr nc, .noiseOrSfxChannel jr .asm_219c0 .noiseOrSfxChannel @@ -188,7 +188,7 @@ Audio2_endchannel: ld hl, wChannelFlags2 add hl, bc res 0, [hl] - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ld a, $0 ld [rNR30], a @@ -231,19 +231,19 @@ Audio2_endchannel: and [hl] ld [rNR51], a .asm_219c9 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_219d2 jr .asm_219ef .asm_219d2 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $86 jr z, .asm_219ef jr c, .asm_219dd jr .asm_219ef .asm_219dd ld a, c - cp CH4 + cp Ch4 jr z, .asm_219e6 call Audio2_21e6d ret c @@ -344,14 +344,14 @@ Audio2_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch3 jr z, .noiseChannel ; noise channel has 0 params call Audio2_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 ld hl, wSfxWaveInstrument jr .sfxChannel3 @@ -471,7 +471,7 @@ Audio2_tempo: cp $ed ; is this command a tempo? jr nz, Audio2_stereopanning ; no ld a, c ; yes - cp CH4 + cp Ch4 jr nc, .sfxChannel call Audio2_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -514,10 +514,10 @@ Audio2_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch7], a .skip jp Audio2_endchannel @@ -570,7 +570,7 @@ Audio2_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio2_unknownsfx0x10 ; no ld a, c - cp CH3 ; is this a noise or sfx channel? + cp Ch3 ; is this a noise or sfx channel? jr c, Audio2_unknownsfx0x10 ; no ld b, $0 ld hl, wChannelFlags2 @@ -596,7 +596,7 @@ Audio2_unknownsfx0x20: call Audio2_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de @@ -613,7 +613,7 @@ Audio2_unknownsfx0x20: Audio2_unknownsfx0x10: ld a, c - cp CH4 + cp Ch4 jr c, Audio2_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? @@ -629,7 +629,7 @@ Audio2_unknownsfx0x10: Audio2_note: ld a, c - cp CH3 + cp Ch3 jr nz, Audio2_notelength ; if not noise channel ld a, d and $f0 @@ -677,7 +677,7 @@ Audio2_notelength: ld l, b call Audio2_22006 ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -687,7 +687,7 @@ Audio2_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch7 jr z, .skip ; if noise channel call Audio2_21e2f ld a, [wSfxTempo] @@ -727,9 +727,9 @@ Audio2_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -737,9 +737,9 @@ Audio2_notepitch: ; fall through .sfxChannel ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 @@ -775,9 +775,9 @@ Audio2_notepitch: .asm_21d39 push de ld a, c - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld d, $0 ld e, a add hl, de @@ -822,11 +822,11 @@ Audio2_21d79: or [hl] ld d, a ld a, c - cp CH7 + cp Ch7 jr z, .sfxNoiseChannel - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -854,9 +854,9 @@ Audio2_21daa: add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch2 jr z, .channel3 ; if music channel 3 - cp CH6 + cp Ch6 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -874,15 +874,15 @@ Audio2_21daa: Audio2_21dcc: ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch2 jr z, .musicChannel3 ld de, wSfxWaveInstrument .musicChannel3 @@ -921,7 +921,7 @@ Audio2_21dcc: inc hl ld [hl], d ld a, c - cp CH4 + cp Ch4 jr c, .musicChannel call Audio2_21e56 .musicChannel @@ -929,7 +929,7 @@ Audio2_21dcc: Audio2_21e19: ld a, c - cp CH4 + cp Ch4 jr nz, .asm_21e2e ld a, [wLowHealthAlarm] bit 7, a @@ -1008,7 +1008,7 @@ Audio2_21e6d: ret Audio2_21e8b: - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_21e94 jr .asm_21e9a @@ -1025,9 +1025,9 @@ Audio2_21e8b: ret Audio2_21e9f: - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld b, a - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] or b cp $9d jr nc, .asm_21ead @@ -1313,7 +1313,7 @@ Audio2_22017: ld d, [hl] ld a, b .loop - cp CH7 + cp Ch7 jr z, .done sra d rr e @@ -1682,12 +1682,12 @@ Audio2_2224e: jr c, .asm_222b5 jr .asm_222d4 .asm_222b5 - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer ld de, Noise2_endchannel ld [hl], e inc hl diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 33baa5c6..78e832b4 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,7 +1,7 @@ ; The third of three duplicated sound engines. Audio3_UpdateMusic:: - ld c, CH0 + ld c, Ch0 .loop ld b, $0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio3_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch4 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio3_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp CH7 + cp Ch7 jr nz, .loop ret @@ -52,9 +52,9 @@ Audio3_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch4 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -173,7 +173,7 @@ Audio3_endchannel: bit 1, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch3 jr nc, .noiseOrSfxChannel jr .asm_7d2b3 .noiseOrSfxChannel @@ -181,7 +181,7 @@ Audio3_endchannel: ld hl, wChannelFlags2 add hl, bc res 0, [hl] - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ld a, $0 ld [rNR30], a @@ -224,19 +224,19 @@ Audio3_endchannel: and [hl] ld [rNR51], a .asm_7d2bc - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_7d2c5 jr .asm_7d2e2 .asm_7d2c5 - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $86 jr z, .asm_7d2e2 jr c, .asm_7d2d0 jr .asm_7d2e2 .asm_7d2d0 ld a, c - cp CH4 + cp Ch4 jr z, .asm_7d2d9 call Audio3_7d73b ret c @@ -337,14 +337,14 @@ Audio3_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch3 jr z, .noiseChannel ; noise channel has 0 params call Audio3_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notChannel3 ld hl, wSfxWaveInstrument jr .sfxChannel3 @@ -464,7 +464,7 @@ Audio3_tempo: cp $ed ; is this command a tempo? jr nz, Audio3_stereopanning ; no ld a, c ; yes - cp CH4 + cp Ch4 jr nc, .sfxChannel call Audio3_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -507,10 +507,10 @@ Audio3_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch7] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch7], a .skip jp Audio3_endchannel @@ -563,7 +563,7 @@ Audio3_unknownsfx0x20: cp $20 ; is this command an unknownsfx0x20? jr nz, Audio3_unknownsfx0x10 ; no ld a, c - cp CH3 ; is this a noise or sfx channel? + cp Ch3 ; is this a noise or sfx channel? jr c, Audio3_unknownsfx0x10 ; no ld b, $0 ld hl, wChannelFlags2 @@ -589,7 +589,7 @@ Audio3_unknownsfx0x20: call Audio3_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de @@ -606,7 +606,7 @@ Audio3_unknownsfx0x20: Audio3_unknownsfx0x10: ld a, c - cp CH4 + cp Ch4 jr c, Audio3_note ; if not a sfx ld a, d cp $10 ; is this command an unknownsfx0x10? @@ -622,7 +622,7 @@ Audio3_unknownsfx0x10: Audio3_note: ld a, c - cp CH3 + cp Ch3 jr nz, Audio3_notelength ; if not noise channel ld a, d and $f0 @@ -670,7 +670,7 @@ Audio3_notelength: ld l, b call Audio3_7d8bb ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -680,7 +680,7 @@ Audio3_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch7 jr z, .skip ; if noise channel call Audio3_7d707 ld a, [wSfxTempo] @@ -720,9 +720,9 @@ Audio3_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch4 jr nc, .sfxChannel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -730,9 +730,9 @@ Audio3_notepitch: ; fall through .sfxChannel ld a, c - cp CH2 + cp Ch2 jr z, .musicChannel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 @@ -768,9 +768,9 @@ Audio3_notepitch: .asm_7d62c push de ld a, c - cp CH4 + cp Ch4 jr nc, .skip ; if sfx Channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld d, $0 ld e, a add hl, de @@ -815,11 +815,11 @@ Audio3_7d66c: or [hl] ld d, a ld a, c - cp CH7 + cp Ch7 jr z, .sfxNoiseChannel - cp CH4 + cp Ch4 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 add hl, bc ld a, [hl] and a @@ -847,9 +847,9 @@ Audio3_7d69d: add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch2 jr z, .channel3 ; if music channel 3 - cp CH6 + cp Ch6 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -867,15 +867,15 @@ Audio3_7d69d: Audio3_7d6bf: ld a, c - cp CH2 + cp Ch2 jr z, .channel3 - cp CH6 + cp Ch6 jr nz, .notSfxChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch2 jr z, .musicChannel3 ld de, wSfxWaveInstrument .musicChannel3 @@ -977,7 +977,7 @@ Audio3_7d73b: ret Audio3_7d759: - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp $14 jr nc, .asm_7d762 jr .asm_7d768 @@ -1631,12 +1631,12 @@ Audio3_7db03: jr c, .asm_7db6a jr .asm_7db89 .asm_7db6a - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer ld de, Noise3_endchannel ld [hl], e inc hl diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 703c5746..38594d41 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,66 +1,66 @@ Music_PalletTown:: - music Music_PalletTown, CH0_ | CH1_ | CH2_ + audio Music_PalletTown, Ch0, Ch1, Ch2 Music_Pokecenter:: - music Music_Pokecenter, CH0_ | CH1_ | CH2_ + audio Music_Pokecenter, Ch0, Ch1, Ch2 Music_Gym:: - music Music_Gym, CH0_ | CH1_ | CH2_ + audio Music_Gym, Ch0, Ch1, Ch2 ; Viridian City, Pewter City, Saffron City Music_Cities1:: - music Music_Cities1, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Cities1, Ch0, Ch1, Ch2, Ch3 ; Cerulean City, Fuchsia City Music_Cities2:: - music Music_Cities2, CH0_ | CH1_ | CH2_ + audio Music_Cities2, Ch0, Ch1, Ch2 Music_Celadon:: - music Music_Celadon, CH0_ | CH1_ | CH2_ + audio Music_Celadon, Ch0, Ch1, Ch2 Music_Cinnabar:: - music Music_Cinnabar, CH0_ | CH1_ | CH2_ + audio Music_Cinnabar, Ch0, Ch1, Ch2 Music_Vermilion:: - music Music_Vermilion, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3 Music_Lavender:: - music Music_Lavender, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Lavender, Ch0, Ch1, Ch2, Ch3 Music_SSAnne:: - music Music_SSAnne, CH0_ | CH1_ | CH2_ + audio Music_SSAnne, Ch0, Ch1, Ch2 Music_MeetProfOak:: - music Music_MeetProfOak, CH0_ | CH1_ | CH2_ + audio Music_MeetProfOak, Ch0, Ch1, Ch2 Music_MeetRival:: - music Music_MeetRival, CH0_ | CH1_ | CH2_ + audio Music_MeetRival, Ch0, Ch1, Ch2 Music_MuseumGuy:: - music Music_MuseumGuy, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3 Music_SafariZone:: - music Music_SafariZone, CH0_ | CH1_ | CH2_ + audio Music_SafariZone, Ch0, Ch1, Ch2 Music_PkmnHealed:: - music Music_PkmnHealed, CH0_ | CH1_ | CH2_ + audio Music_PkmnHealed, Ch0, Ch1, Ch2 ; Routes 1 and 2 Music_Routes1:: - music Music_Routes1, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Routes1, Ch0, Ch1, Ch2, Ch3 ; Routes 24 and 25 Music_Routes2:: - music Music_Routes2, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Routes2, Ch0, Ch1, Ch2, Ch3 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - music Music_Routes3, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Routes3, Ch0, Ch1, Ch2, Ch3 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - music Music_Routes4, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Routes4, Ch0, Ch1, Ch2, Ch3 ; Route 23, Indigo Plateau Music_IndigoPlateau:: - music Music_IndigoPlateau, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index c03c7dc9..45557420 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,20 +1,20 @@ Music_GymLeaderBattle:: - music Music_GymLeaderBattle, CH0_ | CH1_ | CH2_ + audio Music_GymLeaderBattle, Ch0, Ch1, Ch2 Music_TrainerBattle:: - music Music_TrainerBattle, CH0_ | CH1_ | CH2_ + audio Music_TrainerBattle, Ch0, Ch1, Ch2 Music_WildBattle:: - music Music_WildBattle, CH0_ | CH1_ | CH2_ + audio Music_WildBattle, Ch0, Ch1, Ch2 Music_FinalBattle:: - music Music_FinalBattle, CH0_ | CH1_ | CH2_ + audio Music_FinalBattle, Ch0, Ch1, Ch2 Music_DefeatedTrainer:: - music Music_DefeatedTrainer, CH0_ | CH1_ | CH2_ + audio Music_DefeatedTrainer, Ch0, Ch1, Ch2 Music_DefeatedWildMon:: - music Music_DefeatedWildMon, CH0_ | CH1_ | CH2_ + audio Music_DefeatedWildMon, Ch0, Ch1, Ch2 Music_DefeatedGymLeader:: - music Music_DefeatedGymLeader, CH0_ | CH1_ | CH2_ + audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 350a1618..90798882 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,56 +1,56 @@ Music_TitleScreen:: - music Music_TitleScreen, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3 Music_Credits:: - music Music_Credits, CH0_ | CH1_ | CH2_ + audio Music_Credits, Ch0, Ch1, Ch2 Music_HallOfFame:: - music Music_HallOfFame, CH0_ | CH1_ | CH2_ + audio Music_HallOfFame, Ch0, Ch1, Ch2 Music_OaksLab:: - music Music_OaksLab, CH0_ | CH1_ | CH2_ + audio Music_OaksLab, Ch0, Ch1, Ch2 Music_JigglypuffSong:: - music Music_JigglypuffSong, CH0_ | CH1_ + audio Music_JigglypuffSong, Ch0, Ch1 Music_BikeRiding:: - music Music_BikeRiding, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3 Music_Surfing:: - music Music_Surfing, CH0_ | CH1_ | CH2_ + audio Music_Surfing, Ch0, Ch1, Ch2 Music_GameCorner:: - music Music_GameCorner, CH0_ | CH1_ | CH2_ + audio Music_GameCorner, Ch0, Ch1, Ch2 Music_IntroBattle:: - music Music_IntroBattle, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: - music Music_Dungeon1, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - music Music_Dungeon2, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - music Music_Dungeon3, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3 Music_CinnabarMansion:: - music Music_CinnabarMansion, CH0_ | CH1_ | CH2_ | CH3_ + audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3 Music_PokemonTower:: - music Music_PokemonTower, CH0_ | CH1_ | CH2_ + audio Music_PokemonTower, Ch0, Ch1, Ch2 Music_SilphCo:: - music Music_SilphCo, CH0_ | CH1_ | CH2_ + audio Music_SilphCo, Ch0, Ch1, Ch2 Music_MeetEvilTrainer:: - music Music_MeetEvilTrainer, CH0_ | CH1_ | CH2_ + audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2 Music_MeetFemaleTrainer:: - music Music_MeetFemaleTrainer, CH0_ | CH1_ | CH2_ + audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2 Music_MeetMaleTrainer:: - music Music_MeetMaleTrainer, CH0_ | CH1_ | CH2_ + audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 45dad274..72a69646 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -2,288 +2,287 @@ SFX_Headers_1:: db $ff, $ff, $ff ; padding SFX_Snare1_1:: - sfx SFX_Snare1_1, CH7_ + audio SFX_Snare1_1, Ch7 SFX_Snare2_1:: - sfx SFX_Snare2_1, CH7_ + audio SFX_Snare2_1, Ch7 SFX_Snare3_1:: - sfx SFX_Snare3_1, CH7_ + audio SFX_Snare3_1, Ch7 SFX_Snare4_1:: - sfx SFX_Snare4_1, CH7_ + audio SFX_Snare4_1, Ch7 SFX_Snare5_1:: - sfx SFX_Snare5_1, CH7_ + audio SFX_Snare5_1, Ch7 SFX_Triangle1_1:: - sfx SFX_Triangle1_1, CH7_ + audio SFX_Triangle1_1, Ch7 SFX_Triangle2_1:: - sfx SFX_Triangle2_1, CH7_ + audio SFX_Triangle2_1, Ch7 SFX_Snare6_1:: - sfx SFX_Snare6_1, CH7_ + audio SFX_Snare6_1, Ch7 SFX_Snare7_1:: - sfx SFX_Snare7_1, CH7_ + audio SFX_Snare7_1, Ch7 SFX_Snare8_1:: - sfx SFX_Snare8_1, CH7_ + audio SFX_Snare8_1, Ch7 SFX_Snare9_1:: - sfx SFX_Snare9_1, CH7_ + audio SFX_Snare9_1, Ch7 SFX_Cymbal1_1:: - sfx SFX_Cymbal1_1, CH7_ + audio SFX_Cymbal1_1, Ch7 SFX_Cymbal2_1:: - sfx SFX_Cymbal2_1, CH7_ + audio SFX_Cymbal2_1, Ch7 SFX_Cymbal3_1:: - sfx SFX_Cymbal3_1, CH7_ + audio SFX_Cymbal3_1, Ch7 SFX_Muted_Snare1_1:: - sfx SFX_Muted_Snare1_1, CH7_ + audio SFX_Muted_Snare1_1, Ch7 SFX_Triangle3_1:: - sfx SFX_Triangle3_1, CH7_ + audio SFX_Triangle3_1, Ch7 SFX_Muted_Snare2_1:: - sfx SFX_Muted_Snare2_1, CH7_ + audio SFX_Muted_Snare2_1, Ch7 SFX_Muted_Snare3_1:: - sfx SFX_Muted_Snare3_1, CH7_ + audio SFX_Muted_Snare3_1, Ch7 SFX_Muted_Snare4_1:: - sfx SFX_Muted_Snare4_1, CH7_ + audio SFX_Muted_Snare4_1, Ch7 SFX_Cry00_1:: - sfx SFX_Cry00_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry00_1, Ch4, Ch5, Ch7 SFX_Cry01_1:: - sfx SFX_Cry01_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry01_1, Ch4, Ch5, Ch7 SFX_Cry02_1:: - sfx SFX_Cry02_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry02_1, Ch4, Ch5, Ch7 SFX_Cry03_1:: - sfx SFX_Cry03_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry03_1, Ch4, Ch5, Ch7 SFX_Cry04_1:: - sfx SFX_Cry04_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry04_1, Ch4, Ch5, Ch7 SFX_Cry05_1:: - sfx SFX_Cry05_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry05_1, Ch4, Ch5, Ch7 SFX_Cry06_1:: - sfx SFX_Cry06_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry06_1, Ch4, Ch5, Ch7 SFX_Cry07_1:: - sfx SFX_Cry07_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry07_1, Ch4, Ch5, Ch7 SFX_Cry08_1:: - sfx SFX_Cry08_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry08_1, Ch4, Ch5, Ch7 SFX_Cry09_1:: - sfx SFX_Cry09_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry09_1, Ch4, Ch5, Ch7 SFX_Cry0A_1:: - sfx SFX_Cry0A_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry0A_1, Ch4, Ch5, Ch7 SFX_Cry0B_1:: - sfx SFX_Cry0B_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry0B_1, Ch4, Ch5, Ch7 SFX_Cry0C_1:: - sfx SFX_Cry0C_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry0C_1, Ch4, Ch5, Ch7 SFX_Cry0D_1:: - sfx SFX_Cry0D_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry0D_1, Ch4, Ch5, Ch7 SFX_Cry0E_1:: - sfx SFX_Cry0E_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry0E_1, Ch4, Ch5, Ch7 SFX_Cry0F_1:: - sfx SFX_Cry0F_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry0F_1, Ch4, Ch5, Ch7 SFX_Cry10_1:: - sfx SFX_Cry10_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry10_1, Ch4, Ch5, Ch7 SFX_Cry11_1:: - sfx SFX_Cry11_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry11_1, Ch4, Ch5, Ch7 SFX_Cry12_1:: - sfx SFX_Cry12_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry12_1, Ch4, Ch5, Ch7 SFX_Cry13_1:: - sfx SFX_Cry13_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry13_1, Ch4, Ch5, Ch7 SFX_Cry14_1:: - sfx SFX_Cry14_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry14_1, Ch4, Ch5, Ch7 SFX_Cry15_1:: - sfx SFX_Cry15_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry15_1, Ch4, Ch5, Ch7 SFX_Cry16_1:: - sfx SFX_Cry16_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry16_1, Ch4, Ch5, Ch7 SFX_Cry17_1:: - sfx SFX_Cry17_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry17_1, Ch4, Ch5, Ch7 SFX_Cry18_1:: - sfx SFX_Cry18_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry18_1, Ch4, Ch5, Ch7 SFX_Cry19_1:: - sfx SFX_Cry19_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry19_1, Ch4, Ch5, Ch7 SFX_Cry1A_1:: - sfx SFX_Cry1A_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry1A_1, Ch4, Ch5, Ch7 SFX_Cry1B_1:: - sfx SFX_Cry1B_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry1B_1, Ch4, Ch5, Ch7 SFX_Cry1C_1:: - sfx SFX_Cry1C_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry1C_1, Ch4, Ch5, Ch7 SFX_Cry1D_1:: - sfx SFX_Cry1D_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry1D_1, Ch4, Ch5, Ch7 SFX_Cry1E_1:: - sfx SFX_Cry1E_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry1E_1, Ch4, Ch5, Ch7 SFX_Cry1F_1:: - sfx SFX_Cry1F_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry1F_1, Ch4, Ch5, Ch7 SFX_Cry20_1:: - sfx SFX_Cry20_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry20_1, Ch4, Ch5, Ch7 SFX_Cry21_1:: - sfx SFX_Cry21_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry21_1, Ch4, Ch5, Ch7 SFX_Cry22_1:: - sfx SFX_Cry22_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry22_1, Ch4, Ch5, Ch7 SFX_Cry23_1:: - sfx SFX_Cry23_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry23_1, Ch4, Ch5, Ch7 SFX_Cry24_1:: - sfx SFX_Cry24_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry24_1, Ch4, Ch5, Ch7 SFX_Cry25_1:: - sfx SFX_Cry25_1, CH4_ | CH5_ | CH7_ + audio SFX_Cry25_1, Ch4, Ch5, Ch7 SFX_Get_Item1_1:: - sfx SFX_Get_Item1_1, CH4_ | CH5_ | CH6_ + audio SFX_Get_Item1_1, Ch4, Ch5, Ch6 SFX_Get_Item2_1:: - sfx SFX_Get_Item2_1, CH4_ | CH5_ | CH6_ + audio SFX_Get_Item2_1, Ch4, Ch5, Ch6 SFX_Tink_1:: - sfx SFX_Tink_1, CH4_ + audio SFX_Tink_1, Ch4 SFX_Heal_HP_1:: - sfx SFX_Heal_HP_1, CH4_ + audio SFX_Heal_HP_1, Ch4 SFX_Heal_Ailment_1:: - sfx SFX_Heal_Ailment_1, CH4_ + audio SFX_Heal_Ailment_1, Ch4 SFX_Start_Menu_1:: - sfx SFX_Start_Menu_1, CH7_ + audio SFX_Start_Menu_1, Ch7 SFX_Press_AB_1:: - sfx SFX_Press_AB_1, CH4_ + audio SFX_Press_AB_1, Ch4 SFX_Pokedex_Rating_1:: - sfx SFX_Pokedex_Rating_1, CH4_ | CH5_ | CH6_ + audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6 SFX_Get_Key_Item_1:: - sfx SFX_Get_Key_Item_1, CH4_ | CH5_ | CH6_ + audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6 SFX_Poisoned_1:: - sfx SFX_Poisoned_1, CH4_ + audio SFX_Poisoned_1, Ch4 SFX_Trade_Machine_1:: - sfx SFX_Trade_Machine_1, CH4_ + audio SFX_Trade_Machine_1, Ch4 SFX_Turn_On_PC_1:: - sfx SFX_Turn_On_PC_1, CH4_ + audio SFX_Turn_On_PC_1, Ch4 SFX_Turn_Off_PC_1:: - sfx SFX_Turn_Off_PC_1, CH4_ + audio SFX_Turn_Off_PC_1, Ch4 SFX_Enter_PC_1:: - sfx SFX_Enter_PC_1, CH4_ + audio SFX_Enter_PC_1, Ch4 SFX_Shrink_1:: - sfx SFX_Shrink_1, CH4_ + audio SFX_Shrink_1, Ch4 SFX_Switch_1:: - sfx SFX_Switch_1, CH4_ + audio SFX_Switch_1, Ch4 SFX_Healing_Machine_1:: - sfx SFX_Healing_Machine_1, CH4_ + audio SFX_Healing_Machine_1, Ch4 SFX_Teleport_Exit1_1:: - sfx SFX_Teleport_Exit1_1, CH4_ + audio SFX_Teleport_Exit1_1, Ch4 SFX_Teleport_Enter1_1:: - sfx SFX_Teleport_Enter1_1, CH4_ + audio SFX_Teleport_Enter1_1, Ch4 SFX_Teleport_Exit2_1:: - sfx SFX_Teleport_Exit2_1, CH4_ + audio SFX_Teleport_Exit2_1, Ch4 SFX_Ledge_1:: - sfx SFX_Ledge_1, CH4_ + audio SFX_Ledge_1, Ch4 SFX_Teleport_Enter2_1:: - sfx SFX_Teleport_Enter2_1, CH7_ + audio SFX_Teleport_Enter2_1, Ch7 SFX_Fly_1:: - sfx SFX_Fly_1, CH7_ + audio SFX_Fly_1, Ch7 SFX_Denied_1:: - sfx SFX_Denied_1, CH4_ | CH5_ + audio SFX_Denied_1, Ch4, Ch5 SFX_Arrow_Tiles_1:: - sfx SFX_Arrow_Tiles_1, CH4_ + audio SFX_Arrow_Tiles_1, Ch4 SFX_Push_Boulder_1:: - sfx SFX_Push_Boulder_1, CH7_ + audio SFX_Push_Boulder_1, Ch7 SFX_SS_Anne_Horn_1:: - sfx SFX_SS_Anne_Horn_1, CH4_ | CH5_ + audio SFX_SS_Anne_Horn_1, Ch4, Ch5 SFX_Withdraw_Deposit_1:: - sfx SFX_Withdraw_Deposit_1, CH4_ + audio SFX_Withdraw_Deposit_1, Ch4 SFX_Cut_1:: - sfx SFX_Cut_1, CH7_ + audio SFX_Cut_1, Ch7 SFX_Go_Inside_1:: - sfx SFX_Go_Inside_1, CH7_ + audio SFX_Go_Inside_1, Ch7 SFX_Swap_1:: - sfx SFX_Swap_1, CH4_ | CH5_ + audio SFX_Swap_1, Ch4, Ch5 SFX_59_1:: - sfx SFX_59_1, CH4_ | CH5_ + audio SFX_59_1, Ch4, Ch5 SFX_Purchase_1:: - sfx SFX_Purchase_1, CH4_ | CH5_ + audio SFX_Purchase_1, Ch4, Ch5 SFX_Collision_1:: - sfx SFX_Collision_1, CH4_ + audio SFX_Collision_1, Ch4 SFX_Go_Outside_1:: - sfx SFX_Go_Outside_1, CH7_ + audio SFX_Go_Outside_1, Ch7 SFX_Save_1:: - sfx SFX_Save_1, CH4_ | CH5_ + audio SFX_Save_1, Ch4, Ch5 ; the Pokeflute sound effect directly hijacks channel 2 SFX_Pokeflute:: - db CH2 - dw SFX_Pokeflute_Ch2 + audio SFX_Pokeflute, Ch2 SFX_Safari_Zone_PA:: - sfx SFX_Safari_Zone_PA, CH4_ + audio SFX_Safari_Zone_PA, Ch4 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 825f9405..b96a764f 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -2,358 +2,358 @@ SFX_Headers_2:: db $ff, $ff, $ff ; padding SFX_Snare1_2:: - sfx SFX_Snare1_2, CH7_ + audio SFX_Snare1_2, Ch7 SFX_Snare2_2:: - sfx SFX_Snare2_2, CH7_ + audio SFX_Snare2_2, Ch7 SFX_Snare3_2:: - sfx SFX_Snare3_2, CH7_ + audio SFX_Snare3_2, Ch7 SFX_Snare4_2:: - sfx SFX_Snare4_2, CH7_ + audio SFX_Snare4_2, Ch7 SFX_Snare5_2:: - sfx SFX_Snare5_2, CH7_ + audio SFX_Snare5_2, Ch7 SFX_Triangle1_2:: - sfx SFX_Triangle1_2, CH7_ + audio SFX_Triangle1_2, Ch7 SFX_Triangle2_2:: - sfx SFX_Triangle2_2, CH7_ + audio SFX_Triangle2_2, Ch7 SFX_Snare6_2:: - sfx SFX_Snare6_2, CH7_ + audio SFX_Snare6_2, Ch7 SFX_Snare7_2:: - sfx SFX_Snare7_2, CH7_ + audio SFX_Snare7_2, Ch7 SFX_Snare8_2:: - sfx SFX_Snare8_2, CH7_ + audio SFX_Snare8_2, Ch7 SFX_Snare9_2:: - sfx SFX_Snare9_2, CH7_ + audio SFX_Snare9_2, Ch7 SFX_Cymbal1_2:: - sfx SFX_Cymbal1_2, CH7_ + audio SFX_Cymbal1_2, Ch7 SFX_Cymbal2_2:: - sfx SFX_Cymbal2_2, CH7_ + audio SFX_Cymbal2_2, Ch7 SFX_Cymbal3_2:: - sfx SFX_Cymbal3_2, CH7_ + audio SFX_Cymbal3_2, Ch7 SFX_Muted_Snare1_2:: - sfx SFX_Muted_Snare1_2, CH7_ + audio SFX_Muted_Snare1_2, Ch7 SFX_Triangle3_2:: - sfx SFX_Triangle3_2, CH7_ + audio SFX_Triangle3_2, Ch7 SFX_Muted_Snare2_2:: - sfx SFX_Muted_Snare2_2, CH7_ + audio SFX_Muted_Snare2_2, Ch7 SFX_Muted_Snare3_2:: - sfx SFX_Muted_Snare3_2, CH7_ + audio SFX_Muted_Snare3_2, Ch7 SFX_Muted_Snare4_2:: - sfx SFX_Muted_Snare4_2, CH7_ + audio SFX_Muted_Snare4_2, Ch7 SFX_Cry00_2:: - sfx SFX_Cry00_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry00_2, Ch4, Ch5, Ch7 SFX_Cry01_2:: - sfx SFX_Cry01_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry01_2, Ch4, Ch5, Ch7 SFX_Cry02_2:: - sfx SFX_Cry02_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry02_2, Ch4, Ch5, Ch7 SFX_Cry03_2:: - sfx SFX_Cry03_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry03_2, Ch4, Ch5, Ch7 SFX_Cry04_2:: - sfx SFX_Cry04_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry04_2, Ch4, Ch5, Ch7 SFX_Cry05_2:: - sfx SFX_Cry05_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry05_2, Ch4, Ch5, Ch7 SFX_Cry06_2:: - sfx SFX_Cry06_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry06_2, Ch4, Ch5, Ch7 SFX_Cry07_2:: - sfx SFX_Cry07_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry07_2, Ch4, Ch5, Ch7 SFX_Cry08_2:: - sfx SFX_Cry08_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry08_2, Ch4, Ch5, Ch7 SFX_Cry09_2:: - sfx SFX_Cry09_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry09_2, Ch4, Ch5, Ch7 SFX_Cry0A_2:: - sfx SFX_Cry0A_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry0A_2, Ch4, Ch5, Ch7 SFX_Cry0B_2:: - sfx SFX_Cry0B_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry0B_2, Ch4, Ch5, Ch7 SFX_Cry0C_2:: - sfx SFX_Cry0C_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry0C_2, Ch4, Ch5, Ch7 SFX_Cry0D_2:: - sfx SFX_Cry0D_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry0D_2, Ch4, Ch5, Ch7 SFX_Cry0E_2:: - sfx SFX_Cry0E_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry0E_2, Ch4, Ch5, Ch7 SFX_Cry0F_2:: - sfx SFX_Cry0F_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry0F_2, Ch4, Ch5, Ch7 SFX_Cry10_2:: - sfx SFX_Cry10_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry10_2, Ch4, Ch5, Ch7 SFX_Cry11_2:: - sfx SFX_Cry11_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry11_2, Ch4, Ch5, Ch7 SFX_Cry12_2:: - sfx SFX_Cry12_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry12_2, Ch4, Ch5, Ch7 SFX_Cry13_2:: - sfx SFX_Cry13_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry13_2, Ch4, Ch5, Ch7 SFX_Cry14_2:: - sfx SFX_Cry14_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry14_2, Ch4, Ch5, Ch7 SFX_Cry15_2:: - sfx SFX_Cry15_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry15_2, Ch4, Ch5, Ch7 SFX_Cry16_2:: - sfx SFX_Cry16_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry16_2, Ch4, Ch5, Ch7 SFX_Cry17_2:: - sfx SFX_Cry17_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry17_2, Ch4, Ch5, Ch7 SFX_Cry18_2:: - sfx SFX_Cry18_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry18_2, Ch4, Ch5, Ch7 SFX_Cry19_2:: - sfx SFX_Cry19_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry19_2, Ch4, Ch5, Ch7 SFX_Cry1A_2:: - sfx SFX_Cry1A_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry1A_2, Ch4, Ch5, Ch7 SFX_Cry1B_2:: - sfx SFX_Cry1B_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry1B_2, Ch4, Ch5, Ch7 SFX_Cry1C_2:: - sfx SFX_Cry1C_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry1C_2, Ch4, Ch5, Ch7 SFX_Cry1D_2:: - sfx SFX_Cry1D_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry1D_2, Ch4, Ch5, Ch7 SFX_Cry1E_2:: - sfx SFX_Cry1E_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry1E_2, Ch4, Ch5, Ch7 SFX_Cry1F_2:: - sfx SFX_Cry1F_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry1F_2, Ch4, Ch5, Ch7 SFX_Cry20_2:: - sfx SFX_Cry20_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry20_2, Ch4, Ch5, Ch7 SFX_Cry21_2:: - sfx SFX_Cry21_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry21_2, Ch4, Ch5, Ch7 SFX_Cry22_2:: - sfx SFX_Cry22_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry22_2, Ch4, Ch5, Ch7 SFX_Cry23_2:: - sfx SFX_Cry23_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry23_2, Ch4, Ch5, Ch7 SFX_Cry24_2:: - sfx SFX_Cry24_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry24_2, Ch4, Ch5, Ch7 SFX_Cry25_2:: - sfx SFX_Cry25_2, CH4_ | CH5_ | CH7_ + audio SFX_Cry25_2, Ch4, Ch5, Ch7 SFX_Level_Up:: - sfx SFX_Level_Up, CH4_ | CH5_ | CH6_ + audio SFX_Level_Up, Ch4, Ch5, Ch6 SFX_Get_Item2_2:: - sfx SFX_Get_Item2_2, CH4_ | CH5_ | CH6_ + audio SFX_Get_Item2_2, Ch4, Ch5, Ch6 SFX_Tink_2:: - sfx SFX_Tink_2, CH4_ + audio SFX_Tink_2, Ch4 SFX_Heal_HP_2:: - sfx SFX_Heal_HP_2, CH4_ + audio SFX_Heal_HP_2, Ch4 SFX_Heal_Ailment_2:: - sfx SFX_Heal_Ailment_2, CH4_ + audio SFX_Heal_Ailment_2, Ch4 SFX_Start_Menu_2:: - sfx SFX_Start_Menu_2, CH7_ + audio SFX_Start_Menu_2, Ch7 SFX_Press_AB_2:: - sfx SFX_Press_AB_2, CH4_ + audio SFX_Press_AB_2, Ch4 SFX_Ball_Toss:: - sfx SFX_Ball_Toss, CH4_ | CH5_ + audio SFX_Ball_Toss, Ch4, Ch5 SFX_Ball_Poof:: - sfx SFX_Ball_Poof, CH4_ | CH7_ + audio SFX_Ball_Poof, Ch4, Ch7 SFX_Faint_Thud:: - sfx SFX_Faint_Thud, CH4_ | CH7_ + audio SFX_Faint_Thud, Ch4, Ch7 SFX_Run:: - sfx SFX_Run, CH7_ + audio SFX_Run, Ch7 SFX_Dex_Page_Added:: - sfx SFX_Dex_Page_Added, CH4_ | CH5_ + audio SFX_Dex_Page_Added, Ch4, Ch5 SFX_Caught_Mon:: - sfx SFX_Caught_Mon, CH4_ | CH5_ | CH6_ + audio SFX_Caught_Mon, Ch4, Ch5, Ch6 SFX_Peck:: - sfx SFX_Peck, CH7_ + audio SFX_Peck, Ch7 SFX_Faint_Fall:: - sfx SFX_Faint_Fall, CH4_ + audio SFX_Faint_Fall, Ch4 SFX_Battle_09:: - sfx SFX_Battle_09, CH4_ + audio SFX_Battle_09, Ch4 SFX_Pound:: - sfx SFX_Pound, CH7_ + audio SFX_Pound, Ch7 SFX_Battle_0B:: - sfx SFX_Battle_0B, CH7_ + audio SFX_Battle_0B, Ch7 SFX_Battle_0C:: - sfx SFX_Battle_0C, CH7_ + audio SFX_Battle_0C, Ch7 SFX_Battle_0D:: - sfx SFX_Battle_0D, CH7_ + audio SFX_Battle_0D, Ch7 SFX_Battle_0E:: - sfx SFX_Battle_0E, CH7_ + audio SFX_Battle_0E, Ch7 SFX_Battle_0F:: - sfx SFX_Battle_0F, CH7_ + audio SFX_Battle_0F, Ch7 SFX_Damage:: - sfx SFX_Damage, CH7_ + audio SFX_Damage, Ch7 SFX_Not_Very_Effective:: - sfx SFX_Not_Very_Effective, CH7_ + audio SFX_Not_Very_Effective, Ch7 SFX_Battle_12:: - sfx SFX_Battle_12, CH7_ + audio SFX_Battle_12, Ch7 SFX_Battle_13:: - sfx SFX_Battle_13, CH7_ + audio SFX_Battle_13, Ch7 SFX_Battle_14:: - sfx SFX_Battle_14, CH7_ + audio SFX_Battle_14, Ch7 SFX_Vine_Whip:: - sfx SFX_Vine_Whip, CH7_ + audio SFX_Vine_Whip, Ch7 SFX_Battle_16:: - sfx SFX_Battle_16, CH7_ + audio SFX_Battle_16, Ch7 SFX_Battle_17:: - sfx SFX_Battle_17, CH7_ + audio SFX_Battle_17, Ch7 SFX_Battle_18:: - sfx SFX_Battle_18, CH7_ + audio SFX_Battle_18, Ch7 SFX_Battle_19:: - sfx SFX_Battle_19, CH7_ + audio SFX_Battle_19, Ch7 SFX_Super_Effective:: - sfx SFX_Super_Effective, CH7_ + audio SFX_Super_Effective, Ch7 SFX_Battle_1B:: - sfx SFX_Battle_1B, CH7_ + audio SFX_Battle_1B, Ch7 SFX_Battle_1C:: - sfx SFX_Battle_1C, CH7_ + audio SFX_Battle_1C, Ch7 SFX_Doubleslap:: - sfx SFX_Doubleslap, CH7_ + audio SFX_Doubleslap, Ch7 SFX_Battle_1E:: - sfx SFX_Battle_1E, CH4_ | CH7_ + audio SFX_Battle_1E, Ch4, Ch7 SFX_Horn_Drill:: - sfx SFX_Horn_Drill, CH7_ + audio SFX_Horn_Drill, Ch7 SFX_Battle_20:: - sfx SFX_Battle_20, CH7_ + audio SFX_Battle_20, Ch7 SFX_Battle_21:: - sfx SFX_Battle_21, CH7_ + audio SFX_Battle_21, Ch7 SFX_Battle_22:: - sfx SFX_Battle_22, CH7_ + audio SFX_Battle_22, Ch7 SFX_Battle_23:: - sfx SFX_Battle_23, CH7_ + audio SFX_Battle_23, Ch7 SFX_Battle_24:: - sfx SFX_Battle_24, CH4_ | CH7_ + audio SFX_Battle_24, Ch4, Ch7 SFX_Battle_25:: - sfx SFX_Battle_25, CH7_ + audio SFX_Battle_25, Ch7 SFX_Battle_26:: - sfx SFX_Battle_26, CH7_ + audio SFX_Battle_26, Ch7 SFX_Battle_27:: - sfx SFX_Battle_27, CH4_ | CH5_ | CH7_ + audio SFX_Battle_27, Ch4, Ch5, Ch7 SFX_Battle_28:: - sfx SFX_Battle_28, CH4_ | CH5_ | CH7_ + audio SFX_Battle_28, Ch4, Ch5, Ch7 SFX_Battle_29:: - sfx SFX_Battle_29, CH4_ | CH7_ + audio SFX_Battle_29, Ch4, Ch7 SFX_Battle_2A:: - sfx SFX_Battle_2A, CH4_ | CH5_ | CH7_ + audio SFX_Battle_2A, Ch4, Ch5, Ch7 SFX_Battle_2B:: - sfx SFX_Battle_2B, CH4_ | CH7_ + audio SFX_Battle_2B, Ch4, Ch7 SFX_Battle_2C:: - sfx SFX_Battle_2C, CH4_ | CH5_ | CH7_ + audio SFX_Battle_2C, Ch4, Ch5, Ch7 SFX_Psybeam:: - sfx SFX_Psybeam, CH4_ | CH5_ | CH7_ + audio SFX_Psybeam, Ch4, Ch5, Ch7 SFX_Battle_2E:: - sfx SFX_Battle_2E, CH4_ | CH5_ | CH7_ + audio SFX_Battle_2E, Ch4, Ch5, Ch7 SFX_Battle_2F:: - sfx SFX_Battle_2F, CH4_ | CH5_ | CH7_ + audio SFX_Battle_2F, Ch4, Ch5, Ch7 SFX_Psychic_M:: - sfx SFX_Psychic_M, CH4_ | CH5_ | CH7_ + audio SFX_Psychic_M, Ch4, Ch5, Ch7 SFX_Battle_31:: - sfx SFX_Battle_31, CH4_ | CH5_ + audio SFX_Battle_31, Ch4, Ch5 SFX_Battle_32:: - sfx SFX_Battle_32, CH4_ | CH5_ + audio SFX_Battle_32, Ch4, Ch5 SFX_Battle_33:: - sfx SFX_Battle_33, CH4_ | CH5_ + audio SFX_Battle_33, Ch4, Ch5 SFX_Battle_34:: - sfx SFX_Battle_34, CH4_ | CH5_ | CH7_ + audio SFX_Battle_34, Ch4, Ch5, Ch7 SFX_Battle_35:: - sfx SFX_Battle_35, CH4_ | CH5_ + audio SFX_Battle_35, Ch4, Ch5 SFX_Battle_36:: - sfx SFX_Battle_36, CH4_ | CH5_ | CH7_ + audio SFX_Battle_36, Ch4, Ch5, Ch7 SFX_Silph_Scope:: - sfx SFX_Silph_Scope, CH4_ + audio SFX_Silph_Scope, Ch4 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 0a713cc6..19a19272 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -2,310 +2,310 @@ SFX_Headers_3:: db $ff, $ff, $ff ; padding SFX_Snare1_3:: - sfx SFX_Snare1_3, CH7_ + audio SFX_Snare1_3, Ch7 SFX_Snare2_3:: - sfx SFX_Snare2_3, CH7_ + audio SFX_Snare2_3, Ch7 SFX_Snare3_3:: - sfx SFX_Snare3_3, CH7_ + audio SFX_Snare3_3, Ch7 SFX_Snare4_3:: - sfx SFX_Snare4_3, CH7_ + audio SFX_Snare4_3, Ch7 SFX_Snare5_3:: - sfx SFX_Snare5_3, CH7_ + audio SFX_Snare5_3, Ch7 SFX_Triangle1_3:: - sfx SFX_Triangle1_3, CH7_ + audio SFX_Triangle1_3, Ch7 SFX_Triangle2_3:: - sfx SFX_Triangle2_3, CH7_ + audio SFX_Triangle2_3, Ch7 SFX_Snare6_3:: - sfx SFX_Snare6_3, CH7_ + audio SFX_Snare6_3, Ch7 SFX_Snare7_3:: - sfx SFX_Snare7_3, CH7_ + audio SFX_Snare7_3, Ch7 SFX_Snare8_3:: - sfx SFX_Snare8_3, CH7_ + audio SFX_Snare8_3, Ch7 SFX_Snare9_3:: - sfx SFX_Snare9_3, CH7_ + audio SFX_Snare9_3, Ch7 SFX_Cymbal1_3:: - sfx SFX_Cymbal1_3, CH7_ + audio SFX_Cymbal1_3, Ch7 SFX_Cymbal2_3:: - sfx SFX_Cymbal2_3, CH7_ + audio SFX_Cymbal2_3, Ch7 SFX_Cymbal3_3:: - sfx SFX_Cymbal3_3, CH7_ + audio SFX_Cymbal3_3, Ch7 SFX_Muted_Snare1_3:: - sfx SFX_Muted_Snare1_3, CH7_ + audio SFX_Muted_Snare1_3, Ch7 SFX_Triangle3_3:: - sfx SFX_Triangle3_3, CH7_ + audio SFX_Triangle3_3, Ch7 SFX_Muted_Snare2_3:: - sfx SFX_Muted_Snare2_3, CH7_ + audio SFX_Muted_Snare2_3, Ch7 SFX_Muted_Snare3_3:: - sfx SFX_Muted_Snare3_3, CH7_ + audio SFX_Muted_Snare3_3, Ch7 SFX_Muted_Snare4_3:: - sfx SFX_Muted_Snare4_3, CH7_ + audio SFX_Muted_Snare4_3, Ch7 SFX_Cry00_3:: - sfx SFX_Cry00_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry00_3, Ch4, Ch5, Ch7 SFX_Cry01_3:: - sfx SFX_Cry01_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry01_3, Ch4, Ch5, Ch7 SFX_Cry02_3:: - sfx SFX_Cry02_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry02_3, Ch4, Ch5, Ch7 SFX_Cry03_3:: - sfx SFX_Cry03_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry03_3, Ch4, Ch5, Ch7 SFX_Cry04_3:: - sfx SFX_Cry04_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry04_3, Ch4, Ch5, Ch7 SFX_Cry05_3:: - sfx SFX_Cry05_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry05_3, Ch4, Ch5, Ch7 SFX_Cry06_3:: - sfx SFX_Cry06_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry06_3, Ch4, Ch5, Ch7 SFX_Cry07_3:: - sfx SFX_Cry07_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry07_3, Ch4, Ch5, Ch7 SFX_Cry08_3:: - sfx SFX_Cry08_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry08_3, Ch4, Ch5, Ch7 SFX_Cry09_3:: - sfx SFX_Cry09_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry09_3, Ch4, Ch5, Ch7 SFX_Cry0A_3:: - sfx SFX_Cry0A_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry0A_3, Ch4, Ch5, Ch7 SFX_Cry0B_3:: - sfx SFX_Cry0B_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry0B_3, Ch4, Ch5, Ch7 SFX_Cry0C_3:: - sfx SFX_Cry0C_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry0C_3, Ch4, Ch5, Ch7 SFX_Cry0D_3:: - sfx SFX_Cry0D_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry0D_3, Ch4, Ch5, Ch7 SFX_Cry0E_3:: - sfx SFX_Cry0E_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry0E_3, Ch4, Ch5, Ch7 SFX_Cry0F_3:: - sfx SFX_Cry0F_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry0F_3, Ch4, Ch5, Ch7 SFX_Cry10_3:: - sfx SFX_Cry10_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry10_3, Ch4, Ch5, Ch7 SFX_Cry11_3:: - sfx SFX_Cry11_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry11_3, Ch4, Ch5, Ch7 SFX_Cry12_3:: - sfx SFX_Cry12_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry12_3, Ch4, Ch5, Ch7 SFX_Cry13_3:: - sfx SFX_Cry13_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry13_3, Ch4, Ch5, Ch7 SFX_Cry14_3:: - sfx SFX_Cry14_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry14_3, Ch4, Ch5, Ch7 SFX_Cry15_3:: - sfx SFX_Cry15_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry15_3, Ch4, Ch5, Ch7 SFX_Cry16_3:: - sfx SFX_Cry16_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry16_3, Ch4, Ch5, Ch7 SFX_Cry17_3:: - sfx SFX_Cry17_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry17_3, Ch4, Ch5, Ch7 SFX_Cry18_3:: - sfx SFX_Cry18_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry18_3, Ch4, Ch5, Ch7 SFX_Cry19_3:: - sfx SFX_Cry19_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry19_3, Ch4, Ch5, Ch7 SFX_Cry1A_3:: - sfx SFX_Cry1A_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry1A_3, Ch4, Ch5, Ch7 SFX_Cry1B_3:: - sfx SFX_Cry1B_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry1B_3, Ch4, Ch5, Ch7 SFX_Cry1C_3:: - sfx SFX_Cry1C_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry1C_3, Ch4, Ch5, Ch7 SFX_Cry1D_3:: - sfx SFX_Cry1D_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry1D_3, Ch4, Ch5, Ch7 SFX_Cry1E_3:: - sfx SFX_Cry1E_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry1E_3, Ch4, Ch5, Ch7 SFX_Cry1F_3:: - sfx SFX_Cry1F_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry1F_3, Ch4, Ch5, Ch7 SFX_Cry20_3:: - sfx SFX_Cry20_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry20_3, Ch4, Ch5, Ch7 SFX_Cry21_3:: - sfx SFX_Cry21_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry21_3, Ch4, Ch5, Ch7 SFX_Cry22_3:: - sfx SFX_Cry22_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry22_3, Ch4, Ch5, Ch7 SFX_Cry23_3:: - sfx SFX_Cry23_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry23_3, Ch4, Ch5, Ch7 SFX_Cry24_3:: - sfx SFX_Cry24_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry24_3, Ch4, Ch5, Ch7 SFX_Cry25_3:: - sfx SFX_Cry25_3, CH4_ | CH5_ | CH7_ + audio SFX_Cry25_3, Ch4, Ch5, Ch7 SFX_Get_Item1_3:: - sfx SFX_Get_Item1_3, CH4_ | CH5_ | CH6_ + audio SFX_Get_Item1_3, Ch4, Ch5, Ch6 SFX_Get_Item2_3:: - sfx SFX_Get_Item2_3, CH4_ | CH5_ | CH6_ + audio SFX_Get_Item2_3, Ch4, Ch5, Ch6 SFX_Tink_3:: - sfx SFX_Tink_3, CH4_ + audio SFX_Tink_3, Ch4 SFX_Heal_HP_3:: - sfx SFX_Heal_HP_3, CH4_ + audio SFX_Heal_HP_3, Ch4 SFX_Heal_Ailment_3:: - sfx SFX_Heal_Ailment_3, CH4_ + audio SFX_Heal_Ailment_3, Ch4 SFX_Start_Menu_3:: - sfx SFX_Start_Menu_3, CH7_ + audio SFX_Start_Menu_3, Ch7 SFX_Press_AB_3:: - sfx SFX_Press_AB_3, CH4_ + audio SFX_Press_AB_3, Ch4 SFX_Pokedex_Rating_3:: - sfx SFX_Pokedex_Rating_3, CH4_ | CH5_ | CH6_ + audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6 SFX_Get_Key_Item_3:: - sfx SFX_Get_Key_Item_3, CH4_ | CH5_ | CH6_ + audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6 SFX_Poisoned_3:: - sfx SFX_Poisoned_3, CH4_ + audio SFX_Poisoned_3, Ch4 SFX_Trade_Machine_3:: - sfx SFX_Trade_Machine_3, CH4_ + audio SFX_Trade_Machine_3, Ch4 SFX_Turn_On_PC_3:: - sfx SFX_Turn_On_PC_3, CH4_ + audio SFX_Turn_On_PC_3, Ch4 SFX_Turn_Off_PC_3:: - sfx SFX_Turn_Off_PC_3, CH4_ + audio SFX_Turn_Off_PC_3, Ch4 SFX_Enter_PC_3:: - sfx SFX_Enter_PC_3, CH4_ + audio SFX_Enter_PC_3, Ch4 SFX_Shrink_3:: - sfx SFX_Shrink_3, CH4_ + audio SFX_Shrink_3, Ch4 SFX_Switch_3:: - sfx SFX_Switch_3, CH4_ + audio SFX_Switch_3, Ch4 SFX_Healing_Machine_3:: - sfx SFX_Healing_Machine_3, CH4_ + audio SFX_Healing_Machine_3, Ch4 SFX_Teleport_Exit1_3:: - sfx SFX_Teleport_Exit1_3, CH4_ + audio SFX_Teleport_Exit1_3, Ch4 SFX_Teleport_Enter1_3:: - sfx SFX_Teleport_Enter1_3, CH4_ + audio SFX_Teleport_Enter1_3, Ch4 SFX_Teleport_Exit2_3:: - sfx SFX_Teleport_Exit2_3, CH4_ + audio SFX_Teleport_Exit2_3, Ch4 SFX_Ledge_3:: - sfx SFX_Ledge_3, CH4_ + audio SFX_Ledge_3, Ch4 SFX_Teleport_Enter2_3:: - sfx SFX_Teleport_Enter2_3, CH7_ + audio SFX_Teleport_Enter2_3, Ch7 SFX_Fly_3:: - sfx SFX_Fly_3, CH7_ + audio SFX_Fly_3, Ch7 SFX_Denied_3:: - sfx SFX_Denied_3, CH4_ | CH5_ + audio SFX_Denied_3, Ch4, Ch5 SFX_Arrow_Tiles_3:: - sfx SFX_Arrow_Tiles_3, CH4_ + audio SFX_Arrow_Tiles_3, Ch4 SFX_Push_Boulder_3:: - sfx SFX_Push_Boulder_3, CH7_ + audio SFX_Push_Boulder_3, Ch7 SFX_SS_Anne_Horn_3:: - sfx SFX_SS_Anne_Horn_3, CH4_ | CH5_ + audio SFX_SS_Anne_Horn_3, Ch4, Ch5 SFX_Withdraw_Deposit_3:: - sfx SFX_Withdraw_Deposit_3, CH4_ + audio SFX_Withdraw_Deposit_3, Ch4 SFX_Cut_3:: - sfx SFX_Cut_3, CH7_ + audio SFX_Cut_3, Ch7 SFX_Go_Inside_3:: - sfx SFX_Go_Inside_3, CH7_ + audio SFX_Go_Inside_3, Ch7 SFX_Swap_3:: - sfx SFX_Swap_3, CH4_ | CH5_ + audio SFX_Swap_3, Ch4, Ch5 SFX_59_3:: - sfx SFX_59_3, CH4_ | CH5_ + audio SFX_59_3, Ch4, Ch5 SFX_Purchase_3:: - sfx SFX_Purchase_3, CH4_ | CH5_ + audio SFX_Purchase_3, Ch4, Ch5 SFX_Collision_3:: - sfx SFX_Collision_3, CH4_ + audio SFX_Collision_3, Ch4 SFX_Go_Outside_3:: - sfx SFX_Go_Outside_3, CH7_ + audio SFX_Go_Outside_3, Ch7 SFX_Save_3:: - sfx SFX_Save_3, CH4_ | CH5_ + audio SFX_Save_3, Ch4, Ch5 SFX_Intro_Lunge:: - sfx SFX_Intro_Lunge, CH7_ + audio SFX_Intro_Lunge, Ch7 SFX_Intro_Hip:: - sfx SFX_Intro_Hip, CH4_ + audio SFX_Intro_Hip, Ch4 SFX_Intro_Hop:: - sfx SFX_Intro_Hop, CH4_ + audio SFX_Intro_Hop, Ch4 SFX_Intro_Raise:: - sfx SFX_Intro_Raise, CH7_ + audio SFX_Intro_Raise, Ch7 SFX_Intro_Crash:: - sfx SFX_Intro_Crash, CH7_ + audio SFX_Intro_Crash, Ch7 SFX_Intro_Whoosh:: - sfx SFX_Intro_Whoosh, CH7_ + audio SFX_Intro_Whoosh, Ch7 SFX_Slots_Stop_Wheel:: - sfx SFX_Slots_Stop_Wheel, CH4_ + audio SFX_Slots_Stop_Wheel, Ch4 SFX_Slots_Reward:: - sfx SFX_Slots_Reward, CH4_ + audio SFX_Slots_Reward, Ch4 SFX_Slots_New_Spin:: - sfx SFX_Slots_New_Spin, CH4_ | CH5_ + audio SFX_Slots_New_Spin, Ch4, Ch5 SFX_Shooting_Star:: - sfx SFX_Shooting_Star, CH4_ + audio SFX_Shooting_Star, Ch4 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9241ce6b..01c12347 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -872,7 +872,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -956,7 +956,7 @@ EndLowHealthAlarm: ; the low health alarm and prevents it from reactivating until the next battle. xor a ld [wLowHealthAlarm], a ; turn off low health alarm - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -1954,7 +1954,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 2d6ab2e9..c77e3b39 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a diff --git a/engine/evolution.asm b/engine/evolution.asm index c0a3434a..a2c52765 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -8,7 +8,7 @@ EvolveMon: push af xor a ld [wLowHealthAlarm], a - ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + Ch4], a dec a ld [wNewSoundID], a call PlaySound diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index c5ae3f10..f04c1deb 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -71,7 +71,7 @@ SafariZoneGameOver: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .waitForMusicToPlay - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_SAFARI_ZONE_PA jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER diff --git a/engine/items/items.asm b/engine/items/items.asm index 42d05981..aaddc396 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -990,7 +990,7 @@ ItemUseMedicine: .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm],a ;disable low health alarm - ld [wChannelSoundIDs + CH4],a + ld [wChannelSoundIDs + Ch4],a push hl push de ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1777,7 +1777,7 @@ ItemUsePokeflute: call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + CH6] + ld a,[wChannelSoundIDs + Ch6] and a ; music off? jr nz,.musicWaitLoop .skipMusic @@ -1850,7 +1850,7 @@ PlayedFluteHadEffectText: ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + CH2] + ld a,[wChannelSoundIDs + Ch2] cp a, SFX_POKEFLUE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 929e4f22..7ff4ff71 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -33,7 +33,7 @@ ShakeElevator: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites diff --git a/home.asm b/home.asm index 62a176c2..6bb99f40 100644 --- a/home.asm +++ b/home.asm @@ -3214,7 +3214,7 @@ WaitForSoundToFinish:: ret nz push hl .waitLoop - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch4 xor a or [hl] inc hl diff --git a/home/audio.asm b/home/audio.asm index 7c0c5238..c982d9d6 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -148,10 +148,10 @@ PlaySound:: and a jr z, .next xor a - ld [wChannelSoundIDs + CH4], a - ld [wChannelSoundIDs + CH5], a - ld [wChannelSoundIDs + CH6], a - ld [wChannelSoundIDs + CH7], a + 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? diff --git a/home/overworld.asm b/home/overworld.asm index f71bb68a..fe763b43 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1244,7 +1244,7 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc,.noCollision .collision - ld a,[wChannelSoundIDs + CH4] + ld a,[wChannelSoundIDs + Ch4] cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION @@ -1948,7 +1948,7 @@ CollisionCheckOnWater:: jr z,.stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a,[wChannelSoundIDs + CH4] + ld a,[wChannelSoundIDs + Ch4] cp SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION diff --git a/macros.asm b/macros.asm index ca123d97..eec166f0 100644 --- a/macros.asm +++ b/macros.asm @@ -392,64 +392,29 @@ StopAllMusic: macro call PlaySound endm -;1_channel EQU $00 -;2_channels EQU $40 -;3_channels EQU $80 -;4_channels EQU $C0 - -CH0 EQU 0 -CH1 EQU 1 -CH2 EQU 2 -CH3 EQU 3 -CH4 EQU 4 -CH5 EQU 5 -CH6 EQU 6 -CH7 EQU 7 - -CH0_ EQU 1 << CH0 -CH1_ EQU 1 << CH1 -CH2_ EQU 1 << CH2 -CH3_ EQU 1 << CH3 -CH4_ EQU 1 << CH4 -CH5_ EQU 1 << CH5 -CH6_ EQU 1 << CH6 -CH7_ EQU 1 << CH7 - -; channel 0 is not optional -music: MACRO - db ((((\2 & CH0_) >> CH0) + ((\2 & CH1_) >> CH1) + ((\2 & CH2_) >> CH2) + ((\2 & CH3_) >> CH3)) - 1) << 6 | CH0 - dw \1_Ch0 - IF \2 & CH1_ - db CH1 - dw \1_Ch1 +Ch0 EQU 0 +Ch1 EQU 1 +Ch2 EQU 2 +Ch3 EQU 3 +Ch4 EQU 4 +Ch5 EQU 5 +Ch6 EQU 6 +Ch7 EQU 7 + +audio: MACRO + db (_NARG - 2) << 6 | \2 + dw \1_\2 + IF _NARG > 2 + db \3 + dw \1_\3 ENDC - IF \2 & CH2_ - db CH2 - dw \1_Ch2 + IF _NARG > 3 + db \4 + dw \1_\4 ENDC - IF \2 & CH3_ - db CH3 - dw \1_Ch3 - ENDC -ENDM - -; do not start a sound effect with channel 5 or 6, only channel 4 or 7 -sfx: MACRO - IF \2 & CH4_ - db ((((\2 & CH4_) >> CH4) + ((\2 & CH5_) >> CH5) + ((\2 & CH6_) >> CH6) + ((\2 & CH7_) >> CH7)) - 1) << 6 | CH4 - dw \1_Ch4 - ENDC - IF \2 & CH5_ - db CH5 - dw \1_Ch5 - ENDC - IF \2 & CH6_ - db CH6 - dw \1_Ch6 - ENDC - IF \2 & CH7_ - db CH7 - dw \1_Ch7 + IF _NARG > 4 + db \5 + dw \1_\5 ENDC ENDM diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index bea7a47d..5de1e6b7 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -60,7 +60,7 @@ PewterJigglypuffText: ld a, [wChannelSoundIDs] ld b, a - ld a, [wChannelSoundIDs + CH1] + ld a, [wChannelSoundIDs + Ch1] or b jr nz, .loop -- cgit v1.2.3 From 52bb07ca18f5475eb9a11c69bf8fee75bcb1abff Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 27 Jul 2016 22:33:48 -0500 Subject: Replace unnecessary tabs with spaces --- audio/engine_2.asm | 10 +-- audio/engine_3.asm | 10 +-- constants/misc_constants.asm | 12 ++-- data/baseStats/victreebel.asm | 2 +- data/evos_moves.asm | 78 +++++++++++----------- data/hide_show_data.asm | 4 +- data/mon_party_sprites.asm | 152 +++++++++++++++++++++--------------------- data/wild_mons.asm | 12 ++-- engine/battle/core.asm | 14 ++-- engine/items/items.asm | 4 +- home.asm | 2 +- home/pic.asm | 4 +- macros.asm | 10 +-- 13 files changed, 157 insertions(+), 157 deletions(-) diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 7fdc7a06..4eb9b96b 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -37,11 +37,11 @@ Audio2_UpdateMusic:: ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. ; known flags for wChannelFlags1: -; 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 +; 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 Audio2_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 78e832b4..bd784023 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -37,11 +37,11 @@ Audio3_UpdateMusic:: ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. ; known flags for wChannelFlags1: -; 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 +; 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 Audio3_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index cc10de70..b2571b86 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -105,12 +105,12 @@ QUESTION_BUBBLE EQU 1 SMILE_BUBBLE EQU 2 ; slot symbols -SLOTS7 EQU $0200 -SLOTSBAR EQU $0604 -SLOTSCHERRY EQU $0A08 -SLOTSFISH EQU $0E0C -SLOTSBIRD EQU $1210 -SLOTSMOUSE EQU $1614 +SLOTS7 EQU $0200 +SLOTSBAR EQU $0604 +SLOTSCHERRY EQU $0A08 +SLOTSFISH EQU $0E0C +SLOTSBIRD EQU $1210 +SLOTSMOUSE EQU $1614 ; party menu types NORMAL_PARTY_MENU EQU 0 diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index a56958ef..7a82c86e 100644 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -1,4 +1,4 @@ -db DEX_VICTREEBEL ; pokedex id +db DEX_VICTREEBEL ; pokedex id db 80 ; base hp db 105 ; base attack db 65 ; base defense diff --git a/data/evos_moves.asm b/data/evos_moves.asm index a668ea3e..2371fb83 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -29,8 +29,8 @@ EvosMovesPointerTable: dw Mon009_EvosMoves dw Mon127_EvosMoves dw Mon114_EvosMoves - dw Mon152_EvosMoves ;MissingNo - dw Mon153_EvosMoves ;MissingNo + dw Mon152_EvosMoves ;MissingNo + dw Mon153_EvosMoves ;MissingNo dw Mon058_EvosMoves dw Mon095_EvosMoves dw Mon022_EvosMoves @@ -48,26 +48,26 @@ EvosMovesPointerTable: dw Mon054_EvosMoves dw Mon096_EvosMoves dw Mon076_EvosMoves - dw Mon154_EvosMoves ;MissingNo + dw Mon154_EvosMoves ;MissingNo dw Mon126_EvosMoves - dw Mon155_EvosMoves ;MissingNo + dw Mon155_EvosMoves ;MissingNo dw Mon125_EvosMoves dw Mon082_EvosMoves dw Mon109_EvosMoves - dw Mon156_EvosMoves ;MissingNo + dw Mon156_EvosMoves ;MissingNo dw Mon056_EvosMoves dw Mon086_EvosMoves dw Mon050_EvosMoves dw Mon128_EvosMoves - dw Mon157_EvosMoves ;MissingNo - dw Mon158_EvosMoves ;MissingNo - dw Mon159_EvosMoves ;MissingNo + dw Mon157_EvosMoves ;MissingNo + dw Mon158_EvosMoves ;MissingNo + dw Mon159_EvosMoves ;MissingNo dw Mon083_EvosMoves dw Mon048_EvosMoves dw Mon149_EvosMoves - dw Mon160_EvosMoves ;MissingNo - dw Mon161_EvosMoves ;MissingNo - dw Mon162_EvosMoves ;MissingNo + dw Mon160_EvosMoves ;MissingNo + dw Mon161_EvosMoves ;MissingNo + dw Mon162_EvosMoves ;MissingNo dw Mon084_EvosMoves dw Mon060_EvosMoves dw Mon124_EvosMoves @@ -77,23 +77,23 @@ EvosMovesPointerTable: dw Mon132_EvosMoves dw Mon052_EvosMoves dw Mon098_EvosMoves - dw Mon163_EvosMoves ;MissingNo - dw Mon164_EvosMoves ;MissingNo - dw Mon165_EvosMoves ;MissingNo + dw Mon163_EvosMoves ;MissingNo + dw Mon164_EvosMoves ;MissingNo + dw Mon165_EvosMoves ;MissingNo dw Mon037_EvosMoves dw Mon038_EvosMoves dw Mon025_EvosMoves dw Mon026_EvosMoves - dw Mon166_EvosMoves ;MissingNo - dw Mon167_EvosMoves ;MissingNo + dw Mon166_EvosMoves ;MissingNo + dw Mon167_EvosMoves ;MissingNo dw Mon147_EvosMoves dw Mon148_EvosMoves dw Mon140_EvosMoves dw Mon141_EvosMoves dw Mon116_EvosMoves dw Mon117_EvosMoves - dw Mon168_EvosMoves ;MissingNo - dw Mon169_EvosMoves ;MissingNo + dw Mon168_EvosMoves ;MissingNo + dw Mon169_EvosMoves ;MissingNo dw Mon027_EvosMoves dw Mon028_EvosMoves dw Mon138_EvosMoves @@ -113,38 +113,38 @@ EvosMovesPointerTable: dw Mon013_EvosMoves dw Mon014_EvosMoves dw Mon015_EvosMoves - dw Mon170_EvosMoves ;MissingNo + dw Mon170_EvosMoves ;MissingNo dw Mon085_EvosMoves dw Mon057_EvosMoves dw Mon051_EvosMoves dw Mon049_EvosMoves dw Mon087_EvosMoves - dw Mon171_EvosMoves ;MissingNo - dw Mon172_EvosMoves ;MissingNo + dw Mon171_EvosMoves ;MissingNo + dw Mon172_EvosMoves ;MissingNo dw Mon010_EvosMoves dw Mon011_EvosMoves dw Mon012_EvosMoves dw Mon068_EvosMoves - dw Mon173_EvosMoves ;MissingNo + dw Mon173_EvosMoves ;MissingNo dw Mon055_EvosMoves dw Mon097_EvosMoves dw Mon042_EvosMoves dw Mon150_EvosMoves dw Mon143_EvosMoves dw Mon129_EvosMoves - dw Mon174_EvosMoves ;MissingNo - dw Mon175_EvosMoves ;MissingNo + dw Mon174_EvosMoves ;MissingNo + dw Mon175_EvosMoves ;MissingNo dw Mon089_EvosMoves - dw Mon176_EvosMoves ;MissingNo + dw Mon176_EvosMoves ;MissingNo dw Mon099_EvosMoves dw Mon091_EvosMoves - dw Mon177_EvosMoves ;MissingNo + dw Mon177_EvosMoves ;MissingNo dw Mon101_EvosMoves dw Mon036_EvosMoves dw Mon110_EvosMoves dw Mon053_EvosMoves dw Mon105_EvosMoves - dw Mon178_EvosMoves ;MissingNo + dw Mon178_EvosMoves ;MissingNo dw Mon093_EvosMoves dw Mon063_EvosMoves dw Mon065_EvosMoves @@ -154,13 +154,13 @@ EvosMovesPointerTable: dw Mon001_EvosMoves dw Mon003_EvosMoves dw Mon073_EvosMoves - dw Mon179_EvosMoves ;MissingNo + dw Mon179_EvosMoves ;MissingNo dw Mon118_EvosMoves dw Mon119_EvosMoves - dw Mon180_EvosMoves ;MissingNo - dw Mon181_EvosMoves ;MissingNo - dw Mon182_EvosMoves ;MissingNo - dw Mon183_EvosMoves ;MissingNo + dw Mon180_EvosMoves ;MissingNo + dw Mon181_EvosMoves ;MissingNo + dw Mon182_EvosMoves ;MissingNo + dw Mon183_EvosMoves ;MissingNo dw Mon077_EvosMoves dw Mon078_EvosMoves dw Mon019_EvosMoves @@ -170,19 +170,19 @@ EvosMovesPointerTable: dw Mon074_EvosMoves dw Mon137_EvosMoves dw Mon142_EvosMoves - dw Mon184_EvosMoves ;MissingNo + dw Mon184_EvosMoves ;MissingNo dw Mon081_EvosMoves - dw Mon185_EvosMoves ;MissingNo - dw Mon186_EvosMoves ;MissingNo + dw Mon185_EvosMoves ;MissingNo + dw Mon186_EvosMoves ;MissingNo dw Mon004_EvosMoves dw Mon007_EvosMoves dw Mon005_EvosMoves dw Mon008_EvosMoves dw Mon006_EvosMoves - dw Mon187_EvosMoves ;MissingNo - dw Mon188_EvosMoves ;MissingNo - dw Mon189_EvosMoves ;MissingNo - dw Mon190_EvosMoves ;MissingNo + dw Mon187_EvosMoves ;MissingNo + dw Mon188_EvosMoves ;MissingNo + dw Mon189_EvosMoves ;MissingNo + dw Mon190_EvosMoves ;MissingNo dw Mon043_EvosMoves dw Mon044_EvosMoves dw Mon045_EvosMoves diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index f3ea62ef..1fa4b64a 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -266,8 +266,8 @@ MapHSPointers: ; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList) ; These constants come from the bytes for Predef functions: -Hide equ $11 -Show equ $15 +Hide equ $11 +Show equ $15 MapHSXX: db $FF,$FF,$FF diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index d83e7b4e..987d8d28 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -1,77 +1,77 @@ MonPartyData: - dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur - dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander - dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard - dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle - dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie - dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree - dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna - dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow - 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 ;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 - dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff - dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat - dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom - dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras - dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat - dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett - dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth - dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck - dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey - dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe - dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag - dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath - dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra - dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop - dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp - dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell - dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool - dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude - dn SPRITE_MON, SPRITE_MON ;Graveler/Golem - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash - dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro - dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo - dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel - dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer - dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder - dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly - dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar - dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee - dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby - dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb - dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute - dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone - dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee - dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung - dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing - dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon - dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela - dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea - dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen - dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu - dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime - dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx - dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar - dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros - dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados - dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon - dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte - dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto - dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl - dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres - dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair - dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo - dn SPRITE_MON, 0 ;Mew/Padding + dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur + dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander + dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard + dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle + dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie + dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree + dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna + dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow + 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 ;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 + dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff + dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat + dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom + dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras + dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat + dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett + dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth + dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck + dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey + dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe + dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag + dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath + dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra + dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop + dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp + dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell + dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool + dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude + dn SPRITE_MON, SPRITE_MON ;Graveler/Golem + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash + dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro + dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo + dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel + dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer + dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder + dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly + dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar + dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee + dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby + dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb + dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute + dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone + dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee + dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung + dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing + dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon + dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela + dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea + dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen + dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu + dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime + dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx + dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar + dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros + dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados + dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon + dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon + dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte + dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto + dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl + dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno + dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres + dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair + dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo + dn SPRITE_MON, 0 ;Mew/Padding diff --git a/data/wild_mons.asm b/data/wild_mons.asm index a4265565..a2c9d6b2 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -253,12 +253,12 @@ WildDataPointers: ; first part: pokemon found in grass ; second part: pokemon found while surfing ; each part goes as follows: - ; if first byte == 00, then - ; no wild pokemon on this map - ; if first byte != 00, then - ; first byte is encounter rate - ; followed by 20 bytes: - ; level, species (ten times) + ; if first byte == 00, then + ; no wild pokemon on this map + ; if first byte != 00, then + ; first byte is encounter rate + ; followed by 20 bytes: + ; level, species (ten times) INCLUDE "data/wildPokemon/nomons.asm" INCLUDE "data/wildPokemon/route1.asm" diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 01c12347..d1fd27f1 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4502,10 +4502,10 @@ GetEnemyMonStat: CalculateDamage: ; input: -; b: attack -; c: opponent defense -; d: base power -; e: level +; b: attack +; c: opponent defense +; d: base power +; e: level ld a, [H_WHOSETURN] ; whose turn? and a @@ -7512,7 +7512,7 @@ FrozenText: CheckDefrost: ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target - and a, 1 << FRZ ; are they frozen? + and a, 1 << FRZ ; are they frozen? ret z ; return if so ld a, [H_WHOSETURN] and a @@ -7521,7 +7521,7 @@ CheckDefrost: ld a, [wPlayerMoveType] sub a, FIRE ret nz ; return if type of move used isn't fire - ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] + ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] ld hl, wEnemyMon1Status ld a, [wEnemyMonPartyPos] ld bc, wEnemyMon2 - wEnemyMon1 @@ -7531,7 +7531,7 @@ CheckDefrost: ld hl, FireDefrostedText jr .common .opponent - ld a, [wEnemyMoveType] ; same as above with addresses swapped + ld a, [wEnemyMoveType] ; same as above with addresses swapped sub a, FIRE ret nz ld [wBattleMonStatus], a diff --git a/engine/items/items.asm b/engine/items/items.asm index aaddc396..f8873a6e 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,7 +1,7 @@ UseItem_: ld a,1 ld [wActionResultOrTookBattleTurn],a ; initialise to success value - ld a,[wcf91] ;contains item_ID + ld a,[wcf91] ;contains item_ID cp a,HM_01 jp nc,ItemUseTMHM ld hl,ItemUsePtrTable @@ -235,7 +235,7 @@ ItemUseBall: ld b,a .skipAilmentValueSubtraction - push bc ; save (Rand1 - Status) + push bc ; save (Rand1 - Status) ; Calculate MaxHP * 255. xor a diff --git a/home.asm b/home.asm index 6bb99f40..def6200a 100644 --- a/home.asm +++ b/home.asm @@ -725,7 +725,7 @@ UncompressMonSprite:: ; define (by index number) the bank that a pokemon's image is in ; index = Mew, bank 1 ; index = Kabutops fossil, bank $B -; index < $1F, bank 9 +; index < $1F, bank 9 ; $1F ≤ index < $4A, bank $A ; $4A ≤ index < $74, bank $B ; $74 ≤ index < $99, bank $C diff --git a/home/pic.asm b/home/pic.asm index 444a9f05..797b1c70 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -48,8 +48,8 @@ _UncompressSpriteData:: ld [wSpriteWidth], a call ReadNextInputBit ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit - ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2 - ; bit 0 decides in which one the first chunk is placed + ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2 + ; bit 0 decides in which one the first chunk is placed ; fall through ; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2 diff --git a/macros.asm b/macros.asm index eec166f0..0705bfce 100644 --- a/macros.asm +++ b/macros.asm @@ -140,13 +140,13 @@ overworldMapCoord: MACRO ;\3 = X movement (X-blocks) EVENT_DISP: MACRO dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp - db \2,\3 ;Y,X + db \2,\3 ;Y,X ENDM FLYWARP_DATA: MACRO EVENT_DISP \1,\2,\3 - db ((\2) & $01) ;sub-block Y - db ((\3) & $01) ;sub-block X + db ((\2) & $01) ;sub-block Y + db ((\3) & $01) ;sub-block X ENDM ; external map entry macro @@ -588,8 +588,8 @@ ENDM ; format: notetype speed, volume, fade notetype: MACRO - db $D0 | \1 - db (\2 << 4) | \3 + db $D0 | \1 + db (\2 << 4) | \3 ENDM dspeed: MACRO -- cgit v1.2.3 From 032f961ef26a94caf385f6d5ae5823a0066d4d66 Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 31 Jul 2016 13:04:04 -0500 Subject: Split macros.asm --- constants.asm | 1 - constants/event_macros.asm | 441 -------------------------- macros.asm | 772 +-------------------------------------------- macros/asm_macros.asm | 188 +++++++++++ macros/audio_macros.asm | 277 ++++++++++++++++ macros/data_macros.asm | 220 +++++++++++++ macros/event_macros.asm | 441 ++++++++++++++++++++++++++ macros/text_macros.asm | 80 +++++ 8 files changed, 1211 insertions(+), 1209 deletions(-) delete mode 100755 constants/event_macros.asm create mode 100755 macros/asm_macros.asm create mode 100755 macros/audio_macros.asm create mode 100755 macros/data_macros.asm create mode 100755 macros/event_macros.asm create mode 100755 macros/text_macros.asm diff --git a/constants.asm b/constants.asm index d4e453ec..c8e5a78d 100644 --- a/constants.asm +++ b/constants.asm @@ -29,5 +29,4 @@ INCLUDE "constants/music_constants.asm" INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" -INCLUDE "constants/event_macros.asm" INCLUDE "constants/text_constants.asm" diff --git a/constants/event_macros.asm b/constants/event_macros.asm deleted file mode 100755 index 20027209..00000000 --- a/constants/event_macros.asm +++ /dev/null @@ -1,441 +0,0 @@ -;\1 = event index -;\2 = return result in carry instead of zero flag -CheckEvent: MACRO -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - - IF _NARG > 1 - IF ((\1) % 8) == 7 - add a - ELSE - REPT ((\1) % 8) + 1 - rrca - ENDR - ENDC - ELSE - bit (\1) % 8, a - ENDC - ENDM - -;\1 = event index -CheckEventReuseA: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - ENDC - - bit (\1) % 8, a - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -CheckEventAfterBranchReuseA: MACRO -event_byte = ((\2) / 8) - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - ENDC - - bit (\1) % 8, a - ENDM - -;\1 = reg -;\2 = event index -;\3 = event index this event is relative to (optional, this is needed when there is a fixed flag address) -EventFlagBit: MACRO - IF _NARG > 2 - ld \1, ((\3) % 8) + ((\2) - (\3)) - ELSE - ld \1, (\2) % 8 - ENDC - ENDM - -;\1 = reg -;\2 = event index -EventFlagAddress: MACRO -event_byte = ((\2) / 8) - ld \1, wEventFlags + event_byte - ENDM - -;\1 = event index -CheckEventHL: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckEventReuseHL: MACRO -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - bit (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -CheckEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -CheckEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndSetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - set (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndResetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - res (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndSetEventA: MACRO - ld a, [wEventFlags + ((\1) / 8)] - bit (\1) % 8, a - set (\1) % 8, a - ld [wEventFlags + ((\1) / 8)], a - ENDM - -;\1 = event index -CheckAndResetEventA: MACRO - ld a, [wEventFlags + ((\1) / 8)] - bit (\1) % 8, a - res (\1) % 8, a - ld [wEventFlags + ((\1) / 8)], a - ENDM - -;\1 = event index -SetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - set (\1) % 8, [hl] - ENDM - -;\1 = event index -SetEventReuseHL: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - set (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -SetEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - set (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -SetEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - set (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index -;\3, \4, ... = additional (optional) event indices -SetEvents: MACRO - SetEvent \1 - rept (_NARG + -1) - SetEventReuseHL \2 - shift - endr - ENDM - -;\1 = event index -ResetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - res (\1) % 8, [hl] - ENDM - -;\1 = event index -ResetEventReuseHL: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - res (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -ResetEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - res (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -ResetEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - res (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index -;\3 = event index (optional) -ResetEvents: MACRO - ResetEvent \1 - rept (_NARG + -1) - ResetEventReuseHL \2 - shift - endr - ENDM - -;\1 = event index -;\2 = number of bytes away from the base address (optional, for matching the ROM) -dbEventFlagBit: MACRO - IF _NARG > 1 - db ((\1) % 8) + ((\2) * 8) - ELSE - db ((\1) % 8) - ENDC - ENDM - -;\1 = event index -;\2 = number of bytes away from the base address (optional, for matching the ROM) -dwEventFlagAddress: MACRO - IF _NARG > 1 - dw wEventFlags + ((\1) / 8) - (\2) - ELSE - dw wEventFlags + ((\1) / 8) - ENDC - ENDM - -;\1 = start -;\2 = end -SetEventRange: MACRO -event_start_byte = ((\1) / 8) -event_end_byte = ((\2) / 8) - - IF event_end_byte < event_start_byte - FAIL "Incorrect argument order in SetEventRange." - ENDC - - IF event_start_byte == event_end_byte - ld a, [wEventFlags + event_start_byte] - or (1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8)) - ld [wEventFlags + event_start_byte], a - ELSE -event_fill_start = event_start_byte + 1 -event_fill_count = event_end_byte - event_start_byte - 1 - - IF ((\1) % 8) == 0 -event_fill_start = event_fill_start + -1 -event_fill_count = event_fill_count + 1 - ELSE - ld a, [wEventFlags + event_start_byte] - or $ff - ((1 << ((\1) % 8)) - 1) - ld [wEventFlags + event_start_byte], a - ENDC - - IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 - ENDC - - IF event_fill_count == 1 - ld hl, wEventFlags + event_fill_start - ld [hl], $ff - ENDC - - IF event_fill_count > 1 - ld a, $ff - ld hl, wEventFlags + event_fill_start - - REPT event_fill_count + -1 - ld [hli], a - ENDR - - ld [hl], a - ENDC - - IF ((\2) % 8) == 0 - ld hl, wEventFlags + event_end_byte - set 0, [hl] - ELSE - IF ((\2) % 8) != 7 - ld a, [wEventFlags + event_end_byte] - or (1 << (((\2) % 8) + 1)) - 1 - ld [wEventFlags + event_end_byte], a - ENDC - ENDC - ENDC - ENDM - -;\1 = start -;\2 = end -;\3 = assume a is 0 if present -ResetEventRange: MACRO -event_start_byte = ((\1) / 8) -event_end_byte = ((\2) / 8) - - IF event_end_byte < event_start_byte - FAIL "Incorrect argument order in ResetEventRange." - ENDC - - IF event_start_byte == event_end_byte - ld a, [wEventFlags + event_start_byte] - and ~((1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8))) & $ff - ld [wEventFlags + event_start_byte], a - ELSE -event_fill_start = event_start_byte + 1 -event_fill_count = event_end_byte - event_start_byte - 1 - - IF ((\1) % 8) == 0 -event_fill_start = event_fill_start + -1 -event_fill_count = event_fill_count + 1 - ELSE - ld a, [wEventFlags + event_start_byte] - and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff - ld [wEventFlags + event_start_byte], a - ENDC - - IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 - ENDC - - IF event_fill_count == 1 - ld hl, wEventFlags + event_fill_start - ld [hl], 0 - ENDC - - IF event_fill_count > 1 - ld hl, wEventFlags + event_fill_start - - ; force xor a if we just to wrote to it above - IF (_NARG < 3) || (((\1) % 8) != 0) - xor a - ENDC - - REPT event_fill_count + -1 - ld [hli], a - ENDR - - ld [hl], a - ENDC - - IF ((\2) % 8) == 0 - ld hl, wEventFlags + event_end_byte - res 0, [hl] - ELSE - IF ((\2) % 8) != 7 - ld a, [wEventFlags + event_end_byte] - and ~((1 << (((\2) % 8) + 1)) - 1) & $ff - ld [wEventFlags + event_end_byte], a - ENDC - ENDC - ENDC - ENDM - -; returns whether both events are set in Z flag -; This is counter-intuitive because the other event checks set the Z flag when -; the event is not set, but this sets the Z flag when the event is set. -;\1 = event index 1 -;\2 = event index 2 -;\3 = try to reuse a (optional) -CheckBothEventsSet: MACRO - IF ((\1) / 8) == ((\2) / 8) - IF (_NARG < 3) || (((\1) / 8) != event_byte) -event_byte = ((\1) / 8) - ld a, [wEventFlags + ((\1) / 8)] - ENDC - and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - ELSE - ; This case doesn't happen in the original ROM. - IF ((\1) % 8) == ((\2) % 8) - push hl - ld a, [wEventFlags + ((\1) / 8)] - ld hl, wEventFlags + ((\2) / 8) - and [hl] - cpl - bit ((\1) % 8), a - pop hl - ELSE - push bc - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) - ld b, a - ld a, [wEventFlags + ((\2) / 8)] - and (1 << ((\2) % 8)) - or b - cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - pop bc - ENDC - ENDC - ENDM - -; returns the complement of whether either event is set in Z flag -;\1 = event index 1 -;\2 = event index 2 -CheckEitherEventSet: MACRO - IF ((\1) / 8) == ((\2) / 8) - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - ELSE - ; This case doesn't happen in the original ROM. - IF ((\1) % 8) == ((\2) % 8) - push hl - ld a, [wEventFlags + ((\1) / 8)] - ld hl, wEventFlags + ((\2) / 8) - or [hl] - bit ((\1) % 8), a - pop hl - ELSE - push bc - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) - ld b, a - ld a, [wEventFlags + ((\2) / 8)] - and (1 << ((\2) % 8)) - or b - pop bc - ENDC - ENDC - ENDM - -; for handling fixed event bits when events are inserted/removed -;\1 = event index -;\2 = fixed flag bit -AdjustEventBit: MACRO - IF ((\1) % 8) != (\2) - add ((\1) % 8) - (\2) - ENDC - ENDM diff --git a/macros.asm b/macros.asm index 0705bfce..b779ec5f 100644 --- a/macros.asm +++ b/macros.asm @@ -1,767 +1,5 @@ - -percent EQUS "* $ff / 100" - -lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + ((\3) & $ff) - ENDM - - -; Constant enumeration is useful for monsters, items, moves, etc. -const_def: MACRO -const_value = 0 -ENDM - -const: MACRO -\1 EQU const_value -const_value = const_value + 1 -ENDM - - -homecall: MACRO - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(\1) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call \1 - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ENDM - -farcall EQUS "callba" - -callba: MACRO - ld b, BANK(\1) - ld hl, \1 - call Bankswitch - ENDM - -callab: MACRO - ld hl, \1 - ld b, BANK(\1) - call Bankswitch - ENDM - -jpba: MACRO - ld b, BANK(\1) - ld hl, \1 - jp Bankswitch - ENDM - -jpab: MACRO - ld hl, \1 - ld b, BANK(\1) - jp Bankswitch - ENDM - -bcd2: MACRO - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM - -bcd3: MACRO - dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM - -coins equs "bcd2" -money equs "bcd3" - -validateCoords: MACRO - if \1 >= SCREEN_WIDTH - fail "x coord out of range" - endc - if \2 >= SCREEN_HEIGHT - fail "y coord out of range" - endc - endm - -;\1 = r -;\2 = X -;\3 = Y -;\4 = which tilemap (optional) -coord: MACRO - validateCoords \2, \3 -if _NARG >= 4 - ld \1, \4 + SCREEN_WIDTH * \3 + \2 -else - ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 -endc - ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -aCoord: MACRO - validateCoords \1, \2 -if _NARG >= 3 - ld a, [\3 + SCREEN_WIDTH * \2 + \1] -else - ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] -endc - ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -Coorda: MACRO - validateCoords \1, \2 -if _NARG >= 3 - ld [\3 + SCREEN_WIDTH * \2 + \1], a -else - ld [wTileMap + SCREEN_WIDTH * \2 + \1], a -endc - ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -dwCoord: MACRO - validateCoords \1, \2 -if _NARG >= 3 - dw \3 + SCREEN_WIDTH * \2 + \1 -else - dw wTileMap + SCREEN_WIDTH * \2 + \1 -endc - ENDM - -;\1 = r -;\2 = X -;\3 = Y -;\4 = map width -overworldMapCoord: MACRO - ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) - ENDM - -;\1 = Map Width -;\2 = Rows above (Y-blocks) -;\3 = X movement (X-blocks) -EVENT_DISP: MACRO - dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp - db \2,\3 ;Y,X - ENDM - -FLYWARP_DATA: MACRO - EVENT_DISP \1,\2,\3 - db ((\2) & $01) ;sub-block Y - db ((\3) & $01) ;sub-block X - ENDM - -; external map entry macro -EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer -; the appearance of towns and routes in the town map, indexed by map id - ; nybble: y-coordinate - ; nybble: x-coordinate - ; word : pointer to map name - dn \2, \1 - dw \3 - ENDM - -; internal map entry macro -IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer -; the appearance of buildings and dungeons in the town map - ; byte : maximum map id subject to this rule - ; nybble: y-coordinate - ; nybble: x-coordinate - ; word : pointer to map name - db \1 + 1 - dn \3, \2 - dw \4 - ENDM - -; tilesets' headers macro -tileset: MACRO - db BANK(\2) ; BANK(GFX) - dw \1, \2, \3 ; Block, GFX, Coll - db \4, \5, \6 ; counter tiles - db \7 ; grass tile - db \8 ; permission (indoor, cave, outdoor) - ENDM - -INDOOR EQU 0 -CAVE EQU 1 -OUTDOOR EQU 2 - -; macro for two nibbles -dn: MACRO - db (\1 << 4 | \2) - ENDM - -; macro for putting a byte then a word -dbw: MACRO - db \1 - dw \2 - ENDM - -dba: MACRO - dbw BANK(\1), \1 - ENDM - -dwb: MACRO - dw \1 - db \2 - ENDM - -dab: MACRO - dwb \1, BANK(\1) - ENDM - -dbbw: MACRO - db \1, \2 - dw \3 - ENDM - -; data format macros -RGB: MACRO - dw (\3 << 10 | \2 << 5 | \1) - ENDM - -; text macros -text EQUS "db $00," ; Start writing text. -next EQUS "db $4e," ; Move a line down. -line EQUS "db $4f," ; Start writing at the bottom line. -para EQUS "db $51," ; Start a new paragraph. -cont EQUS "db $55," ; Scroll to the next line. -done EQUS "db $57" ; End a text box. -prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). - -page EQUS "db $49," ; Start a new Pokedex page. -dex EQUS "db $5f, $50" ; End a Pokedex entry. - -TX_RAM: MACRO -; prints text to screen -; \1: RAM address to read from - db $1 - dw \1 - ENDM - -TX_BCD: MACRO -; \1: RAM address to read from -; \2: number of bytes + print flags - db $2 - dw \1 - db \2 - ENDM - -TX_LINE EQUS "db $05" -TX_BLINK EQUS "db $06" -;TX_SCROLL EQUS "db $07" -TX_ASM EQUS "db $08" - -TX_NUM: MACRO -; print a big-endian decimal number. -; \1: address to read from -; \2: number of bytes to read -; \3: number of digits to display - db $09 - dw \1 - db \2 << 4 | \3 - ENDM - -TX_DELAY EQUS "db $0a" -TX_SFX_ITEM_1 EQUS "db $0b" -TX_SFX_LEVEL_UP EQUS "db $0b" -;TX_ELLIPSES EQUS "db $0c" -TX_WAIT EQUS "db $0d" -;TX_SFX_DEX_RATING EQUS "db $0e" -TX_SFX_ITEM_2 EQUS "db $10" -TX_SFX_KEY_ITEM EQUS "db $11" -TX_SFX_CAUGHT_MON EQUS "db $12" -TX_SFX_DEX_PAGE_ADDED EQUS "db $13" -TX_CRY_NIDORINA EQUS "db $14" -TX_CRY_PIDGEOT EQUS "db $15" -;TX_CRY_DEWGONG EQUS "db $16" - -TX_FAR: MACRO - db $17 - dw \1 - db BANK(\1) - ENDM - -TX_VENDING_MACHINE EQUS "db $f5" -TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" -TX_PRIZE_VENDOR EQUS "db $f7" -TX_POKECENTER_PC EQUS "db $f9" -TX_PLAYERS_PC EQUS "db $fc" -TX_BILLS_PC EQUS "db $fd" - -TX_MART: MACRO - db $FE, _NARG - rept _NARG - db \1 - shift - endr - db $FF - ENDM - -TX_POKECENTER_NURSE EQUS "db $ff" - -; Predef macro. -predef_const: MACRO - const \1PredefID - ENDM - -add_predef: MACRO -\1Predef:: - db BANK(\1) - dw \1 - ENDM - -predef_id: MACRO - ld a, (\1Predef - PredefPointers) / 3 - ENDM - -predef: MACRO - predef_id \1 - call Predef - ENDM - -predef_jump: MACRO - predef_id \1 - jp Predef - ENDM - -tx_pre_const: MACRO - const \1_id - ENDM - -add_tx_pre: MACRO -\1_id:: dw \1 -ENDM - -db_tx_pre: MACRO - db (\1_id - TextPredefs) / 2 + 1 -ENDM - -tx_pre_id: MACRO - ld a, (\1_id - TextPredefs) / 2 + 1 -ENDM - -tx_pre: MACRO - tx_pre_id \1 - call PrintPredefTextID -ENDM - -tx_pre_jump: MACRO - tx_pre_id \1 - jp PrintPredefTextID -ENDM - -WALK EQU $FE -STAY EQU $FF - -DOWN EQU $D0 -UP EQU $D1 -LEFT EQU $D2 -RIGHT EQU $D3 -NONE EQU $FF - -;\1 sprite id -;\2 x position -;\3 y position -;\4 movement (WALK/STAY) -;\5 range or direction -;\6 text id -;\7 items only: item id -;\7 trainers only: trainer class/pokemon id -;\8 trainers only: trainer number/pokemon level -object: MACRO - db \1 - db \3 + 4 - db \2 + 4 - db \4 - db \5 - IF (_NARG > 7) - db TRAINER | \6 - db \7 - db \8 - ELSE - IF (_NARG > 6) - db ITEM | \6 - db \7 - ELSE - db \6 - ENDC - ENDC -ENDM - -StopAllMusic: macro - ld a, $ff - call PlaySound - endm - -Ch0 EQU 0 -Ch1 EQU 1 -Ch2 EQU 2 -Ch3 EQU 3 -Ch4 EQU 4 -Ch5 EQU 5 -Ch6 EQU 6 -Ch7 EQU 7 - -audio: MACRO - db (_NARG - 2) << 6 | \2 - dw \1_\2 - IF _NARG > 2 - db \3 - dw \1_\3 - ENDC - IF _NARG > 3 - db \4 - dw \1_\4 - ENDC - IF _NARG > 4 - db \5 - dw \1_\5 - ENDC -ENDM - -unknownsfx0x10: MACRO - db $10 - db \1 -ENDM - -unknownsfx0x20: MACRO - db $20 | \1 - db \2 - db \3 - db \4 -ENDM - -unknownnoise0x20: MACRO - db $20 | \1 - db \2 - db \3 -ENDM - -;format: pitch length (in 16ths) -C_: MACRO - db $00 | (\1 - 1) -ENDM - -C#: MACRO - db $10 | (\1 - 1) -ENDM - -D_: MACRO - db $20 | (\1 - 1) -ENDM - -D#: MACRO - db $30 | (\1 - 1) -ENDM - -E_: MACRO - db $40 | (\1 - 1) -ENDM - -F_: MACRO - db $50 | (\1 - 1) -ENDM - -F#: MACRO - db $60 | (\1 - 1) -ENDM - -G_: MACRO - db $70 | (\1 - 1) -ENDM - -G#: MACRO - db $80 | (\1 - 1) -ENDM - -A_: MACRO - db $90 | (\1 - 1) -ENDM - -A#: MACRO - db $A0 | (\1 - 1) -ENDM - -B_: MACRO - db $B0 | (\1 - 1) -ENDM - -;format: instrument length (in 16ths) -snare1: MACRO - db $B0 | (\1 - 1) - db $01 -ENDM - -snare2: MACRO - db $B0 | (\1 - 1) - db $02 -ENDM - -snare3: MACRO - db $B0 | (\1 - 1) - db $03 -ENDM - -snare4: MACRO - db $B0 | (\1 - 1) - db $04 -ENDM - -snare5: MACRO - db $B0 | (\1 - 1) - db $05 -ENDM - -triangle1: MACRO - db $B0 | (\1 - 1) - db $06 -ENDM - -triangle2: MACRO - db $B0 | (\1 - 1) - db $07 -ENDM - -snare6: MACRO - db $B0 | (\1 - 1) - db $08 -ENDM - -snare7: MACRO - db $B0 | (\1 - 1) - db $09 -ENDM - -snare8: MACRO - db $B0 | (\1 - 1) - db $0A -ENDM - -snare9: MACRO - db $B0 | (\1 - 1) - db $0B -ENDM - -cymbal1: MACRO - db $B0 | (\1 - 1) - db $0C -ENDM - -cymbal2: MACRO - db $B0 | (\1 - 1) - db $0D -ENDM - -cymbal3: MACRO - db $B0 | (\1 - 1) - db $0E -ENDM - -mutedsnare1: MACRO - db $B0 | (\1 - 1) - db $0F -ENDM - -triangle3: MACRO - db $B0 | (\1 - 1) - db $10 -ENDM - -mutedsnare2: MACRO - db $B0 | (\1 - 1) - db $11 -ENDM - -mutedsnare3: MACRO - db $B0 | (\1 - 1) - db $12 -ENDM - -mutedsnare4: MACRO - db $B0 | (\1 - 1) - db $13 -ENDM - -;format: rest length (in 16ths) -rest: MACRO - db $C0 | (\1 - 1) -ENDM - -; format: notetype speed, volume, fade -notetype: MACRO - db $D0 | \1 - db (\2 << 4) | \3 -ENDM - -dspeed: MACRO - db $D0 | \1 -ENDM - -octave: MACRO - db $E8 - \1 -ENDM - -toggleperfectpitch: MACRO - db $E8 -ENDM - -;format: vibrato delay, rate, depth -vibrato: MACRO - db $EA - db \1 - db (\2 << 4) | \3 -ENDM - -pitchbend: MACRO - db $EB - db \1 - db \2 -ENDM - -duty: MACRO - db $EC - db \1 -ENDM - -tempo: MACRO - db $ED - db \1 / $100 - db \1 % $100 -ENDM - -stereopanning: MACRO - db $EE - db \1 -ENDM - -volume: MACRO - db $F0 - db (\1 << 4) | \2 -ENDM - -executemusic: MACRO - db $F8 -ENDM - -dutycycle: MACRO - db $FC - db \1 -ENDM - -;format: callchannel address -callchannel: MACRO - db $FD - dw \1 -ENDM - -;format: loopchannel count, address -loopchannel: MACRO - db $FE - db \1 - dw \2 -ENDM - -endchannel: MACRO - db $FF -ENDM - - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -NORTH_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * (\2_HEIGHT - 3)) + \4; "Connection Strip" location - dw wOverworldMap + 3 + \3 ; current map position - IF (\1_WIDTH < \2_WIDTH) - db \1_WIDTH - \3 + 3 ; width of connection strip - ELSE - db \2_WIDTH - \4 ; width of connection strip - ENDC - db \2_WIDTH ; map width - db (\2_HEIGHT * 2) - 1 ; y alignment (y coordinate of player when entering map) - db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 1 + (\2_HEIGHT * (\2_WIDTH + 6)) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -;\6 (flag) = add 3 to width of connection strip (why?) -SOUTH_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + \4 ; "Conection Strip" location - dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position - IF (\1_WIDTH < \2_WIDTH) - IF (_NARG > 5) - db \1_WIDTH - \3 + 3 ; width of connection strip - ELSE - db \1_WIDTH - \3 ; width of connection strip - ENDC - ELSE - db \2_WIDTH - \4 ; width of connection strip - ENDC - db \2_WIDTH ; map width - db 0 ; y alignment (y coordinate of player when entering map) - db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -WEST_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * \4) + \2_WIDTH - 3 ; "Connection Strip" location - dw wOverworldMap + (\1_WIDTH + 6) * (\3 + 3) ; current map position - IF (\1_HEIGHT < \2_HEIGHT) - db \1_HEIGHT - \3 + 3 ; height of connection strip - ELSE - db \2_HEIGHT - \4 ; height of connection strip - ENDC - db \2_WIDTH ; map width - db (\3 - \4) * -2 ; y alignment - db (\2_WIDTH * 2) - 1 ; x alignment - dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -;\6 (flag) = add 3 to height of connection strip (why?) -EAST_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * \4) ; "Connection Strip" location - dw wOverworldMap - 3 + (\1_WIDTH + 6) * (\3 + 4) ; current map position - IF (\1_HEIGHT < \2_HEIGHT) - IF (_NARG > 5) - db \1_HEIGHT - \3 + 3 ; height of connection strip - ELSE - db \1_HEIGHT - \3 ; height of connection strip - ENDC - ELSE - db \2_HEIGHT - \4 ; height of connection strip - ENDC - db \2_WIDTH ; map width - db (\3 - \4) * -2 ; y alignment - db 0 ; x alignment - dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) -ENDM - -tmlearn: MACRO -x = 0 - rept _NARG -IF \1 != 0 -x = x | (1 << ((\1 - 1) % 8)) -ENDC - shift - endr - db x -ENDM +INCLUDE "macros/asm_macros.asm" +INCLUDE "macros/data_macros.asm" +INCLUDE "macros/text_macros.asm" +INCLUDE "macros/audio_macros.asm" +INCLUDE "macros/event_macros.asm" diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm new file mode 100755 index 00000000..5cf5a809 --- /dev/null +++ b/macros/asm_macros.asm @@ -0,0 +1,188 @@ + +lb: MACRO ; r, hi, lo + ld \1, (\2) << 8 + ((\3) & $ff) +ENDM + +homecall: MACRO + ld a, [H_LOADEDROMBANK] + push af + ld a, BANK(\1) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + call \1 + pop af + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a +ENDM + +farcall EQUS "callba" + +callba: MACRO + ld b, BANK(\1) + ld hl, \1 + call Bankswitch +ENDM + +callab: MACRO + ld hl, \1 + ld b, BANK(\1) + call Bankswitch +ENDM + +jpba: MACRO + ld b, BANK(\1) + ld hl, \1 + jp Bankswitch +ENDM + +jpab: MACRO + ld hl, \1 + ld b, BANK(\1) + jp Bankswitch +ENDM + +validateCoords: MACRO + IF \1 >= SCREEN_WIDTH + fail "x coord out of range" + ENDC + IF \2 >= SCREEN_HEIGHT + fail "y coord out of range" + ENDC +ENDM + +;\1 = r +;\2 = X +;\3 = Y +;\4 = which tilemap (optional) +coord: MACRO + validateCoords \2, \3 + IF _NARG >= 4 + ld \1, \4 + SCREEN_WIDTH * \3 + \2 + ELSE + ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 + ENDC +ENDM + +;\1 = X +;\2 = Y +;\3 = which tilemap (optional) +aCoord: MACRO + validateCoords \1, \2 + IF _NARG >= 3 + ld a, [\3 + SCREEN_WIDTH * \2 + \1] + ELSE + ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] + ENDC +ENDM + +;\1 = X +;\2 = Y +;\3 = which tilemap (optional) +Coorda: MACRO + validateCoords \1, \2 + IF _NARG >= 3 + ld [\3 + SCREEN_WIDTH * \2 + \1], a + ELSE + ld [wTileMap + SCREEN_WIDTH * \2 + \1], a + ENDC +ENDM + +;\1 = X +;\2 = Y +;\3 = which tilemap (optional) +dwCoord: MACRO + validateCoords \1, \2 + IF _NARG >= 3 + dw \3 + SCREEN_WIDTH * \2 + \1 + ELSE + dw wTileMap + SCREEN_WIDTH * \2 + \1 + ENDC +ENDM + +;\1 = r +;\2 = X +;\3 = Y +;\4 = map width +overworldMapCoord: MACRO + ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) +ENDM + +; macro for two nibbles +dn: MACRO + db (\1 << 4 | \2) +ENDM + +; macro for putting a byte then a word +dbw: MACRO + db \1 + dw \2 +ENDM + +dba: MACRO + dbw BANK(\1), \1 +ENDM + +dwb: MACRO + dw \1 + db \2 +ENDM + +dab: MACRO + dwb \1, BANK(\1) +ENDM + +dbbw: MACRO + db \1, \2 + dw \3 +ENDM + +; Predef macro. +predef_const: MACRO + const \1PredefID +ENDM + +add_predef: MACRO +\1Predef:: + db BANK(\1) + dw \1 +ENDM + +predef_id: MACRO + ld a, (\1Predef - PredefPointers) / 3 +ENDM + +predef: MACRO + predef_id \1 + call Predef +ENDM + +predef_jump: MACRO + predef_id \1 + jp Predef +ENDM + +tx_pre_const: MACRO + const \1_id +ENDM + +add_tx_pre: MACRO +\1_id:: dw \1 +ENDM + +db_tx_pre: MACRO + db (\1_id - TextPredefs) / 2 + 1 +ENDM + +tx_pre_id: MACRO + ld a, (\1_id - TextPredefs) / 2 + 1 +ENDM + +tx_pre: MACRO + tx_pre_id \1 + call PrintPredefTextID +ENDM + +tx_pre_jump: MACRO + tx_pre_id \1 + jp PrintPredefTextID +ENDM diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm new file mode 100755 index 00000000..71304bf8 --- /dev/null +++ b/macros/audio_macros.asm @@ -0,0 +1,277 @@ + +StopAllMusic: MACRO + ld a, $ff + call PlaySound +ENDM + +Ch0 EQU 0 +Ch1 EQU 1 +Ch2 EQU 2 +Ch3 EQU 3 +Ch4 EQU 4 +Ch5 EQU 5 +Ch6 EQU 6 +Ch7 EQU 7 + +audio: MACRO + db (_NARG - 2) << 6 | \2 + dw \1_\2 + IF _NARG > 2 + db \3 + dw \1_\3 + ENDC + IF _NARG > 3 + db \4 + dw \1_\4 + ENDC + IF _NARG > 4 + db \5 + dw \1_\5 + ENDC +ENDM + +unknownsfx0x10: MACRO + db $10 + db \1 +ENDM + +unknownsfx0x20: MACRO + db $20 | \1 + db \2 + db \3 + db \4 +ENDM + +unknownnoise0x20: MACRO + db $20 | \1 + db \2 + db \3 +ENDM + +;format: pitch length (in 16ths) +C_: MACRO + db $00 | (\1 - 1) +ENDM + +C#: MACRO + db $10 | (\1 - 1) +ENDM + +D_: MACRO + db $20 | (\1 - 1) +ENDM + +D#: MACRO + db $30 | (\1 - 1) +ENDM + +E_: MACRO + db $40 | (\1 - 1) +ENDM + +F_: MACRO + db $50 | (\1 - 1) +ENDM + +F#: MACRO + db $60 | (\1 - 1) +ENDM + +G_: MACRO + db $70 | (\1 - 1) +ENDM + +G#: MACRO + db $80 | (\1 - 1) +ENDM + +A_: MACRO + db $90 | (\1 - 1) +ENDM + +A#: MACRO + db $A0 | (\1 - 1) +ENDM + +B_: MACRO + db $B0 | (\1 - 1) +ENDM + +;format: instrument length (in 16ths) +snare1: MACRO + db $B0 | (\1 - 1) + db $01 +ENDM + +snare2: MACRO + db $B0 | (\1 - 1) + db $02 +ENDM + +snare3: MACRO + db $B0 | (\1 - 1) + db $03 +ENDM + +snare4: MACRO + db $B0 | (\1 - 1) + db $04 +ENDM + +snare5: MACRO + db $B0 | (\1 - 1) + db $05 +ENDM + +triangle1: MACRO + db $B0 | (\1 - 1) + db $06 +ENDM + +triangle2: MACRO + db $B0 | (\1 - 1) + db $07 +ENDM + +snare6: MACRO + db $B0 | (\1 - 1) + db $08 +ENDM + +snare7: MACRO + db $B0 | (\1 - 1) + db $09 +ENDM + +snare8: MACRO + db $B0 | (\1 - 1) + db $0A +ENDM + +snare9: MACRO + db $B0 | (\1 - 1) + db $0B +ENDM + +cymbal1: MACRO + db $B0 | (\1 - 1) + db $0C +ENDM + +cymbal2: MACRO + db $B0 | (\1 - 1) + db $0D +ENDM + +cymbal3: MACRO + db $B0 | (\1 - 1) + db $0E +ENDM + +mutedsnare1: MACRO + db $B0 | (\1 - 1) + db $0F +ENDM + +triangle3: MACRO + db $B0 | (\1 - 1) + db $10 +ENDM + +mutedsnare2: MACRO + db $B0 | (\1 - 1) + db $11 +ENDM + +mutedsnare3: MACRO + db $B0 | (\1 - 1) + db $12 +ENDM + +mutedsnare4: MACRO + db $B0 | (\1 - 1) + db $13 +ENDM + +;format: rest length (in 16ths) +rest: MACRO + db $C0 | (\1 - 1) +ENDM + +; format: notetype speed, volume, fade +notetype: MACRO + db $D0 | \1 + db (\2 << 4) | \3 +ENDM + +dspeed: MACRO + db $D0 | \1 +ENDM + +octave: MACRO + db $E8 - \1 +ENDM + +toggleperfectpitch: MACRO + db $E8 +ENDM + +;format: vibrato delay, rate, depth +vibrato: MACRO + db $EA + db \1 + db (\2 << 4) | \3 +ENDM + +pitchbend: MACRO + db $EB + db \1 + db \2 +ENDM + +duty: MACRO + db $EC + db \1 +ENDM + +tempo: MACRO + db $ED + db \1 / $100 + db \1 % $100 +ENDM + +stereopanning: MACRO + db $EE + db \1 +ENDM + +volume: MACRO + db $F0 + db (\1 << 4) | \2 +ENDM + +executemusic: MACRO + db $F8 +ENDM + +dutycycle: MACRO + db $FC + db \1 +ENDM + +;format: callchannel address +callchannel: MACRO + db $FD + dw \1 +ENDM + +;format: loopchannel count, address +loopchannel: MACRO + db $FE + db \1 + dw \2 +ENDM + +endchannel: MACRO + db $FF +ENDM diff --git a/macros/data_macros.asm b/macros/data_macros.asm new file mode 100755 index 00000000..e24ae20e --- /dev/null +++ b/macros/data_macros.asm @@ -0,0 +1,220 @@ + +; Constant enumeration is useful for monsters, items, moves, etc. +const_def: MACRO +const_value = 0 +ENDM + +const: MACRO +\1 EQU const_value +const_value = const_value + 1 +ENDM + +; data format macros + +percent EQUS "* $ff / 100" + +bcd2: MACRO + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 +ENDM + +bcd3: MACRO + dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 +ENDM + +coins equs "bcd2" +money equs "bcd3" + +;\1 = Map Width +;\2 = Rows above (Y-blocks) +;\3 = X movement (X-blocks) +EVENT_DISP: MACRO + dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp + db \2,\3 ;Y,X +ENDM + +FLYWARP_DATA: MACRO + EVENT_DISP \1,\2,\3 + db ((\2) & $01) ;sub-block Y + db ((\3) & $01) ;sub-block X +ENDM + +; external map entry macro +EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer +; the appearance of towns and routes in the town map, indexed by map id + ; nybble: y-coordinate + ; nybble: x-coordinate + ; word : pointer to map name + dn \2, \1 + dw \3 +ENDM + +; internal map entry macro +IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer +; the appearance of buildings and dungeons in the town map + ; byte : maximum map id subject to this rule + ; nybble: y-coordinate + ; nybble: x-coordinate + ; word : pointer to map name + db \1 + 1 + dn \3, \2 + dw \4 +ENDM + +; tilesets' headers macro +tileset: MACRO + db BANK(\2) ; BANK(GFX) + dw \1, \2, \3 ; Block, GFX, Coll + db \4, \5, \6 ; counter tiles + db \7 ; grass tile + db \8 ; permission (indoor, cave, outdoor) +ENDM + +INDOOR EQU 0 +CAVE EQU 1 +OUTDOOR EQU 2 + +RGB: MACRO + dw (\3 << 10 | \2 << 5 | \1) +ENDM + +WALK EQU $FE +STAY EQU $FF + +DOWN EQU $D0 +UP EQU $D1 +LEFT EQU $D2 +RIGHT EQU $D3 +NONE EQU $FF + +;\1 sprite id +;\2 x position +;\3 y position +;\4 movement (WALK/STAY) +;\5 range or direction +;\6 text id +;\7 items only: item id +;\7 trainers only: trainer class/pokemon id +;\8 trainers only: trainer number/pokemon level +object: MACRO + db \1 + db \3 + 4 + db \2 + 4 + db \4 + db \5 + IF (_NARG > 7) + db TRAINER | \6 + db \7 + db \8 + ELSE + IF (_NARG > 6) + db ITEM | \6 + db \7 + ELSE + db \6 + ENDC + ENDC +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = x movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +NORTH_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * (\2_HEIGHT - 3)) + \4; "Connection Strip" location + dw wOverworldMap + 3 + \3 ; current map position + IF (\1_WIDTH < \2_WIDTH) + db \1_WIDTH - \3 + 3 ; width of connection strip + ELSE + db \2_WIDTH - \4 ; width of connection strip + ENDC + db \2_WIDTH ; map width + db (\2_HEIGHT * 2) - 1 ; y alignment (y coordinate of player when entering map) + db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) + dw wOverworldMap + 1 + (\2_HEIGHT * (\2_WIDTH + 6)) ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = x movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +;\6 (flag) = add 3 to width of connection strip (why?) +SOUTH_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + \4 ; "Conection Strip" location + dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position + IF (\1_WIDTH < \2_WIDTH) + IF (_NARG > 5) + db \1_WIDTH - \3 + 3 ; width of connection strip + ELSE + db \1_WIDTH - \3 ; width of connection strip + ENDC + ELSE + db \2_WIDTH - \4 ; width of connection strip + ENDC + db \2_WIDTH ; map width + db 0 ; y alignment (y coordinate of player when entering map) + db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) + dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = y movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +WEST_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * \4) + \2_WIDTH - 3 ; "Connection Strip" location + dw wOverworldMap + (\1_WIDTH + 6) * (\3 + 3) ; current map position + IF (\1_HEIGHT < \2_HEIGHT) + db \1_HEIGHT - \3 + 3 ; height of connection strip + ELSE + db \2_HEIGHT - \4 ; height of connection strip + ENDC + db \2_WIDTH ; map width + db (\3 - \4) * -2 ; y alignment + db (\2_WIDTH * 2) - 1 ; x alignment + dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = y movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +;\6 (flag) = add 3 to height of connection strip (why?) +EAST_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * \4) ; "Connection Strip" location + dw wOverworldMap - 3 + (\1_WIDTH + 6) * (\3 + 4) ; current map position + IF (\1_HEIGHT < \2_HEIGHT) + IF (_NARG > 5) + db \1_HEIGHT - \3 + 3 ; height of connection strip + ELSE + db \1_HEIGHT - \3 ; height of connection strip + ENDC + ELSE + db \2_HEIGHT - \4 ; height of connection strip + ENDC + db \2_WIDTH ; map width + db (\3 - \4) * -2 ; y alignment + db 0 ; x alignment + dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) +ENDM + +tmlearn: MACRO +x = 0 + REPT _NARG +IF \1 != 0 +x = x | (1 << ((\1 - 1) % 8)) +ENDC + SHIFT + ENDR + db x +ENDM diff --git a/macros/event_macros.asm b/macros/event_macros.asm new file mode 100755 index 00000000..20027209 --- /dev/null +++ b/macros/event_macros.asm @@ -0,0 +1,441 @@ +;\1 = event index +;\2 = return result in carry instead of zero flag +CheckEvent: MACRO +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + + IF _NARG > 1 + IF ((\1) % 8) == 7 + add a + ELSE + REPT ((\1) % 8) + 1 + rrca + ENDR + ENDC + ELSE + bit (\1) % 8, a + ENDC + ENDM + +;\1 = event index +CheckEventReuseA: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + + bit (\1) % 8, a + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +CheckEventAfterBranchReuseA: MACRO +event_byte = ((\2) / 8) + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + + bit (\1) % 8, a + ENDM + +;\1 = reg +;\2 = event index +;\3 = event index this event is relative to (optional, this is needed when there is a fixed flag address) +EventFlagBit: MACRO + IF _NARG > 2 + ld \1, ((\3) % 8) + ((\2) - (\3)) + ELSE + ld \1, (\2) % 8 + ENDC + ENDM + +;\1 = reg +;\2 = event index +EventFlagAddress: MACRO +event_byte = ((\2) / 8) + ld \1, wEventFlags + event_byte + ENDM + +;\1 = event index +CheckEventHL: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckEventReuseHL: MACRO +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] + ENDM + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +CheckEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + bit (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +CheckEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckAndSetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + set (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckAndResetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + res (\1) % 8, [hl] + ENDM + +;\1 = event index +CheckAndSetEventA: MACRO + ld a, [wEventFlags + ((\1) / 8)] + bit (\1) % 8, a + set (\1) % 8, a + ld [wEventFlags + ((\1) / 8)], a + ENDM + +;\1 = event index +CheckAndResetEventA: MACRO + ld a, [wEventFlags + ((\1) / 8)] + bit (\1) % 8, a + res (\1) % 8, a + ld [wEventFlags + ((\1) / 8)], a + ENDM + +;\1 = event index +SetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + set (\1) % 8, [hl] + ENDM + +;\1 = event index +SetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + set (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +SetEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + set (\1) % 8, [hl] + ENDM + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +SetEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + set (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index +;\3, \4, ... = additional (optional) event indices +SetEvents: MACRO + SetEvent \1 + rept (_NARG + -1) + SetEventReuseHL \2 + shift + endr + ENDM + +;\1 = event index +ResetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + res (\1) % 8, [hl] + ENDM + +;\1 = event index +ResetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + res (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index of the last event used before the branch +ResetEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + res (\1) % 8, [hl] + ENDM + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +ResetEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + res (\1) % 8, [hl] + ENDM + +;\1 = event index +;\2 = event index +;\3 = event index (optional) +ResetEvents: MACRO + ResetEvent \1 + rept (_NARG + -1) + ResetEventReuseHL \2 + shift + endr + ENDM + +;\1 = event index +;\2 = number of bytes away from the base address (optional, for matching the ROM) +dbEventFlagBit: MACRO + IF _NARG > 1 + db ((\1) % 8) + ((\2) * 8) + ELSE + db ((\1) % 8) + ENDC + ENDM + +;\1 = event index +;\2 = number of bytes away from the base address (optional, for matching the ROM) +dwEventFlagAddress: MACRO + IF _NARG > 1 + dw wEventFlags + ((\1) / 8) - (\2) + ELSE + dw wEventFlags + ((\1) / 8) + ENDC + ENDM + +;\1 = start +;\2 = end +SetEventRange: MACRO +event_start_byte = ((\1) / 8) +event_end_byte = ((\2) / 8) + + IF event_end_byte < event_start_byte + FAIL "Incorrect argument order in SetEventRange." + ENDC + + IF event_start_byte == event_end_byte + ld a, [wEventFlags + event_start_byte] + or (1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8)) + ld [wEventFlags + event_start_byte], a + ELSE +event_fill_start = event_start_byte + 1 +event_fill_count = event_end_byte - event_start_byte - 1 + + IF ((\1) % 8) == 0 +event_fill_start = event_fill_start + -1 +event_fill_count = event_fill_count + 1 + ELSE + ld a, [wEventFlags + event_start_byte] + or $ff - ((1 << ((\1) % 8)) - 1) + ld [wEventFlags + event_start_byte], a + ENDC + + IF ((\2) % 8) == 7 +event_fill_count = event_fill_count + 1 + ENDC + + IF event_fill_count == 1 + ld hl, wEventFlags + event_fill_start + ld [hl], $ff + ENDC + + IF event_fill_count > 1 + ld a, $ff + ld hl, wEventFlags + event_fill_start + + REPT event_fill_count + -1 + ld [hli], a + ENDR + + ld [hl], a + ENDC + + IF ((\2) % 8) == 0 + ld hl, wEventFlags + event_end_byte + set 0, [hl] + ELSE + IF ((\2) % 8) != 7 + ld a, [wEventFlags + event_end_byte] + or (1 << (((\2) % 8) + 1)) - 1 + ld [wEventFlags + event_end_byte], a + ENDC + ENDC + ENDC + ENDM + +;\1 = start +;\2 = end +;\3 = assume a is 0 if present +ResetEventRange: MACRO +event_start_byte = ((\1) / 8) +event_end_byte = ((\2) / 8) + + IF event_end_byte < event_start_byte + FAIL "Incorrect argument order in ResetEventRange." + ENDC + + IF event_start_byte == event_end_byte + ld a, [wEventFlags + event_start_byte] + and ~((1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8))) & $ff + ld [wEventFlags + event_start_byte], a + ELSE +event_fill_start = event_start_byte + 1 +event_fill_count = event_end_byte - event_start_byte - 1 + + IF ((\1) % 8) == 0 +event_fill_start = event_fill_start + -1 +event_fill_count = event_fill_count + 1 + ELSE + ld a, [wEventFlags + event_start_byte] + and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff + ld [wEventFlags + event_start_byte], a + ENDC + + IF ((\2) % 8) == 7 +event_fill_count = event_fill_count + 1 + ENDC + + IF event_fill_count == 1 + ld hl, wEventFlags + event_fill_start + ld [hl], 0 + ENDC + + IF event_fill_count > 1 + ld hl, wEventFlags + event_fill_start + + ; force xor a if we just to wrote to it above + IF (_NARG < 3) || (((\1) % 8) != 0) + xor a + ENDC + + REPT event_fill_count + -1 + ld [hli], a + ENDR + + ld [hl], a + ENDC + + IF ((\2) % 8) == 0 + ld hl, wEventFlags + event_end_byte + res 0, [hl] + ELSE + IF ((\2) % 8) != 7 + ld a, [wEventFlags + event_end_byte] + and ~((1 << (((\2) % 8) + 1)) - 1) & $ff + ld [wEventFlags + event_end_byte], a + ENDC + ENDC + ENDC + ENDM + +; returns whether both events are set in Z flag +; This is counter-intuitive because the other event checks set the Z flag when +; the event is not set, but this sets the Z flag when the event is set. +;\1 = event index 1 +;\2 = event index 2 +;\3 = try to reuse a (optional) +CheckBothEventsSet: MACRO + IF ((\1) / 8) == ((\2) / 8) + IF (_NARG < 3) || (((\1) / 8) != event_byte) +event_byte = ((\1) / 8) + ld a, [wEventFlags + ((\1) / 8)] + ENDC + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + and [hl] + cpl + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + pop bc + ENDC + ENDC + ENDM + +; returns the complement of whether either event is set in Z flag +;\1 = event index 1 +;\2 = event index 2 +CheckEitherEventSet: MACRO + IF ((\1) / 8) == ((\2) / 8) + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + or [hl] + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + pop bc + ENDC + ENDC + ENDM + +; for handling fixed event bits when events are inserted/removed +;\1 = event index +;\2 = fixed flag bit +AdjustEventBit: MACRO + IF ((\1) % 8) != (\2) + add ((\1) % 8) - (\2) + ENDC + ENDM diff --git a/macros/text_macros.asm b/macros/text_macros.asm new file mode 100755 index 00000000..21e02634 --- /dev/null +++ b/macros/text_macros.asm @@ -0,0 +1,80 @@ + +; text macros +text EQUS "db $00," ; Start writing text. +next EQUS "db $4e," ; Move a line down. +line EQUS "db $4f," ; Start writing at the bottom line. +para EQUS "db $51," ; Start a new paragraph. +cont EQUS "db $55," ; Scroll to the next line. +done EQUS "db $57" ; End a text box. +prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). + +page EQUS "db $49," ; Start a new Pokedex page. +dex EQUS "db $5f, $50" ; End a Pokedex entry. + +TX_RAM: MACRO +; prints text to screen +; \1: RAM address to read from + db $1 + dw \1 +ENDM + +TX_BCD: MACRO +; \1: RAM address to read from +; \2: number of bytes + print flags + db $2 + dw \1 + db \2 +ENDM + +TX_LINE EQUS "db $05" +TX_BLINK EQUS "db $06" +;TX_SCROLL EQUS "db $07" +TX_ASM EQUS "db $08" + +TX_NUM: MACRO +; print a big-endian decimal number. +; \1: address to read from +; \2: number of bytes to read +; \3: number of digits to display + db $09 + dw \1 + db \2 << 4 | \3 +ENDM + +TX_DELAY EQUS "db $0a" +TX_SFX_ITEM_1 EQUS "db $0b" +TX_SFX_LEVEL_UP EQUS "db $0b" +;TX_ELLIPSES EQUS "db $0c" +TX_WAIT EQUS "db $0d" +;TX_SFX_DEX_RATING EQUS "db $0e" +TX_SFX_ITEM_2 EQUS "db $10" +TX_SFX_KEY_ITEM EQUS "db $11" +TX_SFX_CAUGHT_MON EQUS "db $12" +TX_SFX_DEX_PAGE_ADDED EQUS "db $13" +TX_CRY_NIDORINA EQUS "db $14" +TX_CRY_PIDGEOT EQUS "db $15" +;TX_CRY_DEWGONG EQUS "db $16" + +TX_FAR: MACRO + db $17 + dw \1 + db BANK(\1) +ENDM + +TX_VENDING_MACHINE EQUS "db $f5" +TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" +TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_PC EQUS "db $f9" +TX_PLAYERS_PC EQUS "db $fc" +TX_BILLS_PC EQUS "db $fd" + +TX_MART: MACRO + db $FE, _NARG + REPT _NARG + db \1 + SHIFT + ENDR + db $FF +ENDM + +TX_POKECENTER_NURSE EQUS "db $ff" -- cgit v1.2.3 From defd8ad8c78c7ecd591a4f30146629aa50ac64d3 Mon Sep 17 00:00:00 2001 From: Mathias Bynens Date: Thu, 9 Apr 2015 13:41:12 +0200 Subject: Enable continuous integration --- .travis.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..3fe46c2b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +language: c +install: + - sudo easy_install pypng + - path="$(pwd)"; cd; git clone git://github.com/bentley/rgbds.git && cd rgbds && sudo make install; cd "$path" +before_script: + - |- + function check_status() { + if ! git diff-index --quiet HEAD --; then + echo 'Uncommitted changes detected.'; + return 1; + fi; + } + - |- + function verify() { + actual="$(md5sum "${1}" | cut -c 1-32)"; + expected="${2}"; + if [ "${actual}" != "${expected}" ]; then + echo "md5(${1}): expected ${2}, but got ${actual} instead."; + return 1; + fi; + } +script: + - make + - verify pokeblue.gbc 50927e843568814f7ed45ec4f944bd8b + - verify pokered.gbc 3d45c1ee9abd5738df46d2bdda8b57dc + - check_status -- cgit v1.2.3 From 0eedb406081791c9ffb6309cda25259ee011682e Mon Sep 17 00:00:00 2001 From: Summate Date: Sun, 4 Sep 2016 14:31:59 -0500 Subject: Continuing the source-level documentation of roughly where trainers can be found --- data/trainer_parties.asm | 186 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index c186dd00..0c586dad 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -60,16 +60,22 @@ YoungsterData: ; Route 3 db 11,RATTATA,EKANS,0 db 14,SPEAROW,0 +; Mt. Moon 1F db 10,RATTATA,RATTATA,ZUBAT,0 +; Route 24 db 14,RATTATA,EKANS,ZUBAT,0 +; Route 25 db 15,RATTATA,SPEAROW,0 db 17,SLOWPOKE,0 db 14,EKANS,SANDSHREW,0 +; SS Anne 1F Rooms db 21,NIDORAN_M,0 +; Route 11 db 21,EKANS,0 db 19,SANDSHREW,ZUBAT,0 db 17,RATTATA,RATTATA,RATICATE,0 db 18,NIDORAN_M,NIDORINO,0 +; Unused db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 BugCatcherData: ; Viridian Forest @@ -80,12 +86,17 @@ BugCatcherData: db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 +; Mt. Moon 1F db 11,WEEDLE,KAKUNA,0 db 10,CATERPIE,METAPOD,CATERPIE,0 +; Route 24 db 14,CATERPIE,WEEDLE,0 +; Route 6 db 16,WEEDLE,CATERPIE,WEEDLE,0 db 20,BUTTERFREE,0 +; Unused db 18,METAPOD,CATERPIE,VENONAT,0 +; Route 9 db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 LassData: @@ -93,147 +104,213 @@ LassData: db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 db 14,JIGGLYPUFF,0 +; Route 4 db 31,PARAS,PARAS,PARASECT,0 +; Mt. Moon 1F db 11,ODDISH,BELLSPROUT,0 db 14,CLEFAIRY,0 +; Route 24 db 16,PIDGEY,NIDORAN_F,0 db 14,PIDGEY,NIDORAN_F,0 +; Route 25 db 15,NIDORAN_M,NIDORAN_F,0 db 13,ODDISH,PIDGEY,ODDISH,0 +; SS Anne 1F Rooms db 18,PIDGEY,NIDORAN_F,0 +; SS Anne 2F Rooms db 18,RATTATA,PIKACHU,0 +; Route 8 db 23,NIDORAN_F,NIDORINA,0 db 24,MEOWTH,MEOWTH,MEOWTH,0 db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 db 22,CLEFAIRY,CLEFAIRY,0 +; Celadon Gym db 23,BELLSPROUT,WEEPINBELL,0 db 23,ODDISH,GLOOM,0 SailorData: +; SS Anne Stern db 18,MACHOP,SHELLDER,0 db 17,MACHOP,TENTACOOL,0 +; SS Anne B1F Rooms db 21,SHELLDER,0 db 17,HORSEA,SHELLDER,TENTACOOL,0 db 18,TENTACOOL,STARYU,0 db 17,HORSEA,HORSEA,HORSEA,0 db 20,MACHOP,0 +; Vermilion Gym db 21,PIKACHU,PIKACHU,0 JrTrainerMData: +; Pewter Gym db 11,DIGLETT,SANDSHREW,0 +; Route 24/Route 25 db 14,RATTATA,EKANS,0 +; Route 24 db 18,MANKEY,0 +; Route 6 db 20,SQUIRTLE,0 db 16,SPEAROW,RATICATE,0 +; Unused db 18,DIGLETT,DIGLETT,SANDSHREW,0 +; Route 9 db 21,GROWLITHE,CHARMANDER,0 db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 +; Route 12 db 29,NIDORAN_M,NIDORINO,0 JrTrainerFData: +; Cerulean Gym db 19,GOLDEEN,0 +; Route 6 db 16,RATTATA,PIKACHU,0 db 16,PIDGEY,PIDGEY,PIDGEY,0 +; Unused db 22,BULBASAUR,0 +; Route 9 db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 23,MEOWTH,0 +; Route 10 db 20,PIKACHU,CLEFAIRY,0 db 21,PIDGEY,PIDGEOTTO,0 +; Rock Tunnel B1F db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 db 22,ODDISH,BULBASAUR,0 +; Celadon Gym db 24,BULBASAUR,IVYSAUR,0 +; Route 13 db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 db 30,POLIWAG,POLIWAG,0 db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0 db 28,GOLDEEN,POLIWAG,HORSEA,0 +; Route 20 db 31,GOLDEEN,SEAKING,0 +; Rock Tunnel 1F db 22,BELLSPROUT,CLEFAIRY,0 db 20,MEOWTH,ODDISH,PIDGEY,0 db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 +; Route 15 db 28,GLOOM,ODDISH,ODDISH,0 db 29,PIKACHU,RAICHU,0 db 33,CLEFAIRY,0 db 29,BELLSPROUT,ODDISH,TANGELA,0 +; Route 20 db 30,TENTACOOL,HORSEA,SEEL,0 PokemaniacData: +; Route 10 db 30,RHYHORN,LICKITUNG,0 db 20,CUBONE,SLOWPOKE,0 +; Rock Tunnel B1F db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0 db 22,CHARMANDER,CUBONE,0 db 25,SLOWPOKE,0 +; Victory Road 2F db 40,CHARMELEON,LAPRAS,LICKITUNG,0 +; Rock Tunnel 1F db 23,CUBONE,SLOWPOKE,0 SuperNerdData: +; Mt. Moon 1F db 11,MAGNEMITE,VOLTORB,0 +; Mt. Moon B2F db 12,GRIMER,VOLTORB,KOFFING,0 +; Route 8 db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0 db 22,GRIMER,MUK,GRIMER,0 db 26,KOFFING,0 +; Unused db 22,KOFFING,MAGNEMITE,WEEZING,0 db 20,MAGNEMITE,MAGNEMITE,KOFFING,MAGNEMITE,0 db 24,MAGNEMITE,VOLTORB,0 +; Cinnabar Gym db 36,VULPIX,VULPIX,NINETALES,0 db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0 db 41,RAPIDASH,0 db 37,GROWLITHE,VULPIX,0 HikerData: +; Mt. Moon 1F db 10,GEODUDE,GEODUDE,ONIX,0 +; Route 25 db 15,MACHOP,GEODUDE,0 db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0 db 17,ONIX,0 +; Route 9 db 21,GEODUDE,ONIX,0 db 20,GEODUDE,MACHOP,GEODUDE,0 +; Route 10 db 21,GEODUDE,ONIX,0 db 19,ONIX,GRAVELER,0 +; Rock Tunnel B1F db 21,GEODUDE,GEODUDE,GRAVELER,0 db 25,GEODUDE,0 +; Route 9/Rock Tunnel B1F db 20,MACHOP,ONIX,0 +; Rock Tunnel 1F db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0 db 20,ONIX,ONIX,GEODUDE,0 db 21,GEODUDE,GRAVELER,0 BikerData: +; Route 13 db 28,KOFFING,KOFFING,KOFFING,0 +; Route 14 db 29,KOFFING,GRIMER,0 +; Route 15 db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0 db 28,KOFFING,GRIMER,WEEZING,0 +; Route 16 db 29,GRIMER,KOFFING,0 db 33,WEEZING,0 db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 +; Route 17 db 28,WEEZING,KOFFING,WEEZING,0 db 33,MUK,0 db 29,VOLTORB,VOLTORB,0 db 29,WEEZING,MUK,0 db 25,KOFFING,WEEZING,KOFFING,KOFFING,WEEZING,0 +; Route 14 db 26,KOFFING,KOFFING,GRIMER,KOFFING,0 db 28,GRIMER,GRIMER,KOFFING,0 db 29,KOFFING,MUK,0 BurglarData: +; Unused db 29,GROWLITHE,VULPIX,0 db 33,GROWLITHE,0 db 28,VULPIX,CHARMANDER,PONYTA,0 +; Cinnabar Gym db 36,GROWLITHE,VULPIX,NINETALES,0 db 41,PONYTA,0 db 37,VULPIX,GROWLITHE,0 +; Mansion 2F db 34,CHARMANDER,CHARMELEON,0 +; Mansion 3F db 38,NINETALES,0 +; Mansion B1F db 34,GROWLITHE,PONYTA,0 EngineerData: +; Unused db 21,VOLTORB,MAGNEMITE,0 +; Route 11 db 21,MAGNEMITE,0 db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0 Juggler1Data: ; none FisherData: +; SS Anne 2F Rooms db 17,GOLDEEN,TENTACOOL,GOLDEEN,0 +; SS Anne B1F Rooms db 17,TENTACOOL,STARYU,SHELLDER,0 +; Route 12 db 22,GOLDEEN,POLIWAG,GOLDEEN,0 db 24,TENTACOOL,GOLDEEN,0 db 27,GOLDEEN,0 db 21,POLIWAG,SHELLDER,GOLDEEN,HORSEA,0 +; Route 21 db 28,SEAKING,GOLDEEN,SEAKING,SEAKING,0 db 31,SHELLDER,CLOYSTER,0 db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0 db 33,SEAKING,GOLDEEN,0 +; Route 12 db 24,MAGIKARP,MAGIKARP,0 SwimmerData: +; Cerulean Gym db 16,HORSEA,SHELLDER,0 +; Route 19 db 30,TENTACOOL,SHELLDER,0 db 29,GOLDEEN,HORSEA,STARYU,0 db 30,POLIWAG,POLIWHIRL,0 @@ -241,192 +318,280 @@ SwimmerData: db 29,GOLDEEN,SHELLDER,SEAKING,0 db 30,HORSEA,HORSEA,0 db 27,TENTACOOL,TENTACOOL,STARYU,HORSEA,TENTACRUEL,0 +; Route 20 db 31,SHELLDER,CLOYSTER,0 db 35,STARYU,0 db 28,HORSEA,HORSEA,SEADRA,HORSEA,0 +; Route 21 db 33,SEADRA,TENTACRUEL,0 db 37,STARMIE,0 db 33,STARYU,WARTORTLE,0 db 32,POLIWHIRL,TENTACOOL,SEADRA,0 CueBallData: +; Route 16 db 28,MACHOP,MANKEY,MACHOP,0 db 29,MANKEY,MACHOP,0 db 33,MACHOP,0 +; Route 17 db 29,MANKEY,PRIMEAPE,0 db 29,MACHOP,MACHOKE,0 db 33,MACHOKE,0 db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0 db 29,PRIMEAPE,MACHOKE,0 +; Route 21 db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0 GamblerData: +; Route 11 db 18,POLIWAG,HORSEA,0 db 18,BELLSPROUT,ODDISH,0 db 18,VOLTORB,MAGNEMITE,0 db 18,GROWLITHE,VULPIX,0 +; Route 8 db 22,POLIWAG,POLIWAG,POLIWHIRL,0 +; Unused db 22,ONIX,GEODUDE,GRAVELER,0 +; Route 8 db 24,GROWLITHE,VULPIX,0 BeautyData: +; Celadon Gym db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 24,BELLSPROUT,BELLSPROUT,0 db 26,EXEGGCUTE,0 +; Route 13 db 27,RATTATA,PIKACHU,RATTATA,0 db 29,CLEFAIRY,MEOWTH,0 +; Route 20 db 35,SEAKING,0 db 30,SHELLDER,SHELLDER,CLOYSTER,0 db 31,POLIWAG,SEAKING,0 +; Route 15 db 29,PIDGEOTTO,WIGGLYTUFF,0 db 29,BULBASAUR,IVYSAUR,0 +; Unused db 33,WEEPINBELL,BELLSPROUT,WEEPINBELL,0 +; Route 19 db 27,POLIWAG,GOLDEEN,SEAKING,GOLDEEN,POLIWAG,0 db 30,GOLDEEN,SEAKING,0 db 29,STARYU,STARYU,STARYU,0 +; Route 20 db 30,SEADRA,HORSEA,SEADRA,0 PsychicData: +; Saffron Gym db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 db 34,MR_MIME,KADABRA,0 db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 RockerData: +; Vermilion Gym db 20,VOLTORB,MAGNEMITE,VOLTORB,0 +; Route 12 db 29,VOLTORB,ELECTRODE,0 JugglerData: +; Silph Co. 5F db 29,KADABRA,MR_MIME,0 +; Victory Road 2F db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 +; Fucshia Gym db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 db 34,DROWZEE,HYPNO,0 +; Victory Road 2F db 48,MR_MIME,0 +; Unused db 33,HYPNO,0 +; Fucshia Gym db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 TamerData: +; Fucshia Gym db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 +; Viridian Gym db 43,RHYHORN,0 db 39,ARBOK,TAUROS,0 +; Victory Road 2F db 44,PERSIAN,GOLDUCK,0 +; Unused db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0 BirdKeeperData: +; Route 13 db 29,PIDGEY,PIDGEOTTO,0 db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 +; Route 14 db 33,FARFETCHD,0 db 29,SPEAROW,FEAROW,0 +; Route 15 db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0 db 28,DODRIO,DODUO,DODUO,0 +; Route 18 db 29,SPEAROW,FEAROW,0 db 34,DODRIO,0 db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 +; Route 20 db 30,FEAROW,FEAROW,PIDGEOTTO,0 +; Unused db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 db 42,FARFETCHD,FEAROW,0 +; Route 14 db 28,PIDGEY,DODUO,PIDGEOTTO,0 db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 db 29,PIDGEOTTO,FEAROW,0 db 28,SPEAROW,DODUO,FEAROW,0 BlackbeltData: +; Fighting Dojo db 37,HITMONLEE,HITMONCHAN,0 db 31,MANKEY,MANKEY,PRIMEAPE,0 db 32,MACHOP,MACHOKE,0 db 36,PRIMEAPE,0 db 31,MACHOP,MANKEY,PRIMEAPE,0 +; Viridian Gym db 40,MACHOP,MACHOKE,0 db 43,MACHOKE,0 db 38,MACHOKE,MACHOP,MACHOKE,0 +; Victory Road 2F db 43,MACHOKE,MACHOP,MACHOKE,0 Green1Data: db 5,SQUIRTLE,0 db 5,BULBASAUR,0 db 5,CHARMANDER,0 +; Route 22 db $FF,9,PIDGEY,8,SQUIRTLE,0 db $FF,9,PIDGEY,8,BULBASAUR,0 db $FF,9,PIDGEY,8,CHARMANDER,0 +; Cerulean City db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0 db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0 ProfOakData: +; Unused db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0 ChiefData: ; none ScientistData: +; Unused db 34,KOFFING,VOLTORB,0 +; Silph Co. 2F db 26,GRIMER,WEEZING,KOFFING,WEEZING,0 db 28,MAGNEMITE,VOLTORB,MAGNETON,0 +; Silph Co. 3F/Mansion 1F db 29,ELECTRODE,WEEZING,0 +; Silph Co. 4F db 33,ELECTRODE,0 +; Silph Co. 5F db 26,MAGNETON,KOFFING,WEEZING,MAGNEMITE,0 +; Silph Co. 6F db 25,VOLTORB,KOFFING,MAGNETON,MAGNEMITE,KOFFING,0 +; Silph Co. 7F db 29,ELECTRODE,MUK,0 +; Silph Co. 8F db 29,GRIMER,ELECTRODE,0 +; Silph Co. 9F db 28,VOLTORB,KOFFING,MAGNETON,0 +; Silph Co. 10F db 29,MAGNEMITE,KOFFING,0 +; Mansion 3F db 33,MAGNEMITE,MAGNETON,VOLTORB,0 +; Mansion B1F db 34,MAGNEMITE,ELECTRODE,0 GiovanniData: +; Rocket Hideout B4F db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0 +; Silph Co. 11F db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0 +; Viridian Gym db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0 RocketData: +; Mt. Moon B2F db 13,RATTATA,ZUBAT,0 db 11,SANDSHREW,RATTATA,ZUBAT,0 db 12,ZUBAT,EKANS,0 db 16,RATICATE,0 +; Cerulean City db 17,MACHOP,DROWZEE,0 +; Route 24 db 15,EKANS,ZUBAT,0 +; Game Corner db 20,RATICATE,ZUBAT,0 +; Rocket Hideout B1F db 21,DROWZEE,MACHOP,0 db 21,RATICATE,RATICATE,0 db 20,GRIMER,KOFFING,KOFFING,0 db 19,RATTATA,RATICATE,RATICATE,RATTATA,0 db 22,GRIMER,KOFFING,0 +; Rocket Hideout B2F db 17,ZUBAT,KOFFING,GRIMER,ZUBAT,RATICATE,0 +; Rocket Hideout B3F db 20,RATTATA,RATICATE,DROWZEE,0 db 21,MACHOP,MACHOP,0 +; Rocket Hideout B4F db 23,SANDSHREW,EKANS,SANDSLASH,0 db 23,EKANS,SANDSHREW,ARBOK,0 db 21,KOFFING,ZUBAT,0 +; Pokémon Tower 7F db 25,ZUBAT,ZUBAT,GOLBAT,0 db 26,KOFFING,DROWZEE,0 db 23,ZUBAT,RATTATA,RATICATE,ZUBAT,0 +; Unused db 26,DROWZEE,KOFFING,0 +; Silph Co. 2F db 29,CUBONE,ZUBAT,0 db 25,GOLBAT,ZUBAT,ZUBAT,RATICATE,ZUBAT,0 +; Silph Co. 3F db 28,RATICATE,HYPNO,RATICATE,0 +; Silph Co. 4F db 29,MACHOP,DROWZEE,0 db 28,EKANS,ZUBAT,CUBONE,0 +; Silph Co. 5F db 33,ARBOK,0 db 33,HYPNO,0 +; Silph Co. 6F db 29,MACHOP,MACHOKE,0 db 28,ZUBAT,ZUBAT,GOLBAT,0 +; Silph Co. 7F db 26,RATICATE,ARBOK,KOFFING,GOLBAT,0 db 29,CUBONE,CUBONE,0 db 29,SANDSHREW,SANDSLASH,0 +; Silph Co. 8F db 26,RATICATE,ZUBAT,GOLBAT,RATTATA,0 db 28,WEEZING,GOLBAT,KOFFING,0 +; Silph Co. 9F db 28,DROWZEE,GRIMER,MACHOP,0 db 28,GOLBAT,DROWZEE,HYPNO,0 +; Silph Co. 10F db 33,MACHOKE,0 +; Silph Co. 11F db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 db 32,CUBONE,DROWZEE,MAROWAK,0 CooltrainerMData: +; Viridian Gym db 39,NIDORINO,NIDOKING,0 +; Victory Road 3F db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 db 43,KINGLER,TENTACRUEL,BLASTOISE,0 +; Unused db 45,KINGLER,STARMIE,0 +; Victory Road 1F db 42,IVYSAUR,WARTORTLE,CHARMELEON,CHARIZARD,0 +; Unused db 44,IVYSAUR,WARTORTLE,CHARMELEON,0 db 49,NIDOKING,0 db 44,KINGLER,CLOYSTER,0 +; Viridian Gym db 39,SANDSLASH,DUGTRIO,0 db 43,RHYHORN,0 CooltrainerFData: +; Celadon Gym db 24,WEEPINBELL,GLOOM,IVYSAUR,0 +; Victory Road 3F db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0 db 43,PARASECT,DEWGONG,CHANSEY,0 +; Unused db 46,VILEPLUME,BUTTERFREE,0 +; Victory Road 1F db 44,PERSIAN,NINETALES,0 +; Unused db 45,IVYSAUR,VENUSAUR,0 db 45,NIDORINA,NIDOQUEEN,0 db 43,PERSIAN,NINETALES,RAICHU,0 @@ -447,21 +612,29 @@ BlaineData: SabrinaData: db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 GentlemanData: +; SS Anne 1F Rooms db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 +; SS Anne 2F Rooms/Vermilion Gym db 23,PIKACHU,0 +; Unused db 48,PRIMEAPE,0 +; SS Anne 2F Rooms db 17,GROWLITHE,PONYTA,0 Green2Data: +; SS Anne 2F db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0 db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0 +; Pokémon Tower 2F db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0 db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0 db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0 +; Silph Co. 7F db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0 db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0 db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0 +; Route 22 db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0 db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0 db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 @@ -472,27 +645,40 @@ Green3Data: LoreleiData: db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0 ChannelerData: +; Unused db 22,GASTLY,0 db 24,GASTLY,0 db 23,GASTLY,GASTLY,0 db 24,GASTLY,0 +; Pokémon Tower 3F db 23,GASTLY,0 db 24,GASTLY,0 +; Unused db 24,HAUNTER,0 +; Pokémon Tower 3F db 22,GASTLY,0 +; Pokémon Tower 4F db 24,GASTLY,0 db 23,GASTLY,GASTLY,0 +; Unused db 24,GASTLY,0 +; Pokémon Tower 4F db 22,GASTLY,0 +; Unused db 24,GASTLY,0 +; Pokémon Tower 5F db 23,HAUNTER,0 +; Unused db 24,GASTLY,0 +; Pokémon Tower 5F db 22,GASTLY,0 db 24,GASTLY,0 db 22,HAUNTER,0 +; Pokémon Tower 6F db 22,GASTLY,GASTLY,GASTLY,0 db 24,GASTLY,0 db 24,GASTLY,0 +; Saffron Gym db 34,GASTLY,HAUNTER,0 db 38,HAUNTER,0 db 33,GASTLY,GASTLY,HAUNTER,0 -- cgit v1.2.3 From 46a94c63fc287e7290502776d02648476bc44171 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 11 Sep 2016 02:01:37 -0700 Subject: name text destination pointer variable --- home/text.asm | 10 +++++----- wram.asm | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/home/text.asm b/home/text.asm index 65d7a614..b983f609 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,5 +1,5 @@ TextBoxBorder:: -; Draw a cxb text box at hl. +; Draw a c×b text box at hl. ; top row push hl @@ -369,9 +369,9 @@ TextCommandProcessor:: xor e ld [wLetterPrintingDelayFlags],a ld a,c - ld [wUnusedCC3A],a + ld [wTextDest],a ld a,b - ld [wUnusedCC3B],a + ld [wTextDest + 1],a NextTextCommand:: ld a,[hli] @@ -480,10 +480,10 @@ TextCommand02:: TextCommand03:: pop hl ld a,[hli] - ld [wUnusedCC3A],a + ld [wTextDest],a ld c,a ld a,[hli] - ld [wUnusedCC3B],a + ld [wTextDest + 1],a ld b,a jp NextTextCommand diff --git a/wram.asm b/wram.asm index 0321545c..35acff94 100755 --- a/wram.asm +++ b/wram.asm @@ -445,11 +445,10 @@ wTradeCenterPointerTableIndex:: ; cc38 ds 1 -wUnusedCC3A:: ; cc3a - ds 1 - -wUnusedCC3B:: ; cc3b - ds 1 +wTextDest:: ; cc3a +; destination pointer for text output +; this variable is written to, but is never read from + ds 2 wDoNotWaitForButtonPressAfterDisplayingText:: ; cc3c ; if non-zero, skip waiting for a button press after displaying text in DisplayTextID -- cgit v1.2.3 From 6f1ac06e03cd046f61fb2370ff7379a29932bbb1 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 17 Sep 2016 17:37:32 -0700 Subject: pull some bank 1 code out of main.asm --- engine/cable_club.asm | 6 + engine/load_mon_data.asm | 49 +++ engine/overworld/map_sprite_functions1.asm | 356 ++++++++++++++++++++ engine/print_waiting_text.asm | 20 ++ engine/test_battle.asm | 45 +++ engine/titlescreen.asm | 3 + main.asm | 510 +---------------------------- text/unused_names.asm | 20 ++ 8 files changed, 504 insertions(+), 505 deletions(-) create mode 100644 engine/load_mon_data.asm create mode 100644 engine/overworld/map_sprite_functions1.asm create mode 100644 engine/print_waiting_text.asm create mode 100644 engine/test_battle.asm create mode 100644 text/unused_names.asm diff --git a/engine/cable_club.asm b/engine/cable_club.asm index ab18f32b..137e8406 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -969,3 +969,9 @@ CableClub_DrawHorizontalLine: dec d jr nz, .loop ret + +LoadTrainerInfoTextBoxTiles: + ld de, TrainerInfoTextBoxTileGraphics + ld hl, vChars2 + $760 + lb bc, BANK(TrainerInfoTextBoxTileGraphics), (TrainerInfoTextBoxTileGraphicsEnd - TrainerInfoTextBoxTileGraphics) / $10 + jp CopyVideoData diff --git a/engine/load_mon_data.asm b/engine/load_mon_data.asm new file mode 100644 index 00000000..a71a81c5 --- /dev/null +++ b/engine/load_mon_data.asm @@ -0,0 +1,49 @@ +LoadMonData_: +; Load monster [wWhichPokemon] from list [wMonDataLocation]: +; 0: partymon +; 1: enemymon +; 2: boxmon +; 3: daycaremon +; Return monster id at wcf91 and its data at wLoadedMon. +; Also load base stats at wMonHeader for convenience. + + ld a, [wDayCareMonSpecies] + ld [wcf91], a + ld a, [wMonDataLocation] + cp DAYCARE_DATA + jr z, .GetMonHeader + + ld a, [wWhichPokemon] + ld e, a + callab GetMonSpecies + +.GetMonHeader + ld a, [wcf91] + ld [wd0b5], a ; input for GetMonHeader + call GetMonHeader + + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wMonDataLocation] + cp ENEMY_PARTY_DATA + jr c, .getMonEntry + + ld hl, wEnemyMons + jr z, .getMonEntry + + cp 2 + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 + jr z, .getMonEntry + + ld hl, wDayCareMon + jr .copyMonData + +.getMonEntry + ld a, [wWhichPokemon] + call AddNTimes + +.copyMonData + ld de, wLoadedMon + ld bc, wPartyMon2 - wPartyMon1 + jp CopyData diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm new file mode 100644 index 00000000..d1a411fa --- /dev/null +++ b/engine/overworld/map_sprite_functions1.asm @@ -0,0 +1,356 @@ +_UpdateSprites: + ld h, $c1 + inc h + ld a, $e ; wSpriteStateData2 + $0e +.spriteLoop + ld l, a + sub $e + ld c, a + ld [H_CURRENTSPRITEOFFSET], a + ld a, [hl] + and a + jr z, .skipSprite ; tests $c2Xe + push hl + push de + push bc + call .updateCurrentSprite + pop bc + pop de + pop hl +.skipSprite + ld a, l + add $10 ; move to next sprite + cp $e ; test for overflow (back at $0e) + jr nz, .spriteLoop + ret +.updateCurrentSprite + cp $1 + jp nz, UpdateNonPlayerSprite + jp UpdatePlayerSprite + +UpdateNonPlayerSprite: + dec a + swap a + ld [$ff93], a ; $10 * sprite# + ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset? + ld b, a + ld a, [H_CURRENTSPRITEOFFSET] + cp b + jr nz, .unequal + jp DoScriptedNPCMovement +.unequal + jp UpdateNPCSprite + +; This detects if the current sprite (whose offset is at H_CURRENTSPRITEOFFSET) +; is going to collide with another sprite by looping over the other sprites. +; The current sprite's offset will be labelled with i (e.g. $c1i0). +; The loop sprite's offset will labelled with j (e.g. $c1j0). +; +; Note that the Y coordinate of the sprite (in [$c1k4]) is one of the following +; 9 values when the sprite is aligned with the grid: $fc, $0c, $1c, $2c, ..., $7c. +; The reason that 4 is added below to the coordinate is to make it align with a +; multiple of $10 to make comparisons easier. +DetectCollisionBetweenSprites: + nop + + ld h, wSpriteStateData1 / $100 + ld a, [H_CURRENTSPRITEOFFSET] + add wSpriteStateData1 % $100 + ld l, a + + ld a, [hl] ; a = [$c1i0] (picture) (0 if slot is unused) + and a ; is this sprite slot slot used? + ret z ; return if not used + + ld a, l + add 3 + ld l, a + + ld a, [hli] ; a = [$c1i3] (delta Y) (-1, 0, or 1) + call SetSpriteCollisionValues + + ld a, [hli] ; a = [$C1i4] (Y screen coordinate) + add 4 ; align with multiple of $10 + +; The effect of the following 3 lines is to +; add 7 to a if moving south or +; subtract 7 from a if moving north. + add b + and $f0 + or c + + ld [$ff90], a ; store Y coordinate adjusted for direction of movement + + ld a, [hli] ; a = [$c1i5] (delta X) (-1, 0, or 1) + call SetSpriteCollisionValues + ld a, [hl] ; a = [$C1i6] (X screen coordinate) + +; The effect of the following 3 lines is to +; add 7 to a if moving east or +; subtract 7 from a if moving west. + add b + and $f0 + or c + + ld [$ff91], a ; store X coordinate adjusted for direction of movement + + ld a, l + add 7 + ld l, a + + xor a + ld [hld], a ; zero [$c1id] XXX what's [$c1id] for? + ld [hld], a ; zero [$c1ic] (directions in which collisions occurred) + + ld a, [$ff91] + ld [hld], a ; [$c1ib] = adjusted X coordinate + ld a, [$ff90] + ld [hl], a ; [$c1ia] = adjusted Y coordinate + + xor a ; zero the loop counter + +.loop + ld [$ff8f], a ; store loop counter + swap a + ld e, a + ld a, [H_CURRENTSPRITEOFFSET] + cp e ; does the loop sprite match the current sprite? + jp z, .next ; go to the next sprite if they match + + ld d, h + ld a, [de] ; a = [$c1j0] (picture) (0 if slot is unused) + and a ; is this sprite slot slot used? + jp z, .next ; go the next sprite if not used + + inc e + inc e + ld a, [de] ; a = [$c1j2] ($ff means the sprite is offscreen) + inc a + jp z, .next ; go the next sprite if offscreen + + ld a, [H_CURRENTSPRITEOFFSET] + add 10 + ld l, a + + inc e + ld a, [de] ; a = [$c1j3] (delta Y) + call SetSpriteCollisionValues + + inc e + ld a, [de] ; a = [$C1j4] (Y screen coordinate) + add 4 ; align with multiple of $10 + +; The effect of the following 3 lines is to +; add 7 to a if moving south or +; subtract 7 from a if moving north. + add b + and $f0 + or c + + sub [hl] ; subtract the adjusted Y coordinate of sprite i ([$c1ia]) from that of sprite j + +; calculate the absolute value of the difference to get the distance + jr nc, .noCarry1 + cpl + inc a +.noCarry1 + ld [$ff90], a ; store the distance between the two sprites' adjusted Y values + +; Use the carry flag set by the above subtraction to determine which sprite's +; Y coordinate is larger. This information is used later to set [$c1ic], +; which stores which direction the collision occurred in. +; The following 5 lines set the lowest 2 bits of c, which are later shifted left by 2. +; If sprite i's Y is larger, set lowest 2 bits of c to 10. +; If sprite j's Y is larger or both are equal, set lowest 2 bits of c to 01. + push af + rl c + pop af + ccf + rl c + +; If sprite i's delta Y is 0, then b = 7, else b = 9. + ld b, 7 + ld a, [hl] ; a = [$c1ia] (adjusted Y coordinate) + and $f + jr z, .next1 + ld b, 9 + +.next1 + ld a, [$ff90] ; a = distance between adjusted Y coordinates + sub b + ld [$ff92], a ; store distance adjusted using sprite i's direction + ld a, b + ld [$ff90], a ; store 7 or 9 depending on sprite i's delta Y + jr c, .checkXDistance + +; If sprite j's delta Y is 0, then b = 7, else b = 9. + ld b, 7 + dec e + ld a, [de] ; a = [$c1j3] (delta Y) + inc e + and a + jr z, .next2 + ld b, 9 + +.next2 + ld a, [$ff92] ; a = distance adjusted using sprite i's direction + sub b ; adjust distance using sprite j's direction + jr z, .checkXDistance + jr nc, .next ; go to next sprite if distance is still positive after both adjustments + +.checkXDistance + inc e + inc l + ld a, [de] ; a = [$c1j5] (delta X) + + push bc + + call SetSpriteCollisionValues + inc e + ld a, [de] ; a = [$c1j6] (X screen coordinate) + +; The effect of the following 3 lines is to +; add 7 to a if moving east or +; subtract 7 from a if moving west. + add b + and $f0 + or c + + pop bc + + sub [hl] ; subtract the adjusted X coordinate of sprite i ([$c1ib]) from that of sprite j + +; calculate the absolute value of the difference to get the distance + jr nc, .noCarry2 + cpl + inc a +.noCarry2 + ld [$ff91], a ; store the distance between the two sprites' adjusted X values + +; Use the carry flag set by the above subtraction to determine which sprite's +; X coordinate is larger. This information is used later to set [$c1ic], +; which stores which direction the collision occurred in. +; The following 5 lines set the lowest 2 bits of c. +; If sprite i's X is larger, set lowest 2 bits of c to 10. +; If sprite j's X is larger or both are equal, set lowest 2 bits of c to 01. + push af + rl c + pop af + ccf + rl c + +; If sprite i's delta X is 0, then b = 7, else b = 9. + ld b, 7 + ld a, [hl] ; a = [$c1ib] (adjusted X coordinate) + and $f + jr z, .next3 + ld b, 9 + +.next3 + ld a, [$ff91] ; a = distance between adjusted X coordinates + sub b + ld [$ff92], a ; store distance adjusted using sprite i's direction + ld a, b + ld [$ff91], a ; store 7 or 9 depending on sprite i's delta X + jr c, .collision + +; If sprite j's delta X is 0, then b = 7, else b = 9. + ld b, 7 + dec e + ld a, [de] ; a = [$c1j5] (delta X) + inc e + and a + jr z, .next4 + ld b, 9 + +.next4 + ld a, [$ff92] ; a = distance adjusted using sprite i's direction + sub b ; adjust distance using sprite j's direction + jr z, .collision + jr nc, .next ; go to next sprite if distance is still positive after both adjustments + +.collision + ld a, [$ff91] ; a = 7 or 9 depending on sprite i's delta X + ld b, a + ld a, [$ff90] ; a = 7 or 9 depending on sprite i's delta Y + inc l + +; If delta X isn't 0 and delta Y is 0, then b = %0011, else b = %1100. +; (note that normally if delta X isn't 0, then delta Y must be 0 and vice versa) + cp b + jr c, .next5 + ld b, %1100 + jr .next6 +.next5 + ld b, %0011 + +.next6 + ld a, c ; c has 2 bits set (one of bits 0-1 is set for the X axis and one of bits 2-3 for the Y axis) + and b ; we select either the bit in bits 0-1 or bits 2-3 based on the calculation immediately above + or [hl] ; or with existing collision direction bits in [$c1ic] + ld [hl], a ; store new value + ld a, c ; useless code because a is overwritten before being used again + +; set bit in [$c1ie] or [$c1if] to indicate which sprite the collision occurred with + inc l + inc l + ld a, [$ff8f] ; a = loop counter + ld de, SpriteCollisionBitTable + add a + add e + ld e, a + jr nc, .noCarry3 + inc d +.noCarry3 + ld a, [de] + or [hl] + ld [hli], a + inc de + ld a, [de] + or [hl] + ld [hl], a + +.next + ld a, [$ff8f] ; a = loop counter + inc a + cp $10 + jp nz, .loop + ret + +; takes delta X or delta Y in a +; b = delta X/Y +; c = 0 if delta X/Y is 0 +; c = 7 if delta X/Y is 1 +; c = 9 if delta X/Y is -1 +SetSpriteCollisionValues: + and a + ld b, 0 + ld c, 0 + jr z, .done + ld c, 9 + cp -1 + jr z, .ok + ld c, 7 + ld a, 0 +.ok + ld b, a +.done + ret + +SpriteCollisionBitTable: + db %00000000,%00000001 + db %00000000,%00000010 + db %00000000,%00000100 + db %00000000,%00001000 + db %00000000,%00010000 + db %00000000,%00100000 + db %00000000,%01000000 + db %00000000,%10000000 + db %00000001,%00000000 + db %00000010,%00000000 + db %00000100,%00000000 + db %00001000,%00000000 + db %00010000,%00000000 + db %00100000,%00000000 + db %01000000,%00000000 + db %10000000,%00000000 diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm new file mode 100644 index 00000000..7a95da2a --- /dev/null +++ b/engine/print_waiting_text.asm @@ -0,0 +1,20 @@ +PrintWaitingText: + coord hl, 3, 10 + ld b, $1 + ld c, $b + ld a, [wIsInBattle] + and a + jr z, .asm_4c17 + call TextBoxBorder + jr .asm_4c1a +.asm_4c17 + call CableClub_TextBoxBorder +.asm_4c1a + coord hl, 4, 11 + ld de, WaitingText + call PlaceString + ld c, 50 + jp DelayFrames + +WaitingText: + db "Waiting...!@" diff --git a/engine/test_battle.asm b/engine/test_battle.asm new file mode 100644 index 00000000..d9dcf1fa --- /dev/null +++ b/engine/test_battle.asm @@ -0,0 +1,45 @@ +TestBattle: + ret + +.loop + call GBPalNormal + + ; Don't mess around + ; with obedience. + ld a, %10000000 ; EARTHBADGE + ld [wObtainedBadges], a + + ld hl, wFlags_D733 + set BIT_TEST_BATTLE, [hl] + + ; Reset the party. + ld hl, wPartyCount + xor a + ld [hli], a + dec a + ld [hl], a + + ; Give the player a + ; level 20 Rhydon. + ld a, RHYDON + ld [wcf91], a + ld a, 20 + ld [wCurEnemyLVL], a + xor a + ld [wMonDataLocation], a + ld [wCurMap], a + call AddPartyMon + + ; Fight against a + ; level 20 Rhydon. + ld a, RHYDON + ld [wCurOpponent], a + + predef InitOpponent + + ; When the battle ends, + ; do it all again. + ld a, 1 + ld [wUpdateSpritesEnabled], a + ld [H_AUTOBGTRANSFERENABLED], a + jr .loop diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index e1a6e015..f4cce5b4 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -398,3 +398,6 @@ ENDC IF DEF(_BLUE) db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" ENDC + +NintenText: db "NINTEN@" +SonyText: db "SONY@" diff --git a/main.asm b/main.asm index 06e32463..e5a89b49 100755 --- a/main.asm +++ b/main.asm @@ -11,7 +11,6 @@ PICS_3 EQU $B PICS_4 EQU $C PICS_5 EQU $D - INCLUDE "home.asm" @@ -74,525 +73,26 @@ INCLUDE "data/baseStats/mew.asm" INCLUDE "engine/battle/safari_zone.asm" INCLUDE "engine/titlescreen.asm" - -NintenText: db "NINTEN@" -SonyText: db "SONY@" - - -LoadMonData_: -; Load monster [wWhichPokemon] from list [wMonDataLocation]: -; 0: partymon -; 1: enemymon -; 2: boxmon -; 3: daycaremon -; Return monster id at wcf91 and its data at wLoadedMon. -; Also load base stats at wMonHeader for convenience. - - ld a, [wDayCareMonSpecies] - ld [wcf91], a - ld a, [wMonDataLocation] - cp DAYCARE_DATA - jr z, .GetMonHeader - - ld a, [wWhichPokemon] - ld e, a - callab GetMonSpecies - -.GetMonHeader - ld a, [wcf91] - ld [wd0b5], a ; input for GetMonHeader - call GetMonHeader - - ld hl, wPartyMons - ld bc, wPartyMon2 - wPartyMon1 - ld a, [wMonDataLocation] - cp ENEMY_PARTY_DATA - jr c, .getMonEntry - - ld hl, wEnemyMons - jr z, .getMonEntry - - cp 2 - ld hl, wBoxMons - ld bc, wBoxMon2 - wBoxMon1 - jr z, .getMonEntry - - ld hl, wDayCareMon - jr .copyMonData - -.getMonEntry - ld a, [wWhichPokemon] - call AddNTimes - -.copyMonData - ld de, wLoadedMon - ld bc, wPartyMon2 - wPartyMon1 - jp CopyData - +INCLUDE "engine/load_mon_data.asm" INCLUDE "data/item_prices.asm" INCLUDE "text/item_names.asm" - -UnusedNames: - db "かみなりバッヂ@" - db "かいがらバッヂ@" - db "おじぞうバッヂ@" - db "はやぶさバッヂ@" - db "ひんやりバッヂ@" - db "なかよしバッヂ@" - db "バラバッヂ@" - db "ひのたまバッヂ@" - db "ゴールドバッヂ@" - db "たまご@" - db "ひよこ@" - db "ブロンズ@" - db "シルバー@" - db "ゴールド@" - db "プチキャプテン@" - db "キャプテン@" - db "プチマスター@" - db "マスター@" - db "エクセレント" +INCLUDE "text/unused_names.asm" INCLUDE "engine/overworld/oam.asm" INCLUDE "engine/oam_dma.asm" -PrintWaitingText: - coord hl, 3, 10 - ld b, $1 - ld c, $b - ld a, [wIsInBattle] - and a - jr z, .asm_4c17 - call TextBoxBorder - jr .asm_4c1a -.asm_4c17 - call CableClub_TextBoxBorder -.asm_4c1a - coord hl, 4, 11 - ld de, WaitingText - call PlaceString - ld c, 50 - jp DelayFrames - -WaitingText: - db "Waiting...!@" +INCLUDE "engine/print_waiting_text.asm" +INCLUDE "engine/overworld/map_sprite_functions1.asm" -_UpdateSprites: - ld h, $c1 - inc h - ld a, $e ; wSpriteStateData2 + $0e -.spriteLoop - ld l, a - sub $e - ld c, a - ld [H_CURRENTSPRITEOFFSET], a - ld a, [hl] - and a - jr z, .skipSprite ; tests $c2Xe - push hl - push de - push bc - call .updateCurrentSprite - pop bc - pop de - pop hl -.skipSprite - ld a, l - add $10 ; move to next sprite - cp $e ; test for overflow (back at $0e) - jr nz, .spriteLoop - ret -.updateCurrentSprite - cp $1 - jp nz, UpdateNonPlayerSprite - jp UpdatePlayerSprite - -UpdateNonPlayerSprite: - dec a - swap a - ld [$ff93], a ; $10 * sprite# - ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset? - ld b, a - ld a, [H_CURRENTSPRITEOFFSET] - cp b - jr nz, .unequal - jp DoScriptedNPCMovement -.unequal - jp UpdateNPCSprite - -; This detects if the current sprite (whose offset is at H_CURRENTSPRITEOFFSET) -; is going to collide with another sprite by looping over the other sprites. -; The current sprite's offset will be labelled with i (e.g. $c1i0). -; The loop sprite's offset will labelled with j (e.g. $c1j0). -; -; Note that the Y coordinate of the sprite (in [$c1k4]) is one of the following -; 9 values when the sprite is aligned with the grid: $fc, $0c, $1c, $2c, ..., $7c. -; The reason that 4 is added below to the coordinate is to make it align with a -; multiple of $10 to make comparisons easier. -DetectCollisionBetweenSprites: - nop - - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add wSpriteStateData1 % $100 - ld l, a - - ld a, [hl] ; a = [$c1i0] (picture) (0 if slot is unused) - and a ; is this sprite slot slot used? - ret z ; return if not used - - ld a, l - add 3 - ld l, a - - ld a, [hli] ; a = [$c1i3] (delta Y) (-1, 0, or 1) - call SetSpriteCollisionValues - - ld a, [hli] ; a = [$C1i4] (Y screen coordinate) - add 4 ; align with multiple of $10 - -; The effect of the following 3 lines is to -; add 7 to a if moving south or -; subtract 7 from a if moving north. - add b - and $f0 - or c - - ld [$ff90], a ; store Y coordinate adjusted for direction of movement - - ld a, [hli] ; a = [$c1i5] (delta X) (-1, 0, or 1) - call SetSpriteCollisionValues - ld a, [hl] ; a = [$C1i6] (X screen coordinate) - -; The effect of the following 3 lines is to -; add 7 to a if moving east or -; subtract 7 from a if moving west. - add b - and $f0 - or c - - ld [$ff91], a ; store X coordinate adjusted for direction of movement - - ld a, l - add 7 - ld l, a - - xor a - ld [hld], a ; zero [$c1id] XXX what's [$c1id] for? - ld [hld], a ; zero [$c1ic] (directions in which collisions occurred) - - ld a, [$ff91] - ld [hld], a ; [$c1ib] = adjusted X coordinate - ld a, [$ff90] - ld [hl], a ; [$c1ia] = adjusted Y coordinate - - xor a ; zero the loop counter - -.loop - ld [$ff8f], a ; store loop counter - swap a - ld e, a - ld a, [H_CURRENTSPRITEOFFSET] - cp e ; does the loop sprite match the current sprite? - jp z, .next ; go to the next sprite if they match - - ld d, h - ld a, [de] ; a = [$c1j0] (picture) (0 if slot is unused) - and a ; is this sprite slot slot used? - jp z, .next ; go the next sprite if not used - - inc e - inc e - ld a, [de] ; a = [$c1j2] ($ff means the sprite is offscreen) - inc a - jp z, .next ; go the next sprite if offscreen - - ld a, [H_CURRENTSPRITEOFFSET] - add 10 - ld l, a - - inc e - ld a, [de] ; a = [$c1j3] (delta Y) - call SetSpriteCollisionValues - - inc e - ld a, [de] ; a = [$C1j4] (Y screen coordinate) - add 4 ; align with multiple of $10 - -; The effect of the following 3 lines is to -; add 7 to a if moving south or -; subtract 7 from a if moving north. - add b - and $f0 - or c - - sub [hl] ; subtract the adjusted Y coordinate of sprite i ([$c1ia]) from that of sprite j - -; calculate the absolute value of the difference to get the distance - jr nc, .noCarry1 - cpl - inc a -.noCarry1 - ld [$ff90], a ; store the distance between the two sprites' adjusted Y values - -; Use the carry flag set by the above subtraction to determine which sprite's -; Y coordinate is larger. This information is used later to set [$c1ic], -; which stores which direction the collision occurred in. -; The following 5 lines set the lowest 2 bits of c, which are later shifted left by 2. -; If sprite i's Y is larger, set lowest 2 bits of c to 10. -; If sprite j's Y is larger or both are equal, set lowest 2 bits of c to 01. - push af - rl c - pop af - ccf - rl c - -; If sprite i's delta Y is 0, then b = 7, else b = 9. - ld b, 7 - ld a, [hl] ; a = [$c1ia] (adjusted Y coordinate) - and $f - jr z, .next1 - ld b, 9 - -.next1 - ld a, [$ff90] ; a = distance between adjusted Y coordinates - sub b - ld [$ff92], a ; store distance adjusted using sprite i's direction - ld a, b - ld [$ff90], a ; store 7 or 9 depending on sprite i's delta Y - jr c, .checkXDistance - -; If sprite j's delta Y is 0, then b = 7, else b = 9. - ld b, 7 - dec e - ld a, [de] ; a = [$c1j3] (delta Y) - inc e - and a - jr z, .next2 - ld b, 9 - -.next2 - ld a, [$ff92] ; a = distance adjusted using sprite i's direction - sub b ; adjust distance using sprite j's direction - jr z, .checkXDistance - jr nc, .next ; go to next sprite if distance is still positive after both adjustments - -.checkXDistance - inc e - inc l - ld a, [de] ; a = [$c1j5] (delta X) - - push bc - - call SetSpriteCollisionValues - inc e - ld a, [de] ; a = [$c1j6] (X screen coordinate) - -; The effect of the following 3 lines is to -; add 7 to a if moving east or -; subtract 7 from a if moving west. - add b - and $f0 - or c - - pop bc - - sub [hl] ; subtract the adjusted X coordinate of sprite i ([$c1ib]) from that of sprite j - -; calculate the absolute value of the difference to get the distance - jr nc, .noCarry2 - cpl - inc a -.noCarry2 - ld [$ff91], a ; store the distance between the two sprites' adjusted X values - -; Use the carry flag set by the above subtraction to determine which sprite's -; X coordinate is larger. This information is used later to set [$c1ic], -; which stores which direction the collision occurred in. -; The following 5 lines set the lowest 2 bits of c. -; If sprite i's X is larger, set lowest 2 bits of c to 10. -; If sprite j's X is larger or both are equal, set lowest 2 bits of c to 01. - push af - rl c - pop af - ccf - rl c - -; If sprite i's delta X is 0, then b = 7, else b = 9. - ld b, 7 - ld a, [hl] ; a = [$c1ib] (adjusted X coordinate) - and $f - jr z, .next3 - ld b, 9 - -.next3 - ld a, [$ff91] ; a = distance between adjusted X coordinates - sub b - ld [$ff92], a ; store distance adjusted using sprite i's direction - ld a, b - ld [$ff91], a ; store 7 or 9 depending on sprite i's delta X - jr c, .collision - -; If sprite j's delta X is 0, then b = 7, else b = 9. - ld b, 7 - dec e - ld a, [de] ; a = [$c1j5] (delta X) - inc e - and a - jr z, .next4 - ld b, 9 - -.next4 - ld a, [$ff92] ; a = distance adjusted using sprite i's direction - sub b ; adjust distance using sprite j's direction - jr z, .collision - jr nc, .next ; go to next sprite if distance is still positive after both adjustments - -.collision - ld a, [$ff91] ; a = 7 or 9 depending on sprite i's delta X - ld b, a - ld a, [$ff90] ; a = 7 or 9 depending on sprite i's delta Y - inc l - -; If delta X isn't 0 and delta Y is 0, then b = %0011, else b = %1100. -; (note that normally if delta X isn't 0, then delta Y must be 0 and vice versa) - cp b - jr c, .next5 - ld b, %1100 - jr .next6 -.next5 - ld b, %0011 - -.next6 - ld a, c ; c has 2 bits set (one of bits 0-1 is set for the X axis and one of bits 2-3 for the Y axis) - and b ; we select either the bit in bits 0-1 or bits 2-3 based on the calculation immediately above - or [hl] ; or with existing collision direction bits in [$c1ic] - ld [hl], a ; store new value - ld a, c ; useless code because a is overwritten before being used again - -; set bit in [$c1ie] or [$c1if] to indicate which sprite the collision occurred with - inc l - inc l - ld a, [$ff8f] ; a = loop counter - ld de, SpriteCollisionBitTable - add a - add e - ld e, a - jr nc, .noCarry3 - inc d -.noCarry3 - ld a, [de] - or [hl] - ld [hli], a - inc de - ld a, [de] - or [hl] - ld [hl], a - -.next - ld a, [$ff8f] ; a = loop counter - inc a - cp $10 - jp nz, .loop - ret - -; takes delta X or delta Y in a -; b = delta X/Y -; c = 0 if delta X/Y is 0 -; c = 7 if delta X/Y is 1 -; c = 9 if delta X/Y is -1 -SetSpriteCollisionValues: - and a - ld b, 0 - ld c, 0 - jr z, .done - ld c, 9 - cp -1 - jr z, .ok - ld c, 7 - ld a, 0 -.ok - ld b, a -.done - ret - -SpriteCollisionBitTable: - db %00000000,%00000001 - db %00000000,%00000010 - db %00000000,%00000100 - db %00000000,%00001000 - db %00000000,%00010000 - db %00000000,%00100000 - db %00000000,%01000000 - db %00000000,%10000000 - db %00000001,%00000000 - db %00000010,%00000000 - db %00000100,%00000000 - db %00001000,%00000000 - db %00010000,%00000000 - db %00100000,%00000000 - db %01000000,%00000000 - db %10000000,%00000000 - -TestBattle: - ret - -.loop - call GBPalNormal - - ; Don't mess around - ; with obedience. - ld a, %10000000 ; EARTHBADGE - ld [wObtainedBadges], a - - ld hl, wFlags_D733 - set BIT_TEST_BATTLE, [hl] - - ; Reset the party. - ld hl, wPartyCount - xor a - ld [hli], a - dec a - ld [hl], a - - ; Give the player a - ; level 20 Rhydon. - ld a, RHYDON - ld [wcf91], a - ld a, 20 - ld [wCurEnemyLVL], a - xor a - ld [wMonDataLocation], a - ld [wCurMap], a - call AddPartyMon - - ; Fight against a - ; level 20 Rhydon. - ld a, RHYDON - ld [wCurOpponent], a - - predef InitOpponent - - ; When the battle ends, - ; do it all again. - ld a, 1 - ld [wUpdateSpritesEnabled], a - ld [H_AUTOBGTRANSFERENABLED], a - jr .loop +INCLUDE "engine/test_battle.asm" INCLUDE "engine/overworld/item.asm" INCLUDE "engine/overworld/movement.asm" INCLUDE "engine/cable_club.asm" -LoadTrainerInfoTextBoxTiles: - ld de, TrainerInfoTextBoxTileGraphics - ld hl, vChars2 + $760 - lb bc, BANK(TrainerInfoTextBoxTileGraphics), (TrainerInfoTextBoxTileGraphicsEnd - TrainerInfoTextBoxTileGraphics) / $10 - jp CopyVideoData - INCLUDE "engine/menu/main_menu.asm" INCLUDE "engine/oak_speech.asm" diff --git a/text/unused_names.asm b/text/unused_names.asm new file mode 100644 index 00000000..4aca7ca2 --- /dev/null +++ b/text/unused_names.asm @@ -0,0 +1,20 @@ +UnusedNames:: + db "かみなりバッヂ@" + db "かいがらバッヂ@" + db "おじぞうバッヂ@" + db "はやぶさバッヂ@" + db "ひんやりバッヂ@" + db "なかよしバッヂ@" + db "バラバッヂ@" + db "ひのたまバッヂ@" + db "ゴールドバッヂ@" + db "たまご@" + db "ひよこ@" + db "ブロンズ@" + db "シルバー@" + db "ゴールド@" + db "プチキャプテン@" + db "キャプテン@" + db "プチマスター@" + db "マスター@" + db "エクセレント" -- cgit v1.2.3 From c2381bb3e624e966c323610df762a299468a1728 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 17 Sep 2016 18:17:57 -0700 Subject: split bank 1 into files --- engine/black_out.asm | 46 + engine/debug1.asm | 33 + engine/display_pokedex.asm | 19 + engine/display_text_id_init.asm | 78 ++ engine/menu/draw_start_menu.asm | 89 ++ engine/menu/swap_items.asm | 149 ++++ engine/menu/text_box.asm | 767 +++++++++++++++++ engine/overworld/set_blackout_map.asm | 29 + engine/remove_pokemon.asm | 95 +++ engine/special_warps.asm | 149 ++++ engine/subtract_paid_money.asm | 17 + main.asm | 1486 +-------------------------------- 12 files changed, 1482 insertions(+), 1475 deletions(-) create mode 100644 engine/black_out.asm create mode 100644 engine/debug1.asm create mode 100644 engine/display_pokedex.asm create mode 100644 engine/display_text_id_init.asm create mode 100644 engine/menu/draw_start_menu.asm create mode 100644 engine/menu/swap_items.asm create mode 100644 engine/menu/text_box.asm create mode 100644 engine/overworld/set_blackout_map.asm create mode 100644 engine/remove_pokemon.asm create mode 100644 engine/special_warps.asm create mode 100644 engine/subtract_paid_money.asm diff --git a/engine/black_out.asm b/engine/black_out.asm new file mode 100644 index 00000000..6c358ce3 --- /dev/null +++ b/engine/black_out.asm @@ -0,0 +1,46 @@ +ResetStatusAndHalveMoneyOnBlackout:: +; Reset player status on blackout. + xor a + ld [wBattleResult], a + ld [wWalkBikeSurfState], a + ld [wIsInBattle], a + ld [wMapPalOffset], a + ld [wNPCMovementScriptFunctionNum], a + ld [hJoyHeld], a + ld [wNPCMovementScriptPointerTableNum], a + ld [wFlags_0xcd60], a + + ld [hMoney], a + ld [hMoney + 1], a + ld [hMoney + 2], a + call HasEnoughMoney + jr c, .lostmoney ; never happens + + ; Halve the player's money. + ld a, [wPlayerMoney] + ld [hMoney], a + ld a, [wPlayerMoney + 1] + ld [hMoney + 1], a + ld a, [wPlayerMoney + 2] + ld [hMoney + 2], a + xor a + ld [hDivideBCDDivisor], a + ld [hDivideBCDDivisor + 1], a + ld a, 2 + ld [hDivideBCDDivisor + 2], a + predef DivideBCDPredef3 + ld a, [hDivideBCDQuotient] + ld [wPlayerMoney], a + ld a, [hDivideBCDQuotient + 1] + ld [wPlayerMoney + 1], a + ld a, [hDivideBCDQuotient + 2] + ld [wPlayerMoney + 2], a + +.lostmoney + ld hl, wd732 + set 2, [hl] + res 3, [hl] + set 6, [hl] + ld a, %11111111 + ld [wJoyIgnore], a + predef_jump HealParty diff --git a/engine/debug1.asm b/engine/debug1.asm new file mode 100644 index 00000000..a5eb7dde --- /dev/null +++ b/engine/debug1.asm @@ -0,0 +1,33 @@ +; This function appears to never be used. +; It is likely a debugging feature to give the player Tsunekazu Ishihara's +; favorite Pokemon. This is indicated by the overpowered Exeggutor, which +; Ishihara (president of Creatures Inc.) said was his favorite Pokemon in an ABC +; interview on February 8, 2000. +; "Exeggutor is my favorite. That's because I was always using this character +; while I was debugging the program." +; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript + +SetIshiharaTeam: + ld de, IshiharaTeam +.loop + ld a, [de] + cp $ff + ret z + ld [wcf91], a + inc de + ld a, [de] + ld [wCurEnemyLVL], a + inc de + call AddPartyMon + jr .loop + +IshiharaTeam: + db EXEGGUTOR,90 + db MEW,20 + db JOLTEON,56 + db DUGTRIO,56 + db ARTICUNO,57 + db $FF + +EmptyFunc: + ret diff --git a/engine/display_pokedex.asm b/engine/display_pokedex.asm new file mode 100644 index 00000000..96a2dd6c --- /dev/null +++ b/engine/display_pokedex.asm @@ -0,0 +1,19 @@ +_DisplayPokedex: + ld hl, wd730 + set 6, [hl] + predef ShowPokedexData + ld hl, wd730 + res 6, [hl] + call ReloadMapData + ld c, 10 + call DelayFrames + predef IndexToPokedex + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_SET + ld hl, wPokedexSeen + predef FlagActionPredef + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret diff --git a/engine/display_text_id_init.asm b/engine/display_text_id_init.asm new file mode 100644 index 00000000..312d6329 --- /dev/null +++ b/engine/display_text_id_init.asm @@ -0,0 +1,78 @@ +; function that performs initialization for DisplayTextID +DisplayTextIDInit: + xor a + ld [wListMenuID],a + ld a,[wAutoTextBoxDrawingControl] + bit 0,a + jr nz,.skipDrawingTextBoxBorder + ld a,[hSpriteIndexOrTextID] ; text ID (or sprite ID) + and a + jr nz,.notStartMenu +; if text ID is 0 (i.e. the start menu) +; Note that the start menu text border is also drawn in the function directly +; below this, so this seems unnecessary. + CheckEvent EVENT_GOT_POKEDEX +; start menu with pokedex + coord hl, 10, 0 + ld b,$0e + ld c,$08 + jr nz,.drawTextBoxBorder +; start menu without pokedex + 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 + coord hl, 0, 12 + ld b,$04 + ld c,$12 +.drawTextBoxBorder + call TextBoxBorder +.skipDrawingTextBoxBorder + ld hl,wFontLoaded + set 0,[hl] + ld hl,wFlags_0xcd60 + bit 4,[hl] + res 4,[hl] + jr nz,.skipMovingSprites + 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 +; the original direction they were facing must be restored after the dialogue is over + ld hl,wSpriteStateData1 + $19 + ld c,$0f + ld de,$0010 +.spriteFacingDirectionCopyLoop + ld a,[hl] + inc h + ld [hl],a + dec h + add hl,de + dec c + jr nz,.spriteFacingDirectionCopyLoop +; loop to force all the sprites in the middle of animation to stand still +; (so that they don't like they're frozen mid-step during the dialogue) + ld hl,wSpriteStateData1 + 2 + ld de,$0010 + ld c,e +.spriteStandStillLoop + ld a,[hl] + cp a,$ff ; is the sprite visible? + jr z,.nextSprite +; if it is visible + and a,$fc + ld [hl],a +.nextSprite + add hl,de + dec c + jr nz,.spriteStandStillLoop + ld b,$9c ; window background address + call CopyScreenTileBufferToVRAM ; transfer background in WRAM to VRAM + xor a + ld [hWY],a ; put the window on the screen + call LoadFontTilePatterns + ld a,$01 + ld [H_AUTOBGTRANSFERENABLED],a ; enable continuous WRAM to VRAM transfer each V-blank + ret diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm new file mode 100644 index 00000000..4df9de27 --- /dev/null +++ b/engine/menu/draw_start_menu.asm @@ -0,0 +1,89 @@ +; function that displays the start menu +DrawStartMenu: + CheckEvent EVENT_GOT_POKEDEX +; menu with pokedex + coord hl, 10, 0 + ld b,$0e + ld c,$08 + jr nz,.drawTextBoxBorder +; shorter menu if the player doesn't have the pokedex + coord hl, 10, 0 + ld b,$0c + ld c,$08 +.drawTextBoxBorder + call TextBoxBorder + 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 + ld a,$0b + ld [wTopMenuItemX],a ; X position of first menu choice + ld a,[wBattleAndStartSavedMenuItem] ; remembered menu selection from last time + ld [wCurrentMenuItem],a + ld [wLastMenuItem],a + xor a + ld [wMenuWatchMovingOutOfBounds],a + ld hl,wd730 + set 6,[hl] ; no pauses between printing each letter + coord hl, 12, 2 + CheckEvent EVENT_GOT_POKEDEX +; case for not having pokdex + ld a,$06 + jr z,.storeMenuItemCount +; case for having pokedex + ld de,StartMenuPokedexText + call PrintStartMenuItem + ld a,$07 +.storeMenuItemCount + ld [wMaxMenuItem],a ; number of menu items + ld de,StartMenuPokemonText + call PrintStartMenuItem + ld de,StartMenuItemText + call PrintStartMenuItem + ld de,wPlayerName ; player's name + call PrintStartMenuItem + ld a,[wd72e] + bit 6,a ; is the player using the link feature? +; case for not using link feature + ld de,StartMenuSaveText + jr z,.printSaveOrResetText +; case for using link feature + ld de,StartMenuResetText +.printSaveOrResetText + call PrintStartMenuItem + ld de,StartMenuOptionText + call PrintStartMenuItem + ld de,StartMenuExitText + call PlaceString + ld hl,wd730 + res 6,[hl] ; turn pauses between printing letters back on + ret + +StartMenuPokedexText: + db "POKéDEX@" + +StartMenuPokemonText: + db "POKéMON@" + +StartMenuItemText: + db "ITEM@" + +StartMenuSaveText: + db "SAVE@" + +StartMenuResetText: + db "RESET@" + +StartMenuExitText: + db "EXIT@" + +StartMenuOptionText: + db "OPTION@" + +PrintStartMenuItem: + push hl + call PlaceString + pop hl + ld de,SCREEN_WIDTH * 2 + add hl,de + ret diff --git a/engine/menu/swap_items.asm b/engine/menu/swap_items.asm new file mode 100644 index 00000000..b1fa78be --- /dev/null +++ b/engine/menu/swap_items.asm @@ -0,0 +1,149 @@ +HandleItemListSwapping: + ld a,[wListMenuID] + cp a,ITEMLISTMENU + jp nz,DisplayListMenuIDLoop ; only rearrange item list menus + push hl + ld hl,wListPointer + ld a,[hli] + ld h,[hl] + ld l,a + inc hl ; hl = beginning of list entries + ld a,[wCurrentMenuItem] + ld b,a + ld a,[wListScrollOffset] + add b + add a + ld c,a + ld b,0 + add hl,bc ; hl = address of currently selected item entry + ld a,[hl] + pop hl + inc a + jp z,DisplayListMenuIDLoop ; ignore attempts to swap the Cancel menu item + ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + and a ; has the first item to swap already been chosen? + jr nz,.swapItems +; if not, set the currently selected item as the first item + ld a,[wCurrentMenuItem] + inc a + ld b,a + ld a,[wListScrollOffset] ; index of top (visible) menu item within the list + add b + ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) + ld c,20 + call DelayFrames + jp DisplayListMenuIDLoop +.swapItems + ld a,[wCurrentMenuItem] + inc a + ld b,a + ld a,[wListScrollOffset] + add b + ld b,a + ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + cp b ; is the currently selected item the same as the first item to swap? + jp z,DisplayListMenuIDLoop ; ignore attempts to swap an item with itself + dec a + ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) + ld c,20 + call DelayFrames + push hl + push de + ld hl,wListPointer + ld a,[hli] + ld h,[hl] + ld l,a + inc hl ; hl = beginning of list entries + ld d,h + ld e,l ; de = beginning of list entries + ld a,[wCurrentMenuItem] + ld b,a + ld a,[wListScrollOffset] + add b + add a + ld c,a + ld b,0 + add hl,bc ; hl = address of currently selected item entry + ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + add a + add e + ld e,a + jr nc,.noCarry + inc d +.noCarry ; de = address of first item to swap + ld a,[de] + ld b,a + ld a,[hli] + cp b + jr z,.swapSameItemType +.swapDifferentItems + ld [$ff95],a ; [$ff95] = second item ID + ld a,[hld] + ld [$ff96],a ; [$ff96] = second item quantity + ld a,[de] + ld [hli],a ; put first item ID in second item slot + inc de + ld a,[de] + ld [hl],a ; put first item quantity in second item slot + ld a,[$ff96] + ld [de],a ; put second item quantity in first item slot + dec de + ld a,[$ff95] + ld [de],a ; put second item ID in first item slot + xor a + ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + pop de + pop hl + jp DisplayListMenuIDLoop +.swapSameItemType + inc de + ld a,[hl] + ld b,a + ld a,[de] + add b ; a = sum of both item quantities + cp a,100 ; is the sum too big for one item slot? + jr c,.combineItemSlots +; swap enough items from the first slot to max out the second slot if they can't be combined + sub a,99 + ld [de],a + ld a,99 + ld [hl],a + jr .done +.combineItemSlots + ld [hl],a ; put the sum in the second item slot + ld hl,wListPointer + ld a,[hli] + ld h,[hl] + ld l,a + dec [hl] ; decrease the number of items + ld a,[hl] + 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 +.skipSettingMaxMenuItemID + dec de + ld h,d + ld l,e + inc hl + inc hl ; hl = address of item after first item to swap +.moveItemsUpLoop ; erase the first item slot and move up all the following item slots to fill the gap + ld a,[hli] + ld [de],a + inc de + inc a ; reached the $ff terminator? + jr z,.afterMovingItemsUp + ld a,[hli] + ld [de],a + inc de + jr .moveItemsUpLoop +.afterMovingItemsUp + xor a + ld [wListScrollOffset],a + ld [wCurrentMenuItem],a +.done + xor a + ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + pop de + pop hl + jp DisplayListMenuIDLoop diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm new file mode 100644 index 00000000..12067dd4 --- /dev/null +++ b/engine/menu/text_box.asm @@ -0,0 +1,767 @@ +; function to draw various text boxes +DisplayTextBoxID_: + ld a,[wTextBoxID] + cp a,TWO_OPTION_MENU + jp z,DisplayTwoOptionMenu + ld c,a + ld hl,TextBoxFunctionTable + ld de,3 + call SearchTextBoxTable + jr c,.functionTableMatch + ld hl,TextBoxCoordTable + ld de,5 + call SearchTextBoxTable + jr c,.coordTableMatch + ld hl,TextBoxTextAndCoordTable + ld de,9 + call SearchTextBoxTable + jr c,.textAndCoordTableMatch +.done + ret +.functionTableMatch + ld a,[hli] + ld h,[hl] + ld l,a ; hl = address of function + ld de,.done + push de + jp [hl] ; jump to the function +.coordTableMatch + call GetTextBoxIDCoords + call GetAddressOfScreenCoords + call TextBoxBorder + ret +.textAndCoordTableMatch + call GetTextBoxIDCoords + push hl + call GetAddressOfScreenCoords + call TextBoxBorder + pop hl + call GetTextBoxIDText + ld a,[wd730] + push af + ld a,[wd730] + set 6,a ; no pauses between printing each letter + ld [wd730],a + call PlaceString + pop af + ld [wd730],a + call UpdateSprites + ret + +; function to search a table terminated with $ff for a byte matching c in increments of de +; sets carry flag if a match is found and clears carry flag if not +SearchTextBoxTable: + dec de +.loop + ld a,[hli] + cp a,$ff + jr z,.notFound + cp c + jr z,.found + add hl,de + jr .loop +.found + scf +.notFound + ret + +; function to load coordinates from the TextBoxCoordTable or the TextBoxTextAndCoordTable +; INPUT: +; hl = address of coordinates +; OUTPUT: +; b = height +; c = width +; d = row of upper left corner +; e = column of upper left corner +GetTextBoxIDCoords: + ld a,[hli] ; column of upper left corner + ld e,a + ld a,[hli] ; row of upper left corner + ld d,a + ld a,[hli] ; column of lower right corner + sub e + dec a + ld c,a ; c = width + ld a,[hli] ; row of lower right corner + sub d + dec a + ld b,a ; b = height + ret + +; function to load a text address and text coordinates from the TextBoxTextAndCoordTable +GetTextBoxIDText: + ld a,[hli] + ld e,a + ld a,[hli] + ld d,a ; de = address of text + push de ; save text address + ld a,[hli] + ld e,a ; column of upper left corner of text + ld a,[hl] + ld d,a ; row of upper left corner of text + call GetAddressOfScreenCoords + pop de ; restore text address + ret + +; function to point hl to the screen coordinates +; INPUT: +; d = row +; e = column +; OUTPUT: +; hl = address of upper left corner of text box +GetAddressOfScreenCoords: + push bc + coord hl, 0, 0 + ld bc,20 +.loop ; loop to add d rows to the base address + ld a,d + and a + jr z,.addedRows + add hl,bc + dec d + jr .loop +.addedRows + pop bc + add hl,de + ret + +; Format: +; 00: text box ID +; 01-02: function address +TextBoxFunctionTable: + dbw MONEY_BOX, DisplayMoneyBox + dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu + dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu + db $ff ; terminator + +; Format: +; 00: text box ID +; 01: column of upper left corner +; 02: row of upper left corner +; 03: column of lower right corner +; 04: row of lower right corner +TextBoxCoordTable: + db MESSAGE_BOX, 0, 12, 19, 17 + db $03, 0, 0, 19, 14 + db $07, 0, 0, 11, 6 + db LIST_MENU_BOX, 4, 2, 19, 12 + db $10, 7, 0, 19, 17 + db MON_SPRITE_POPUP, 6, 4, 14, 13 + db $ff ; terminator + +; Format: +; 00: text box ID +; 01: column of upper left corner +; 02: row of upper left corner +; 03: column of lower right corner +; 04: row of lower right corner +; 05-06: address of text +; 07: column of beginning of text +; 08: row of beginning of text +; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row] +TextBoxTextAndCoordTable: + db JP_MOCHIMONO_MENU_TEMPLATE + db 0,0,14,17 ; text box coordinates + dw JapaneseMochimonoText + db 3,0 ; text coordinates + + db USE_TOSS_MENU_TEMPLATE + db 13,10,19,14 ; text box coordinates + dw UseTossText + db 15,11 ; text coordinates + + db JP_SAVE_MESSAGE_MENU_TEMPLATE + db 0,0,7,5 ; text box coordinates + dw JapaneseSaveMessageText + db 2,2 ; text coordinates + + db JP_SPEED_OPTIONS_MENU_TEMPLATE + db 0,6,5,10 ; text box coordinates + dw JapaneseSpeedOptionsText + db 2,7 ; text coordinates + + db BATTLE_MENU_TEMPLATE + db 8,12,19,17 ; text box coordinates + dw BattleMenuText + db 10,14 ; text coordinates + + db SAFARI_BATTLE_MENU_TEMPLATE + db 0,12,19,17 ; text box coordinates + dw SafariZoneBattleMenuText + db 2,14 ; text coordinates + + db SWITCH_STATS_CANCEL_MENU_TEMPLATE + db 11,11,19,17 ; text box coordinates + dw SwitchStatsCancelText + db 13,12 ; text coordinates + + db BUY_SELL_QUIT_MENU_TEMPLATE + db 0,0,10,6 ; text box coordinates + dw BuySellQuitText + db 2,1 ; text coordinates + + db MONEY_BOX_TEMPLATE + db 11,0,19,2 ; text box coordinates + dw MoneyText + db 13,0 ; text coordinates + + db JP_AH_MENU_TEMPLATE + db 7,6,11,10 ; text box coordinates + dw JapaneseAhText + db 8,8 ; text coordinates + + db JP_POKEDEX_MENU_TEMPLATE + db 11,8,19,17 ; text box coordinates + dw JapanesePokedexMenu + db 12,10 ; text coordinates + +; note that there is no terminator + +BuySellQuitText: + db "BUY" + next "SELL" + next "QUIT@@" + +UseTossText: + db "USE" + next "TOSS@" + +JapaneseSaveMessageText: + db "きろく" + next "メッセージ@" + +JapaneseSpeedOptionsText: + db "はやい" + next "おそい@" + +MoneyText: + db "MONEY@" + +JapaneseMochimonoText: + db "もちもの@" + +JapaneseMainMenuText: + db "つづきから" + next "さいしょから@" + +BattleMenuText: + db "FIGHT ",$E1,$E2 + next "ITEM RUN@" + +SafariZoneBattleMenuText: + db "BALL× BAIT" + next "THROW ROCK RUN@" + +SwitchStatsCancelText: + db "SWITCH" + next "STATS" + next "CANCEL@" + +JapaneseAhText: + db "アッ!@" + +JapanesePokedexMenu: + db "データをみる" + next "なきごえ" + next "ぶんぷをみる" + next "キャンセル@" + +DisplayMoneyBox: + ld hl, wd730 + set 6, [hl] + ld a, MONEY_BOX_TEMPLATE + ld [wTextBoxID], a + call DisplayTextBoxID + coord hl, 13, 1 + ld b, 1 + ld c, 6 + call ClearScreenArea + coord hl, 12, 1 + ld de, wPlayerMoney + ld c, $a3 + call PrintBCDNumber + ld hl, wd730 + res 6, [hl] + ret + +CurrencyString: + db " ¥@" + +DoBuySellQuitMenu: + ld a, [wd730] + set 6, a ; no printing delay + ld [wd730], a + xor a + ld [wChosenMenuItem], a + ld a, BUY_SELL_QUIT_MENU_TEMPLATE + ld [wTextBoxID], a + call DisplayTextBoxID + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $2 + ld [wMaxMenuItem], a + ld a, $1 + ld [wTopMenuItemY], a + ld a, $1 + ld [wTopMenuItemX], a + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wd730] + res 6, a ; turn on the printing delay + ld [wd730], a + call HandleMenuInput + call PlaceUnfilledArrowMenuCursor + bit 0, a ; was A pressed? + jr nz, .pressedA + bit 1, a ; was B pressed? (always true since only A/B are watched) + jr z, .pressedA + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + jr .quit +.pressedA + ld a, CHOSE_MENU_ITEM + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + ld b, a + ld a, [wMaxMenuItem] + cp b + jr z, .quit + ret +.quit + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + scf + ret + +; displays a menu with two options to choose from +; b = Y of upper left corner of text region +; c = X of upper left corner of text region +; hl = address where the text box border should be drawn +DisplayTwoOptionMenu: + push hl + ld a, [wd730] + set 6, a ; no printing delay + ld [wd730], a + +; pointless because both values are overwritten before they are read + xor a + ld [wChosenMenuItem], a + ld [wMenuExitMethod], a + + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $1 + ld [wMaxMenuItem], a + ld a, b + ld [wTopMenuItemY], a + ld a, c + ld [wTopMenuItemX], a + xor a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + push hl + ld hl, wTwoOptionMenuID + bit 7, [hl] ; select second menu item by default? + res 7, [hl] + jr z, .storeCurrentMenuItem + inc a +.storeCurrentMenuItem + ld [wCurrentMenuItem], a + pop hl + push hl + push hl + call TwoOptionMenu_SaveScreenTiles + ld a, [wTwoOptionMenuID] + ld hl, TwoOptionMenuStrings + ld e, a + ld d, $0 + ld a, $5 +.menuStringLoop + add hl, de + dec a + jr nz, .menuStringLoop + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld e, l + ld d, h + pop hl + push de + ld a, [wTwoOptionMenuID] + cp TRADE_CANCEL_MENU + jr nz, .notTradeCancelMenu + call CableClub_TextBoxBorder + jr .afterTextBoxBorder +.notTradeCancelMenu + call TextBoxBorder +.afterTextBoxBorder + call UpdateSprites + pop hl + ld a, [hli] + and a ; put blank line before first menu item? + ld bc, 20 + 2 + jr z, .noBlankLine + ld bc, 2 * 20 + 2 +.noBlankLine + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + pop hl + add hl, bc + call PlaceString + ld hl, wd730 + res 6, [hl] ; turn on the printing delay + ld a, [wTwoOptionMenuID] + cp NO_YES_MENU + jr nz, .notNoYesMenu +; No/Yes menu +; this menu type ignores the B button +; it only seems to be used when confirming the deletion of a save file + xor a + ld [wTwoOptionMenuID], a + ld a, [wFlags_0xcd60] + push af + push hl + ld hl, wFlags_0xcd60 + bit 5, [hl] + set 5, [hl] ; don't play sound when A or B is pressed in menu + pop hl +.noYesMenuInputLoop + call HandleMenuInput + bit 1, a ; A button pressed? + jr nz, .noYesMenuInputLoop ; try again if A was not pressed + pop af + pop hl + ld [wFlags_0xcd60], a + ld a, SFX_PRESS_AB + call PlaySound + jr .pressedAButton +.notNoYesMenu + xor a + ld [wTwoOptionMenuID], a + call HandleMenuInput + pop hl + bit 1, a ; A button pressed? + jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed +.pressedAButton + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + and a + jr nz, .choseSecondMenuItem +; chose first menu item + ld a, CHOSE_FIRST_ITEM + ld [wMenuExitMethod], a + ld c, 15 + call DelayFrames + call TwoOptionMenu_RestoreScreenTiles + and a + ret +.choseSecondMenuItem + ld a, 1 + ld [wCurrentMenuItem], a + ld [wChosenMenuItem], a + ld a, CHOSE_SECOND_ITEM + ld [wMenuExitMethod], a + ld c, 15 + call DelayFrames + call TwoOptionMenu_RestoreScreenTiles + scf + ret + +; Some of the wider/taller two option menus will not have the screen areas +; they cover be fully saved/restored by the two functions below. +; The bottom and right edges of the menu may remain after the function returns. + +TwoOptionMenu_SaveScreenTiles: + ld de, wBuffer + lb bc, 5, 6 +.loop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .loop + push bc + ld bc, SCREEN_WIDTH - 6 + add hl, bc + pop bc + ld c, $6 + dec b + jr nz, .loop + ret + +TwoOptionMenu_RestoreScreenTiles: + ld de, wBuffer + lb bc, 5, 6 +.loop + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .loop + push bc + ld bc, SCREEN_WIDTH - 6 + add hl, bc + pop bc + ld c, 6 + dec b + jr nz, .loop + call UpdateSprites + ret + +; Format: +; 00: byte width +; 01: byte height +; 02: byte put blank line before first menu item +; 03: word text pointer +TwoOptionMenuStrings: + db 4,3,0 + dw .YesNoMenu + db 6,3,0 + dw .NorthWestMenu + db 6,3,0 + dw .SouthEastMenu + db 6,3,0 + dw .YesNoMenu + db 6,3,0 + dw .NorthEastMenu + db 7,3,0 + dw .TradeCancelMenu + db 7,4,1 + dw .HealCancelMenu + db 4,3,0 + dw .NoYesMenu + +.NoYesMenu + db "NO" + next "YES@" +.YesNoMenu + db "YES" + next "NO@" +.NorthWestMenu + db "NORTH" + next "WEST@" +.SouthEastMenu + db "SOUTH" + next "EAST@" +.NorthEastMenu + db "NORTH" + next "EAST@" +.TradeCancelMenu + db "TRADE" + next "CANCEL@" +.HealCancelMenu + db "HEAL" + next "CANCEL@" + +DisplayFieldMoveMonMenu: + xor a + ld hl, wFieldMoves + ld [hli], a ; wFieldMoves + ld [hli], a ; wFieldMoves + 1 + ld [hli], a ; wFieldMoves + 2 + ld [hli], a ; wFieldMoves + 3 + ld [hli], a ; wNumFieldMoves + ld [hl], 12 ; wFieldMovesLeftmostXCoord + call GetMonFieldMoves + ld a, [wNumFieldMoves] + and a + jr nz, .fieldMovesExist + +; no field moves + coord hl, 11, 11 + ld b, 5 + ld c, 7 + call TextBoxBorder + call UpdateSprites + ld a, 12 + ld [hFieldMoveMonMenuTopMenuItemX], a + coord hl, 13, 12 + ld de, PokemonMenuEntries + jp PlaceString + +.fieldMovesExist + push af + +; 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. + coord hl, 0, 11 + ld a, [wFieldMovesLeftmostXCoord] + dec a + ld e, a + ld d, 0 + add hl, de + ld b, 5 + ld a, 18 + sub e + ld c, a + pop af + +; For each field move, move the top of the text box up 2 rows while the leaving +; the bottom of the text box at the bottom of the screen. + ld de, -SCREEN_WIDTH * 2 +.textBoxHeightLoop + add hl, de + inc b + inc b + dec a + jr nz, .textBoxHeightLoop + +; Make space for an extra blank row above the top field move. + ld de, -SCREEN_WIDTH + add hl, de + inc b + + call TextBoxBorder + call UpdateSprites + +; Calculate the position of the first field move name to print. + coord hl, 0, 12 + ld a, [wFieldMovesLeftmostXCoord] + inc a + ld e, a + ld d, 0 + add hl, de + ld de, -SCREEN_WIDTH * 2 + ld a, [wNumFieldMoves] +.calcFirstFieldMoveYLoop + add hl, de + dec a + jr nz, .calcFirstFieldMoveYLoop + + xor a + ld [wNumFieldMoves], a + ld de, wFieldMoves +.printNamesLoop + push hl + ld hl, FieldMoveNames + ld a, [de] + and a + jr z, .donePrintingNames + inc de + ld b, a ; index of name +.skipNamesLoop ; skip past names before the name we want + dec b + jr z, .reachedName +.skipNameLoop ; skip past current name + ld a, [hli] + cp "@" + jr nz, .skipNameLoop + jr .skipNamesLoop +.reachedName + ld b, h + ld c, l + pop hl + push de + ld d, b + ld e, c + call PlaceString + ld bc, SCREEN_WIDTH * 2 + add hl, bc + pop de + jr .printNamesLoop + +.donePrintingNames + pop hl + ld a, [wFieldMovesLeftmostXCoord] + ld [hFieldMoveMonMenuTopMenuItemX], a + coord hl, 0, 12 + ld a, [wFieldMovesLeftmostXCoord] + inc a + ld e, a + ld d, 0 + add hl, de + ld de, PokemonMenuEntries + jp PlaceString + +FieldMoveNames: + db "CUT@" + db "FLY@" + db "@" + db "SURF@" + db "STRENGTH@" + db "FLASH@" + db "DIG@" + db "TELEPORT@" + db "SOFTBOILED@" + +PokemonMenuEntries: + db "STATS" + next "SWITCH" + next "CANCEL@" + +GetMonFieldMoves: + ld a, [wWhichPokemon] + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld d, h + ld e, l + ld c, NUM_MOVES + 1 + ld hl, wFieldMoves +.loop + push hl +.nextMove + dec c + jr z, .done + ld a, [de] ; move ID + and a + jr z, .done + ld b, a + inc de + ld hl, FieldMoveDisplayData +.fieldMoveLoop + ld a, [hli] + cp $ff + jr z, .nextMove ; if the move is not a field move + cp b + jr z, .foundFieldMove + inc hl + inc hl + jr .fieldMoveLoop +.foundFieldMove + ld a, b + ld [wLastFieldMoveID], a + ld a, [hli] ; field move name index + ld b, [hl] ; field move leftmost X coordinate + pop hl + ld [hli], a ; store name index in wFieldMoves + ld a, [wNumFieldMoves] + inc a + ld [wNumFieldMoves], a + ld a, [wFieldMovesLeftmostXCoord] + cp b + jr c, .skipUpdatingLeftmostXCoord + ld a, b + ld [wFieldMovesLeftmostXCoord], a +.skipUpdatingLeftmostXCoord + ld a, [wLastFieldMoveID] + ld b, a + jr .loop +.done + pop hl + ret + +; Format: [Move id], [name index], [leftmost tile] +; Move id = id of move +; Name index = index of name in FieldMoveNames +; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed +; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C +FieldMoveDisplayData: + db CUT, $01, $0C + db FLY, $02, $0C + db $B4, $03, $0C ; unused field move + db SURF, $04, $0C + db STRENGTH, $05, $0A + db FLASH, $06, $0C + db DIG, $07, $0C + db TELEPORT, $08, $0A + db SOFTBOILED, $09, $08 + db $ff ; list terminator diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm new file mode 100644 index 00000000..9bfe82bd --- /dev/null +++ b/engine/overworld/set_blackout_map.asm @@ -0,0 +1,29 @@ +SetLastBlackoutMap: +; Set the map to return to when +; blacking out or using Teleport or Dig. +; Safari rest houses don't count. + + push hl + ld hl, SafariZoneRestHouses + ld a, [wCurMap] + ld b, a +.loop + ld a, [hli] + cp -1 + jr z, .notresthouse + cp b + jr nz, .loop + jr .done + +.notresthouse + ld a, [wLastMap] + ld [wLastBlackoutMap], a +.done + pop hl + ret + +SafariZoneRestHouses: + db SAFARI_ZONE_REST_HOUSE_2 + db SAFARI_ZONE_REST_HOUSE_3 + db SAFARI_ZONE_REST_HOUSE_4 + db -1 diff --git a/engine/remove_pokemon.asm b/engine/remove_pokemon.asm new file mode 100644 index 00000000..1fcb5d09 --- /dev/null +++ b/engine/remove_pokemon.asm @@ -0,0 +1,95 @@ +_RemovePokemon: + ld hl, wPartyCount + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7b74 + ld hl, wNumInBox +.asm_7b74 + ld a, [hl] + dec a + ld [hli], a + ld a, [wWhichPokemon] + ld c, a + ld b, $0 + add hl, bc + ld e, l + ld d, h + inc de +.asm_7b81 + ld a, [de] + inc de + ld [hli], a + inc a + jr nz, .asm_7b81 + ld hl, wPartyMonOT + ld d, $5 + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7b97 + ld hl, wBoxMonOT + ld d, $13 +.asm_7b97 + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries + ld a, [wWhichPokemon] + cp d + jr nz, .asm_7ba6 + ld [hl], $ff + ret +.asm_7ba6 + ld d, h + ld e, l + ld bc, NAME_LENGTH + add hl, bc + ld bc, wPartyMonNicks + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7bb8 + ld bc, wBoxMonNicks +.asm_7bb8 + call CopyDataUntil + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7bcd + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 +.asm_7bcd + ld a, [wWhichPokemon] + call AddNTimes + ld d, h + ld e, l + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7be4 + ld bc, wBoxMon2 - wBoxMon1 + add hl, bc + ld bc, wBoxMonOT + jr .asm_7beb +.asm_7be4 + ld bc, wPartyMon2 - wPartyMon1 + add hl, bc + ld bc, wPartyMonOT +.asm_7beb + call CopyDataUntil + ld hl, wPartyMonNicks + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7bfa + ld hl, wBoxMonNicks +.asm_7bfa + ld bc, NAME_LENGTH + ld a, [wWhichPokemon] + call AddNTimes + ld d, h + ld e, l + ld bc, NAME_LENGTH + add hl, bc + ld bc, wPokedexOwned + ld a, [wRemoveMonFromBox] + and a + jr z, .asm_7c15 + ld bc, wBoxMonNicksEnd +.asm_7c15 + jp CopyDataUntil diff --git a/engine/special_warps.asm b/engine/special_warps.asm new file mode 100644 index 00000000..de00a817 --- /dev/null +++ b/engine/special_warps.asm @@ -0,0 +1,149 @@ +SpecialWarpIn: + call LoadSpecialWarpData + predef LoadTilesetHeader + ld hl,wd732 + bit 2,[hl] ; dungeon warp or fly warp? + res 2,[hl] + jr z,.next +; if dungeon warp or fly warp + ld a,[wDestinationMap] + jr .next2 +.next + bit 1,[hl] + jr z,.next3 + call EmptyFunc +.next3 + ld a,0 +.next2 + ld b,a + ld a,[wd72d] + and a + jr nz,.next4 + ld a,b +.next4 + ld hl,wd732 + bit 4,[hl] ; dungeon warp? + ret nz +; if not dungeon warp + ld [wLastMap],a + ret + +; gets the map ID, tile block map view pointer, tileset, and coordinates +LoadSpecialWarpData: + ld a, [wd72d] + cp TRADE_CENTER + jr nz, .notTradeCenter + ld hl, TradeCenterSpec1 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right + jr z, .copyWarpData + ld hl, TradeCenterSpec2 + jr .copyWarpData +.notTradeCenter + cp COLOSSEUM + jr nz, .notColosseum + ld hl, ColosseumSpec1 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK + jr z, .copyWarpData + ld hl, ColosseumSpec2 + jr .copyWarpData +.notColosseum + ld a, [wd732] + bit 1, a + jr nz, .notFirstMap + bit 2, a + jr nz, .notFirstMap + ld hl, FirstMapSpec +.copyWarpData + ld de, wCurMap + ld c, $7 +.copyWarpDataLoop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyWarpDataLoop + ld a, [hli] + ld [wCurMapTileset], a + xor a + jr .done +.notFirstMap + ld a, [wLastMap] ; this value is overwritten before it's ever read + ld hl, wd732 + bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? + jr nz, .usedDunegonWarp + bit 6, [hl] ; return to last pokemon center (or player's house)? + res 6, [hl] + jr z, .otherDestination +; return to last pokemon center or player's house + ld a, [wLastBlackoutMap] + jr .usedFlyWarp +.usedDunegonWarp + ld hl, wd72d + res 4, [hl] + ld a, [wDungeonWarpDestinationMap] + ld b, a + ld [wCurMap], a + ld a, [wWhichDungeonWarp] + ld c, a + ld hl, DungeonWarpList + ld de, 0 + ld a, 6 + ld [wDungeonWarpDataEntrySize], a +.dungeonWarpListLoop + ld a, [hli] + cp b + jr z, .matchedDungeonWarpDestinationMap + inc hl + jr .nextDungeonWarp +.matchedDungeonWarpDestinationMap + ld a, [hli] + cp c + jr z, .matchedDungeonWarpID +.nextDungeonWarp + ld a, [wDungeonWarpDataEntrySize] + add e + ld e, a + jr .dungeonWarpListLoop +.matchedDungeonWarpID + ld hl, DungeonWarpData + add hl, de + jr .copyWarpData2 +.otherDestination + ld a, [wDestinationMap] +.usedFlyWarp + ld b, a + ld [wCurMap], a + ld hl, FlyWarpDataPtr +.flyWarpDataPtrLoop + ld a, [hli] + inc hl + cp b + jr z, .foundFlyWarpMatch + inc hl + inc hl + jr .flyWarpDataPtrLoop +.foundFlyWarpMatch + ld a, [hli] + ld h, [hl] + ld l, a +.copyWarpData2 + ld de, wCurrentTileBlockMapViewPointer + ld c, $6 +.copyWarpDataLoop2 + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyWarpDataLoop2 + xor a ; OVERWORLD + ld [wCurMapTileset], a +.done + ld [wYOffsetSinceLastSpecialWarp], a + ld [wXOffsetSinceLastSpecialWarp], a + ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps + ld [wDestinationWarpID], a + ret + +INCLUDE "data/special_warps.asm" diff --git a/engine/subtract_paid_money.asm b/engine/subtract_paid_money.asm new file mode 100644 index 00000000..2888c3fb --- /dev/null +++ b/engine/subtract_paid_money.asm @@ -0,0 +1,17 @@ +; subtracts the amount the player paid from their money +; sets carry flag if there is enough money and unsets carry flag if not +SubtractAmountPaidFromMoney_: + ld de,wPlayerMoney + ld hl,hMoney ; total price of items + ld c,3 ; length of money in bytes + call StringCmp + ret c + ld de,wPlayerMoney + 2 + ld hl,hMoney + 2 ; total price of items + ld c,3 ; length of money in bytes + predef SubBCDPredef ; subtract total price from money + ld a,MONEY_BOX + ld [wTextBoxID],a + call DisplayTextBoxID ; redraw money text box + and a + ret diff --git a/main.asm b/main.asm index e5a89b49..15c7f8dc 100755 --- a/main.asm +++ b/main.asm @@ -18,53 +18,7 @@ SECTION "bank1",ROMX,BANK[$1] INCLUDE "data/facing.asm" -ResetStatusAndHalveMoneyOnBlackout:: -; Reset player status on blackout. - xor a - ld [wBattleResult], a - ld [wWalkBikeSurfState], a - ld [wIsInBattle], a - ld [wMapPalOffset], a - ld [wNPCMovementScriptFunctionNum], a - ld [hJoyHeld], a - ld [wNPCMovementScriptPointerTableNum], a - ld [wFlags_0xcd60], a - - ld [hMoney], a - ld [hMoney + 1], a - ld [hMoney + 2], a - call HasEnoughMoney - jr c, .lostmoney ; never happens - - ; Halve the player's money. - ld a, [wPlayerMoney] - ld [hMoney], a - ld a, [wPlayerMoney + 1] - ld [hMoney + 1], a - ld a, [wPlayerMoney + 2] - ld [hMoney + 2], a - xor a - ld [hDivideBCDDivisor], a - ld [hDivideBCDDivisor + 1], a - ld a, 2 - ld [hDivideBCDDivisor + 2], a - predef DivideBCDPredef3 - ld a, [hDivideBCDQuotient] - ld [wPlayerMoney], a - ld a, [hDivideBCDQuotient + 1] - ld [wPlayerMoney + 1], a - ld a, [hDivideBCDQuotient + 2] - ld [wPlayerMoney + 2], a - -.lostmoney - ld hl, wd732 - set 2, [hl] - res 3, [hl] - set 6, [hl] - ld a, %11111111 - ld [wJoyIgnore], a - predef_jump HealParty - +INCLUDE "engine/black_out.asm" MewPicFront:: INCBIN "pic/bmon/mew.pic" MewPicBack:: INCBIN "pic/monback/mewb.pic" @@ -97,361 +51,17 @@ INCLUDE "engine/menu/main_menu.asm" INCLUDE "engine/oak_speech.asm" -SpecialWarpIn: - call LoadSpecialWarpData - predef LoadTilesetHeader - ld hl,wd732 - bit 2,[hl] ; dungeon warp or fly warp? - res 2,[hl] - jr z,.next -; if dungeon warp or fly warp - ld a,[wDestinationMap] - jr .next2 -.next - bit 1,[hl] - jr z,.next3 - call EmptyFunc -.next3 - ld a,0 -.next2 - ld b,a - ld a,[wd72d] - and a - jr nz,.next4 - ld a,b -.next4 - ld hl,wd732 - bit 4,[hl] ; dungeon warp? - ret nz -; if not dungeon warp - ld [wLastMap],a - ret - -; gets the map ID, tile block map view pointer, tileset, and coordinates -LoadSpecialWarpData: - ld a, [wd72d] - cp TRADE_CENTER - jr nz, .notTradeCenter - ld hl, TradeCenterSpec1 - ld a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right - jr z, .copyWarpData - ld hl, TradeCenterSpec2 - jr .copyWarpData -.notTradeCenter - cp COLOSSEUM - jr nz, .notColosseum - ld hl, ColosseumSpec1 - ld a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK - jr z, .copyWarpData - ld hl, ColosseumSpec2 - jr .copyWarpData -.notColosseum - ld a, [wd732] - bit 1, a - jr nz, .notFirstMap - bit 2, a - jr nz, .notFirstMap - ld hl, FirstMapSpec -.copyWarpData - ld de, wCurMap - ld c, $7 -.copyWarpDataLoop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyWarpDataLoop - ld a, [hli] - ld [wCurMapTileset], a - xor a - jr .done -.notFirstMap - ld a, [wLastMap] ; this value is overwritten before it's ever read - ld hl, wd732 - bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? - jr nz, .usedDunegonWarp - bit 6, [hl] ; return to last pokemon center (or player's house)? - res 6, [hl] - jr z, .otherDestination -; return to last pokemon center or player's house - ld a, [wLastBlackoutMap] - jr .usedFlyWarp -.usedDunegonWarp - ld hl, wd72d - res 4, [hl] - ld a, [wDungeonWarpDestinationMap] - ld b, a - ld [wCurMap], a - ld a, [wWhichDungeonWarp] - ld c, a - ld hl, DungeonWarpList - ld de, 0 - ld a, 6 - ld [wDungeonWarpDataEntrySize], a -.dungeonWarpListLoop - ld a, [hli] - cp b - jr z, .matchedDungeonWarpDestinationMap - inc hl - jr .nextDungeonWarp -.matchedDungeonWarpDestinationMap - ld a, [hli] - cp c - jr z, .matchedDungeonWarpID -.nextDungeonWarp - ld a, [wDungeonWarpDataEntrySize] - add e - ld e, a - jr .dungeonWarpListLoop -.matchedDungeonWarpID - ld hl, DungeonWarpData - add hl, de - jr .copyWarpData2 -.otherDestination - ld a, [wDestinationMap] -.usedFlyWarp - ld b, a - ld [wCurMap], a - ld hl, FlyWarpDataPtr -.flyWarpDataPtrLoop - ld a, [hli] - inc hl - cp b - jr z, .foundFlyWarpMatch - inc hl - inc hl - jr .flyWarpDataPtrLoop -.foundFlyWarpMatch - ld a, [hli] - ld h, [hl] - ld l, a -.copyWarpData2 - ld de, wCurrentTileBlockMapViewPointer - ld c, $6 -.copyWarpDataLoop2 - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyWarpDataLoop2 - xor a ; OVERWORLD - ld [wCurMapTileset], a -.done - ld [wYOffsetSinceLastSpecialWarp], a - ld [wXOffsetSinceLastSpecialWarp], a - ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps - ld [wDestinationWarpID], a - ret - -INCLUDE "data/special_warps.asm" - -; This function appears to never be used. -; It is likely a debugging feature to give the player Tsunekazu Ishihara's -; favorite Pokemon. This is indicated by the overpowered Exeggutor, which -; Ishihara (president of Creatures Inc.) said was his favorite Pokemon in an ABC -; interview on February 8, 2000. -; "Exeggutor is my favorite. That's because I was always using this character -; while I was debugging the program." -; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript - -SetIshiharaTeam: - ld de, IshiharaTeam -.loop - ld a, [de] - cp $ff - ret z - ld [wcf91], a - inc de - ld a, [de] - ld [wCurEnemyLVL], a - inc de - call AddPartyMon - jr .loop - -IshiharaTeam: - db EXEGGUTOR,90 - db MEW,20 - db JOLTEON,56 - db DUGTRIO,56 - db ARTICUNO,57 - db $FF +INCLUDE "engine/special_warps.asm" -EmptyFunc: - ret +INCLUDE "engine/debug1.asm" INCLUDE "engine/menu/naming_screen.asm" INCLUDE "engine/oak_speech2.asm" -; subtracts the amount the player paid from their money -; sets carry flag if there is enough money and unsets carry flag if not -SubtractAmountPaidFromMoney_: - ld de,wPlayerMoney - ld hl,hMoney ; total price of items - ld c,3 ; length of money in bytes - call StringCmp - ret c - ld de,wPlayerMoney + 2 - ld hl,hMoney + 2 ; total price of items - ld c,3 ; length of money in bytes - predef SubBCDPredef ; subtract total price from money - ld a,MONEY_BOX - ld [wTextBoxID],a - call DisplayTextBoxID ; redraw money text box - and a - ret +INCLUDE "engine/subtract_paid_money.asm" -HandleItemListSwapping: - ld a,[wListMenuID] - cp a,ITEMLISTMENU - jp nz,DisplayListMenuIDLoop ; only rearrange item list menus - push hl - ld hl,wListPointer - ld a,[hli] - ld h,[hl] - ld l,a - inc hl ; hl = beginning of list entries - ld a,[wCurrentMenuItem] - ld b,a - ld a,[wListScrollOffset] - add b - add a - ld c,a - ld b,0 - add hl,bc ; hl = address of currently selected item entry - ld a,[hl] - pop hl - inc a - jp z,DisplayListMenuIDLoop ; ignore attempts to swap the Cancel menu item - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) - and a ; has the first item to swap already been chosen? - jr nz,.swapItems -; if not, set the currently selected item as the first item - ld a,[wCurrentMenuItem] - inc a - ld b,a - ld a,[wListScrollOffset] ; index of top (visible) menu item within the list - add b - ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) - ld c,20 - call DelayFrames - jp DisplayListMenuIDLoop -.swapItems - ld a,[wCurrentMenuItem] - inc a - ld b,a - ld a,[wListScrollOffset] - add b - ld b,a - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) - cp b ; is the currently selected item the same as the first item to swap? - jp z,DisplayListMenuIDLoop ; ignore attempts to swap an item with itself - dec a - ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) - ld c,20 - call DelayFrames - push hl - push de - ld hl,wListPointer - ld a,[hli] - ld h,[hl] - ld l,a - inc hl ; hl = beginning of list entries - ld d,h - ld e,l ; de = beginning of list entries - ld a,[wCurrentMenuItem] - ld b,a - ld a,[wListScrollOffset] - add b - add a - ld c,a - ld b,0 - add hl,bc ; hl = address of currently selected item entry - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) - add a - add e - ld e,a - jr nc,.noCarry - inc d -.noCarry ; de = address of first item to swap - ld a,[de] - ld b,a - ld a,[hli] - cp b - jr z,.swapSameItemType -.swapDifferentItems - ld [$ff95],a ; [$ff95] = second item ID - ld a,[hld] - ld [$ff96],a ; [$ff96] = second item quantity - ld a,[de] - ld [hli],a ; put first item ID in second item slot - inc de - ld a,[de] - ld [hl],a ; put first item quantity in second item slot - ld a,[$ff96] - ld [de],a ; put second item quantity in first item slot - dec de - ld a,[$ff95] - ld [de],a ; put second item ID in first item slot - xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped - pop de - pop hl - jp DisplayListMenuIDLoop -.swapSameItemType - inc de - ld a,[hl] - ld b,a - ld a,[de] - add b ; a = sum of both item quantities - cp a,100 ; is the sum too big for one item slot? - jr c,.combineItemSlots -; swap enough items from the first slot to max out the second slot if they can't be combined - sub a,99 - ld [de],a - ld a,99 - ld [hl],a - jr .done -.combineItemSlots - ld [hl],a ; put the sum in the second item slot - ld hl,wListPointer - ld a,[hli] - ld h,[hl] - ld l,a - dec [hl] ; decrease the number of items - ld a,[hl] - 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 -.skipSettingMaxMenuItemID - dec de - ld h,d - ld l,e - inc hl - inc hl ; hl = address of item after first item to swap -.moveItemsUpLoop ; erase the first item slot and move up all the following item slots to fill the gap - ld a,[hli] - ld [de],a - inc de - inc a ; reached the $ff terminator? - jr z,.afterMovingItemsUp - ld a,[hli] - ld [de],a - inc de - jr .moveItemsUpLoop -.afterMovingItemsUp - xor a - ld [wListScrollOffset],a - ld [wCurrentMenuItem],a -.done - xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped - pop de - pop hl - jp DisplayListMenuIDLoop +INCLUDE "engine/menu/swap_items.asm" INCLUDE "engine/overworld/pokemart.asm" @@ -459,1096 +69,22 @@ INCLUDE "engine/learn_move.asm" INCLUDE "engine/overworld/pokecenter.asm" -SetLastBlackoutMap: -; Set the map to return to when -; blacking out or using Teleport or Dig. -; Safari rest houses don't count. - - push hl - ld hl, SafariZoneRestHouses - ld a, [wCurMap] - ld b, a -.loop - ld a, [hli] - cp -1 - jr z, .notresthouse - cp b - jr nz, .loop - jr .done - -.notresthouse - ld a, [wLastMap] - ld [wLastBlackoutMap], a -.done - pop hl - ret +INCLUDE "engine/overworld/set_blackout_map.asm" -SafariZoneRestHouses: - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 - db -1 - -; function that performs initialization for DisplayTextID -DisplayTextIDInit: - xor a - ld [wListMenuID],a - ld a,[wAutoTextBoxDrawingControl] - bit 0,a - jr nz,.skipDrawingTextBoxBorder - ld a,[hSpriteIndexOrTextID] ; text ID (or sprite ID) - and a - jr nz,.notStartMenu -; if text ID is 0 (i.e. the start menu) -; Note that the start menu text border is also drawn in the function directly -; below this, so this seems unnecessary. - CheckEvent EVENT_GOT_POKEDEX -; start menu with pokedex - coord hl, 10, 0 - ld b,$0e - ld c,$08 - jr nz,.drawTextBoxBorder -; start menu without pokedex - 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 - coord hl, 0, 12 - ld b,$04 - ld c,$12 -.drawTextBoxBorder - call TextBoxBorder -.skipDrawingTextBoxBorder - ld hl,wFontLoaded - set 0,[hl] - ld hl,wFlags_0xcd60 - bit 4,[hl] - res 4,[hl] - jr nz,.skipMovingSprites - 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 -; the original direction they were facing must be restored after the dialogue is over - ld hl,wSpriteStateData1 + $19 - ld c,$0f - ld de,$0010 -.spriteFacingDirectionCopyLoop - ld a,[hl] - inc h - ld [hl],a - dec h - add hl,de - dec c - jr nz,.spriteFacingDirectionCopyLoop -; loop to force all the sprites in the middle of animation to stand still -; (so that they don't like they're frozen mid-step during the dialogue) - ld hl,wSpriteStateData1 + 2 - ld de,$0010 - ld c,e -.spriteStandStillLoop - ld a,[hl] - cp a,$ff ; is the sprite visible? - jr z,.nextSprite -; if it is visible - and a,$fc - ld [hl],a -.nextSprite - add hl,de - dec c - jr nz,.spriteStandStillLoop - ld b,$9c ; window background address - call CopyScreenTileBufferToVRAM ; transfer background in WRAM to VRAM - xor a - ld [hWY],a ; put the window on the screen - call LoadFontTilePatterns - ld a,$01 - ld [H_AUTOBGTRANSFERENABLED],a ; enable continuous WRAM to VRAM transfer each V-blank - ret - -; function that displays the start menu -DrawStartMenu: - CheckEvent EVENT_GOT_POKEDEX -; menu with pokedex - coord hl, 10, 0 - ld b,$0e - ld c,$08 - jr nz,.drawTextBoxBorder -; shorter menu if the player doesn't have the pokedex - coord hl, 10, 0 - ld b,$0c - ld c,$08 -.drawTextBoxBorder - call TextBoxBorder - 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 - ld a,$0b - ld [wTopMenuItemX],a ; X position of first menu choice - ld a,[wBattleAndStartSavedMenuItem] ; remembered menu selection from last time - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a - xor a - ld [wMenuWatchMovingOutOfBounds],a - ld hl,wd730 - set 6,[hl] ; no pauses between printing each letter - coord hl, 12, 2 - CheckEvent EVENT_GOT_POKEDEX -; case for not having pokdex - ld a,$06 - jr z,.storeMenuItemCount -; case for having pokedex - ld de,StartMenuPokedexText - call PrintStartMenuItem - ld a,$07 -.storeMenuItemCount - ld [wMaxMenuItem],a ; number of menu items - ld de,StartMenuPokemonText - call PrintStartMenuItem - ld de,StartMenuItemText - call PrintStartMenuItem - ld de,wPlayerName ; player's name - call PrintStartMenuItem - ld a,[wd72e] - bit 6,a ; is the player using the link feature? -; case for not using link feature - ld de,StartMenuSaveText - jr z,.printSaveOrResetText -; case for using link feature - ld de,StartMenuResetText -.printSaveOrResetText - call PrintStartMenuItem - ld de,StartMenuOptionText - call PrintStartMenuItem - ld de,StartMenuExitText - call PlaceString - ld hl,wd730 - res 6,[hl] ; turn pauses between printing letters back on - ret - -StartMenuPokedexText: - db "POKéDEX@" - -StartMenuPokemonText: - db "POKéMON@" - -StartMenuItemText: - db "ITEM@" - -StartMenuSaveText: - db "SAVE@" - -StartMenuResetText: - db "RESET@" - -StartMenuExitText: - db "EXIT@" - -StartMenuOptionText: - db "OPTION@" - -PrintStartMenuItem: - push hl - call PlaceString - pop hl - ld de,SCREEN_WIDTH * 2 - add hl,de - ret +INCLUDE "engine/display_text_id_init.asm" +INCLUDE "engine/menu/draw_start_menu.asm" INCLUDE "engine/overworld/cable_club_npc.asm" -; function to draw various text boxes -DisplayTextBoxID_: - ld a,[wTextBoxID] - cp a,TWO_OPTION_MENU - jp z,DisplayTwoOptionMenu - ld c,a - ld hl,TextBoxFunctionTable - ld de,3 - call SearchTextBoxTable - jr c,.functionTableMatch - ld hl,TextBoxCoordTable - ld de,5 - call SearchTextBoxTable - jr c,.coordTableMatch - ld hl,TextBoxTextAndCoordTable - ld de,9 - call SearchTextBoxTable - jr c,.textAndCoordTableMatch -.done - ret -.functionTableMatch - ld a,[hli] - ld h,[hl] - ld l,a ; hl = address of function - ld de,.done - push de - jp [hl] ; jump to the function -.coordTableMatch - call GetTextBoxIDCoords - call GetAddressOfScreenCoords - call TextBoxBorder - ret -.textAndCoordTableMatch - call GetTextBoxIDCoords - push hl - call GetAddressOfScreenCoords - call TextBoxBorder - pop hl - call GetTextBoxIDText - ld a,[wd730] - push af - ld a,[wd730] - set 6,a ; no pauses between printing each letter - ld [wd730],a - call PlaceString - pop af - ld [wd730],a - call UpdateSprites - ret - -; function to search a table terminated with $ff for a byte matching c in increments of de -; sets carry flag if a match is found and clears carry flag if not -SearchTextBoxTable: - dec de -.loop - ld a,[hli] - cp a,$ff - jr z,.notFound - cp c - jr z,.found - add hl,de - jr .loop -.found - scf -.notFound - ret - -; function to load coordinates from the TextBoxCoordTable or the TextBoxTextAndCoordTable -; INPUT: -; hl = address of coordinates -; OUTPUT: -; b = height -; c = width -; d = row of upper left corner -; e = column of upper left corner -GetTextBoxIDCoords: - ld a,[hli] ; column of upper left corner - ld e,a - ld a,[hli] ; row of upper left corner - ld d,a - ld a,[hli] ; column of lower right corner - sub e - dec a - ld c,a ; c = width - ld a,[hli] ; row of lower right corner - sub d - dec a - ld b,a ; b = height - ret - -; function to load a text address and text coordinates from the TextBoxTextAndCoordTable -GetTextBoxIDText: - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a ; de = address of text - push de ; save text address - ld a,[hli] - ld e,a ; column of upper left corner of text - ld a,[hl] - ld d,a ; row of upper left corner of text - call GetAddressOfScreenCoords - pop de ; restore text address - ret - -; function to point hl to the screen coordinates -; INPUT: -; d = row -; e = column -; OUTPUT: -; hl = address of upper left corner of text box -GetAddressOfScreenCoords: - push bc - coord hl, 0, 0 - ld bc,20 -.loop ; loop to add d rows to the base address - ld a,d - and a - jr z,.addedRows - add hl,bc - dec d - jr .loop -.addedRows - pop bc - add hl,de - ret - -; Format: -; 00: text box ID -; 01-02: function address -TextBoxFunctionTable: - dbw MONEY_BOX, DisplayMoneyBox - dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu - dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu - db $ff ; terminator - -; Format: -; 00: text box ID -; 01: column of upper left corner -; 02: row of upper left corner -; 03: column of lower right corner -; 04: row of lower right corner -TextBoxCoordTable: - db MESSAGE_BOX, 0, 12, 19, 17 - db $03, 0, 0, 19, 14 - db $07, 0, 0, 11, 6 - db LIST_MENU_BOX, 4, 2, 19, 12 - db $10, 7, 0, 19, 17 - db MON_SPRITE_POPUP, 6, 4, 14, 13 - db $ff ; terminator - -; Format: -; 00: text box ID -; 01: column of upper left corner -; 02: row of upper left corner -; 03: column of lower right corner -; 04: row of lower right corner -; 05-06: address of text -; 07: column of beginning of text -; 08: row of beginning of text -; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row] -TextBoxTextAndCoordTable: - db JP_MOCHIMONO_MENU_TEMPLATE - db 0,0,14,17 ; text box coordinates - dw JapaneseMochimonoText - db 3,0 ; text coordinates - - db USE_TOSS_MENU_TEMPLATE - db 13,10,19,14 ; text box coordinates - dw UseTossText - db 15,11 ; text coordinates - - db JP_SAVE_MESSAGE_MENU_TEMPLATE - db 0,0,7,5 ; text box coordinates - dw JapaneseSaveMessageText - db 2,2 ; text coordinates - - db JP_SPEED_OPTIONS_MENU_TEMPLATE - db 0,6,5,10 ; text box coordinates - dw JapaneseSpeedOptionsText - db 2,7 ; text coordinates - - db BATTLE_MENU_TEMPLATE - db 8,12,19,17 ; text box coordinates - dw BattleMenuText - db 10,14 ; text coordinates - - db SAFARI_BATTLE_MENU_TEMPLATE - db 0,12,19,17 ; text box coordinates - dw SafariZoneBattleMenuText - db 2,14 ; text coordinates - - db SWITCH_STATS_CANCEL_MENU_TEMPLATE - db 11,11,19,17 ; text box coordinates - dw SwitchStatsCancelText - db 13,12 ; text coordinates - - db BUY_SELL_QUIT_MENU_TEMPLATE - db 0,0,10,6 ; text box coordinates - dw BuySellQuitText - db 2,1 ; text coordinates - - db MONEY_BOX_TEMPLATE - db 11,0,19,2 ; text box coordinates - dw MoneyText - db 13,0 ; text coordinates - - db JP_AH_MENU_TEMPLATE - db 7,6,11,10 ; text box coordinates - dw JapaneseAhText - db 8,8 ; text coordinates - - db JP_POKEDEX_MENU_TEMPLATE - db 11,8,19,17 ; text box coordinates - dw JapanesePokedexMenu - db 12,10 ; text coordinates - -; note that there is no terminator - -BuySellQuitText: - db "BUY" - next "SELL" - next "QUIT@@" - -UseTossText: - db "USE" - next "TOSS@" - -JapaneseSaveMessageText: - db "きろく" - next "メッセージ@" - -JapaneseSpeedOptionsText: - db "はやい" - next "おそい@" - -MoneyText: - db "MONEY@" - -JapaneseMochimonoText: - db "もちもの@" - -JapaneseMainMenuText: - db "つづきから" - next "さいしょから@" - -BattleMenuText: - db "FIGHT ",$E1,$E2 - next "ITEM RUN@" - -SafariZoneBattleMenuText: - db "BALL× BAIT" - next "THROW ROCK RUN@" - -SwitchStatsCancelText: - db "SWITCH" - next "STATS" - next "CANCEL@" - -JapaneseAhText: - db "アッ!@" - -JapanesePokedexMenu: - db "データをみる" - next "なきごえ" - next "ぶんぷをみる" - next "キャンセル@" - -DisplayMoneyBox: - ld hl, wd730 - set 6, [hl] - ld a, MONEY_BOX_TEMPLATE - ld [wTextBoxID], a - call DisplayTextBoxID - coord hl, 13, 1 - ld b, 1 - ld c, 6 - call ClearScreenArea - coord hl, 12, 1 - ld de, wPlayerMoney - ld c, $a3 - call PrintBCDNumber - ld hl, wd730 - res 6, [hl] - ret - -CurrencyString: - db " ¥@" - -DoBuySellQuitMenu: - ld a, [wd730] - set 6, a ; no printing delay - ld [wd730], a - xor a - ld [wChosenMenuItem], a - ld a, BUY_SELL_QUIT_MENU_TEMPLATE - ld [wTextBoxID], a - call DisplayTextBoxID - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, $2 - ld [wMaxMenuItem], a - ld a, $1 - ld [wTopMenuItemY], a - ld a, $1 - ld [wTopMenuItemX], a - xor a - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld [wMenuWatchMovingOutOfBounds], a - ld a, [wd730] - res 6, a ; turn on the printing delay - ld [wd730], a - call HandleMenuInput - call PlaceUnfilledArrowMenuCursor - bit 0, a ; was A pressed? - jr nz, .pressedA - bit 1, a ; was B pressed? (always true since only A/B are watched) - jr z, .pressedA - ld a, CANCELLED_MENU - ld [wMenuExitMethod], a - jr .quit -.pressedA - ld a, CHOSE_MENU_ITEM - ld [wMenuExitMethod], a - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - ld b, a - ld a, [wMaxMenuItem] - cp b - jr z, .quit - ret -.quit - ld a, CANCELLED_MENU - ld [wMenuExitMethod], a - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - scf - ret - -; displays a menu with two options to choose from -; b = Y of upper left corner of text region -; c = X of upper left corner of text region -; hl = address where the text box border should be drawn -DisplayTwoOptionMenu: - push hl - ld a, [wd730] - set 6, a ; no printing delay - ld [wd730], a - -; pointless because both values are overwritten before they are read - xor a - ld [wChosenMenuItem], a - ld [wMenuExitMethod], a - - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, $1 - ld [wMaxMenuItem], a - ld a, b - ld [wTopMenuItemY], a - ld a, c - ld [wTopMenuItemX], a - xor a - ld [wLastMenuItem], a - ld [wMenuWatchMovingOutOfBounds], a - push hl - ld hl, wTwoOptionMenuID - bit 7, [hl] ; select second menu item by default? - res 7, [hl] - jr z, .storeCurrentMenuItem - inc a -.storeCurrentMenuItem - ld [wCurrentMenuItem], a - pop hl - push hl - push hl - call TwoOptionMenu_SaveScreenTiles - ld a, [wTwoOptionMenuID] - ld hl, TwoOptionMenuStrings - ld e, a - ld d, $0 - ld a, $5 -.menuStringLoop - add hl, de - dec a - jr nz, .menuStringLoop - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld e, l - ld d, h - pop hl - push de - ld a, [wTwoOptionMenuID] - cp TRADE_CANCEL_MENU - jr nz, .notTradeCancelMenu - call CableClub_TextBoxBorder - jr .afterTextBoxBorder -.notTradeCancelMenu - call TextBoxBorder -.afterTextBoxBorder - call UpdateSprites - pop hl - ld a, [hli] - and a ; put blank line before first menu item? - ld bc, 20 + 2 - jr z, .noBlankLine - ld bc, 2 * 20 + 2 -.noBlankLine - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - pop hl - add hl, bc - call PlaceString - ld hl, wd730 - res 6, [hl] ; turn on the printing delay - ld a, [wTwoOptionMenuID] - cp NO_YES_MENU - jr nz, .notNoYesMenu -; No/Yes menu -; this menu type ignores the B button -; it only seems to be used when confirming the deletion of a save file - xor a - ld [wTwoOptionMenuID], a - ld a, [wFlags_0xcd60] - push af - push hl - ld hl, wFlags_0xcd60 - bit 5, [hl] - set 5, [hl] ; don't play sound when A or B is pressed in menu - pop hl -.noYesMenuInputLoop - call HandleMenuInput - bit 1, a ; A button pressed? - jr nz, .noYesMenuInputLoop ; try again if A was not pressed - pop af - pop hl - ld [wFlags_0xcd60], a - ld a, SFX_PRESS_AB - call PlaySound - jr .pressedAButton -.notNoYesMenu - xor a - ld [wTwoOptionMenuID], a - call HandleMenuInput - pop hl - bit 1, a ; A button pressed? - jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed -.pressedAButton - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - and a - jr nz, .choseSecondMenuItem -; chose first menu item - ld a, CHOSE_FIRST_ITEM - ld [wMenuExitMethod], a - ld c, 15 - call DelayFrames - call TwoOptionMenu_RestoreScreenTiles - and a - ret -.choseSecondMenuItem - ld a, 1 - ld [wCurrentMenuItem], a - ld [wChosenMenuItem], a - ld a, CHOSE_SECOND_ITEM - ld [wMenuExitMethod], a - ld c, 15 - call DelayFrames - call TwoOptionMenu_RestoreScreenTiles - scf - ret - -; Some of the wider/taller two option menus will not have the screen areas -; they cover be fully saved/restored by the two functions below. -; The bottom and right edges of the menu may remain after the function returns. - -TwoOptionMenu_SaveScreenTiles: - ld de, wBuffer - lb bc, 5, 6 -.loop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .loop - push bc - ld bc, SCREEN_WIDTH - 6 - add hl, bc - pop bc - ld c, $6 - dec b - jr nz, .loop - ret - -TwoOptionMenu_RestoreScreenTiles: - ld de, wBuffer - lb bc, 5, 6 -.loop - ld a, [de] - inc de - ld [hli], a - dec c - jr nz, .loop - push bc - ld bc, SCREEN_WIDTH - 6 - add hl, bc - pop bc - ld c, 6 - dec b - jr nz, .loop - call UpdateSprites - ret - -; Format: -; 00: byte width -; 01: byte height -; 02: byte put blank line before first menu item -; 03: word text pointer -TwoOptionMenuStrings: - db 4,3,0 - dw .YesNoMenu - db 6,3,0 - dw .NorthWestMenu - db 6,3,0 - dw .SouthEastMenu - db 6,3,0 - dw .YesNoMenu - db 6,3,0 - dw .NorthEastMenu - db 7,3,0 - dw .TradeCancelMenu - db 7,4,1 - dw .HealCancelMenu - db 4,3,0 - dw .NoYesMenu - -.NoYesMenu - db "NO" - next "YES@" -.YesNoMenu - db "YES" - next "NO@" -.NorthWestMenu - db "NORTH" - next "WEST@" -.SouthEastMenu - db "SOUTH" - next "EAST@" -.NorthEastMenu - db "NORTH" - next "EAST@" -.TradeCancelMenu - db "TRADE" - next "CANCEL@" -.HealCancelMenu - db "HEAL" - next "CANCEL@" - -DisplayFieldMoveMonMenu: - xor a - ld hl, wFieldMoves - ld [hli], a ; wFieldMoves - ld [hli], a ; wFieldMoves + 1 - ld [hli], a ; wFieldMoves + 2 - ld [hli], a ; wFieldMoves + 3 - ld [hli], a ; wNumFieldMoves - ld [hl], 12 ; wFieldMovesLeftmostXCoord - call GetMonFieldMoves - ld a, [wNumFieldMoves] - and a - jr nz, .fieldMovesExist - -; no field moves - coord hl, 11, 11 - ld b, 5 - ld c, 7 - call TextBoxBorder - call UpdateSprites - ld a, 12 - ld [hFieldMoveMonMenuTopMenuItemX], a - coord hl, 13, 12 - ld de, PokemonMenuEntries - jp PlaceString - -.fieldMovesExist - push af - -; 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. - coord hl, 0, 11 - ld a, [wFieldMovesLeftmostXCoord] - dec a - ld e, a - ld d, 0 - add hl, de - ld b, 5 - ld a, 18 - sub e - ld c, a - pop af - -; For each field move, move the top of the text box up 2 rows while the leaving -; the bottom of the text box at the bottom of the screen. - ld de, -SCREEN_WIDTH * 2 -.textBoxHeightLoop - add hl, de - inc b - inc b - dec a - jr nz, .textBoxHeightLoop - -; Make space for an extra blank row above the top field move. - ld de, -SCREEN_WIDTH - add hl, de - inc b - - call TextBoxBorder - call UpdateSprites - -; Calculate the position of the first field move name to print. - coord hl, 0, 12 - ld a, [wFieldMovesLeftmostXCoord] - inc a - ld e, a - ld d, 0 - add hl, de - ld de, -SCREEN_WIDTH * 2 - ld a, [wNumFieldMoves] -.calcFirstFieldMoveYLoop - add hl, de - dec a - jr nz, .calcFirstFieldMoveYLoop - - xor a - ld [wNumFieldMoves], a - ld de, wFieldMoves -.printNamesLoop - push hl - ld hl, FieldMoveNames - ld a, [de] - and a - jr z, .donePrintingNames - inc de - ld b, a ; index of name -.skipNamesLoop ; skip past names before the name we want - dec b - jr z, .reachedName -.skipNameLoop ; skip past current name - ld a, [hli] - cp "@" - jr nz, .skipNameLoop - jr .skipNamesLoop -.reachedName - ld b, h - ld c, l - pop hl - push de - ld d, b - ld e, c - call PlaceString - ld bc, SCREEN_WIDTH * 2 - add hl, bc - pop de - jr .printNamesLoop - -.donePrintingNames - pop hl - ld a, [wFieldMovesLeftmostXCoord] - ld [hFieldMoveMonMenuTopMenuItemX], a - coord hl, 0, 12 - ld a, [wFieldMovesLeftmostXCoord] - inc a - ld e, a - ld d, 0 - add hl, de - ld de, PokemonMenuEntries - jp PlaceString - -FieldMoveNames: - db "CUT@" - db "FLY@" - db "@" - db "SURF@" - db "STRENGTH@" - db "FLASH@" - db "DIG@" - db "TELEPORT@" - db "SOFTBOILED@" - -PokemonMenuEntries: - db "STATS" - next "SWITCH" - next "CANCEL@" - -GetMonFieldMoves: - ld a, [wWhichPokemon] - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld d, h - ld e, l - ld c, NUM_MOVES + 1 - ld hl, wFieldMoves -.loop - push hl -.nextMove - dec c - jr z, .done - ld a, [de] ; move ID - and a - jr z, .done - ld b, a - inc de - ld hl, FieldMoveDisplayData -.fieldMoveLoop - ld a, [hli] - cp $ff - jr z, .nextMove ; if the move is not a field move - cp b - jr z, .foundFieldMove - inc hl - inc hl - jr .fieldMoveLoop -.foundFieldMove - ld a, b - ld [wLastFieldMoveID], a - ld a, [hli] ; field move name index - ld b, [hl] ; field move leftmost X coordinate - pop hl - ld [hli], a ; store name index in wFieldMoves - ld a, [wNumFieldMoves] - inc a - ld [wNumFieldMoves], a - ld a, [wFieldMovesLeftmostXCoord] - cp b - jr c, .skipUpdatingLeftmostXCoord - ld a, b - ld [wFieldMovesLeftmostXCoord], a -.skipUpdatingLeftmostXCoord - ld a, [wLastFieldMoveID] - ld b, a - jr .loop -.done - pop hl - ret - -; Format: [Move id], [name index], [leftmost tile] -; Move id = id of move -; Name index = index of name in FieldMoveNames -; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed -; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C -FieldMoveDisplayData: - db CUT, $01, $0C - db FLY, $02, $0C - db $B4, $03, $0C ; unused field move - db SURF, $04, $0C - db STRENGTH, $05, $0A - db FLASH, $06, $0C - db DIG, $07, $0C - db TELEPORT, $08, $0A - db SOFTBOILED, $09, $08 - db $ff ; list terminator - +INCLUDE "engine/menu/text_box.asm" INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" INCLUDE "engine/menu/players_pc.asm" -_RemovePokemon: - ld hl, wPartyCount - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7b74 - ld hl, wNumInBox -.asm_7b74 - ld a, [hl] - dec a - ld [hli], a - ld a, [wWhichPokemon] - ld c, a - ld b, $0 - add hl, bc - ld e, l - ld d, h - inc de -.asm_7b81 - ld a, [de] - inc de - ld [hli], a - inc a - jr nz, .asm_7b81 - ld hl, wPartyMonOT - ld d, $5 - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7b97 - ld hl, wBoxMonOT - ld d, $13 -.asm_7b97 - ld a, [wWhichPokemon] - call SkipFixedLengthTextEntries - ld a, [wWhichPokemon] - cp d - jr nz, .asm_7ba6 - ld [hl], $ff - ret -.asm_7ba6 - ld d, h - ld e, l - ld bc, NAME_LENGTH - add hl, bc - ld bc, wPartyMonNicks - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7bb8 - ld bc, wBoxMonNicks -.asm_7bb8 - call CopyDataUntil - ld hl, wPartyMons - ld bc, wPartyMon2 - wPartyMon1 - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7bcd - ld hl, wBoxMons - ld bc, wBoxMon2 - wBoxMon1 -.asm_7bcd - ld a, [wWhichPokemon] - call AddNTimes - ld d, h - ld e, l - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7be4 - ld bc, wBoxMon2 - wBoxMon1 - add hl, bc - ld bc, wBoxMonOT - jr .asm_7beb -.asm_7be4 - ld bc, wPartyMon2 - wPartyMon1 - add hl, bc - ld bc, wPartyMonOT -.asm_7beb - call CopyDataUntil - ld hl, wPartyMonNicks - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7bfa - ld hl, wBoxMonNicks -.asm_7bfa - ld bc, NAME_LENGTH - ld a, [wWhichPokemon] - call AddNTimes - ld d, h - ld e, l - ld bc, NAME_LENGTH - add hl, bc - ld bc, wPokedexOwned - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7c15 - ld bc, wBoxMonNicksEnd -.asm_7c15 - jp CopyDataUntil - -_DisplayPokedex: - ld hl, wd730 - set 6, [hl] - predef ShowPokedexData - ld hl, wd730 - res 6, [hl] - call ReloadMapData - ld c, 10 - call DelayFrames - predef IndexToPokedex - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_SET - ld hl, wPokedexSeen - predef FlagActionPredef - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret +INCLUDE "engine/remove_pokemon.asm" +INCLUDE "engine/display_pokedex.asm" SECTION "bank3",ROMX,BANK[$3] -- cgit v1.2.3 From d1162fec71ca789cae66dfe826aa0eae0e134b53 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 16 Oct 2016 22:30:32 -0700 Subject: correct comments about teleport effect --- engine/battle/core.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d1fd27f1..508e250c 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8047,9 +8047,8 @@ SwitchAndTeleportEffect: cp c ; get a random number between 0 and c jr nc, .rejectionSampleLoop1 srl b - srl b ; b = enemy level * 4 -; bug: does not account for overflow, so levels above 63 can lead to erroneousness results - cp b ; is rand[0, playerLevel + enemyLevel] > enemyLevel? + srl b ; b = enemyLevel / 4 + cp b ; is rand[0, playerLevel + enemyLevel) >= (enemyLevel / 4)? jr nc, .playerMoveWasSuccessful ; if so, allow teleporting ld c, 50 call DelayFrames -- cgit v1.2.3 From bb1bf5e6a7536378dffc2b995384d6dc8692bea8 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Oct 2016 01:44:13 -0700 Subject: link battle action constants --- constants/misc_constants.asm | 4 ++++ engine/battle/core.asm | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index b2571b86..e9e4b7bf 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -200,3 +200,7 @@ LINK_STATE_START_BATTLE EQU $03 ; pre-battle initialisation LINK_STATE_BATTLING EQU $04 ; in a link battle LINK_STATE_RESET EQU $05 ; reset game (unused) LINK_STATE_TRADING EQU $32 ; in a link trade + +LINKBATTLE_RUN EQU $F +LINKBATTLE_STRUGGLE EQU $E +LINKBATTLE_NO_ACTION EQU $D ; never sent diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 508e250c..cc5a6de7 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -432,13 +432,13 @@ MainInBattleLoop: jr nz, .noLinkBattle ; link battle ld a, [wSerialExchangeNybbleReceiveData] - cp $f + cp LINKBATTLE_RUN jp z, EnemyRan - cp $e + cp LINKBATTLE_STRUGGLE jr z, .noLinkBattle - cp $d + cp LINKBATTLE_NO_ACTION jr z, .noLinkBattle - sub $4 + sub 4 jr c, .noLinkBattle ; the link battle enemy has switched mons ld a, [wPlayerBattleStatus1] @@ -990,7 +990,7 @@ ReplaceFaintedEnemyMon: ; link battle call LinkBattleExchangeData ld a, [wSerialExchangeNybbleReceiveData] - cp $f + cp LINKBATTLE_RUN ret z call LoadScreenTilesFromBuffer1 .notLinkBattle @@ -1679,12 +1679,12 @@ TryRunningFromBattle: call SaveScreenTilesToBuffer1 xor a ld [wActionResultOrTookBattleTurn], a - ld a, $f + ld a, LINKBATTLE_RUN ld [wPlayerMoveListIndex], a call LinkBattleExchangeData call LoadScreenTilesFromBuffer1 ld a, [wSerialExchangeNybbleReceiveData] - cp $f + cp LINKBATTLE_RUN ld a, $2 jr z, .playSound dec a @@ -2999,16 +2999,16 @@ SelectEnemyMove: call LinkBattleExchangeData call LoadScreenTilesFromBuffer1 ld a, [wSerialExchangeNybbleReceiveData] - cp $e + cp LINKBATTLE_STRUGGLE jp z, .linkedOpponentUsedStruggle - cp $d + cp LINKBATTLE_NO_ACTION jr z, .unableToSelectMove - cp $4 + cp 4 ret nc ld [wEnemyMoveListIndex], a ld c, a ld hl, wEnemyMonMoves - ld b, $0 + ld b, 0 add hl, bc ld a, [hl] jr .done @@ -3087,7 +3087,7 @@ LinkBattleExchangeData: ld a, $ff ld [wSerialExchangeNybbleReceiveData], a ld a, [wPlayerMoveListIndex] - cp $f ; is the player running from battle? + cp LINKBATTLE_RUN ; is the player running from battle? jr z, .doExchange ld a, [wActionResultOrTookBattleTurn] and a ; is the player switching in another mon? @@ -3095,7 +3095,7 @@ LinkBattleExchangeData: ; the player used a move ld a, [wPlayerSelectedMove] cp STRUGGLE - ld b, $e + ld b, LINKBATTLE_STRUGGLE jr z, .next dec b inc a @@ -5676,9 +5676,9 @@ ExecuteEnemyMove: jr nz, .executeEnemyMove ld b, $1 ld a, [wSerialExchangeNybbleReceiveData] - cp $e + cp LINKBATTLE_STRUGGLE jr z, .executeEnemyMove - cp $4 + cp 4 ret nc .executeEnemyMove ld hl, wAILayer2Encouragement -- cgit v1.2.3 From 4d61c351726b38b22e0606df23bd2fdfb13640cc Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Oct 2016 02:04:48 -0700 Subject: correct mistaken comments --- constants/misc_constants.asm | 2 +- engine/battle/core.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index e9e4b7bf..57b19a37 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -203,4 +203,4 @@ LINK_STATE_TRADING EQU $32 ; in a link trade LINKBATTLE_RUN EQU $F LINKBATTLE_STRUGGLE EQU $E -LINKBATTLE_NO_ACTION EQU $D ; never sent +LINKBATTLE_NO_ACTION EQU $D diff --git a/engine/battle/core.asm b/engine/battle/core.asm index cc5a6de7..d921fd15 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3097,8 +3097,8 @@ LinkBattleExchangeData: cp STRUGGLE ld b, LINKBATTLE_STRUGGLE jr z, .next - dec b - inc a + dec b ; LINKBATTLE_NO_ACTION + inc a ; does move equal -1 (i.e. no action)? jr z, .next ld a, [wPlayerMoveListIndex] jr .doExchange -- cgit v1.2.3 From 77c3e22a4ecd3dc81918f00c548cef7c634f3419 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Oct 2016 10:32:03 -0700 Subject: use more HRAM constants --- engine/battle/core.asm | 4 ++-- engine/battle/experience.asm | 6 +++--- engine/cable_club.asm | 4 ++-- scripts/tradecenter.asm | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d921fd15..153a9048 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -488,8 +488,8 @@ MainInBattleLoop: jr nc, .playerMovesFirst ; if player is faster jr .enemyMovesFirst ; if enemy is faster .speedEqual ; 50/50 chance for both players - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK jr z, .invertOutcome call BattleRandom cp $80 diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 9aee8bd7..24748338 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -119,11 +119,11 @@ GainExperience: ld d, MAX_LEVEL callab CalcExperience ; get max exp ; compare max exp with current exp - ld a, [$ff96] + ld a, [hExperience] ld b, a - ld a, [$ff97] + ld a, [hExperience + 1] ld c, a - ld a, [$ff98] + ld a, [hExperience + 2] ld d, a pop hl ld a, [hld] diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 137e8406..fa99215e 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -551,7 +551,7 @@ TradeCenter_SelectMon: Coorda 1, 16 .cancelMenuItem_JoypadLoop call JoypadLowSensitivity - ld a, [$ffb5] + ld a, [hJoy5] and a ; pressed anything? jr z, .cancelMenuItem_JoypadLoop bit 0, a ; A button pressed? @@ -914,7 +914,7 @@ CableClub_Run: ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a - ld [$ffb5], a + ld [hJoy5], a ld a, 10 ld [wAudioFadeOutControl], a ld a, BANK(Music_Celadon) diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm index a200e719..80efe4f9 100755 --- a/scripts/tradecenter.asm +++ b/scripts/tradecenter.asm @@ -1,7 +1,7 @@ TradeCenterScript: call EnableAutoTextBoxDrawing - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ld a, SPRITE_FACING_LEFT jr z, .next ld a, SPRITE_FACING_RIGHT @@ -21,8 +21,8 @@ TradeCenterScript: ld [hl], a ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + $19], a - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ret z ld a, $7 ld [wSpriteStateData2 + $15], a -- cgit v1.2.3 From 10289bf7ddac46d0188da06f2714dbce0dece59c Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Wed, 2 Nov 2016 21:02:29 -0700 Subject: use hardware constants in pic.asm --- home/pic.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/pic.asm b/home/pic.asm index 797b1c70..a1c18e8a 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -7,10 +7,10 @@ UncompressSpriteData:: ld a, b ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - ld a, $a - ld [$0], a + ld a, SRAM_ENABLE + ld [MBC1SRamEnable], a xor a - ld [$4000], a + ld [MBC1SRamBank], a call _UncompressSpriteData pop af ld [H_LOADEDROMBANK], a -- cgit v1.2.3 From bf67f7174d8e3f1348c786618ee5a3a076d1eff8 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 31 Dec 2016 17:23:54 -0800 Subject: split code out of main.asm --- engine/add_mon.asm | 512 ++++++ engine/bcd.asm | 212 +++ engine/cable_club.asm | 2 +- engine/flag_action.asm | 73 + engine/get_bag_item_quantity.asm | 18 + engine/heal_party.asm | 99 ++ engine/init_player_data.asm | 55 + engine/items/inventory.asm | 150 ++ engine/menu/draw_badges.asm | 120 ++ engine/overworld/clear_variables.asm | 20 + engine/overworld/daycare_exp.asm | 18 + engine/overworld/field_move_messages.asm | 57 + engine/overworld/missable_objects.asm | 215 +++ engine/overworld/player_state.asm | 463 +++++ engine/overworld/poison.asm | 112 ++ engine/overworld/push_boulder.asm | 105 ++ engine/overworld/tileset_header.asm | 60 + engine/overworld/update_map.asm | 126 ++ engine/overworld/wild_mons.asm | 33 + engine/pathfinding.asm | 201 +++ home/overworld.asm | 2 +- main.asm | 2697 +----------------------------- 22 files changed, 2673 insertions(+), 2677 deletions(-) create mode 100644 engine/add_mon.asm create mode 100644 engine/bcd.asm create mode 100644 engine/flag_action.asm create mode 100644 engine/get_bag_item_quantity.asm create mode 100644 engine/heal_party.asm create mode 100644 engine/init_player_data.asm create mode 100644 engine/items/inventory.asm create mode 100644 engine/menu/draw_badges.asm create mode 100644 engine/overworld/clear_variables.asm create mode 100644 engine/overworld/daycare_exp.asm create mode 100644 engine/overworld/field_move_messages.asm create mode 100644 engine/overworld/missable_objects.asm create mode 100644 engine/overworld/player_state.asm create mode 100644 engine/overworld/poison.asm create mode 100644 engine/overworld/push_boulder.asm create mode 100644 engine/overworld/tileset_header.asm create mode 100644 engine/overworld/update_map.asm create mode 100644 engine/overworld/wild_mons.asm create mode 100644 engine/pathfinding.asm diff --git a/engine/add_mon.asm b/engine/add_mon.asm new file mode 100644 index 00000000..19d03942 --- /dev/null +++ b/engine/add_mon.asm @@ -0,0 +1,512 @@ +_AddPartyMon: +; Adds a new mon to the player's or enemy's party. +; [wMonDataLocation] is used in an unusual way in this function. +; If the lower nybble is 0, the mon is added to the player's party, else the enemy's. +; If the entire value is 0, then the player is allowed to name the mon. + ld de, wPartyCount + ld a, [wMonDataLocation] + and $f + jr z, .next + ld de, wEnemyPartyCount +.next + ld a, [de] + inc a + cp PARTY_LENGTH + 1 + ret nc ; return if the party is already full + ld [de], a + ld a, [de] + ld [hNewPartyLength], a + add e + ld e, a + jr nc, .noCarry + inc d +.noCarry + ld a, [wcf91] + ld [de], a ; write species of new mon in party list + inc de + ld a, $ff ; terminator + ld [de], a + ld hl, wPartyMonOT + ld a, [wMonDataLocation] + and $f + jr z, .next2 + ld hl, wEnemyMonOT +.next2 + ld a, [hNewPartyLength] + dec a + call SkipFixedLengthTextEntries + ld d, h + ld e, l + ld hl, wPlayerName + ld bc, NAME_LENGTH + call CopyData + ld a, [wMonDataLocation] + and a + jr nz, .skipNaming + ld hl, wPartyMonNicks + ld a, [hNewPartyLength] + dec a + call SkipFixedLengthTextEntries + ld a, NAME_MON_SCREEN + ld [wNamingScreenType], a + predef AskName +.skipNaming + ld hl, wPartyMons + ld a, [wMonDataLocation] + and $f + jr z, .next3 + ld hl, wEnemyMons +.next3 + ld a, [hNewPartyLength] + dec a + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld e, l + ld d, h + push hl + ld a, [wcf91] + ld [wd0b5], a + call GetMonHeader + ld hl, wMonHeader + ld a, [hli] + ld [de], a ; species + inc de + pop hl + push hl + ld a, [wMonDataLocation] + and $f + ld a, $98 ; set enemy trainer mon IVs to fixed average values + ld b, $88 + jr nz, .next4 + +; If the mon is being added to the player's party, update the pokedex. + ld a, [wcf91] + ld [wd11e], a + push de + predef IndexToPokedex + pop de + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_TEST + ld hl, wPokedexOwned + call FlagAction + ld a, c ; whether the mon was already flagged as owned + ld [wUnusedD153], a ; not read + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_SET + push bc + call FlagAction + pop bc + ld hl, wPokedexSeen + call FlagAction + + pop hl + push hl + + ld a, [wIsInBattle] + and a ; is this a wild mon caught in battle? + jr nz, .copyEnemyMonData + +; Not wild. + call Random ; generate random IVs + ld b, a + call Random + +.next4 + push bc + ld bc, wPartyMon1DVs - wPartyMon1 + add hl, bc + pop bc + ld [hli], a + ld [hl], b ; write IVs + ld bc, (wPartyMon1HPExp - 1) - (wPartyMon1DVs + 1) + add hl, bc + ld a, 1 + ld c, a + xor a + ld b, a + call CalcStat ; calc HP stat (set cur Hp to max HP) + ld a, [H_MULTIPLICAND+1] + ld [de], a + inc de + ld a, [H_MULTIPLICAND+2] + ld [de], a + inc de + xor a + ld [de], a ; box level + inc de + ld [de], a ; status ailments + inc de + jr .copyMonTypesAndMoves +.copyEnemyMonData + ld bc, wEnemyMon1DVs - wEnemyMon1 + add hl, bc + ld a, [wEnemyMonDVs] ; copy IVs from cur enemy mon + ld [hli], a + ld a, [wEnemyMonDVs + 1] + ld [hl], a + ld a, [wEnemyMonHP] ; copy HP from cur enemy mon + ld [de], a + inc de + ld a, [wEnemyMonHP+1] + ld [de], a + inc de + xor a + ld [de], a ; box level + inc de + ld a, [wEnemyMonStatus] ; copy status ailments from cur enemy mon + ld [de], a + inc de +.copyMonTypesAndMoves + ld hl, wMonHTypes + ld a, [hli] ; type 1 + ld [de], a + inc de + ld a, [hli] ; type 2 + ld [de], a + inc de + ld a, [hli] ; catch rate (held item in gen 2) + ld [de], a + ld hl, wMonHMoves + ld a, [hli] + inc de + push de + ld [de], a + ld a, [hli] + inc de + ld [de], a + ld a, [hli] + inc de + ld [de], a + ld a, [hli] + inc de + ld [de], a + push de + dec de + dec de + dec de + xor a + ld [wLearningMovesFromDayCare], a + predef WriteMonMoves + pop de + ld a, [wPlayerID] ; set trainer ID to player ID + inc de + ld [de], a + ld a, [wPlayerID + 1] + inc de + ld [de], a + push de + ld a, [wCurEnemyLVL] + ld d, a + callab CalcExperience + pop de + inc de + ld a, [hExperience] ; write experience + ld [de], a + inc de + ld a, [hExperience + 1] + ld [de], a + inc de + ld a, [hExperience + 2] + ld [de], a + xor a + ld b, NUM_STATS * 2 +.writeEVsLoop ; set all EVs to 0 + inc de + ld [de], a + dec b + jr nz, .writeEVsLoop + inc de + inc de + pop hl + call AddPartyMon_WriteMovePP + inc de + ld a, [wCurEnemyLVL] + ld [de], a + inc de + ld a, [wIsInBattle] + dec a + jr nz, .calcFreshStats + ld hl, wEnemyMonMaxHP + ld bc, $a + call CopyData ; copy stats of cur enemy mon + pop hl + jr .done +.calcFreshStats + pop hl + ld bc, wPartyMon1HPExp - 1 - wPartyMon1 + add hl, bc + ld b, $0 + call CalcStats ; calculate fresh set of stats +.done + scf + ret + +LoadMovePPs: + call GetPredefRegisters + ; fallthrough +AddPartyMon_WriteMovePP: + ld b, NUM_MOVES +.pploop + ld a, [hli] ; read move ID + and a + jr z, .empty + dec a + push hl + push de + push bc + ld hl, Moves + ld bc, MoveEnd - Moves + call AddNTimes + ld de, wcd6d + ld a, BANK(Moves) + call FarCopyData + pop bc + pop de + pop hl + ld a, [wcd6d + 5] ; PP is byte 5 of move data +.empty + inc de + ld [de], a + dec b + jr nz, .pploop ; there are still moves to read + ret + +; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party +; used in the cable club trade center +_AddEnemyMonToPlayerParty: + ld hl, wPartyCount + ld a, [hl] + cp PARTY_LENGTH + scf + ret z ; party full, return failure + inc a + ld [hl], a ; add 1 to party members + ld c, a + ld b, $0 + add hl, bc + ld a, [wcf91] + ld [hli], a ; add mon as last list entry + ld [hl], $ff ; write new sentinel + ld hl, wPartyMons + ld a, [wPartyCount] + dec a + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld e, l + ld d, h + ld hl, wLoadedMon + call CopyData ; write new mon's data (from wLoadedMon) + ld hl, wPartyMonOT + ld a, [wPartyCount] + dec a + call SkipFixedLengthTextEntries + ld d, h + ld e, l + ld hl, wEnemyMonOT + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries + ld bc, NAME_LENGTH + call CopyData ; write new mon's OT name (from an enemy mon) + ld hl, wPartyMonNicks + ld a, [wPartyCount] + dec a + call SkipFixedLengthTextEntries + ld d, h + ld e, l + ld hl, wEnemyMonNicks + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries + ld bc, NAME_LENGTH + call CopyData ; write new mon's nickname (from an enemy mon) + ld a, [wcf91] + ld [wd11e], a + predef IndexToPokedex + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_SET + ld hl, wPokedexOwned + push bc + call FlagAction ; add to owned pokemon + pop bc + ld hl, wPokedexSeen + call FlagAction ; add to seen pokemon + and a + ret ; return success + +_MoveMon: + ld a, [wMoveMonType] + and a + jr z, .checkPartyMonSlots + cp DAYCARE_TO_PARTY + jr z, .checkPartyMonSlots + cp PARTY_TO_DAYCARE + ld hl, wDayCareMon + jr z, .asm_f575 + ld hl, wNumInBox + ld a, [hl] + cp MONS_PER_BOX + jr nz, .partyOrBoxNotFull + jr .boxFull +.checkPartyMonSlots + ld hl, wPartyCount + ld a, [hl] + cp PARTY_LENGTH + jr nz, .partyOrBoxNotFull +.boxFull + scf + ret +.partyOrBoxNotFull + inc a + ld [hl], a ; increment number of mons in party/box + ld c, a + ld b, 0 + add hl, bc + ld a, [wMoveMonType] + cp DAYCARE_TO_PARTY + ld a, [wDayCareMon] + jr z, .asm_f556 + ld a, [wcf91] +.asm_f556 + ld [hli], a ; write new mon ID + ld [hl], $ff ; write new sentinel + ld a, [wMoveMonType] + dec a + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 ; $2c + ld a, [wPartyCount] + jr nz, .skipToNewMonEntry + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 ; $21 + ld a, [wNumInBox] +.skipToNewMonEntry + dec a + call AddNTimes +.asm_f575 + push hl + ld e, l + ld d, h + ld a, [wMoveMonType] + and a + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 ; $21 + jr z, .asm_f591 + cp DAYCARE_TO_PARTY + ld hl, wDayCareMon + jr z, .asm_f597 + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 ; $2c +.asm_f591 + ld a, [wWhichPokemon] + call AddNTimes +.asm_f597 + push hl + push de + ld bc, wBoxMon2 - wBoxMon1 + call CopyData + pop de + pop hl + ld a, [wMoveMonType] + and a + jr z, .asm_f5b4 + cp DAYCARE_TO_PARTY + jr z, .asm_f5b4 + ld bc, wBoxMon2 - wBoxMon1 + add hl, bc + ld a, [hl] + inc de + inc de + inc de + ld [de], a +.asm_f5b4 + ld a, [wMoveMonType] + cp PARTY_TO_DAYCARE + ld de, wDayCareMonOT + jr z, .asm_f5d3 + dec a + ld hl, wPartyMonOT + ld a, [wPartyCount] + jr nz, .asm_f5cd + ld hl, wBoxMonOT + ld a, [wNumInBox] +.asm_f5cd + dec a + call SkipFixedLengthTextEntries + ld d, h + ld e, l +.asm_f5d3 + ld hl, wBoxMonOT + ld a, [wMoveMonType] + and a + jr z, .asm_f5e6 + ld hl, wDayCareMonOT + cp DAYCARE_TO_PARTY + jr z, .asm_f5ec + ld hl, wPartyMonOT +.asm_f5e6 + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries +.asm_f5ec + ld bc, NAME_LENGTH + call CopyData + ld a, [wMoveMonType] + cp PARTY_TO_DAYCARE + ld de, wDayCareMonName + jr z, .asm_f611 + dec a + ld hl, wPartyMonNicks + ld a, [wPartyCount] + jr nz, .asm_f60b + ld hl, wBoxMonNicks + ld a, [wNumInBox] +.asm_f60b + dec a + call SkipFixedLengthTextEntries + ld d, h + ld e, l +.asm_f611 + ld hl, wBoxMonNicks + ld a, [wMoveMonType] + and a + jr z, .asm_f624 + ld hl, wDayCareMonName + cp DAYCARE_TO_PARTY + jr z, .asm_f62a + ld hl, wPartyMonNicks +.asm_f624 + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries +.asm_f62a + ld bc, NAME_LENGTH + call CopyData + pop hl + ld a, [wMoveMonType] + cp PARTY_TO_BOX + jr z, .asm_f664 + cp PARTY_TO_DAYCARE + jr z, .asm_f664 + push hl + srl a + add $2 + ld [wMonDataLocation], a + call LoadMonData + callba CalcLevelFromExperience + ld a, d + ld [wCurEnemyLVL], a + pop hl + ld bc, wBoxMon2 - wBoxMon1 + add hl, bc + ld [hli], a + ld d, h + ld e, l + ld bc, -18 + add hl, bc + ld b, $1 + call CalcStats +.asm_f664 + and a + ret diff --git a/engine/bcd.asm b/engine/bcd.asm new file mode 100644 index 00000000..3e693e1f --- /dev/null +++ b/engine/bcd.asm @@ -0,0 +1,212 @@ +DivideBCDPredef:: +DivideBCDPredef2:: +DivideBCDPredef3:: +DivideBCDPredef4:: + call GetPredefRegisters + +DivideBCD:: + xor a + ld [$ffa5], a + ld [$ffa6], a + ld [$ffa7], a + ld d, $1 +.asm_f72a + ld a, [$ffa2] + and $f0 + jr nz, .asm_f75b + inc d + ld a, [$ffa2] + swap a + and $f0 + ld b, a + ld a, [$ffa3] + swap a + ld [$ffa3], a + and $f + or b + ld [$ffa2], a + ld a, [$ffa3] + and $f0 + ld b, a + ld a, [$ffa4] + swap a + ld [$ffa4], a + and $f + or b + ld [$ffa3], a + ld a, [$ffa4] + and $f0 + ld [$ffa4], a + jr .asm_f72a +.asm_f75b + push de + push de + call DivideBCD_f800 + pop de + ld a, b + swap a + and $f0 + ld [$ffa5], a + dec d + jr z, .asm_f7bc + push de + call DivideBCD_f7d7 + call DivideBCD_f800 + pop de + ld a, [$ffa5] + or b + ld [$ffa5], a + dec d + jr z, .asm_f7bc + push de + call DivideBCD_f7d7 + call DivideBCD_f800 + pop de + ld a, b + swap a + and $f0 + ld [$ffa6], a + dec d + jr z, .asm_f7bc + push de + call DivideBCD_f7d7 + call DivideBCD_f800 + pop de + ld a, [$ffa6] + or b + ld [$ffa6], a + dec d + jr z, .asm_f7bc + push de + call DivideBCD_f7d7 + call DivideBCD_f800 + pop de + ld a, b + swap a + and $f0 + ld [$ffa7], a + dec d + jr z, .asm_f7bc + push de + call DivideBCD_f7d7 + call DivideBCD_f800 + pop de + ld a, [$ffa7] + or b + ld [$ffa7], a +.asm_f7bc + ld a, [$ffa5] + ld [$ffa2], a + ld a, [$ffa6] + ld [$ffa3], a + ld a, [$ffa7] + ld [$ffa4], a + pop de + ld a, $6 + sub d + and a + ret z +.asm_f7ce + push af + call DivideBCD_f7d7 + pop af + dec a + jr nz, .asm_f7ce + ret + +DivideBCD_f7d7: + ld a, [$ffa4] + swap a + and $f + ld b, a + ld a, [$ffa3] + swap a + ld [$ffa3], a + and $f0 + or b + ld [$ffa4], a + ld a, [$ffa3] + and $f + ld b, a + ld a, [$ffa2] + swap a + ld [$ffa2], a + and $f0 + or b + ld [$ffa3], a + ld a, [$ffa2] + and $f + ld [$ffa2], a + ret + +DivideBCD_f800: + ld bc, $3 +.asm_f803 + ld de, $ff9f + ld hl, $ffa2 + push bc + call StringCmp + pop bc + ret c + inc b + ld de, $ffa1 + ld hl, $ffa4 + push bc + call SubBCD + pop bc + jr .asm_f803 + + +AddBCDPredef:: + call GetPredefRegisters + +AddBCD:: + and a + ld b, c +.add + ld a, [de] + adc [hl] + daa + ld [de], a + dec de + dec hl + dec c + jr nz, .add + jr nc, .done + ld a, $99 + inc de +.fill + ld [de], a + inc de + dec b + jr nz, .fill +.done + ret + + +SubBCDPredef:: + call GetPredefRegisters + +SubBCD:: + and a + ld b, c +.sub + ld a, [de] + sbc [hl] + daa + ld [de], a + dec de + dec hl + dec c + jr nz, .sub + jr nc, .done + ld a, $00 + inc de +.fill + ld [de], a + inc de + dec b + jr nz, .fill + scf +.done + ret diff --git a/engine/cable_club.asm b/engine/cable_club.asm index fa99215e..474dbd11 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -588,7 +588,7 @@ ReturnToCableClubRoom: dec a ld [wDestinationWarpID], a call LoadMapData - callba ClearVariablesAfterLoadingMapData + callba ClearVariablesOnEnterMap pop hl pop af ld [hl], a diff --git a/engine/flag_action.asm b/engine/flag_action.asm new file mode 100644 index 00000000..dc516887 --- /dev/null +++ b/engine/flag_action.asm @@ -0,0 +1,73 @@ +FlagActionPredef: + call GetPredefRegisters + +FlagAction: +; Perform action b on bit c +; in the bitfield at hl. +; 0: reset +; 1: set +; 2: read +; Return the result in c. + + push hl + push de + push bc + + ; bit + ld a, c + ld d, a + and 7 + ld e, a + + ; byte + ld a, d + srl a + srl a + srl a + add l + ld l, a + jr nc, .ok + inc h +.ok + + ; d = 1 << e (bitmask) + inc e + ld d, 1 +.shift + dec e + jr z, .shifted + sla d + jr .shift +.shifted + + ld a, b + and a + jr z, .reset + cp 2 + jr z, .read + +.set + ld b, [hl] + ld a, d + or b + ld [hl], a + jr .done + +.reset + ld b, [hl] + ld a, d + xor $ff + and b + ld [hl], a + jr .done + +.read + ld b, [hl] + ld a, d + and b +.done + pop bc + pop de + pop hl + ld c, a + ret diff --git a/engine/get_bag_item_quantity.asm b/engine/get_bag_item_quantity.asm new file mode 100644 index 00000000..f10df1a0 --- /dev/null +++ b/engine/get_bag_item_quantity.asm @@ -0,0 +1,18 @@ +GetQuantityOfItemInBag: +; In: b = item ID +; Out: b = how many of that item are in the bag + call GetPredefRegisters + ld hl, wNumBagItems +.loop + inc hl + ld a, [hli] + cp $ff + jr z, .notInBag + cp b + jr nz, .loop + ld a, [hl] + ld b, a + ret +.notInBag + ld b, 0 + ret diff --git a/engine/heal_party.asm b/engine/heal_party.asm new file mode 100644 index 00000000..7aaa1bd1 --- /dev/null +++ b/engine/heal_party.asm @@ -0,0 +1,99 @@ +HealParty: +; Restore HP and PP. + + ld hl, wPartySpecies + ld de, wPartyMon1HP +.healmon + ld a, [hli] + cp $ff + jr z, .done + + push hl + push de + + ld hl, wPartyMon1Status - wPartyMon1HP + add hl, de + xor a + ld [hl], a + + push de + ld b, NUM_MOVES ; A Pokémon has 4 moves +.pp + ld hl, wPartyMon1Moves - wPartyMon1HP + add hl, de + + ld a, [hl] + and a + jr z, .nextmove + + dec a + ld hl, wPartyMon1PP - wPartyMon1HP + add hl, de + + push hl + push de + push bc + + ld hl, Moves + ld bc, MoveEnd - Moves + call AddNTimes + ld de, wcd6d + ld a, BANK(Moves) + call FarCopyData + ld a, [wcd6d + 5] ; PP is byte 5 of move data + + pop bc + pop de + pop hl + + inc de + push bc + ld b, a + ld a, [hl] + and $c0 + add b + ld [hl], a + pop bc + +.nextmove + dec b + jr nz, .pp + pop de + + ld hl, wPartyMon1MaxHP - wPartyMon1HP + add hl, de + ld a, [hli] + ld [de], a + inc de + ld a, [hl] + ld [de], a + + pop de + pop hl + + push hl + ld bc, wPartyMon2 - wPartyMon1 + ld h, d + ld l, e + add hl, bc + ld d, h + ld e, l + pop hl + jr .healmon + +.done + xor a + ld [wWhichPokemon], a + ld [wd11e], a + + ld a, [wPartyCount] + ld b, a +.ppup + push bc + call RestoreBonusPP + pop bc + ld hl, wWhichPokemon + inc [hl] + dec b + jr nz, .ppup + ret diff --git a/engine/init_player_data.asm b/engine/init_player_data.asm new file mode 100644 index 00000000..c576e65a --- /dev/null +++ b/engine/init_player_data.asm @@ -0,0 +1,55 @@ +InitPlayerData: +InitPlayerData2: + + call Random + ld a, [hRandomSub] + ld [wPlayerID], a + + call Random + ld a, [hRandomAdd] + ld [wPlayerID + 1], a + + ld a, $ff + ld [wUnusedD71B], a + + ld hl, wPartyCount + call InitializeEmptyList + ld hl, wNumInBox + call InitializeEmptyList + ld hl, wNumBagItems + call InitializeEmptyList + ld hl, wNumBoxItems + call InitializeEmptyList + +START_MONEY EQU $3000 + ld hl, wPlayerMoney + 1 + ld a, START_MONEY / $100 + ld [hld], a + xor a + ld [hli], a + inc hl + ld [hl], a + + ld [wMonDataLocation], a + + ld hl, wObtainedBadges + ld [hli], a + + ld [hl], a + + ld hl, wPlayerCoins + ld [hli], a + ld [hl], a + + ld hl, wGameProgressFlags + ld bc, wGameProgressFlagsEnd - wGameProgressFlags + call FillMemory ; clear all game progress flags + + jp InitializeMissableObjectsFlags + +InitializeEmptyList: + xor a ; count + ld [hli], a + dec a ; terminator + ld [hl], a + ret diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm new file mode 100644 index 00000000..1294ed8d --- /dev/null +++ b/engine/items/inventory.asm @@ -0,0 +1,150 @@ +; function to add an item (in varying quantities) to the player's bag or PC box +; INPUT: +; hl = address of inventory (either wNumBagItems or wNumBoxItems) +; [wcf91] = item ID +; [wItemQuantity] = item quantity +; sets carry flag if successful, unsets carry flag if unsuccessful +AddItemToInventory_: + ld a,[wItemQuantity] ; a = item quantity + push af + push bc + push de + push hl + push hl + ld d,PC_ITEM_CAPACITY ; how many items the PC can hold + ld a,wNumBagItems & $FF + cp l + jr nz,.checkIfInventoryFull + ld a,wNumBagItems >> 8 + cp h + jr nz,.checkIfInventoryFull +; if the destination is the bag + ld d,BAG_ITEM_CAPACITY ; how many items the bag can hold +.checkIfInventoryFull + ld a,[hl] + sub d + ld d,a + ld a,[hli] + and a + jr z,.addNewItem +.loop + ld a,[hli] + ld b,a ; b = ID of current item in table + ld a,[wcf91] ; a = ID of item being added + cp b ; does the current item in the table match the item being added? + jp z,.increaseItemQuantity ; if so, increase the item's quantity + inc hl + ld a,[hl] + cp a,$ff ; is it the end of the table? + jr nz,.loop +.addNewItem ; add an item not yet in the inventory + pop hl + ld a,d + and a ; is there room for a new item slot? + jr z,.done +; if there is room + inc [hl] ; increment the number of items in the inventory + ld a,[hl] ; the number of items will be the index of the new item + add a + dec a + ld c,a + ld b,0 + add hl,bc ; hl = address to store the item + ld a,[wcf91] + ld [hli],a ; store item ID + ld a,[wItemQuantity] + ld [hli],a ; store item quantity + ld [hl],$ff ; store terminator + jp .success +.increaseItemQuantity ; increase the quantity of an item already in the inventory + ld a,[wItemQuantity] + ld b,a ; b = quantity to add + ld a,[hl] ; a = existing item quantity + add b ; a = new item quantity + cp a,100 + jp c,.storeNewQuantity ; if the new quantity is less than 100, store it +; if the new quantity is greater than or equal to 100, +; try to max out the current slot and add the rest in a new slot + sub a,99 + ld [wItemQuantity],a ; a = amount left over (to put in the new slot) + ld a,d + and a ; is there room for a new item slot? + jr z,.increaseItemQuantityFailed +; if so, store 99 in the current slot and store the rest in a new slot + ld a,99 + ld [hli],a + jp .loop +.increaseItemQuantityFailed + pop hl + and a + jr .done +.storeNewQuantity + ld [hl],a + pop hl +.success + scf +.done + pop hl + pop de + pop bc + pop bc + ld a,b + ld [wItemQuantity],a ; restore the initial value from when the function was called + ret + +; function to remove an item (in varying quantities) from the player's bag or PC box +; INPUT: +; hl = address of inventory (either wNumBagItems or wNumBoxItems) +; [wWhichPokemon] = index (within the inventory) of the item to remove +; [wItemQuantity] = quantity to remove +RemoveItemFromInventory_: + push hl + inc hl + ld a,[wWhichPokemon] ; index (within the inventory) of the item being removed + sla a + add l + ld l,a + jr nc,.noCarry + inc h +.noCarry + inc hl + ld a,[wItemQuantity] ; quantity being removed + ld e,a + ld a,[hl] ; a = current quantity + sub e + ld [hld],a ; store new quantity + ld [wMaxItemQuantity],a + and a + jr nz,.skipMovingUpSlots +; if the remaining quantity is 0, +; remove the emptied item slot and move up all the following item slots +.moveSlotsUp + ld e,l + ld d,h + inc de + inc de ; de = address of the slot following the emptied one +.loop ; loop to move up the following slots + ld a,[de] + inc de + ld [hli],a + cp a,$ff + jr nz,.loop +; update menu info + xor a + ld [wListScrollOffset],a + ld [wCurrentMenuItem],a + ld [wBagSavedMenuItem],a + ld [wSavedListScrollOffset],a + pop hl + 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 [wListCount],a + cp a,2 + jr c,.done + ld [wMaxMenuItem],a + jr .done +.skipMovingUpSlots + pop hl +.done + ret diff --git a/engine/menu/draw_badges.asm b/engine/menu/draw_badges.asm new file mode 100644 index 00000000..9e6262a0 --- /dev/null +++ b/engine/menu/draw_badges.asm @@ -0,0 +1,120 @@ +DrawBadges: +; Draw 4x2 gym leader faces, with the faces replaced by +; badges if they are owned. Used in the player status screen. + +; In Japanese versions, names are displayed above faces. +; Instead of removing relevant code, the name graphics were erased. + +; Tile ids for face/badge graphics. + ld de, wBadgeOrFaceTiles + ld hl, .FaceBadgeTiles + ld bc, 8 + call CopyData + +; Booleans for each badge. + ld hl, wTempObtainedBadgesBooleans + ld bc, 8 + xor a + call FillMemory + +; Alter these based on owned badges. + ld de, wTempObtainedBadgesBooleans + ld hl, wBadgeOrFaceTiles + ld a, [wObtainedBadges] + ld b, a + ld c, 8 +.CheckBadge + srl b + jr nc, .NextBadge + ld a, [hl] + add 4 ; Badge graphics are after each face + ld [hl], a + ld a, 1 + ld [de], a +.NextBadge + inc hl + inc de + dec c + jr nz, .CheckBadge + +; Draw two rows of badges. + ld hl, wBadgeNumberTile + ld a, $d8 ; [1] + ld [hli], a + ld [hl], $60 ; First name + + coord hl, 2, 11 + ld de, wTempObtainedBadgesBooleans + call .DrawBadgeRow + + coord hl, 2, 14 + ld de, wTempObtainedBadgesBooleans + 4 +; call .DrawBadgeRow +; ret + +.DrawBadgeRow +; Draw 4 badges. + + ld c, 4 +.DrawBadge + push de + push hl + +; Badge no. + ld a, [wBadgeNumberTile] + ld [hli], a + inc a + ld [wBadgeNumberTile], a + +; Names aren't printed if the badge is owned. + ld a, [de] + and a + ld a, [wBadgeNameTile] + jr nz, .SkipName + call .PlaceTiles + jr .PlaceBadge + +.SkipName + inc a + inc a + inc hl + +.PlaceBadge + ld [wBadgeNameTile], a + ld de, SCREEN_WIDTH - 1 + add hl, de + ld a, [wBadgeOrFaceTiles] + call .PlaceTiles + add hl, de + call .PlaceTiles + +; Shift badge array back one byte. + push bc + ld hl, wBadgeOrFaceTiles + 1 + ld de, wBadgeOrFaceTiles + ld bc, 8 + call CopyData + pop bc + + pop hl + ld de, 4 + add hl, de + + pop de + inc de + dec c + jr nz, .DrawBadge + ret + +.PlaceTiles + ld [hli], a + inc a + ld [hl], a + inc a + ret + +.FaceBadgeTiles + db $20, $28, $30, $38, $40, $48, $50, $58 + +GymLeaderFaceAndBadgeTileGraphics: + INCBIN "gfx/badges.2bpp" diff --git a/engine/overworld/clear_variables.asm b/engine/overworld/clear_variables.asm new file mode 100644 index 00000000..9a59cc7c --- /dev/null +++ b/engine/overworld/clear_variables.asm @@ -0,0 +1,20 @@ +ClearVariablesOnEnterMap: + ld a, SCREEN_HEIGHT_PIXELS + ld [hWY], a + ld [rWY], a + xor a + ld [H_AUTOBGTRANSFERENABLED], a + ld [wStepCounter], a + ld [wLoneAttackNo], a + ld [hJoyPressed], a + ld [hJoyReleased], a + ld [hJoyHeld], a + ld [wActionResultOrTookBattleTurn], a + ld [wUnusedD5A3], a + ld hl, wCardKeyDoorY + ld [hli], a + ld [hl], a + ld hl, wWhichTrade + ld bc, wStandingOnWarpPadOrHole - wWhichTrade + call FillMemory + ret diff --git a/engine/overworld/daycare_exp.asm b/engine/overworld/daycare_exp.asm new file mode 100644 index 00000000..dbe4023a --- /dev/null +++ b/engine/overworld/daycare_exp.asm @@ -0,0 +1,18 @@ +IncrementDayCareMonExp: + ld a, [wDayCareInUse] + and a + ret z + ld hl, wDayCareMonExp + 2 + inc [hl] + ret nz + dec hl + inc [hl] + ret nz + dec hl + inc [hl] + ld a, [hl] + cp $50 + ret c + ld a, $50 + ld [hl], a + ret diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm new file mode 100644 index 00000000..69914bfc --- /dev/null +++ b/engine/overworld/field_move_messages.asm @@ -0,0 +1,57 @@ +PrintStrengthTxt: + ld hl, wd728 + set 0, [hl] + ld hl, UsedStrengthText + call PrintText + ld hl, CanMoveBouldersText + jp PrintText + +UsedStrengthText: + TX_FAR _UsedStrengthText + TX_ASM + ld a, [wcf91] + call PlayCry + call Delay3 + jp TextScriptEnd + +CanMoveBouldersText: + TX_FAR _CanMoveBouldersText + db "@" + +IsSurfingAllowed: +; Returns whether surfing is allowed in bit 1 of wd728. +; Surfing isn't allowed on the Cycling Road or in the lowest level of the +; Seafoam Islands before the current has been slowed with boulders. + ld hl, wd728 + set 1, [hl] + ld a, [wd732] + bit 5, a + jr nz, .forcedToRideBike + ld a, [wCurMap] + cp SEAFOAM_ISLANDS_5 + ret nz + CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE + ret z + ld hl, CoordsData_cdf7 + call ArePlayerCoordsInArray + ret nc + ld hl, wd728 + res 1, [hl] + ld hl, CurrentTooFastText + jp PrintText +.forcedToRideBike + ld hl, wd728 + res 1, [hl] + ld hl, CyclingIsFunText + jp PrintText + +CoordsData_cdf7: + db $0B,$07,$FF + +CurrentTooFastText: + TX_FAR _CurrentTooFastText + db "@" + +CyclingIsFunText: + TX_FAR _CyclingIsFunText + db "@" diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm new file mode 100644 index 00000000..8587c0f7 --- /dev/null +++ b/engine/overworld/missable_objects.asm @@ -0,0 +1,215 @@ +MarkTownVisitedAndLoadMissableObjects: + ld a, [wCurMap] + cp ROUTE_1 + jr nc, .notInTown + ld c, a + ld b, FLAG_SET + ld hl, wTownVisitedFlag ; mark town as visited (for flying) + predef FlagActionPredef +.notInTown + ld hl, MapHSPointers + ld a, [wCurMap] + ld b, $0 + ld c, a + add hl, bc + add hl, bc + ld a, [hli] ; load missable objects pointer in hl + ld h, [hl] + ; fall through + +LoadMissableObjects: + ld l, a + push hl + ld de, MapHS00 ; calculate difference between out pointer and the base pointer + ld a, l + sub e + jr nc, .asm_f13c + dec h +.asm_f13c + ld l, a + ld a, h + sub d + ld h, a + ld a, h + ld [H_DIVIDEND], a + ld a, l + ld [H_DIVIDEND+1], a + xor a + ld [H_DIVIDEND+2], a + ld [H_DIVIDEND+3], a + ld a, $3 + 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, [wCurMap] + ld b, a + ld a, [H_DIVIDEND+3] + ld c, a ; store global offset in c + ld de, wMissableObjectList + pop hl +.writeMissableObjectsListLoop + ld a, [hli] + cp $ff + jr z, .done ; end of list + cp b + jr nz, .done ; not for current map anymore + ld a, [hli] + inc hl + ld [de], a ; write (map-local) sprite ID + inc de + ld a, c + inc c + ld [de], a ; write (global) missable object index + inc de + jr .writeMissableObjectsListLoop +.done + ld a, $ff + ld [de], a ; write sentinel + ret + +InitializeMissableObjectsFlags: + ld hl, wMissableObjectFlags + ld bc, wMissableObjectFlagsEnd - wMissableObjectFlags + xor a + call FillMemory ; clear missable objects flags + ld hl, MapHS00 + xor a + ld [wMissableObjectCounter], a +.missableObjectsLoop + ld a, [hli] + cp $ff ; end of list + ret z + push hl + inc hl + ld a, [hl] + cp Hide + jr nz, .skip + ld hl, wMissableObjectFlags + ld a, [wMissableObjectCounter] + ld c, a + ld b, FLAG_SET + call MissableObjectFlagAction ; set flag if Item is hidden +.skip + ld hl, wMissableObjectCounter + inc [hl] + pop hl + inc hl + inc hl + jr .missableObjectsLoop + +; tests if current sprite is a missable object that is hidden/has been removed +IsObjectHidden: + ld a, [H_CURRENTSPRITEOFFSET] + swap a + ld b, a + ld hl, wMissableObjectList +.loop + ld a, [hli] + cp $ff + jr z, .notHidden ; not missable -> not hidden + cp b + ld a, [hli] + jr nz, .loop + ld c, a + ld b, FLAG_TEST + ld hl, wMissableObjectFlags + call MissableObjectFlagAction + ld a, c + and a + jr nz, .hidden +.notHidden + xor a +.hidden + ld [$ffe5], a + ret + +; adds missable object (items, leg. pokemon, etc.) to the map +; [wMissableObjectIndex]: index of the missable object to be added (global index) +ShowObject: +ShowObject2: + ld hl, wMissableObjectFlags + ld a, [wMissableObjectIndex] + ld c, a + ld b, FLAG_RESET + call MissableObjectFlagAction ; reset "removed" flag + jp UpdateSprites + +; removes missable object (items, leg. pokemon, etc.) from the map +; [wMissableObjectIndex]: index of the missable object to be removed (global index) +HideObject: + ld hl, wMissableObjectFlags + ld a, [wMissableObjectIndex] + ld c, a + ld b, FLAG_SET + call MissableObjectFlagAction ; set "removed" flag + jp UpdateSprites + +MissableObjectFlagAction: +; identical to FlagAction + + push hl + push de + push bc + + ; bit + ld a, c + ld d, a + and 7 + ld e, a + + ; byte + ld a, d + srl a + srl a + srl a + add l + ld l, a + jr nc, .ok + inc h +.ok + + ; d = 1 << e (bitmask) + inc e + ld d, 1 +.shift + dec e + jr z, .shifted + sla d + jr .shift +.shifted + + ld a, b + and a + jr z, .reset + cp 2 + jr z, .read + +.set + ld a, [hl] + ld b, a + ld a, d + or b + ld [hl], a + jr .done + +.reset + ld a, [hl] + ld b, a + ld a, d + xor $ff + and b + ld [hl], a + jr .done + +.read + ld a, [hl] + ld b, a + ld a, d + and b + +.done + pop bc + pop de + pop hl + ld c, a + ret diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm new file mode 100644 index 00000000..79f755b9 --- /dev/null +++ b/engine/overworld/player_state.asm @@ -0,0 +1,463 @@ +; only used for setting bit 2 of wd736 upon entering a new map +IsPlayerStandingOnWarp: + ld a, [wNumberOfWarps] + and a + ret z + ld c, a + ld hl, wWarpEntries +.loop + ld a, [wYCoord] + cp [hl] + jr nz, .nextWarp1 + inc hl + ld a, [wXCoord] + cp [hl] + jr nz, .nextWarp2 + inc hl + ld a, [hli] ; target warp + ld [wDestinationWarpID], a + ld a, [hl] ; target map + ld [hWarpDestinationMap], a + ld hl, wd736 + set 2, [hl] ; standing on warp flag + ret +.nextWarp1 + inc hl +.nextWarp2 + inc hl + inc hl + inc hl + dec c + jr nz, .loop + ret + +CheckForceBikeOrSurf: + ld hl, wd732 + bit 5, [hl] + ret nz + ld hl, ForcedBikeOrSurfMaps + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a + ld a, [wCurMap] + ld d, a +.loop + ld a, [hli] + cp $ff + ret z ;if we reach FF then it's not part of the list + cp d ;compare to current map + jr nz, .incorrectMap + ld a, [hli] + cp b ;compare y-coord + jr nz, .incorrectY + ld a, [hli] + cp c ;compare x-coord + jr nz, .loop ; incorrect x-coord, check next item + ld a, [wCurMap] + cp SEAFOAM_ISLANDS_4 + ld a, $2 + ld [wSeafoamIslands4CurScript], a + jr z, .forceSurfing + ld a, [wCurMap] + cp SEAFOAM_ISLANDS_5 + ld a, $2 + ld [wSeafoamIslands5CurScript], a + jr z, .forceSurfing + ;force bike riding + ld hl, wd732 + set 5, [hl] + ld a, $1 + ld [wWalkBikeSurfState], a + ld [wWalkBikeSurfStateCopy], a + jp ForceBikeOrSurf +.incorrectMap + inc hl +.incorrectY + inc hl + jr .loop +.forceSurfing + ld a, $2 + ld [wWalkBikeSurfState], a + ld [wWalkBikeSurfStateCopy], a + jp ForceBikeOrSurf + +INCLUDE "data/force_bike_surf.asm" + +IsPlayerFacingEdgeOfMap: + push hl + push de + push bc + ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + srl a + ld c, a + ld b, $0 + ld hl, .functionPointerTable + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a + ld de, .asm_c41e + push de + jp [hl] +.asm_c41e + pop bc + pop de + pop hl + ret + +.functionPointerTable + dw .facingDown + dw .facingUp + dw .facingLeft + dw .facingRight + +.facingDown + ld a, [wCurMapHeight] + add a + dec a + cp b + jr z, .setCarry + jr .resetCarry + +.facingUp + ld a, b + and a + jr z, .setCarry + jr .resetCarry + +.facingLeft + ld a, c + and a + jr z, .setCarry + jr .resetCarry + +.facingRight + ld a, [wCurMapWidth] + add a + dec a + cp c + jr z, .setCarry + jr .resetCarry +.resetCarry + and a + ret +.setCarry + scf + ret + +IsWarpTileInFrontOfPlayer: + push hl + push de + push bc + call _GetTileAndCoordsInFrontOfPlayer + ld a, [wCurMap] + cp SS_ANNE_5 + jr z, .ssAnne5 + ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + srl a + ld c, a + ld b, 0 + ld hl, .warpTileListPointers + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wTileInFrontOfPlayer] + ld de, $1 + call IsInArray +.done + pop bc + pop de + pop hl + ret + +.warpTileListPointers: + dw .facingDownWarpTiles + dw .facingUpWarpTiles + dw .facingLeftWarpTiles + dw .facingRightWarpTiles + +.facingDownWarpTiles + db $01,$12,$17,$3D,$04,$18,$33,$FF + +.facingUpWarpTiles + db $01,$5C,$FF + +.facingLeftWarpTiles + db $1A,$4B,$FF + +.facingRightWarpTiles + db $0F,$4E,$FF + +.ssAnne5 + ld a, [wTileInFrontOfPlayer] + cp $15 + jr nz, .notSSAnne5Warp + scf + jr .done +.notSSAnne5Warp + and a + jr .done + +IsPlayerStandingOnDoorTileOrWarpTile: + push hl + push de + push bc + callba IsPlayerStandingOnDoorTile + jr c, .done + ld a, [wCurMapTileset] + add a + ld c, a + ld b, $0 + ld hl, WarpTileIDPointers + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, $1 + aCoord 8, 9 + call IsInArray + jr nc, .done + ld hl, wd736 + res 2, [hl] +.done + pop bc + pop de + pop hl + ret + +INCLUDE "data/warp_tile_ids.asm" + +PrintSafariZoneSteps: + ld a, [wCurMap] + cp SAFARI_ZONE_EAST + ret c + cp UNKNOWN_DUNGEON_2 + ret nc + coord hl, 0, 0 + ld b, 3 + ld c, 7 + call TextBoxBorder + coord hl, 1, 1 + ld de, wSafariSteps + lb bc, 2, 3 + call PrintNumber + coord hl, 4, 1 + ld de, SafariSteps + call PlaceString + coord hl, 1, 3 + ld de, SafariBallText + call PlaceString + ld a, [wNumSafariBalls] + cp 10 + jr nc, .asm_c56d + coord hl, 5, 3 + ld a, " " + ld [hl], a +.asm_c56d + coord hl, 6, 3 + ld de, wNumSafariBalls + lb bc, 1, 2 + jp PrintNumber + +SafariSteps: + db "/500@" + +SafariBallText: + db "BALL×× @" + +GetTileAndCoordsInFrontOfPlayer: + call GetPredefRegisters + +_GetTileAndCoordsInFrontOfPlayer: + ld a, [wYCoord] + ld d, a + ld a, [wXCoord] + ld e, a + ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + and a ; cp SPRITE_FACING_DOWN + jr nz, .notFacingDown +; facing down + aCoord 8, 11 + inc d + jr .storeTile +.notFacingDown + cp SPRITE_FACING_UP + jr nz, .notFacingUp +; facing up + aCoord 8, 7 + dec d + jr .storeTile +.notFacingUp + cp SPRITE_FACING_LEFT + jr nz, .notFacingLeft +; facing left + aCoord 6, 9 + dec e + jr .storeTile +.notFacingLeft + cp SPRITE_FACING_RIGHT + jr nz, .storeTile +; facing right + aCoord 10, 9 + inc e +.storeTile + ld c, a + ld [wTileInFrontOfPlayer], a + ret + +GetTileTwoStepsInFrontOfPlayer: + xor a + ld [$ffdb], a + ld hl, wYCoord + ld a, [hli] + ld d, a + ld e, [hl] + ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + and a ; cp SPRITE_FACING_DOWN + jr nz, .notFacingDown +; facing down + ld hl, $ffdb + set 0, [hl] + aCoord 8, 13 + inc d + jr .storeTile +.notFacingDown + cp SPRITE_FACING_UP + jr nz, .notFacingUp +; facing up + ld hl, $ffdb + set 1, [hl] + aCoord 8, 5 + dec d + jr .storeTile +.notFacingUp + cp SPRITE_FACING_LEFT + jr nz, .notFacingLeft +; facing left + ld hl, $ffdb + set 2, [hl] + aCoord 4, 9 + dec e + jr .storeTile +.notFacingLeft + cp SPRITE_FACING_RIGHT + jr nz, .storeTile +; facing right + ld hl, $ffdb + set 3, [hl] + aCoord 12, 9 + inc e +.storeTile + ld c, a + ld [wTileInFrontOfBoulderAndBoulderCollisionResult], a + ld [wTileInFrontOfPlayer], a + ret + +CheckForCollisionWhenPushingBoulder: + call GetTileTwoStepsInFrontOfPlayer + ld hl, wTilesetCollisionPtr + ld a, [hli] + ld h, [hl] + ld l, a +.loop + ld a, [hli] + cp $ff + jr z, .done ; if the tile two steps ahead is not passable + cp c + jr nz, .loop + ld hl, TilePairCollisionsLand + call CheckForTilePairCollisions2 + ld a, $ff + jr c, .done ; if there is an elevation difference between the current tile and the one two steps ahead + ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult] + cp $15 ; stairs tile + ld a, $ff + jr z, .done ; if the tile two steps ahead is stairs + call CheckForBoulderCollisionWithSprites +.done + ld [wTileInFrontOfBoulderAndBoulderCollisionResult], a + ret + +; sets a to $ff if there is a collision and $00 if there is no collision +CheckForBoulderCollisionWithSprites: + ld a, [wBoulderSpriteIndex] + dec a + swap a + ld d, 0 + ld e, a + ld hl, wSpriteStateData2 + $14 + add hl, de + ld a, [hli] ; map Y position + ld [$ffdc], a + ld a, [hl] ; map X position + ld [$ffdd], a + ld a, [wNumSprites] + ld c, a + ld de, $f + ld hl, wSpriteStateData2 + $14 + ld a, [$ffdb] + and $3 ; facing up or down? + jr z, .pushingHorizontallyLoop +.pushingVerticallyLoop + inc hl + ld a, [$ffdd] + cp [hl] + jr nz, .nextSprite1 ; if X coordinates don't match + dec hl + ld a, [hli] + ld b, a + ld a, [$ffdb] + rrca + jr c, .pushingDown +; pushing up + ld a, [$ffdc] + dec a + jr .compareYCoords +.pushingDown + ld a, [$ffdc] + inc a +.compareYCoords + cp b + jr z, .failure +.nextSprite1 + dec c + jr z, .success + add hl, de + jr .pushingVerticallyLoop +.pushingHorizontallyLoop + ld a, [hli] + ld b, a + ld a, [$ffdc] + cp b + jr nz, .nextSprite2 + ld b, [hl] + ld a, [$ffdb] + bit 2, a + jr nz, .pushingLeft +; pushing right + ld a, [$ffdd] + inc a + jr .compareXCoords +.pushingLeft + ld a, [$ffdd] + dec a +.compareXCoords + cp b + jr z, .failure +.nextSprite2 + dec c + jr z, .success + add hl, de + jr .pushingHorizontallyLoop +.failure + ld a, $ff + ret +.success + xor a + ret diff --git a/engine/overworld/poison.asm b/engine/overworld/poison.asm new file mode 100644 index 00000000..75f68568 --- /dev/null +++ b/engine/overworld/poison.asm @@ -0,0 +1,112 @@ +ApplyOutOfBattlePoisonDamage: + ld a, [wd730] + add a + jp c, .noBlackOut ; no black out if joypad states are being simulated + ld a, [wPartyCount] + and a + jp z, .noBlackOut + call IncrementDayCareMonExp + ld a, [wStepCounter] + and $3 ; is the counter a multiple of 4? + jp nz, .noBlackOut ; only apply poison damage every fourth step + ld [wWhichPokemon], a + ld hl, wPartyMon1Status + ld de, wPartySpecies +.applyDamageLoop + ld a, [hl] + and (1 << PSN) + jr z, .nextMon2 ; not poisoned + dec hl + dec hl + ld a, [hld] + ld b, a + ld a, [hli] + or b + jr z, .nextMon ; already fainted +; subtract 1 from HP + ld a, [hl] + dec a + ld [hld], a + inc a + jr nz, .noBorrow +; borrow 1 from upper byte of HP + dec [hl] + inc hl + jr .nextMon +.noBorrow + ld a, [hli] + or [hl] + jr nz, .nextMon ; didn't faint from damage +; the mon fainted from the damage + push hl + inc hl + inc hl + ld [hl], a + ld a, [de] + ld [wd11e], a + push de + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks + call GetPartyMonName + xor a + ld [wJoyIgnore], a + call EnableAutoTextBoxDrawing + ld a, $d0 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + pop de + pop hl +.nextMon + inc hl + inc hl +.nextMon2 + inc de + ld a, [de] + inc a + jr z, .applyDamageLoopDone + ld bc, wPartyMon2 - wPartyMon1 + add hl, bc + push hl + ld hl, wWhichPokemon + inc [hl] + pop hl + jr .applyDamageLoop +.applyDamageLoopDone + ld hl, wPartyMon1Status + ld a, [wPartyCount] + ld d, a + ld e, 0 +.countPoisonedLoop + ld a, [hl] + and (1 << PSN) + or e + ld e, a + ld bc, wPartyMon2 - wPartyMon1 + add hl, bc + dec d + jr nz, .countPoisonedLoop + ld a, e + and a ; are any party members poisoned? + jr z, .skipPoisonEffectAndSound + ld b, $2 + predef ChangeBGPalColor0_4Frames ; change BG white to dark grey for 4 frames + ld a, SFX_POISONED + call PlaySound +.skipPoisonEffectAndSound + predef AnyPartyAlive + ld a, d + and a + jr nz, .noBlackOut + call EnableAutoTextBoxDrawing + ld a, $d1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wd72e + set 5, [hl] + ld a, $ff + jr .done +.noBlackOut + xor a +.done + ld [wOutOfBattleBlackout], a + ret diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm new file mode 100644 index 00000000..c91605a8 --- /dev/null +++ b/engine/overworld/push_boulder.asm @@ -0,0 +1,105 @@ +TryPushingBoulder: + ld a, [wd728] + bit 0, a ; using Strength? + ret z + ld a, [wFlags_0xcd60] + bit 1, a ; has boulder dust animation from previous push played yet? + ret nz + xor a + ld [hSpriteIndexOrTextID], a + call IsSpriteInFrontOfPlayer + ld a, [hSpriteIndexOrTextID] + ld [wBoulderSpriteIndex], a + and a + jp z, ResetBoulderPushFlags + ld hl, wSpriteStateData1 + 1 + ld d, $0 + ld a, [hSpriteIndexOrTextID] + swap a + ld e, a + add hl, de + res 7, [hl] + call GetSpriteMovementByte2Pointer + ld a, [hl] + cp BOULDER_MOVEMENT_BYTE_2 + jp nz, ResetBoulderPushFlags + ld hl, wFlags_0xcd60 + bit 6, [hl] + 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 D_RIGHT | D_LEFT | D_UP | D_DOWN + ret z + predef CheckForCollisionWhenPushingBoulder + ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult] + and a ; was there a collision? + jp nz, ResetBoulderPushFlags + ld a, [hJoyHeld] + ld b, a + ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + cp SPRITE_FACING_UP + jr z, .pushBoulderUp + cp SPRITE_FACING_LEFT + jr z, .pushBoulderLeft + cp SPRITE_FACING_RIGHT + jr z, .pushBoulderRight +.pushBoulderDown + bit 7, b + ret z + ld de, PushBoulderDownMovementData + jr .done +.pushBoulderUp + bit 6, b + ret z + ld de, PushBoulderUpMovementData + jr .done +.pushBoulderLeft + bit 5, b + ret z + ld de, PushBoulderLeftMovementData + jr .done +.pushBoulderRight + bit 4, b + ret z + ld de, PushBoulderRightMovementData +.done + call MoveSprite + ld a, SFX_PUSH_BOULDER + call PlaySound + ld hl, wFlags_0xcd60 + set 1, [hl] + ret + +PushBoulderUpMovementData: + db NPC_MOVEMENT_UP,$FF + +PushBoulderDownMovementData: + db NPC_MOVEMENT_DOWN,$FF + +PushBoulderLeftMovementData: + db NPC_MOVEMENT_LEFT,$FF + +PushBoulderRightMovementData: + db NPC_MOVEMENT_RIGHT,$FF + +DoBoulderDustAnimation: + ld a, [wd730] + bit 0, a + ret nz + callab AnimateBoulderDust + call DiscardButtonPresses + ld [wJoyIgnore], a + call ResetBoulderPushFlags + set 7, [hl] + ld a, [wBoulderSpriteIndex] + ld [H_SPRITEINDEX], a + call GetSpriteMovementByte2Pointer + ld [hl], $10 + ld a, SFX_CUT + jp PlaySound + +ResetBoulderPushFlags: + ld hl, wFlags_0xcd60 + res 1, [hl] + res 6, [hl] + ret diff --git a/engine/overworld/tileset_header.asm b/engine/overworld/tileset_header.asm new file mode 100644 index 00000000..6e33974f --- /dev/null +++ b/engine/overworld/tileset_header.asm @@ -0,0 +1,60 @@ +LoadTilesetHeader: + call GetPredefRegisters + push hl + ld d, 0 + ld a, [wCurMapTileset] + add a + add a + ld b, a + add a + add b ; a = tileset * 12 + jr nc, .noCarry + inc d +.noCarry + ld e, a + ld hl, Tilesets + add hl, de + ld de, wTilesetBank + ld c, $b +.copyTilesetHeaderLoop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyTilesetHeaderLoop + ld a, [hl] + ld [hTilesetType], a + xor a + ld [$ffd8], a + pop hl + ld a, [wCurMapTileset] + push hl + push de + ld hl, DungeonTilesets + ld de, $1 + call IsInArray + pop de + pop hl + jr c, .asm_c797 + ld a, [wCurMapTileset] + ld b, a + ld a, [hPreviousTileset] + cp b + jr z, .done +.asm_c797 + ld a, [wDestinationWarpID] + cp $ff + jr z, .done + call LoadDestinationWarpPosition + ld a, [wYCoord] + and $1 + ld [wYBlockCoord], a + ld a, [wXCoord] + and $1 + ld [wXBlockCoord], a +.done + ret + +INCLUDE "data/dungeon_tilesets.asm" + +INCLUDE "data/tileset_headers.asm" diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm new file mode 100644 index 00000000..8577b9e7 --- /dev/null +++ b/engine/overworld/update_map.asm @@ -0,0 +1,126 @@ +; replaces a tile block with the one specified in [wNewTileBlockID] +; and redraws the map view if necessary +; b = Y +; c = X +ReplaceTileBlock: + call GetPredefRegisters + ld hl, wOverworldMap + ld a, [wCurMapWidth] + add $6 + ld e, a + ld d, $0 + add hl, de + add hl, de + add hl, de + ld e, $3 + add hl, de + ld e, a + ld a, b + and a + jr z, .addX +; add width * Y +.addWidthYTimesLoop + add hl, de + dec b + jr nz, .addWidthYTimesLoop +.addX + add hl, bc ; add X + ld a, [wNewTileBlockID] + ld [hl], a + ld a, [wCurrentTileBlockMapViewPointer] + ld c, a + ld a, [wCurrentTileBlockMapViewPointer + 1] + ld b, a + call CompareHLWithBC + ret c ; return if the replaced tile block is below the map view in memory + push hl + ld l, e + ld h, $0 + ld e, $6 + ld d, h + add hl, hl + add hl, hl + add hl, de + add hl, bc + pop bc + call CompareHLWithBC + ret c ; return if the replaced tile block is above the map view in memory + +RedrawMapView: + ld a, [wIsInBattle] + inc a + ret z + ld a, [H_AUTOBGTRANSFERENABLED] + push af + ld a, [hTilesetType] + push af + xor a + ld [H_AUTOBGTRANSFERENABLED], a + ld [hTilesetType], a ; no flower/water BG tile animations + call LoadCurrentMapView + call RunDefaultPaletteCommand + ld hl, wMapViewVRAMPointer + ld a, [hli] + ld h, [hl] + ld l, a + ld de, -2 * 32 + add hl, de + ld a, h + and $3 + or $98 + ld a, l + ld [wBuffer], a + ld a, h + ld [wBuffer + 1], a ; this copy of the address is not used + ld a, 2 + ld [$ffbe], a + ld c, 9 ; number of rows of 2x2 tiles (this covers the whole screen) +.redrawRowLoop + push bc + push hl + push hl + ld hl, wTileMap - 2 * SCREEN_WIDTH + ld de, SCREEN_WIDTH + ld a, [$ffbe] +.calcWRAMAddrLoop + add hl, de + dec a + jr nz, .calcWRAMAddrLoop + call CopyToRedrawRowOrColumnSrcTiles + pop hl + ld de, $20 + ld a, [$ffbe] + ld c, a +.calcVRAMAddrLoop + add hl, de + ld a, h + and $3 + or $98 + dec c + jr nz, .calcVRAMAddrLoop + ld [hRedrawRowOrColumnDest + 1], a + ld a, l + ld [hRedrawRowOrColumnDest], a + ld a, REDRAW_ROW + ld [hRedrawRowOrColumnMode], a + call DelayFrame + ld hl, $ffbe + inc [hl] + inc [hl] + pop hl + pop bc + dec c + jr nz, .redrawRowLoop + pop af + ld [hTilesetType], a + pop af + ld [H_AUTOBGTRANSFERENABLED], a + ret + +CompareHLWithBC: + ld a, h + sub b + ret nz + ld a, l + sub c + ret diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm new file mode 100644 index 00000000..6444ab7e --- /dev/null +++ b/engine/overworld/wild_mons.asm @@ -0,0 +1,33 @@ +LoadWildData: + ld hl,WildDataPointers + ld a,[wCurMap] + + ; get wild data for current map + ld c,a + ld b,0 + add hl,bc + add hl,bc + ld a,[hli] + ld h,[hl] + ld l,a ; hl now points to wild data for current map + ld a,[hli] + ld [wGrassRate],a + and a + jr z,.NoGrassData ; if no grass data, skip to surfing data + push hl + ld de,wGrassMons ; otherwise, load grass data + ld bc,$0014 + call CopyData + pop hl + ld bc,$0014 + add hl,bc +.NoGrassData + ld a,[hli] + ld [wWaterRate],a + and a + ret z ; if no water data, we're done + ld de,wWaterMons ; otherwise, load surfing data + ld bc,$0014 + jp CopyData + +INCLUDE "data/wild_mons.asm" diff --git a/engine/pathfinding.asm b/engine/pathfinding.asm new file mode 100644 index 00000000..ba052d38 --- /dev/null +++ b/engine/pathfinding.asm @@ -0,0 +1,201 @@ +FindPathToPlayer: + xor a + ld hl, hFindPathNumSteps + ld [hli], a ; hFindPathNumSteps + ld [hli], a ; hFindPathFlags + ld [hli], a ; hFindPathYProgress + ld [hl], a ; hFindPathXProgress + ld hl, wNPCMovementDirections2 + ld de, $0 +.loop + ld a, [hFindPathYProgress] + ld b, a + ld a, [hNPCPlayerYDistance] ; Y distance in steps + call CalcDifference + ld d, a + and a + jr nz, .asm_f8da + ld a, [hFindPathFlags] + set 0, a ; current end of path matches the player's Y coordinate + ld [hFindPathFlags], a +.asm_f8da + ld a, [hFindPathXProgress] + ld b, a + ld a, [hNPCPlayerXDistance] ; X distance in steps + call CalcDifference + ld e, a + and a + jr nz, .asm_f8ec + ld a, [hFindPathFlags] + set 1, a ; current end of path matches the player's X coordinate + ld [hFindPathFlags], a +.asm_f8ec + ld a, [hFindPathFlags] + cp $3 ; has the end of the path reached the player's position? + jr z, .done +; Compare whether the X distance between the player and the current of the path +; is greater or if the Y distance is. Then, try to reduce whichever is greater. + ld a, e + cp d + jr c, .yDistanceGreater +; x distance is greater + ld a, [hNPCPlayerRelativePosFlags] + bit 1, a + jr nz, .playerIsLeftOfNPC + ld d, NPC_MOVEMENT_RIGHT + jr .next1 +.playerIsLeftOfNPC + ld d, NPC_MOVEMENT_LEFT +.next1 + ld a, [hFindPathXProgress] + add 1 + ld [hFindPathXProgress], a + jr .storeDirection +.yDistanceGreater + ld a, [hNPCPlayerRelativePosFlags] + bit 0, a + jr nz, .playerIsAboveNPC + ld d, NPC_MOVEMENT_DOWN + jr .next2 +.playerIsAboveNPC + ld d, NPC_MOVEMENT_UP +.next2 + ld a, [hFindPathYProgress] + add 1 + ld [hFindPathYProgress], a +.storeDirection + ld a, d + ld [hli], a + ld a, [hFindPathNumSteps] + inc a + ld [hFindPathNumSteps], a + jp .loop +.done + ld [hl], $ff + ret + +CalcPositionOfPlayerRelativeToNPC: + xor a + ld [hNPCPlayerRelativePosFlags], a + ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels + ld d, a + ld a, [wSpriteStateData1 + 6] ; player's sprite screen X position in pixels + ld e, a + ld hl, wSpriteStateData1 + ld a, [hNPCSpriteOffset] + add l + add $4 + ld l, a + jr nc, .noCarry + inc h +.noCarry + ld a, d + ld b, a + ld a, [hli] ; NPC sprite screen Y position in pixels + call CalcDifference + jr nc, .NPCSouthOfOrAlignedWithPlayer +.NPCNorthOfPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 0, [hl] + set 0, [hl] + pop hl + jr .divideYDistance +.NPCSouthOfOrAlignedWithPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 0, [hl] + res 0, [hl] + pop hl +.divideYDistance + push hl + ld hl, hDividend2 + ld [hli], a + ld a, 16 + ld [hli], a + call DivideBytes ; divide Y absolute distance by 16 + ld a, [hl] ; quotient + ld [hNPCPlayerYDistance], a + pop hl + inc hl + ld b, e + ld a, [hl] ; NPC sprite screen X position in pixels + call CalcDifference + jr nc, .NPCEastOfOrAlignedWithPlayer +.NPCWestOfPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 1, [hl] + set 1, [hl] + pop hl + jr .divideXDistance +.NPCEastOfOrAlignedWithPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 1, [hl] + res 1, [hl] + pop hl +.divideXDistance + ld [hDividend2], a + ld a, 16 + ld [hDivisor2], a + call DivideBytes ; divide X absolute distance by 16 + ld a, [hQuotient2] + ld [hNPCPlayerXDistance], a + ld a, [hNPCPlayerRelativePosPerspective] + and a + ret z + ld a, [hNPCPlayerRelativePosFlags] + cpl + and $3 + ld [hNPCPlayerRelativePosFlags], a + ret + +ConvertNPCMovementDirectionsToJoypadMasks: + ld a, [hNPCMovementDirections2Index] + ld [wNPCMovementDirections2Index], a + dec a + ld de, wSimulatedJoypadStatesEnd + ld hl, wNPCMovementDirections2 + add l + ld l, a + jr nc, .loop + inc h +.loop + ld a, [hld] + call ConvertNPCMovementDirectionToJoypadMask + ld [de], a + inc de + ld a, [hNPCMovementDirections2Index] + dec a + ld [hNPCMovementDirections2Index], a + jr nz, .loop + ret + +ConvertNPCMovementDirectionToJoypadMask: + push hl + ld b, a + ld hl, NPCMovementDirectionsToJoypadMasksTable +.loop + ld a, [hli] + cp $ff + jr z, .done + cp b + jr z, .loadJoypadMask + inc hl + jr .loop +.loadJoypadMask + ld a, [hl] +.done + pop hl + ret + +NPCMovementDirectionsToJoypadMasksTable: + db NPC_MOVEMENT_UP, D_UP + db NPC_MOVEMENT_DOWN, D_DOWN + db NPC_MOVEMENT_LEFT, D_LEFT + db NPC_MOVEMENT_RIGHT, D_RIGHT + db $ff + +; unreferenced + ret diff --git a/home/overworld.asm b/home/overworld.asm index fe763b43..ec8f1925 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -8,7 +8,7 @@ EnterMap:: ld a, $ff ld [wJoyIgnore], a call LoadMapData - callba ClearVariablesAfterLoadingMapData + callba ClearVariablesOnEnterMap ld hl, wd72c bit 0, [hl] ; has the player already made 3 steps since the last battle? jr z, .skipGivingThreeStepsOfNoRandomBattles diff --git a/main.asm b/main.asm index 15c7f8dc..da2d3671 100755 --- a/main.asm +++ b/main.asm @@ -94,2692 +94,39 @@ INCLUDE "data/map_songs.asm" INCLUDE "data/map_header_banks.asm" -ClearVariablesAfterLoadingMapData: - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a - ld [rWY], a - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld [wStepCounter], a - ld [wLoneAttackNo], a - ld [hJoyPressed], a - ld [hJoyReleased], a - ld [hJoyHeld], a - ld [wActionResultOrTookBattleTurn], a - ld [wUnusedD5A3], a - ld hl, wCardKeyDoorY - ld [hli], a - ld [hl], a - ld hl, wWhichTrade - ld bc, wStandingOnWarpPadOrHole - wWhichTrade - call FillMemory - ret - -; only used for setting bit 2 of wd736 upon entering a new map -IsPlayerStandingOnWarp: - ld a, [wNumberOfWarps] - and a - ret z - ld c, a - ld hl, wWarpEntries -.loop - ld a, [wYCoord] - cp [hl] - jr nz, .nextWarp1 - inc hl - ld a, [wXCoord] - cp [hl] - jr nz, .nextWarp2 - inc hl - ld a, [hli] ; target warp - ld [wDestinationWarpID], a - ld a, [hl] ; target map - ld [hWarpDestinationMap], a - ld hl, wd736 - set 2, [hl] ; standing on warp flag - ret -.nextWarp1 - inc hl -.nextWarp2 - inc hl - inc hl - inc hl - dec c - jr nz, .loop - ret - -CheckForceBikeOrSurf: - ld hl, wd732 - bit 5, [hl] - ret nz - ld hl, ForcedBikeOrSurfMaps - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a - ld a, [wCurMap] - ld d, a -.loop - ld a, [hli] - cp $ff - ret z ;if we reach FF then it's not part of the list - cp d ;compare to current map - jr nz, .incorrectMap - ld a, [hli] - cp b ;compare y-coord - jr nz, .incorrectY - ld a, [hli] - cp c ;compare x-coord - jr nz, .loop ; incorrect x-coord, check next item - ld a, [wCurMap] - cp SEAFOAM_ISLANDS_4 - ld a, $2 - ld [wSeafoamIslands4CurScript], a - jr z, .forceSurfing - ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 - ld a, $2 - ld [wSeafoamIslands5CurScript], a - jr z, .forceSurfing - ;force bike riding - ld hl, wd732 - set 5, [hl] - ld a, $1 - ld [wWalkBikeSurfState], a - ld [wWalkBikeSurfStateCopy], a - jp ForceBikeOrSurf -.incorrectMap - inc hl -.incorrectY - inc hl - jr .loop -.forceSurfing - ld a, $2 - ld [wWalkBikeSurfState], a - ld [wWalkBikeSurfStateCopy], a - jp ForceBikeOrSurf - -INCLUDE "data/force_bike_surf.asm" - -IsPlayerFacingEdgeOfMap: - push hl - push de - push bc - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction - srl a - ld c, a - ld b, $0 - ld hl, .functionPointerTable - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a - ld de, .asm_c41e - push de - jp [hl] -.asm_c41e - pop bc - pop de - pop hl - ret - -.functionPointerTable - dw .facingDown - dw .facingUp - dw .facingLeft - dw .facingRight - -.facingDown - ld a, [wCurMapHeight] - add a - dec a - cp b - jr z, .setCarry - jr .resetCarry - -.facingUp - ld a, b - and a - jr z, .setCarry - jr .resetCarry - -.facingLeft - ld a, c - and a - jr z, .setCarry - jr .resetCarry - -.facingRight - ld a, [wCurMapWidth] - add a - dec a - cp c - jr z, .setCarry - jr .resetCarry -.resetCarry - and a - ret -.setCarry - scf - ret - -IsWarpTileInFrontOfPlayer: - push hl - push de - push bc - call _GetTileAndCoordsInFrontOfPlayer - ld a, [wCurMap] - cp SS_ANNE_5 - jr z, .ssAnne5 - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction - srl a - ld c, a - ld b, 0 - ld hl, .warpTileListPointers - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - ld a, [wTileInFrontOfPlayer] - ld de, $1 - call IsInArray -.done - pop bc - pop de - pop hl - ret - -.warpTileListPointers: - dw .facingDownWarpTiles - dw .facingUpWarpTiles - dw .facingLeftWarpTiles - dw .facingRightWarpTiles - -.facingDownWarpTiles - db $01,$12,$17,$3D,$04,$18,$33,$FF - -.facingUpWarpTiles - db $01,$5C,$FF - -.facingLeftWarpTiles - db $1A,$4B,$FF - -.facingRightWarpTiles - db $0F,$4E,$FF - -.ssAnne5 - ld a, [wTileInFrontOfPlayer] - cp $15 - jr nz, .notSSAnne5Warp - scf - jr .done -.notSSAnne5Warp - and a - jr .done - -IsPlayerStandingOnDoorTileOrWarpTile: - push hl - push de - push bc - callba IsPlayerStandingOnDoorTile - jr c, .done - ld a, [wCurMapTileset] - add a - ld c, a - ld b, $0 - ld hl, WarpTileIDPointers - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - ld de, $1 - aCoord 8, 9 - call IsInArray - jr nc, .done - ld hl, wd736 - res 2, [hl] -.done - pop bc - pop de - pop hl - ret - -INCLUDE "data/warp_tile_ids.asm" - -PrintSafariZoneSteps: - ld a, [wCurMap] - cp SAFARI_ZONE_EAST - ret c - cp UNKNOWN_DUNGEON_2 - ret nc - coord hl, 0, 0 - ld b, 3 - ld c, 7 - call TextBoxBorder - coord hl, 1, 1 - ld de, wSafariSteps - lb bc, 2, 3 - call PrintNumber - coord hl, 4, 1 - ld de, SafariSteps - call PlaceString - coord hl, 1, 3 - ld de, SafariBallText - call PlaceString - ld a, [wNumSafariBalls] - cp 10 - jr nc, .asm_c56d - coord hl, 5, 3 - ld a, " " - ld [hl], a -.asm_c56d - coord hl, 6, 3 - ld de, wNumSafariBalls - lb bc, 1, 2 - jp PrintNumber - -SafariSteps: - db "/500@" - -SafariBallText: - db "BALL×× @" - -GetTileAndCoordsInFrontOfPlayer: - call GetPredefRegisters - -_GetTileAndCoordsInFrontOfPlayer: - ld a, [wYCoord] - ld d, a - ld a, [wXCoord] - ld e, a - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - and a ; cp SPRITE_FACING_DOWN - jr nz, .notFacingDown -; facing down - aCoord 8, 11 - inc d - jr .storeTile -.notFacingDown - cp SPRITE_FACING_UP - jr nz, .notFacingUp -; facing up - aCoord 8, 7 - dec d - jr .storeTile -.notFacingUp - cp SPRITE_FACING_LEFT - jr nz, .notFacingLeft -; facing left - aCoord 6, 9 - dec e - jr .storeTile -.notFacingLeft - cp SPRITE_FACING_RIGHT - jr nz, .storeTile -; facing right - aCoord 10, 9 - inc e -.storeTile - ld c, a - ld [wTileInFrontOfPlayer], a - ret - -GetTileTwoStepsInFrontOfPlayer: - xor a - ld [$ffdb], a - ld hl, wYCoord - ld a, [hli] - ld d, a - ld e, [hl] - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - and a ; cp SPRITE_FACING_DOWN - jr nz, .notFacingDown -; facing down - ld hl, $ffdb - set 0, [hl] - aCoord 8, 13 - inc d - jr .storeTile -.notFacingDown - cp SPRITE_FACING_UP - jr nz, .notFacingUp -; facing up - ld hl, $ffdb - set 1, [hl] - aCoord 8, 5 - dec d - jr .storeTile -.notFacingUp - cp SPRITE_FACING_LEFT - jr nz, .notFacingLeft -; facing left - ld hl, $ffdb - set 2, [hl] - aCoord 4, 9 - dec e - jr .storeTile -.notFacingLeft - cp SPRITE_FACING_RIGHT - jr nz, .storeTile -; facing right - ld hl, $ffdb - set 3, [hl] - aCoord 12, 9 - inc e -.storeTile - ld c, a - ld [wTileInFrontOfBoulderAndBoulderCollisionResult], a - ld [wTileInFrontOfPlayer], a - ret - -CheckForCollisionWhenPushingBoulder: - call GetTileTwoStepsInFrontOfPlayer - ld hl, wTilesetCollisionPtr - ld a, [hli] - ld h, [hl] - ld l, a -.loop - ld a, [hli] - cp $ff - jr z, .done ; if the tile two steps ahead is not passable - cp c - jr nz, .loop - ld hl, TilePairCollisionsLand - call CheckForTilePairCollisions2 - ld a, $ff - jr c, .done ; if there is an elevation difference between the current tile and the one two steps ahead - ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult] - cp $15 ; stairs tile - ld a, $ff - jr z, .done ; if the tile two steps ahead is stairs - call CheckForBoulderCollisionWithSprites -.done - ld [wTileInFrontOfBoulderAndBoulderCollisionResult], a - ret - -; sets a to $ff if there is a collision and $00 if there is no collision -CheckForBoulderCollisionWithSprites: - ld a, [wBoulderSpriteIndex] - dec a - swap a - ld d, 0 - ld e, a - ld hl, wSpriteStateData2 + $14 - add hl, de - ld a, [hli] ; map Y position - ld [$ffdc], a - ld a, [hl] ; map X position - ld [$ffdd], a - ld a, [wNumSprites] - ld c, a - ld de, $f - ld hl, wSpriteStateData2 + $14 - ld a, [$ffdb] - and $3 ; facing up or down? - jr z, .pushingHorizontallyLoop -.pushingVerticallyLoop - inc hl - ld a, [$ffdd] - cp [hl] - jr nz, .nextSprite1 ; if X coordinates don't match - dec hl - ld a, [hli] - ld b, a - ld a, [$ffdb] - rrca - jr c, .pushingDown -; pushing up - ld a, [$ffdc] - dec a - jr .compareYCoords -.pushingDown - ld a, [$ffdc] - inc a -.compareYCoords - cp b - jr z, .failure -.nextSprite1 - dec c - jr z, .success - add hl, de - jr .pushingVerticallyLoop -.pushingHorizontallyLoop - ld a, [hli] - ld b, a - ld a, [$ffdc] - cp b - jr nz, .nextSprite2 - ld b, [hl] - ld a, [$ffdb] - bit 2, a - jr nz, .pushingLeft -; pushing right - ld a, [$ffdd] - inc a - jr .compareXCoords -.pushingLeft - ld a, [$ffdd] - dec a -.compareXCoords - cp b - jr z, .failure -.nextSprite2 - dec c - jr z, .success - add hl, de - jr .pushingHorizontallyLoop -.failure - ld a, $ff - ret -.success - xor a - ret - -ApplyOutOfBattlePoisonDamage: - ld a, [wd730] - add a - jp c, .noBlackOut ; no black out if joypad states are being simulated - ld a, [wPartyCount] - and a - jp z, .noBlackOut - call IncrementDayCareMonExp - ld a, [wStepCounter] - and $3 ; is the counter a multiple of 4? - jp nz, .noBlackOut ; only apply poison damage every fourth step - ld [wWhichPokemon], a - ld hl, wPartyMon1Status - ld de, wPartySpecies -.applyDamageLoop - ld a, [hl] - and (1 << PSN) - jr z, .nextMon2 ; not poisoned - dec hl - dec hl - ld a, [hld] - ld b, a - ld a, [hli] - or b - jr z, .nextMon ; already fainted -; subtract 1 from HP - ld a, [hl] - dec a - ld [hld], a - inc a - jr nz, .noBorrow -; borrow 1 from upper byte of HP - dec [hl] - inc hl - jr .nextMon -.noBorrow - ld a, [hli] - or [hl] - jr nz, .nextMon ; didn't faint from damage -; the mon fainted from the damage - push hl - inc hl - inc hl - ld [hl], a - ld a, [de] - ld [wd11e], a - push de - ld a, [wWhichPokemon] - ld hl, wPartyMonNicks - call GetPartyMonName - xor a - ld [wJoyIgnore], a - call EnableAutoTextBoxDrawing - ld a, $d0 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - pop de - pop hl -.nextMon - inc hl - inc hl -.nextMon2 - inc de - ld a, [de] - inc a - jr z, .applyDamageLoopDone - ld bc, wPartyMon2 - wPartyMon1 - add hl, bc - push hl - ld hl, wWhichPokemon - inc [hl] - pop hl - jr .applyDamageLoop -.applyDamageLoopDone - ld hl, wPartyMon1Status - ld a, [wPartyCount] - ld d, a - ld e, 0 -.countPoisonedLoop - ld a, [hl] - and (1 << PSN) - or e - ld e, a - ld bc, wPartyMon2 - wPartyMon1 - add hl, bc - dec d - jr nz, .countPoisonedLoop - ld a, e - and a ; are any party members poisoned? - jr z, .skipPoisonEffectAndSound - ld b, $2 - predef ChangeBGPalColor0_4Frames ; change BG white to dark grey for 4 frames - ld a, SFX_POISONED - call PlaySound -.skipPoisonEffectAndSound - predef AnyPartyAlive - ld a, d - and a - jr nz, .noBlackOut - call EnableAutoTextBoxDrawing - ld a, $d1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wd72e - set 5, [hl] - ld a, $ff - jr .done -.noBlackOut - xor a -.done - ld [wOutOfBattleBlackout], a - ret - -LoadTilesetHeader: - call GetPredefRegisters - push hl - ld d, 0 - ld a, [wCurMapTileset] - add a - add a - ld b, a - add a - add b ; a = tileset * 12 - jr nc, .noCarry - inc d -.noCarry - ld e, a - ld hl, Tilesets - add hl, de - ld de, wTilesetBank - ld c, $b -.copyTilesetHeaderLoop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyTilesetHeaderLoop - ld a, [hl] - ld [hTilesetType], a - xor a - ld [$ffd8], a - pop hl - ld a, [wCurMapTileset] - push hl - push de - ld hl, DungeonTilesets - ld de, $1 - call IsInArray - pop de - pop hl - jr c, .asm_c797 - ld a, [wCurMapTileset] - ld b, a - ld a, [hPreviousTileset] - cp b - jr z, .done -.asm_c797 - ld a, [wDestinationWarpID] - cp $ff - jr z, .done - call LoadDestinationWarpPosition - ld a, [wYCoord] - and $1 - ld [wYBlockCoord], a - ld a, [wXCoord] - and $1 - ld [wXBlockCoord], a -.done - ret - -INCLUDE "data/dungeon_tilesets.asm" - -INCLUDE "data/tileset_headers.asm" - -IncrementDayCareMonExp: - ld a, [wDayCareInUse] - and a - ret z - ld hl, wDayCareMonExp + 2 - inc [hl] - ret nz - dec hl - inc [hl] - ret nz - dec hl - inc [hl] - ld a, [hl] - cp $50 - ret c - ld a, $50 - ld [hl], a - ret +INCLUDE "engine/overworld/clear_variables.asm" +INCLUDE "engine/overworld/player_state.asm" +INCLUDE "engine/overworld/poison.asm" +INCLUDE "engine/overworld/tileset_header.asm" +INCLUDE "engine/overworld/daycare_exp.asm" INCLUDE "data/hide_show_data.asm" -PrintStrengthTxt: - ld hl, wd728 - set 0, [hl] - ld hl, UsedStrengthText - call PrintText - ld hl, CanMoveBouldersText - jp PrintText - -UsedStrengthText: - TX_FAR _UsedStrengthText - TX_ASM - ld a, [wcf91] - call PlayCry - call Delay3 - jp TextScriptEnd - -CanMoveBouldersText: - TX_FAR _CanMoveBouldersText - db "@" - -IsSurfingAllowed: -; Returns whether surfing is allowed in bit 1 of wd728. -; Surfing isn't allowed on the Cycling Road or in the lowest level of the -; Seafoam Islands before the current has been slowed with boulders. - ld hl, wd728 - set 1, [hl] - ld a, [wd732] - bit 5, a - jr nz, .forcedToRideBike - ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 - ret nz - CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE - ret z - ld hl, CoordsData_cdf7 - call ArePlayerCoordsInArray - ret nc - ld hl, wd728 - res 1, [hl] - ld hl, CurrentTooFastText - jp PrintText -.forcedToRideBike - ld hl, wd728 - res 1, [hl] - ld hl, CyclingIsFunText - jp PrintText - -CoordsData_cdf7: - db $0B,$07,$FF - -CurrentTooFastText: - TX_FAR _CurrentTooFastText - db "@" - -CyclingIsFunText: - TX_FAR _CyclingIsFunText - db "@" - -; function to add an item (in varying quantities) to the player's bag or PC box -; INPUT: -; hl = address of inventory (either wNumBagItems or wNumBoxItems) -; [wcf91] = item ID -; [wItemQuantity] = item quantity -; sets carry flag if successful, unsets carry flag if unsuccessful -AddItemToInventory_: - ld a,[wItemQuantity] ; a = item quantity - push af - push bc - push de - push hl - push hl - ld d,PC_ITEM_CAPACITY ; how many items the PC can hold - ld a,wNumBagItems & $FF - cp l - jr nz,.checkIfInventoryFull - ld a,wNumBagItems >> 8 - cp h - jr nz,.checkIfInventoryFull -; if the destination is the bag - ld d,BAG_ITEM_CAPACITY ; how many items the bag can hold -.checkIfInventoryFull - ld a,[hl] - sub d - ld d,a - ld a,[hli] - and a - jr z,.addNewItem -.loop - ld a,[hli] - ld b,a ; b = ID of current item in table - ld a,[wcf91] ; a = ID of item being added - cp b ; does the current item in the table match the item being added? - jp z,.increaseItemQuantity ; if so, increase the item's quantity - inc hl - ld a,[hl] - cp a,$ff ; is it the end of the table? - jr nz,.loop -.addNewItem ; add an item not yet in the inventory - pop hl - ld a,d - and a ; is there room for a new item slot? - jr z,.done -; if there is room - inc [hl] ; increment the number of items in the inventory - ld a,[hl] ; the number of items will be the index of the new item - add a - dec a - ld c,a - ld b,0 - add hl,bc ; hl = address to store the item - ld a,[wcf91] - ld [hli],a ; store item ID - ld a,[wItemQuantity] - ld [hli],a ; store item quantity - ld [hl],$ff ; store terminator - jp .success -.increaseItemQuantity ; increase the quantity of an item already in the inventory - ld a,[wItemQuantity] - ld b,a ; b = quantity to add - ld a,[hl] ; a = existing item quantity - add b ; a = new item quantity - cp a,100 - jp c,.storeNewQuantity ; if the new quantity is less than 100, store it -; if the new quantity is greater than or equal to 100, -; try to max out the current slot and add the rest in a new slot - sub a,99 - ld [wItemQuantity],a ; a = amount left over (to put in the new slot) - ld a,d - and a ; is there room for a new item slot? - jr z,.increaseItemQuantityFailed -; if so, store 99 in the current slot and store the rest in a new slot - ld a,99 - ld [hli],a - jp .loop -.increaseItemQuantityFailed - pop hl - and a - jr .done -.storeNewQuantity - ld [hl],a - pop hl -.success - scf -.done - pop hl - pop de - pop bc - pop bc - ld a,b - ld [wItemQuantity],a ; restore the initial value from when the function was called - ret - -; function to remove an item (in varying quantities) from the player's bag or PC box -; INPUT: -; hl = address of inventory (either wNumBagItems or wNumBoxItems) -; [wWhichPokemon] = index (within the inventory) of the item to remove -; [wItemQuantity] = quantity to remove -RemoveItemFromInventory_: - push hl - inc hl - ld a,[wWhichPokemon] ; index (within the inventory) of the item being removed - sla a - add l - ld l,a - jr nc,.noCarry - inc h -.noCarry - inc hl - ld a,[wItemQuantity] ; quantity being removed - ld e,a - ld a,[hl] ; a = current quantity - sub e - ld [hld],a ; store new quantity - ld [wMaxItemQuantity],a - and a - jr nz,.skipMovingUpSlots -; if the remaining quantity is 0, -; remove the emptied item slot and move up all the following item slots -.moveSlotsUp - ld e,l - ld d,h - inc de - inc de ; de = address of the slot following the emptied one -.loop ; loop to move up the following slots - ld a,[de] - inc de - ld [hli],a - cp a,$ff - jr nz,.loop -; update menu info - xor a - ld [wListScrollOffset],a - ld [wCurrentMenuItem],a - ld [wBagSavedMenuItem],a - ld [wSavedListScrollOffset],a - pop hl - 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 [wListCount],a - cp a,2 - jr c,.done - ld [wMaxMenuItem],a - jr .done -.skipMovingUpSlots - pop hl -.done - ret - -; wild pokemon data: from 4EB8 to 55C7 - -LoadWildData: - ld hl,WildDataPointers - ld a,[wCurMap] - - ; get wild data for current map - ld c,a - ld b,0 - add hl,bc - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a ; hl now points to wild data for current map - ld a,[hli] - ld [wGrassRate],a - and a - jr z,.NoGrassData ; if no grass data, skip to surfing data - push hl - ld de,wGrassMons ; otherwise, load grass data - ld bc,$0014 - call CopyData - pop hl - ld bc,$0014 - add hl,bc -.NoGrassData - ld a,[hli] - ld [wWaterRate],a - and a - ret z ; if no water data, we're done - ld de,wWaterMons ; otherwise, load surfing data - ld bc,$0014 - jp CopyData - -INCLUDE "data/wild_mons.asm" +INCLUDE "engine/overworld/field_move_messages.asm" -INCLUDE "engine/items/items.asm" +INCLUDE "engine/items/inventory.asm" -DrawBadges: -; Draw 4x2 gym leader faces, with the faces replaced by -; badges if they are owned. Used in the player status screen. - -; In Japanese versions, names are displayed above faces. -; Instead of removing relevant code, the name graphics were erased. - -; Tile ids for face/badge graphics. - ld de, wBadgeOrFaceTiles - ld hl, .FaceBadgeTiles - ld bc, 8 - call CopyData - -; Booleans for each badge. - ld hl, wTempObtainedBadgesBooleans - ld bc, 8 - xor a - call FillMemory - -; Alter these based on owned badges. - ld de, wTempObtainedBadgesBooleans - ld hl, wBadgeOrFaceTiles - ld a, [wObtainedBadges] - ld b, a - ld c, 8 -.CheckBadge - srl b - jr nc, .NextBadge - ld a, [hl] - add 4 ; Badge graphics are after each face - ld [hl], a - ld a, 1 - ld [de], a -.NextBadge - inc hl - inc de - dec c - jr nz, .CheckBadge - -; Draw two rows of badges. - ld hl, wBadgeNumberTile - ld a, $d8 ; [1] - ld [hli], a - ld [hl], $60 ; First name - - coord hl, 2, 11 - ld de, wTempObtainedBadgesBooleans - call .DrawBadgeRow - - coord hl, 2, 14 - ld de, wTempObtainedBadgesBooleans + 4 -; call .DrawBadgeRow -; ret - -.DrawBadgeRow -; Draw 4 badges. - - ld c, 4 -.DrawBadge - push de - push hl - -; Badge no. - ld a, [wBadgeNumberTile] - ld [hli], a - inc a - ld [wBadgeNumberTile], a - -; Names aren't printed if the badge is owned. - ld a, [de] - and a - ld a, [wBadgeNameTile] - jr nz, .SkipName - call .PlaceTiles - jr .PlaceBadge - -.SkipName - inc a - inc a - inc hl - -.PlaceBadge - ld [wBadgeNameTile], a - ld de, SCREEN_WIDTH - 1 - add hl, de - ld a, [wBadgeOrFaceTiles] - call .PlaceTiles - add hl, de - call .PlaceTiles - -; Shift badge array back one byte. - push bc - ld hl, wBadgeOrFaceTiles + 1 - ld de, wBadgeOrFaceTiles - ld bc, 8 - call CopyData - pop bc - - pop hl - ld de, 4 - add hl, de - - pop de - inc de - dec c - jr nz, .DrawBadge - ret - -.PlaceTiles - ld [hli], a - inc a - ld [hl], a - inc a - ret - -.FaceBadgeTiles - db $20, $28, $30, $38, $40, $48, $50, $58 - -GymLeaderFaceAndBadgeTileGraphics: - INCBIN "gfx/badges.2bpp" - -; replaces a tile block with the one specified in [wNewTileBlockID] -; and redraws the map view if necessary -; b = Y -; c = X -ReplaceTileBlock: - call GetPredefRegisters - ld hl, wOverworldMap - ld a, [wCurMapWidth] - add $6 - ld e, a - ld d, $0 - add hl, de - add hl, de - add hl, de - ld e, $3 - add hl, de - ld e, a - ld a, b - and a - jr z, .addX -; add width * Y -.addWidthYTimesLoop - add hl, de - dec b - jr nz, .addWidthYTimesLoop -.addX - add hl, bc ; add X - ld a, [wNewTileBlockID] - ld [hl], a - ld a, [wCurrentTileBlockMapViewPointer] - ld c, a - ld a, [wCurrentTileBlockMapViewPointer + 1] - ld b, a - call CompareHLWithBC - ret c ; return if the replaced tile block is below the map view in memory - push hl - ld l, e - ld h, $0 - ld e, $6 - ld d, h - add hl, hl - add hl, hl - add hl, de - add hl, bc - pop bc - call CompareHLWithBC - ret c ; return if the replaced tile block is above the map view in memory - -RedrawMapView: - ld a, [wIsInBattle] - inc a - ret z - ld a, [H_AUTOBGTRANSFERENABLED] - push af - ld a, [hTilesetType] - push af - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld [hTilesetType], a ; no flower/water BG tile animations - call LoadCurrentMapView - call RunDefaultPaletteCommand - ld hl, wMapViewVRAMPointer - ld a, [hli] - ld h, [hl] - ld l, a - ld de, -2 * 32 - add hl, de - ld a, h - and $3 - or $98 - ld a, l - ld [wBuffer], a - ld a, h - ld [wBuffer + 1], a ; this copy of the address is not used - ld a, 2 - ld [$ffbe], a - ld c, 9 ; number of rows of 2x2 tiles (this covers the whole screen) -.redrawRowLoop - push bc - push hl - push hl - ld hl, wTileMap - 2 * SCREEN_WIDTH - ld de, SCREEN_WIDTH - ld a, [$ffbe] -.calcWRAMAddrLoop - add hl, de - dec a - jr nz, .calcWRAMAddrLoop - call CopyToRedrawRowOrColumnSrcTiles - pop hl - ld de, $20 - ld a, [$ffbe] - ld c, a -.calcVRAMAddrLoop - add hl, de - ld a, h - and $3 - or $98 - dec c - jr nz, .calcVRAMAddrLoop - ld [hRedrawRowOrColumnDest + 1], a - ld a, l - ld [hRedrawRowOrColumnDest], a - ld a, REDRAW_ROW - ld [hRedrawRowOrColumnMode], a - call DelayFrame - ld hl, $ffbe - inc [hl] - inc [hl] - pop hl - pop bc - dec c - jr nz, .redrawRowLoop - pop af - ld [hTilesetType], a - pop af - ld [H_AUTOBGTRANSFERENABLED], a - ret - -CompareHLWithBC: - ld a, h - sub b - ret nz - ld a, l - sub c - ret +INCLUDE "engine/overworld/wild_mons.asm" -INCLUDE "engine/overworld/cut.asm" +INCLUDE "engine/items/items.asm" -MarkTownVisitedAndLoadMissableObjects: - ld a, [wCurMap] - cp ROUTE_1 - jr nc, .notInTown - ld c, a - ld b, FLAG_SET - ld hl, wTownVisitedFlag ; mark town as visited (for flying) - predef FlagActionPredef -.notInTown - ld hl, MapHSPointers - ld a, [wCurMap] - ld b, $0 - ld c, a - add hl, bc - add hl, bc - ld a, [hli] ; load missable objects pointer in hl - ld h, [hl] - ; fall through - -LoadMissableObjects: - ld l, a - push hl - ld de, MapHS00 ; calculate difference between out pointer and the base pointer - ld a, l - sub e - jr nc, .asm_f13c - dec h -.asm_f13c - ld l, a - ld a, h - sub d - ld h, a - ld a, h - ld [H_DIVIDEND], a - ld a, l - ld [H_DIVIDEND+1], a - xor a - ld [H_DIVIDEND+2], a - ld [H_DIVIDEND+3], a - ld a, $3 - 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, [wCurMap] - ld b, a - ld a, [H_DIVIDEND+3] - ld c, a ; store global offset in c - ld de, wMissableObjectList - pop hl -.writeMissableObjectsListLoop - ld a, [hli] - cp $ff - jr z, .done ; end of list - cp b - jr nz, .done ; not for current map anymore - ld a, [hli] - inc hl - ld [de], a ; write (map-local) sprite ID - inc de - ld a, c - inc c - ld [de], a ; write (global) missable object index - inc de - jr .writeMissableObjectsListLoop -.done - ld a, $ff - ld [de], a ; write sentinel - ret - -InitializeMissableObjectsFlags: - ld hl, wMissableObjectFlags - ld bc, wMissableObjectFlagsEnd - wMissableObjectFlags - xor a - call FillMemory ; clear missable objects flags - ld hl, MapHS00 - xor a - ld [wMissableObjectCounter], a -.missableObjectsLoop - ld a, [hli] - cp $ff ; end of list - ret z - push hl - inc hl - ld a, [hl] - cp Hide - jr nz, .skip - ld hl, wMissableObjectFlags - ld a, [wMissableObjectCounter] - ld c, a - ld b, FLAG_SET - call MissableObjectFlagAction ; set flag if Item is hidden -.skip - ld hl, wMissableObjectCounter - inc [hl] - pop hl - inc hl - inc hl - jr .missableObjectsLoop - -; tests if current sprite is a missable object that is hidden/has been removed -IsObjectHidden: - ld a, [H_CURRENTSPRITEOFFSET] - swap a - ld b, a - ld hl, wMissableObjectList -.loop - ld a, [hli] - cp $ff - jr z, .notHidden ; not missable -> not hidden - cp b - ld a, [hli] - jr nz, .loop - ld c, a - ld b, FLAG_TEST - ld hl, wMissableObjectFlags - call MissableObjectFlagAction - ld a, c - and a - jr nz, .hidden -.notHidden - xor a -.hidden - ld [$ffe5], a - ret - -; adds missable object (items, leg. pokemon, etc.) to the map -; [wMissableObjectIndex]: index of the missable object to be added (global index) -ShowObject: -ShowObject2: - ld hl, wMissableObjectFlags - ld a, [wMissableObjectIndex] - ld c, a - ld b, FLAG_RESET - call MissableObjectFlagAction ; reset "removed" flag - jp UpdateSprites - -; removes missable object (items, leg. pokemon, etc.) from the map -; [wMissableObjectIndex]: index of the missable object to be removed (global index) -HideObject: - ld hl, wMissableObjectFlags - ld a, [wMissableObjectIndex] - ld c, a - ld b, FLAG_SET - call MissableObjectFlagAction ; set "removed" flag - jp UpdateSprites - -MissableObjectFlagAction: -; identical to FlagAction - - push hl - push de - push bc - - ; bit - ld a, c - ld d, a - and 7 - ld e, a - - ; byte - ld a, d - srl a - srl a - srl a - add l - ld l, a - jr nc, .ok - inc h -.ok - - ; d = 1 << e (bitmask) - inc e - ld d, 1 -.shift - dec e - jr z, .shifted - sla d - jr .shift -.shifted - - ld a, b - and a - jr z, .reset - cp 2 - jr z, .read - -.set - ld a, [hl] - ld b, a - ld a, d - or b - ld [hl], a - jr .done - -.reset - ld a, [hl] - ld b, a - ld a, d - xor $ff - and b - ld [hl], a - jr .done - -.read - ld a, [hl] - ld b, a - ld a, d - and b - -.done - pop bc - pop de - pop hl - ld c, a - ret - -TryPushingBoulder: - ld a, [wd728] - bit 0, a ; using Strength? - ret z - ld a, [wFlags_0xcd60] - bit 1, a ; has boulder dust animation from previous push played yet? - ret nz - xor a - ld [hSpriteIndexOrTextID], a - call IsSpriteInFrontOfPlayer - ld a, [hSpriteIndexOrTextID] - ld [wBoulderSpriteIndex], a - and a - jp z, ResetBoulderPushFlags - ld hl, wSpriteStateData1 + 1 - ld d, $0 - ld a, [hSpriteIndexOrTextID] - swap a - ld e, a - add hl, de - res 7, [hl] - call GetSpriteMovementByte2Pointer - ld a, [hl] - cp BOULDER_MOVEMENT_BYTE_2 - jp nz, ResetBoulderPushFlags - ld hl, wFlags_0xcd60 - bit 6, [hl] - 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 D_RIGHT | D_LEFT | D_UP | D_DOWN - ret z - predef CheckForCollisionWhenPushingBoulder - ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult] - and a ; was there a collision? - jp nz, ResetBoulderPushFlags - ld a, [hJoyHeld] - ld b, a - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - cp SPRITE_FACING_UP - jr z, .pushBoulderUp - cp SPRITE_FACING_LEFT - jr z, .pushBoulderLeft - cp SPRITE_FACING_RIGHT - jr z, .pushBoulderRight -.pushBoulderDown - bit 7, b - ret z - ld de, PushBoulderDownMovementData - jr .done -.pushBoulderUp - bit 6, b - ret z - ld de, PushBoulderUpMovementData - jr .done -.pushBoulderLeft - bit 5, b - ret z - ld de, PushBoulderLeftMovementData - jr .done -.pushBoulderRight - bit 4, b - ret z - ld de, PushBoulderRightMovementData -.done - call MoveSprite - ld a, SFX_PUSH_BOULDER - call PlaySound - ld hl, wFlags_0xcd60 - set 1, [hl] - ret - -PushBoulderUpMovementData: - db NPC_MOVEMENT_UP,$FF - -PushBoulderDownMovementData: - db NPC_MOVEMENT_DOWN,$FF - -PushBoulderLeftMovementData: - db NPC_MOVEMENT_LEFT,$FF - -PushBoulderRightMovementData: - db NPC_MOVEMENT_RIGHT,$FF - -DoBoulderDustAnimation: - ld a, [wd730] - bit 0, a - ret nz - callab AnimateBoulderDust - call DiscardButtonPresses - ld [wJoyIgnore], a - call ResetBoulderPushFlags - set 7, [hl] - ld a, [wBoulderSpriteIndex] - ld [H_SPRITEINDEX], a - call GetSpriteMovementByte2Pointer - ld [hl], $10 - ld a, SFX_CUT - jp PlaySound - -ResetBoulderPushFlags: - ld hl, wFlags_0xcd60 - res 1, [hl] - res 6, [hl] - ret - -_AddPartyMon: -; Adds a new mon to the player's or enemy's party. -; [wMonDataLocation] is used in an unusual way in this function. -; If the lower nybble is 0, the mon is added to the player's party, else the enemy's. -; If the entire value is 0, then the player is allowed to name the mon. - ld de, wPartyCount - ld a, [wMonDataLocation] - and $f - jr z, .next - ld de, wEnemyPartyCount -.next - ld a, [de] - inc a - cp PARTY_LENGTH + 1 - ret nc ; return if the party is already full - ld [de], a - ld a, [de] - ld [hNewPartyLength], a - add e - ld e, a - jr nc, .noCarry - inc d -.noCarry - ld a, [wcf91] - ld [de], a ; write species of new mon in party list - inc de - ld a, $ff ; terminator - ld [de], a - ld hl, wPartyMonOT - ld a, [wMonDataLocation] - and $f - jr z, .next2 - ld hl, wEnemyMonOT -.next2 - ld a, [hNewPartyLength] - dec a - call SkipFixedLengthTextEntries - ld d, h - ld e, l - ld hl, wPlayerName - ld bc, NAME_LENGTH - call CopyData - ld a, [wMonDataLocation] - and a - jr nz, .skipNaming - ld hl, wPartyMonNicks - ld a, [hNewPartyLength] - dec a - call SkipFixedLengthTextEntries - ld a, NAME_MON_SCREEN - ld [wNamingScreenType], a - predef AskName -.skipNaming - ld hl, wPartyMons - ld a, [wMonDataLocation] - and $f - jr z, .next3 - ld hl, wEnemyMons -.next3 - ld a, [hNewPartyLength] - dec a - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld e, l - ld d, h - push hl - ld a, [wcf91] - ld [wd0b5], a - call GetMonHeader - ld hl, wMonHeader - ld a, [hli] - ld [de], a ; species - inc de - pop hl - push hl - ld a, [wMonDataLocation] - and $f - ld a, $98 ; set enemy trainer mon IVs to fixed average values - ld b, $88 - jr nz, .next4 - -; If the mon is being added to the player's party, update the pokedex. - ld a, [wcf91] - ld [wd11e], a - push de - predef IndexToPokedex - pop de - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_TEST - ld hl, wPokedexOwned - call FlagAction - ld a, c ; whether the mon was already flagged as owned - ld [wUnusedD153], a ; not read - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_SET - push bc - call FlagAction - pop bc - ld hl, wPokedexSeen - call FlagAction - - pop hl - push hl - - ld a, [wIsInBattle] - and a ; is this a wild mon caught in battle? - jr nz, .copyEnemyMonData - -; Not wild. - call Random ; generate random IVs - ld b, a - call Random - -.next4 - push bc - ld bc, wPartyMon1DVs - wPartyMon1 - add hl, bc - pop bc - ld [hli], a - ld [hl], b ; write IVs - ld bc, (wPartyMon1HPExp - 1) - (wPartyMon1DVs + 1) - add hl, bc - ld a, 1 - ld c, a - xor a - ld b, a - call CalcStat ; calc HP stat (set cur Hp to max HP) - ld a, [H_MULTIPLICAND+1] - ld [de], a - inc de - ld a, [H_MULTIPLICAND+2] - ld [de], a - inc de - xor a - ld [de], a ; box level - inc de - ld [de], a ; status ailments - inc de - jr .copyMonTypesAndMoves -.copyEnemyMonData - ld bc, wEnemyMon1DVs - wEnemyMon1 - add hl, bc - ld a, [wEnemyMonDVs] ; copy IVs from cur enemy mon - ld [hli], a - ld a, [wEnemyMonDVs + 1] - ld [hl], a - ld a, [wEnemyMonHP] ; copy HP from cur enemy mon - ld [de], a - inc de - ld a, [wEnemyMonHP+1] - ld [de], a - inc de - xor a - ld [de], a ; box level - inc de - ld a, [wEnemyMonStatus] ; copy status ailments from cur enemy mon - ld [de], a - inc de -.copyMonTypesAndMoves - ld hl, wMonHTypes - ld a, [hli] ; type 1 - ld [de], a - inc de - ld a, [hli] ; type 2 - ld [de], a - inc de - ld a, [hli] ; catch rate (held item in gen 2) - ld [de], a - ld hl, wMonHMoves - ld a, [hli] - inc de - push de - ld [de], a - ld a, [hli] - inc de - ld [de], a - ld a, [hli] - inc de - ld [de], a - ld a, [hli] - inc de - ld [de], a - push de - dec de - dec de - dec de - xor a - ld [wLearningMovesFromDayCare], a - predef WriteMonMoves - pop de - ld a, [wPlayerID] ; set trainer ID to player ID - inc de - ld [de], a - ld a, [wPlayerID + 1] - inc de - ld [de], a - push de - ld a, [wCurEnemyLVL] - ld d, a - callab CalcExperience - pop de - inc de - ld a, [hExperience] ; write experience - ld [de], a - inc de - ld a, [hExperience + 1] - ld [de], a - inc de - ld a, [hExperience + 2] - ld [de], a - xor a - ld b, NUM_STATS * 2 -.writeEVsLoop ; set all EVs to 0 - inc de - ld [de], a - dec b - jr nz, .writeEVsLoop - inc de - inc de - pop hl - call AddPartyMon_WriteMovePP - inc de - ld a, [wCurEnemyLVL] - ld [de], a - inc de - ld a, [wIsInBattle] - dec a - jr nz, .calcFreshStats - ld hl, wEnemyMonMaxHP - ld bc, $a - call CopyData ; copy stats of cur enemy mon - pop hl - jr .done -.calcFreshStats - pop hl - ld bc, wPartyMon1HPExp - 1 - wPartyMon1 - add hl, bc - ld b, $0 - call CalcStats ; calculate fresh set of stats -.done - scf - ret - -LoadMovePPs: - call GetPredefRegisters - ; fallthrough -AddPartyMon_WriteMovePP: - ld b, NUM_MOVES -.pploop - ld a, [hli] ; read move ID - and a - jr z, .empty - dec a - push hl - push de - push bc - ld hl, Moves - ld bc, MoveEnd - Moves - call AddNTimes - ld de, wcd6d - ld a, BANK(Moves) - call FarCopyData - pop bc - pop de - pop hl - ld a, [wcd6d + 5] ; PP is byte 5 of move data -.empty - inc de - ld [de], a - dec b - jr nz, .pploop ; there are still moves to read - ret - -; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party -; used in the cable club trade center -_AddEnemyMonToPlayerParty: - ld hl, wPartyCount - ld a, [hl] - cp PARTY_LENGTH - scf - ret z ; party full, return failure - inc a - ld [hl], a ; add 1 to party members - ld c, a - ld b, $0 - add hl, bc - ld a, [wcf91] - ld [hli], a ; add mon as last list entry - ld [hl], $ff ; write new sentinel - ld hl, wPartyMons - ld a, [wPartyCount] - dec a - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld e, l - ld d, h - ld hl, wLoadedMon - call CopyData ; write new mon's data (from wLoadedMon) - ld hl, wPartyMonOT - ld a, [wPartyCount] - dec a - call SkipFixedLengthTextEntries - ld d, h - ld e, l - ld hl, wEnemyMonOT - ld a, [wWhichPokemon] - call SkipFixedLengthTextEntries - ld bc, NAME_LENGTH - call CopyData ; write new mon's OT name (from an enemy mon) - ld hl, wPartyMonNicks - ld a, [wPartyCount] - dec a - call SkipFixedLengthTextEntries - ld d, h - ld e, l - ld hl, wEnemyMonNicks - ld a, [wWhichPokemon] - call SkipFixedLengthTextEntries - ld bc, NAME_LENGTH - call CopyData ; write new mon's nickname (from an enemy mon) - ld a, [wcf91] - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_SET - ld hl, wPokedexOwned - push bc - call FlagAction ; add to owned pokemon - pop bc - ld hl, wPokedexSeen - call FlagAction ; add to seen pokemon - and a - ret ; return success - -_MoveMon: - ld a, [wMoveMonType] - and a - jr z, .checkPartyMonSlots - cp DAYCARE_TO_PARTY - jr z, .checkPartyMonSlots - cp PARTY_TO_DAYCARE - ld hl, wDayCareMon - jr z, .asm_f575 - ld hl, wNumInBox - ld a, [hl] - cp MONS_PER_BOX - jr nz, .partyOrBoxNotFull - jr .boxFull -.checkPartyMonSlots - ld hl, wPartyCount - ld a, [hl] - cp PARTY_LENGTH - jr nz, .partyOrBoxNotFull -.boxFull - scf - ret -.partyOrBoxNotFull - inc a - ld [hl], a ; increment number of mons in party/box - ld c, a - ld b, 0 - add hl, bc - ld a, [wMoveMonType] - cp DAYCARE_TO_PARTY - ld a, [wDayCareMon] - jr z, .asm_f556 - ld a, [wcf91] -.asm_f556 - ld [hli], a ; write new mon ID - ld [hl], $ff ; write new sentinel - ld a, [wMoveMonType] - dec a - ld hl, wPartyMons - ld bc, wPartyMon2 - wPartyMon1 ; $2c - ld a, [wPartyCount] - jr nz, .skipToNewMonEntry - ld hl, wBoxMons - ld bc, wBoxMon2 - wBoxMon1 ; $21 - ld a, [wNumInBox] -.skipToNewMonEntry - dec a - call AddNTimes -.asm_f575 - push hl - ld e, l - ld d, h - ld a, [wMoveMonType] - and a - ld hl, wBoxMons - ld bc, wBoxMon2 - wBoxMon1 ; $21 - jr z, .asm_f591 - cp DAYCARE_TO_PARTY - ld hl, wDayCareMon - jr z, .asm_f597 - ld hl, wPartyMons - ld bc, wPartyMon2 - wPartyMon1 ; $2c -.asm_f591 - ld a, [wWhichPokemon] - call AddNTimes -.asm_f597 - push hl - push de - ld bc, wBoxMon2 - wBoxMon1 - call CopyData - pop de - pop hl - ld a, [wMoveMonType] - and a - jr z, .asm_f5b4 - cp DAYCARE_TO_PARTY - jr z, .asm_f5b4 - ld bc, wBoxMon2 - wBoxMon1 - add hl, bc - ld a, [hl] - inc de - inc de - inc de - ld [de], a -.asm_f5b4 - ld a, [wMoveMonType] - cp PARTY_TO_DAYCARE - ld de, wDayCareMonOT - jr z, .asm_f5d3 - dec a - ld hl, wPartyMonOT - ld a, [wPartyCount] - jr nz, .asm_f5cd - ld hl, wBoxMonOT - ld a, [wNumInBox] -.asm_f5cd - dec a - call SkipFixedLengthTextEntries - ld d, h - ld e, l -.asm_f5d3 - ld hl, wBoxMonOT - ld a, [wMoveMonType] - and a - jr z, .asm_f5e6 - ld hl, wDayCareMonOT - cp DAYCARE_TO_PARTY - jr z, .asm_f5ec - ld hl, wPartyMonOT -.asm_f5e6 - ld a, [wWhichPokemon] - call SkipFixedLengthTextEntries -.asm_f5ec - ld bc, NAME_LENGTH - call CopyData - ld a, [wMoveMonType] - cp PARTY_TO_DAYCARE - ld de, wDayCareMonName - jr z, .asm_f611 - dec a - ld hl, wPartyMonNicks - ld a, [wPartyCount] - jr nz, .asm_f60b - ld hl, wBoxMonNicks - ld a, [wNumInBox] -.asm_f60b - dec a - call SkipFixedLengthTextEntries - ld d, h - ld e, l -.asm_f611 - ld hl, wBoxMonNicks - ld a, [wMoveMonType] - and a - jr z, .asm_f624 - ld hl, wDayCareMonName - cp DAYCARE_TO_PARTY - jr z, .asm_f62a - ld hl, wPartyMonNicks -.asm_f624 - ld a, [wWhichPokemon] - call SkipFixedLengthTextEntries -.asm_f62a - ld bc, NAME_LENGTH - call CopyData - pop hl - ld a, [wMoveMonType] - cp PARTY_TO_BOX - jr z, .asm_f664 - cp PARTY_TO_DAYCARE - jr z, .asm_f664 - push hl - srl a - add $2 - ld [wMonDataLocation], a - call LoadMonData - callba CalcLevelFromExperience - ld a, d - ld [wCurEnemyLVL], a - pop hl - ld bc, wBoxMon2 - wBoxMon1 - add hl, bc - ld [hli], a - ld d, h - ld e, l - ld bc, -18 - add hl, bc - ld b, $1 - call CalcStats -.asm_f664 - and a - ret - - -FlagActionPredef: - call GetPredefRegisters - -FlagAction: -; Perform action b on bit c -; in the bitfield at hl. -; 0: reset -; 1: set -; 2: read -; Return the result in c. - - push hl - push de - push bc - - ; bit - ld a, c - ld d, a - and 7 - ld e, a - - ; byte - ld a, d - srl a - srl a - srl a - add l - ld l, a - jr nc, .ok - inc h -.ok - - ; d = 1 << e (bitmask) - inc e - ld d, 1 -.shift - dec e - jr z, .shifted - sla d - jr .shift -.shifted - - ld a, b - and a - jr z, .reset - cp 2 - jr z, .read - -.set - ld b, [hl] - ld a, d - or b - ld [hl], a - jr .done - -.reset - ld b, [hl] - ld a, d - xor $ff - and b - ld [hl], a - jr .done - -.read - ld b, [hl] - ld a, d - and b -.done - pop bc - pop de - pop hl - ld c, a - ret - - -HealParty: -; Restore HP and PP. - - ld hl, wPartySpecies - ld de, wPartyMon1HP -.healmon - ld a, [hli] - cp $ff - jr z, .done - - push hl - push de - - ld hl, wPartyMon1Status - wPartyMon1HP - add hl, de - xor a - ld [hl], a - - push de - ld b, NUM_MOVES ; A Pokémon has 4 moves -.pp - ld hl, wPartyMon1Moves - wPartyMon1HP - add hl, de - - ld a, [hl] - and a - jr z, .nextmove - - dec a - ld hl, wPartyMon1PP - wPartyMon1HP - add hl, de - - push hl - push de - push bc - - ld hl, Moves - ld bc, MoveEnd - Moves - call AddNTimes - ld de, wcd6d - ld a, BANK(Moves) - call FarCopyData - ld a, [wcd6d + 5] ; PP is byte 5 of move data - - pop bc - pop de - pop hl - - inc de - push bc - ld b, a - ld a, [hl] - and $c0 - add b - ld [hl], a - pop bc - -.nextmove - dec b - jr nz, .pp - pop de - - ld hl, wPartyMon1MaxHP - wPartyMon1HP - add hl, de - ld a, [hli] - ld [de], a - inc de - ld a, [hl] - ld [de], a - - pop de - pop hl - - push hl - ld bc, wPartyMon2 - wPartyMon1 - ld h, d - ld l, e - add hl, bc - ld d, h - ld e, l - pop hl - jr .healmon - -.done - xor a - ld [wWhichPokemon], a - ld [wd11e], a - - ld a, [wPartyCount] - ld b, a -.ppup - push bc - call RestoreBonusPP - pop bc - ld hl, wWhichPokemon - inc [hl] - dec b - jr nz, .ppup - ret - - -DivideBCDPredef:: -DivideBCDPredef2:: -DivideBCDPredef3:: -DivideBCDPredef4:: - call GetPredefRegisters - -DivideBCD:: - xor a - ld [$ffa5], a - ld [$ffa6], a - ld [$ffa7], a - ld d, $1 -.asm_f72a - ld a, [$ffa2] - and $f0 - jr nz, .asm_f75b - inc d - ld a, [$ffa2] - swap a - and $f0 - ld b, a - ld a, [$ffa3] - swap a - ld [$ffa3], a - and $f - or b - ld [$ffa2], a - ld a, [$ffa3] - and $f0 - ld b, a - ld a, [$ffa4] - swap a - ld [$ffa4], a - and $f - or b - ld [$ffa3], a - ld a, [$ffa4] - and $f0 - ld [$ffa4], a - jr .asm_f72a -.asm_f75b - push de - push de - call DivideBCD_f800 - pop de - ld a, b - swap a - and $f0 - ld [$ffa5], a - dec d - jr z, .asm_f7bc - push de - call DivideBCD_f7d7 - call DivideBCD_f800 - pop de - ld a, [$ffa5] - or b - ld [$ffa5], a - dec d - jr z, .asm_f7bc - push de - call DivideBCD_f7d7 - call DivideBCD_f800 - pop de - ld a, b - swap a - and $f0 - ld [$ffa6], a - dec d - jr z, .asm_f7bc - push de - call DivideBCD_f7d7 - call DivideBCD_f800 - pop de - ld a, [$ffa6] - or b - ld [$ffa6], a - dec d - jr z, .asm_f7bc - push de - call DivideBCD_f7d7 - call DivideBCD_f800 - pop de - ld a, b - swap a - and $f0 - ld [$ffa7], a - dec d - jr z, .asm_f7bc - push de - call DivideBCD_f7d7 - call DivideBCD_f800 - pop de - ld a, [$ffa7] - or b - ld [$ffa7], a -.asm_f7bc - ld a, [$ffa5] - ld [$ffa2], a - ld a, [$ffa6] - ld [$ffa3], a - ld a, [$ffa7] - ld [$ffa4], a - pop de - ld a, $6 - sub d - and a - ret z -.asm_f7ce - push af - call DivideBCD_f7d7 - pop af - dec a - jr nz, .asm_f7ce - ret - -DivideBCD_f7d7: - ld a, [$ffa4] - swap a - and $f - ld b, a - ld a, [$ffa3] - swap a - ld [$ffa3], a - and $f0 - or b - ld [$ffa4], a - ld a, [$ffa3] - and $f - ld b, a - ld a, [$ffa2] - swap a - ld [$ffa2], a - and $f0 - or b - ld [$ffa3], a - ld a, [$ffa2] - and $f - ld [$ffa2], a - ret - -DivideBCD_f800: - ld bc, $3 -.asm_f803 - ld de, $ff9f - ld hl, $ffa2 - push bc - call StringCmp - pop bc - ret c - inc b - ld de, $ffa1 - ld hl, $ffa4 - push bc - call SubBCD - pop bc - jr .asm_f803 - - -AddBCDPredef:: - call GetPredefRegisters - -AddBCD:: - and a - ld b, c -.add - ld a, [de] - adc [hl] - daa - ld [de], a - dec de - dec hl - dec c - jr nz, .add - jr nc, .done - ld a, $99 - inc de -.fill - ld [de], a - inc de - dec b - jr nz, .fill -.done - ret - - -SubBCDPredef:: - call GetPredefRegisters - -SubBCD:: - and a - ld b, c -.sub - ld a, [de] - sbc [hl] - daa - ld [de], a - dec de - dec hl - dec c - jr nz, .sub - jr nc, .done - ld a, $00 - inc de -.fill - ld [de], a - inc de - dec b - jr nz, .fill - scf -.done - ret - - -InitPlayerData: -InitPlayerData2: - - call Random - ld a, [hRandomSub] - ld [wPlayerID], a - - call Random - ld a, [hRandomAdd] - ld [wPlayerID + 1], a - - ld a, $ff - ld [wUnusedD71B], a - - ld hl, wPartyCount - call InitializeEmptyList - ld hl, wNumInBox - call InitializeEmptyList - ld hl, wNumBagItems - call InitializeEmptyList - ld hl, wNumBoxItems - call InitializeEmptyList - -START_MONEY EQU $3000 - ld hl, wPlayerMoney + 1 - ld a, START_MONEY / $100 - ld [hld], a - xor a - ld [hli], a - inc hl - ld [hl], a - - ld [wMonDataLocation], a - - ld hl, wObtainedBadges - ld [hli], a - - ld [hl], a - - ld hl, wPlayerCoins - ld [hli], a - ld [hl], a - - ld hl, wGameProgressFlags - ld bc, wGameProgressFlagsEnd - wGameProgressFlags - call FillMemory ; clear all game progress flags - - jp InitializeMissableObjectsFlags - -InitializeEmptyList: - xor a ; count - ld [hli], a - dec a ; terminator - ld [hl], a - ret - - -GetQuantityOfItemInBag: -; In: b = item ID -; Out: b = how many of that item are in the bag - call GetPredefRegisters - ld hl, wNumBagItems -.loop - inc hl - ld a, [hli] - cp $ff - jr z, .notInBag - cp b - jr nz, .loop - ld a, [hl] - ld b, a - ret -.notInBag - ld b, 0 - ret - -FindPathToPlayer: - xor a - ld hl, hFindPathNumSteps - ld [hli], a ; hFindPathNumSteps - ld [hli], a ; hFindPathFlags - ld [hli], a ; hFindPathYProgress - ld [hl], a ; hFindPathXProgress - ld hl, wNPCMovementDirections2 - ld de, $0 -.loop - ld a, [hFindPathYProgress] - ld b, a - ld a, [hNPCPlayerYDistance] ; Y distance in steps - call CalcDifference - ld d, a - and a - jr nz, .asm_f8da - ld a, [hFindPathFlags] - set 0, a ; current end of path matches the player's Y coordinate - ld [hFindPathFlags], a -.asm_f8da - ld a, [hFindPathXProgress] - ld b, a - ld a, [hNPCPlayerXDistance] ; X distance in steps - call CalcDifference - ld e, a - and a - jr nz, .asm_f8ec - ld a, [hFindPathFlags] - set 1, a ; current end of path matches the player's X coordinate - ld [hFindPathFlags], a -.asm_f8ec - ld a, [hFindPathFlags] - cp $3 ; has the end of the path reached the player's position? - jr z, .done -; Compare whether the X distance between the player and the current of the path -; is greater or if the Y distance is. Then, try to reduce whichever is greater. - ld a, e - cp d - jr c, .yDistanceGreater -; x distance is greater - ld a, [hNPCPlayerRelativePosFlags] - bit 1, a - jr nz, .playerIsLeftOfNPC - ld d, NPC_MOVEMENT_RIGHT - jr .next1 -.playerIsLeftOfNPC - ld d, NPC_MOVEMENT_LEFT -.next1 - ld a, [hFindPathXProgress] - add 1 - ld [hFindPathXProgress], a - jr .storeDirection -.yDistanceGreater - ld a, [hNPCPlayerRelativePosFlags] - bit 0, a - jr nz, .playerIsAboveNPC - ld d, NPC_MOVEMENT_DOWN - jr .next2 -.playerIsAboveNPC - ld d, NPC_MOVEMENT_UP -.next2 - ld a, [hFindPathYProgress] - add 1 - ld [hFindPathYProgress], a -.storeDirection - ld a, d - ld [hli], a - ld a, [hFindPathNumSteps] - inc a - ld [hFindPathNumSteps], a - jp .loop -.done - ld [hl], $ff - ret - -CalcPositionOfPlayerRelativeToNPC: - xor a - ld [hNPCPlayerRelativePosFlags], a - ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels - ld d, a - ld a, [wSpriteStateData1 + 6] ; player's sprite screen X position in pixels - ld e, a - ld hl, wSpriteStateData1 - ld a, [hNPCSpriteOffset] - add l - add $4 - ld l, a - jr nc, .noCarry - inc h -.noCarry - ld a, d - ld b, a - ld a, [hli] ; NPC sprite screen Y position in pixels - call CalcDifference - jr nc, .NPCSouthOfOrAlignedWithPlayer -.NPCNorthOfPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 0, [hl] - set 0, [hl] - pop hl - jr .divideYDistance -.NPCSouthOfOrAlignedWithPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 0, [hl] - res 0, [hl] - pop hl -.divideYDistance - push hl - ld hl, hDividend2 - ld [hli], a - ld a, 16 - ld [hli], a - call DivideBytes ; divide Y absolute distance by 16 - ld a, [hl] ; quotient - ld [hNPCPlayerYDistance], a - pop hl - inc hl - ld b, e - ld a, [hl] ; NPC sprite screen X position in pixels - call CalcDifference - jr nc, .NPCEastOfOrAlignedWithPlayer -.NPCWestOfPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 1, [hl] - set 1, [hl] - pop hl - jr .divideXDistance -.NPCEastOfOrAlignedWithPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 1, [hl] - res 1, [hl] - pop hl -.divideXDistance - ld [hDividend2], a - ld a, 16 - ld [hDivisor2], a - call DivideBytes ; divide X absolute distance by 16 - ld a, [hQuotient2] - ld [hNPCPlayerXDistance], a - ld a, [hNPCPlayerRelativePosPerspective] - and a - ret z - ld a, [hNPCPlayerRelativePosFlags] - cpl - and $3 - ld [hNPCPlayerRelativePosFlags], a - ret - -ConvertNPCMovementDirectionsToJoypadMasks: - ld a, [hNPCMovementDirections2Index] - ld [wNPCMovementDirections2Index], a - dec a - ld de, wSimulatedJoypadStatesEnd - ld hl, wNPCMovementDirections2 - add l - ld l, a - jr nc, .loop - inc h -.loop - ld a, [hld] - call ConvertNPCMovementDirectionToJoypadMask - ld [de], a - inc de - ld a, [hNPCMovementDirections2Index] - dec a - ld [hNPCMovementDirections2Index], a - jr nz, .loop - ret - -ConvertNPCMovementDirectionToJoypadMask: - push hl - ld b, a - ld hl, NPCMovementDirectionsToJoypadMasksTable -.loop - ld a, [hli] - cp $ff - jr z, .done - cp b - jr z, .loadJoypadMask - inc hl - jr .loop -.loadJoypadMask - ld a, [hl] -.done - pop hl - ret - -NPCMovementDirectionsToJoypadMasksTable: - db NPC_MOVEMENT_UP, D_UP - db NPC_MOVEMENT_DOWN, D_DOWN - db NPC_MOVEMENT_LEFT, D_LEFT - db NPC_MOVEMENT_RIGHT, D_RIGHT - db $ff - -; unreferenced - ret +INCLUDE "engine/menu/draw_badges.asm" +INCLUDE "engine/overworld/update_map.asm" +INCLUDE "engine/overworld/cut.asm" +INCLUDE "engine/overworld/missable_objects.asm" +INCLUDE "engine/overworld/push_boulder.asm" + +INCLUDE "engine/add_mon.asm" +INCLUDE "engine/flag_action.asm" +INCLUDE "engine/heal_party.asm" +INCLUDE "engine/bcd.asm" +INCLUDE "engine/init_player_data.asm" +INCLUDE "engine/get_bag_item_quantity.asm" +INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" - INCLUDE "engine/hidden_object_functions3.asm" - SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" -- cgit v1.2.3 From 3068ab2e19497ace112eb9608975944ebb3ae210 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 31 Dec 2016 17:36:05 -0800 Subject: use text constants in poison.asm --- engine/overworld/poison.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/overworld/poison.asm b/engine/overworld/poison.asm index 75f68568..5d8eb9fd 100644 --- a/engine/overworld/poison.asm +++ b/engine/overworld/poison.asm @@ -51,7 +51,7 @@ ApplyOutOfBattlePoisonDamage: xor a ld [wJoyIgnore], a call EnableAutoTextBoxDrawing - ld a, $d0 + ld a, TEXT_MON_FAINTED ld [hSpriteIndexOrTextID], a call DisplayTextID pop de @@ -98,7 +98,7 @@ ApplyOutOfBattlePoisonDamage: and a jr nz, .noBlackOut call EnableAutoTextBoxDrawing - ld a, $d1 + ld a, TEXT_BLACKED_OUT ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72e -- cgit v1.2.3 From 7c3a90bf0181127fab4cd98ad4a3173a2984f51e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 7 Jan 2017 11:13:52 -0800 Subject: use actual predef label --- engine/predefs.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/predefs.asm b/engine/predefs.asm index 7b0be1e9..605cba3a 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -58,7 +58,7 @@ PredefPointers:: add_predef ScaleSpriteByTwo add_predef LoadMonBackPic add_predef CopyDownscaledMonTiles - add_predef LoadMissableObjects + dbw $03,JumpMoveEffect ; wrong bank add_predef HealParty add_predef MoveAnimation add_predef DivideBCDPredef -- cgit v1.2.3 From 46fbe5531b370a2f932e3f204de1e7527a5a3b6d Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 16 Jan 2017 14:42:15 -0800 Subject: fix incorrect comment --- engine/battle/moveEffects/haze_effect.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index bd20f231..06907bcc 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -12,6 +12,7 @@ HazeEffect_: ld hl, wEnemyMonUnmodifiedAttack ld de, wEnemyMonAttack call ResetStats +; cure non-volatile status, but only for the target ld hl, wEnemyMonStatus ld de, wEnemySelectedMove ld a, [H_WHOSETURN] @@ -46,7 +47,6 @@ HazeEffect_: jp PrintText CureVolatileStatuses: -; only cures statuses of the Pokemon not using Haze res Confused, [hl] inc hl ; BATTSTATUS2 ld a, [hl] -- cgit v1.2.3 From f40c979a6cab4904219c6b145ba9549c5a56108d Mon Sep 17 00:00:00 2001 From: dannye Date: Fri, 20 Jan 2017 17:32:43 -0600 Subject: Fix typos --- home.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home.asm b/home.asm index def6200a..8cd85019 100644 --- a/home.asm +++ b/home.asm @@ -208,7 +208,7 @@ DrawHPBar:: and a jr nz, .fill - ; If c iz nonzero, draw a pixel anyway. + ; If c is nonzero, draw a pixel anyway. ld a, c and a jr z, .done @@ -4113,7 +4113,7 @@ EraseMenuCursor:: ; The reason is that most functions that call this initialize H_DOWNARROWBLINKCNT1 to 0. ; The effect is that if the tile at hl is initialized with a down arrow, ; this function will toggle that down arrow on and off, but if the tile isn't -; initliazed with a down arrow, this function does nothing. +; initialized with a down arrow, this function does nothing. ; That allows this to be called without worrying about if a down arrow should ; be blinking. HandleDownArrowBlinkTiming:: -- cgit v1.2.3 From cec6e6e2fb7886acc85200f921d3913fd2ea8a2b Mon Sep 17 00:00:00 2001 From: AntonioND Date: Tue, 14 Mar 2017 20:52:58 +0000 Subject: Fix floating sections This is needed to prevent rgblink from moving them around in future releases. Signed-off-by: AntonioND --- audio.asm | 30 +++++++++++++------------- home.asm | 4 ++-- main.asm | 72 +++++++++++++++++++++++++++++++-------------------------------- sram.asm | 8 +++---- text.asm | 26 +++++++++++------------ wram.asm | 4 ++-- 6 files changed, 72 insertions(+), 72 deletions(-) diff --git a/audio.asm b/audio.asm index 0a344ae7..a2cb3220 100644 --- a/audio.asm +++ b/audio.asm @@ -6,29 +6,29 @@ AUDIO_3 EQU $1f INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX[$4000], BANK[AUDIO_1] INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX[$4000], BANK[AUDIO_2] INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX[$4000], BANK[AUDIO_3] INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX[$422E], BANK[AUDIO_1] INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX[$42BE], BANK[AUDIO_2] INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX[$4249], BANK[AUDIO_3] INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX[$42FD], BANK[AUDIO_1] INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -127,7 +127,7 @@ INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effects 2", ROMX[$42FD], BANK[AUDIO_2] INCLUDE "audio/sfx/snare1_2.asm" INCLUDE "audio/sfx/snare2_2.asm" @@ -252,7 +252,7 @@ INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effects 3", ROMX[$42FD], BANK[AUDIO_3] INCLUDE "audio/sfx/snare1_3.asm" INCLUDE "audio/sfx/snare2_3.asm" @@ -360,7 +360,7 @@ INCLUDE "audio/sfx/cry22_3.asm" -SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] +SECTION "Audio Engine 1", ROMX[$50C6], BANK[AUDIO_1] PlayBattleMusic:: xor a @@ -453,7 +453,7 @@ Music_Cities1AlternateTempo:: jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] +SECTION "Audio Engine 2", ROMX[$536E], BANK[AUDIO_2] Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] @@ -557,7 +557,7 @@ Audio2_OverwriteChannelPointer: ret -SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] +SECTION "Audio Engine 3", ROMX[$513B], BANK[AUDIO_3] PlayPokedexRatingSfx:: ld a, [$ffdc] @@ -601,7 +601,7 @@ INCLUDE "audio/engine_3.asm" -SECTION "Music 1", ROMX, BANK[AUDIO_1] +SECTION "Music 1", ROMX[$5BA3], BANK[AUDIO_1] INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" @@ -630,7 +630,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX, BANK[AUDIO_2] +SECTION "Music 2", ROMX[$6322], BANK[AUDIO_2] INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +646,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX, BANK[AUDIO_3] +SECTION "Music 3", ROMX[$5BBB], BANK[AUDIO_3] INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" diff --git a/home.asm b/home.asm index 8cd85019..bfd73b31 100644 --- a/home.asm +++ b/home.asm @@ -30,7 +30,7 @@ SECTION "joypad", ROM0 [$60] reti -SECTION "Home", ROM0 +SECTION "Home", ROM0 [$61] DisableLCD:: xor a @@ -99,7 +99,7 @@ SECTION "Header", ROM0 [$104] -SECTION "Main", ROM0 +SECTION "Main", ROM0 [$150] Start:: cp GBC diff --git a/main.asm b/main.asm index da2d3671..7943dc3d 100755 --- a/main.asm +++ b/main.asm @@ -14,7 +14,7 @@ PICS_5 EQU $D INCLUDE "home.asm" -SECTION "bank1",ROMX,BANK[$1] +SECTION "bank1",ROMX[$4000],BANK[$1] INCLUDE "data/facing.asm" @@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" -SECTION "bank3",ROMX,BANK[$3] +SECTION "bank3",ROMX[$4000],BANK[$3] INCLUDE "engine/joypad.asm" @@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX[$4000], BANK[NPC_SPRITES_1] OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" -SECTION "Graphics", ROMX, BANK[GFX] +SECTION "Graphics", ROMX[$5380], BANK[GFX] PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -184,7 +184,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" PlayerCharacterTitleGraphicsEnd: -SECTION "Battle (bank 4)", ROMX, BANK[$4] +SECTION "Battle (bank 4)", ROMX[$68D8], BANK[$4] INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" @@ -206,7 +206,7 @@ INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX[$4000], BANK[NPC_SPRITES_2] RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -250,7 +250,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -SECTION "Battle (bank 5)", ROMX, BANK[$5] +SECTION "Battle (bank 5)", ROMX[$7840], BANK[$5] INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -260,7 +260,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank6",ROMX,BANK[$6] +SECTION "bank6",ROMX[$4000],BANK[$6] INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -335,7 +335,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7",ROMX,BANK[$7] +SECTION "bank7",ROMX[$4000],BANK[$7] INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -516,7 +516,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX, BANK[PICS_1] +SECTION "Pics 1", ROMX[$4000], BANK[PICS_1] RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" @@ -578,13 +578,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -SECTION "Battle (bank 9)", ROMX, BANK[$9] +SECTION "Battle (bank 9)", ROMX[$7D6B], BANK[$9] INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" -SECTION "Pics 2", ROMX, BANK[PICS_2] +SECTION "Pics 2", ROMX[$4000], BANK[PICS_2] GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" @@ -652,11 +652,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -SECTION "Battle (bank A)", ROMX, BANK[$A] +SECTION "Battle (bank A)", ROMX[$7EA9], BANK[$A] INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX, BANK[PICS_3] +SECTION "Pics 3", ROMX[$4000], BANK[PICS_3] ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" @@ -730,7 +730,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -SECTION "Battle (bank B)", ROMX, BANK[$B] +SECTION "Battle (bank B)", ROMX[$7B7B], BANK[$B] INCLUDE "engine/battle/display_effectiveness.asm" @@ -746,7 +746,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX, BANK[PICS_4] +SECTION "Pics 4", ROMX[$4000], BANK[PICS_4] DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" @@ -811,12 +811,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" -SECTION "Battle (bank C)", ROMX, BANK[$C] +SECTION "Battle (bank C)", ROMX[$7F2B], BANK[$C] INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" -SECTION "Pics 5", ROMX, BANK[PICS_5] +SECTION "Pics 5", ROMX[$4000], BANK[PICS_5] BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" @@ -874,7 +874,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -SECTION "Battle (bank D)", ROMX, BANK[$D] +SECTION "Battle (bank D)", ROMX[$7244], BANK[$D] INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" @@ -884,7 +884,7 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bankE",ROMX,BANK[$E] +SECTION "bankE",ROMX[$4000],BANK[$E] INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -910,12 +910,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm" INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" -SECTION "bankF",ROMX,BANK[$F] +SECTION "bankF",ROMX[$4000],BANK[$F] INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX,BANK[$10] +SECTION "bank10",ROMX[$4000],BANK[$10] INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/trade.asm" @@ -923,7 +923,7 @@ INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" -SECTION "bank11",ROMX,BANK[$11] +SECTION "bank11",ROMX[$4000],BANK[$11] INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1068,7 +1068,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12",ROMX,BANK[$12] +SECTION "bank12",ROMX[$4000],BANK[$12] INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1247,7 +1247,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX,BANK[$13] +SECTION "bank13",ROMX[$4000],BANK[$13] TrainerPics:: YoungsterPic:: INCBIN "pic/trainer/youngster.pic" @@ -1312,7 +1312,7 @@ INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14",ROMX,BANK[$14] +SECTION "bank14",ROMX[$4000],BANK[$14] INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1390,7 +1390,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX,BANK[$15] +SECTION "bank15",ROMX[$4000],BANK[$15] INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1482,7 +1482,7 @@ INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX,BANK[$16] +SECTION "bank16",ROMX[$4000],BANK[$16] INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1572,7 +1572,7 @@ HallofFameRoomBlocks: INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX,BANK[$17] +SECTION "bank17",ROMX[$4000],BANK[$17] SaffronMartBlocks: LavenderMartBlocks: @@ -1728,7 +1728,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX,BANK[$18] +SECTION "bank18",ROMX[$4000],BANK[$18] ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1851,7 +1851,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX,BANK[$19] +SECTION "bank19",ROMX[$4000],BANK[$19] Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1873,7 +1873,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX,BANK[$1A] +SECTION "bank1A",ROMX[$4000],BANK[$1A] INCLUDE "engine/battle/decrement_pp.asm" @@ -1909,7 +1909,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX,BANK[$1B] +SECTION "bank1B",ROMX[$4000],BANK[$1B] Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1927,7 +1927,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX,BANK[$1C] +SECTION "bank1C",ROMX[$4000],BANK[$1C] INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1942,7 +1942,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX,BANK[$1D] +SECTION "bank1D",ROMX[$4000],BANK[$1D] CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" @@ -2074,7 +2074,7 @@ INCLUDE "engine/menu/league_pc.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX,BANK[$1E] +SECTION "bank1E",ROMX[$4000],BANK[$1E] INCLUDE "engine/battle/animations.asm" diff --git a/sram.asm b/sram.asm index 3e7b3e16..3b51df77 100644 --- a/sram.asm +++ b/sram.asm @@ -1,4 +1,4 @@ -SECTION "Sprite Buffers", SRAM, BANK[0] +SECTION "Sprite Buffers", SRAM[$a000], BANK[0] sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 @@ -9,7 +9,7 @@ sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 -SECTION "Save Data", SRAM, BANK[1] +SECTION "Save Data", SRAM[$a000], BANK[1] ds $598 sPlayerName:: ds NAME_LENGTH ; a598 @@ -21,7 +21,7 @@ sTilesetType:: ds 1 ; b522 sMainDataCheckSum:: ds 1 ; b523 -SECTION "Saved Boxes 1", SRAM, BANK[2] +SECTION "Saved Boxes 1", SRAM[$a000], BANK[2] sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -33,7 +33,7 @@ sBank2AllBoxesChecksum:: ds 1 ; ba4c sBank2IndividualBoxChecksums:: ds 6 ; ba4d -SECTION "Saved Boxes 2", SRAM, BANK[3] +SECTION "Saved Boxes 2", SRAM[$a000], BANK[3] sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 diff --git a/text.asm b/text.asm index 866d4a7f..be12aa7d 100644 --- a/text.asm +++ b/text.asm @@ -19,7 +19,7 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" -SECTION "Text 1", ROMX, BANK[TEXT_1] +SECTION "Text 1", ROMX[$4000], BANK[TEXT_1] _CardKeySuccessText1:: text "Bingo!@@" @@ -192,7 +192,7 @@ INCLUDE "text/maps/silph_co_4f.asm" INCLUDE "text/maps/silph_co_5f_1.asm" -SECTION "Text 2", ROMX, BANK[TEXT_2] +SECTION "Text 2", ROMX[$4000], BANK[TEXT_2] INCLUDE "text/maps/silph_co_5f_2.asm" INCLUDE "text/maps/silph_co_6f.asm" @@ -224,7 +224,7 @@ INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f_1.asm" -SECTION "Text 3", ROMX, BANK[TEXT_3] +SECTION "Text 3", ROMX[$4000], BANK[TEXT_3] INCLUDE "text/maps/rock_tunnel_b2f_2.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" @@ -1939,7 +1939,7 @@ INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare_1.asm" -SECTION "Text 4", ROMX, BANK[TEXT_4] +SECTION "Text 4", ROMX[$4000], BANK[TEXT_4] INCLUDE "text/maps/daycare_2.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" @@ -1978,7 +1978,7 @@ INCLUDE "text/maps/route_10.asm" INCLUDE "text/maps/route_11_1.asm" -SECTION "Text 5", ROMX, BANK[TEXT_5] +SECTION "Text 5", ROMX[$4000], BANK[TEXT_5] INCLUDE "text/maps/route_11_2.asm" INCLUDE "text/maps/route_12.asm" @@ -1996,7 +1996,7 @@ INCLUDE "text/maps/route_23.asm" INCLUDE "text/maps/route_24_1.asm" -SECTION "Text 6", ROMX, BANK[TEXT_6] +SECTION "Text 6", ROMX[$4000], BANK[TEXT_6] INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" @@ -2339,7 +2339,7 @@ INCLUDE "text/maps/museum_2f.asm" INCLUDE "text/maps/pewter_gym_1.asm" -SECTION "Text 7", ROMX, BANK[TEXT_7] +SECTION "Text 7", ROMX[$4000], BANK[TEXT_7] INCLUDE "text/maps/pewter_gym_2.asm" INCLUDE "text/maps/pewter_house_1.asm" @@ -2371,7 +2371,7 @@ INCLUDE "text/maps/vermilion_mart.asm" INCLUDE "text/maps/vermilion_gym_1.asm" -SECTION "Text 8", ROMX, BANK[TEXT_8] +SECTION "Text 8", ROMX[$4000], BANK[TEXT_8] INCLUDE "text/maps/vermilion_gym_2.asm" INCLUDE "text/maps/vermilion_house.asm" @@ -2403,7 +2403,7 @@ INCLUDE "text/maps/safari_zone_entrance.asm" INCLUDE "text/maps/fuchsia_gym_1.asm" -SECTION "Text 9", ROMX, BANK[TEXT_9] +SECTION "Text 9", ROMX[$4000], BANK[TEXT_9] INCLUDE "text/maps/fuchsia_gym_2.asm" INCLUDE "text/maps/fuchsia_meeting_room.asm" @@ -2646,7 +2646,7 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: done -SECTION "Text 10", ROMX, BANK[TEXT_10] +SECTION "Text 10", ROMX[$4000], BANK[TEXT_10] _CableClubNPCPleaseComeAgainText:: text "Please come again!" @@ -2992,7 +2992,7 @@ _BoxFullCannotThrowBallText:: prompt -SECTION "Text 11", ROMX, BANK[TEXT_11] +SECTION "Text 11", ROMX[$4000], BANK[TEXT_11] _ItemUseText001:: text " used@@" @@ -3192,11 +3192,11 @@ _UsedCutText:: prompt -SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT] +SECTION "Pokedex Text", ROMX[$4000], BANK[POKEDEX_TEXT] INCLUDE "text/pokedex.asm" -SECTION "Move Names", ROMX, BANK[MOVE_NAMES] +SECTION "Move Names", ROMX[$4000], BANK[MOVE_NAMES] INCLUDE "text/move_names.asm" diff --git a/wram.asm b/wram.asm index 35acff94..af130062 100755 --- a/wram.asm +++ b/wram.asm @@ -60,7 +60,7 @@ battle_struct: MACRO ENDM -SECTION "WRAM Bank 0", WRAM0 +SECTION "WRAM Bank 0", WRAM0 [$c000] wUnusedC000:: ; c000 ds 1 @@ -1610,7 +1610,7 @@ wEnemyMonDefense:: dw wEnemyMonSpeed:: dw wEnemyMonSpecial:: dw wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX, BANK[1] +SECTION "WRAM Bank 1", WRAMX[$d000], BANK[1] ds 2 ; NUM_MOVES - 2 wEnemyMonBaseStats:: ds 5 -- cgit v1.2.3 From cfacfd847c56a5162d33684238acf6c59e0677b9 Mon Sep 17 00:00:00 2001 From: Panda Habert Date: Thu, 16 Mar 2017 20:47:01 +0100 Subject: Fix typo in address --- wram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wram.asm b/wram.asm index af130062..47502613 100755 --- a/wram.asm +++ b/wram.asm @@ -1414,7 +1414,7 @@ wStatusScreenHPBarColor:: ; cf25 ds 7 -wCopyingSGBTileData:: ; c2fd +wCopyingSGBTileData:: ; cf2d wWhichPartyMenuHPBar:: ; cf2d -- cgit v1.2.3 From ce35f2f7a1d72c3404e3c7953cdaa10a0cff00e8 Mon Sep 17 00:00:00 2001 From: Joe Farebrother Date: Sun, 19 Mar 2017 20:35:40 +0000 Subject: Gave the labels in _MoveMon more descriptive names and added a few comments --- engine/add_mon.asm | 78 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/engine/add_mon.asm b/engine/add_mon.asm index 19d03942..b2feeb12 100644 --- a/engine/add_mon.asm +++ b/engine/add_mon.asm @@ -340,13 +340,14 @@ _AddEnemyMonToPlayerParty: _MoveMon: ld a, [wMoveMonType] - and a + and a ; BOX_TO_PARTY jr z, .checkPartyMonSlots cp DAYCARE_TO_PARTY jr z, .checkPartyMonSlots cp PARTY_TO_DAYCARE ld hl, wDayCareMon - jr z, .asm_f575 + jr z, .findMonDataSrc + ; else it's PARTY_TO_BOX ld hl, wNumInBox ld a, [hl] cp MONS_PER_BOX @@ -369,24 +370,26 @@ _MoveMon: ld a, [wMoveMonType] cp DAYCARE_TO_PARTY ld a, [wDayCareMon] - jr z, .asm_f556 + jr z, .copySpecies ld a, [wcf91] -.asm_f556 +.copySpecies ld [hli], a ; write new mon ID ld [hl], $ff ; write new sentinel +.findMonDataDest ld a, [wMoveMonType] dec a ld hl, wPartyMons ld bc, wPartyMon2 - wPartyMon1 ; $2c ld a, [wPartyCount] - jr nz, .skipToNewMonEntry + jr nz, .addMonOffset + ; if it's PARTY_TO_BOX ld hl, wBoxMons ld bc, wBoxMon2 - wBoxMon1 ; $21 ld a, [wNumInBox] -.skipToNewMonEntry +.addMonOffset dec a call AddNTimes -.asm_f575 +.findMonDataSrc push hl ld e, l ld d, h @@ -394,16 +397,16 @@ _MoveMon: and a ld hl, wBoxMons ld bc, wBoxMon2 - wBoxMon1 ; $21 - jr z, .asm_f591 + jr z, .addMonOffset2 cp DAYCARE_TO_PARTY ld hl, wDayCareMon - jr z, .asm_f597 + jr z, .copyMonData ld hl, wPartyMons ld bc, wPartyMon2 - wPartyMon1 ; $2c -.asm_f591 +.addMonOffset2 ld a, [wWhichPokemon] call AddNTimes -.asm_f597 +.copyMonData push hl push de ld bc, wBoxMon2 - wBoxMon1 @@ -411,84 +414,85 @@ _MoveMon: pop de pop hl ld a, [wMoveMonType] - and a - jr z, .asm_f5b4 + and a ; BOX_TO_PARTY + jr z, .findOTdest cp DAYCARE_TO_PARTY - jr z, .asm_f5b4 + jr z, .findOTdest ld bc, wBoxMon2 - wBoxMon1 add hl, bc - ld a, [hl] + ld a, [hl] ; hl = Level inc de inc de inc de - ld [de], a -.asm_f5b4 + ld [de], a ; de = BoxLevel +.findOTdest ld a, [wMoveMonType] cp PARTY_TO_DAYCARE ld de, wDayCareMonOT - jr z, .asm_f5d3 - dec a + jr z, .findOTsrc + dec a ld hl, wPartyMonOT ld a, [wPartyCount] - jr nz, .asm_f5cd + jr nz, .addOToffset ld hl, wBoxMonOT ld a, [wNumInBox] -.asm_f5cd +.addOToffset dec a call SkipFixedLengthTextEntries ld d, h ld e, l -.asm_f5d3 +.findOTsrc ld hl, wBoxMonOT ld a, [wMoveMonType] and a - jr z, .asm_f5e6 + jr z, .addOToffset2 ld hl, wDayCareMonOT cp DAYCARE_TO_PARTY - jr z, .asm_f5ec + jr z, .copyOT ld hl, wPartyMonOT -.asm_f5e6 +.addOToffset2 ld a, [wWhichPokemon] call SkipFixedLengthTextEntries -.asm_f5ec +.copyOT ld bc, NAME_LENGTH call CopyData ld a, [wMoveMonType] +.findNickDest cp PARTY_TO_DAYCARE ld de, wDayCareMonName - jr z, .asm_f611 + jr z, .findNickSrc dec a ld hl, wPartyMonNicks ld a, [wPartyCount] - jr nz, .asm_f60b + jr nz, .addNickOffset ld hl, wBoxMonNicks ld a, [wNumInBox] -.asm_f60b +.addNickOffset dec a call SkipFixedLengthTextEntries ld d, h ld e, l -.asm_f611 +.findNickSrc ld hl, wBoxMonNicks ld a, [wMoveMonType] and a - jr z, .asm_f624 + jr z, .addNickOffset2 ld hl, wDayCareMonName cp DAYCARE_TO_PARTY - jr z, .asm_f62a + jr z, .copyNick ld hl, wPartyMonNicks -.asm_f624 +.addNickOffset2 ld a, [wWhichPokemon] call SkipFixedLengthTextEntries -.asm_f62a +.copyNick ld bc, NAME_LENGTH call CopyData pop hl ld a, [wMoveMonType] cp PARTY_TO_BOX - jr z, .asm_f664 + jr z, .done cp PARTY_TO_DAYCARE - jr z, .asm_f664 + jr z, .done push hl srl a add $2 @@ -507,6 +511,6 @@ _MoveMon: add hl, bc ld b, $1 call CalcStats -.asm_f664 +.done and a ret -- cgit v1.2.3 From 39d31cecb263498e286c1fba3b8e0c6d439244b9 Mon Sep 17 00:00:00 2001 From: Joe Farebrother Date: Sun, 19 Mar 2017 21:09:24 +0000 Subject: Gave names to the functions and labels and adresses used in DivideBCD and added a few comments --- engine/bcd.asm | 146 +++++++++++++++++++++++++++++---------------------------- hram.asm | 1 + 2 files changed, 75 insertions(+), 72 deletions(-) diff --git a/engine/bcd.asm b/engine/bcd.asm index 3e693e1f..2d0b43df 100644 --- a/engine/bcd.asm +++ b/engine/bcd.asm @@ -6,155 +6,157 @@ DivideBCDPredef4:: DivideBCD:: xor a - ld [$ffa5], a - ld [$ffa6], a - ld [$ffa7], a + ld [hDivideBCDBuffer], a + ld [hDivideBCDBuffer+1], a + ld [hDivideBCDBuffer+2], a ld d, $1 -.asm_f72a - ld a, [$ffa2] +.mulBy10Loop +; multiply the divisor by 10 until the leading digit is nonzero +; to set up the standard long division algorithm + ld a, [hDivideBCDDivisor] and $f0 - jr nz, .asm_f75b + jr nz, .next inc d - ld a, [$ffa2] + ld a, [hDivideBCDDivisor] swap a and $f0 ld b, a - ld a, [$ffa3] + ld a, [hDivideBCDDivisor+1] swap a - ld [$ffa3], a + ld [hDivideBCDDivisor+1], a and $f or b - ld [$ffa2], a - ld a, [$ffa3] + ld [hDivideBCDDivisor], a + ld a, [hDivideBCDDivisor+1] and $f0 ld b, a - ld a, [$ffa4] + ld a, [hDivideBCDDivisor+2] swap a - ld [$ffa4], a + ld [hDivideBCDDivisor+2], a and $f or b - ld [$ffa3], a - ld a, [$ffa4] + ld [hDivideBCDDivisor+1], a + ld a, [hDivideBCDDivisor+2] and $f0 - ld [$ffa4], a - jr .asm_f72a -.asm_f75b + ld [hDivideBCDDivisor+2], a + jr .mulBy10Loop +.next push de push de - call DivideBCD_f800 + call DivideBCD_getNextDigit pop de ld a, b swap a and $f0 - ld [$ffa5], a + ld [hDivideBCDBuffer], a dec d - jr z, .asm_f7bc + jr z, .next2 push de - call DivideBCD_f7d7 - call DivideBCD_f800 + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit pop de - ld a, [$ffa5] + ld a, [hDivideBCDBuffer] or b - ld [$ffa5], a + ld [hDivideBCDBuffer], a dec d - jr z, .asm_f7bc + jr z, .next2 push de - call DivideBCD_f7d7 - call DivideBCD_f800 + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit pop de ld a, b swap a and $f0 - ld [$ffa6], a + ld [hDivideBCDBuffer+1], a dec d - jr z, .asm_f7bc + jr z, .next2 push de - call DivideBCD_f7d7 - call DivideBCD_f800 + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit pop de - ld a, [$ffa6] + ld a, [hDivideBCDBuffer+1] or b - ld [$ffa6], a + ld [hDivideBCDBuffer+1], a dec d - jr z, .asm_f7bc + jr z, .next2 push de - call DivideBCD_f7d7 - call DivideBCD_f800 + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit pop de ld a, b swap a and $f0 - ld [$ffa7], a + ld [hDivideBCDBuffer+2], a dec d - jr z, .asm_f7bc + jr z, .next2 push de - call DivideBCD_f7d7 - call DivideBCD_f800 + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit pop de - ld a, [$ffa7] + ld a, [hDivideBCDBuffer+2] or b - ld [$ffa7], a -.asm_f7bc - ld a, [$ffa5] - ld [$ffa2], a - ld a, [$ffa6] - ld [$ffa3], a - ld a, [$ffa7] - ld [$ffa4], a + ld [hDivideBCDBuffer+2], a +.next2 + ld a, [hDivideBCDBuffer] + ld [hDivideBCDQuotient], a ; the same memory location as hDivideBCDDivisor + ld a, [hDivideBCDBuffer+1] + ld [hDivideBCDQuotient+1], a + ld a, [hDivideBCDBuffer+2] + ld [hDivideBCDQuotient+2], a pop de - ld a, $6 + ld a, $6 sub d and a ret z -.asm_f7ce +.divResultBy10loop push af - call DivideBCD_f7d7 + call DivideBCD_divDivisorBy10 pop af dec a - jr nz, .asm_f7ce + jr nz, .divResultBy10loop ret -DivideBCD_f7d7: - ld a, [$ffa4] +DivideBCD_divDivisorBy10: + ld a, [hDivideBCDDivisor+2] swap a and $f ld b, a - ld a, [$ffa3] + ld a, [hDivideBCDDivisor+1] swap a - ld [$ffa3], a + ld [hDivideBCDDivisor+1], a and $f0 or b - ld [$ffa4], a - ld a, [$ffa3] + ld [hDivideBCDDivisor+2], a + ld a, [hDivideBCDDivisor+1] and $f ld b, a - ld a, [$ffa2] + ld a, [hDivideBCDDivisor] swap a - ld [$ffa2], a + ld [hDivideBCDDivisor], a and $f0 or b - ld [$ffa3], a - ld a, [$ffa2] + ld [hDivideBCDDivisor+1], a + ld a, [hDivideBCDDivisor] and $f - ld [$ffa2], a + ld [hDivideBCDDivisor], a ret -DivideBCD_f800: +DivideBCD_getNextDigit: ld bc, $3 -.asm_f803 - ld de, $ff9f - ld hl, $ffa2 +.loop + ld de, hMoney ; the dividend + ld hl, hDivideBCDDivisor push bc call StringCmp pop bc ret c inc b - ld de, $ffa1 - ld hl, $ffa4 + ld de, hMoney+2 ; since SubBCD works starting from the least significant digit + ld hl, hDivideBCDDivisor+2 push bc call SubBCD pop bc - jr .asm_f803 + jr .loop AddBCDPredef:: diff --git a/hram.asm b/hram.asm index f5817fa4..9c13e5a1 100644 --- a/hram.asm +++ b/hram.asm @@ -155,6 +155,7 @@ hCoins EQU $FFA0 ; 2-byte BCD number hDivideBCDDivisor EQU $FFA2 ; 3-byte BCD number hDivideBCDQuotient EQU $FFA2 ; 3-byte BCD number +hDivideBCDBuffer EQU $FFA5 ; 3-byte BCD number hSerialReceivedNewData EQU $FFA9 -- cgit v1.2.3 From d7bd7f44530b363bae10bdc558ea556fe13f7272 Mon Sep 17 00:00:00 2001 From: Sanqui Date: Mon, 20 Mar 2017 20:37:02 +0100 Subject: Update Travis script to use `make compare` and rgbds v0.2.5 --- .travis.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fe46c2b..bd38f51b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,24 @@ language: c install: - - sudo easy_install pypng - - path="$(pwd)"; cd; git clone git://github.com/bentley/rgbds.git && cd rgbds && sudo make install; cd "$path" + - |- + path="$(pwd)"; cd; + wget https://github.com/rednex/rgbds/archive/v0.2.5.tar.gz -O rgbds.tar.gz && + tar xf rgbds.tar.gz && + cd rgbds-0.2.5 && + sudo make install && + cd - && + rm -rf rgbds && + cd "$path" before_script: - |- function check_status() { - if ! git diff-index --quiet HEAD --; then - echo 'Uncommitted changes detected.'; - return 1; - fi; - } - - |- - function verify() { - actual="$(md5sum "${1}" | cut -c 1-32)"; - expected="${2}"; - if [ "${actual}" != "${expected}" ]; then - echo "md5(${1}): expected ${2}, but got ${actual} instead."; + if ! git diff-index --quiet --ignore-submodules=all HEAD --; then + echo 'Uncommitted changes detected:'; + git diff-index HEAD --; return 1; fi; } script: - make - - verify pokeblue.gbc 50927e843568814f7ed45ec4f944bd8b - - verify pokered.gbc 3d45c1ee9abd5738df46d2bdda8b57dc + - make compare - check_status -- cgit v1.2.3 From 52adb844def5bffa9cd402e886cf24ea17fc00ab Mon Sep 17 00:00:00 2001 From: AntonioND Date: Tue, 21 Mar 2017 00:44:10 +0000 Subject: Revert "Fix floating sections" This reverts commit cec6e6e2fb7886acc85200f921d3913fd2ea8a2b. Signed-off-by: AntonioND --- audio.asm | 30 +++++++++++++------------- home.asm | 4 ++-- main.asm | 72 +++++++++++++++++++++++++++++++-------------------------------- sram.asm | 8 +++---- text.asm | 26 +++++++++++------------ wram.asm | 4 ++-- 6 files changed, 72 insertions(+), 72 deletions(-) diff --git a/audio.asm b/audio.asm index a2cb3220..0a344ae7 100644 --- a/audio.asm +++ b/audio.asm @@ -6,29 +6,29 @@ AUDIO_3 EQU $1f INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX[$4000], BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX[$4000], BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX[$4000], BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX[$422E], BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX[$42BE], BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX[$4249], BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX[$42FD], BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -127,7 +127,7 @@ INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -SECTION "Sound Effects 2", ROMX[$42FD], BANK[AUDIO_2] +SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/sfx/snare1_2.asm" INCLUDE "audio/sfx/snare2_2.asm" @@ -252,7 +252,7 @@ INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -SECTION "Sound Effects 3", ROMX[$42FD], BANK[AUDIO_3] +SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/sfx/snare1_3.asm" INCLUDE "audio/sfx/snare2_3.asm" @@ -360,7 +360,7 @@ INCLUDE "audio/sfx/cry22_3.asm" -SECTION "Audio Engine 1", ROMX[$50C6], BANK[AUDIO_1] +SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] PlayBattleMusic:: xor a @@ -453,7 +453,7 @@ Music_Cities1AlternateTempo:: jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX[$536E], BANK[AUDIO_2] +SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] @@ -557,7 +557,7 @@ Audio2_OverwriteChannelPointer: ret -SECTION "Audio Engine 3", ROMX[$513B], BANK[AUDIO_3] +SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] PlayPokedexRatingSfx:: ld a, [$ffdc] @@ -601,7 +601,7 @@ INCLUDE "audio/engine_3.asm" -SECTION "Music 1", ROMX[$5BA3], BANK[AUDIO_1] +SECTION "Music 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" @@ -630,7 +630,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX[$6322], BANK[AUDIO_2] +SECTION "Music 2", ROMX, BANK[AUDIO_2] INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +646,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX[$5BBB], BANK[AUDIO_3] +SECTION "Music 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" diff --git a/home.asm b/home.asm index bfd73b31..8cd85019 100644 --- a/home.asm +++ b/home.asm @@ -30,7 +30,7 @@ SECTION "joypad", ROM0 [$60] reti -SECTION "Home", ROM0 [$61] +SECTION "Home", ROM0 DisableLCD:: xor a @@ -99,7 +99,7 @@ SECTION "Header", ROM0 [$104] -SECTION "Main", ROM0 [$150] +SECTION "Main", ROM0 Start:: cp GBC diff --git a/main.asm b/main.asm index 7943dc3d..da2d3671 100755 --- a/main.asm +++ b/main.asm @@ -14,7 +14,7 @@ PICS_5 EQU $D INCLUDE "home.asm" -SECTION "bank1",ROMX[$4000],BANK[$1] +SECTION "bank1",ROMX,BANK[$1] INCLUDE "data/facing.asm" @@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" -SECTION "bank3",ROMX[$4000],BANK[$3] +SECTION "bank3",ROMX,BANK[$3] INCLUDE "engine/joypad.asm" @@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "NPC Sprites 1", ROMX[$4000], BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" -SECTION "Graphics", ROMX[$5380], BANK[GFX] +SECTION "Graphics", ROMX, BANK[GFX] PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -184,7 +184,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" PlayerCharacterTitleGraphicsEnd: -SECTION "Battle (bank 4)", ROMX[$68D8], BANK[$4] +SECTION "Battle (bank 4)", ROMX, BANK[$4] INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" @@ -206,7 +206,7 @@ INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -SECTION "NPC Sprites 2", ROMX[$4000], BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -250,7 +250,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -SECTION "Battle (bank 5)", ROMX[$7840], BANK[$5] +SECTION "Battle (bank 5)", ROMX, BANK[$5] INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -260,7 +260,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank6",ROMX[$4000],BANK[$6] +SECTION "bank6",ROMX,BANK[$6] INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -335,7 +335,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7",ROMX[$4000],BANK[$7] +SECTION "bank7",ROMX,BANK[$7] INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -516,7 +516,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX[$4000], BANK[PICS_1] +SECTION "Pics 1", ROMX, BANK[PICS_1] RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" @@ -578,13 +578,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -SECTION "Battle (bank 9)", ROMX[$7D6B], BANK[$9] +SECTION "Battle (bank 9)", ROMX, BANK[$9] INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" -SECTION "Pics 2", ROMX[$4000], BANK[PICS_2] +SECTION "Pics 2", ROMX, BANK[PICS_2] GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" @@ -652,11 +652,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -SECTION "Battle (bank A)", ROMX[$7EA9], BANK[$A] +SECTION "Battle (bank A)", ROMX, BANK[$A] INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX[$4000], BANK[PICS_3] +SECTION "Pics 3", ROMX, BANK[PICS_3] ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" @@ -730,7 +730,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -SECTION "Battle (bank B)", ROMX[$7B7B], BANK[$B] +SECTION "Battle (bank B)", ROMX, BANK[$B] INCLUDE "engine/battle/display_effectiveness.asm" @@ -746,7 +746,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX[$4000], BANK[PICS_4] +SECTION "Pics 4", ROMX, BANK[PICS_4] DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" @@ -811,12 +811,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" -SECTION "Battle (bank C)", ROMX[$7F2B], BANK[$C] +SECTION "Battle (bank C)", ROMX, BANK[$C] INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" -SECTION "Pics 5", ROMX[$4000], BANK[PICS_5] +SECTION "Pics 5", ROMX, BANK[PICS_5] BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" @@ -874,7 +874,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -SECTION "Battle (bank D)", ROMX[$7244], BANK[$D] +SECTION "Battle (bank D)", ROMX, BANK[$D] INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" @@ -884,7 +884,7 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bankE",ROMX[$4000],BANK[$E] +SECTION "bankE",ROMX,BANK[$E] INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -910,12 +910,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm" INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" -SECTION "bankF",ROMX[$4000],BANK[$F] +SECTION "bankF",ROMX,BANK[$F] INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX[$4000],BANK[$10] +SECTION "bank10",ROMX,BANK[$10] INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/trade.asm" @@ -923,7 +923,7 @@ INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" -SECTION "bank11",ROMX[$4000],BANK[$11] +SECTION "bank11",ROMX,BANK[$11] INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1068,7 +1068,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12",ROMX[$4000],BANK[$12] +SECTION "bank12",ROMX,BANK[$12] INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1247,7 +1247,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX[$4000],BANK[$13] +SECTION "bank13",ROMX,BANK[$13] TrainerPics:: YoungsterPic:: INCBIN "pic/trainer/youngster.pic" @@ -1312,7 +1312,7 @@ INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14",ROMX[$4000],BANK[$14] +SECTION "bank14",ROMX,BANK[$14] INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1390,7 +1390,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX[$4000],BANK[$15] +SECTION "bank15",ROMX,BANK[$15] INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1482,7 +1482,7 @@ INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX[$4000],BANK[$16] +SECTION "bank16",ROMX,BANK[$16] INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1572,7 +1572,7 @@ HallofFameRoomBlocks: INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX[$4000],BANK[$17] +SECTION "bank17",ROMX,BANK[$17] SaffronMartBlocks: LavenderMartBlocks: @@ -1728,7 +1728,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX[$4000],BANK[$18] +SECTION "bank18",ROMX,BANK[$18] ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1851,7 +1851,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX[$4000],BANK[$19] +SECTION "bank19",ROMX,BANK[$19] Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1873,7 +1873,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX[$4000],BANK[$1A] +SECTION "bank1A",ROMX,BANK[$1A] INCLUDE "engine/battle/decrement_pp.asm" @@ -1909,7 +1909,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX[$4000],BANK[$1B] +SECTION "bank1B",ROMX,BANK[$1B] Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1927,7 +1927,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX[$4000],BANK[$1C] +SECTION "bank1C",ROMX,BANK[$1C] INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1942,7 +1942,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX[$4000],BANK[$1D] +SECTION "bank1D",ROMX,BANK[$1D] CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" @@ -2074,7 +2074,7 @@ INCLUDE "engine/menu/league_pc.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX[$4000],BANK[$1E] +SECTION "bank1E",ROMX,BANK[$1E] INCLUDE "engine/battle/animations.asm" diff --git a/sram.asm b/sram.asm index 3b51df77..3e7b3e16 100644 --- a/sram.asm +++ b/sram.asm @@ -1,4 +1,4 @@ -SECTION "Sprite Buffers", SRAM[$a000], BANK[0] +SECTION "Sprite Buffers", SRAM, BANK[0] sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 @@ -9,7 +9,7 @@ sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 -SECTION "Save Data", SRAM[$a000], BANK[1] +SECTION "Save Data", SRAM, BANK[1] ds $598 sPlayerName:: ds NAME_LENGTH ; a598 @@ -21,7 +21,7 @@ sTilesetType:: ds 1 ; b522 sMainDataCheckSum:: ds 1 ; b523 -SECTION "Saved Boxes 1", SRAM[$a000], BANK[2] +SECTION "Saved Boxes 1", SRAM, BANK[2] sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -33,7 +33,7 @@ sBank2AllBoxesChecksum:: ds 1 ; ba4c sBank2IndividualBoxChecksums:: ds 6 ; ba4d -SECTION "Saved Boxes 2", SRAM[$a000], BANK[3] +SECTION "Saved Boxes 2", SRAM, BANK[3] sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 diff --git a/text.asm b/text.asm index be12aa7d..866d4a7f 100644 --- a/text.asm +++ b/text.asm @@ -19,7 +19,7 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" -SECTION "Text 1", ROMX[$4000], BANK[TEXT_1] +SECTION "Text 1", ROMX, BANK[TEXT_1] _CardKeySuccessText1:: text "Bingo!@@" @@ -192,7 +192,7 @@ INCLUDE "text/maps/silph_co_4f.asm" INCLUDE "text/maps/silph_co_5f_1.asm" -SECTION "Text 2", ROMX[$4000], BANK[TEXT_2] +SECTION "Text 2", ROMX, BANK[TEXT_2] INCLUDE "text/maps/silph_co_5f_2.asm" INCLUDE "text/maps/silph_co_6f.asm" @@ -224,7 +224,7 @@ INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f_1.asm" -SECTION "Text 3", ROMX[$4000], BANK[TEXT_3] +SECTION "Text 3", ROMX, BANK[TEXT_3] INCLUDE "text/maps/rock_tunnel_b2f_2.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" @@ -1939,7 +1939,7 @@ INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare_1.asm" -SECTION "Text 4", ROMX[$4000], BANK[TEXT_4] +SECTION "Text 4", ROMX, BANK[TEXT_4] INCLUDE "text/maps/daycare_2.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" @@ -1978,7 +1978,7 @@ INCLUDE "text/maps/route_10.asm" INCLUDE "text/maps/route_11_1.asm" -SECTION "Text 5", ROMX[$4000], BANK[TEXT_5] +SECTION "Text 5", ROMX, BANK[TEXT_5] INCLUDE "text/maps/route_11_2.asm" INCLUDE "text/maps/route_12.asm" @@ -1996,7 +1996,7 @@ INCLUDE "text/maps/route_23.asm" INCLUDE "text/maps/route_24_1.asm" -SECTION "Text 6", ROMX[$4000], BANK[TEXT_6] +SECTION "Text 6", ROMX, BANK[TEXT_6] INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" @@ -2339,7 +2339,7 @@ INCLUDE "text/maps/museum_2f.asm" INCLUDE "text/maps/pewter_gym_1.asm" -SECTION "Text 7", ROMX[$4000], BANK[TEXT_7] +SECTION "Text 7", ROMX, BANK[TEXT_7] INCLUDE "text/maps/pewter_gym_2.asm" INCLUDE "text/maps/pewter_house_1.asm" @@ -2371,7 +2371,7 @@ INCLUDE "text/maps/vermilion_mart.asm" INCLUDE "text/maps/vermilion_gym_1.asm" -SECTION "Text 8", ROMX[$4000], BANK[TEXT_8] +SECTION "Text 8", ROMX, BANK[TEXT_8] INCLUDE "text/maps/vermilion_gym_2.asm" INCLUDE "text/maps/vermilion_house.asm" @@ -2403,7 +2403,7 @@ INCLUDE "text/maps/safari_zone_entrance.asm" INCLUDE "text/maps/fuchsia_gym_1.asm" -SECTION "Text 9", ROMX[$4000], BANK[TEXT_9] +SECTION "Text 9", ROMX, BANK[TEXT_9] INCLUDE "text/maps/fuchsia_gym_2.asm" INCLUDE "text/maps/fuchsia_meeting_room.asm" @@ -2646,7 +2646,7 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: done -SECTION "Text 10", ROMX[$4000], BANK[TEXT_10] +SECTION "Text 10", ROMX, BANK[TEXT_10] _CableClubNPCPleaseComeAgainText:: text "Please come again!" @@ -2992,7 +2992,7 @@ _BoxFullCannotThrowBallText:: prompt -SECTION "Text 11", ROMX[$4000], BANK[TEXT_11] +SECTION "Text 11", ROMX, BANK[TEXT_11] _ItemUseText001:: text " used@@" @@ -3192,11 +3192,11 @@ _UsedCutText:: prompt -SECTION "Pokedex Text", ROMX[$4000], BANK[POKEDEX_TEXT] +SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT] INCLUDE "text/pokedex.asm" -SECTION "Move Names", ROMX[$4000], BANK[MOVE_NAMES] +SECTION "Move Names", ROMX, BANK[MOVE_NAMES] INCLUDE "text/move_names.asm" diff --git a/wram.asm b/wram.asm index 47502613..1bcef26b 100755 --- a/wram.asm +++ b/wram.asm @@ -60,7 +60,7 @@ battle_struct: MACRO ENDM -SECTION "WRAM Bank 0", WRAM0 [$c000] +SECTION "WRAM Bank 0", WRAM0 wUnusedC000:: ; c000 ds 1 @@ -1610,7 +1610,7 @@ wEnemyMonDefense:: dw wEnemyMonSpeed:: dw wEnemyMonSpecial:: dw wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX[$d000], BANK[1] +SECTION "WRAM Bank 1", WRAMX, BANK[1] ds 2 ; NUM_MOVES - 2 wEnemyMonBaseStats:: ds 5 -- cgit v1.2.3 From 3541904411d4051fd7e0635d5f995cbe38dd0867 Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Sun, 2 Apr 2017 13:19:04 -0700 Subject: Use correct variable in EngageMapTrainer EngageMapTrainer should write to wEngagedTrainerClass and wEngagedTrainerSet, not wEngagedTrainerClass and wEnemyMonAttackMod. wEnemyMonAttackMod doesn't make any sense in this context. Use the correct variable. These two variables happen to have the same address, so there is no functional difference between using wEnemyMonAttackMod versus using wEngagedTrainerSet. --- home.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.asm b/home.asm index bfd73b31..94125da2 100644 --- a/home.asm +++ b/home.asm @@ -2528,7 +2528,7 @@ EngageMapTrainer:: ld a, [hli] ; load trainer class ld [wEngagedTrainerClass], a ld a, [hl] ; load trainer mon set - ld [wEnemyMonAttackMod], a + ld [wEngagedTrainerSet], a jp PlayTrainerMusic PrintEndBattleText:: -- cgit v1.2.3 From d51dcc263e487d4846cbe989c53c45bc0478b483 Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Sun, 2 Apr 2017 13:27:47 -0700 Subject: Remove duplicate OaksLabText labels For unknown reasons, the text pointer list for Oak's Lab is duplicated. This is currently implemented by treating the two text pointer lists as one large list. This leads to duplicate labels and some confusing logic. Refactor the code to treat the two text pointer lists separately. This lets us remove several labels. It also makes the code which sets the text pointer list self-documenting. --- scripts/oakslab.asm | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index b91abd43..e73d7cf8 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -712,7 +712,7 @@ OaksLabScript_1d02b: ret OaksLabScript_1d076: - ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28 + ld hl, OaksLabTextPointers2 ld a, l ld [wMapTextPtr], a ld a, h @@ -747,19 +747,20 @@ OaksLabTextPointers: dw OaksLabText25 dw OaksLabText26 dw OaksLabText27 - dw OaksLabText28 - dw OaksLabText29 - dw OaksLabText30 - dw OaksLabText31 - dw OaksLabText32 - dw OaksLabText33 - dw OaksLabText34 - dw OaksLabText35 - dw OaksLabText36 - dw OaksLabText37 - dw OaksLabText38 - -OaksLabText28: + +OaksLabTextPointers2: + dw OaksLabText1 + dw OaksLabText2 + dw OaksLabText3 + dw OaksLabText4 + dw OaksLabText5 + dw OaksLabText6 + dw OaksLabText7 + dw OaksLabText8 + dw OaksLabText9 + dw OaksLabText10 + dw OaksLabText11 + OaksLabText1: TX_ASM CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 @@ -791,7 +792,6 @@ OaksLabText41: TX_FAR _OaksLabText41 db "@" -OaksLabText29: OaksLabText2: TX_ASM ld a, STARTER2 @@ -802,7 +802,6 @@ OaksLabText2: ld b, $2 jr OaksLabScript_1d133 -OaksLabText30: OaksLabText3: TX_ASM ld a, STARTER3 @@ -813,7 +812,6 @@ OaksLabText3: ld b, $3 jr OaksLabScript_1d133 -OaksLabText31: OaksLabText4: TX_ASM ld a, STARTER1 @@ -1070,8 +1068,6 @@ OaksLabText_1d31d: TX_FAR _OaksLabText_1d31d db "@" -OaksLabText34: -OaksLabText33: OaksLabText7: OaksLabText6: TX_ASM @@ -1083,12 +1079,10 @@ OaksLabText_1d32c: TX_FAR _OaksLabText_1d32c db "@" -OaksLabText35: OaksLabText8: TX_FAR _OaksLabText8 db "@" -OaksLabText36: OaksLabText9: TX_ASM ld hl, OaksLabText_1d340 @@ -1227,8 +1221,6 @@ OaksLabText27: TX_FAR _OaksLabText27 db "@" -OaksLabText38: -OaksLabText37: OaksLabText11: OaksLabText10: TX_ASM -- cgit v1.2.3 From 6697d9e7f1721bdbc9c996413a5e733e050f3d9e Mon Sep 17 00:00:00 2001 From: Sanqui Date: Wed, 19 Apr 2017 20:09:45 +0200 Subject: INSTALL.md: add a note about different cygwin install paths Fixes #149. --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 9bc30d6c..adcde642 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -44,7 +44,7 @@ To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the d In the installer, select the following packages: `make` `git` `python` `gettext` Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). -Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. +Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. In the **Cygwin terminal**: -- cgit v1.2.3 From c4e51522cc09424fa7f97c4e1f3f81b0cbc00089 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 1 May 2017 11:08:36 -0400 Subject: Update the rgbds links. v0.2.5 is the last working version. --- INSTALL.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index adcde642..dee3eea1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -2,8 +2,9 @@ sudo apt-get install make gcc bison git python - git clone https://github.com/bentley/rgbds + git clone https://github.com/rednex/rgbds cd rgbds + git checkout v0.2.5 sudo make install cd .. @@ -26,8 +27,9 @@ In **Terminal**, run: xcode-select --install - git clone https://github.com/bentley/rgbds + git clone https://github.com/rednex/rgbds cd rgbds + git checkout v0.2.5 sudo make install cd .. @@ -43,8 +45,8 @@ To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the d In the installer, select the following packages: `make` `git` `python` `gettext` -Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/). -Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. +Then get [**rgbds 0.2.5**](https://github.com/bentley/rgbds/releases/tag/v0.2.5). +Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. In the **Cygwin terminal**: -- cgit v1.2.3 From 832c28eaea1efa8c64765da88ffce661da9426a8 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 1 May 2017 11:15:39 -0400 Subject: Fix the Stack section. Negative section sizes are no longer allowed as of rgbds 0.3.0. --- wram.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wram.asm b/wram.asm index 1bcef26b..cc2d332a 100755 --- a/wram.asm +++ b/wram.asm @@ -3220,9 +3220,9 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: -SECTION "Stack", WRAMX[$dfff], BANK[1] +SECTION "Stack", WRAMX[$df00], BANK[1] + ds $ff wStack:: ; dfff - ds -$100 INCLUDE "sram.asm" -- cgit v1.2.3 From e9f33ce19c3f573cc7fb312d6869e711d5d9de4f Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 8 May 2017 02:54:20 -0500 Subject: =?UTF-8?q?Typo:=20SFX=5FPOKEFLUE=20=E2=86=92=20SFX=5FPOKEFLUTE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/music_constants.asm | 2 +- engine/items/items.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 57ad230d..5eb05b61 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -194,7 +194,7 @@ ENDM music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_Pokeflute + music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 diff --git a/engine/items/items.asm b/engine/items/items.asm index f8873a6e..057595df 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1846,12 +1846,12 @@ PlayedFluteHadEffectText: ; play out-of-battle pokeflute music ld a,$ff call PlaySound ; turn off music - ld a, SFX_POKEFLUE + ld a, SFX_POKEFLUTE ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wChannelSoundIDs + Ch2] - cp a, SFX_POKEFLUE + cp a, SFX_POKEFLUTE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done -- cgit v1.2.3 From 7f3517b8d111f6375a81e18241df1be9502727e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= Date: Fri, 9 Jun 2017 22:34:50 +0100 Subject: Add linkerscript MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antonio Niño Díaz --- Makefile | 2 +- linkerscript.link | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 linkerscript.link diff --git a/Makefile b/Makefile index 12532d73..8e766b28 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) - rgblink -n $*.sym -o $@ $^ + rgblink -n $*.sym -l linkerscript.link -o $@ $^ rgbfix $($*_opt) $@ %.png: ; diff --git a/linkerscript.link b/linkerscript.link new file mode 100644 index 00000000..ad5ac793 --- /dev/null +++ b/linkerscript.link @@ -0,0 +1,176 @@ +ROM0 + ORG $61 + "Home" + ORG $150 + "Main" + +ROMX $1 + "bank1" + +ROMX $2 + "Sound Effect Headers 1" ; AUDIO_1 + "Music Headers 1" + "Sound Effects 1" + "Audio Engine 1" + "Music 1" + +ROMX $3 + "bank3" + +ROMX $4 + "NPC Sprites 1" ; NPC_SPRITES_1 + "Graphics" ; GFX + "Battle (bank 4)" + +ROMX $5 + "NPC Sprites 2" ; NPC_SPRITES_2 + "Battle (bank 5)" + +ROMX $6 + "bank6" + +ROMX $7 + "bank7" + +ROMX $8 + "Sound Effect Headers 2" ; AUDIO_2 + "Music Headers 2" + "Sound Effects 2" + "Audio Engine 2" + "Music 2" + +ROMX $9 + "Pics 1" ; PICS_1 + "Battle (bank 9)" + +ROMX $A + "Pics 2" ; PICS_2 + "Battle (bank A)" + +ROMX $B + "Pics 3" ; PICS_3 + "Battle (bank B)" + +ROMX $C + "Pics 4" ; PICS_4 + "Battle (bank C)" + +ROMX $D + "Pics 5" ; PICS_5 + "Battle (bank D)" + +ROMX $E + "bankE" + +ROMX $F + "bankF" + +ROMX $10 + "bank10" + +ROMX $11 + "bank11" + +ROMX $12 + "bank12" + +ROMX $13 + "bank13" + +ROMX $14 + "bank14" + +ROMX $15 + "bank15" + +ROMX $16 + "bank16" + +ROMX $17 + "bank17" + +ROMX $18 + "bank18" + +ROMX $19 + "bank19" + +ROMX $1A + "bank1A" + +ROMX $1B + "bank1B" + +ROMX $1C + "bank1C" + +ROMX $1D + "bank1D" + +ROMX $1E + "bank1E" + +ROMX $1F + "Sound Effect Headers 3" ; AUDIO_3 + "Music Headers 3" + "Sound Effects 3" + "Audio Engine 3" + "Music 3" + +ROMX $20 + "Text 1" ; TEXT_1 + +ROMX $21 + "Text 2" ; TEXT_2 + +ROMX $22 + "Text 3" ; TEXT_3 + +ROMX $23 + "Text 4" ; TEXT_4 + +ROMX $24 + "Text 5" ; TEXT_5 + +ROMX $25 + "Text 6" ; TEXT_6 + +ROMX $26 + "Text 7" ; TEXT_7 + +ROMX $27 + "Text 8" ; TEXT_8 + +ROMX $28 + "Text 9" ; TEXT_9 + +ROMX $29 + "Text 10" ; TEXT_10 + +ROMX $2A + "Text 11" ; TEXT_11 + +ROMX $2B + "Pokedex Text" ; POKEDEX_TEXT + +ROMX $2C + "Move Names" ; MOVE_NAMES + +WRAM0 + "WRAM Bank 0" + +WRAMX 1 + "WRAM Bank 1" + +SRAM 0 + "Sprite Buffers" + +SRAM 1 + "Save Data" + +SRAM 2 + "Saved Boxes 1" + +SRAM 3 + "Saved Boxes 2" + -- cgit v1.2.3 From dfc094db727d094e50e2a7bfb7fc1ae22cb1084b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= Date: Fri, 9 Jun 2017 22:36:11 +0100 Subject: Update Travis configuration to use rgbds 0.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antonio Niño Díaz --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd38f51b..ca18f64d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ language: c install: - |- path="$(pwd)"; cd; - wget https://github.com/rednex/rgbds/archive/v0.2.5.tar.gz -O rgbds.tar.gz && - tar xf rgbds.tar.gz && - cd rgbds-0.2.5 && - sudo make install && - cd - && - rm -rf rgbds && + wget https://github.com/rednex/rgbds/archive/v0.3.1.tar.gz -O rgbds.tar.gz && + tar xf rgbds.tar.gz && + cd rgbds-0.3.1 && + sudo make install && + cd - && + rm -rf rgbds && cd "$path" before_script: - |- -- cgit v1.2.3 From 9ea25bc8cd32df5b3bcf6333c3d2582e1b11f2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= Date: Fri, 9 Jun 2017 22:54:09 +0100 Subject: Replace deprecated mnemonics by the correct ones MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old mnemonics generate warnings with new versions of rgbds. This patch replaces them by the correct ones. Signed-off-by: Antonio Niño Díaz --- engine/battle/animations.asm | 8 ++++---- engine/battle/battle_transitions.asm | 2 +- engine/battle/core.asm | 6 +++--- engine/battle/trainer_ai.asm | 4 ++-- engine/cable_club.asm | 2 +- engine/items/items.asm | 2 +- engine/menu/start_sub_menus.asm | 2 +- engine/menu/text_box.asm | 2 +- engine/overworld/player_state.asm | 2 +- engine/overworld/ssanne.asm | 2 +- engine/palettes.asm | 2 +- engine/slot_machine.asm | 2 +- engine/trade.asm | 2 +- home.asm | 6 +++--- home/overworld.asm | 2 +- home/predef.asm | 2 +- home/vcopy.asm | 12 ++++++------ 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 373136a8..4992b84a 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -213,7 +213,7 @@ PlayAnimation: ld h,a ld de,.nextAnimationCommand push de - jp [hl] ; jump to special effect function + jp hl ; jump to special effect function .playSubanimation ld c,a and a,%00111111 @@ -457,7 +457,7 @@ PlayApplyingAttackAnimation: ld a,[hli] ld h,[hl] ld l,a - jp [hl] + jp hl AnimationTypePointerTable: dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect @@ -642,7 +642,7 @@ DoSpecialEffectByAnimationId: ld l,a ld de,.done push de - jp [hl] + jp hl .done pop bc pop de @@ -1080,7 +1080,7 @@ CallWithTurnFlipped: ld [H_WHOSETURN],a ld de,.returnAddress push de - jp [hl] + jp hl .returnAddress pop af ld [H_WHOSETURN],a diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 9e02c56f..985a1eb2 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -62,7 +62,7 @@ BattleTransition: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; the three GetBattleTransitionID functions set the first ; three bits of c, which determines what transition animation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 153a9048..4835e8cf 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3150,7 +3150,7 @@ ExecutePlayerMove: jp z, ExecutePlayerMoveDone call CheckPlayerStatusConditions jr nz, .playerHasNoSpecialCondition - jp [hl] + jp hl .playerHasNoSpecialCondition call GetCurrentMove ld hl, wPlayerBattleStatus1 @@ -5690,7 +5690,7 @@ ExecuteEnemyMove: ld [wDamageMultipliers], a call CheckEnemyStatusConditions jr nz, .enemyHasNoSpecialConditions - jp [hl] + jp hl .enemyHasNoSpecialConditions ld hl, wEnemyBattleStatus1 bit ChargingUp, [hl] ; is the enemy charging up for attack? @@ -7139,7 +7139,7 @@ _JumpMoveEffect: ld a, [hli] ld h, [hl] ld l, a - jp [hl] ; jump to special effect handler + jp hl ; jump to special effect handler MoveEffectPointerTable: dw SleepEffect ; unused effect diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index b175fcaf..d78079e8 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -51,7 +51,7 @@ AIEnemyTrainerChooseMoves: ld l, a ld de, .nextMoveChoiceModification ; set return address push de - jp [hl] ; execute modification function + jp hl ; execute modification function .loopFindMinimumEntries ; all entries will be decremented sequentially until one of them is zero ld hl, wBuffer ; temp move selection array ld de, wEnemyMonMoves ; enemy moves @@ -366,7 +366,7 @@ TrainerAI: ld h,[hl] ld l,a call Random - jp [hl] + jp hl TrainerAIPointers: ; one entry per trainer class diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 474dbd11..3e72daa9 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -304,7 +304,7 @@ CallCurrentTradeCenterFunction: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl TradeCenter_SelectMon: call ClearScreen diff --git a/engine/items/items.asm b/engine/items/items.asm index 057595df..f334e384 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -13,7 +13,7 @@ UseItem_: ld a,[hli] ld h,[hl] ld l,a - jp [hl] + jp hl ItemUsePtrTable: dw ItemUseBall ; MASTER_BALL diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 251d7ae4..8c10266b 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -118,7 +118,7 @@ StartMenu_Pokemon: ld h,[hl] ld l,a ld a,[wObtainedBadges] ; badges obtained - jp [hl] + jp hl .outOfBattleMovePointers dw .cut dw .fly diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm index 12067dd4..90c35d25 100644 --- a/engine/menu/text_box.asm +++ b/engine/menu/text_box.asm @@ -24,7 +24,7 @@ DisplayTextBoxID_: ld l,a ; hl = address of function ld de,.done push de - jp [hl] ; jump to the function + jp hl ; jump to the function .coordTableMatch call GetTextBoxIDCoords call GetAddressOfScreenCoords diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index 79f755b9..b8d734f2 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -103,7 +103,7 @@ IsPlayerFacingEdgeOfMap: ld c, a ld de, .asm_c41e push de - jp [hl] + jp hl .asm_c41e pop bc pop de diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index 712c53ed..ea4747ce 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -16,7 +16,7 @@ AnimateBoulderDust: ld bc, .returnAddress push bc ld c, 4 - jp [hl] + jp hl .returnAddress ld a, [rOBP1] xor %01100100 diff --git a/engine/palettes.asm b/engine/palettes.asm index 4785ade2..6a798860 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -17,7 +17,7 @@ _RunPaletteCommand: ld l, a ld de, SendSGBPackets push de - jp [hl] + jp hl SetPal_BattleBlack: ld hl, PalPacket_Black diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 2dfcffde..3a46687f 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -451,7 +451,7 @@ SlotMachine_CheckForMatches: pop hl ld de, .flashScreenLoop push de - jp [hl] + jp hl .flashScreenLoop ld a, [rBGP] diff --git a/engine/trade.asm b/engine/trade.asm index c3913a7e..8bc8e3bc 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -46,7 +46,7 @@ TradeAnimCommon: ld l, a ld de, .loop push de - jp [hl] ; call trade func, which will return to the top of the loop + jp hl ; call trade func, which will return to the top of the loop .done pop af ld [hSCX], a diff --git a/home.asm b/home.asm index 0a2d829d..27c977ca 100644 --- a/home.asm +++ b/home.asm @@ -2966,7 +2966,7 @@ Bankswitch:: ld [MBC1RomBank],a ld bc,.Return push bc - jp [hl] + jp hl .Return pop bc ld a,b @@ -4422,7 +4422,7 @@ CallFunctionInTable:: ld l, a ld de, .returnAddress push de - jp [hl] + jp hl .returnAddress pop bc pop de @@ -4605,7 +4605,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ld [H_LOADEDROMBANK], a ld de, .returnAddress push de - jp [hl] + jp hl .returnAddress xor a jr .done diff --git a/home/overworld.asm b/home/overworld.asm index ec8f1925..509b699b 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1995,7 +1995,7 @@ RunMapScript:: ld l,a ld de,.return push de - jp [hl] ; jump to script + jp hl ; jump to script .return ret diff --git a/home/predef.asm b/home/predef.asm index 2fac9aca..9bb9be74 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -24,7 +24,7 @@ Predef:: ld de, .done push de - jp [hl] + jp hl .done pop af diff --git a/home/vcopy.asm b/home/vcopy.asm index 3fe19745..ad92e8fb 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -123,7 +123,7 @@ AutoBgMapTransfer:: ld a,[H_AUTOBGTRANSFERENABLED] and a ret z - ld hl,[sp + 0] + ld hl,sp + 0 ld a,h ld [H_SPTEMP],a ld a,l @@ -205,7 +205,7 @@ VBlankCopyBgMap:: ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte and a ret z - ld hl,[sp + 0] + ld hl,sp + 0 ld a,h ld [H_SPTEMP],a ld a,l @@ -238,7 +238,7 @@ VBlankCopyDouble:: and a ret z - ld hl, [sp + 0] + ld hl, sp + 0 ld a, h ld [H_SPTEMP], a ld a, l @@ -290,7 +290,7 @@ VBlankCopyDouble:: ld a, h ld [H_VBCOPYDOUBLEDEST + 1], a - ld hl, [sp + 0] + ld hl, sp + 0 ld a, l ld [H_VBCOPYDOUBLESRC], a ld a, h @@ -316,7 +316,7 @@ VBlankCopy:: and a ret z - ld hl, [sp + 0] + ld hl, sp + 0 ld a, h ld [H_SPTEMP], a ld a, l @@ -360,7 +360,7 @@ VBlankCopy:: ld a, h ld [H_VBCOPYDEST + 1], a - ld hl, [sp + 0] + ld hl, sp + 0 ld a, l ld [H_VBCOPYSRC], a ld a, h -- cgit v1.2.3 From 7a9a1b1e55f4a7f6c339a86d8cdb7fbf1bee7838 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 24 Jun 2017 15:01:43 -0500 Subject: Fix typos in comments --- audio.asm | 2 +- constants/hardware_constants.asm | 2 +- constants/misc_constants.asm | 2 +- data/trainer_parties.asm | 6 +++--- engine/battle/animations.asm | 4 ++-- engine/battle/core.asm | 20 ++++++++++---------- engine/battle/draw_hud_pokeball_gfx.asm | 2 +- engine/battle/moveEffects/heal_effect.asm | 2 +- engine/battle/moveEffects/recoil_effect.asm | 2 +- engine/battle/moveEffects/substitute_effect.asm | 4 ++-- engine/battle/trainer_ai.asm | 8 ++++---- engine/hidden_object_functions17.asm | 2 +- engine/items/items.asm | 2 +- engine/learn_move.asm | 2 +- engine/menu/draw_start_menu.asm | 2 +- engine/menu/naming_screen.asm | 2 +- engine/menu/pokedex.asm | 2 +- engine/overworld/map_sprites.asm | 4 ++-- engine/overworld/movement.asm | 8 ++++---- home.asm | 6 +++--- hram.asm | 2 +- macros/data_macros.asm | 2 +- wram.asm | 10 +++++----- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/audio.asm b/audio.asm index 0a344ae7..8bc175fa 100644 --- a/audio.asm +++ b/audio.asm @@ -541,7 +541,7 @@ Music_PokeFluteInBattle:: ; begin playing the "caught mon" sound effect ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent - ; then immediately overwrtie the channel pointers + ; then immediately overwrite the channel pointers ld hl, wChannelCommandPointers + Ch4 * 2 ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index 21a3ad93..d6af3584 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -68,7 +68,7 @@ rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) -rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Inital (R/W) +rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) rNR52 EQU $ff26 ; Sound on/off diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 57b19a37..d4f231b5 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -120,7 +120,7 @@ TMHM_PARTY_MENU EQU 3 SWAP_MONS_PARTY_MENU EQU 4 EVO_STONE_PARTY_MENU EQU 5 -; party memu message IDs +; party menu message IDs ANTIDOTE_MSG EQU $F0 BURN_HEAL_MSG EQU $F1 ICE_HEAL_MSG EQU $F2 diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 0c586dad..da4f80c9 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -391,18 +391,18 @@ JugglerData: db 29,KADABRA,MR_MIME,0 ; Victory Road 2F db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 -; Fucshia Gym +; Fuchsia Gym db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 db 34,DROWZEE,HYPNO,0 ; Victory Road 2F db 48,MR_MIME,0 ; Unused db 33,HYPNO,0 -; Fucshia Gym +; Fuchsia Gym db 38,HYPNO,0 db 34,DROWZEE,KADABRA,0 TamerData: -; Fucshia Gym +; Fuchsia Gym db 34,SANDSLASH,ARBOK,0 db 33,ARBOK,SANDSLASH,ARBOK,0 ; Viridian Gym diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 373136a8..4964b2cf 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -829,7 +829,7 @@ DoRockSlideSpecialEffects: cp a,1 jp z,AnimationFlashScreen ; if it's the end of the subanimation, flash the screen ret -; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically +; if the subanimation counter is between 8 and 11, shake the screen horizontally and vertically .shakeScreen ld b,1 predef PredefShakeScreenHorizontally ; shake horizontally @@ -1516,7 +1516,7 @@ AnimationShowMonPic: jp Delay3 AnimationShowEnemyMonPic: -; Shows the emenmy mon's front sprite. Used in animations like Seismic Toss +; Shows the enemy mon's front sprite. Used in animations like Seismic Toss ; to make the mon's sprite reappear after disappears offscreen. ld hl, AnimationShowMonPic jp CallWithTurnFlipped diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 153a9048..4e21f6de 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -406,7 +406,7 @@ MainInBattleLoop: ld a, [wEnemyBattleStatus1] bit UsingTrappingMove, a ; check if enemy is using a multi-turn attack like wrap jr z, .selectPlayerMove ; if not, jump -; enemy is using a mult-turn attack like wrap, so player is trapped and cannot execute a move +; enemy is using a multi-turn attack like wrap, so player is trapped and cannot execute a move ld a, $ff ld [wPlayerSelectedMove], a jr .selectEnemyMove @@ -704,7 +704,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ret ; adds bc to enemy HP -; bc isn't updated if HP substracted was capped to prevent overkill +; bc isn't updated if HP subtracted was capped to prevent overkill HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP @@ -1218,7 +1218,7 @@ ChooseNextMon: ret ; called when player is out of usable mons. -; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight) +; prints appropriate lose message, sets carry flag if player blacked out (special case for initial rival fight) HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -3550,7 +3550,7 @@ CheckPlayerStatusConditions: ld c,[hl] ld hl,wPlayerBideAccumulatedDamage + 1 ld a,[hl] - add c ; acumulate damage taken + add c ; accumulate damage taken ld [hld],a ld a,[hl] adc b @@ -4286,7 +4286,7 @@ GetDamageVarsForPlayerAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wBattleMonSpecial ld a, [wCriticalHitOrOHKO] @@ -4399,7 +4399,7 @@ GetDamageVarsForEnemyAttack: sla c rl b ; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has ued Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wEnemyMonSpecial ld a, [wCriticalHitOrOHKO] @@ -7291,16 +7291,16 @@ PoisonEffect: ld de, wEnemyMoveEffect .poisonEffect call CheckTargetSubstitute - jr nz, .noEffect ; can't posion a substitute target + jr nz, .noEffect ; can't poison a substitute target ld a, [hli] ld b, a and a jr nz, .noEffect ; miss if target is already statused ld a, [hli] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [hld] - cp POISON ; can't posion a poison-type target + cp POISON ; can't poison a poison-type target jr z, .noEffect ld a, [de] cp POISON_SIDE_EFFECT1 @@ -7780,7 +7780,7 @@ StatModifierDownEffect: jp nz, MoveMissed ld a, [de] sub ATTACK_DOWN1_EFFECT - cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers al -1 effects + cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers all -1 effects jr c, .decrementStatMod sub ATTACK_DOWN2_EFFECT - ATTACK_DOWN1_EFFECT ; map -2 effects to corresponding -1 effect .decrementStatMod diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index f44d64f5..323dd167 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -186,7 +186,7 @@ SetupPlayerAndEnemyPokeballs: ld hl, wOAMBuffer + $18 jp WritePokeballOAMData -; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) +; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon) PokeballTileGraphics:: INCBIN "gfx/pokeball.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index b7d8283f..2e68acc0 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -76,7 +76,7 @@ HealEffect_: ld a, [de] sbc [hl] jr c, .playAnim -; copy max HP to current HP if an overflow ocurred +; copy max HP to current HP if an overflow occurred ld a, [hli] ld [de], a ld [wHPBarNewHP+1], a diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 7fc90c44..0f2f087b 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -25,7 +25,7 @@ RecoilEffect_: jr nz, .updateHP inc c ; minimum recoil damage is 1 .updateHP -; substract HP from user due to the recoil damage +; subtract HP from user due to the recoil damage ld a, [hli] ld [wHPBarMaxHP+1], a ld a, [hl] diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 03314ebf..6cca3eae 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -37,9 +37,9 @@ SubstituteEffect_: sbc 0 pop bc jr c, .notEnoughHP ; underflow means user would be left with negative health - ; bug: since it only brances on carry, it will possibly leave user with 0 HP + ; bug: since it only branches on carry, it will possibly leave user with 0 HP .userHasZeroOrMoreHP - ldi [hl], a ; save resulting HP after substraction into current HP + ldi [hl], a ; save resulting HP after subtraction into current HP ld [hl], d ld h, b ld l, c diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index b175fcaf..cabd4334 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -114,7 +114,7 @@ AIMoveChoiceModification1: ld a, [wBattleMonStatus] and a ret z ; return if no status ailment on player's mon - ld hl, wBuffer - 1 ; temp move selection array (-1 byte offest) + ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset) ld de, wEnemyMonMoves ; enemy moves ld b, NUM_MOVES + 1 .nextMove @@ -154,7 +154,7 @@ StatusAilmentMoveEffects: ; slightly encourage moves with specific effects. ; in particular, stat-modifying moves and other move effects -; that fall in-bewteen +; that fall in-between AIMoveChoiceModification2: ld a, [wAILayer2Encouragement] cp $1 @@ -212,7 +212,7 @@ AIMoveChoiceModification3: cp $10 jr z, .nextMove jr c, .notEffectiveMove - dec [hl] ; sligthly encourage this move + dec [hl] ; slightly encourage this move jr .nextMove .notEffectiveMove ; discourages non-effective moves if better moves are available push hl @@ -253,7 +253,7 @@ AIMoveChoiceModification3: pop hl and a jr z, .nextMove - inc [hl] ; sligthly discourage this move + inc [hl] ; slightly discourage this move jr .nextMove AIMoveChoiceModification4: ret diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 1b571d35..c1fa5aa4 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -54,7 +54,7 @@ KabutopsFossilText: DisplayMonFrontSpriteInBox: ; Displays a pokemon's front sprite in a pop-up window. -; [wcf91] = pokemon interal id number +; [wcf91] = pokemon internal id number ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 diff --git a/engine/items/items.asm b/engine/items/items.asm index 057595df..f46261b6 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: jp nc,.useVitamin ; if it's a vitamin or Rare Candy cp a,FULL_RESTORE jr nc,.healHP ; if it's a Full Restore or one of the potions -; fall through if it's one of the status-specifc healing items +; fall through if it's one of the status-specific healing items .cureStatusAilment ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status diff --git a/engine/learn_move.asm b/engine/learn_move.asm index ba73d4c0..53c7f87e 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -185,7 +185,7 @@ TryingToLearn: LearnedMove1Text: TX_FAR _LearnedMove1Text - TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the pary menu (rare candy) and plays SFX_LEVEL_UP in battle + TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle TX_BLINK db "@" diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index 4df9de27..83a81aac 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menu/draw_start_menu.asm @@ -27,7 +27,7 @@ DrawStartMenu: set 6,[hl] ; no pauses between printing each letter coord hl, 12, 2 CheckEvent EVENT_GOT_POKEDEX -; case for not having pokdex +; case for not having pokedex ld a,$06 jr z,.storeMenuItemCount ; case for having pokedex diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 2628da48..64065c4d 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -409,7 +409,7 @@ PrintNicknameAndUnderscores: call EraseMenuCursor ld a, $11 ; "ED" x coord ld [wTopMenuItemX], a - ld a, $5 ; "ED" y corrd + ld a, $5 ; "ED" y coord ld [wCurrentMenuItem], a ld a, [wNamingScreenType] cp NAME_MON_SCREEN diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2da3a0f6..bf8afaa9 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -647,7 +647,7 @@ PokedexToIndex: ret IndexToPokedex: - ; converts the indexédex number at wd11e to a Pokédex number + ; converts the index number at wd11e to a Pokédex number push bc push hl ld a,[wd11e] diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 05588321..2a221c7e 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -7,7 +7,7 @@ ; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot ; fields, respectively, within loops. The X is the loop index. ; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* -; denote fields of the sprite slots interated over in the inner loop. +; denote fields of the sprite slots iterated over in the inner loop. InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) @@ -192,7 +192,7 @@ LoadMapSpriteTilePatterns: pop de call FarCopyData2 ; load tile pattern data for sprite when walking jr .skipSecondLoad -; When reloading the upper half of tile patterns after diplaying text, the LCD +; When reloading the upper half of tile patterns after displaying text, the LCD ; will be on, so CopyVideoData (which writes to VRAM only during V-blank) must ; be used instead of FarCopyData2. .loadWhileLCDOn diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 6d05859e..bbfbbc39 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -331,9 +331,9 @@ UpdateSpriteInWalkingAnimation: ld a, [H_CURRENTSPRITEOFFSET] ld l, a inc h - ld a, [hl] ; c2x0 (walk animantion counter) + ld a, [hl] ; c2x0 (walk animation counter) dec a - ld [hl], a ; update walk animantion counter + ld [hl], a ; update walk animation counter ret nz ld a, $6 ; walking finished, update state add l @@ -446,7 +446,7 @@ InitializeSpriteStatus: ld [hl], a ; $c2x3: set X displacement to 8 ret -; calculates the spprite's scrren position form its map position and the player position +; calculates the sprite's screen position form its map position and the player position InitializeSpriteScreenPosition: ld h, wSpriteStateData2 / $100 ld a, [H_CURRENTSPRITEOFFSET] @@ -685,7 +685,7 @@ CanWalkOntoTile: scf ; set carry (marking failure to walk) ret -; calculates the tile pointer pointing to the tile the current sprite stancs on +; calculates the tile pointer pointing to the tile the current sprite stands on ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer GetTileSpriteStandsOn: diff --git a/home.asm b/home.asm index 0a2d829d..3d0adfff 100644 --- a/home.asm +++ b/home.asm @@ -2083,7 +2083,7 @@ DisableWaitingAfterTextDisplay:: ; [wcf91] = item ID ; OUTPUT: ; [wActionResultOrTookBattleTurn] = success -; 00: unsucessful +; 00: unsuccessful ; 01: successful ; 02: not able to be used right now, no extra menu displayed (only certain items use this) UseItem:: @@ -3382,7 +3382,7 @@ CopyString:: ; this function is used when lower button sensitivity is wanted (e.g. menus) ; OUTPUT: [hJoy5] = pressed buttons in usual format ; there are two flags that control its functionality, [hJoy6] and [hJoy7] -; there are esentially three modes of operation +; there are essentially three modes of operation ; 1. Get newly pressed buttons only ; ([hJoy7] == 0, [hJoy6] == any) ; Just copies [hJoyPressed] to [hJoy5]. @@ -3730,7 +3730,7 @@ CalcStat:: ld a, b add e jr nc, .noCarry2 - inc d ; da = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 + inc d ; de = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 .noCarry2 ld [H_MULTIPLICAND+2], a ld a, d diff --git a/hram.asm b/hram.asm index 9c13e5a1..4beca9c4 100644 --- a/hram.asm +++ b/hram.asm @@ -98,7 +98,7 @@ hSwapTemp EQU $FF95 hExperience EQU $FF96 ; 3 bytes, big endian -; Multiplcation and division variables are meant +; Multiplication and division variables are meant ; to overlap for back-to-back usage. Big endian. H_MULTIPLICAND EQU $FF96 ; 3 bytes diff --git a/macros/data_macros.asm b/macros/data_macros.asm index e24ae20e..4c6457be 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -146,7 +146,7 @@ ENDM ;\6 (flag) = add 3 to width of connection strip (why?) SOUTH_MAP_CONNECTION: MACRO db \2 ; map id - dw \5 + \4 ; "Conection Strip" location + dw \5 + \4 ; "Connection Strip" location dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position IF (\1_WIDTH < \2_WIDTH) IF (_NARG > 5) diff --git a/wram.asm b/wram.asm index cc2d332a..698027be 100755 --- a/wram.asm +++ b/wram.asm @@ -1735,7 +1735,7 @@ wPlayerBattleStatus3:: ; d064 ; bit 0 - toxic ; bit 1 - light screen ; bit 2 - reflect -; bit 3 - tranformed +; bit 3 - transformed ds 1 wEnemyStatsToDouble:: ; d065 @@ -2046,7 +2046,7 @@ wPredefBank:: ; d0b7 wMonHeader:: ; d0b8 wMonHIndex:: ; d0b8 -; In the ROM base stats data stucture, this is the dex number, but it is +; In the ROM base stats data structure, this is the dex number, but it is ; overwritten with the internal index number after the header is copied to WRAM. ds 1 @@ -3057,7 +3057,7 @@ wd732:: ; d732 ; bit 1: remnant of debug mode? not set by the game code. ; if it is set ; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and SONY as the rival's name -; 2. does not have the player start in floor two of the playyer's house (instead sending them to [wLastMap]) +; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap]) ; 3. allows wild battles to be avoided by holding down B ; bit 2: the target warp is a fly warp (bit 3 set or blacked out) or a dungeon warp (bit 4 set) ; bit 3: used warp pad, escape rope, dig, teleport, or fly, so the target warp is a "fly warp" @@ -3085,7 +3085,7 @@ wd736:: ; d736 ; bit 1: the player is currently stepping down from a door ; bit 2: standing on a warp ; bit 6: jumping down a ledge / fishing animation -; bit 7: player sprite spinning due to spin tiles (Rocket hidehout / Viridian Gym) +; bit 7: player sprite spinning due to spin tiles (Rocket hideout / Viridian Gym) ds 1 wCompletedInGameTradeFlags:: ; d737 @@ -3168,7 +3168,7 @@ wUnusedDA38:: ; da38 wCurMapScript:: ; da39 ; index of current map script, mostly used as index for function pointer array -; mostly copied from map-specific map script pointer and wirtten back later +; mostly copied from map-specific map script pointer and written back later ds 1 ds 7 -- cgit v1.2.3 From 5c39c6c5cb4defc4fcec85bb4b7cd878d190d6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20M=2E=20Gonz=C3=A1lez?= Date: Sun, 30 Jul 2017 18:46:53 -0300 Subject: Replaced all instances of $52, $53, and $5A with "", "", and "" respectively. --- text.asm | 2 +- text/maps/agatha.asm | 2 +- text/maps/bills_house.asm | 2 +- text/maps/blues_house.asm | 6 +++--- text/maps/bruno.asm | 2 +- text/maps/celadon_city.asm | 2 +- text/maps/celadon_dept_store_roof.asm | 6 +++--- text/maps/celadon_diner.asm | 2 +- text/maps/celadon_game_corner.asm | 6 +++--- text/maps/celadon_gym.asm | 2 +- text/maps/cerulean_city.asm | 10 +++++----- text/maps/cerulean_gym.asm | 2 +- text/maps/champion.asm | 22 +++++++++++----------- text/maps/cinnabar_gym.asm | 4 ++-- text/maps/cinnabar_lab_fossil_room.asm | 2 +- text/maps/cinnabar_lab_metronome_room.asm | 2 +- text/maps/copycats_house_2f.asm | 14 +++++++------- text/maps/daycare_1.asm | 2 +- text/maps/fuchsia_fishing_house.asm | 4 ++-- text/maps/fuchsia_gym_2.asm | 2 +- text/maps/fujis_house.asm | 4 ++-- text/maps/lance.asm | 6 +++--- text/maps/mr_psychics_house.asm | 2 +- text/maps/mt_moon_b2f.asm | 2 +- text/maps/oaks_lab.asm | 4 ++-- text/maps/pallet_town.asm | 4 ++-- text/maps/pewter_gym_2.asm | 4 ++-- text/maps/pokemon_tower_2f.asm | 6 +++--- text/maps/pokemon_tower_5f.asm | 2 +- text/maps/route_1.asm | 2 +- text/maps/route_12_gate_upstairs.asm | 2 +- text/maps/route_12_house.asm | 4 ++-- text/maps/route_16_house.asm | 2 +- text/maps/route_22.asm | 12 ++++++------ text/maps/route_24_1.asm | 2 +- text/maps/safari_zone_entrance.asm | 2 +- text/maps/safari_zone_secret_house.asm | 2 +- text/maps/saffron_gym.asm | 2 +- text/maps/silph_co_11f.asm | 4 ++-- text/maps/silph_co_2f.asm | 2 +- text/maps/silph_co_3f.asm | 2 +- text/maps/silph_co_7f.asm | 12 ++++++------ text/maps/ss_anne_2.asm | 10 +++++----- text/maps/ss_anne_7.asm | 4 ++-- text/maps/vermilion_fishing_house.asm | 4 ++-- text/maps/vermilion_gym_2.asm | 2 +- text/maps/victory_road_2f.asm | 2 +- text/maps/viridian_city.asm | 2 +- text/maps/viridian_gym.asm | 2 +- text/maps/viridian_mart.asm | 2 +- text/maps/wardens_house.asm | 4 ++-- text/oakspeech.asm | 2 +- 52 files changed, 107 insertions(+), 107 deletions(-) diff --git a/text.asm b/text.asm index 866d4a7f..fc075e19 100644 --- a/text.asm +++ b/text.asm @@ -2239,7 +2239,7 @@ _CoinsScatteredText:: prompt _GettingPumpedText:: - text $5a, "'s" + text "'s" line "getting pumped!" prompt diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 4957f4d4..9ef5059a 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -17,7 +17,7 @@ _AgathaBeforeBattleText:: cont "wrong! #MON" cont "are for fighting!" - para $52, "! I'll show" + para "! I'll show" line "you how a real" cont "trainer fights!" done diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 463b13e6..5ece48d7 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -54,7 +54,7 @@ _BillThankYouText:: prompt _SSTicketReceivedText:: - text $52, " received" + text " received" line "an @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index b676ea69..1898636a 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -1,6 +1,6 @@ _DaisyInitialText:: - text "Hi ",$52,"!" - line $53," is out at" + text "Hi !" + line " is out at" cont "Grandpa's lab." done @@ -12,7 +12,7 @@ _DaisyOfferMapText:: prompt _GotMapText:: - text $52," got a" + text " got a" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index 39898eb5..9c493c4a 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -11,7 +11,7 @@ _BrunoBeforeBattleText:: line "trained with" cont "my #MON!" - para $52, "!" + para "!" para "We will grind you" line "down with our" diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index e2470ec1..1dbd5cdf 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -40,7 +40,7 @@ _TM41PreText:: prompt _ReceivedTM41Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 4689b023..5d104cf5 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -14,7 +14,7 @@ _CeladonMartRoofText_484f3:: line "from me!@@" _CeladonMartRoofText_484f9:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -40,7 +40,7 @@ _CeladonMartRoofText_48504:: line "from me!@@" _CeladonMartRoofText_4850a:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -66,7 +66,7 @@ _CeladonMartRoofText_48515:: line "from me!@@" _ReceivedTM49Text:: - text $52, " received" + text " received" line "TM49!@@" _CeladonMartRoofText_48520:: diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index fd31eb20..dc5e9350 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -42,7 +42,7 @@ _CeladonDinerText_491a7:: prompt _ReceivedCoinCaseText:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm index 2d263e80..1e59f83e 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/celadon_game_corner.asm @@ -64,7 +64,7 @@ _CeladonGameCornerText_48d9c:: prompt _Received10CoinsText:: - text $52, " received" + text " received" line "10 coins!@@" _CeladonGameCornerText_48da7:: @@ -121,7 +121,7 @@ _CeladonGameCornerText_48e26:: prompt _Received20CoinsText:: - text $52, " received" + text " received" line "20 coins!@@" _CeladonGameCornerText_48e31:: @@ -143,7 +143,7 @@ _CeladonGameCornerText_48e88:: prompt _CeladonGameCornerText_48e8d:: - text $52, " received" + text " received" line "20 coins!@@" _CeladonGameCornerText_48e93:: diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index 99833ee1..d8f9394c 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -62,7 +62,7 @@ _CeladonGymText9:: done _ReceivedTM21Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index 48d97e05..b5319d04 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -1,6 +1,6 @@ _CeruleanCityText_19668:: - text $53, ": Yo!" - line $52, "!" + text ": Yo!" + line "!" para "You're still" line "struggling along" @@ -13,7 +13,7 @@ _CeruleanCityText_19668:: para "Here, let me see" line "what you caught," - cont $52, "!" + cont "!" done _CeruleanCityText_1966d:: @@ -29,7 +29,7 @@ _CeruleanCityText_19672:: prompt _CeruleanCityText_19677:: - text $53, ": Hey," + text ": Hey," line "guess what?" para "I went to BILL's" @@ -69,7 +69,7 @@ _CeruleanCityText_196d9:: done _ReceivedTM28Text:: - text $52, " recovered" + text " recovered" line "TM28!@@" _ReceivedTM28Text2:: diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index dd6baaff..1d1d6d1c 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -46,7 +46,7 @@ _CeruleanGymText_5c7c8:: done _ReceivedTM11Text:: - text $52, " received" + text " received" line "TM11!@@" _CeruleanGymText_5c7d3:: diff --git a/text/maps/champion.asm b/text/maps/champion.asm index 3ca7aadf..61050565 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,9 +1,9 @@ _GaryChampionIntroText:: - text $53, ": Hey!" + text ": Hey!" para "I was looking" line "forward to seeing" - cont "you, ", $52, "!" + cont "you, !" para "My rival should" line "be strong to keep" @@ -24,7 +24,7 @@ _GaryChampionIntroText:: para "I'm the #MON" line "LEAGUE champion!" - para $52, "! Do you" + para "! Do you" line "know what that" cont "means?" @@ -54,11 +54,11 @@ _GaryVictoryText:: line "I won, I won!" para "I'm too good for" - line "you, ", $52, "!" + line "you, !" para "You did well to" line "even reach me," - cont $53, ", the" + cont ", the" cont "#MON genius!" para "Nice try, loser!" @@ -82,7 +82,7 @@ _GaryText_76103:: done _GaryText2:: - text "OAK: ", $52, "!" + text "OAK: !" done _GaryText_76120:: @@ -99,12 +99,12 @@ _GaryText_76120:: TX_RAM wcd6d text "!" - para $52, ", you have" + para ", you have" line "come of age!" done _GaryText_76125:: - text "OAK: ", $53, "! I'm" + text "OAK: ! I'm" line "disappointed!" para "I came when I" @@ -115,7 +115,7 @@ _GaryText_76125:: line "here, you had" cont "already lost!" - para $53, "! Do you" + para "! Do you" line "understand why" cont "you lost?" @@ -130,7 +130,7 @@ _GaryText_76125:: done _GaryText_7612a:: - text "OAK: ", $52, "!" + text "OAK: !" para "You understand" line "that your victory" @@ -141,6 +141,6 @@ _GaryText_7612a:: line "with your #MON" cont "is marvelous!" - para $52, "!" + para "!" line "Come with me!" done diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index b14f6f60..173f94d2 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -42,7 +42,7 @@ _BlaineBadgeText:: done _ReceivedTM38Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -204,6 +204,6 @@ _CinnabarGymText_75ac2:: done _CinnabarGymText_75ac7:: - text $52, "! You beat" + text "! You beat" line "that fire brand!" done diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index 565104b3..3978814e 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -58,7 +58,7 @@ _Lab4Text_610b3:: text "So! You hurry and" line "give me that!" - para $52, " handed" + para " handed" line "over @" TX_RAM wcd6d text "!" diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index e2fbb558..fa04677f 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -7,7 +7,7 @@ _TM35PreReceiveText:: prompt _ReceivedTM35Text:: - text $52, " received " + text " received " line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 90833127..44988e58 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -1,11 +1,11 @@ _CopycatsHouse2FText_5ccd4:: - text $52, ": Hi! Do" + text ": Hi! Do" line "you like #MON?" - para $52, ": Uh no, I" + para ": Uh no, I" line "just asked you." - para $52, ": Huh?" + para ": Huh?" line "You're strange!" para "COPYCAT: Hmm?" @@ -27,7 +27,7 @@ _TM31PreReceiveText:: prompt _ReceivedTM31Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" @@ -41,12 +41,12 @@ _TM31ExplanationText1:: line "#MON!@@" _TM31ExplanationText2:: - text $52, ": Hi!" + text ": Hi!" line "Thanks for TM31!" - para $52, ": Pardon?" + para ": Pardon?" - para $52, ": Is it" + para ": Is it" line "that fun to mimic" cont "my every move?" diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index 6e3c5737..f4cec10e 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -46,7 +46,7 @@ _DayCareOweMoneyText:: done _DayCareGotMonBackText:: - text $52, " got" + text " got" line "@" TX_RAM wDayCareMonName text " back!" diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 195dc8ef..b1b8b2f2 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -17,7 +17,7 @@ _FuchsiaHouse3Text_561c2:: para "Take this and" line "fish, young one!" - para $52, " received" + para " received" line "a @" TX_RAM wcf4b text "!@@" @@ -29,7 +29,7 @@ _FuchsiaHouse3Text_56212:: _FuchsiaHouse3Text_56217:: text "Hello there," - line $52, "!" + line "!" para "How are the fish" line "biting?" diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm index ba1970e6..2913fb8f 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym_2.asm @@ -25,7 +25,7 @@ _FuchsiaGymText9:: done _ReceivedTM06Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index 7c61d1ed..86cade68 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -34,7 +34,7 @@ _LavenderHouse1Text4:: text "NIDORINO: Gaoo!@@" _LavenderHouse1Text_1d94c:: - text "MR.FUJI: ", $52, "." + text "MR.FUJI: ." para "Your #DEX quest" line "may fail without" @@ -46,7 +46,7 @@ _LavenderHouse1Text_1d94c:: prompt _ReceivedFluteText:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 0313b158..ed3dcada 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -24,7 +24,7 @@ _LanceBeforeBattleText:: para "Your LEAGUE" line "challenge ends" - cont "with me, ", $52, "!" + cont "with me, !" done _LanceEndBattleText:: @@ -39,7 +39,7 @@ _LanceAfterBattleText:: text "I still can't" line "believe my" cont "dragons lost to" - cont "you, ", $52, "!" + cont "you, !" para "You are now the" line "#MON LEAGUE" @@ -54,7 +54,7 @@ _LanceAfterBattleText:: line "another trainer!" cont "His name is..." - para $53, "!" + para "!" line "He beat the ELITE" cont "FOUR before you!" diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index 8c37383d..7be2e11e 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -6,7 +6,7 @@ _TM29PreReceiveText:: prompt _ReceivedTM29Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index 462c9d3c..472649b9 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -9,7 +9,7 @@ _MtMoon3Text_49f64:: done _MtMoon3Text_49f6f:: - text $52, " got the" + text " got the" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 1f02c355..7a6f57b7 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -10,7 +10,7 @@ _OaksLabText40:: cont "greedy like you!" para "Go ahead and" - line "choose, ", $52, "!" + line "choose, !" done _OaksLabText41:: @@ -49,7 +49,7 @@ _OaksLabMonEnergeticText:: prompt _OaksLabReceivedMonText:: - text $52, " received" + text " received" line "a @" TX_RAM wcd6d text "!@@" diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index 64b3325b..d5eda74f 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -47,9 +47,9 @@ _PalletTownText5:: done _PalletTownText6:: - text $52,"'s house " + text "'s house " done _PalletTownText7:: - text $53,"'s house " + text "'s house " done diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm index ff5f7242..86b97018 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/pewter_gym_2.asm @@ -18,7 +18,7 @@ _TM34PreReceiveText:: done _ReceivedTM34Text:: - text $52, " received" + text " received" line "TM34!@@" _TM34ExplanationText:: @@ -57,7 +57,7 @@ _PewterGymText_5c4bc:: line "victory, here's" cont "the BOULDERBADGE!" - para $52, " received" + para " received" line "the BOULDERBADGE!@@" _PewterGymText_5c4c1:: diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm index ec2281fd..79323001 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/pokemon_tower_2f.asm @@ -1,6 +1,6 @@ _PokemonTower2Text_6062d:: - text $53, ": Hey," - line $52, "! What" + text ": Hey," + line "! What" cont "brings you here?" cont "Your #MON" cont "don't look dead!" @@ -19,7 +19,7 @@ _PokemonTower2Text_60632:: prompt _PokemonTower2Text_60637:: - text $53, ": Well," + text ": Well," line "look at all your" cont "wimpy #MON!" diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm index f2cadfcb..b329118d 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/pokemon_tower_5f.asm @@ -66,6 +66,6 @@ _PokemonTower5Text7:: text "Entered purified," line "protected zone!" - para $52, "'s #MON" + para "'s #MON" line "are fully healed!" done diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index adffd705..73188f09 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -13,7 +13,7 @@ _Route1ViridianMartSampleText:: prompt _Route1Text_1cae8:: - text $52, " got" + text " got" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 1f2af788..95a89527 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -9,7 +9,7 @@ _TM39PreReceiveText:: prompt _ReceivedTM39Text:: - text $52, " received" + text " received" line "TM39!@@" _TM39ExplanationText:: diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index 4cb4beee..e04ce5fb 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -16,7 +16,7 @@ _Route12HouseText_564c5:: para "Take this and" line "fish, young one!" - para $52, " received" + para " received" line "a @" TX_RAM wcf4b text "!@@" @@ -39,7 +39,7 @@ _Route12HouseText_564cf:: _Route12HouseText_564d4:: text "Hello there," - line $52, "!" + line "!" para "Use the SUPER ROD" line "in any water!" diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm index 534cee08..77efde87 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/route_16_house.asm @@ -9,7 +9,7 @@ _Route16HouseText3:: prompt _ReceivedHM02Text:: - text $52, " received" + text " received" line "HM02!@@" _HM02ExplanationText:: diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index ac4141eb..3a1d28f0 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -1,6 +1,6 @@ _Route22RivalBeforeBattleText1:: - text $53, ": Hey!" - line $52, "!" + text ": Hey!" + line "!" para "You're going to" line "#MON LEAGUE?" @@ -38,7 +38,7 @@ _Route22RivalDefeatedText1:: prompt _Route22Text_511bc:: - text $53, ": What?" + text ": What?" line "Why do I have 2" cont "#MON?" @@ -47,8 +47,8 @@ _Route22Text_511bc:: prompt _Route22RivalBeforeBattleText2:: - text $53, ": What?" - line $52, "! What a" + text ": What?" + line "! What a" cont "surprise to see" cont "you here!" @@ -72,7 +72,7 @@ _Route22RivalAfterBattleText2:: line "up! I'm ready for" cont "#MON LEAGUE!" - para $52, ", you need" + para ", you need" line "more practice!" para "But hey, you know" diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm index 25079b2f..ae861eda 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/route_24_1.asm @@ -10,7 +10,7 @@ _Route24Text_51515:: prompt _Route24Text_5151a:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 8a018b2d..dcc1fd9b 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -20,7 +20,7 @@ SafariZoneEntranceText_9e747:: line "special # BALL" cont "here." - para $52, " received" + para " received" line "30 SAFARI BALLs!@@" _SafariZoneEntranceText_75360:: diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index 1bbe89fd..3df79d90 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -15,7 +15,7 @@ _SecretHouseText_4a350:: prompt _ReceivedHM03Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index ba57e35d..419b56ac 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -55,7 +55,7 @@ _SaffronGymText_5d173:: done ReceivedTM46Text:: - text $52, " received" + text " received" line "TM46!@@" _TM46ExplanationText:: diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 8e7a3848..fbaa6086 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -20,7 +20,7 @@ _SilphCoPresidentText:: prompt _ReceivedSilphCoMasterBallText:: - text $52, " got a" + text " got a" line "@" TX_RAM wcf4b text "!@@" @@ -87,7 +87,7 @@ _SilphCo10Text_62335:: para "But, TEAM ROCKET" line "will never fall!" - para $52, "! Never" + para "! Never" line "forget that all" cont "#MON exist" cont "for TEAM ROCKET!" diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index a48ebd23..bd87630a 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -10,7 +10,7 @@ _SilphCo2Text_59ded:: prompt _ReceivedTM36Text:: - text $52, " got" + text " got" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm index a514d3ef..b6a023f9 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/silph_co_3f.asm @@ -4,7 +4,7 @@ _SilphCo3Text_59ff9:: done _SilphCo3Text_59ffe:: - text $52, "! You and" + text "! You and" line "your #MON" cont "saved us!" done diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index e6ad11c1..1cc2bc30 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -145,12 +145,12 @@ _SilphCo7AfterBattleText4:: done _SilphCo7Text_51ebe:: - text $53, ": What" - line "kept you ", $52, "?" + text ": What" + line "kept you ?" done _SilphCo7Text_51ec3:: - text $53, ": Hahaha!" + text ": Hahaha!" line "I thought you'd" cont "turn up if I" cont "waited here!" @@ -173,7 +173,7 @@ _SilphCo7Text_51ec8:: prompt _SilphCo7Text_51ecd:: - text $53, ": How can" + text ": How can" line "I put this?" para "You're not good" @@ -182,7 +182,7 @@ _SilphCo7Text_51ecd:: prompt _SilphCo7Text_51ed2:: - text "Well, ", $52, "!" + text "Well, !" para "I'm moving on up" line "and ahead!" @@ -202,7 +202,7 @@ _SilphCo7Text_51ed2:: line "world's most" cont "powerful trainer!" - para $52, ", well" + para ", well" line "good luck to you!" cont "Don't sweat it!" cont "Smell ya!" diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm index ba231ac5..58d804ba 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/ss_anne_2.asm @@ -9,13 +9,13 @@ _SSAnne2Text1:: done _SSAnneRivalBeforeBattleText:: - text $53, ": Bonjour!" - line $52, "!" + text ": Bonjour!" + line "!" para "Imagine seeing" line "you here!" - para $52, ", were you" + para ", were you" line "really invited?" para "So how's your" @@ -40,7 +40,7 @@ _SSAnneRivalDefeatedText:: prompt _SSAnneRivalWonText:: - text $52, "! What are" + text "! What are" line "you, seasick?" para "You should shape" @@ -48,7 +48,7 @@ _SSAnneRivalWonText:: prompt _SSAnneRivalCaptainText:: - text $53, ": I heard" + text ": I heard" line "there was a CUT" cont "master on board." diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index bb8ca042..7bf004da 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -3,7 +3,7 @@ _SSAnne7RubText:: line "I feel hideous..." cont "Urrp! Seasick..." - para $52, " rubbed" + para " rubbed" line "the CAPTAIN's" cont "back!" @@ -31,7 +31,7 @@ _ReceivingHM01Text:: prompt _ReceivedHM01Text:: - text $52, " got" + text " got" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index 0fa28cae..6857bb5b 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -16,7 +16,7 @@ _VermilionHouse2Text_560b6:: para "Take this and" line "fish, young one!" - para $52, " received" + para " received" line "an @" TX_RAM wcf4b text "!@@" @@ -39,7 +39,7 @@ _VermilionHouse2Text_560c0:: _VermilionHouse2Text_560c5:: text "Hello there," - line $52, "!" + line "!" para "How are the fish" line "biting?" diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm index 4fd5e159..d0a01932 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym_2.asm @@ -24,7 +24,7 @@ _VermilionGymText_5cb77:: done _ReceivedTM24Text:: - text $52, " received " + text " received " line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index cdcf6e36..ec9dcf4f 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -29,7 +29,7 @@ _VictoryRoad2EndBattleText2:: prompt _VictoryRoad2AfterBattleText2:: - text $53, " also came" + text " also came" line "through here!" done diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 17b2ec91..67ab5c40 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -83,7 +83,7 @@ _ViridianCityText_191ca:: prompt _ReceivedTM42Text:: - text $52, " received" + text " received" line "TM42!@@" _TM42Explanation:: diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index df04e6d6..f87d8d58 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -60,7 +60,7 @@ _ViridianGymText12:: done _ReceivedTM27Text:: - text $52, " received" + text " received" line "TM27!@@" _TM27ExplanationText:: diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm index aa199335..61750afe 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -16,7 +16,7 @@ ViridianMartParcelQuestText:: line "Will you take it" cont "to him?" - para $52, " got" + para " got" line "OAK's PARCEL!@@" _ViridianMartText2:: diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index d4da3781..9d40cace 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -18,7 +18,7 @@ _WardenGibberishText3:: done _WardenTeethText1:: - text $52, " gave the" + text " gave the" line "GOLD TEETH to the" cont "WARDEN!@@" @@ -42,7 +42,7 @@ _WardenThankYouText:: prompt _ReceivedHM04Text:: - text $52, " received" + text " received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/oakspeech.asm b/text/oakspeech.asm index 5911092c..e006d16f 100644 --- a/text/oakspeech.asm +++ b/text/oakspeech.asm @@ -42,7 +42,7 @@ _IntroduceRivalText:: prompt _OakSpeechText3:: - text $52,"!" + text "!" para "Your very own" line "#MON legend is" -- cgit v1.2.3 From 55bfaba38e2ffe9b1f8d28e067f443bb6345a09b Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Mon, 4 Sep 2017 19:06:18 -0400 Subject: Add Discord link. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index abaaa653..e8897010 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,9 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). ## See also * Disassembly of [**Pokémon Crystal**][pokecrystal] +* Discord: [**pret**][Discord] * irc: **irc.freenode.net** [**#pret**][irc] [pokecrystal]: https://github.com/kanzure/pokecrystal +[Discord]: https://discord.gg/cJxDDVP [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret -- cgit v1.2.3 From a92733b2b9a074c302e23fe6f7a85c8f46a116b3 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Mon, 4 Sep 2017 19:25:52 -0400 Subject: Add other disassembly links. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e8897010..70315c05 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,16 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). ## See also +* Disassembly of [**Pokémon Yellow**][pokeyellow] * Disassembly of [**Pokémon Crystal**][pokecrystal] +* Disassembly of [**Pokémon Pinball**][pokepinball] +* Disassembly of [**Pokémon TCG**][poketcg] * Discord: [**pret**][Discord] * irc: **irc.freenode.net** [**#pret**][irc] -[pokecrystal]: https://github.com/kanzure/pokecrystal +[pokeyellow]: https://github.com/pret/pokeyellow +[pokecrystal]: https://github.com/pret/pokecrystal +[pokepinball]: https://github.com/pret/pokepinball +[poketcg]: https://github.com/pret/poketcg [Discord]: https://discord.gg/cJxDDVP [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret -- cgit v1.2.3 From fc9712596f6122fc114e0136c19795b36ee4868b Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Mon, 4 Sep 2017 19:41:04 -0400 Subject: Add Gen 3 disassemblies. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 70315c05..6d5ebe4f 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). * Disassembly of [**Pokémon Crystal**][pokecrystal] * Disassembly of [**Pokémon Pinball**][pokepinball] * Disassembly of [**Pokémon TCG**][poketcg] +* Disassembly of [**Pokémon Ruby**][pokeruby] +* Disassembly of [**Pokémon Emerald**][pokeemerald] * Discord: [**pret**][Discord] * irc: **irc.freenode.net** [**#pret**][irc] @@ -23,5 +25,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). [pokecrystal]: https://github.com/pret/pokecrystal [pokepinball]: https://github.com/pret/pokepinball [poketcg]: https://github.com/pret/poketcg +[pokeruby]: https://github.com/pret/pokeruby +[pokeemerald]: https://github.com/pret/pokeemerald [Discord]: https://discord.gg/cJxDDVP [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret -- cgit v1.2.3 From 901844f536e7eef58045c3dbeb6387e2c78ba870 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 29 Sep 2017 19:16:08 -0700 Subject: Use unions rather than negative offsets --- wram.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wram.asm b/wram.asm index cc2d332a..628e0664 100755 --- a/wram.asm +++ b/wram.asm @@ -3137,10 +3137,12 @@ wEnemyPartyCount:: ds 1 ; d89c wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d ; Overload enemy party data +UNION + wWaterRate:: db ; d8a4 wWaterMons:: db ; d8a5 - ds wWaterRate - @ +NEXTU wEnemyMons:: ; d8a4 wEnemyMon1:: party_struct wEnemyMon1 @@ -3153,6 +3155,8 @@ wEnemyMon6:: party_struct wEnemyMon6 wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee +ENDU + wTrainerHeaderPtr:: ; da30 ds 2 -- cgit v1.2.3 From f95d25c8329ef7b8d61ec2b053e774c9f91ef0b1 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 29 Sep 2017 19:22:56 -0700 Subject: Rename linkerscript and sort sym file --- Makefile | 3 +- linkerscript.link | 176 ------------------------------------------------------ pokered.link | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 177 deletions(-) delete mode 100644 linkerscript.link create mode 100644 pokered.link diff --git a/Makefile b/Makefile index 8e766b28..d0d3c011 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,9 @@ pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) - rgblink -n $*.sym -l linkerscript.link -o $@ $^ + rgblink -n $*.sym -l pokered.link -o $@ $^ rgbfix $($*_opt) $@ + sort $*.sym -o $*.sym %.png: ; %.2bpp: %.png ; @$(2bpp) $< diff --git a/linkerscript.link b/linkerscript.link deleted file mode 100644 index ad5ac793..00000000 --- a/linkerscript.link +++ /dev/null @@ -1,176 +0,0 @@ -ROM0 - ORG $61 - "Home" - ORG $150 - "Main" - -ROMX $1 - "bank1" - -ROMX $2 - "Sound Effect Headers 1" ; AUDIO_1 - "Music Headers 1" - "Sound Effects 1" - "Audio Engine 1" - "Music 1" - -ROMX $3 - "bank3" - -ROMX $4 - "NPC Sprites 1" ; NPC_SPRITES_1 - "Graphics" ; GFX - "Battle (bank 4)" - -ROMX $5 - "NPC Sprites 2" ; NPC_SPRITES_2 - "Battle (bank 5)" - -ROMX $6 - "bank6" - -ROMX $7 - "bank7" - -ROMX $8 - "Sound Effect Headers 2" ; AUDIO_2 - "Music Headers 2" - "Sound Effects 2" - "Audio Engine 2" - "Music 2" - -ROMX $9 - "Pics 1" ; PICS_1 - "Battle (bank 9)" - -ROMX $A - "Pics 2" ; PICS_2 - "Battle (bank A)" - -ROMX $B - "Pics 3" ; PICS_3 - "Battle (bank B)" - -ROMX $C - "Pics 4" ; PICS_4 - "Battle (bank C)" - -ROMX $D - "Pics 5" ; PICS_5 - "Battle (bank D)" - -ROMX $E - "bankE" - -ROMX $F - "bankF" - -ROMX $10 - "bank10" - -ROMX $11 - "bank11" - -ROMX $12 - "bank12" - -ROMX $13 - "bank13" - -ROMX $14 - "bank14" - -ROMX $15 - "bank15" - -ROMX $16 - "bank16" - -ROMX $17 - "bank17" - -ROMX $18 - "bank18" - -ROMX $19 - "bank19" - -ROMX $1A - "bank1A" - -ROMX $1B - "bank1B" - -ROMX $1C - "bank1C" - -ROMX $1D - "bank1D" - -ROMX $1E - "bank1E" - -ROMX $1F - "Sound Effect Headers 3" ; AUDIO_3 - "Music Headers 3" - "Sound Effects 3" - "Audio Engine 3" - "Music 3" - -ROMX $20 - "Text 1" ; TEXT_1 - -ROMX $21 - "Text 2" ; TEXT_2 - -ROMX $22 - "Text 3" ; TEXT_3 - -ROMX $23 - "Text 4" ; TEXT_4 - -ROMX $24 - "Text 5" ; TEXT_5 - -ROMX $25 - "Text 6" ; TEXT_6 - -ROMX $26 - "Text 7" ; TEXT_7 - -ROMX $27 - "Text 8" ; TEXT_8 - -ROMX $28 - "Text 9" ; TEXT_9 - -ROMX $29 - "Text 10" ; TEXT_10 - -ROMX $2A - "Text 11" ; TEXT_11 - -ROMX $2B - "Pokedex Text" ; POKEDEX_TEXT - -ROMX $2C - "Move Names" ; MOVE_NAMES - -WRAM0 - "WRAM Bank 0" - -WRAMX 1 - "WRAM Bank 1" - -SRAM 0 - "Sprite Buffers" - -SRAM 1 - "Save Data" - -SRAM 2 - "Saved Boxes 1" - -SRAM 3 - "Saved Boxes 2" - diff --git a/pokered.link b/pokered.link new file mode 100644 index 00000000..ad5ac793 --- /dev/null +++ b/pokered.link @@ -0,0 +1,176 @@ +ROM0 + ORG $61 + "Home" + ORG $150 + "Main" + +ROMX $1 + "bank1" + +ROMX $2 + "Sound Effect Headers 1" ; AUDIO_1 + "Music Headers 1" + "Sound Effects 1" + "Audio Engine 1" + "Music 1" + +ROMX $3 + "bank3" + +ROMX $4 + "NPC Sprites 1" ; NPC_SPRITES_1 + "Graphics" ; GFX + "Battle (bank 4)" + +ROMX $5 + "NPC Sprites 2" ; NPC_SPRITES_2 + "Battle (bank 5)" + +ROMX $6 + "bank6" + +ROMX $7 + "bank7" + +ROMX $8 + "Sound Effect Headers 2" ; AUDIO_2 + "Music Headers 2" + "Sound Effects 2" + "Audio Engine 2" + "Music 2" + +ROMX $9 + "Pics 1" ; PICS_1 + "Battle (bank 9)" + +ROMX $A + "Pics 2" ; PICS_2 + "Battle (bank A)" + +ROMX $B + "Pics 3" ; PICS_3 + "Battle (bank B)" + +ROMX $C + "Pics 4" ; PICS_4 + "Battle (bank C)" + +ROMX $D + "Pics 5" ; PICS_5 + "Battle (bank D)" + +ROMX $E + "bankE" + +ROMX $F + "bankF" + +ROMX $10 + "bank10" + +ROMX $11 + "bank11" + +ROMX $12 + "bank12" + +ROMX $13 + "bank13" + +ROMX $14 + "bank14" + +ROMX $15 + "bank15" + +ROMX $16 + "bank16" + +ROMX $17 + "bank17" + +ROMX $18 + "bank18" + +ROMX $19 + "bank19" + +ROMX $1A + "bank1A" + +ROMX $1B + "bank1B" + +ROMX $1C + "bank1C" + +ROMX $1D + "bank1D" + +ROMX $1E + "bank1E" + +ROMX $1F + "Sound Effect Headers 3" ; AUDIO_3 + "Music Headers 3" + "Sound Effects 3" + "Audio Engine 3" + "Music 3" + +ROMX $20 + "Text 1" ; TEXT_1 + +ROMX $21 + "Text 2" ; TEXT_2 + +ROMX $22 + "Text 3" ; TEXT_3 + +ROMX $23 + "Text 4" ; TEXT_4 + +ROMX $24 + "Text 5" ; TEXT_5 + +ROMX $25 + "Text 6" ; TEXT_6 + +ROMX $26 + "Text 7" ; TEXT_7 + +ROMX $27 + "Text 8" ; TEXT_8 + +ROMX $28 + "Text 9" ; TEXT_9 + +ROMX $29 + "Text 10" ; TEXT_10 + +ROMX $2A + "Text 11" ; TEXT_11 + +ROMX $2B + "Pokedex Text" ; POKEDEX_TEXT + +ROMX $2C + "Move Names" ; MOVE_NAMES + +WRAM0 + "WRAM Bank 0" + +WRAMX 1 + "WRAM Bank 1" + +SRAM 0 + "Sprite Buffers" + +SRAM 1 + "Save Data" + +SRAM 2 + "Saved Boxes 1" + +SRAM 3 + "Saved Boxes 2" + -- cgit v1.2.3 From d7fae287e49652f05c137ed20ce27e43d07b7514 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 29 Sep 2017 19:23:55 -0700 Subject: Update Travis configuration to use rgbds 0.3.3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca18f64d..bbcb7721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: c install: - |- path="$(pwd)"; cd; - wget https://github.com/rednex/rgbds/archive/v0.3.1.tar.gz -O rgbds.tar.gz && + wget https://github.com/rednex/rgbds/archive/v0.3.3.tar.gz -O rgbds.tar.gz && tar xf rgbds.tar.gz && - cd rgbds-0.3.1 && + cd rgbds-0.3.3 && sudo make install && cd - && rm -rf rgbds && -- cgit v1.2.3 From a9a687bd6e4b2d26564d7d41609daee6e1c59446 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 30 Sep 2017 13:33:44 -0400 Subject: install: rgbds 0.3.3 --- INSTALL.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index dee3eea1..f31f22ee 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,10 +1,10 @@ # Linux - sudo apt-get install make gcc bison git python + sudo apt-get install make git python + sudo apt-get install byacc flex pkg-config libpng-dev git clone https://github.com/rednex/rgbds cd rgbds - git checkout v0.2.5 sudo make install cd .. @@ -23,15 +23,12 @@ To build them individually: # Mac -In **Terminal**, run: +Get [**Homebrew**](http://brew.sh/). - xcode-select --install +Then in **Terminal**, run: - git clone https://github.com/rednex/rgbds - cd rgbds - git checkout v0.2.5 - sudo make install - cd .. + xcode-select --install + brew install rgbds git clone --recursive https://github.com/pret/pokered cd pokered @@ -41,12 +38,15 @@ In **Terminal**, run: # Windows -To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings. +To build on Windows, use [**Cygwin**](http://cygwin.com/install.html) (64-bit). Use the default settings. -In the installer, select the following packages: `make` `git` `python` `gettext` +In the installer, select the following packages: +- `make` +- `git` +- `python` -Then get [**rgbds 0.2.5**](https://github.com/bentley/rgbds/releases/tag/v0.2.5). -Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin\usr\local\bin`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. +Then download [**rgbds**](https://github.com/bentley/rgbds/releases). +Extract the archive. Inside should be `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe`, `rgbgfx.exe` and some `.dll` files. Put each file in `C:\cygwin64\usr\local\bin\`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. In the **Cygwin terminal**: -- cgit v1.2.3 From 19e4e188ceee383af090a6bc49f42151bf474e00 Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 29 Oct 2017 13:22:17 -0500 Subject: Catch a missed hide/show ID --- engine/overworld/npc_movement.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 98d1b7a7..2c75b9d8 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -148,7 +148,7 @@ PalletMovementScript_Done: ld a, [wSimulatedJoypadStatesIndex] and a ret nz - ld a, $0 + ld a, HS_PALLET_TOWN_OAK ld [wMissableObjectIndex], a predef HideObject ld hl, wd730 -- cgit v1.2.3 From 9dc48a1be72413c33976b7f9ecd4b0a5cb310f60 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 2 Dec 2017 14:40:34 -0600 Subject: Replace hardcoded address offset --- engine/save.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/save.asm b/engine/save.asm index 4fb2c4c8..e5f67a62 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -619,7 +619,7 @@ SAVCheckRandomID: ld a,[sMainDataCheckSum] cp c jr nz,.next - ld hl,sMainData + 98 ; player ID + ld hl,sMainData + (wPlayerID - wMainDataStart) ; player ID ld a,[hli] ld h,[hl] ld l,a -- cgit v1.2.3 From 94b9a86c8b9b6ea29653e98921205056790d6617 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Sat, 30 Dec 2017 00:59:48 +0100 Subject: Uppercase battle status constants --- constants/status_constants.asm | 40 ++-- engine/battle/animations.asm | 2 +- engine/battle/core.asm | 214 ++++++++++----------- engine/battle/decrement_pp.asm | 6 +- engine/battle/moveEffects/conversion_effect.asm | 2 +- engine/battle/moveEffects/focus_energy_effect.asm | 4 +- engine/battle/moveEffects/haze_effect.asm | 8 +- engine/battle/moveEffects/leech_seed_effect.asm | 4 +- engine/battle/moveEffects/mist_effect.asm | 4 +- .../moveEffects/reflect_light_screen_effect.asm | 8 +- engine/battle/moveEffects/substitute_effect.asm | 4 +- engine/battle/moveEffects/transform_effect.asm | 6 +- engine/items/items.asm | 12 +- engine/palettes.asm | 2 +- 14 files changed, 158 insertions(+), 158 deletions(-) diff --git a/constants/status_constants.asm b/constants/status_constants.asm index d9be6250..25babb82 100755 --- a/constants/status_constants.asm +++ b/constants/status_constants.asm @@ -6,27 +6,27 @@ FRZ EQU 5 PAR EQU 6 ; volatile statuses 1 -StoringEnergy EQU 0 ; Bide -ThrashingAbout EQU 1 ; e.g. Thrash -AttackingMultipleTimes EQU 2 ; e.g. Double Kick, Fury Attack -Flinched EQU 3 -ChargingUp EQU 4 ; e.g. Solar Beam, Fly -UsingTrappingMove EQU 5 ; e.g. Wrap -Invulnerable EQU 6 ; charging up Fly/Dig -Confused EQU 7 +STORING_ENERGY EQU 0 ; Bide +THRASHING_ABOUT EQU 1 ; e.g. Thrash +ATTACKING_MULTIPLE_TIMES EQU 2 ; e.g. Double Kick, Fury Attack +FLINCHED EQU 3 +CHARGING_UP EQU 4 ; e.g. Solar Beam, Fly +USING_TRAPPING_MOVE EQU 5 ; e.g. Wrap +INVULNERABLE EQU 6 ; charging up Fly/Dig +CONFUSED EQU 7 ; volatile statuses 2 -UsingXAccuracy EQU 0 -ProtectedByMist EQU 1 -GettingPumped EQU 2 ; Focus Energy -; EQU 3 ; unused? -HasSubstituteUp EQU 4 -NeedsToRecharge EQU 5 ; Hyper Beam -UsingRage EQU 6 -Seeded EQU 7 +USING_X_ACCURACY EQU 0 +PROTECTED_BY_MIST EQU 1 +GETTING_PUMPED EQU 2 ; Focus Energy +; EQU 3 ; unused +HAS_SUBSTITUTE_UP EQU 4 +NEEDS_TO_RECHARGE EQU 5 ; Hyper Beam +USING_RAGE EQU 6 +SEEDED EQU 7 ; volatile statuses 3 -BadlyPoisoned EQU 0 -HasLightScreenUp EQU 1 -HasReflectUp EQU 2 -Transformed EQU 3 +BADLY_POISONED EQU 0 +HAS_LIGHT_SCREEN_UP EQU 1 +HAS_REFLECT_UP EQU 2 +TRANSFORMED EQU 3 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 1e400aa5..e17a651a 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2101,7 +2101,7 @@ HideSubstituteShowMonAnim: .next1 push hl ; if the substitute broke, slide it down, else slide it offscreen horizontally - bit HasSubstituteUp, a + bit HAS_SUBSTITUTE_UP, a jr nz, .substituteStillUp call AnimationSlideMonDown jr .next2 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4e7c8032..a2b18389 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -381,15 +381,15 @@ MainInBattleLoop: xor a ld [wFirstMonsNotOutYet], a ld a, [wPlayerBattleStatus2] - and (1 << NeedsToRecharge) | (1 << UsingRage) ; check if the player is using Rage or needs to recharge + and (1 << NEEDS_TO_RECHARGE) | (1 << USING_RAGE) ; check if the player is using Rage or needs to recharge jr nz, .selectEnemyMove ; the player is not using Rage and doesn't need to recharge ld hl, wEnemyBattleStatus1 - res Flinched, [hl] ; reset flinch bit + res FLINCHED, [hl] ; reset flinch bit ld hl, wPlayerBattleStatus1 - res Flinched, [hl] ; reset flinch bit + res FLINCHED, [hl] ; reset flinch bit ld a, [hl] - and (1 << ThrashingAbout) | (1 << ChargingUp) ; check if the player is thrashing about or charging for an attack + and (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) ; check if the player is thrashing about or charging for an attack jr nz, .selectEnemyMove ; if so, jump ; the player is neither thrashing about nor charging for an attack call DisplayBattleMenu ; show battle menu @@ -401,10 +401,10 @@ MainInBattleLoop: and (1 << FRZ) | SLP ; is mon frozen or asleep? jr nz, .selectEnemyMove ; if so, jump ld a, [wPlayerBattleStatus1] - and (1 << StoringEnergy) | (1 << UsingTrappingMove) ; check player is using Bide or using a multi-turn attack like wrap + and (1 << STORING_ENERGY) | (1 << USING_TRAPPING_MOVE) ; check player is using Bide or using a multi-turn attack like wrap jr nz, .selectEnemyMove ; if so, jump ld a, [wEnemyBattleStatus1] - bit UsingTrappingMove, a ; check if enemy is using a multi-turn attack like wrap + bit USING_TRAPPING_MOVE, a ; check if enemy is using a multi-turn attack like wrap jr z, .selectPlayerMove ; if not, jump ; enemy is using a multi-turn attack like wrap, so player is trapped and cannot execute a move ld a, $ff @@ -442,7 +442,7 @@ MainInBattleLoop: jr c, .noLinkBattle ; the link battle enemy has switched mons ld a, [wPlayerBattleStatus1] - bit UsingTrappingMove, a ; check if using multi-turn move like Wrap + bit USING_TRAPPING_MOVE, a ; check if using multi-turn move like Wrap jr z, .specialMoveNotUsed ld a, [wPlayerMoveListIndex] ld hl, wBattleMonMoves @@ -667,7 +667,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ld hl, wEnemyBattleStatus3 ld de, wEnemyToxicCounter .playersTurn - bit BadlyPoisoned, [hl] + bit BADLY_POISONED, [hl] jr z, .noToxic ld a, [de] ; increment toxic counter inc a @@ -776,14 +776,14 @@ CheckNumAttacksLeft: jr nz, .checkEnemy ; player has 0 attacks left ld hl, wPlayerBattleStatus1 - res UsingTrappingMove, [hl] ; player not using multi-turn attack like wrap any more + res USING_TRAPPING_MOVE, [hl] ; player not using multi-turn attack like wrap any more .checkEnemy ld a, [wEnemyNumAttacksLeft] and a ret nz ; enemy has 0 attacks left ld hl, wEnemyBattleStatus1 - res UsingTrappingMove, [hl] ; enemy not using multi-turn attack like wrap any more + res USING_TRAPPING_MOVE, [hl] ; enemy not using multi-turn attack like wrap any more ret HandleEnemyMonFainted: @@ -833,7 +833,7 @@ FaintEnemyPokemon: ld [hl], a .wild ld hl, wPlayerBattleStatus1 - res AttackingMultipleTimes, [hl] + res ATTACKING_MULTIPLE_TIMES, [hl] ; Bug. This only zeroes the high byte of the player's accumulated damage, ; setting the accumulated damage to itself mod 256 instead of 0 as was probably ; intended. That alone is problematic, but this mistake has another more severe @@ -1842,7 +1842,7 @@ SendOutMon: ld b, SET_PAL_BATTLE call RunPaletteCommand ld hl, wEnemyBattleStatus1 - res UsingTrappingMove, [hl] + res USING_TRAPPING_MOVE, [hl] ld a, $1 ld [H_WHOSETURN], a ld a, POOF_ANIM @@ -2343,13 +2343,13 @@ UseBagItem: jp z, BagWasSelected ; if not, go back to the bag menu ld a, [wPlayerBattleStatus1] - bit UsingTrappingMove, a ; is the player using a multi-turn move like wrap? + bit USING_TRAPPING_MOVE, a ; is the player using a multi-turn move like wrap? jr z, .checkIfMonCaptured ld hl, wPlayerNumAttacksLeft dec [hl] jr nz, .checkIfMonCaptured ld hl, wPlayerBattleStatus1 - res UsingTrappingMove, [hl] ; not using multi-turn move any more + res USING_TRAPPING_MOVE, [hl] ; not using multi-turn move any more .checkIfMonCaptured ld a, [wCapturedMonSpecies] @@ -2456,7 +2456,7 @@ PartyMenuOrRockOrRun: predef StatusScreen2 ; now we need to reload the enemy mon pic ld a, [wEnemyBattleStatus2] - bit HasSubstituteUp, a ; does the enemy mon have a substitute? + bit HAS_SUBSTITUTE_UP, a ; does the enemy mon have a substitute? ld hl, AnimationSubstitute jr nz, .doEnemyMonAnimation ; enemy mon doesn't have substitute @@ -3014,20 +3014,20 @@ SelectEnemyMove: jr .done .noLinkBattle ld a, [wEnemyBattleStatus2] - and (1 << NeedsToRecharge) | (1 << UsingRage) ; need to recharge or using rage + and (1 << NEEDS_TO_RECHARGE) | (1 << USING_RAGE) ; need to recharge or using rage ret nz ld hl, wEnemyBattleStatus1 ld a, [hl] - and (1 << ChargingUp) | (1 << ThrashingAbout) ; using a charging move or thrash/petal dance + and (1 << CHARGING_UP) | (1 << THRASHING_ABOUT) ; using a charging move or thrash/petal dance ret nz ld a, [wEnemyMonStatus] and SLP | 1 << FRZ ; sleeping or frozen ret nz ld a, [wEnemyBattleStatus1] - and (1 << UsingTrappingMove) | (1 << StoringEnergy) ; using a trapping move like wrap or bide + and (1 << USING_TRAPPING_MOVE) | (1 << STORING_ENERGY) ; using a trapping move like wrap or bide ret nz ld a, [wPlayerBattleStatus1] - bit UsingTrappingMove, a ; caught in player's trapping move (e.g. wrap) + bit USING_TRAPPING_MOVE, a ; caught in player's trapping move (e.g. wrap) jr z, .canSelectMove .unableToSelectMove ld a, $ff @@ -3154,7 +3154,7 @@ ExecutePlayerMove: .playerHasNoSpecialCondition call GetCurrentMove ld hl, wPlayerBattleStatus1 - bit ChargingUp, [hl] ; charging up for attack + bit CHARGING_UP, [hl] ; charging up for attack jr nz, PlayerCanExecuteChargingMove call CheckForDisobedience jp z, ExecutePlayerMoveDone @@ -3170,10 +3170,10 @@ CheckIfPlayerNeedsToChargeUp: ; in-battle stuff PlayerCanExecuteChargingMove: ld hl,wPlayerBattleStatus1 - res ChargingUp,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack + res CHARGING_UP,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack ; being fully paralyzed or hurting oneself in confusion removes charging up status ; resulting in the Pokemon being invulnerable for the whole battle - res Invulnerable,[hl] + res INVULNERABLE,[hl] PlayerCanExecuteMove: call PrintMonName1Text ld hl,DecrementPP @@ -3225,7 +3225,7 @@ getPlayerAnimationType: playPlayerMoveAnimation: push af ld a,[wPlayerBattleStatus2] - bit HasSubstituteUp,a + bit HAS_SUBSTITUTE_UP,a ld hl,HideSubstituteShowMonAnim ld b,BANK(HideSubstituteShowMonAnim) call nz,Bankswitch @@ -3236,7 +3236,7 @@ playPlayerMoveAnimation: call HandleExplodingAnimation call DrawPlayerHUDAndHPBar ld a,[wPlayerBattleStatus2] - bit HasSubstituteUp,a + bit HAS_SUBSTITUTE_UP,a ld hl,ReshowSubstituteAnim ld b,BANK(ReshowSubstituteAnim) call nz,Bankswitch @@ -3303,14 +3303,14 @@ MirrorMoveCheck: call HandleBuildingRage ld hl,wPlayerBattleStatus1 - bit AttackingMultipleTimes,[hl] + bit ATTACKING_MULTIPLE_TIMES,[hl] jr z,.executeOtherEffects ld a,[wPlayerNumAttacksLeft] dec a ld [wPlayerNumAttacksLeft],a jp nz,getPlayerAnimationType ; for multi-hit moves, apply attack until PlayerNumAttacksLeft hits 0 or the enemy faints. ; damage calculation and accuracy tests only happen for the first hit - res AttackingMultipleTimes,[hl] ; clear attacking multiple times status when all attacks are over + res ATTACKING_MULTIPLE_TIMES,[hl] ; clear attacking multiple times status when all attacks are over ld hl,MultiHitText call PrintText xor a @@ -3424,7 +3424,7 @@ CheckPlayerStatusConditions: .HeldInPlaceCheck ld a,[wEnemyBattleStatus1] - bit UsingTrappingMove,a ; is enemy using a mult-turn move like wrap? + bit USING_TRAPPING_MOVE,a ; is enemy using a mult-turn move like wrap? jp z,.FlinchedCheck ld hl,CantMoveText call PrintText @@ -3433,9 +3433,9 @@ CheckPlayerStatusConditions: .FlinchedCheck ld hl,wPlayerBattleStatus1 - bit Flinched,[hl] + bit FLINCHED,[hl] jp z,.HyperBeamCheck - res Flinched,[hl] ; reset player's flinch status + res FLINCHED,[hl] ; reset player's flinch status ld hl,FlinchedText call PrintText ld hl,ExecutePlayerMoveDone ; player can't move this turn @@ -3443,9 +3443,9 @@ CheckPlayerStatusConditions: .HyperBeamCheck ld hl,wPlayerBattleStatus2 - bit NeedsToRecharge,[hl] + bit NEEDS_TO_RECHARGE,[hl] jr z,.AnyMoveDisabledCheck - res NeedsToRecharge,[hl] ; reset player's recharge status + res NEEDS_TO_RECHARGE,[hl] ; reset player's recharge status ld hl,MustRechargeText call PrintText ld hl,ExecutePlayerMoveDone ; player can't move this turn @@ -3473,7 +3473,7 @@ CheckPlayerStatusConditions: dec [hl] jr nz,.IsConfused ld hl,wPlayerBattleStatus1 - res Confused,[hl] ; if confused counter hit 0, reset confusion status + res CONFUSED,[hl] ; if confused counter hit 0, reset confusion status ld hl,ConfusedNoMoreText call PrintText jr .TriedToUseDisabledMoveCheck @@ -3489,7 +3489,7 @@ CheckPlayerStatusConditions: jr c,.TriedToUseDisabledMoveCheck ld hl,wPlayerBattleStatus1 ld a,[hl] - and a, 1 << Confused ; if mon hurts itself, clear every other status from wPlayerBattleStatus1 + and a, 1 << CONFUSED ; if mon hurts itself, clear every other status from wPlayerBattleStatus1 ld [hl],a call HandleSelfConfusionDamage jr .MonHurtItselfOrFullyParalysed @@ -3520,7 +3520,7 @@ CheckPlayerStatusConditions: ld hl,wPlayerBattleStatus1 ld a,[hl] ; clear bide, thrashing, charging up, and trapping moves such as warp (already cleared for confusion damage) - and $ff ^ ((1 << StoringEnergy) | (1 << ThrashingAbout) | (1 << ChargingUp) | (1 << UsingTrappingMove)) + and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) ld [hl],a ld a,[wPlayerMoveEffect] cp a,FLY_EFFECT @@ -3540,7 +3540,7 @@ CheckPlayerStatusConditions: .BideCheck ld hl,wPlayerBattleStatus1 - bit StoringEnergy,[hl] ; is mon using bide? + bit STORING_ENERGY,[hl] ; is mon using bide? jr z,.ThrashingAboutCheck xor a ld [wPlayerMoveNum],a @@ -3562,7 +3562,7 @@ CheckPlayerStatusConditions: jp .returnToHL ; unless mon unleashes energy, can't move this turn .UnleashEnergy ld hl,wPlayerBattleStatus1 - res StoringEnergy,[hl] ; not using bide any more + res STORING_ENERGY,[hl] ; not using bide any more ld hl,UnleashedEnergyText call PrintText ld a,1 @@ -3589,7 +3589,7 @@ CheckPlayerStatusConditions: jp .returnToHL .ThrashingAboutCheck - bit ThrashingAbout,[hl] ; is mon using thrash or petal dance? + bit THRASHING_ABOUT,[hl] ; is mon using thrash or petal dance? jr z,.MultiturnMoveCheck ld a,THRASH ld [wPlayerMoveNum],a @@ -3601,8 +3601,8 @@ CheckPlayerStatusConditions: jp nz,.returnToHL push hl ld hl,wPlayerBattleStatus1 - res ThrashingAbout,[hl] ; no longer thrashing about - set Confused,[hl] ; confused + res THRASHING_ABOUT,[hl] ; no longer thrashing about + set CONFUSED,[hl] ; confused call BattleRandom and a,3 inc a @@ -3612,7 +3612,7 @@ CheckPlayerStatusConditions: jp .returnToHL .MultiturnMoveCheck - bit UsingTrappingMove,[hl] ; is mon using multi-turn move? + bit USING_TRAPPING_MOVE,[hl] ; is mon using multi-turn move? jp z,.RageCheck ld hl,AttackContinuesText call PrintText @@ -3626,7 +3626,7 @@ CheckPlayerStatusConditions: .RageCheck ld a, [wPlayerBattleStatus2] - bit UsingRage, a ; is mon using rage? + bit USING_RAGE, a ; is mon using rage? jp z, .checkPlayerStatusConditionsDone ; if we made it this far, mon can move normally this turn ld a, RAGE ld [wd11e], a @@ -3716,7 +3716,7 @@ PrintMoveIsDisabledText: ld de, wEnemyBattleStatus1 .removeChargingUp ld a, [de] - res ChargingUp, a ; end the pokemon's + res CHARGING_UP, a ; end the pokemon's ld [de], a ld a, [hl] ld [wd11e], a @@ -4250,7 +4250,7 @@ GetDamageVarsForPlayerAttack: ld b, a ld c, [hl] ; bc = enemy defense ld a, [wEnemyBattleStatus3] - bit HasReflectUp, a ; check for Reflect + bit HAS_REFLECT_UP, a ; check for Reflect jr z, .physicalAttackCritCheck ; if the enemy has used Reflect, double the enemy's defense sla c @@ -4280,7 +4280,7 @@ GetDamageVarsForPlayerAttack: ld b, a ld c, [hl] ; bc = enemy special ld a, [wEnemyBattleStatus3] - bit HasLightScreenUp, a ; check for Light Screen + bit HAS_LIGHT_SCREEN_UP, a ; check for Light Screen jr z, .specialAttackCritCheck ; if the enemy has used Light Screen, double the enemy's special sla c @@ -4363,7 +4363,7 @@ GetDamageVarsForEnemyAttack: ld b, a ld c, [hl] ; bc = player defense ld a, [wPlayerBattleStatus3] - bit HasReflectUp, a ; check for Reflect + bit HAS_REFLECT_UP, a ; check for Reflect jr z, .physicalAttackCritCheck ; if the player has used Reflect, double the player's defense sla c @@ -4393,7 +4393,7 @@ GetDamageVarsForEnemyAttack: ld b, a ld c, [hl] ld a, [wPlayerBattleStatus3] - bit HasLightScreenUp, a ; check for Light Screen + bit HAS_LIGHT_SCREEN_UP, a ; check for Light Screen jr z, .specialAttackCritCheck ; if the player has used Light Screen, double the player's special sla c @@ -4707,7 +4707,7 @@ CriticalHitTest: dec hl ld c, [hl] ; read move id ld a, [de] - bit GettingPumped, a ; test for focus energy + bit GETTING_PUMPED, a ; test for focus energy jr nz, .focusEnergyUsed ; bug: using focus energy causes a shift to the right instead of left, ; resulting in 1/4 the usual crit chance sla b ; (effective (base speed/2)*2) @@ -4894,7 +4894,7 @@ ApplyDamageToEnemyPokemon: or b jr z,ApplyAttackToEnemyPokemonDone ; we're done if damage is 0 ld a,[wEnemyBattleStatus2] - bit HasSubstituteUp,a ; does the enemy have a substitute? + bit HAS_SUBSTITUTE_UP,a ; does the enemy have a substitute? jp nz,AttackSubstitute ; subtract the damage from the pokemon's current HP ; also, save the current HP at wHPBarOldHP @@ -5013,7 +5013,7 @@ ApplyDamageToPlayerPokemon: or b jr z,ApplyAttackToPlayerPokemonDone ; we're done if damage is 0 ld a,[wPlayerBattleStatus2] - bit HasSubstituteUp,a ; does the player have a substitute? + bit HAS_SUBSTITUTE_UP,a ; does the player have a substitute? jp nz,AttackSubstitute ; subtract the damage from the pokemon's current HP ; also, save the current HP at wHPBarOldHP and the new HP at wHPBarNewHP @@ -5091,7 +5091,7 @@ AttackSubstitute: ; the Substitute had before being attacked. ld h,b ld l,c - res HasSubstituteUp,[hl] ; unset the substitute bit + res HAS_SUBSTITUTE_UP,[hl] ; unset the substitute bit ld hl,SubstituteBrokeText call PrintText ; flip whose turn it is for the next function call @@ -5134,7 +5134,7 @@ HandleBuildingRage: ld de,wPlayerMonStatMods ld bc,wPlayerMoveNum .next - bit UsingRage,[hl] ; is the pokemon being attacked under the effect of Rage? + bit USING_RAGE,[hl] ; is the pokemon being attacked under the effect of Rage? ret z ; return if not ld a,[de] cp a,$0d ; maximum stat modifier value @@ -5468,7 +5468,7 @@ MoveHitTest: cp a,DREAM_EATER_EFFECT jp z,.moveMissed .checkForDigOrFlyStatus - bit Invulnerable,[hl] + bit INVULNERABLE,[hl] jp nz,.moveMissed ld a,[H_WHOSETURN] and a @@ -5493,11 +5493,11 @@ MoveHitTest: ; the moves that are marked with an asterisk are not affected since this ; function is not called when those moves are used ld a,[wEnemyBattleStatus2] - bit ProtectedByMist,a ; is mon protected by mist? + bit PROTECTED_BY_MIST,a ; is mon protected by mist? jp nz,.moveMissed .skipEnemyMistCheck ld a,[wPlayerBattleStatus2] - bit UsingXAccuracy,a ; is the player using X Accuracy? + bit USING_X_ACCURACY,a ; is the player using X Accuracy? ret nz ; if so, always hit regardless of accuracy/evasion jr .calcHitChance .enemyTurn @@ -5514,11 +5514,11 @@ MoveHitTest: .playerMistCheck ; similar to enemy mist check ld a,[wPlayerBattleStatus2] - bit ProtectedByMist,a ; is mon protected by mist? + bit PROTECTED_BY_MIST,a ; is mon protected by mist? jp nz,.moveMissed .skipPlayerMistCheck ld a,[wEnemyBattleStatus2] - bit UsingXAccuracy,a ; is the enemy using X Accuracy? + bit USING_X_ACCURACY,a ; is the enemy using X Accuracy? ret nz ; if so, always hit regardless of accuracy/evasion .calcHitChance call CalcHitChance ; scale the move accuracy according to attacker's accuracy and target's evasion @@ -5548,11 +5548,11 @@ MoveHitTest: jr z,.playerTurn2 .enemyTurn2 ld hl,wEnemyBattleStatus1 - res UsingTrappingMove,[hl] ; end multi-turn attack e.g. wrap + res USING_TRAPPING_MOVE,[hl] ; end multi-turn attack e.g. wrap ret .playerTurn2 ld hl,wPlayerBattleStatus1 - res UsingTrappingMove,[hl] ; end multi-turn attack e.g. wrap + res USING_TRAPPING_MOVE,[hl] ; end multi-turn attack e.g. wrap ret ; values for player turn @@ -5693,7 +5693,7 @@ ExecuteEnemyMove: jp hl .enemyHasNoSpecialConditions ld hl, wEnemyBattleStatus1 - bit ChargingUp, [hl] ; is the enemy charging up for attack? + bit CHARGING_UP, [hl] ; is the enemy charging up for attack? jr nz, EnemyCanExecuteChargingMove ; if so, jump call GetCurrentMove @@ -5706,8 +5706,8 @@ CheckIfEnemyNeedsToChargeUp: jr EnemyCanExecuteMove EnemyCanExecuteChargingMove: ld hl, wEnemyBattleStatus1 - res ChargingUp, [hl] ; no longer charging up for attack - res Invulnerable, [hl] ; no longer invulnerable to typical attacks + res CHARGING_UP, [hl] ; no longer charging up for attack + res INVULNERABLE, [hl] ; no longer invulnerable to typical attacks ld a, [wEnemyMoveNum] ld [wd0b5], a ld a, BANK(MoveNames) @@ -5775,7 +5775,7 @@ handleExplosionMiss: playEnemyMoveAnimation: push af ld a, [wEnemyBattleStatus2] - bit HasSubstituteUp, a ; does mon have a substitute? + bit HAS_SUBSTITUTE_UP, a ; does mon have a substitute? ld hl, HideSubstituteShowMonAnim ld b, BANK(HideSubstituteShowMonAnim) call nz, Bankswitch @@ -5786,7 +5786,7 @@ playEnemyMoveAnimation: call HandleExplodingAnimation call DrawEnemyHUDAndHPBar ld a, [wEnemyBattleStatus2] - bit HasSubstituteUp, a ; does mon have a substitute? + bit HAS_SUBSTITUTE_UP, a ; does mon have a substitute? ld hl, ReshowSubstituteAnim ld b, BANK(ReshowSubstituteAnim) call nz, Bankswitch ; slide the substitute's sprite out @@ -5852,14 +5852,14 @@ EnemyCheckIfMirrorMoveEffect: ret z call HandleBuildingRage ld hl, wEnemyBattleStatus1 - bit AttackingMultipleTimes, [hl] ; is mon hitting multiple times? (example: double kick) + bit ATTACKING_MULTIPLE_TIMES, [hl] ; is mon hitting multiple times? (example: double kick) jr z, .notMultiHitMove push hl ld hl, wEnemyNumAttacksLeft dec [hl] pop hl jp nz, GetEnemyAnimationType - res AttackingMultipleTimes, [hl] ; mon is no longer hitting multiple times + res ATTACKING_MULTIPLE_TIMES, [hl] ; mon is no longer hitting multiple times ld hl, HitXTimesText call PrintText xor a @@ -5919,7 +5919,7 @@ CheckEnemyStatusConditions: jp .enemyReturnToHL .checkIfTrapped ld a, [wPlayerBattleStatus1] - bit UsingTrappingMove, a ; is the player using a multi-turn attack like warp + bit USING_TRAPPING_MOVE, a ; is the player using a multi-turn attack like warp jp z, .checkIfFlinched ld hl, CantMoveText call PrintText @@ -5927,18 +5927,18 @@ CheckEnemyStatusConditions: jp .enemyReturnToHL .checkIfFlinched ld hl, wEnemyBattleStatus1 - bit Flinched, [hl] ; check if enemy mon flinched + bit FLINCHED, [hl] ; check if enemy mon flinched jp z, .checkIfMustRecharge - res Flinched, [hl] + res FLINCHED, [hl] ld hl, FlinchedText call PrintText ld hl, ExecuteEnemyMoveDone ; enemy can't move this turn jp .enemyReturnToHL .checkIfMustRecharge ld hl, wEnemyBattleStatus2 - bit NeedsToRecharge, [hl] ; check if enemy mon has to recharge after using a move + bit NEEDS_TO_RECHARGE, [hl] ; check if enemy mon has to recharge after using a move jr z, .checkIfAnyMoveDisabled - res NeedsToRecharge, [hl] + res NEEDS_TO_RECHARGE, [hl] ld hl, MustRechargeText call PrintText ld hl, ExecuteEnemyMoveDone ; enemy can't move this turn @@ -5964,7 +5964,7 @@ CheckEnemyStatusConditions: dec [hl] jr nz, .isConfused ld hl, wEnemyBattleStatus1 - res Confused, [hl] ; if confused counter hit 0, reset confusion status + res CONFUSED, [hl] ; if confused counter hit 0, reset confusion status ld hl, ConfusedNoMoreText call PrintText jp .checkIfTriedToUseDisabledMove @@ -5980,7 +5980,7 @@ CheckEnemyStatusConditions: jr c, .checkIfTriedToUseDisabledMove ld hl, wEnemyBattleStatus1 ld a, [hl] - and 1 << Confused ; if mon hurts itself, clear every other status from wEnemyBattleStatus1 + and 1 << CONFUSED ; if mon hurts itself, clear every other status from wEnemyBattleStatus1 ld [hl], a ld hl, HurtItselfText call PrintText @@ -6047,7 +6047,7 @@ CheckEnemyStatusConditions: ld hl, wEnemyBattleStatus1 ld a, [hl] ; clear bide, thrashing about, charging up, and multi-turn moves such as warp - and $ff ^ ((1 << StoringEnergy) | (1 << ThrashingAbout) | (1 << ChargingUp) | (1 << UsingTrappingMove)) + and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) ld [hl], a ld a, [wEnemyMoveEffect] cp FLY_EFFECT @@ -6065,7 +6065,7 @@ CheckEnemyStatusConditions: jp .enemyReturnToHL ; if using a two-turn move, enemy needs to recharge the first turn .checkIfUsingBide ld hl, wEnemyBattleStatus1 - bit StoringEnergy, [hl] ; is mon using bide? + bit STORING_ENERGY, [hl] ; is mon using bide? jr z, .checkIfThrashingAbout xor a ld [wEnemyMoveNum], a @@ -6087,7 +6087,7 @@ CheckEnemyStatusConditions: jp .enemyReturnToHL ; unless mon unleashes energy, can't move this turn .unleashEnergy ld hl, wEnemyBattleStatus1 - res StoringEnergy, [hl] ; not using bide any more + res STORING_ENERGY, [hl] ; not using bide any more ld hl, UnleashedEnergyText call PrintText ld a, $1 @@ -6114,7 +6114,7 @@ CheckEnemyStatusConditions: ld hl, handleIfEnemyMoveMissed ; skip damage calculation, DecrementPP and MoveHitTest jp .enemyReturnToHL .checkIfThrashingAbout - bit ThrashingAbout, [hl] ; is mon using thrash or petal dance? + bit THRASHING_ABOUT, [hl] ; is mon using thrash or petal dance? jr z, .checkIfUsingMultiturnMove ld a, THRASH ld [wEnemyMoveNum], a @@ -6126,8 +6126,8 @@ CheckEnemyStatusConditions: jp nz, .enemyReturnToHL push hl ld hl, wEnemyBattleStatus1 - res ThrashingAbout, [hl] ; mon is no longer using thrash or petal dance - set Confused, [hl] ; mon is now confused + res THRASHING_ABOUT, [hl] ; mon is no longer using thrash or petal dance + set CONFUSED, [hl] ; mon is now confused call BattleRandom and $3 inc a @@ -6136,7 +6136,7 @@ CheckEnemyStatusConditions: pop hl ; skip DecrementPP jp .enemyReturnToHL .checkIfUsingMultiturnMove - bit UsingTrappingMove, [hl] ; is mon using multi-turn move? + bit USING_TRAPPING_MOVE, [hl] ; is mon using multi-turn move? jp z, .checkIfUsingRage ld hl, AttackContinuesText call PrintText @@ -6148,7 +6148,7 @@ CheckEnemyStatusConditions: jp .enemyReturnToHL .checkIfUsingRage ld a, [wEnemyBattleStatus2] - bit UsingRage, a ; is mon using rage? + bit USING_RAGE, a ; is mon using rage? jp z, .checkEnemyStatusConditionsDone ; if we made it this far, mon can move normally this turn ld a, RAGE ld [wd11e], a @@ -6206,7 +6206,7 @@ LoadEnemyMonData: ld [wd0b5], a call GetMonHeader ld a, [wEnemyBattleStatus3] - bit Transformed, a ; is enemy mon transformed? + bit TRANSFORMED, a ; is enemy mon transformed? ld hl, wTransformedEnemyMonOriginalDVs ; original DVs before transforming ld a, [hli] ld b, [hl] @@ -6238,7 +6238,7 @@ LoadEnemyMonData: cp $2 ; is it a trainer battle? jr z, .copyHPAndStatusFromPartyData ld a, [wEnemyBattleStatus3] - bit Transformed, a ; is enemy mon transformed? + bit TRANSFORMED, a ; is enemy mon transformed? jr nz, .copyTypes ; if transformed, jump ; if it's a wild mon and not transformed, init the current HP to max HP and the status to 0 ld a, [wEnemyMonMaxHP] @@ -6815,7 +6815,7 @@ HandleExplodingAnimation: ret nz .isExplodingMove ld a, [de] - bit Invulnerable, a ; fly/dig + bit INVULNERABLE, a ; fly/dig ret nz ld a, [hli] cp GHOST @@ -7240,8 +7240,8 @@ SleepEffect: .sleepEffect ld a, [bc] - bit NeedsToRecharge, a ; does the target need to recharge? (hyper beam) - res NeedsToRecharge, a ; target no longer needs to recharge + bit NEEDS_TO_RECHARGE, a ; does the target need to recharge? (hyper beam) + res NEEDS_TO_RECHARGE, a ; target no longer needs to recharge ld [bc], a jr nz, .setSleepCounter ; if the target had to recharge, all hit tests will be skipped ; including the event where the target already has another status @@ -7340,7 +7340,7 @@ PoisonEffect: .ok cp TOXIC jr nz, .normalPoison ; done if move is not Toxic - set BadlyPoisoned, [hl] ; else set Toxic battstatus + set BADLY_POISONED, [hl] ; else set Toxic battstatus xor a ld [de], a ld hl, BadlyPoisonedText @@ -7393,7 +7393,7 @@ ExplodeEffect: inc hl ld [hl], a ; set mon's status to 0 ld a, [de] - res Seeded, a ; clear mon's leech seed status + res SEEDED, a ; clear mon's leech seed status ld [de], a ret @@ -7673,7 +7673,7 @@ UpdateStatDone: jr nz, .asm_3f4f9 ; if a substitute is up, slide off the substitute and show the mon pic before ; playing the minimize animation - bit HasSubstituteUp, [hl] + bit HAS_SUBSTITUTE_UP, [hl] push af push bc ld hl, HideSubstituteShowMonAnim @@ -7776,7 +7776,7 @@ StatModifierDownEffect: and a jp nz, MoveMissed ld a, [bc] - bit Invulnerable, a ; fly/dig + bit INVULNERABLE, a ; fly/dig jp nz, MoveMissed ld a, [de] sub ATTACK_DOWN1_EFFECT @@ -7992,7 +7992,7 @@ BideEffect: ld de, wEnemyBideAccumulatedDamage ld bc, wEnemyNumAttacksLeft .bideEffect - set StoringEnergy, [hl] ; mon is now using bide + set STORING_ENERGY, [hl] ; mon is now using bide xor a ld [de], a inc de @@ -8017,7 +8017,7 @@ ThrashPetalDanceEffect: ld hl, wEnemyBattleStatus1 ld de, wEnemyNumAttacksLeft .thrashPetalDanceEffect - set ThrashingAbout, [hl] ; mon is now using thrash/petal dance + set THRASHING_ABOUT, [hl] ; mon is now using thrash/petal dance call BattleRandom and $1 inc a @@ -8153,9 +8153,9 @@ TwoToFiveAttacksEffect: ld de, wEnemyNumAttacksLeft ld bc, wEnemyNumHits .twoToFiveAttacksEffect - bit AttackingMultipleTimes, [hl] ; is mon attacking multiple times? + bit ATTACKING_MULTIPLE_TIMES, [hl] ; is mon attacking multiple times? ret nz - set AttackingMultipleTimes, [hl] ; mon is now attacking multiple times + set ATTACKING_MULTIPLE_TIMES, [hl] ; mon is now attacking multiple times ld hl, wPlayerMoveEffect ld a, [H_WHOSETURN] and a @@ -8208,7 +8208,7 @@ FlinchSideEffect: call BattleRandom cp b ret nc - set Flinched, [hl] ; set mon's status to flinching + set FLINCHED, [hl] ; set mon's status to flinching call ClearHyperBeam ret @@ -8226,18 +8226,18 @@ ChargeEffect: ld de, wEnemyMoveEffect ld b, ANIM_AF .chargeEffect - set ChargingUp, [hl] + set CHARGING_UP, [hl] ld a, [de] dec de ; de contains enemy or player MOVENUM cp FLY_EFFECT jr nz, .notFly - set Invulnerable, [hl] ; mon is now invulnerable to typical attacks (fly/dig) + set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) ld b, TELEPORT ; load Teleport's animation .notFly ld a, [de] cp DIG jr nz, .notDigOrFly - set Invulnerable, [hl] ; mon is now invulnerable to typical attacks (fly/dig) + set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) ld b, ANIM_C0 .notDigOrFly xor a @@ -8306,11 +8306,11 @@ TrappingEffect: ld hl, wEnemyBattleStatus1 ld de, wEnemyNumAttacksLeft .trappingEffect - bit UsingTrappingMove, [hl] + bit USING_TRAPPING_MOVE, [hl] ret nz call ClearHyperBeam ; since this effect is called before testing whether the move will hit, ; the target won't need to recharge even if the trapping move missed - set UsingTrappingMove, [hl] ; mon is now using a trapping move + set USING_TRAPPING_MOVE, [hl] ; mon is now using a trapping move call BattleRandom ; 3/8 chance for 2 and 3 attacks, and 1/8 chance for 4 and 5 attacks and $3 cp $2 @@ -8356,9 +8356,9 @@ ConfusionSideEffectSuccess: ld bc, wPlayerConfusedCounter ld a, [wEnemyMoveEffect] .confuseTarget - bit Confused, [hl] ; is mon confused? + bit CONFUSED, [hl] ; is mon confused? jr nz, ConfusionEffectFailed - set Confused, [hl] ; mon is now confused + set CONFUSED, [hl] ; mon is now confused push af call BattleRandom and $3 @@ -8395,7 +8395,7 @@ HyperBeamEffect: jr z, .hyperBeamEffect ld hl, wEnemyBattleStatus2 .hyperBeamEffect - set NeedsToRecharge, [hl] ; mon now needs to recharge + set NEEDS_TO_RECHARGE, [hl] ; mon now needs to recharge ret ClearHyperBeam: @@ -8406,7 +8406,7 @@ ClearHyperBeam: jr z, .playerTurn ld hl, wPlayerBattleStatus2 .playerTurn - res NeedsToRecharge, [hl] ; mon no longer needs to recharge + res NEEDS_TO_RECHARGE, [hl] ; mon no longer needs to recharge pop hl ret @@ -8417,7 +8417,7 @@ RageEffect: jr z, .player ld hl, wEnemyBattleStatus2 .player - set UsingRage, [hl] ; mon is now in "rage" mode + set USING_RAGE, [hl] ; mon is now in "rage" mode ret MimicEffect: @@ -8438,7 +8438,7 @@ MimicEffect: ld hl, wEnemyMonMoves ld a, [wEnemyBattleStatus1] .enemyTurn - bit Invulnerable, a + bit INVULNERABLE, a jr nz, .mimicMissed .getRandomMove push hl @@ -8462,7 +8462,7 @@ MimicEffect: jr .playerTurn .letPlayerChooseMove ld a, [wEnemyBattleStatus1] - bit Invulnerable, a + bit INVULNERABLE, a jr nz, .mimicMissed ld a, [wCurrentMenuItem] push af @@ -8661,7 +8661,7 @@ CheckTargetSubstitute: jr z, .next1 ld hl, wPlayerBattleStatus2 .next1 - bit HasSubstituteUp, [hl] + bit HAS_SUBSTITUTE_UP, [hl] pop hl ret diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index e23a85ba..39cd0809 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -7,9 +7,9 @@ DecrementPP: ld hl, wPlayerBattleStatus1 ld a, [hli] ; load the wPlayerBattleStatus1 pokemon status flags and increment hl to load the ; wPlayerBattleStatus2 status flags later - and a, (1 << StoringEnergy) | (1 << ThrashingAbout) | (1 << AttackingMultipleTimes) + and a, (1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << ATTACKING_MULTIPLE_TIMES) ret nz ; if any of these statuses are true, don't decrement PP - bit UsingRage, [hl] + bit USING_RAGE, [hl] ret nz ; don't decrement PP either if Pokemon is using Rage ld hl, wBattleMonPP ; PP of first move (in battle) @@ -18,7 +18,7 @@ DecrementPP: ; decrement PP in the party struct ld a, [wPlayerBattleStatus3] - bit Transformed, a + bit TRANSFORMED, a ret nz ; Return if transformed. Pokemon Red stores the "current pokemon's" PP ; separately from the "Pokemon in your party's" PP. This is ; duplication -- in all cases *other* than Pokemon with Transform. diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index 9c347876..f23c3d70 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -11,7 +11,7 @@ ConversionEffect_: pop de ld a, [wPlayerBattleStatus1] .conversionEffect - bit Invulnerable, a ; is mon immune to typical attacks (dig/fly) + bit INVULNERABLE, a ; is mon immune to typical attacks (dig/fly) jr nz, PrintButItFailedText ; copy target's types to user ld a, [hli] diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index 69301d8e..16dad7bb 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -5,9 +5,9 @@ FocusEnergyEffect_: jr z, .notEnemy ld hl, wEnemyBattleStatus2 .notEnemy - bit GettingPumped, [hl] ; is mon already using focus energy? + bit GETTING_PUMPED, [hl] ; is mon already using focus energy? jr nz, .alreadyUsing - set GettingPumped, [hl] ; mon is now using focus energy + set GETTING_PUMPED, [hl] ; mon is now using focus energy callab PlayCurrentMoveAnimation ld hl, GettingPumpedText jp PrintText diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index 06907bcc..47723ba2 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -47,14 +47,14 @@ HazeEffect_: jp PrintText CureVolatileStatuses: - res Confused, [hl] + res CONFUSED, [hl] inc hl ; BATTSTATUS2 ld a, [hl] - ; clear UsingXAccuracy, ProtectedByMist, GettingPumped, and Seeded statuses - and $ff ^((1 << UsingXAccuracy) | (1 << ProtectedByMist) | (1 << GettingPumped) | (1 << Seeded)) + ; clear USING_X_ACCURACY, PROTECTED_BY_MIST, GETTING_PUMPED, and SEEDED statuses + and $ff ^((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) ld [hli], a ; BATTSTATUS3 ld a, [hl] - and %11110000 | (1 << Transformed) ; clear Bad Poison, Reflect and Light Screen statuses + and %11110000 | (1 << TRANSFORMED) ; clear Bad Poison, Reflect and Light Screen statuses ld [hl], a ret diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm index 0f3a2666..f4d3ee9c 100644 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ b/engine/battle/moveEffects/leech_seed_effect.asm @@ -19,9 +19,9 @@ LeechSeedEffect_: ld a, [de] cp GRASS jr z, .moveMissed - bit Seeded, [hl] + bit SEEDED, [hl] jr nz, .moveMissed - set Seeded, [hl] + set SEEDED, [hl] callab PlayCurrentMoveAnimation ld hl, WasSeededText jp PrintText diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm index b92777de..65070a3e 100644 --- a/engine/battle/moveEffects/mist_effect.asm +++ b/engine/battle/moveEffects/mist_effect.asm @@ -5,9 +5,9 @@ MistEffect_: jr z, .mistEffect ld hl, wEnemyBattleStatus2 .mistEffect - bit ProtectedByMist, [hl] ; is mon protected by mist? + bit PROTECTED_BY_MIST, [hl] ; is mon protected by mist? jr nz, .mistAlreadyInUse - set ProtectedByMist, [hl] ; mon is now protected by mist + set PROTECTED_BY_MIST, [hl] ; mon is now protected by mist callab PlayCurrentMoveAnimation ld hl, ShroudedInMistText jp PrintText diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index b45fbe20..2805a969 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -10,15 +10,15 @@ ReflectLightScreenEffect_: ld a, [de] cp LIGHT_SCREEN_EFFECT jr nz, .reflect - bit HasLightScreenUp, [hl] ; is mon already protected by light screen? + bit HAS_LIGHT_SCREEN_UP, [hl] ; is mon already protected by light screen? jr nz, .moveFailed - set HasLightScreenUp, [hl] ; mon is now protected by light screen + set HAS_LIGHT_SCREEN_UP, [hl] ; mon is now protected by light screen ld hl, LightScreenProtectedText jr .playAnim .reflect - bit HasReflectUp, [hl] ; is mon already protected by reflect? + bit HAS_REFLECT_UP, [hl] ; is mon already protected by reflect? jr nz, .moveFailed - set HasReflectUp, [hl] ; mon is now protected by reflect + set HAS_REFLECT_UP, [hl] ; mon is now protected by reflect ld hl, ReflectGainedArmorText .playAnim push hl diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 6cca3eae..b5d006fc 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -12,7 +12,7 @@ SubstituteEffect_: ld bc, wEnemyBattleStatus2 .notEnemy ld a, [bc] - bit HasSubstituteUp, a ; user already has substitute? + bit HAS_SUBSTITUTE_UP, a ; user already has substitute? jr nz, .alreadyHasSubstitute ; quarter health to remove from user ; assumes max HP is 1023 or lower @@ -43,7 +43,7 @@ SubstituteEffect_: ld [hl], d ld h, b ld l, c - set HasSubstituteUp, [hl] + set HAS_SUBSTITUTE_UP, [hl] ld a, [wOptions] bit 7, a ; battle animation is enabled? ld hl, PlayCurrentMoveAnimation diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index 45f8c910..9a5de9cc 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -12,7 +12,7 @@ TransformEffect_: ld [wPlayerMoveListIndex], a ld a, [wPlayerBattleStatus1] .hitTest - bit Invulnerable, a ; is mon invulnerable to typical attacks? (fly/dig) + bit INVULNERABLE, a ; is mon invulnerable to typical attacks? (fly/dig) jp nz, .failed push hl push de @@ -24,7 +24,7 @@ TransformEffect_: ld hl, wEnemyBattleStatus2 .transformEffect ; animation(s) played are different if target has Substitute up - bit HasSubstituteUp, [hl] + bit HAS_SUBSTITUTE_UP, [hl] push af ld hl, HideSubstituteShowMonAnim ld b, BANK(HideSubstituteShowMonAnim) @@ -44,7 +44,7 @@ TransformEffect_: call nz, Bankswitch pop bc ld a, [bc] - set Transformed, a ; mon is now Transformed + set TRANSFORMED, a ; mon is now transformed ld [bc], a pop de pop hl diff --git a/engine/items/items.asm b/engine/items/items.asm index c4c1634b..81c4c615 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -471,7 +471,7 @@ ItemUseBall: ; This is a bug because a wild Pokémon could have used Transform via ; Mirror Move even though the only wild Pokémon that knows Transform is Ditto. ld hl,wEnemyBattleStatus3 - bit Transformed,[hl] + bit TRANSFORMED,[hl] jr z,.notTransformed ld a,DITTO ld [wEnemyMonSpecies2],a @@ -481,7 +481,7 @@ ItemUseBall: ; If the Pokémon is not transformed, set the transformed bit and copy the ; DVs to wTransformedEnemyMonOriginalDVs so that LoadEnemyMonData won't generate ; new DVs. - set Transformed,[hl] + set TRANSFORMED,[hl] ld hl,wTransformedEnemyMonOriginalDVs ld a,[wEnemyMonDVs] ld [hli],a @@ -901,7 +901,7 @@ ItemUseMedicine: ld [wBattleMonStatus],a ; remove the status ailment in the in-battle pokemon data push hl ld hl,wPlayerBattleStatus3 - res BadlyPoisoned,[hl] ; heal Toxic status + res BADLY_POISONED,[hl] ; heal Toxic status pop hl ld bc,wPartyMon1Stats - wPartyMon1Status add hl,bc ; hl now points to party stats @@ -1546,7 +1546,7 @@ ItemUseXAccuracy: and a jp z,ItemUseNotTime ld hl,wPlayerBattleStatus2 - set UsingXAccuracy,[hl] ; X Accuracy bit + set USING_X_ACCURACY,[hl] ; X Accuracy bit jp PrintItemUseTextAndRemoveItem ; This function is bugged and never works. It always jumps to ItemUseNotTime. @@ -1655,7 +1655,7 @@ ItemUseGuardSpec: and a jp z,ItemUseNotTime ld hl,wPlayerBattleStatus2 - set ProtectedByMist,[hl] ; Mist bit + set PROTECTED_BY_MIST,[hl] ; Mist bit jp PrintItemUseTextAndRemoveItem ItemUseSuperRepel: @@ -1671,7 +1671,7 @@ ItemUseDireHit: and a jp z,ItemUseNotTime ld hl,wPlayerBattleStatus2 - set GettingPumped,[hl] ; Focus Energy bit + set GETTING_PUMPED,[hl] ; Focus Energy bit jp PrintItemUseTextAndRemoveItem ItemUseXStat: diff --git a/engine/palettes.asm b/engine/palettes.asm index 6a798860..1ac5e56a 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -269,7 +269,7 @@ BadgeBlkDataLengths: db 6 ; Earth Badge DeterminePaletteID: - bit Transformed, a ; a is battle status 3 + 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] -- cgit v1.2.3 From 237aeb8fbdb204948d611830565d4a00c6b0ab70 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Sat, 30 Dec 2017 01:54:27 +0100 Subject: Add space between arguments in assembly instructions and remove redundant a in instructions like add a, x --- engine/HoF_room_pc.asm | 52 +- engine/battle/animations.asm | 1000 +++++++------- engine/battle/core.asm | 1698 +++++++++++------------ engine/battle/decrement_pp.asm | 4 +- engine/battle/display_effectiveness.asm | 4 +- engine/battle/read_trainer_party.asm | 148 +- engine/battle/save_trainer_name.asm | 26 +- engine/battle/trainer_ai.asm | 326 ++--- engine/display_text_id_init.asm | 80 +- engine/hall_of_fame.asm | 2 +- engine/in_game_trades.asm | 164 +-- engine/items/inventory.asm | 136 +- engine/items/items.asm | 2272 +++++++++++++++--------------- engine/load_pokedex_tiles.asm | 8 +- engine/menu/draw_start_menu.asm | 72 +- engine/menu/main_menu.asm | 406 +++--- engine/menu/party_menu.asm | 204 +-- engine/menu/pc.asm | 16 +- engine/menu/pokedex.asm | 518 +++---- engine/menu/prize_menu.asm | 208 +-- engine/menu/start_menu.asm | 88 +- engine/menu/start_sub_menus.asm | 568 ++++---- engine/menu/swap_items.asm | 180 +-- engine/menu/text_box.asm | 96 +- engine/oak_speech.asm | 142 +- engine/overworld/map_sprites.asm | 416 +++--- engine/overworld/pokemart.asm | 228 +-- engine/overworld/wild_mons.asm | 40 +- engine/palettes.asm | 48 +- engine/pokedex_rating.asm | 2 +- engine/predefs.asm | 52 +- engine/save.asm | 66 +- engine/special_warps.asm | 30 +- engine/subtract_paid_money.asm | 16 +- engine/titlescreen.asm | 6 +- engine/trade2.asm | 28 +- home.asm | 1928 +++++++++++++------------- home/copy2.asm | 56 +- home/overworld.asm | 2298 +++++++++++++++---------------- home/text.asm | 336 ++--- home/vcopy.asm | 204 +-- scripts/celadongamecorner.asm | 4 +- scripts/ceruleancity.asm | 6 +- scripts/fightingdojo.asm | 2 +- scripts/fuchsiahouse2.asm | 2 +- scripts/oakslab.asm | 2 +- scripts/pallettown.asm | 160 +-- scripts/redshouse1f.asm | 8 +- scripts/redshouse2f.asm | 14 +- scripts/safarizoneentrance.asm | 90 +- 50 files changed, 7230 insertions(+), 7230 deletions(-) diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 82aa6d52..fb196486 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -47,61 +47,61 @@ FadeInCreditsText: DisplayCreditsMon: xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a call SaveScreenTilesToBuffer1 call FillMiddleOfScreenWithWhite ; display the next monster from CreditsMons - ld hl,wNumCreditsMonsDisplayed - ld c,[hl] ; how many monsters have we displayed so far? + ld hl, wNumCreditsMonsDisplayed + ld c, [hl] ; how many monsters have we displayed so far? inc [hl] - ld b,0 - ld hl,CreditsMons - add hl,bc ; go that far in the list of monsters and get the next one - ld a,[hl] - ld [wcf91],a - ld [wd0b5],a + ld b, 0 + ld hl, CreditsMons + add hl, bc ; go that far in the list of monsters and get the next one + ld a, [hl] + ld [wcf91], a + ld [wd0b5], a coord hl, 8, 6 call GetMonHeader call LoadFrontSpriteByMonIndex - ld hl,vBGMap0 + $c + ld hl, vBGMap0 + $c call CreditsCopyTileMapToVRAM xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a call LoadScreenTilesFromBuffer1 - ld hl,vBGMap0 + ld hl, vBGMap0 call CreditsCopyTileMapToVRAM - ld a,$A7 - ld [rWX],a - ld hl,vBGMap1 + ld a, $A7 + ld [rWX], a + ld hl, vBGMap1 call CreditsCopyTileMapToVRAM call FillMiddleOfScreenWithWhite - ld a,%11111100 ; make the mon a black silhouette - ld [rBGP],a + ld a, %11111100 ; make the mon a black silhouette + ld [rBGP], a ; scroll the mon left by one tile 7 times - ld bc,7 + ld bc, 7 .scrollLoop1 call ScrollCreditsMonLeft dec c - jr nz,.scrollLoop1 + jr nz, .scrollLoop1 ; scroll the mon left by one tile 20 times ; This time, we have to move the window left too in order to hide the text that ; is wrapping around to the right side of the screen. - ld c,20 + ld c, 20 .scrollLoop2 call ScrollCreditsMonLeft - ld a,[rWX] + ld a, [rWX] sub 8 - ld [rWX],a + ld [rWX], a dec c - jr nz,.scrollLoop2 + jr nz, .scrollLoop2 xor a - ld [hWY],a - ld a,%11000000 - ld [rBGP],a + ld [hWY], a + ld a, %11000000 + ld [rBGP], a ret INCLUDE "data/credit_mons.asm" diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index e17a651a..76d4f464 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1,202 +1,202 @@ ; Draws a "frame block". Frame blocks are blocks of tiles that are put ; together to form frames in battle animations. DrawFrameBlock: - ld l,c - ld h,b - ld a,[hli] - ld [wNumFBTiles],a - ld a,[wFBDestAddr + 1] - ld e,a - ld a,[wFBDestAddr] - ld d,a + ld l, c + ld h, b + ld a, [hli] + ld [wNumFBTiles], a + ld a, [wFBDestAddr + 1] + ld e, a + ld a, [wFBDestAddr] + ld d, a xor a - ld [wFBTileCounter],a ; loop counter + ld [wFBTileCounter], a ; loop counter .loop - ld a,[wFBTileCounter] + ld a, [wFBTileCounter] inc a - ld [wFBTileCounter],a - ld a,[wSubAnimTransform] + ld [wFBTileCounter], a + ld a, [wSubAnimTransform] dec a - jr z,.flipHorizontalAndVertical ; 1 + jr z, .flipHorizontalAndVertical ; 1 dec a - jp z,.flipHorizontalTranslateDown ; 2 + jp z, .flipHorizontalTranslateDown ; 2 dec a - jr z,.flipBaseCoords ; 3 + jr z, .flipBaseCoords ; 3 .noTransformation - ld a,[wBaseCoordY] + ld a, [wBaseCoordY] add [hl] - ld [de],a ; store Y + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] + ld a, [wBaseCoordX] jr .finishCopying .flipBaseCoords - ld a,[wBaseCoordY] - ld b,a - ld a,136 + ld a, [wBaseCoordY] + ld b, a + ld a, 136 sub b ; flip Y base coordinate add [hl] ; Y offset - ld [de],a ; store Y + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] - ld b,a - ld a,168 + ld a, [wBaseCoordX] + ld b, a + ld a, 168 sub b ; flip X base coordinate .finishCopying ; finish copying values to OAM (when [wSubAnimTransform] not 1 or 2) add [hl] ; X offset - ld [de],a ; store X + ld [de], a ; store X inc hl inc de - ld a,[hli] - add a,$31 ; base tile ID for battle animations - ld [de],a ; store tile ID + ld a, [hli] + add $31 ; base tile ID for battle animations + ld [de], a ; store tile ID inc de - ld a,[hli] - ld [de],a ; store flags + ld a, [hli] + ld [de], a ; store flags inc de jp .nextTile .flipHorizontalAndVertical - ld a,[wBaseCoordY] + ld a, [wBaseCoordY] add [hl] ; Y offset - ld b,a - ld a,136 + ld b, a + ld a, 136 sub b ; flip Y coordinate - ld [de],a ; store Y + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] + ld a, [wBaseCoordX] add [hl] ; X offset - ld b,a - ld a,168 + ld b, a + ld a, 168 sub b ; flip X coordinate - ld [de],a ; store X + ld [de], a ; store X inc hl inc de - ld a,[hli] - add a,$31 ; base tile ID for battle animations - ld [de],a ; store tile ID + ld a, [hli] + add $31 ; base tile ID for battle animations + ld [de], a ; store tile ID inc de ; toggle horizontal and vertical flip - ld a,[hli] ; flags + ld a, [hli] ; flags and a - ld b,OAM_VFLIP | OAM_HFLIP - jr z,.storeFlags1 - cp a,OAM_HFLIP - ld b,OAM_VFLIP - jr z,.storeFlags1 - cp a,OAM_VFLIP - ld b,OAM_HFLIP - jr z,.storeFlags1 - ld b,0 + ld b, OAM_VFLIP | OAM_HFLIP + jr z, .storeFlags1 + cp OAM_HFLIP + ld b, OAM_VFLIP + jr z, .storeFlags1 + cp OAM_VFLIP + ld b, OAM_HFLIP + jr z, .storeFlags1 + ld b, 0 .storeFlags1 - ld a,b - ld [de],a + ld a, b + ld [de], a inc de jp .nextTile .flipHorizontalTranslateDown - ld a,[wBaseCoordY] + ld a, [wBaseCoordY] add [hl] - add a,40 ; translate Y coordinate downwards - ld [de],a ; store Y + add 40 ; translate Y coordinate downwards + ld [de], a ; store Y inc hl inc de - ld a,[wBaseCoordX] + ld a, [wBaseCoordX] add [hl] - ld b,a - ld a,168 + ld b, a + ld a, 168 sub b ; flip X coordinate - ld [de],a ; store X + ld [de], a ; store X inc hl inc de - ld a,[hli] - add a,$31 ; base tile ID for battle animations - ld [de],a ; store tile ID + ld a, [hli] + add $31 ; base tile ID for battle animations + ld [de], a ; store tile ID inc de - ld a,[hli] - bit 5,a ; is horizontal flip enabled? - jr nz,.disableHorizontalFlip + ld a, [hli] + bit 5, a ; is horizontal flip enabled? + jr nz, .disableHorizontalFlip .enableHorizontalFlip - set 5,a + set 5, a jr .storeFlags2 .disableHorizontalFlip - res 5,a + res 5, a .storeFlags2 - ld [de],a + ld [de], a inc de .nextTile - ld a,[wFBTileCounter] - ld c,a - ld a,[wNumFBTiles] + ld a, [wFBTileCounter] + ld c, a + ld a, [wNumFBTiles] cp c - jp nz,.loop ; go back up if there are more tiles to draw + jp nz, .loop ; go back up if there are more tiles to draw .afterDrawingTiles - ld a,[wFBMode] - cp a,2 - jr z,.advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer - ld a,[wSubAnimFrameDelay] - ld c,a + ld a, [wFBMode] + cp 2 + jr z, .advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer + ld a, [wSubAnimFrameDelay] + ld c, a call DelayFrames - ld a,[wFBMode] - cp a,3 - jr z,.advanceFrameBlockDestAddr ; skip cleaning OAM buffer - cp a,4 - jr z,.done ; skip cleaning OAM buffer and don't advance the frame block destination address - ld a,[wAnimationID] - cp a,GROWL - jr z,.resetFrameBlockDestAddr + ld a, [wFBMode] + cp 3 + jr z, .advanceFrameBlockDestAddr ; skip cleaning OAM buffer + cp 4 + jr z, .done ; skip cleaning OAM buffer and don't advance the frame block destination address + ld a, [wAnimationID] + cp GROWL + jr z, .resetFrameBlockDestAddr call AnimationCleanOAM .resetFrameBlockDestAddr - ld hl,wOAMBuffer ; OAM buffer - ld a,l - ld [wFBDestAddr + 1],a - ld a,h - ld [wFBDestAddr],a ; set destination address to beginning of OAM buffer + ld hl, wOAMBuffer ; OAM buffer + ld a, l + ld [wFBDestAddr + 1], a + ld a, h + ld [wFBDestAddr], a ; set destination address to beginning of OAM buffer ret .advanceFrameBlockDestAddr - ld a,e - ld [wFBDestAddr + 1],a - ld a,d - ld [wFBDestAddr],a + ld a, e + ld [wFBDestAddr + 1], a + ld a, d + ld [wFBDestAddr], a .done ret PlayAnimation: xor a - ld [$FF8B],a ; it looks like nothing reads this - ld [wSubAnimTransform],a - ld a,[wAnimationID] ; get animation number + ld [$FF8B], a ; it looks like nothing reads this + ld [wSubAnimTransform], a + ld a, [wAnimationID] ; get animation number dec a - ld l,a - ld h,0 - add hl,hl - ld de,AttackAnimationPointers ; animation command stream pointers - add hl,de - ld a,[hli] - ld h,[hl] - ld l,a + ld l, a + ld h, 0 + add hl, hl + ld de, AttackAnimationPointers ; animation command stream pointers + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a .animationLoop - ld a,[hli] - cp a,$FF - jr z,.AnimationOver - cp a,$C0 ; is this subanimation or a special effect? - jr c,.playSubanimation + ld a, [hli] + cp $FF + jr z, .AnimationOver + cp $C0 ; is this subanimation or a special effect? + jr c, .playSubanimation .doSpecialEffect - ld c,a - ld de,SpecialEffectPointers + ld c, a + ld de, SpecialEffectPointers .searchSpecialEffectTableLoop - ld a,[de] + ld a, [de] cp c - jr z,.foundMatch + jr z, .foundMatch inc de inc de inc de jr .searchSpecialEffectTableLoop .foundMatch - ld a,[hli] - cp a,$FF ; is there a sound to play? - jr z,.skipPlayingSound - ld [wAnimSoundID],a ; store sound + ld a, [hli] + cp $FF ; is there a sound to play? + jr z, .skipPlayingSound + ld [wAnimSoundID], a ; store sound push hl push de call GetMoveSound @@ -206,50 +206,50 @@ PlayAnimation: .skipPlayingSound push hl inc de - ld a,[de] - ld l,a + ld a, [de] + ld l, a inc de - ld a,[de] - ld h,a - ld de,.nextAnimationCommand + ld a, [de] + ld h, a + ld de, .nextAnimationCommand push de jp hl ; jump to special effect function .playSubanimation - ld c,a - and a,%00111111 - ld [wSubAnimFrameDelay],a + ld c, a + and %00111111 + ld [wSubAnimFrameDelay], a xor a sla c rla sla c rla - ld [wWhichBattleAnimTileset],a - ld a,[hli] ; sound - ld [wAnimSoundID],a ; store sound - ld a,[hli] ; subanimation ID - ld c,l - ld b,h - ld l,a - ld h,0 - add hl,hl - ld de,SubanimationPointers - add hl,de - ld a,l - ld [wSubAnimAddrPtr],a - ld a,h - ld [wSubAnimAddrPtr + 1],a - ld l,c - ld h,b + ld [wWhichBattleAnimTileset], a + ld a, [hli] ; sound + ld [wAnimSoundID], a ; store sound + ld a, [hli] ; subanimation ID + ld c, l + ld b, h + ld l, a + ld h, 0 + add hl, hl + ld de, SubanimationPointers + add hl, de + ld a, l + ld [wSubAnimAddrPtr], a + ld a, h + ld [wSubAnimAddrPtr + 1], a + ld l, c + ld h, b push hl - ld a,[rOBP0] + ld a, [rOBP0] push af - ld a,[wAnimPalette] - ld [rOBP0],a + ld a, [wAnimPalette] + ld [rOBP0], a call LoadAnimationTileset call LoadSubanimation call PlaySubanimation pop af - ld [rOBP0],a + ld [rOBP0], a .nextAnimationCommand pop hl jr .animationLoop @@ -257,22 +257,22 @@ PlayAnimation: ret LoadSubanimation: - ld a,[wSubAnimAddrPtr + 1] - ld h,a - ld a,[wSubAnimAddrPtr] - ld l,a - ld a,[hli] - ld e,a - ld a,[hl] - ld d,a ; de = address of subanimation - ld a,[de] - ld b,a - and a,31 - ld [wSubAnimCounter],a ; number of frame blocks - ld a,b - and a,%11100000 - cp a,5 << 5 ; is subanimation type 5? - jr nz,.isNotType5 + ld a, [wSubAnimAddrPtr + 1] + ld h, a + ld a, [wSubAnimAddrPtr] + ld l, a + ld a, [hli] + ld e, a + ld a, [hl] + ld d, a ; de = address of subanimation + ld a, [de] + ld b, a + and 31 + ld [wSubAnimCounter], a ; number of frame blocks + ld a, b + and %11100000 + cp 5 << 5 ; is subanimation type 5? + jr nz, .isNotType5 .isType5 call GetSubanimationTransform2 jr .saveTransformation @@ -282,35 +282,35 @@ LoadSubanimation: ; place the upper 3 bits of a into bits 0-2 of a before storing srl a swap a - ld [wSubAnimTransform],a - cp a,4 ; is the animation reversed? - ld hl,0 - jr nz,.storeSubentryAddr + ld [wSubAnimTransform], a + cp 4 ; is the animation reversed? + ld hl, 0 + jr nz, .storeSubentryAddr ; if the animation is reversed, then place the initial subentry address at the end of the list of subentries - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a - ld bc,3 + ld bc, 3 .loop - add hl,bc + add hl, bc dec a - jr nz,.loop + jr nz, .loop .storeSubentryAddr inc de - add hl,de - ld a,l - ld [wSubAnimSubEntryAddr],a - ld a,h - ld [wSubAnimSubEntryAddr + 1],a + add hl, de + ld a, l + ld [wSubAnimSubEntryAddr], a + ld a, h + ld [wSubAnimSubEntryAddr + 1], a ret ; called if the subanimation type is not 5 ; sets the transform to 0 (i.e. no transform) if it's the player's turn ; sets the transform to the subanimation type if it's the enemy's turn GetSubanimationTransform1: - ld b,a - ld a,[H_WHOSETURN] + ld b, a + ld a, [H_WHOSETURN] and a - ld a,b + ld a, b ret nz xor a ret @@ -319,32 +319,32 @@ GetSubanimationTransform1: ; sets the transform to 2 (i.e. horizontal and vertical flip) if it's the player's turn ; sets the transform to 0 (i.e. no transform) if it's the enemy's turn GetSubanimationTransform2: - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] and a - ld a,2 << 5 + ld a, 2 << 5 ret z xor a ret ; loads tile patterns for battle animations LoadAnimationTileset: - ld a,[wWhichBattleAnimTileset] + ld a, [wWhichBattleAnimTileset] add a add a - ld hl,AnimationTilesetPointers - ld e,a - ld d,0 - add hl,de - ld a,[hli] - ld [wTempTilesetNumTiles],a ; number of tiles - ld a,[hli] - ld e,a - ld a,[hl] - ld d,a ; de = address of tileset - ld hl,vSprites + $310 + ld hl, AnimationTilesetPointers + ld e, a + ld d, 0 + add hl, de + ld a, [hli] + ld [wTempTilesetNumTiles], a ; number of tiles + ld a, [hli] + ld e, a + ld a, [hl] + ld d, a ; de = address of tileset + ld hl, vSprites + $310 ld b, BANK(AnimationTileset1) ; ROM bank - ld a,[wTempTilesetNumTiles] - ld c,a ; number of tiles + ld a, [wTempTilesetNumTiles] + ld c, a ; number of tiles jp CopyVideoData ; load tileset AnimationTilesetPointers: @@ -381,12 +381,12 @@ MoveAnimation: push af call WaitForSoundToFinish call SetAnimationPalette - ld a,[wAnimationID] + ld a, [wAnimationID] and a jr z, .animationFinished ; if throwing a Poké Ball, skip the regular animation code - cp a,TOSS_ANIM + cp TOSS_ANIM jr nz, .moveAnimation ld de, .animationFinished push de @@ -394,25 +394,25 @@ MoveAnimation: .moveAnimation ; check if battle animations are disabled in the options - ld a,[wOptions] - bit 7,a + ld a, [wOptions] + bit 7, a jr nz, .animationsDisabled call ShareMoveAnimations call PlayAnimation jr .next4 .animationsDisabled - ld c,30 + ld c, 30 call DelayFrames .next4 call PlayApplyingAttackAnimation ; shake the screen or flash the pic in and out (to show damage) .animationFinished call WaitForSoundToFinish xor a - ld [wSubAnimSubEntryAddr],a - ld [wUnusedD09B],a - ld [wSubAnimTransform],a + ld [wSubAnimSubEntryAddr], a + ld [wUnusedD09B], a + ld [wSubAnimTransform], a dec a - ld [wAnimSoundID],a + ld [wAnimSoundID], a pop af pop bc pop de @@ -421,42 +421,42 @@ MoveAnimation: ShareMoveAnimations: ; some moves just reuse animations from status conditions - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] and a ret z ; opponent’s turn - ld a,[wAnimationID] + ld a, [wAnimationID] - cp a,AMNESIA - ld b,CONF_ANIM + cp AMNESIA + ld b, CONF_ANIM jr z, .replaceAnim - cp a,REST - ld b,SLP_ANIM + cp REST + ld b, SLP_ANIM ret nz .replaceAnim - ld a,b - ld [wAnimationID],a + ld a, b + ld [wAnimationID], a ret PlayApplyingAttackAnimation: ; Generic animation that shows after the move's individual animation ; Different animation depending on whether the move has an additional effect and on whose turn it is - ld a,[wAnimationType] + ld a, [wAnimationType] and a ret z dec a add a - ld c,a - ld b,0 - ld hl,AnimationTypePointerTable - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a + ld c, a + ld b, 0 + ld hl, AnimationTypePointerTable + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a jp hl AnimationTypePointerTable: @@ -547,69 +547,69 @@ SetAnimationPalette: ret PlaySubanimation: - ld a,[wAnimSoundID] - cp a,$FF - jr z,.skipPlayingSound + ld a, [wAnimSoundID] + cp $FF + jr z, .skipPlayingSound call GetMoveSound call PlaySound .skipPlayingSound - ld hl,wOAMBuffer ; base address of OAM buffer - ld a,l - ld [wFBDestAddr + 1],a - ld a,h - ld [wFBDestAddr],a - ld a,[wSubAnimSubEntryAddr + 1] - ld h,a - ld a,[wSubAnimSubEntryAddr] - ld l,a + ld hl, wOAMBuffer ; base address of OAM buffer + ld a, l + ld [wFBDestAddr + 1], a + ld a, h + ld [wFBDestAddr], a + ld a, [wSubAnimSubEntryAddr + 1] + ld h, a + ld a, [wSubAnimSubEntryAddr] + ld l, a .loop push hl - ld c,[hl] ; frame block ID - ld b,0 - ld hl,FrameBlockPointers - add hl,bc - add hl,bc - ld a,[hli] - ld c,a - ld a,[hli] - ld b,a + ld c, [hl] ; frame block ID + ld b, 0 + ld hl, FrameBlockPointers + add hl, bc + add hl, bc + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a pop hl inc hl push hl - ld e,[hl] ; base coordinate ID - ld d,0 - ld hl,FrameBlockBaseCoords ; base coordinate table - add hl,de - add hl,de - ld a,[hli] - ld [wBaseCoordY],a - ld a,[hl] - ld [wBaseCoordX],a + ld e, [hl] ; base coordinate ID + ld d, 0 + ld hl, FrameBlockBaseCoords ; base coordinate table + add hl, de + add hl, de + ld a, [hli] + ld [wBaseCoordY], a + ld a, [hl] + ld [wBaseCoordX], a pop hl inc hl - ld a,[hl] ; frame block mode - ld [wFBMode],a + ld a, [hl] ; frame block mode + ld [wFBMode], a call DrawFrameBlock call DoSpecialEffectByAnimationId ; run animation-specific function (if there is one) - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a - ld [wSubAnimCounter],a + ld [wSubAnimCounter], a ret z - ld a,[wSubAnimSubEntryAddr + 1] - ld h,a - ld a,[wSubAnimSubEntryAddr] - ld l,a - ld a,[wSubAnimTransform] - cp a,4 ; is the animation reversed? - ld bc,3 - jr nz,.nextSubanimationSubentry - ld bc,-3 + ld a, [wSubAnimSubEntryAddr + 1] + ld h, a + ld a, [wSubAnimSubEntryAddr] + ld l, a + ld a, [wSubAnimTransform] + cp 4 ; is the animation reversed? + ld bc, 3 + jr nz, .nextSubanimationSubentry + ld bc, -3 .nextSubanimationSubentry - add hl,bc - ld a,h - ld [wSubAnimSubEntryAddr + 1],a - ld a,l - ld [wSubAnimSubEntryAddr],a + add hl, bc + ld a, h + ld [wSubAnimSubEntryAddr + 1], a + ld a, l + ld [wSubAnimSubEntryAddr], a jp .loop AnimationCleanOAM: @@ -631,16 +631,16 @@ DoSpecialEffectByAnimationId: push hl push de push bc - ld a,[wAnimationID] - ld hl,AnimationIdSpecialEffects - ld de,3 + ld a, [wAnimationID] + ld hl, AnimationIdSpecialEffects + ld de, 3 call IsInArray - jr nc,.done + jr nc, .done inc hl - ld a,[hli] - ld h,[hl] - ld l,a - ld de,.done + ld a, [hli] + ld h, [hl] + ld l, a + ld de, .done push de jp hl .done @@ -726,38 +726,38 @@ AnimationIdSpecialEffects: db $FF ; terminator DoBallTossSpecialEffects: - ld a,[wcf91] - cp a,3 ; is it a Master Ball or Ultra Ball? - jr nc,.skipFlashingEffect + ld a, [wcf91] + cp 3 ; is it a Master Ball or Ultra Ball? + jr nc, .skipFlashingEffect .flashingEffect ; do a flashing effect if it's Master Ball or Ultra Ball - ld a,[rOBP0] - xor a,%00111100 ; complement colors 1 and 2 - ld [rOBP0],a + ld a, [rOBP0] + xor %00111100 ; complement colors 1 and 2 + ld [rOBP0], a .skipFlashingEffect - ld a,[wSubAnimCounter] - cp a,11 ; is it the beginning of the subanimation? - jr nz,.skipPlayingSound + ld a, [wSubAnimCounter] + cp 11 ; is it the beginning of the subanimation? + jr nz, .skipPlayingSound ; if it is the beginning of the subanimation, play a sound - ld a,SFX_BALL_TOSS + ld a, SFX_BALL_TOSS call PlaySound .skipPlayingSound - ld a,[wIsInBattle] - cp a,02 ; is it a trainer battle? - jr z,.isTrainerBattle - ld a,[wd11e] - cp a,$10 ; is the enemy pokemon the Ghost Marowak? + ld a, [wIsInBattle] + cp 02 ; is it a trainer battle? + jr z, .isTrainerBattle + ld a, [wd11e] + cp $10 ; is the enemy pokemon the Ghost Marowak? ret nz ; if the enemy pokemon is the Ghost Marowak, make it dodge during the last 3 frames - ld a,[wSubAnimCounter] - cp a,3 - jr z,.moveGhostMarowakLeft - cp a,2 - jr z,.moveGhostMarowakLeft - cp a,1 + ld a, [wSubAnimCounter] + cp 3 + jr z, .moveGhostMarowakLeft + cp 2 + jr z, .moveGhostMarowakLeft + cp 1 ret nz .moveGhostMarowakLeft coord hl, 17, 0 - ld de,20 + ld de, 20 lb bc, 7, 7 .loop push hl @@ -765,152 +765,152 @@ DoBallTossSpecialEffects: call AnimCopyRowRight ; move row of tiles left pop bc pop hl - add hl,de + add hl, de dec b - jr nz,.loop - ld a,%00001000 - ld [rNR10],a ; Channel 1 sweep register + jr nz, .loop + ld a, %00001000 + ld [rNR10], a ; Channel 1 sweep register ret .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame - ld a,[wSubAnimCounter] - cp a,3 + ld a, [wSubAnimCounter] + cp 3 ret nz dec a - ld [wSubAnimCounter],a + ld [wSubAnimCounter], a ret DoBallShakeSpecialEffects: - ld a,[wSubAnimCounter] - cp a,4 ; is it the beginning of a shake? - jr nz,.skipPlayingSound + ld a, [wSubAnimCounter] + cp 4 ; is it the beginning of a shake? + jr nz, .skipPlayingSound ; if it is the beginning of a shake, play a sound and wait 2/3 of a second - ld a,SFX_TINK + ld a, SFX_TINK call PlaySound - ld c,40 + ld c, 40 call DelayFrames .skipPlayingSound - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] 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,[wNumShakes] ; number of shakes + ld a, [wNumShakes] ; number of shakes dec a ; decrement number of shakes - ld [wNumShakes],a + ld [wNumShakes], a ret z ; if there are shakes left, restart the subanimation - ld a,[wSubAnimSubEntryAddr] - ld l,a - ld a,[wSubAnimSubEntryAddr + 1] - ld h,a - ld de,-(4 * 3) ; 4 subentries and 3 bytes per subentry - add hl,de - ld a,l - ld [wSubAnimSubEntryAddr],a - ld a,h - ld [wSubAnimSubEntryAddr + 1],a - ld a,5 ; number of subentries in the ball shaking subanimation plus one - ld [wSubAnimCounter],a + ld a, [wSubAnimSubEntryAddr] + ld l, a + ld a, [wSubAnimSubEntryAddr + 1] + ld h, a + ld de, -(4 * 3) ; 4 subentries and 3 bytes per subentry + add hl, de + ld a, l + ld [wSubAnimSubEntryAddr], a + ld a, h + ld [wSubAnimSubEntryAddr + 1], a + ld a, 5 ; number of subentries in the ball shaking subanimation plus one + ld [wSubAnimCounter], a ret ; plays a sound after the second frame of the poof animation DoPoofSpecialEffects: - ld a,[wSubAnimCounter] - cp a,5 + ld a, [wSubAnimCounter] + cp 5 ret nz - ld a,SFX_BALL_POOF + ld a, SFX_BALL_POOF jp PlaySound DoRockSlideSpecialEffects: - ld a,[wSubAnimCounter] - cp a,12 + ld a, [wSubAnimCounter] + cp 12 ret nc - cp a,8 - jr nc,.shakeScreen - cp a,1 - jp z,AnimationFlashScreen ; if it's the end of the subanimation, flash the screen + cp 8 + jr nc, .shakeScreen + cp 1 + jp z, AnimationFlashScreen ; if it's the end of the subanimation, flash the screen ret ; if the subanimation counter is between 8 and 11, shake the screen horizontally and vertically .shakeScreen - ld b,1 + ld b, 1 predef PredefShakeScreenHorizontally ; shake horizontally - ld b,1 + ld b, 1 predef_jump PredefShakeScreenVertically ; shake vertically FlashScreenEveryEightFrameBlocks: - ld a,[wSubAnimCounter] - and a,7 ; is the subanimation counter exactly 8? - call z,AnimationFlashScreen ; if so, flash the screen + ld a, [wSubAnimCounter] + and 7 ; is the subanimation counter exactly 8? + call z, AnimationFlashScreen ; if so, flash the screen ret ; flashes the screen if the subanimation counter is divisible by 4 FlashScreenEveryFourFrameBlocks: - ld a,[wSubAnimCounter] - and a,3 - call z,AnimationFlashScreen + ld a, [wSubAnimCounter] + and 3 + call z, AnimationFlashScreen ret ; used for Explosion and Selfdestruct DoExplodeSpecialEffects: - ld a,[wSubAnimCounter] - cp a,1 ; is it the end of the subanimation? - jr nz,FlashScreenEveryFourFrameBlocks + ld a, [wSubAnimCounter] + cp 1 ; is it the end of the subanimation? + jr nz, FlashScreenEveryFourFrameBlocks ; if it's the end of the subanimation, make the attacking pokemon disappear coord hl, 1, 5 jp AnimationHideMonPic ; make pokemon disappear ; flashes the screen when subanimation counter is 1 modulo 4 DoBlizzardSpecialEffects: - ld a,[wSubAnimCounter] - cp a,13 - jp z,AnimationFlashScreen - cp a,9 - jp z,AnimationFlashScreen - cp a,5 - jp z,AnimationFlashScreen - cp a,1 - jp z,AnimationFlashScreen + ld a, [wSubAnimCounter] + cp 13 + jp z, AnimationFlashScreen + cp 9 + jp z, AnimationFlashScreen + cp 5 + jp z, AnimationFlashScreen + cp 1 + jp z, AnimationFlashScreen ret ; flashes the screen at 3 points in the subanimation ; unused FlashScreenUnused: - ld a,[wSubAnimCounter] - cp a,14 - jp z,AnimationFlashScreen - cp a,9 - jp z,AnimationFlashScreen - cp a,2 - jp z,AnimationFlashScreen + ld a, [wSubAnimCounter] + cp 14 + jp z, AnimationFlashScreen + cp 9 + jp z, AnimationFlashScreen + cp 2 + jp z, AnimationFlashScreen ret ; function to make the pokemon disappear at the beginning of the animation TradeHidePokemon: - ld a,[wSubAnimCounter] - cp a,6 + ld a, [wSubAnimCounter] + cp 6 ret nz - ld a,2 * SCREEN_WIDTH + 7 + ld a, 2 * SCREEN_WIDTH + 7 jp ClearMonPicFromTileMap ; make pokemon disappear ; function to make a shaking pokeball jump up at the end of the animation TradeShakePokeball: - ld a,[wSubAnimCounter] - cp a,1 + ld a, [wSubAnimCounter] + cp 1 ret nz ; if it's the end of the animation, make the ball jump up - ld de,BallMoveDistances1 + ld de, BallMoveDistances1 .loop - ld hl,wOAMBuffer ; OAM buffer - ld bc,4 + ld hl, wOAMBuffer ; OAM buffer + ld bc, 4 .innerLoop - ld a,[de] - cp a,$ff - jr z,.done + ld a, [de] + cp $ff + jr z, .done add [hl] ; add to Y value of OAM entry - ld [hl],a - add hl,bc - ld a,l - cp a,4 * 4 ; there are 4 entries, each 4 bytes - jr nz,.innerLoop + ld [hl], a + add hl, bc + ld a, l + cp 4 * 4 ; there are 4 entries, each 4 bytes + jr nz, .innerLoop inc de push bc call Delay3 @@ -918,7 +918,7 @@ TradeShakePokeball: jr .loop .done call AnimationCleanOAM - ld a,SFX_TRADE_MACHINE + ld a, SFX_TRADE_MACHINE jp PlaySound BallMoveDistances1: @@ -927,38 +927,38 @@ BallMoveDistances1: ; function to make the pokeball jump up TradeJumpPokeball: - ld de,BallMoveDistances2 + ld de, BallMoveDistances2 .loop - ld hl,wOAMBuffer ; OAM buffer - ld bc,4 + ld hl, wOAMBuffer ; OAM buffer + ld bc, 4 .innerLoop - ld a,[de] - cp a,$ff - jp z,ClearScreen + ld a, [de] + cp $ff + jp z, ClearScreen add [hl] - ld [hl],a - add hl,bc - ld a,l - cp a,4 * 4 ; there are 4 entries, each 4 bytes - jr nz,.innerLoop + ld [hl], a + add hl, bc + ld a, l + cp 4 * 4 ; there are 4 entries, each 4 bytes + jr nz, .innerLoop inc de push de - ld a,[de] - cp a,12 - jr z,.playSound - cp a,$ff - jr nz,.skipPlayingSound + ld a, [de] + cp 12 + jr z, .playSound + cp $ff + jr nz, .skipPlayingSound .playSound ; play sound if next move distance is 12 or this is the last one - ld a,SFX_BATTLE_18 + ld a, SFX_BATTLE_18 call PlaySound .skipPlayingSound push bc - ld c,5 + ld c, 5 call DelayFrames pop bc - ld a,[hSCX] ; background scroll X - sub a,8 ; scroll to the left - ld [hSCX],a + ld a, [hSCX] ; background scroll X + sub 8 ; scroll to the left + ld [hSCX], a pop de jr .loop @@ -969,20 +969,20 @@ BallMoveDistances2: ; this function copies the current musical note graphic ; so that there are two musical notes flying towards the defending pokemon DoGrowlSpecialEffects: - ld hl,wOAMBuffer ; OAM buffer - ld de,wOAMBuffer + $10 - ld bc,$10 + ld hl, wOAMBuffer ; OAM buffer + ld de, wOAMBuffer + $10 + ld bc, $10 call CopyData ; copy the musical note graphic - ld a,[wSubAnimCounter] + ld a, [wSubAnimCounter] dec a - call z,AnimationCleanOAM ; clean up at the end of the subanimation + call z, AnimationCleanOAM ; clean up at the end of the subanimation ret ; this is associated with Tail Whip, but Tail Whip doesn't use any subanimations TailWhipAnimationUnused: - ld a,1 - ld [wSubAnimCounter],a - ld c,20 + ld a, 1 + ld [wSubAnimCounter], a + ld c, 20 jp DelayFrames ; Format: Special Effect ID (1 byte), Address (2 bytes) @@ -1068,48 +1068,48 @@ SpecialEffectPointers: db $FF AnimationDelay10: - ld c,10 + ld c, 10 jp DelayFrames ; calls a function with the turn flipped from player to enemy or vice versa ; input - hl - address of function to call CallWithTurnFlipped: - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] push af - xor a,1 - ld [H_WHOSETURN],a - ld de,.returnAddress + xor 1 + ld [H_WHOSETURN], a + ld de, .returnAddress push de jp hl .returnAddress pop af - ld [H_WHOSETURN],a + ld [H_WHOSETURN], a ret ; flashes the screen for an extended period (48 frames) AnimationFlashScreenLong: - ld a,3 ; cycle through the palettes 3 times - ld [wFlashScreenLongCounter],a - ld a,[wOnSGB] ; running on SGB? + ld a, 3 ; cycle through the palettes 3 times + ld [wFlashScreenLongCounter], a + ld a, [wOnSGB] ; running on SGB? and a - ld hl,FlashScreenLongMonochrome - jr z,.loop - ld hl,FlashScreenLongSGB + ld hl, FlashScreenLongMonochrome + jr z, .loop + ld hl, FlashScreenLongSGB .loop push hl .innerLoop - ld a,[hli] - cp a,$01 ; is it the end of the palettes? - jr z,.endOfPalettes - ld [rBGP],a + ld a, [hli] + cp $01 ; is it the end of the palettes? + jr z, .endOfPalettes + ld [rBGP], a call FlashScreenLongDelay jr .innerLoop .endOfPalettes - ld a,[wFlashScreenLongCounter] + ld a, [wFlashScreenLongCounter] dec a - ld [wFlashScreenLongCounter],a + ld [wFlashScreenLongCounter], a pop hl - jr nz,.loop + jr nz, .loop ret ; BG palettes @@ -1147,31 +1147,31 @@ FlashScreenLongSGB: ; causes a delay of 2 frames for the first cycle ; causes a delay of 1 frame for the second and third cycles FlashScreenLongDelay: - ld a,[wFlashScreenLongCounter] - cp a,4 ; never true since [wFlashScreenLongCounter] starts at 3 - ld c,4 - jr z,.delayFrames - cp a,3 - ld c,2 - jr z,.delayFrames - cp a,2 ; nothing is done with this - ld c,1 + ld a, [wFlashScreenLongCounter] + cp 4 ; never true since [wFlashScreenLongCounter] starts at 3 + ld c, 4 + jr z, .delayFrames + cp 3 + ld c, 2 + jr z, .delayFrames + cp 2 ; nothing is done with this + ld c, 1 .delayFrames jp DelayFrames AnimationFlashScreen: - ld a,[rBGP] + ld a, [rBGP] push af ; save initial palette - ld a,%00011011 ; 0, 1, 2, 3 (inverted colors) - ld [rBGP],a - ld c,2 + ld a, %00011011 ; 0, 1, 2, 3 (inverted colors) + ld [rBGP], a + ld c, 2 call DelayFrames xor a ; white out background - ld [rBGP],a - ld c,2 + ld [rBGP], a + ld c, 2 call DelayFrames pop af - ld [rBGP],a ; restore initial palette + ld [rBGP], a ; restore initial palette ret AnimationDarkScreenPalette: @@ -2310,52 +2310,52 @@ GetMoveSoundB: ret GetMoveSound: - ld hl,MoveSoundTable - ld e,a - ld d,0 - add hl,de - add hl,de - add hl,de - ld a,[hli] - ld b,a + ld hl, MoveSoundTable + ld e, a + ld d, 0 + add hl, de + add hl, de + add hl, de + ld a, [hli] + ld b, a call IsCryMove - jr nc,.NotCryMove - ld a,[H_WHOSETURN] + jr nc, .NotCryMove + ld a, [H_WHOSETURN] and a - jr nz,.next - ld a,[wBattleMonSpecies] ; get number of current monster + jr nz, .next + ld a, [wBattleMonSpecies] ; get number of current monster jr .Continue .next - ld a,[wEnemyMonSpecies] + ld a, [wEnemyMonSpecies] .Continue push hl call GetCryData - ld b,a + ld b, a pop hl - ld a,[wFrequencyModifier] + ld a, [wFrequencyModifier] add [hl] - ld [wFrequencyModifier],a + ld [wFrequencyModifier], a inc hl - ld a,[wTempoModifier] + ld a, [wTempoModifier] add [hl] - ld [wTempoModifier],a + ld [wTempoModifier], a jr .done .NotCryMove - ld a,[hli] - ld [wFrequencyModifier],a - ld a,[hli] - ld [wTempoModifier],a + ld a, [hli] + ld [wFrequencyModifier], a + ld a, [hli] + ld [wTempoModifier], a .done - ld a,b + ld a, b ret IsCryMove: ; set carry if the move animation involves playing a monster cry - ld a,[wAnimationID] - cp a,GROWL - jr z,.CryMove - cp a,ROAR - jr z,.CryMove + ld a, [wAnimationID] + cp GROWL + jr z, .CryMove + cp ROAR + jr z, .CryMove and a ; clear carry ret .CryMove @@ -2951,46 +2951,46 @@ BattleAnimCopyTileMapToVRAM: jp Delay3 TossBallAnimation: - ld a,[wIsInBattle] - cp a,2 - jr z,.BlockBall ; if in trainer battle, play different animation - ld a,[wPokeBallAnimData] - ld b,a + ld a, [wIsInBattle] + cp 2 + jr z, .BlockBall ; if in trainer battle, play different animation + ld a, [wPokeBallAnimData] + ld b, a ; upper nybble: how many animations (from PokeBallAnimations) to play ; this will be 4 for successful capture, 6 for breakout - and a,$F0 + and $F0 swap a - ld c,a + ld c, a ; lower nybble: number of shakes ; store these for later - ld a,b - and a,$F - ld [wNumShakes],a + ld a, b + and $F + ld [wNumShakes], a - ld hl,.PokeBallAnimations + ld hl, .PokeBallAnimations ; choose which toss animation to use - ld a,[wcf91] - cp a,POKE_BALL - ld b,TOSS_ANIM - jr z,.done - cp a,GREAT_BALL - ld b,GREATTOSS_ANIM - jr z,.done - ld b,ULTRATOSS_ANIM + ld a, [wcf91] + cp POKE_BALL + ld b, TOSS_ANIM + jr z, .done + cp GREAT_BALL + ld b, GREATTOSS_ANIM + jr z, .done + ld b, ULTRATOSS_ANIM .done - ld a,b + ld a, b .PlayNextAnimation - ld [wAnimationID],a + ld [wAnimationID], a push bc push hl call PlayAnimation pop hl - ld a,[hli] + ld a, [hli] pop bc dec c - jr nz,.PlayNextAnimation + jr nz, .PlayNextAnimation ret .PokeBallAnimations: @@ -2998,13 +2998,13 @@ TossBallAnimation: db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM .BlockBall - ld a,TOSS_ANIM - ld [wAnimationID],a + ld a, TOSS_ANIM + ld [wAnimationID], a call PlayAnimation - ld a,SFX_FAINT_THUD + ld a, SFX_FAINT_THUD call PlaySound - ld a,BLOCKBALL_ANIM - ld [wAnimationID],a + ld a, BLOCKBALL_ANIM + ld [wAnimationID], a jp PlayAnimation PlayApplyingAttackSound: diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a2b18389..9265503d 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -579,7 +579,7 @@ HandlePoisonBurnLeechSeed: call PrintText xor a ld [wAnimationType], a - ld a,BURN_PSN_ANIM + ld a, BURN_PSN_ANIM call PlayMoveAnimation ; play burn/poison animation pop hl call HandlePoisonBurnLeechSeed_DecreaseOwnHP @@ -600,7 +600,7 @@ HandlePoisonBurnLeechSeed: ld [H_WHOSETURN], a xor a ld [wAnimationType], a - ld a,ABSORB + ld a, ABSORB call PlayMoveAnimation ; play leech seed animation (from opposing mon) pop af ld [H_WHOSETURN], a @@ -1363,138 +1363,138 @@ SlideTrainerPicOffScreen: ; send out a trainer's mon EnemySendOut: - ld hl,wPartyGainExpFlags + ld hl, wPartyGainExpFlags xor a - ld [hl],a - ld a,[wPlayerMonNumber] - ld c,a - ld b,FLAG_SET + ld [hl], a + ld a, [wPlayerMonNumber] + ld c, a + ld b, FLAG_SET push bc predef FlagActionPredef - ld hl,wPartyFoughtCurrentEnemyFlags + ld hl, wPartyFoughtCurrentEnemyFlags xor a - ld [hl],a + ld [hl], a pop bc predef FlagActionPredef ; don't change wPartyGainExpFlags or wPartyFoughtCurrentEnemyFlags EnemySendOutFirstMon: xor a - ld hl,wEnemyStatsToDouble ; clear enemy statuses - ld [hli],a - ld [hli],a - ld [hli],a - ld [hli],a - ld [hl],a - ld [wEnemyDisabledMove],a - ld [wEnemyDisabledMoveNumber],a - ld [wEnemyMonMinimized],a - ld hl,wPlayerUsedMove - ld [hli],a - ld [hl],a + ld hl, wEnemyStatsToDouble ; clear enemy statuses + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld [wEnemyDisabledMove], a + ld [wEnemyDisabledMoveNumber], a + ld [wEnemyMonMinimized], a + ld hl, wPlayerUsedMove + ld [hli], a + ld [hl], a dec a - ld [wAICount],a - ld hl,wPlayerBattleStatus1 - res 5,[hl] + ld [wAICount], a + ld hl, wPlayerBattleStatus1 + res 5, [hl] coord hl, 18, 0 - ld a,8 + ld a, 8 call SlideTrainerPicOffScreen call PrintEmptyString call SaveScreenTilesToBuffer1 - ld a,[wLinkState] + ld a, [wLinkState] cp LINK_STATE_BATTLING - jr nz,.next - ld a,[wSerialExchangeNybbleReceiveData] + jr nz, .next + ld a, [wSerialExchangeNybbleReceiveData] sub 4 - ld [wWhichPokemon],a + ld [wWhichPokemon], a jr .next3 .next - ld b,$FF + ld b, $FF .next2 inc b - ld a,[wEnemyMonPartyPos] + ld a, [wEnemyMonPartyPos] cp b - jr z,.next2 - ld hl,wEnemyMon1 - ld a,b - ld [wWhichPokemon],a + jr z, .next2 + ld hl, wEnemyMon1 + ld a, b + ld [wWhichPokemon], a push bc - ld bc,wEnemyMon2 - wEnemyMon1 + ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes pop bc inc hl - ld a,[hli] - ld c,a - ld a,[hl] + ld a, [hli] + ld c, a + ld a, [hl] or c - jr z,.next2 + jr z, .next2 .next3 - ld a,[wWhichPokemon] - ld hl,wEnemyMon1Level - ld bc,wEnemyMon2 - wEnemyMon1 + ld a, [wWhichPokemon] + ld hl, wEnemyMon1Level + ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes - ld a,[hl] - ld [wCurEnemyLVL],a - ld a,[wWhichPokemon] + ld a, [hl] + ld [wCurEnemyLVL], a + ld a, [wWhichPokemon] inc a - ld hl,wEnemyPartyCount - ld c,a - ld b,0 - add hl,bc - ld a,[hl] - ld [wEnemyMonSpecies2],a - ld [wcf91],a + ld hl, wEnemyPartyCount + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + ld [wEnemyMonSpecies2], a + ld [wcf91], a call LoadEnemyMonData - ld hl,wEnemyMonHP - ld a,[hli] - ld [wLastSwitchInEnemyMonHP],a - ld a,[hl] - ld [wLastSwitchInEnemyMonHP + 1],a - ld a,1 - ld [wCurrentMenuItem],a - ld a,[wFirstMonsNotOutYet] + ld hl, wEnemyMonHP + ld a, [hli] + ld [wLastSwitchInEnemyMonHP], a + ld a, [hl] + ld [wLastSwitchInEnemyMonHP + 1], a + ld a, 1 + ld [wCurrentMenuItem], a + ld a, [wFirstMonsNotOutYet] dec a - jr z,.next4 - ld a,[wPartyCount] + jr z, .next4 + ld a, [wPartyCount] dec a - jr z,.next4 - ld a,[wLinkState] + jr z, .next4 + ld a, [wLinkState] cp LINK_STATE_BATTLING - jr z,.next4 - ld a,[wOptions] - bit 6,a - jr nz,.next4 + jr z, .next4 + ld a, [wOptions] + bit 6, a + jr nz, .next4 ld hl, TrainerAboutToUseText call PrintText coord hl, 0, 7 lb bc, 8, 1 - ld a,TWO_OPTION_MENU - ld [wTextBoxID],a + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a call DisplayTextBoxID - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - jr nz,.next4 - ld a,BATTLE_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a + jr nz, .next4 + ld a, BATTLE_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a call DisplayPartyMenu .next9 - ld a,1 - ld [wCurrentMenuItem],a - jr c,.next7 - ld hl,wPlayerMonNumber - ld a,[wWhichPokemon] + ld a, 1 + ld [wCurrentMenuItem], a + jr c, .next7 + ld hl, wPlayerMonNumber + ld a, [wWhichPokemon] cp [hl] - jr nz,.next6 - ld hl,AlreadyOutText + jr nz, .next6 + ld hl, AlreadyOutText call PrintText .next8 call GoBackToPartyMenu jr .next9 .next6 call HasMonFainted - jr z,.next8 + jr z, .next8 xor a - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a .next7 call GBPalWhiteOut call LoadHudTilePatterns @@ -1507,27 +1507,27 @@ EnemySendOutFirstMon: ld b, SET_PAL_BATTLE call RunPaletteCommand call GBPalNormal - ld hl,TrainerSentOutText + ld hl, TrainerSentOutText call PrintText - ld a,[wEnemyMonSpecies2] - ld [wcf91],a - ld [wd0b5],a + ld a, [wEnemyMonSpecies2] + ld [wcf91], a + ld [wd0b5], a call GetMonHeader - ld de,vFrontPic + ld de, vFrontPic call LoadMonFrontSprite - ld a,-$31 - ld [hStartTileID],a + ld a, -$31 + ld [hStartTileID], a coord hl, 15, 6 predef AnimateSendingOutMon - ld a,[wEnemyMonSpecies2] + ld a, [wEnemyMonSpecies2] call PlayCry call DrawEnemyHUDAndHPBar - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a ret nz xor a - ld [wPartyGainExpFlags],a - ld [wPartyFoughtCurrentEnemyFlags],a + ld [wPartyGainExpFlags], a + ld [wPartyFoughtCurrentEnemyFlags], a call SaveScreenTilesToBuffer1 jp SwitchPlayerMon @@ -3169,160 +3169,160 @@ CheckIfPlayerNeedsToChargeUp: ; in-battle stuff PlayerCanExecuteChargingMove: - ld hl,wPlayerBattleStatus1 - res CHARGING_UP,[hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack + ld hl, wPlayerBattleStatus1 + res CHARGING_UP, [hl] ; reset charging up and invulnerability statuses if mon was charging up for an attack ; being fully paralyzed or hurting oneself in confusion removes charging up status ; resulting in the Pokemon being invulnerable for the whole battle - res INVULNERABLE,[hl] + res INVULNERABLE, [hl] PlayerCanExecuteMove: call PrintMonName1Text - ld hl,DecrementPP - ld de,wPlayerSelectedMove ; pointer to the move just used - ld b,BANK(DecrementPP) + ld hl, DecrementPP + ld de, wPlayerSelectedMove ; pointer to the move just used + ld b, BANK(DecrementPP) call Bankswitch - ld a,[wPlayerMoveEffect] ; effect of the move just used - ld hl,ResidualEffects1 - ld de,1 + ld a, [wPlayerMoveEffect] ; effect of the move just used + ld hl, ResidualEffects1 + ld de, 1 call IsInArray - jp c,JumpMoveEffect ; ResidualEffects1 moves skip damage calculation and accuracy tests + jp c, JumpMoveEffect ; ResidualEffects1 moves skip damage calculation and accuracy tests ; unless executed as part of their exclusive effect functions - ld a,[wPlayerMoveEffect] - ld hl,SpecialEffectsCont - ld de,1 + ld a, [wPlayerMoveEffect] + ld hl, SpecialEffectsCont + ld de, 1 call IsInArray - call c,JumpMoveEffect ; execute the effects of SpecialEffectsCont moves (e.g. Wrap, Thrash) but don't skip anything + call c, JumpMoveEffect ; execute the effects of SpecialEffectsCont moves (e.g. Wrap, Thrash) but don't skip anything PlayerCalcMoveDamage: - ld a,[wPlayerMoveEffect] - ld hl,SetDamageEffects - ld de,1 + ld a, [wPlayerMoveEffect] + ld hl, SetDamageEffects + ld de, 1 call IsInArray - jp c,.moveHitTest ; SetDamageEffects moves (e.g. Seismic Toss and Super Fang) skip damage calculation + jp c, .moveHitTest ; SetDamageEffects moves (e.g. Seismic Toss and Super Fang) skip damage calculation call CriticalHitTest call HandleCounterMove - jr z,handleIfPlayerMoveMissed + jr z, handleIfPlayerMoveMissed call GetDamageVarsForPlayerAttack call CalculateDamage - jp z,playerCheckIfFlyOrChargeEffect ; for moves with 0 BP, skip any further damage calculation and, for now, skip MoveHitTest + jp z, playerCheckIfFlyOrChargeEffect ; for moves with 0 BP, skip any further damage calculation and, for now, skip MoveHitTest ; for these moves, accuracy tests will only occur if they are called as part of the effect itself call AdjustDamageForMoveType call RandomizeDamage .moveHitTest call MoveHitTest handleIfPlayerMoveMissed: - ld a,[wMoveMissed] + ld a, [wMoveMissed] and a - jr z,getPlayerAnimationType - ld a,[wPlayerMoveEffect] - sub a,EXPLODE_EFFECT - jr z,playPlayerMoveAnimation ; don't play any animation if the move missed, unless it was EXPLODE_EFFECT + jr z, getPlayerAnimationType + ld a, [wPlayerMoveEffect] + sub EXPLODE_EFFECT + jr z, playPlayerMoveAnimation ; don't play any animation if the move missed, unless it was EXPLODE_EFFECT jr playerCheckIfFlyOrChargeEffect getPlayerAnimationType: - ld a,[wPlayerMoveEffect] + ld a, [wPlayerMoveEffect] and a - ld a,4 ; move has no effect other than dealing damage - jr z,playPlayerMoveAnimation - ld a,5 ; move has effect + ld a, 4 ; move has no effect other than dealing damage + jr z, playPlayerMoveAnimation + ld a, 5 ; move has effect playPlayerMoveAnimation: push af - ld a,[wPlayerBattleStatus2] - bit HAS_SUBSTITUTE_UP,a - ld hl,HideSubstituteShowMonAnim - ld b,BANK(HideSubstituteShowMonAnim) - call nz,Bankswitch + ld a, [wPlayerBattleStatus2] + bit HAS_SUBSTITUTE_UP, a + ld hl, HideSubstituteShowMonAnim + ld b, BANK(HideSubstituteShowMonAnim) + call nz, Bankswitch pop af - ld [wAnimationType],a - ld a,[wPlayerMoveNum] + ld [wAnimationType], a + ld a, [wPlayerMoveNum] call PlayMoveAnimation call HandleExplodingAnimation call DrawPlayerHUDAndHPBar - ld a,[wPlayerBattleStatus2] - bit HAS_SUBSTITUTE_UP,a - ld hl,ReshowSubstituteAnim - ld b,BANK(ReshowSubstituteAnim) - call nz,Bankswitch + ld a, [wPlayerBattleStatus2] + bit HAS_SUBSTITUTE_UP, a + ld hl, ReshowSubstituteAnim + ld b, BANK(ReshowSubstituteAnim) + call nz, Bankswitch jr MirrorMoveCheck playerCheckIfFlyOrChargeEffect: - ld c,30 + ld c, 30 call DelayFrames - ld a,[wPlayerMoveEffect] - cp a,FLY_EFFECT - jr z,.playAnim - cp a,CHARGE_EFFECT - jr z,.playAnim + ld a, [wPlayerMoveEffect] + cp FLY_EFFECT + jr z, .playAnim + cp CHARGE_EFFECT + jr z, .playAnim jr MirrorMoveCheck .playAnim xor a - ld [wAnimationType],a - ld a,STATUS_AFFECTED_ANIM + ld [wAnimationType], a + ld a, STATUS_AFFECTED_ANIM call PlayMoveAnimation MirrorMoveCheck: - ld a,[wPlayerMoveEffect] - cp a,MIRROR_MOVE_EFFECT - jr nz,.metronomeCheck + ld a, [wPlayerMoveEffect] + cp MIRROR_MOVE_EFFECT + jr nz, .metronomeCheck call MirrorMoveCopyMove - jp z,ExecutePlayerMoveDone + jp z, ExecutePlayerMoveDone xor a - ld [wMonIsDisobedient],a + ld [wMonIsDisobedient], a jp CheckIfPlayerNeedsToChargeUp ; if Mirror Move was successful go back to damage calculation for copied move .metronomeCheck - cp a,METRONOME_EFFECT - jr nz,.next + cp METRONOME_EFFECT + jr nz, .next call MetronomePickMove jp CheckIfPlayerNeedsToChargeUp ; Go back to damage calculation for the move picked by Metronome .next - ld a,[wPlayerMoveEffect] - ld hl,ResidualEffects2 - ld de,1 + ld a, [wPlayerMoveEffect] + ld hl, ResidualEffects2 + ld de, 1 call IsInArray - jp c,JumpMoveEffect ; done here after executing effects of ResidualEffects2 - ld a,[wMoveMissed] + jp c, JumpMoveEffect ; done here after executing effects of ResidualEffects2 + ld a, [wMoveMissed] and a - jr z,.moveDidNotMiss + jr z, .moveDidNotMiss call PrintMoveFailureText - ld a,[wPlayerMoveEffect] - cp a,EXPLODE_EFFECT ; even if Explosion or Selfdestruct missed, its effect still needs to be activated - jr z,.notDone + ld a, [wPlayerMoveEffect] + cp EXPLODE_EFFECT ; even if Explosion or Selfdestruct missed, its effect still needs to be activated + jr z, .notDone jp ExecutePlayerMoveDone ; otherwise, we're done if the move missed .moveDidNotMiss call ApplyAttackToEnemyPokemon call PrintCriticalOHKOText callab DisplayEffectiveness - ld a,1 - ld [wMoveDidntMiss],a + ld a, 1 + ld [wMoveDidntMiss], a .notDone - ld a,[wPlayerMoveEffect] - ld hl,AlwaysHappenSideEffects - ld de,1 + ld a, [wPlayerMoveEffect] + ld hl, AlwaysHappenSideEffects + ld de, 1 call IsInArray - call c,JumpMoveEffect ; not done after executing effects of AlwaysHappenSideEffects - ld hl,wEnemyMonHP - ld a,[hli] - ld b,[hl] + call c, JumpMoveEffect ; not done after executing effects of AlwaysHappenSideEffects + ld hl, wEnemyMonHP + ld a, [hli] + ld b, [hl] or b ret z ; don't do anything else if the enemy fainted call HandleBuildingRage - ld hl,wPlayerBattleStatus1 - bit ATTACKING_MULTIPLE_TIMES,[hl] - jr z,.executeOtherEffects - ld a,[wPlayerNumAttacksLeft] + ld hl, wPlayerBattleStatus1 + bit ATTACKING_MULTIPLE_TIMES, [hl] + jr z, .executeOtherEffects + ld a, [wPlayerNumAttacksLeft] dec a - ld [wPlayerNumAttacksLeft],a - jp nz,getPlayerAnimationType ; for multi-hit moves, apply attack until PlayerNumAttacksLeft hits 0 or the enemy faints. + ld [wPlayerNumAttacksLeft], a + jp nz, getPlayerAnimationType ; for multi-hit moves, apply attack until PlayerNumAttacksLeft hits 0 or the enemy faints. ; damage calculation and accuracy tests only happen for the first hit - res ATTACKING_MULTIPLE_TIMES,[hl] ; clear attacking multiple times status when all attacks are over - ld hl,MultiHitText + res ATTACKING_MULTIPLE_TIMES, [hl] ; clear attacking multiple times status when all attacks are over + ld hl, MultiHitText call PrintText xor a - ld [wPlayerNumHits],a + ld [wPlayerNumHits], a .executeOtherEffects - ld a,[wPlayerMoveEffect] + ld a, [wPlayerMoveEffect] and a - jp z,ExecutePlayerMoveDone - ld hl,SpecialEffects - ld de,1 + jp z, ExecutePlayerMoveDone + ld hl, SpecialEffects + ld de, 1 call IsInArray - call nc,JumpMoveEffect ; move effects not included in SpecialEffects or in either of the ResidualEffect arrays, + call nc, JumpMoveEffect ; move effects not included in SpecialEffects or in either of the ResidualEffect arrays, ; which are the effects not covered yet. Rage effect will be executed for a second time (though it's irrelevant). ; Includes side effects that only need to be called if the target didn't faint. ; Responsible for executing Twineedle's second side effect (poison). @@ -3334,26 +3334,26 @@ MultiHitText: ExecutePlayerMoveDone: xor a - ld [wActionResultOrTookBattleTurn],a - ld b,1 + ld [wActionResultOrTookBattleTurn], a + ld b, 1 ret PrintGhostText: ; print the ghost battle messages call IsGhostBattle ret nz - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] and a - jr nz,.Ghost - ld a,[wBattleMonStatus] ; player’s turn - and a,SLP | (1 << FRZ) + jr nz, .Ghost + ld a, [wBattleMonStatus] ; player’s turn + and SLP | (1 << FRZ) ret nz - ld hl,ScaredText + ld hl, ScaredText call PrintText xor a ret .Ghost ; ghost’s turn - ld hl,GetOutText + ld hl, GetOutText call PrintText xor a ret @@ -3367,261 +3367,261 @@ GetOutText: db "@" IsGhostBattle: - ld a,[wIsInBattle] + ld a, [wIsInBattle] dec a ret nz - ld a,[wCurMap] - cp a,POKEMONTOWER_1 - jr c,.next - cp a,LAVENDER_HOUSE_1 - jr nc,.next - ld b,SILPH_SCOPE + ld a, [wCurMap] + cp POKEMONTOWER_1 + jr c, .next + cp LAVENDER_HOUSE_1 + jr nc, .next + ld b, SILPH_SCOPE call IsItemInBag ret z .next - ld a,1 + ld a, 1 and a ret ; checks for various status conditions affecting the player mon ; stores whether the mon cannot use a move this turn in Z flag CheckPlayerStatusConditions: - ld hl,wBattleMonStatus - ld a,[hl] - and a,SLP ; sleep mask - jr z,.FrozenCheck + ld hl, wBattleMonStatus + ld a, [hl] + and SLP ; sleep mask + jr z, .FrozenCheck ; sleeping dec a - ld [wBattleMonStatus],a ; decrement number of turns left + ld [wBattleMonStatus], a ; decrement number of turns left and a - jr z,.WakeUp ; if the number of turns hit 0, wake up + jr z, .WakeUp ; if the number of turns hit 0, wake up ; fast asleep xor a - ld [wAnimationType],a - ld a,SLP_ANIM - 1 + ld [wAnimationType], a + ld a, SLP_ANIM - 1 call PlayMoveAnimation - ld hl,FastAsleepText + ld hl, FastAsleepText call PrintText jr .sleepDone .WakeUp - ld hl,WokeUpText + ld hl, WokeUpText call PrintText .sleepDone xor a - ld [wPlayerUsedMove],a - ld hl,ExecutePlayerMoveDone ; player can't move this turn + ld [wPlayerUsedMove], a + ld hl, ExecutePlayerMoveDone ; player can't move this turn jp .returnToHL .FrozenCheck - bit FRZ,[hl] ; frozen? - jr z,.HeldInPlaceCheck - ld hl,IsFrozenText + bit FRZ, [hl] ; frozen? + jr z, .HeldInPlaceCheck + ld hl, IsFrozenText call PrintText xor a - ld [wPlayerUsedMove],a - ld hl,ExecutePlayerMoveDone ; player can't move this turn + ld [wPlayerUsedMove], a + ld hl, ExecutePlayerMoveDone ; player can't move this turn jp .returnToHL .HeldInPlaceCheck - ld a,[wEnemyBattleStatus1] - bit USING_TRAPPING_MOVE,a ; is enemy using a mult-turn move like wrap? - jp z,.FlinchedCheck - ld hl,CantMoveText + ld a, [wEnemyBattleStatus1] + bit USING_TRAPPING_MOVE, a ; is enemy using a mult-turn move like wrap? + jp z, .FlinchedCheck + ld hl, CantMoveText call PrintText - ld hl,ExecutePlayerMoveDone ; player can't move this turn + ld hl, ExecutePlayerMoveDone ; player can't move this turn jp .returnToHL .FlinchedCheck - ld hl,wPlayerBattleStatus1 - bit FLINCHED,[hl] - jp z,.HyperBeamCheck - res FLINCHED,[hl] ; reset player's flinch status - ld hl,FlinchedText + ld hl, wPlayerBattleStatus1 + bit FLINCHED, [hl] + jp z, .HyperBeamCheck + res FLINCHED, [hl] ; reset player's flinch status + ld hl, FlinchedText call PrintText - ld hl,ExecutePlayerMoveDone ; player can't move this turn + ld hl, ExecutePlayerMoveDone ; player can't move this turn jp .returnToHL .HyperBeamCheck - ld hl,wPlayerBattleStatus2 - bit NEEDS_TO_RECHARGE,[hl] - jr z,.AnyMoveDisabledCheck - res NEEDS_TO_RECHARGE,[hl] ; reset player's recharge status - ld hl,MustRechargeText + ld hl, wPlayerBattleStatus2 + bit NEEDS_TO_RECHARGE, [hl] + jr z, .AnyMoveDisabledCheck + res NEEDS_TO_RECHARGE, [hl] ; reset player's recharge status + ld hl, MustRechargeText call PrintText - ld hl,ExecutePlayerMoveDone ; player can't move this turn + ld hl, ExecutePlayerMoveDone ; player can't move this turn jp .returnToHL .AnyMoveDisabledCheck - ld hl,wPlayerDisabledMove - ld a,[hl] + ld hl, wPlayerDisabledMove + ld a, [hl] and a - jr z,.ConfusedCheck + jr z, .ConfusedCheck dec a - ld [hl],a + ld [hl], a and $f ; did Disable counter hit 0? - jr nz,.ConfusedCheck - ld [hl],a - ld [wPlayerDisabledMoveNumber],a - ld hl,DisabledNoMoreText + jr nz, .ConfusedCheck + ld [hl], a + ld [wPlayerDisabledMoveNumber], a + ld hl, DisabledNoMoreText call PrintText .ConfusedCheck - ld a,[wPlayerBattleStatus1] + ld a, [wPlayerBattleStatus1] add a ; is player confused? - jr nc,.TriedToUseDisabledMoveCheck - ld hl,wPlayerConfusedCounter + jr nc, .TriedToUseDisabledMoveCheck + ld hl, wPlayerConfusedCounter dec [hl] - jr nz,.IsConfused - ld hl,wPlayerBattleStatus1 - res CONFUSED,[hl] ; if confused counter hit 0, reset confusion status - ld hl,ConfusedNoMoreText + jr nz, .IsConfused + ld hl, wPlayerBattleStatus1 + res CONFUSED, [hl] ; if confused counter hit 0, reset confusion status + ld hl, ConfusedNoMoreText call PrintText jr .TriedToUseDisabledMoveCheck .IsConfused - ld hl,IsConfusedText + ld hl, IsConfusedText call PrintText xor a - ld [wAnimationType],a - ld a,CONF_ANIM - 1 + ld [wAnimationType], a + ld a, CONF_ANIM - 1 call PlayMoveAnimation call BattleRandom - cp a,$80 ; 50% chance to hurt itself - jr c,.TriedToUseDisabledMoveCheck - ld hl,wPlayerBattleStatus1 - ld a,[hl] - and a, 1 << CONFUSED ; if mon hurts itself, clear every other status from wPlayerBattleStatus1 - ld [hl],a + cp $80 ; 50% chance to hurt itself + jr c, .TriedToUseDisabledMoveCheck + ld hl, wPlayerBattleStatus1 + ld a, [hl] + and 1 << CONFUSED ; if mon hurts itself, clear every other status from wPlayerBattleStatus1 + ld [hl], a call HandleSelfConfusionDamage jr .MonHurtItselfOrFullyParalysed .TriedToUseDisabledMoveCheck ; prevents a disabled move that was selected before being disabled from being used - ld a,[wPlayerDisabledMoveNumber] + ld a, [wPlayerDisabledMoveNumber] and a - jr z,.ParalysisCheck - ld hl,wPlayerSelectedMove + jr z, .ParalysisCheck + ld hl, wPlayerSelectedMove cp [hl] - jr nz,.ParalysisCheck + jr nz, .ParalysisCheck call PrintMoveIsDisabledText - ld hl,ExecutePlayerMoveDone ; if a disabled move was somehow selected, player can't move this turn + ld hl, ExecutePlayerMoveDone ; if a disabled move was somehow selected, player can't move this turn jp .returnToHL .ParalysisCheck - ld hl,wBattleMonStatus - bit PAR,[hl] - jr z,.BideCheck + ld hl, wBattleMonStatus + bit PAR, [hl] + jr z, .BideCheck call BattleRandom - cp a,$3F ; 25% to be fully paralyzed - jr nc,.BideCheck - ld hl,FullyParalyzedText + cp $3F ; 25% to be fully paralyzed + jr nc, .BideCheck + ld hl, FullyParalyzedText call PrintText .MonHurtItselfOrFullyParalysed - ld hl,wPlayerBattleStatus1 - ld a,[hl] + ld hl, wPlayerBattleStatus1 + ld a, [hl] ; clear bide, thrashing, charging up, and trapping moves such as warp (already cleared for confusion damage) and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) - ld [hl],a - ld a,[wPlayerMoveEffect] - cp a,FLY_EFFECT - jr z,.FlyOrChargeEffect - cp a,CHARGE_EFFECT - jr z,.FlyOrChargeEffect + ld [hl], a + ld a, [wPlayerMoveEffect] + cp FLY_EFFECT + jr z, .FlyOrChargeEffect + cp CHARGE_EFFECT + jr z, .FlyOrChargeEffect jr .NotFlyOrChargeEffect .FlyOrChargeEffect xor a - ld [wAnimationType],a - ld a,STATUS_AFFECTED_ANIM + ld [wAnimationType], a + ld a, STATUS_AFFECTED_ANIM call PlayMoveAnimation .NotFlyOrChargeEffect - ld hl,ExecutePlayerMoveDone + ld hl, ExecutePlayerMoveDone jp .returnToHL ; if using a two-turn move, we need to recharge the first turn .BideCheck - ld hl,wPlayerBattleStatus1 - bit STORING_ENERGY,[hl] ; is mon using bide? - jr z,.ThrashingAboutCheck - xor a - ld [wPlayerMoveNum],a - ld hl,wDamage - ld a,[hli] - ld b,a - ld c,[hl] - ld hl,wPlayerBideAccumulatedDamage + 1 - ld a,[hl] + ld hl, wPlayerBattleStatus1 + bit STORING_ENERGY, [hl] ; is mon using bide? + jr z, .ThrashingAboutCheck + xor a + ld [wPlayerMoveNum], a + ld hl, wDamage + ld a, [hli] + ld b, a + ld c, [hl] + ld hl, wPlayerBideAccumulatedDamage + 1 + ld a, [hl] add c ; accumulate damage taken - ld [hld],a - ld a,[hl] + ld [hld], a + ld a, [hl] adc b - ld [hl],a - ld hl,wPlayerNumAttacksLeft + ld [hl], a + ld hl, wPlayerNumAttacksLeft dec [hl] ; did Bide counter hit 0? - jr z,.UnleashEnergy - ld hl,ExecutePlayerMoveDone + jr z, .UnleashEnergy + ld hl, ExecutePlayerMoveDone jp .returnToHL ; unless mon unleashes energy, can't move this turn .UnleashEnergy - ld hl,wPlayerBattleStatus1 - res STORING_ENERGY,[hl] ; not using bide any more - ld hl,UnleashedEnergyText + ld hl, wPlayerBattleStatus1 + res STORING_ENERGY, [hl] ; not using bide any more + ld hl, UnleashedEnergyText call PrintText - ld a,1 - ld [wPlayerMovePower],a - ld hl,wPlayerBideAccumulatedDamage + 1 - ld a,[hld] + ld a, 1 + ld [wPlayerMovePower], a + ld hl, wPlayerBideAccumulatedDamage + 1 + ld a, [hld] add a - ld b,a - ld [wDamage + 1],a - ld a,[hl] + ld b, a + ld [wDamage + 1], a + ld a, [hl] rl a ; double the damage - ld [wDamage],a + ld [wDamage], a or b - jr nz,.next - ld a,1 - ld [wMoveMissed],a + jr nz, .next + ld a, 1 + ld [wMoveMissed], a .next xor a - ld [hli],a - ld [hl],a - ld a,BIDE - ld [wPlayerMoveNum],a - ld hl,handleIfPlayerMoveMissed ; skip damage calculation, DecrementPP and MoveHitTest + ld [hli], a + ld [hl], a + ld a, BIDE + ld [wPlayerMoveNum], a + ld hl, handleIfPlayerMoveMissed ; skip damage calculation, DecrementPP and MoveHitTest jp .returnToHL .ThrashingAboutCheck - bit THRASHING_ABOUT,[hl] ; is mon using thrash or petal dance? - jr z,.MultiturnMoveCheck - ld a,THRASH - ld [wPlayerMoveNum],a - ld hl,ThrashingAboutText + bit THRASHING_ABOUT, [hl] ; is mon using thrash or petal dance? + jr z, .MultiturnMoveCheck + ld a, THRASH + ld [wPlayerMoveNum], a + ld hl, ThrashingAboutText call PrintText - ld hl,wPlayerNumAttacksLeft + ld hl, wPlayerNumAttacksLeft dec [hl] ; did Thrashing About counter hit 0? - ld hl,PlayerCalcMoveDamage ; skip DecrementPP - jp nz,.returnToHL + ld hl, PlayerCalcMoveDamage ; skip DecrementPP + jp nz, .returnToHL push hl - ld hl,wPlayerBattleStatus1 - res THRASHING_ABOUT,[hl] ; no longer thrashing about - set CONFUSED,[hl] ; confused + ld hl, wPlayerBattleStatus1 + res THRASHING_ABOUT, [hl] ; no longer thrashing about + set CONFUSED, [hl] ; confused call BattleRandom - and a,3 + and 3 inc a inc a ; confused for 2-5 turns - ld [wPlayerConfusedCounter],a + ld [wPlayerConfusedCounter], a pop hl ; skip DecrementPP jp .returnToHL .MultiturnMoveCheck - bit USING_TRAPPING_MOVE,[hl] ; is mon using multi-turn move? - jp z,.RageCheck - ld hl,AttackContinuesText + bit USING_TRAPPING_MOVE, [hl] ; is mon using multi-turn move? + jp z, .RageCheck + ld hl, AttackContinuesText call PrintText - ld a,[wPlayerNumAttacksLeft] + ld a, [wPlayerNumAttacksLeft] dec a ; did multi-turn move end? - ld [wPlayerNumAttacksLeft],a - ld hl,getPlayerAnimationType ; if it didn't, skip damage calculation (deal damage equal to last hit), + ld [wPlayerNumAttacksLeft], a + ld hl, getPlayerAnimationType ; if it didn't, skip damage calculation (deal damage equal to last hit), ; DecrementPP and MoveHitTest - jp nz,.returnToHL + jp nz, .returnToHL jp .returnToHL .RageCheck @@ -4515,7 +4515,7 @@ CalculateDamage: .effect ; EXPLODE_EFFECT halves defense. - cp a, EXPLODE_EFFECT + cp EXPLODE_EFFECT jr nz, .ok srl c jr nz, .ok @@ -4523,13 +4523,13 @@ CalculateDamage: .ok ; Multi-hit attacks may or may not have 0 bp. - cp a, TWO_TO_FIVE_ATTACKS_EFFECT + cp TWO_TO_FIVE_ATTACKS_EFFECT jr z, .skipbp - cp a, $1e + cp $1e jr z, .skipbp ; Calculate OHKO damage based on remaining HP. - cp a, OHKO_EFFECT + cp OHKO_EFFECT jp z, JumpToOHKOMoveEffect ; Don't calculate damage for moves that don't do any. @@ -4762,297 +4762,297 @@ HandleCounterMove: ; the outcome may be affected by the player's actions in the move selection menu prior to switching the Pokemon. ; This might also lead to desync glitches in link battles. - ld a,[H_WHOSETURN] ; whose turn + ld a, [H_WHOSETURN] ; whose turn and a ; player's turn - ld hl,wEnemySelectedMove - ld de,wEnemyMovePower - ld a,[wPlayerSelectedMove] - jr z,.next + ld hl, wEnemySelectedMove + ld de, wEnemyMovePower + ld a, [wPlayerSelectedMove] + jr z, .next ; enemy's turn - ld hl,wPlayerSelectedMove - ld de,wPlayerMovePower - ld a,[wEnemySelectedMove] + ld hl, wPlayerSelectedMove + ld de, wPlayerMovePower + ld a, [wEnemySelectedMove] .next - cp a,COUNTER + cp COUNTER ret nz ; return if not using Counter - ld a,$01 - ld [wMoveMissed],a ; initialize the move missed variable to true (it is set to false below if the move hits) - ld a,[hl] - cp a,COUNTER + ld a, $01 + ld [wMoveMissed], a ; initialize the move missed variable to true (it is set to false below if the move hits) + ld a, [hl] + cp COUNTER ret z ; miss if the opponent's last selected move is Counter. - ld a,[de] + ld a, [de] and a ret z ; miss if the opponent's last selected move's Base Power is 0. ; check if the move the target last selected was Normal or Fighting type inc de - ld a,[de] + ld a, [de] and a ; normal type - jr z,.counterableType - cp a,FIGHTING - jr z,.counterableType + jr z, .counterableType + cp FIGHTING + jr z, .counterableType ; if the move wasn't Normal or Fighting type, miss xor a ret .counterableType - ld hl,wDamage - ld a,[hli] + ld hl, wDamage + ld a, [hli] or [hl] ret z ; If we made it here, Counter still misses if the last move used in battle did no damage to its target. ; wDamage is shared by both players, so Counter may strike back damage dealt by the Counter user itself ; if the conditions meet, even though 99% of the times damage will come from the target. ; if it did damage, double it - ld a,[hl] + ld a, [hl] add a - ldd [hl],a - ld a,[hl] + ldd [hl], a + ld a, [hl] adc a - ld [hl],a - jr nc,.noCarry + ld [hl], a + jr nc, .noCarry ; damage is capped at 0xFFFF - ld a,$ff - ld [hli],a - ld [hl],a + ld a, $ff + ld [hli], a + ld [hl], a .noCarry xor a - ld [wMoveMissed],a + ld [wMoveMissed], a call MoveHitTest ; do the normal move hit test in addition to Counter's special rules xor a ret ApplyAttackToEnemyPokemon: - ld a,[wPlayerMoveEffect] - cp a,OHKO_EFFECT - jr z,ApplyDamageToEnemyPokemon - cp a,SUPER_FANG_EFFECT - jr z,.superFangEffect - cp a,SPECIAL_DAMAGE_EFFECT - jr z,.specialDamage - ld a,[wPlayerMovePower] - and a - jp z,ApplyAttackToEnemyPokemonDone ; no attack to apply if base power is 0 + ld a, [wPlayerMoveEffect] + cp OHKO_EFFECT + jr z, ApplyDamageToEnemyPokemon + cp SUPER_FANG_EFFECT + jr z, .superFangEffect + cp SPECIAL_DAMAGE_EFFECT + jr z, .specialDamage + ld a, [wPlayerMovePower] + and a + jp z, ApplyAttackToEnemyPokemonDone ; no attack to apply if base power is 0 jr ApplyDamageToEnemyPokemon .superFangEffect ; set the damage to half the target's HP - ld hl,wEnemyMonHP - ld de,wDamage - ld a,[hli] + ld hl, wEnemyMonHP + ld de, wDamage + ld a, [hli] srl a - ld [de],a + ld [de], a inc de - ld b,a - ld a,[hl] + ld b, a + ld a, [hl] rr a - ld [de],a + ld [de], a or b - jr nz,ApplyDamageToEnemyPokemon + jr nz, ApplyDamageToEnemyPokemon ; make sure Super Fang's damage is always at least 1 - ld a,$01 - ld [de],a + ld a, $01 + ld [de], a jr ApplyDamageToEnemyPokemon .specialDamage - ld hl,wBattleMonLevel - ld a,[hl] - ld b,a ; Seismic Toss deals damage equal to the user's level - ld a,[wPlayerMoveNum] - cp a,SEISMIC_TOSS - jr z,.storeDamage - cp a,NIGHT_SHADE - jr z,.storeDamage - ld b,SONICBOOM_DAMAGE ; 20 - cp a,SONICBOOM - jr z,.storeDamage - ld b,DRAGON_RAGE_DAMAGE ; 40 - cp a,DRAGON_RAGE - jr z,.storeDamage + ld hl, wBattleMonLevel + ld a, [hl] + ld b, a ; Seismic Toss deals damage equal to the user's level + ld a, [wPlayerMoveNum] + cp SEISMIC_TOSS + jr z, .storeDamage + cp NIGHT_SHADE + jr z, .storeDamage + ld b, SONICBOOM_DAMAGE ; 20 + cp SONICBOOM + jr z, .storeDamage + ld b, DRAGON_RAGE_DAMAGE ; 40 + cp DRAGON_RAGE + jr z, .storeDamage ; Psywave - ld a,[hl] - ld b,a + ld a, [hl] + ld b, a srl a add b - ld b,a ; b = level * 1.5 + ld b, a ; b = level * 1.5 ; loop until a random number in the range [1, b) is found .loop call BattleRandom and a - jr z,.loop + jr z, .loop cp b - jr nc,.loop - ld b,a + jr nc, .loop + ld b, a .storeDamage ; store damage value at b - ld hl,wDamage + ld hl, wDamage xor a - ld [hli],a - ld a,b - ld [hl],a + ld [hli], a + ld a, b + ld [hl], a ApplyDamageToEnemyPokemon: - ld hl,wDamage - ld a,[hli] - ld b,a - ld a,[hl] + ld hl, wDamage + ld a, [hli] + ld b, a + ld a, [hl] or b - jr z,ApplyAttackToEnemyPokemonDone ; we're done if damage is 0 - ld a,[wEnemyBattleStatus2] - bit HAS_SUBSTITUTE_UP,a ; does the enemy have a substitute? - jp nz,AttackSubstitute + jr z, ApplyAttackToEnemyPokemonDone ; we're done if damage is 0 + ld a, [wEnemyBattleStatus2] + bit HAS_SUBSTITUTE_UP, a ; does the enemy have a substitute? + jp nz, AttackSubstitute ; subtract the damage from the pokemon's current HP ; also, save the current HP at wHPBarOldHP - ld a,[hld] - ld b,a - ld a,[wEnemyMonHP + 1] - ld [wHPBarOldHP],a + ld a, [hld] + ld b, a + ld a, [wEnemyMonHP + 1] + ld [wHPBarOldHP], a sub b - ld [wEnemyMonHP + 1],a - ld a,[hl] - ld b,a - ld a,[wEnemyMonHP] - ld [wHPBarOldHP+1],a + ld [wEnemyMonHP + 1], a + ld a, [hl] + ld b, a + ld a, [wEnemyMonHP] + ld [wHPBarOldHP+1], a sbc b - ld [wEnemyMonHP],a - jr nc,.animateHpBar + ld [wEnemyMonHP], a + jr nc, .animateHpBar ; if more damage was done than the current HP, zero the HP and set the damage (wDamage) ; equal to how much HP the pokemon had before the attack - ld a,[wHPBarOldHP+1] - ld [hli],a - ld a,[wHPBarOldHP] - ld [hl],a - xor a - ld hl,wEnemyMonHP - ld [hli],a - ld [hl],a + ld a, [wHPBarOldHP+1] + ld [hli], a + ld a, [wHPBarOldHP] + ld [hl], a + xor a + ld hl, wEnemyMonHP + ld [hli], a + ld [hl], a .animateHpBar - ld hl,wEnemyMonMaxHP - ld a,[hli] - ld [wHPBarMaxHP+1],a - ld a,[hl] - ld [wHPBarMaxHP],a - ld hl,wEnemyMonHP - ld a,[hli] - ld [wHPBarNewHP+1],a - ld a,[hl] - ld [wHPBarNewHP],a + ld hl, wEnemyMonMaxHP + ld a, [hli] + ld [wHPBarMaxHP+1], a + ld a, [hl] + ld [wHPBarMaxHP], a + ld hl, wEnemyMonHP + ld a, [hli] + ld [wHPBarNewHP+1], a + ld a, [hl] + ld [wHPBarNewHP], a coord hl, 2, 2 xor a - ld [wHPBarType],a + ld [wHPBarType], a predef UpdateHPBar2 ; animate the HP bar shortening ApplyAttackToEnemyPokemonDone: jp DrawHUDsAndHPBars ApplyAttackToPlayerPokemon: - ld a,[wEnemyMoveEffect] - cp a,OHKO_EFFECT - jr z,ApplyDamageToPlayerPokemon - cp a,SUPER_FANG_EFFECT - jr z,.superFangEffect - cp a,SPECIAL_DAMAGE_EFFECT - jr z,.specialDamage - ld a,[wEnemyMovePower] - and a - jp z,ApplyAttackToPlayerPokemonDone + ld a, [wEnemyMoveEffect] + cp OHKO_EFFECT + jr z, ApplyDamageToPlayerPokemon + cp SUPER_FANG_EFFECT + jr z, .superFangEffect + cp SPECIAL_DAMAGE_EFFECT + jr z, .specialDamage + ld a, [wEnemyMovePower] + and a + jp z, ApplyAttackToPlayerPokemonDone jr ApplyDamageToPlayerPokemon .superFangEffect ; set the damage to half the target's HP - ld hl,wBattleMonHP - ld de,wDamage - ld a,[hli] + ld hl, wBattleMonHP + ld de, wDamage + ld a, [hli] srl a - ld [de],a + ld [de], a inc de - ld b,a - ld a,[hl] + ld b, a + ld a, [hl] rr a - ld [de],a + ld [de], a or b - jr nz,ApplyDamageToPlayerPokemon + jr nz, ApplyDamageToPlayerPokemon ; make sure Super Fang's damage is always at least 1 - ld a,$01 - ld [de],a + ld a, $01 + ld [de], a jr ApplyDamageToPlayerPokemon .specialDamage - ld hl,wEnemyMonLevel - ld a,[hl] - ld b,a - ld a,[wEnemyMoveNum] - cp a,SEISMIC_TOSS - jr z,.storeDamage - cp a,NIGHT_SHADE - jr z,.storeDamage - ld b,SONICBOOM_DAMAGE - cp a,SONICBOOM - jr z,.storeDamage - ld b,DRAGON_RAGE_DAMAGE - cp a,DRAGON_RAGE - jr z,.storeDamage + ld hl, wEnemyMonLevel + ld a, [hl] + ld b, a + ld a, [wEnemyMoveNum] + cp SEISMIC_TOSS + jr z, .storeDamage + cp NIGHT_SHADE + jr z, .storeDamage + ld b, SONICBOOM_DAMAGE + cp SONICBOOM + jr z, .storeDamage + ld b, DRAGON_RAGE_DAMAGE + cp DRAGON_RAGE + jr z, .storeDamage ; Psywave - ld a,[hl] - ld b,a + ld a, [hl] + ld b, a srl a add b - ld b,a ; b = attacker's level * 1.5 + ld b, a ; b = attacker's level * 1.5 ; loop until a random number in the range [0, b) is found ; this differs from the range when the player attacks, which is [1, b) ; it's possible for the enemy to do 0 damage with Psywave, but the player always does at least 1 damage .loop call BattleRandom cp b - jr nc,.loop - ld b,a + jr nc, .loop + ld b, a .storeDamage - ld hl,wDamage + ld hl, wDamage xor a - ld [hli],a - ld a,b - ld [hl],a + ld [hli], a + ld a, b + ld [hl], a ApplyDamageToPlayerPokemon: - ld hl,wDamage - ld a,[hli] - ld b,a - ld a,[hl] + ld hl, wDamage + ld a, [hli] + ld b, a + ld a, [hl] or b - jr z,ApplyAttackToPlayerPokemonDone ; we're done if damage is 0 - ld a,[wPlayerBattleStatus2] - bit HAS_SUBSTITUTE_UP,a ; does the player have a substitute? - jp nz,AttackSubstitute + jr z, ApplyAttackToPlayerPokemonDone ; we're done if damage is 0 + ld a, [wPlayerBattleStatus2] + bit HAS_SUBSTITUTE_UP, a ; does the player have a substitute? + jp nz, AttackSubstitute ; subtract the damage from the pokemon's current HP ; also, save the current HP at wHPBarOldHP and the new HP at wHPBarNewHP - ld a,[hld] - ld b,a - ld a,[wBattleMonHP + 1] - ld [wHPBarOldHP],a + ld a, [hld] + ld b, a + ld a, [wBattleMonHP + 1] + ld [wHPBarOldHP], a sub b - ld [wBattleMonHP + 1],a - ld [wHPBarNewHP],a - ld b,[hl] - ld a,[wBattleMonHP] - ld [wHPBarOldHP+1],a + ld [wBattleMonHP + 1], a + ld [wHPBarNewHP], a + ld b, [hl] + ld a, [wBattleMonHP] + ld [wHPBarOldHP+1], a sbc b - ld [wBattleMonHP],a - ld [wHPBarNewHP+1],a - jr nc,.animateHpBar + ld [wBattleMonHP], a + ld [wHPBarNewHP+1], a + jr nc, .animateHpBar ; if more damage was done than the current HP, zero the HP and set the damage (wDamage) ; equal to how much HP the pokemon had before the attack - ld a,[wHPBarOldHP+1] - ld [hli],a - ld a,[wHPBarOldHP] - ld [hl],a - xor a - ld hl,wBattleMonHP - ld [hli],a - ld [hl],a - ld hl,wHPBarNewHP - ld [hli],a - ld [hl],a + ld a, [wHPBarOldHP+1] + ld [hli], a + ld a, [wHPBarOldHP] + ld [hl], a + xor a + ld hl, wBattleMonHP + ld [hli], a + ld [hl], a + ld hl, wHPBarNewHP + ld [hli], a + ld [hl], a .animateHpBar - ld hl,wBattleMonMaxHP - ld a,[hli] - ld [wHPBarMaxHP+1],a - ld a,[hl] - ld [wHPBarMaxHP],a + ld hl, wBattleMonMaxHP + ld a, [hli] + ld [wHPBarMaxHP+1], a + ld a, [hl] + ld [wHPBarMaxHP], a coord hl, 10, 9 - ld a,$01 - ld [wHPBarType],a + ld a, $01 + ld [wHPBarType], a predef UpdateHPBar2 ; animate the HP bar shortening ApplyAttackToPlayerPokemonDone: jp DrawHUDsAndHPBars @@ -5065,51 +5065,51 @@ AttackSubstitute: ; Normal recoil such as from Double-Edge isn't affected by this glitch, ; because this function is never called in that case. - ld hl,SubstituteTookDamageText + ld hl, SubstituteTookDamageText call PrintText ; values for player turn - ld de,wEnemySubstituteHP - ld bc,wEnemyBattleStatus2 - ld a,[H_WHOSETURN] + ld de, wEnemySubstituteHP + ld bc, wEnemyBattleStatus2 + ld a, [H_WHOSETURN] and a - jr z,.applyDamageToSubstitute + jr z, .applyDamageToSubstitute ; values for enemy turn - ld de,wPlayerSubstituteHP - ld bc,wPlayerBattleStatus2 + ld de, wPlayerSubstituteHP + ld bc, wPlayerBattleStatus2 .applyDamageToSubstitute - ld hl,wDamage - ld a,[hli] + ld hl, wDamage + ld a, [hli] and a - jr nz,.substituteBroke ; damage > 0xFF always breaks substitutes + jr nz, .substituteBroke ; damage > 0xFF always breaks substitutes ; subtract damage from HP of substitute - ld a,[de] + ld a, [de] sub [hl] - ld [de],a + ld [de], a ret nc .substituteBroke ; If the target's Substitute breaks, wDamage isn't updated with the amount of HP ; the Substitute had before being attacked. - ld h,b - ld l,c - res HAS_SUBSTITUTE_UP,[hl] ; unset the substitute bit - ld hl,SubstituteBrokeText + ld h, b + ld l, c + res HAS_SUBSTITUTE_UP, [hl] ; unset the substitute bit + ld hl, SubstituteBrokeText call PrintText ; flip whose turn it is for the next function call - ld a,[H_WHOSETURN] - xor a,$01 - ld [H_WHOSETURN],a + ld a, [H_WHOSETURN] + xor $01 + ld [H_WHOSETURN], a callab HideSubstituteShowMonAnim ; animate the substitute breaking ; flip the turn back to the way it was - ld a,[H_WHOSETURN] - xor a,$01 - ld [H_WHOSETURN],a - ld hl,wPlayerMoveEffect ; value for player's turn + ld a, [H_WHOSETURN] + xor $01 + ld [H_WHOSETURN], a + ld hl, wPlayerMoveEffect ; value for player's turn and a - jr z,.nullifyEffect - ld hl,wEnemyMoveEffect ; value for enemy's turn + jr z, .nullifyEffect + ld hl, wEnemyMoveEffect ; value for enemy's turn .nullifyEffect xor a - ld [hl],a ; zero the effect of the attacker's move + ld [hl], a ; zero the effect of the attacker's move jp DrawHUDsAndHPBars SubstituteTookDamageText: @@ -5123,44 +5123,44 @@ SubstituteBrokeText: ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked HandleBuildingRage: ; values for the player turn - ld hl,wEnemyBattleStatus2 - ld de,wEnemyMonStatMods - ld bc,wEnemyMoveNum - ld a,[H_WHOSETURN] + ld hl, wEnemyBattleStatus2 + ld de, wEnemyMonStatMods + ld bc, wEnemyMoveNum + ld a, [H_WHOSETURN] and a - jr z,.next + jr z, .next ; values for the enemy turn - ld hl,wPlayerBattleStatus2 - ld de,wPlayerMonStatMods - ld bc,wPlayerMoveNum + ld hl, wPlayerBattleStatus2 + ld de, wPlayerMonStatMods + ld bc, wPlayerMoveNum .next - bit USING_RAGE,[hl] ; is the pokemon being attacked under the effect of Rage? + bit USING_RAGE, [hl] ; is the pokemon being attacked under the effect of Rage? ret z ; return if not - ld a,[de] - cp a,$0d ; maximum stat modifier value + ld a, [de] + cp $0d ; maximum stat modifier value ret z ; return if attack modifier is already maxed - ld a,[H_WHOSETURN] - xor a,$01 ; flip turn for the stat modifier raising function - ld [H_WHOSETURN],a + ld a, [H_WHOSETURN] + xor $01 ; flip turn for the stat modifier raising function + ld [H_WHOSETURN], a ; temporarily change the target pokemon's move to $00 and the effect to the one ; that causes the attack modifier to go up one stage - ld h,b - ld l,c - ld [hl],$00 ; null move number + ld h, b + ld l, c + ld [hl], $00 ; null move number inc hl - ld [hl],ATTACK_UP1_EFFECT + ld [hl], ATTACK_UP1_EFFECT push hl - ld hl,BuildingRageText + ld hl, BuildingRageText call PrintText call StatModifierUpEffect ; stat modifier raising function pop hl xor a - ldd [hl],a ; null move effect - ld a,RAGE - ld [hl],a ; restore the target pokemon's move number to Rage - ld a,[H_WHOSETURN] - xor a,$01 ; flip turn back to the way it was - ld [H_WHOSETURN],a + ldd [hl], a ; null move effect + ld a, RAGE + ld [hl], a ; restore the target pokemon's move number to Rage + ld a, [H_WHOSETURN] + xor $01 ; flip turn back to the way it was + ld [H_WHOSETURN], a ret BuildingRageText: @@ -5176,25 +5176,25 @@ MirrorMoveCopyMove: ; ccf1 is also set to 0 whenever the player is fast asleep or frozen solid. ; ccf2 is also set to 0 whenever the enemy is fast asleep or frozen solid. - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] and a ; values for player turn - ld a,[wEnemyUsedMove] - ld hl,wPlayerSelectedMove - ld de,wPlayerMoveNum - jr z,.next + ld a, [wEnemyUsedMove] + ld hl, wPlayerSelectedMove + ld de, wPlayerMoveNum + jr z, .next ; values for enemy turn - ld a,[wPlayerUsedMove] - ld de,wEnemyMoveNum - ld hl,wEnemySelectedMove + ld a, [wPlayerUsedMove] + ld de, wEnemyMoveNum + ld hl, wEnemySelectedMove .next - ld [hl],a - cp a,MIRROR_MOVE ; did the target Pokemon last use Mirror Move, and miss? - jr z,.mirrorMoveFailed + ld [hl], a + cp MIRROR_MOVE ; did the target Pokemon last use Mirror Move, and miss? + jr z, .mirrorMoveFailed and a ; has the target selected any move yet? - jr nz,ReloadMoveData + jr nz, ReloadMoveData .mirrorMoveFailed - ld hl,MirrorMoveFailedText + ld hl, MirrorMoveFailedText call PrintText xor a ret @@ -5205,78 +5205,78 @@ MirrorMoveFailedText: ; function used to reload move data for moves like Mirror Move and Metronome ReloadMoveData: - ld [wd11e],a + ld [wd11e], a dec a - ld hl,Moves - ld bc,MoveEnd - Moves + ld hl, Moves + ld bc, MoveEnd - Moves call AddNTimes - ld a,BANK(Moves) + ld a, BANK(Moves) call FarCopyData ; copy the move's stats call IncrementMovePP ; the follow two function calls are used to reload the move name call GetMoveName call CopyStringToCF4B - ld a,$01 + ld a, $01 and a ret ; function that picks a random move for metronome MetronomePickMove: xor a - ld [wAnimationType],a - ld a,METRONOME + ld [wAnimationType], a + ld a, METRONOME call PlayMoveAnimation ; play Metronome's animation ; values for player turn - ld de,wPlayerMoveNum - ld hl,wPlayerSelectedMove - ld a,[H_WHOSETURN] + ld de, wPlayerMoveNum + ld hl, wPlayerSelectedMove + ld a, [H_WHOSETURN] and a - jr z,.pickMoveLoop + jr z, .pickMoveLoop ; values for enemy turn - ld de,wEnemyMoveNum - ld hl,wEnemySelectedMove + ld de, wEnemyMoveNum + ld hl, wEnemySelectedMove ; loop to pick a random number in the range [1, $a5) to be the move used by Metronome .pickMoveLoop call BattleRandom and a - jr z,.pickMoveLoop - cp a,NUM_ATTACKS + 1 ; max normal move number + 1 (this is Struggle's move number) - jr nc,.pickMoveLoop - cp a,METRONOME - jr z,.pickMoveLoop - ld [hl],a + jr z, .pickMoveLoop + cp NUM_ATTACKS + 1 ; max normal move number + 1 (this is Struggle's move number) + jr nc, .pickMoveLoop + cp METRONOME + jr z, .pickMoveLoop + ld [hl], a jr ReloadMoveData ; this function increments the current move's PP ; it's used to prevent moves that run another move within the same turn ; (like Mirror Move and Metronome) from losing 2 PP IncrementMovePP: - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] and a ; values for player turn - ld hl,wBattleMonPP - ld de,wPartyMon1PP - ld a,[wPlayerMoveListIndex] - jr z,.next + ld hl, wBattleMonPP + ld de, wPartyMon1PP + ld a, [wPlayerMoveListIndex] + jr z, .next ; values for enemy turn - ld hl,wEnemyMonPP - ld de,wEnemyMon1PP - ld a,[wEnemyMoveListIndex] + ld hl, wEnemyMonPP + ld de, wEnemyMon1PP + ld a, [wEnemyMoveListIndex] .next - ld b,$00 - ld c,a - add hl,bc + ld b, $00 + ld c, a + add hl, bc inc [hl] ; increment PP in the currently battling pokemon memory location - ld h,d - ld l,e - add hl,bc - ld a,[H_WHOSETURN] - and a - ld a,[wPlayerMonNumber] ; value for player turn - jr z,.updatePP - ld a,[wEnemyMonPartyPos] ; value for enemy turn + ld h, d + ld l, e + add hl, bc + ld a, [H_WHOSETURN] + and a + ld a, [wPlayerMonNumber] ; value for player turn + jr z, .updatePP + ld a, [wEnemyMonPartyPos] ; value for enemy turn .updatePP - ld bc,wEnemyMon2 - wEnemyMon1 + ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes inc [hl] ; increment PP in the party memory location ret @@ -5284,107 +5284,107 @@ IncrementMovePP: ; function to adjust the base damage of an attack to account for type effectiveness AdjustDamageForMoveType: ; values for player turn - ld hl,wBattleMonType - ld a,[hli] - ld b,a ; b = type 1 of attacker - ld c,[hl] ; c = type 2 of attacker - ld hl,wEnemyMonType - ld a,[hli] - ld d,a ; d = type 1 of defender - ld e,[hl] ; e = type 2 of defender - ld a,[wPlayerMoveType] - ld [wMoveType],a - ld a,[H_WHOSETURN] - and a - jr z,.next + ld hl, wBattleMonType + ld a, [hli] + ld b, a ; b = type 1 of attacker + ld c, [hl] ; c = type 2 of attacker + ld hl, wEnemyMonType + ld a, [hli] + ld d, a ; d = type 1 of defender + ld e, [hl] ; e = type 2 of defender + ld a, [wPlayerMoveType] + ld [wMoveType], a + ld a, [H_WHOSETURN] + and a + jr z, .next ; values for enemy turn - ld hl,wEnemyMonType - ld a,[hli] - ld b,a ; b = type 1 of attacker - ld c,[hl] ; c = type 2 of attacker - ld hl,wBattleMonType - ld a,[hli] - ld d,a ; d = type 1 of defender - ld e,[hl] ; e = type 2 of defender - ld a,[wEnemyMoveType] - ld [wMoveType],a + ld hl, wEnemyMonType + ld a, [hli] + ld b, a ; b = type 1 of attacker + ld c, [hl] ; c = type 2 of attacker + ld hl, wBattleMonType + ld a, [hli] + ld d, a ; d = type 1 of defender + ld e, [hl] ; e = type 2 of defender + ld a, [wEnemyMoveType] + ld [wMoveType], a .next - ld a,[wMoveType] + ld a, [wMoveType] cp b ; does the move type match type 1 of the attacker? - jr z,.sameTypeAttackBonus + jr z, .sameTypeAttackBonus cp c ; does the move type match type 2 of the attacker? - jr z,.sameTypeAttackBonus + jr z, .sameTypeAttackBonus jr .skipSameTypeAttackBonus .sameTypeAttackBonus ; if the move type matches one of the attacker's types - ld hl,wDamage + 1 - ld a,[hld] - ld h,[hl] - ld l,a ; hl = damage - ld b,h - ld c,l ; bc = damage + ld hl, wDamage + 1 + ld a, [hld] + ld h, [hl] + ld l, a ; hl = damage + ld b, h + ld c, l ; bc = damage srl b rr c ; bc = floor(0.5 * damage) - add hl,bc ; hl = floor(1.5 * damage) + add hl, bc ; hl = floor(1.5 * damage) ; store damage - ld a,h - ld [wDamage],a - ld a,l - ld [wDamage + 1],a - ld hl,wDamageMultipliers - set 7,[hl] + ld a, h + ld [wDamage], a + ld a, l + ld [wDamage + 1], a + ld hl, wDamageMultipliers + set 7, [hl] .skipSameTypeAttackBonus - ld a,[wMoveType] - ld b,a - ld hl,TypeEffects + ld a, [wMoveType] + ld b, a + ld hl, TypeEffects .loop - ld a,[hli] ; a = "attacking type" of the current type pair - cp a,$ff - jr z,.done + ld a, [hli] ; a = "attacking type" of the current type pair + cp $ff + jr z, .done cp b ; does move type match "attacking type"? - jr nz,.nextTypePair - ld a,[hl] ; a = "defending type" of the current type pair + jr nz, .nextTypePair + ld a, [hl] ; a = "defending type" of the current type pair cp d ; does type 1 of defender match "defending type"? - jr z,.matchingPairFound + jr z, .matchingPairFound cp e ; does type 2 of defender match "defending type"? - jr z,.matchingPairFound + jr z, .matchingPairFound jr .nextTypePair .matchingPairFound ; if the move type matches the "attacking type" and one of the defender's types matches the "defending type" push hl push bc inc hl - ld a,[wDamageMultipliers] - and a,$80 - ld b,a - ld a,[hl] ; a = damage multiplier - ld [H_MULTIPLIER],a + ld a, [wDamageMultipliers] + and $80 + ld b, a + ld a, [hl] ; a = damage multiplier + ld [H_MULTIPLIER], a add b - ld [wDamageMultipliers],a - xor a - ld [H_MULTIPLICAND],a - ld hl,wDamage - ld a,[hli] - ld [H_MULTIPLICAND + 1],a - ld a,[hld] - ld [H_MULTIPLICAND + 2],a + ld [wDamageMultipliers], a + xor a + ld [H_MULTIPLICAND], a + ld hl, wDamage + ld a, [hli] + ld [H_MULTIPLICAND + 1], a + ld a, [hld] + ld [H_MULTIPLICAND + 2], a call Multiply - ld a,10 - ld [H_DIVISOR],a - ld b,$04 + ld a, 10 + ld [H_DIVISOR], a + ld b, $04 call Divide - ld a,[H_QUOTIENT + 2] - ld [hli],a - ld b,a - ld a,[H_QUOTIENT + 3] - ld [hl],a + ld a, [H_QUOTIENT + 2] + ld [hli], a + ld b, a + ld a, [H_QUOTIENT + 3] + ld [hl], a or b ; is damage 0? - jr nz,.skipTypeImmunity + jr nz, .skipTypeImmunity .typeImmunity ; if damage is 0, make the move miss ; this only occurs if a move that would do 2 or 3 damage is 0.25x effective against the target inc a - ld [wMoveMissed],a + ld [wMoveMissed], a .skipTypeImmunity pop bc pop hl @@ -5402,26 +5402,26 @@ AdjustDamageForMoveType: ; ($05 is not very effective, $10 is neutral, $14 is super effective) ; as far is can tell, this is only used once in some AI code to help decide which move to use AIGetTypeEffectiveness: - ld a,[wEnemyMoveType] - ld d,a ; d = type of enemy move - ld hl,wBattleMonType - ld b,[hl] ; b = type 1 of player's pokemon + ld a, [wEnemyMoveType] + ld d, a ; d = type of enemy move + ld hl, wBattleMonType + ld b, [hl] ; b = type 1 of player's pokemon inc hl - ld c,[hl] ; c = type 2 of player's pokemon - ld a,$10 - ld [wTypeEffectiveness],a ; initialize to neutral effectiveness - ld hl,TypeEffects + ld c, [hl] ; c = type 2 of player's pokemon + ld a, $10 + ld [wTypeEffectiveness], a ; initialize to neutral effectiveness + ld hl, TypeEffects .loop - ld a,[hli] - cp a,$ff + ld a, [hli] + cp $ff ret z cp d ; match the type of the move - jr nz,.nextTypePair1 - ld a,[hli] + jr nz, .nextTypePair1 + ld a, [hli] cp b ; match with type 1 of pokemon - jr z,.done + jr z, .done cp c ; or match with type 2 of pokemon - jr z,.done + jr z, .done jr .nextTypePair2 .nextTypePair1 inc hl @@ -5429,8 +5429,8 @@ AIGetTypeEffectiveness: inc hl jr .loop .done - ld a,[hl] - ld [wTypeEffectiveness],a ; store damage multiplier + ld a, [hl] + ld [wTypeEffectiveness], a ; store damage multiplier ret INCLUDE "data/type_effects.asm" @@ -5438,52 +5438,52 @@ INCLUDE "data/type_effects.asm" ; some tests that need to pass for a move to hit MoveHitTest: ; player's turn - ld hl,wEnemyBattleStatus1 - ld de,wPlayerMoveEffect - ld bc,wEnemyMonStatus - ld a,[H_WHOSETURN] + ld hl, wEnemyBattleStatus1 + ld de, wPlayerMoveEffect + ld bc, wEnemyMonStatus + ld a, [H_WHOSETURN] and a - jr z,.dreamEaterCheck + jr z, .dreamEaterCheck ; enemy's turn - ld hl,wPlayerBattleStatus1 - ld de,wEnemyMoveEffect - ld bc,wBattleMonStatus + ld hl, wPlayerBattleStatus1 + ld de, wEnemyMoveEffect + ld bc, wBattleMonStatus .dreamEaterCheck - ld a,[de] - cp a,DREAM_EATER_EFFECT - jr nz,.swiftCheck - ld a,[bc] - and a,SLP ; is the target pokemon sleeping? - jp z,.moveMissed + ld a, [de] + cp DREAM_EATER_EFFECT + jr nz, .swiftCheck + ld a, [bc] + and SLP ; is the target pokemon sleeping? + jp z, .moveMissed .swiftCheck - ld a,[de] - cp a,SWIFT_EFFECT + ld a, [de] + cp SWIFT_EFFECT ret z ; Swift never misses (interestingly, Azure Heights lists this is a myth, but it appears to be true) call CheckTargetSubstitute ; substitute check (note that this overwrites a) - jr z,.checkForDigOrFlyStatus + jr z, .checkForDigOrFlyStatus ; this code is buggy. it's supposed to prevent HP draining moves from working on substitutes. ; since $7b79 overwrites a with either $00 or $01, it never works. - cp a,DRAIN_HP_EFFECT - jp z,.moveMissed - cp a,DREAM_EATER_EFFECT - jp z,.moveMissed + cp DRAIN_HP_EFFECT + jp z, .moveMissed + cp DREAM_EATER_EFFECT + jp z, .moveMissed .checkForDigOrFlyStatus - bit INVULNERABLE,[hl] - jp nz,.moveMissed - ld a,[H_WHOSETURN] + bit INVULNERABLE, [hl] + jp nz, .moveMissed + ld a, [H_WHOSETURN] and a - jr nz,.enemyTurn + jr nz, .enemyTurn .playerTurn ; this checks if the move effect is disallowed by mist - ld a,[wPlayerMoveEffect] - cp a,ATTACK_DOWN1_EFFECT - jr c,.skipEnemyMistCheck - cp a,HAZE_EFFECT + 1 - jr c,.enemyMistCheck - cp a,ATTACK_DOWN2_EFFECT - jr c,.skipEnemyMistCheck - cp a,REFLECT_EFFECT + 1 - jr c,.enemyMistCheck + ld a, [wPlayerMoveEffect] + cp ATTACK_DOWN1_EFFECT + jr c, .skipEnemyMistCheck + cp HAZE_EFFECT + 1 + jr c, .enemyMistCheck + cp ATTACK_DOWN2_EFFECT + jr c, .skipEnemyMistCheck + cp REFLECT_EFFECT + 1 + jr c, .enemyMistCheck jr .skipEnemyMistCheck .enemyMistCheck ; if move effect is from $12 to $19 inclusive or $3a to $41 inclusive @@ -5492,98 +5492,98 @@ MoveHitTest: ; FLASH, CONVERSION*, HAZE*, SCREECH, LIGHT SCREEN*, REFLECT* ; the moves that are marked with an asterisk are not affected since this ; function is not called when those moves are used - ld a,[wEnemyBattleStatus2] - bit PROTECTED_BY_MIST,a ; is mon protected by mist? - jp nz,.moveMissed + ld a, [wEnemyBattleStatus2] + bit PROTECTED_BY_MIST, a ; is mon protected by mist? + jp nz, .moveMissed .skipEnemyMistCheck - ld a,[wPlayerBattleStatus2] - bit USING_X_ACCURACY,a ; is the player using X Accuracy? + ld a, [wPlayerBattleStatus2] + bit USING_X_ACCURACY, a ; is the player using X Accuracy? ret nz ; if so, always hit regardless of accuracy/evasion jr .calcHitChance .enemyTurn - ld a,[wEnemyMoveEffect] - cp a,ATTACK_DOWN1_EFFECT - jr c,.skipPlayerMistCheck - cp a,HAZE_EFFECT + 1 - jr c,.playerMistCheck - cp a,ATTACK_DOWN2_EFFECT - jr c,.skipPlayerMistCheck - cp a,REFLECT_EFFECT + 1 - jr c,.playerMistCheck + ld a, [wEnemyMoveEffect] + cp ATTACK_DOWN1_EFFECT + jr c, .skipPlayerMistCheck + cp HAZE_EFFECT + 1 + jr c, .playerMistCheck + cp ATTACK_DOWN2_EFFECT + jr c, .skipPlayerMistCheck + cp REFLECT_EFFECT + 1 + jr c, .playerMistCheck jr .skipPlayerMistCheck .playerMistCheck ; similar to enemy mist check - ld a,[wPlayerBattleStatus2] - bit PROTECTED_BY_MIST,a ; is mon protected by mist? - jp nz,.moveMissed + ld a, [wPlayerBattleStatus2] + bit PROTECTED_BY_MIST, a ; is mon protected by mist? + jp nz, .moveMissed .skipPlayerMistCheck - ld a,[wEnemyBattleStatus2] - bit USING_X_ACCURACY,a ; is the enemy using X Accuracy? + ld a, [wEnemyBattleStatus2] + bit USING_X_ACCURACY, a ; is the enemy using X Accuracy? ret nz ; if so, always hit regardless of accuracy/evasion .calcHitChance call CalcHitChance ; scale the move accuracy according to attacker's accuracy and target's evasion - ld a,[wPlayerMoveAccuracy] - ld b,a - ld a,[H_WHOSETURN] + ld a, [wPlayerMoveAccuracy] + ld b, a + ld a, [H_WHOSETURN] and a - jr z,.doAccuracyCheck - ld a,[wEnemyMoveAccuracy] - ld b,a + jr z, .doAccuracyCheck + ld a, [wEnemyMoveAccuracy] + ld b, a .doAccuracyCheck ; if the random number generated is greater than or equal to the scaled accuracy, the move misses ; note that this means that even the highest accuracy is still just a 255/256 chance, not 100% call BattleRandom cp b - jr nc,.moveMissed + jr nc, .moveMissed ret .moveMissed xor a - ld hl,wDamage ; zero the damage - ld [hli],a - ld [hl],a + ld hl, wDamage ; zero the damage + ld [hli], a + ld [hl], a inc a - ld [wMoveMissed],a - ld a,[H_WHOSETURN] + ld [wMoveMissed], a + ld a, [H_WHOSETURN] and a - jr z,.playerTurn2 + jr z, .playerTurn2 .enemyTurn2 - ld hl,wEnemyBattleStatus1 - res USING_TRAPPING_MOVE,[hl] ; end multi-turn attack e.g. wrap + ld hl, wEnemyBattleStatus1 + res USING_TRAPPING_MOVE, [hl] ; end multi-turn attack e.g. wrap ret .playerTurn2 - ld hl,wPlayerBattleStatus1 - res USING_TRAPPING_MOVE,[hl] ; end multi-turn attack e.g. wrap + ld hl, wPlayerBattleStatus1 + res USING_TRAPPING_MOVE, [hl] ; end multi-turn attack e.g. wrap ret ; values for player turn CalcHitChance: - ld hl,wPlayerMoveAccuracy - ld a,[H_WHOSETURN] - and a - ld a,[wPlayerMonAccuracyMod] - ld b,a - ld a,[wEnemyMonEvasionMod] - ld c,a - jr z,.next + ld hl, wPlayerMoveAccuracy + ld a, [H_WHOSETURN] + and a + ld a, [wPlayerMonAccuracyMod] + ld b, a + ld a, [wEnemyMonEvasionMod] + ld c, a + jr z, .next ; values for enemy turn - ld hl,wEnemyMoveAccuracy - ld a,[wEnemyMonAccuracyMod] - ld b,a - ld a,[wPlayerMonEvasionMod] - ld c,a + ld hl, wEnemyMoveAccuracy + ld a, [wEnemyMonAccuracyMod] + ld b, a + ld a, [wPlayerMonEvasionMod] + ld c, a .next - ld a,$0e + ld a, $0e sub c - ld c,a ; c = 14 - EVASIONMOD (this "reflects" the value over 7, so that an increase in the target's evasion + ld c, a ; c = 14 - EVASIONMOD (this "reflects" the value over 7, so that an increase in the target's evasion ; decreases the hit chance instead of increasing the hit chance) ; zero the high bytes of the multiplicand xor a - ld [H_MULTIPLICAND],a - ld [H_MULTIPLICAND + 1],a - ld a,[hl] - ld [H_MULTIPLICAND + 2],a ; set multiplicand to move accuracy + ld [H_MULTIPLICAND], a + ld [H_MULTIPLICAND + 1], a + ld a, [hl] + ld [H_MULTIPLICAND + 2], a ; set multiplicand to move accuracy push hl - ld d,$02 ; loop has two iterations + ld d, $02 ; loop has two iterations ; loop to do the calculations, the first iteration multiplies by the accuracy ratio and ; the second iteration multiplies by the evasion ratio .loop @@ -5591,40 +5591,40 @@ CalcHitChance: ld hl, StatModifierRatios ; stat modifier ratios dec b sla b - ld c,b - ld b,$00 - add hl,bc ; hl = address of stat modifier ratio + ld c, b + ld b, $00 + add hl, bc ; hl = address of stat modifier ratio pop bc - ld a,[hli] - ld [H_MULTIPLIER],a ; set multiplier to the numerator of the ratio + ld a, [hli] + ld [H_MULTIPLIER], a ; set multiplier to the numerator of the ratio call Multiply - ld a,[hl] - ld [H_DIVISOR],a ; set divisor to the the denominator of the ratio + ld a, [hl] + ld [H_DIVISOR], a ; set divisor to the the denominator of the ratio ; (the dividend is the product of the previous multiplication) - ld b,$04 ; number of bytes in the dividend + ld b, $04 ; number of bytes in the dividend call Divide - ld a,[H_QUOTIENT + 3] - ld b,a - ld a,[H_QUOTIENT + 2] + ld a, [H_QUOTIENT + 3] + ld b, a + ld a, [H_QUOTIENT + 2] or b - jp nz,.nextCalculation + jp nz, .nextCalculation ; make sure the result is always at least one - ld [H_QUOTIENT + 2],a - ld a,$01 - ld [H_QUOTIENT + 3],a + ld [H_QUOTIENT + 2], a + ld a, $01 + ld [H_QUOTIENT + 3], a .nextCalculation - ld b,c + ld b, c dec d - jr nz,.loop - ld a,[H_QUOTIENT + 2] + jr nz, .loop + ld a, [H_QUOTIENT + 2] and a ; is the calculated hit chance over 0xFF? - ld a,[H_QUOTIENT + 3] - jr z,.storeAccuracy + ld a, [H_QUOTIENT + 3] + jr z, .storeAccuracy ; if calculated hit chance over 0xFF - ld a,$ff ; set the hit chance to 0xFF + ld a, $ff ; set the hit chance to 0xFF .storeAccuracy pop hl - ld [hl],a ; store the hit chance in the move accuracy variable + ld [hl], a ; store the hit chance in the move accuracy variable ret ; multiplies damage by a random percentage from ~85% to 100% @@ -5805,7 +5805,7 @@ EnemyCheckIfFlyOrChargeEffect: .playAnim xor a ld [wAnimationType], a - ld a,STATUS_AFFECTED_ANIM + ld a, STATUS_AFFECTED_ANIM call PlayMoveAnimation EnemyCheckIfMirrorMoveEffect: ld a, [wEnemyMoveEffect] @@ -5897,7 +5897,7 @@ CheckEnemyStatusConditions: call PrintText xor a ld [wAnimationType], a - ld a,SLP_ANIM + ld a, SLP_ANIM call PlayMoveAnimation jr .sleepDone .wokeUp @@ -5973,7 +5973,7 @@ CheckEnemyStatusConditions: call PrintText xor a ld [wAnimationType], a - ld a,CONF_ANIM + ld a, CONF_ANIM call PlayMoveAnimation call BattleRandom cp $80 @@ -6830,7 +6830,7 @@ HandleExplodingAnimation: ld [wAnimationType], a PlayMoveAnimation: - ld [wAnimationID],a + ld [wAnimationID], a call Delay3 predef_jump MoveAnimation @@ -7417,11 +7417,11 @@ FreezeBurnParalyzeEffect: cp b ; do target type 2 and move type match? ret z ; return if they match ld a, [wPlayerMoveEffect] - cp a, PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those + cp PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr c, .next1 ; branch ahead if this is a 10% chance effect.. ld b, $4d ; else use 0x4D/0x100 or 77/256 = 30.1%~ chance - sub a, $1e ; subtract $1E to map to equivalent 10% chance effects + sub $1e ; subtract $1E to map to equivalent 10% chance effects .next1 push af call BattleRandom ; get random 8bit value for probability test @@ -7429,9 +7429,9 @@ FreezeBurnParalyzeEffect: pop bc ret nc ; do nothing if random value is >= 1A or 4D [no status applied] ld a, b ; what type of effect is this? - cp a, BURN_SIDE_EFFECT1 + cp BURN_SIDE_EFFECT1 jr z, .burn - cp a, FREEZE_SIDE_EFFECT + cp FREEZE_SIDE_EFFECT jr z, .freeze ; .paralyze ld a, 1 << PAR @@ -7469,11 +7469,11 @@ opponentAttacker: cp b ret z ld a, [wEnemyMoveEffect] - cp a, PARALYZE_SIDE_EFFECT1 + 1 + cp PARALYZE_SIDE_EFFECT1 + 1 ld b, $1a jr c, .next1 ld b, $4d - sub a, $1e + sub $1e .next1 push af call BattleRandom @@ -7481,9 +7481,9 @@ opponentAttacker: pop bc ret nc ld a, b - cp a, BURN_SIDE_EFFECT1 + cp BURN_SIDE_EFFECT1 jr z, .burn - cp a, FREEZE_SIDE_EFFECT + cp FREEZE_SIDE_EFFECT jr z, .freeze ld a, 1 << PAR ld [wBattleMonStatus], a @@ -7512,14 +7512,14 @@ FrozenText: CheckDefrost: ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target - and a, 1 << FRZ ; are they frozen? + and 1 << FRZ ; are they frozen? ret z ; return if so ld a, [H_WHOSETURN] and a jr nz, .opponent ;player [attacker] ld a, [wPlayerMoveType] - sub a, FIRE + sub FIRE ret nz ; return if type of move used isn't fire ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] ld hl, wEnemyMon1Status @@ -7532,7 +7532,7 @@ CheckDefrost: jr .common .opponent ld a, [wEnemyMoveType] ; same as above with addresses swapped - sub a, FIRE + sub FIRE ret nz ld [wBattleMonStatus], a ld hl, wPartyMon1Status diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index 39cd0809..b7c428f7 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -1,13 +1,13 @@ DecrementPP: ; after using a move, decrement pp in battle and (if not transformed?) in party ld a, [de] - cp a, STRUGGLE + cp STRUGGLE ret z ; if the pokemon is using "struggle", there's nothing to do ; we don't decrement PP for "struggle" ld hl, wPlayerBattleStatus1 ld a, [hli] ; load the wPlayerBattleStatus1 pokemon status flags and increment hl to load the ; wPlayerBattleStatus2 status flags later - and a, (1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << ATTACKING_MULTIPLE_TIMES) + and (1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << ATTACKING_MULTIPLE_TIMES) ret nz ; if any of these statuses are true, don't decrement PP bit USING_RAGE, [hl] ret nz ; don't decrement PP either if Pokemon is using Rage diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm index 85f2bc3e..1bf14460 100644 --- a/engine/battle/display_effectiveness.asm +++ b/engine/battle/display_effectiveness.asm @@ -1,7 +1,7 @@ DisplayEffectiveness: ld a, [wDamageMultipliers] - and a, $7F - cp a, $0A + and $7F + cp $0A ret z ld hl, SuperEffectiveText jr nc, .done diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 3672d8dc..ba00083b 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -1,43 +1,43 @@ ReadTrainer: ; don't change any moves in a link battle - ld a,[wLinkState] + ld a, [wLinkState] and a ret nz ; set [wEnemyPartyCount] to 0, [wEnemyPartyMons] to FF ; XXX first is total enemy pokemon? ; XXX second is species of first pokemon? - ld hl,wEnemyPartyCount + ld hl, wEnemyPartyCount xor a - ld [hli],a + ld [hli], a dec a - ld [hl],a + ld [hl], a ; get the pointer to trainer data for this class - ld a,[wCurOpponent] + ld a, [wCurOpponent] sub $C9 ; convert value from pokemon to trainer - add a,a - ld hl,TrainerDataPointers - ld c,a - ld b,0 - add hl,bc ; hl points to trainer class - ld a,[hli] - ld h,[hl] - ld l,a - ld a,[wTrainerNo] - ld b,a + add a + ld hl, TrainerDataPointers + ld c, a + ld b, 0 + add hl, bc ; hl points to trainer class + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wTrainerNo] + ld b, a ; At this point b contains the trainer number, ; and hl points to the trainer class. ; Our next task is to iterate through the trainers, ; decrementing b each time, until we get to the right one. .outer dec b - jr z,.IterateTrainer + jr z, .IterateTrainer .inner - ld a,[hli] + ld a, [hli] and a - jr nz,.inner + jr nz, .inner jr .outer ; if the first byte of trainer data is FF, @@ -46,17 +46,17 @@ ReadTrainer: ; - if [wLoneAttackNo] != 0, one pokemon on the team has a special move ; else the first byte is the level of every pokemon on the team .IterateTrainer - ld a,[hli] + ld a, [hli] cp $FF ; is the trainer special? - jr z,.SpecialTrainer ; if so, check for special moves - ld [wCurEnemyLVL],a + jr z, .SpecialTrainer ; if so, check for special moves + ld [wCurEnemyLVL], a .LoopTrainerData - ld a,[hli] + ld a, [hli] and a ; have we reached the end of the trainer data? - jr z,.FinishUp - ld [wcf91],a ; write species somewhere (XXX why?) - ld a,ENEMY_PARTY_DATA - ld [wMonDataLocation],a + jr z, .FinishUp + ld [wcf91], a ; write species somewhere (XXX why?) + ld a, ENEMY_PARTY_DATA + ld [wMonDataLocation], a push hl call AddPartyMon pop hl @@ -66,101 +66,101 @@ ReadTrainer: ; - each pokemon has a specific level ; (as opposed to the whole team being of the same level) ; - if [wLoneAttackNo] != 0, one pokemon on the team has a special move - ld a,[hli] + ld a, [hli] and a ; have we reached the end of the trainer data? - jr z,.AddLoneMove - ld [wCurEnemyLVL],a - ld a,[hli] - ld [wcf91],a - ld a,ENEMY_PARTY_DATA - ld [wMonDataLocation],a + jr z, .AddLoneMove + ld [wCurEnemyLVL], a + ld a, [hli] + ld [wcf91], a + ld a, ENEMY_PARTY_DATA + ld [wMonDataLocation], a push hl call AddPartyMon pop hl jr .SpecialTrainer .AddLoneMove ; does the trainer have a single monster with a different move - ld a,[wLoneAttackNo] ; Brock is 01, Misty is 02, Erika is 04, etc + ld a, [wLoneAttackNo] ; Brock is 01, Misty is 02, Erika is 04, etc and a - jr z,.AddTeamMove + jr z, .AddTeamMove dec a - add a,a - ld c,a - ld b,0 - ld hl,LoneMoves - add hl,bc - ld a,[hli] - ld d,[hl] - ld hl,wEnemyMon1Moves + 2 - ld bc,wEnemyMon2 - wEnemyMon1 + add a + ld c, a + ld b, 0 + ld hl, LoneMoves + add hl, bc + ld a, [hli] + ld d, [hl] + ld hl, wEnemyMon1Moves + 2 + ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes - ld [hl],d + ld [hl], d jr .FinishUp .AddTeamMove ; check if our trainer's team has special moves ; get trainer class number - ld a,[wCurOpponent] + ld a, [wCurOpponent] sub 200 - ld b,a - ld hl,TeamMoves + ld b, a + ld hl, TeamMoves ; iterate through entries in TeamMoves, checking each for our trainer class .IterateTeamMoves - ld a,[hli] + ld a, [hli] cp b - jr z,.GiveTeamMoves ; is there a match? + jr z, .GiveTeamMoves ; is there a match? inc hl ; if not, go to the next entry inc a - jr nz,.IterateTeamMoves + jr nz, .IterateTeamMoves ; no matches found. is this trainer champion rival? - ld a,b + ld a, b cp SONY3 - jr z,.ChampionRival + jr z, .ChampionRival jr .FinishUp ; nope .GiveTeamMoves - ld a,[hl] - ld [wEnemyMon5Moves + 2],a + ld a, [hl] + ld [wEnemyMon5Moves + 2], a jr .FinishUp .ChampionRival ; give moves to his team ; pidgeot - ld a,SKY_ATTACK - ld [wEnemyMon1Moves + 2],a + ld a, SKY_ATTACK + ld [wEnemyMon1Moves + 2], a ; starter - ld a,[wRivalStarter] + ld a, [wRivalStarter] cp STARTER3 - ld b,MEGA_DRAIN - jr z,.GiveStarterMove + ld b, MEGA_DRAIN + jr z, .GiveStarterMove cp STARTER1 - ld b,FIRE_BLAST - jr z,.GiveStarterMove - ld b,BLIZZARD ; must be squirtle + ld b, FIRE_BLAST + jr z, .GiveStarterMove + ld b, BLIZZARD ; must be squirtle .GiveStarterMove - ld a,b - ld [wEnemyMon6Moves + 2],a + ld a, b + ld [wEnemyMon6Moves + 2], a .FinishUp ; clear wAmountMoneyWon addresses xor a - ld de,wAmountMoneyWon - ld [de],a + ld de, wAmountMoneyWon + ld [de], a inc de - ld [de],a + ld [de], a inc de - ld [de],a - ld a,[wCurEnemyLVL] - ld b,a + ld [de], a + ld a, [wCurEnemyLVL] + ld b, a .LastLoop ; update wAmountMoneyWon addresses (money to win) based on enemy's level - ld hl,wTrainerBaseMoney + 1 - ld c,2 ; wAmountMoneyWon is a 3-byte number + ld hl, wTrainerBaseMoney + 1 + ld c, 2 ; wAmountMoneyWon is a 3-byte number push bc predef AddBCDPredef pop bc inc de inc de dec b - jr nz,.LastLoop ; repeat wCurEnemyLVL times + jr nz, .LastLoop ; repeat wCurEnemyLVL times ret diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index 7e2c911c..49d0429f 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -1,21 +1,21 @@ SaveTrainerName: - ld hl,TrainerNamePointers - ld a,[wTrainerClass] + ld hl, TrainerNamePointers + ld a, [wTrainerClass] dec a - ld c,a - ld b,0 - add hl,bc - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a - ld de,wcd6d + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wcd6d .CopyCharacter - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de cp "@" - jr nz,.CopyCharacter + jr nz, .CopyCharacter ret TrainerNamePointers: diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index fff064fa..6f699b9c 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -263,10 +263,10 @@ ReadMove: push de push bc dec a - ld hl,Moves - ld bc,MoveEnd - Moves + ld hl, Moves + ld bc, MoveEnd - Moves call AddNTimes - ld de,wEnemyMoveNum + ld de, wEnemyMoveNum call CopyData pop bc pop de @@ -338,33 +338,33 @@ INCLUDE "data/trainer_parties.asm" TrainerAI: and a - ld a,[wIsInBattle] + ld a, [wIsInBattle] dec a ret z ; if not a trainer, we're done here - ld a,[wLinkState] + ld a, [wLinkState] cp LINK_STATE_BATTLING ret z - ld a,[wTrainerClass] ; what trainer class is this? + ld a, [wTrainerClass] ; what trainer class is this? dec a - ld c,a - ld b,0 - ld hl,TrainerAIPointers - add hl,bc - add hl,bc - add hl,bc - ld a,[wAICount] + ld c, a + ld b, 0 + ld hl, TrainerAIPointers + add hl, bc + add hl, bc + add hl, bc + ld a, [wAICount] and a ret z ; if no AI uses left, we're done here inc hl inc a - jr nz,.getpointer + jr nz, .getpointer dec hl - ld a,[hli] - ld [wAICount],a + ld a, [hli] + ld [wAICount], a .getpointer - ld a,[hli] - ld h,[hl] - ld l,a + ld a, [hli] + ld h, [hl] + ld l, a call Random jp hl @@ -442,17 +442,17 @@ CooltrainerMAI: CooltrainerFAI: cp $40 - ld a,$A + ld a, $A call AICheckIfHPBelowFraction - jp c,AIUseHyperPotion - ld a,5 + jp c, AIUseHyperPotion + ld a, 5 call AICheckIfHPBelowFraction ret nc jp AISwitchIfEnoughMons BrockAI: ; if his active monster has a status condition, use a full heal - ld a,[wEnemyMonStatus] + ld a, [wEnemyMonStatus] and a ret z jp AIUseFullHeal @@ -470,7 +470,7 @@ LtSurgeAI: ErikaAI: cp $80 ret nc - ld a,$A + ld a, $A call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion @@ -488,7 +488,7 @@ BlaineAI: SabrinaAI: cp $40 ret nc - ld a,$A + ld a, $A call AICheckIfHPBelowFraction ret nc jp AIUseHyperPotion @@ -496,7 +496,7 @@ SabrinaAI: Sony2AI: cp $20 ret nc - ld a,5 + ld a, 5 call AICheckIfHPBelowFraction ret nc jp AIUsePotion @@ -504,7 +504,7 @@ Sony2AI: Sony3AI: cp $20 ret nc - ld a,5 + ld a, 5 call AICheckIfHPBelowFraction ret nc jp AIUseFullRestore @@ -512,7 +512,7 @@ Sony3AI: LoreleiAI: cp $80 ret nc - ld a,5 + ld a, 5 call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion @@ -524,10 +524,10 @@ BrunoAI: AgathaAI: cp $14 - jp c,AISwitchIfEnoughMons + jp c, AISwitchIfEnoughMons cp $80 ret nc - ld a,4 + ld a, 4 call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion @@ -535,7 +535,7 @@ AgathaAI: LanceAI: cp $80 ret nc - ld a,5 + ld a, 5 call AICheckIfHPBelowFraction ret nc jp AIUseHyperPotion @@ -547,133 +547,133 @@ GenericAI: ; end of individual trainer AI routines DecrementAICount: - ld hl,wAICount + ld hl, wAICount dec [hl] scf ret AIPlayRestoringSFX: - ld a,SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT jp PlaySoundWaitForCurrent AIUseFullRestore: call AICureStatus - ld a,FULL_RESTORE - ld [wAIItem],a - ld de,wHPBarOldHP - ld hl,wEnemyMonHP + 1 - ld a,[hld] - ld [de],a + ld a, FULL_RESTORE + ld [wAIItem], a + ld de, wHPBarOldHP + ld hl, wEnemyMonHP + 1 + ld a, [hld] + ld [de], a inc de - ld a,[hl] - ld [de],a + ld a, [hl] + ld [de], a inc de - ld hl,wEnemyMonMaxHP + 1 - ld a,[hld] - ld [de],a + ld hl, wEnemyMonMaxHP + 1 + ld a, [hld] + ld [de], a inc de - ld [wHPBarMaxHP],a - ld [wEnemyMonHP + 1],a - ld a,[hl] - ld [de],a - ld [wHPBarMaxHP+1],a - ld [wEnemyMonHP],a + ld [wHPBarMaxHP], a + ld [wEnemyMonHP + 1], a + ld a, [hl] + ld [de], a + ld [wHPBarMaxHP+1], a + ld [wEnemyMonHP], a jr AIPrintItemUseAndUpdateHPBar AIUsePotion: ; enemy trainer heals his monster with a potion - ld a,POTION - ld b,20 + ld a, POTION + ld b, 20 jr AIRecoverHP AIUseSuperPotion: ; enemy trainer heals his monster with a super potion - ld a,SUPER_POTION - ld b,50 + ld a, SUPER_POTION + ld b, 50 jr AIRecoverHP AIUseHyperPotion: ; enemy trainer heals his monster with a hyper potion - ld a,HYPER_POTION - ld b,200 + ld a, HYPER_POTION + ld b, 200 ; fallthrough AIRecoverHP: ; heal b HP and print "trainer used $(a) on pokemon!" - ld [wAIItem],a - ld hl,wEnemyMonHP + 1 - ld a,[hl] - ld [wHPBarOldHP],a + ld [wAIItem], a + ld hl, wEnemyMonHP + 1 + ld a, [hl] + ld [wHPBarOldHP], a add b - ld [hld],a - ld [wHPBarNewHP],a - ld a,[hl] - ld [wHPBarOldHP+1],a - ld [wHPBarNewHP+1],a - jr nc,.next + ld [hld], a + ld [wHPBarNewHP], a + ld a, [hl] + ld [wHPBarOldHP+1], a + ld [wHPBarNewHP+1], a + jr nc, .next inc a - ld [hl],a - ld [wHPBarNewHP+1],a + ld [hl], a + ld [wHPBarNewHP+1], a .next inc hl - ld a,[hld] - ld b,a - ld de,wEnemyMonMaxHP + 1 - ld a,[de] + ld a, [hld] + ld b, a + ld de, wEnemyMonMaxHP + 1 + ld a, [de] dec de - ld [wHPBarMaxHP],a + ld [wHPBarMaxHP], a sub b - ld a,[hli] - ld b,a - ld a,[de] - ld [wHPBarMaxHP+1],a + ld a, [hli] + ld b, a + ld a, [de] + ld [wHPBarMaxHP+1], a sbc b - jr nc,AIPrintItemUseAndUpdateHPBar + jr nc, AIPrintItemUseAndUpdateHPBar inc de - ld a,[de] + ld a, [de] dec de - ld [hld],a - ld [wHPBarNewHP],a - ld a,[de] - ld [hl],a - ld [wHPBarNewHP+1],a + ld [hld], a + ld [wHPBarNewHP], a + ld a, [de] + ld [hl], a + ld [wHPBarNewHP+1], a ; fallthrough AIPrintItemUseAndUpdateHPBar: call AIPrintItemUse_ coord hl, 2, 2 xor a - ld [wHPBarType],a + ld [wHPBarType], a predef UpdateHPBar2 jp DecrementAICount AISwitchIfEnoughMons: ; enemy trainer switches if there are 3 or more unfainted mons in party - ld a,[wEnemyPartyCount] - ld c,a - ld hl,wEnemyMon1HP + ld a, [wEnemyPartyCount] + ld c, a + ld hl, wEnemyMon1HP - ld d,0 ; keep count of unfainted monsters + ld d, 0 ; keep count of unfainted monsters ; count how many monsters haven't fainted yet .loop - ld a,[hli] - ld b,a - ld a,[hld] + ld a, [hli] + ld b, a + ld a, [hld] or b - jr z,.Fainted ; has monster fainted? + jr z, .Fainted ; has monster fainted? inc d .Fainted push bc ld bc, wEnemyMon2 - wEnemyMon1 - add hl,bc + add hl, bc pop bc dec c - jr nz,.loop + jr nz, .loop - ld a,d ; how many available monsters are there? + ld a, d ; how many available monsters are there? cp 2 ; don't bother if only 1 or 2 - jp nc,SwitchEnemyMon + jp nc, SwitchEnemyMon and a ret @@ -681,14 +681,14 @@ SwitchEnemyMon: ; prepare to withdraw the active monster: copy hp, number, and status to roster - ld a,[wEnemyMonPartyPos] - ld hl,wEnemyMon1HP - ld bc,wEnemyMon2 - wEnemyMon1 + ld a, [wEnemyMonPartyPos] + ld hl, wEnemyMon1HP + ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes - ld d,h - ld e,l - ld hl,wEnemyMonHP - ld bc,4 + ld d, h + ld e, l + ld hl, wEnemyMonHP + ld bc, 4 call CopyData ld hl, AIBattleWithdrawText @@ -696,13 +696,13 @@ SwitchEnemyMon: ; This wFirstMonsNotOutYet variable is abused to prevent the player from ; switching in a new mon in response to this switch. - ld a,1 - ld [wFirstMonsNotOutYet],a + ld a, 1 + ld [wFirstMonsNotOutYet], a callab EnemySendOut xor a - ld [wFirstMonsNotOutYet],a + ld [wFirstMonsNotOutYet], a - ld a,[wLinkState] + ld a, [wLinkState] cp LINK_STATE_BATTLING ret z scf @@ -715,120 +715,120 @@ AIBattleWithdrawText: AIUseFullHeal: call AIPlayRestoringSFX call AICureStatus - ld a,FULL_HEAL + ld a, FULL_HEAL jp AIPrintItemUse AICureStatus: ; cures the status of enemy's active pokemon - ld a,[wEnemyMonPartyPos] - ld hl,wEnemyMon1Status - ld bc,wEnemyMon2 - wEnemyMon1 + ld a, [wEnemyMonPartyPos] + ld hl, wEnemyMon1Status + ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes xor a - ld [hl],a ; clear status in enemy team roster - ld [wEnemyMonStatus],a ; clear status of active enemy - ld hl,wEnemyBattleStatus3 - res 0,[hl] + ld [hl], a ; clear status in enemy team roster + ld [wEnemyMonStatus], a ; clear status of active enemy + ld hl, wEnemyBattleStatus3 + res 0, [hl] ret AIUseXAccuracy: ; unused call AIPlayRestoringSFX - ld hl,wEnemyBattleStatus2 - set 0,[hl] - ld a,X_ACCURACY + ld hl, wEnemyBattleStatus2 + set 0, [hl] + ld a, X_ACCURACY jp AIPrintItemUse AIUseGuardSpec: call AIPlayRestoringSFX - ld hl,wEnemyBattleStatus2 - set 1,[hl] - ld a,GUARD_SPEC + ld hl, wEnemyBattleStatus2 + set 1, [hl] + ld a, GUARD_SPEC jp AIPrintItemUse AIUseDireHit: ; unused call AIPlayRestoringSFX - ld hl,wEnemyBattleStatus2 - set 2,[hl] - ld a,DIRE_HIT + ld hl, wEnemyBattleStatus2 + set 2, [hl] + ld a, DIRE_HIT jp AIPrintItemUse AICheckIfHPBelowFraction: ; return carry if enemy trainer's current HP is below 1 / a of the maximum - ld [H_DIVISOR],a - ld hl,wEnemyMonMaxHP - ld a,[hli] - ld [H_DIVIDEND],a - ld a,[hl] - ld [H_DIVIDEND + 1],a - ld b,2 + ld [H_DIVISOR], a + ld hl, wEnemyMonMaxHP + ld a, [hli] + ld [H_DIVIDEND], a + ld a, [hl] + ld [H_DIVIDEND + 1], a + ld b, 2 call Divide - ld a,[H_QUOTIENT + 3] - ld c,a - ld a,[H_QUOTIENT + 2] - ld b,a - ld hl,wEnemyMonHP + 1 - ld a,[hld] - ld e,a - ld a,[hl] - ld d,a - ld a,d + ld a, [H_QUOTIENT + 3] + ld c, a + ld a, [H_QUOTIENT + 2] + ld b, a + ld hl, wEnemyMonHP + 1 + ld a, [hld] + ld e, a + ld a, [hl] + ld d, a + ld a, d sub b ret nz - ld a,e + ld a, e sub c ret AIUseXAttack: - ld b,$A - ld a,X_ATTACK + ld b, $A + ld a, X_ATTACK jr AIIncreaseStat AIUseXDefend: - ld b,$B - ld a,X_DEFEND + ld b, $B + ld a, X_DEFEND jr AIIncreaseStat AIUseXSpeed: - ld b,$C - ld a,X_SPEED + ld b, $C + ld a, X_SPEED jr AIIncreaseStat AIUseXSpecial: - ld b,$D - ld a,X_SPECIAL + ld b, $D + ld a, X_SPECIAL ; fallthrough AIIncreaseStat: - ld [wAIItem],a + ld [wAIItem], a push bc call AIPrintItemUse_ pop bc - ld hl,wEnemyMoveEffect - ld a,[hld] + ld hl, wEnemyMoveEffect + ld a, [hld] push af - ld a,[hl] + ld a, [hl] push af push hl - ld a,ANIM_AF - ld [hli],a - ld [hl],b + ld a, ANIM_AF + ld [hli], a + ld [hl], b callab StatModifierUpEffect pop hl pop af - ld [hli],a + ld [hli], a pop af - ld [hl],a + ld [hl], a jp DecrementAICount AIPrintItemUse: - ld [wAIItem],a + ld [wAIItem], a call AIPrintItemUse_ jp DecrementAICount AIPrintItemUse_: ; print "x used [wAIItem] on z!" - ld a,[wAIItem] - ld [wd11e],a + ld a, [wAIItem] + ld [wd11e], a call GetItemName ld hl, AIBattleUseItemText jp PrintText diff --git a/engine/display_text_id_init.asm b/engine/display_text_id_init.asm index 312d6329..59b3a5f8 100644 --- a/engine/display_text_id_init.asm +++ b/engine/display_text_id_init.asm @@ -1,78 +1,78 @@ ; function that performs initialization for DisplayTextID DisplayTextIDInit: xor a - ld [wListMenuID],a - ld a,[wAutoTextBoxDrawingControl] - bit 0,a - jr nz,.skipDrawingTextBoxBorder - ld a,[hSpriteIndexOrTextID] ; text ID (or sprite ID) + ld [wListMenuID], a + ld a, [wAutoTextBoxDrawingControl] + bit 0, a + jr nz, .skipDrawingTextBoxBorder + ld a, [hSpriteIndexOrTextID] ; text ID (or sprite ID) and a - jr nz,.notStartMenu + jr nz, .notStartMenu ; if text ID is 0 (i.e. the start menu) ; Note that the start menu text border is also drawn in the function directly ; below this, so this seems unnecessary. CheckEvent EVENT_GOT_POKEDEX ; start menu with pokedex coord hl, 10, 0 - ld b,$0e - ld c,$08 - jr nz,.drawTextBoxBorder + ld b, $0e + ld c, $08 + jr nz, .drawTextBoxBorder ; start menu without pokedex coord hl, 10, 0 - ld b,$0c - ld c,$08 + 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 coord hl, 0, 12 - ld b,$04 - ld c,$12 + ld b, $04 + ld c, $12 .drawTextBoxBorder call TextBoxBorder .skipDrawingTextBoxBorder - ld hl,wFontLoaded - set 0,[hl] - ld hl,wFlags_0xcd60 - bit 4,[hl] - res 4,[hl] - jr nz,.skipMovingSprites + ld hl, wFontLoaded + set 0, [hl] + ld hl, wFlags_0xcd60 + bit 4, [hl] + res 4, [hl] + jr nz, .skipMovingSprites 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 ; the original direction they were facing must be restored after the dialogue is over - ld hl,wSpriteStateData1 + $19 - ld c,$0f - ld de,$0010 + ld hl, wSpriteStateData1 + $19 + ld c, $0f + ld de, $0010 .spriteFacingDirectionCopyLoop - ld a,[hl] + ld a, [hl] inc h - ld [hl],a + ld [hl], a dec h - add hl,de + add hl, de dec c - jr nz,.spriteFacingDirectionCopyLoop + jr nz, .spriteFacingDirectionCopyLoop ; loop to force all the sprites in the middle of animation to stand still ; (so that they don't like they're frozen mid-step during the dialogue) - ld hl,wSpriteStateData1 + 2 - ld de,$0010 - ld c,e + ld hl, wSpriteStateData1 + 2 + ld de, $0010 + ld c, e .spriteStandStillLoop - ld a,[hl] - cp a,$ff ; is the sprite visible? - jr z,.nextSprite + ld a, [hl] + cp $ff ; is the sprite visible? + jr z, .nextSprite ; if it is visible - and a,$fc - ld [hl],a + and $fc + ld [hl], a .nextSprite - add hl,de + add hl, de dec c - jr nz,.spriteStandStillLoop - ld b,$9c ; window background address + jr nz, .spriteStandStillLoop + ld b, $9c ; window background address call CopyScreenTileBufferToVRAM ; transfer background in WRAM to VRAM xor a - ld [hWY],a ; put the window on the screen + ld [hWY], a ; put the window on the screen call LoadFontTilePatterns - ld a,$01 - ld [H_AUTOBGTRANSFERENABLED],a ; enable continuous WRAM to VRAM transfer each V-blank + ld a, $01 + ld [H_AUTOBGTRANSFERENABLED], a ; enable continuous WRAM to VRAM transfer each V-blank ret diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 9eb4edc5..3c9b1723 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -6,7 +6,7 @@ AnimateHallOfFame: call LoadFontTilePatterns call LoadTextBoxTilePatterns call DisableLCD - ld hl,vBGMap0 + ld hl, vBGMap0 ld bc, $800 ld a, " " call FillMemory diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index a1fe85bc..c01bc3c3 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -1,85 +1,85 @@ DoInGameTradeDialogue: ; trigger the trade offer/action specified by wWhichTrade call SaveScreenTilesToBuffer2 - ld hl,TradeMons - ld a,[wWhichTrade] - ld b,a + ld hl, TradeMons + ld a, [wWhichTrade] + ld b, a swap a sub b sub b - ld c,a - ld b,0 - add hl,bc - ld a,[hli] - ld [wInGameTradeGiveMonSpecies],a - ld a,[hli] - ld [wInGameTradeReceiveMonSpecies],a - ld a,[hli] + ld c, a + ld b, 0 + add hl, bc + ld a, [hli] + ld [wInGameTradeGiveMonSpecies], a + ld a, [hli] + ld [wInGameTradeReceiveMonSpecies], a + ld a, [hli] push af - ld de,wInGameTradeMonNick + ld de, wInGameTradeMonNick ld bc, NAME_LENGTH call CopyData pop af - ld l,a - ld h,0 - ld de,InGameTradeTextPointers - add hl,hl - add hl,de - ld a,[hli] - ld [wInGameTradeTextPointerTablePointer],a - ld a,[hl] - ld [wInGameTradeTextPointerTablePointer + 1],a - ld a,[wInGameTradeGiveMonSpecies] - ld de,wInGameTradeGiveMonName + ld l, a + ld h, 0 + ld de, InGameTradeTextPointers + add hl, hl + add hl, de + ld a, [hli] + ld [wInGameTradeTextPointerTablePointer], a + ld a, [hl] + ld [wInGameTradeTextPointerTablePointer + 1], a + ld a, [wInGameTradeGiveMonSpecies] + ld de, wInGameTradeGiveMonName call InGameTrade_GetMonName - ld a,[wInGameTradeReceiveMonSpecies] - ld de,wInGameTradeReceiveMonName + ld a, [wInGameTradeReceiveMonSpecies] + ld de, wInGameTradeReceiveMonName call InGameTrade_GetMonName - ld hl,wCompletedInGameTradeFlags - ld a,[wWhichTrade] - ld c,a - ld b,FLAG_TEST + ld hl, wCompletedInGameTradeFlags + ld a, [wWhichTrade] + ld c, a + ld b, FLAG_TEST predef FlagActionPredef - ld a,c + ld a, c and a - ld a,$4 - ld [wInGameTradeTextPointerTableIndex],a - jr nz,.printText + ld a, $4 + ld [wInGameTradeTextPointerTableIndex], a + jr nz, .printText ; if the trade hasn't been done yet xor a - ld [wInGameTradeTextPointerTableIndex],a + ld [wInGameTradeTextPointerTableIndex], a call .printText - ld a,$1 - ld [wInGameTradeTextPointerTableIndex],a + ld a, $1 + ld [wInGameTradeTextPointerTableIndex], a call YesNoChoice - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - jr nz,.printText + jr nz, .printText call InGameTrade_DoTrade - jr c,.printText + jr c, .printText ld hl, TradedForText call PrintText .printText - ld hl,wInGameTradeTextPointerTableIndex - ld a,[hld] ; wInGameTradeTextPointerTableIndex - ld e,a - ld d,0 - ld a,[hld] ; wInGameTradeTextPointerTablePointer + 1 - ld l,[hl] ; wInGameTradeTextPointerTablePointer - ld h,a - add hl,de - add hl,de - ld a,[hli] - ld h,[hl] - ld l,a + ld hl, wInGameTradeTextPointerTableIndex + ld a, [hld] ; wInGameTradeTextPointerTableIndex + ld e, a + ld d, 0 + ld a, [hld] ; wInGameTradeTextPointerTablePointer + 1 + ld l, [hl] ; wInGameTradeTextPointerTablePointer + ld h, a + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a jp PrintText ; copies name of species a to hl InGameTrade_GetMonName: push de - ld [wd11e],a + ld [wd11e], a call GetMonName - ld hl,wcd6d + ld hl, wcd6d pop de ld bc, NAME_LENGTH jp CopyData @@ -88,53 +88,53 @@ INCLUDE "data/trades.asm" InGameTrade_DoTrade: xor a ; NORMAL_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a + ld [wPartyMenuTypeOrMessageID], a dec a - ld [wUpdateSpritesEnabled],a + ld [wUpdateSpritesEnabled], a call DisplayPartyMenu push af call InGameTrade_RestoreScreen pop af - ld a,$1 - jp c,.tradeFailed ; jump if the player didn't select a pokemon - ld a,[wInGameTradeGiveMonSpecies] - ld b,a - ld a,[wcf91] + ld a, $1 + jp c, .tradeFailed ; jump if the player didn't select a pokemon + ld a, [wInGameTradeGiveMonSpecies] + ld b, a + ld a, [wcf91] cp b - ld a,$2 - jr nz,.tradeFailed ; jump if the selected mon's species is not the required one - ld a,[wWhichPokemon] - ld hl,wPartyMon1Level + ld a, $2 + jr nz, .tradeFailed ; jump if the selected mon's species is not the required one + ld a, [wWhichPokemon] + ld hl, wPartyMon1Level ld bc, wPartyMon2 - wPartyMon1 call AddNTimes - ld a,[hl] - ld [wCurEnemyLVL],a - ld hl,wCompletedInGameTradeFlags - ld a,[wWhichTrade] - ld c,a - ld b,FLAG_SET + ld a, [hl] + ld [wCurEnemyLVL], a + ld hl, wCompletedInGameTradeFlags + ld a, [wWhichTrade] + ld c, a + ld b, FLAG_SET predef FlagActionPredef ld hl, ConnectCableText call PrintText - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] push af - ld a,[wCurEnemyLVL] + ld a, [wCurEnemyLVL] push af call LoadHpBarAndStatusTilePatterns call InGameTrade_PrepareTradeData predef InternalClockTradeAnim pop af - ld [wCurEnemyLVL],a + ld [wCurEnemyLVL], a pop af - ld [wWhichPokemon],a - ld a,[wInGameTradeReceiveMonSpecies] - ld [wcf91],a + ld [wWhichPokemon], a + ld a, [wInGameTradeReceiveMonSpecies] + ld [wcf91], a xor a - ld [wMonDataLocation],a ; not used - ld [wRemoveMonFromBox],a + ld [wMonDataLocation], a ; not used + ld [wRemoveMonFromBox], a call RemovePokemon - ld a,$80 ; prevent the player from naming the mon - ld [wMonDataLocation],a + ld a, $80 ; prevent the player from naming the mon + ld [wMonDataLocation], a call AddPartyMon call InGameTrade_CopyDataToReceivedMon callab EvolveTradeMon @@ -142,12 +142,12 @@ InGameTrade_DoTrade: call InGameTrade_RestoreScreen callba RedrawMapView and a - ld a,$3 + ld a, $3 jr .tradeSucceeded .tradeFailed scf .tradeSucceeded - ld [wInGameTradeTextPointerTableIndex],a + ld [wInGameTradeTextPointerTableIndex], a ret InGameTrade_RestoreScreen: diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index 1294ed8d..d07f64eb 100644 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -5,81 +5,81 @@ ; [wItemQuantity] = item quantity ; sets carry flag if successful, unsets carry flag if unsuccessful AddItemToInventory_: - ld a,[wItemQuantity] ; a = item quantity + ld a, [wItemQuantity] ; a = item quantity push af push bc push de push hl push hl - ld d,PC_ITEM_CAPACITY ; how many items the PC can hold - ld a,wNumBagItems & $FF + ld d, PC_ITEM_CAPACITY ; how many items the PC can hold + ld a, wNumBagItems & $FF cp l - jr nz,.checkIfInventoryFull - ld a,wNumBagItems >> 8 + jr nz, .checkIfInventoryFull + ld a, wNumBagItems >> 8 cp h - jr nz,.checkIfInventoryFull + jr nz, .checkIfInventoryFull ; if the destination is the bag - ld d,BAG_ITEM_CAPACITY ; how many items the bag can hold + ld d, BAG_ITEM_CAPACITY ; how many items the bag can hold .checkIfInventoryFull - ld a,[hl] + ld a, [hl] sub d - ld d,a - ld a,[hli] + ld d, a + ld a, [hli] and a - jr z,.addNewItem + jr z, .addNewItem .loop - ld a,[hli] - ld b,a ; b = ID of current item in table - ld a,[wcf91] ; a = ID of item being added + ld a, [hli] + ld b, a ; b = ID of current item in table + ld a, [wcf91] ; a = ID of item being added cp b ; does the current item in the table match the item being added? - jp z,.increaseItemQuantity ; if so, increase the item's quantity + jp z, .increaseItemQuantity ; if so, increase the item's quantity inc hl - ld a,[hl] - cp a,$ff ; is it the end of the table? - jr nz,.loop + ld a, [hl] + cp $ff ; is it the end of the table? + jr nz, .loop .addNewItem ; add an item not yet in the inventory pop hl - ld a,d + ld a, d and a ; is there room for a new item slot? - jr z,.done + jr z, .done ; if there is room inc [hl] ; increment the number of items in the inventory - ld a,[hl] ; the number of items will be the index of the new item + ld a, [hl] ; the number of items will be the index of the new item add a dec a - ld c,a - ld b,0 - add hl,bc ; hl = address to store the item - ld a,[wcf91] - ld [hli],a ; store item ID - ld a,[wItemQuantity] - ld [hli],a ; store item quantity - ld [hl],$ff ; store terminator + ld c, a + ld b, 0 + add hl, bc ; hl = address to store the item + ld a, [wcf91] + ld [hli], a ; store item ID + ld a, [wItemQuantity] + ld [hli], a ; store item quantity + ld [hl], $ff ; store terminator jp .success .increaseItemQuantity ; increase the quantity of an item already in the inventory - ld a,[wItemQuantity] - ld b,a ; b = quantity to add - ld a,[hl] ; a = existing item quantity + ld a, [wItemQuantity] + ld b, a ; b = quantity to add + ld a, [hl] ; a = existing item quantity add b ; a = new item quantity - cp a,100 - jp c,.storeNewQuantity ; if the new quantity is less than 100, store it + cp 100 + jp c, .storeNewQuantity ; if the new quantity is less than 100, store it ; if the new quantity is greater than or equal to 100, ; try to max out the current slot and add the rest in a new slot - sub a,99 - ld [wItemQuantity],a ; a = amount left over (to put in the new slot) - ld a,d + sub 99 + ld [wItemQuantity], a ; a = amount left over (to put in the new slot) + ld a, d and a ; is there room for a new item slot? - jr z,.increaseItemQuantityFailed + jr z, .increaseItemQuantityFailed ; if so, store 99 in the current slot and store the rest in a new slot - ld a,99 - ld [hli],a + ld a, 99 + ld [hli], a jp .loop .increaseItemQuantityFailed pop hl and a jr .done .storeNewQuantity - ld [hl],a + ld [hl], a pop hl .success scf @@ -88,8 +88,8 @@ AddItemToInventory_: pop de pop bc pop bc - ld a,b - ld [wItemQuantity],a ; restore the initial value from when the function was called + ld a, b + ld [wItemQuantity], a ; restore the initial value from when the function was called ret ; function to remove an item (in varying quantities) from the player's bag or PC box @@ -100,49 +100,49 @@ AddItemToInventory_: RemoveItemFromInventory_: push hl inc hl - ld a,[wWhichPokemon] ; index (within the inventory) of the item being removed + ld a, [wWhichPokemon] ; index (within the inventory) of the item being removed sla a add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry inc hl - ld a,[wItemQuantity] ; quantity being removed - ld e,a - ld a,[hl] ; a = current quantity + ld a, [wItemQuantity] ; quantity being removed + ld e, a + ld a, [hl] ; a = current quantity sub e - ld [hld],a ; store new quantity - ld [wMaxItemQuantity],a + ld [hld], a ; store new quantity + ld [wMaxItemQuantity], a and a - jr nz,.skipMovingUpSlots + jr nz, .skipMovingUpSlots ; if the remaining quantity is 0, ; remove the emptied item slot and move up all the following item slots .moveSlotsUp - ld e,l - ld d,h + ld e, l + ld d, h inc de inc de ; de = address of the slot following the emptied one .loop ; loop to move up the following slots - ld a,[de] + ld a, [de] inc de - ld [hli],a - cp a,$ff - jr nz,.loop + ld [hli], a + cp $ff + jr nz, .loop ; update menu info xor a - ld [wListScrollOffset],a - ld [wCurrentMenuItem],a - ld [wBagSavedMenuItem],a - ld [wSavedListScrollOffset],a + ld [wListScrollOffset], a + ld [wCurrentMenuItem], a + ld [wBagSavedMenuItem], a + ld [wSavedListScrollOffset], a pop hl - ld a,[hl] ; a = number of items in inventory + 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 [wListCount],a - cp a,2 - jr c,.done - ld [wMaxMenuItem],a + ld [hl], a ; store new number of items + ld [wListCount], a + cp 2 + jr c, .done + ld [wMaxMenuItem], a jr .done .skipMovingUpSlots pop hl diff --git a/engine/items/items.asm b/engine/items/items.asm index 81c4c615..ada4d7db 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,18 +1,18 @@ UseItem_: - ld a,1 - ld [wActionResultOrTookBattleTurn],a ; initialise to success value - ld a,[wcf91] ;contains item_ID - cp a,HM_01 - jp nc,ItemUseTMHM - ld hl,ItemUsePtrTable + ld a, 1 + ld [wActionResultOrTookBattleTurn], a ; initialise to success value + ld a, [wcf91] ;contains item_ID + cp HM_01 + jp nc, ItemUseTMHM + ld hl, ItemUsePtrTable dec a add a - ld c,a - ld b,0 - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a + ld c, a + ld b, 0 + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a jp hl ItemUsePtrTable: @@ -103,75 +103,75 @@ ItemUsePtrTable: ItemUseBall: ; Balls can't be used out of battle. - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp z,ItemUseNotTime + jp z, ItemUseNotTime ; Balls can't catch trainers' Pokémon. dec a - jp nz,ThrowBallAtTrainerMon + jp nz, ThrowBallAtTrainerMon ; If this is for the old man battle, skip checking if the party & box are full. - ld a,[wBattleType] + ld a, [wBattleType] dec a - jr z,.canUseBall + jr z, .canUseBall - ld a,[wPartyCount] ; is party full? - cp a,PARTY_LENGTH - jr nz,.canUseBall - ld a,[wNumInBox] ; is box full? - cp a,MONS_PER_BOX - jp z,BoxFullCannotThrowBall + ld a, [wPartyCount] ; is party full? + cp PARTY_LENGTH + jr nz, .canUseBall + ld a, [wNumInBox] ; is box full? + cp MONS_PER_BOX + jp z, BoxFullCannotThrowBall .canUseBall xor a - ld [wCapturedMonSpecies],a + ld [wCapturedMonSpecies], a - ld a,[wBattleType] - cp a,BATTLE_TYPE_SAFARI - jr nz,.skipSafariZoneCode + ld a, [wBattleType] + cp BATTLE_TYPE_SAFARI + jr nz, .skipSafariZoneCode .safariZone - ld hl,wNumSafariBalls + ld hl, wNumSafariBalls dec [hl] ; remove a Safari Ball .skipSafariZoneCode call RunDefaultPaletteCommand - ld a,$43 ; successful capture value - ld [wPokeBallAnimData],a + ld a, $43 ; successful capture value + ld [wPokeBallAnimData], a call LoadScreenTilesFromBuffer1 - ld hl,ItemUseText00 + ld hl, ItemUseText00 call PrintText ; If the player is fighting an unidentified ghost, set the value that indicates ; the Pokémon can't be caught and skip the capture calculations. callab IsGhostBattle - ld b,$10 ; can't be caught value - jp z,.setAnimData + ld b, $10 ; can't be caught value + jp z, .setAnimData - ld a,[wBattleType] + ld a, [wBattleType] dec a - jr nz,.notOldManBattle + jr nz, .notOldManBattle .oldManBattle - ld hl,wGrassRate - ld de,wPlayerName - ld bc,NAME_LENGTH + ld hl, wGrassRate + ld de, wPlayerName + ld bc, NAME_LENGTH call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno. glitch) jp .captured .notOldManBattle ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. - ld a,[wCurMap] - cp a,POKEMONTOWER_6 - jr nz,.loop - ld a,[wEnemyMonSpecies2] - cp a,MAROWAK - ld b,$10 ; can't be caught value - jp z,.setAnimData + ld a, [wCurMap] + cp POKEMONTOWER_6 + jr nz, .loop + ld a, [wEnemyMonSpecies2] + cp MAROWAK + ld b, $10 ; can't be caught value + jp z, .setAnimData ; Get the first random number. Let it be called Rand1. ; Rand1 must be within a certain range according the kind of ball being thrown. @@ -183,34 +183,34 @@ ItemUseBall: .loop call Random - ld b,a + ld b, a ; Get the item ID. - ld hl,wcf91 - ld a,[hl] + ld hl, wcf91 + ld a, [hl] ; The Master Ball always succeeds. - cp a,MASTER_BALL - jp z,.captured + cp MASTER_BALL + jp z, .captured ; Anything will do for the basic Poké Ball. - cp a,POKE_BALL - jr z,.checkForAilments + cp POKE_BALL + jr z, .checkForAilments ; If it's a Great/Ultra/Safari Ball and Rand1 is greater than 200, try again. - ld a,200 + ld a, 200 cp b - jr c,.loop + jr c, .loop ; Less than or equal to 200 is good enough for a Great Ball. - ld a,[hl] - cp a,GREAT_BALL - jr z,.checkForAilments + ld a, [hl] + cp GREAT_BALL + jr z, .checkForAilments ; If it's an Ultra/Safari Ball and Rand1 is greater than 150, try again. - ld a,150 + ld a, 150 cp b - jr c,.loop + jr c, .loop .checkForAilments ; Pokémon can be caught more easily with a status ailment. @@ -221,174 +221,174 @@ ItemUseBall: ; Burn/Paralysis/Poison: Status = 12 ; Freeze/Sleep: Status = 25 ; If Status is greater than Rand1, the Pokémon will be caught for sure. - ld a,[wEnemyMonStatus] + ld a, [wEnemyMonStatus] and a - jr z,.skipAilmentValueSubtraction ; no ailments - and a, 1 << FRZ | SLP - ld c,12 - jr z,.notFrozenOrAsleep - ld c,25 + jr z, .skipAilmentValueSubtraction ; no ailments + and 1 << FRZ | SLP + ld c, 12 + jr z, .notFrozenOrAsleep + ld c, 25 .notFrozenOrAsleep - ld a,b + ld a, b sub c - jp c,.captured - ld b,a + jp c, .captured + ld b, a .skipAilmentValueSubtraction push bc ; save (Rand1 - Status) ; Calculate MaxHP * 255. xor a - ld [H_MULTIPLICAND],a - ld hl,wEnemyMonMaxHP - ld a,[hli] - ld [H_MULTIPLICAND + 1],a - ld a,[hl] - ld [H_MULTIPLICAND + 2],a - ld a,255 - ld [H_MULTIPLIER],a + ld [H_MULTIPLICAND], a + ld hl, wEnemyMonMaxHP + ld a, [hli] + ld [H_MULTIPLICAND + 1], a + ld a, [hl] + ld [H_MULTIPLICAND + 2], a + ld a, 255 + ld [H_MULTIPLIER], a call Multiply ; Determine BallFactor. It's 8 for Great Balls and 12 for the others. - ld a,[wcf91] - cp a,GREAT_BALL - ld a,12 - jr nz,.skip1 - ld a,8 + ld a, [wcf91] + cp GREAT_BALL + ld a, 12 + jr nz, .skip1 + ld a, 8 .skip1 ; Note that the results of all division operations are floored. ; Calculate (MaxHP * 255) / BallFactor. - ld [H_DIVISOR],a - ld b,4 ; number of bytes in dividend + ld [H_DIVISOR], a + ld b, 4 ; number of bytes in dividend call Divide ; Divide the enemy's current HP by 4. HP is not supposed to exceed 999 so ; the result should fit in a. If the division results in a quotient of 0, ; change it to 1. - ld hl,wEnemyMonHP - ld a,[hli] - ld b,a - ld a,[hl] + ld hl, wEnemyMonHP + ld a, [hli] + ld b, a + ld a, [hl] srl b rr a srl b rr a and a - jr nz,.skip2 + jr nz, .skip2 inc a .skip2 ; Let W = ((MaxHP * 255) / BallFactor) / max(HP / 4, 1). Calculate W. - ld [H_DIVISOR],a - ld b,4 + ld [H_DIVISOR], a + ld b, 4 call Divide ; If W > 255, store 255 in [H_QUOTIENT + 3]. ; Let X = min(W, 255) = [H_QUOTIENT + 3]. - ld a,[H_QUOTIENT + 2] + ld a, [H_QUOTIENT + 2] and a - jr z,.skip3 - ld a,255 - ld [H_QUOTIENT + 3],a + jr z, .skip3 + ld a, 255 + ld [H_QUOTIENT + 3], a .skip3 pop bc ; b = Rand1 - Status ; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. - ld a,[wEnemyMonCatchRate] + ld a, [wEnemyMonCatchRate] cp b - jr c,.failedToCapture + jr c, .failedToCapture ; If W > 255, the ball captures the Pokémon. - ld a,[H_QUOTIENT + 2] + ld a, [H_QUOTIENT + 2] and a - jr nz,.captured + jr nz, .captured call Random ; Let this random number be called Rand2. ; If Rand2 > X, the ball fails to capture the Pokémon. - ld b,a - ld a,[H_QUOTIENT + 3] + ld b, a + ld a, [H_QUOTIENT + 3] cp b - jr c,.failedToCapture + jr c, .failedToCapture .captured jr .skipShakeCalculations .failedToCapture - ld a,[H_QUOTIENT + 3] - ld [wPokeBallCaptureCalcTemp],a ; Save X. + ld a, [H_QUOTIENT + 3] + ld [wPokeBallCaptureCalcTemp], a ; Save X. ; Calculate CatchRate * 100. xor a - ld [H_MULTIPLICAND],a - ld [H_MULTIPLICAND + 1],a - ld a,[wEnemyMonCatchRate] - ld [H_MULTIPLICAND + 2],a - ld a,100 - ld [H_MULTIPLIER],a + ld [H_MULTIPLICAND], a + ld [H_MULTIPLICAND + 1], a + ld a, [wEnemyMonCatchRate] + ld [H_MULTIPLICAND + 2], a + ld a, 100 + ld [H_MULTIPLIER], a call Multiply ; Determine BallFactor2. ; Poké Ball: BallFactor2 = 255 ; Great Ball: BallFactor2 = 200 ; Ultra/Safari Ball: BallFactor2 = 150 - ld a,[wcf91] - ld b,255 - cp a,POKE_BALL - jr z,.skip4 - ld b,200 - cp a,GREAT_BALL - jr z,.skip4 - ld b,150 - cp a,ULTRA_BALL - jr z,.skip4 + ld a, [wcf91] + ld b, 255 + cp POKE_BALL + jr z, .skip4 + ld b, 200 + cp GREAT_BALL + jr z, .skip4 + ld b, 150 + cp ULTRA_BALL + jr z, .skip4 .skip4 ; Let Y = (CatchRate * 100) / BallFactor2. Calculate Y. - ld a,b - ld [H_DIVISOR],a - ld b,4 + ld a, b + ld [H_DIVISOR], a + ld b, 4 call Divide ; If Y > 255, there are 3 shakes. ; Note that this shouldn't be possible. ; The maximum value of Y is (255 * 100) / 150 = 170. - ld a,[H_QUOTIENT + 2] + ld a, [H_QUOTIENT + 2] and a - ld b,$63 ; 3 shakes - jr nz,.setAnimData + ld b, $63 ; 3 shakes + jr nz, .setAnimData ; Calculate X * Y. - ld a,[wPokeBallCaptureCalcTemp] - ld [H_MULTIPLIER],a + ld a, [wPokeBallCaptureCalcTemp] + ld [H_MULTIPLIER], a call Multiply ; Calculate (X * Y) / 255. - ld a,255 - ld [H_DIVISOR],a - ld b,4 + ld a, 255 + ld [H_DIVISOR], a + ld b, 4 call Divide ; Determine Status2. ; no status ailment: Status2 = 0 ; Burn/Paralysis/Poison: Status2 = 5 ; Freeze/Sleep: Status2 = 10 - ld a,[wEnemyMonStatus] + ld a, [wEnemyMonStatus] and a - jr z,.skip5 - and a, 1 << FRZ | SLP - ld b,5 - jr z,.addAilmentValue - ld b,10 + jr z, .skip5 + and 1 << FRZ | SLP + ld b, 5 + jr z, .addAilmentValue + ld b, 10 .addAilmentValue ; If the Pokémon has a status ailment, add Status2. - ld a,[H_QUOTIENT + 3] + ld a, [H_QUOTIENT + 3] add b - ld [H_QUOTIENT + 3],a + ld [H_QUOTIENT + 3], a .skip5 ; Finally determine the number of shakes. @@ -398,71 +398,71 @@ ItemUseBall: ; 10 ≤ Z < 30: 1 shake ; 30 ≤ Z < 70: 2 shakes ; 70 ≤ Z: 3 shakes - ld a,[H_QUOTIENT + 3] - cp a,10 - ld b,$20 - jr c,.setAnimData - cp a,30 - ld b,$61 - jr c,.setAnimData - cp a,70 - ld b,$62 - jr c,.setAnimData - ld b,$63 + ld a, [H_QUOTIENT + 3] + cp 10 + ld b, $20 + jr c, .setAnimData + cp 30 + ld b, $61 + jr c, .setAnimData + cp 70 + ld b, $62 + jr c, .setAnimData + ld b, $63 .setAnimData - ld a,b - ld [wPokeBallAnimData],a + ld a, b + ld [wPokeBallAnimData], a .skipShakeCalculations - ld c,20 + ld c, 20 call DelayFrames ; Do the animation. - ld a,TOSS_ANIM - ld [wAnimationID],a + ld a, TOSS_ANIM + ld [wAnimationID], a xor a - ld [H_WHOSETURN],a - ld [wAnimationType],a - ld [wDamageMultipliers],a - ld a,[wWhichPokemon] + ld [H_WHOSETURN], a + ld [wAnimationType], a + ld [wDamageMultipliers], a + ld a, [wWhichPokemon] push af - ld a,[wcf91] + ld a, [wcf91] push af predef MoveAnimation pop af - ld [wcf91],a + ld [wcf91], a pop af - ld [wWhichPokemon],a + ld [wWhichPokemon], a ; Determine the message to display from the animation. - ld a,[wPokeBallAnimData] - cp a,$10 - ld hl,ItemUseBallText00 - jp z,.printMessage - cp a,$20 - ld hl,ItemUseBallText01 - jp z,.printMessage - cp a,$61 - ld hl,ItemUseBallText02 - jp z,.printMessage - cp a,$62 - ld hl,ItemUseBallText03 - jp z,.printMessage - cp a,$63 - ld hl,ItemUseBallText04 - jp z,.printMessage + ld a, [wPokeBallAnimData] + cp $10 + ld hl, ItemUseBallText00 + jp z, .printMessage + cp $20 + ld hl, ItemUseBallText01 + jp z, .printMessage + cp $61 + ld hl, ItemUseBallText02 + jp z, .printMessage + cp $62 + ld hl, ItemUseBallText03 + jp z, .printMessage + cp $63 + ld hl, ItemUseBallText04 + jp z, .printMessage ; Save current HP. - ld hl,wEnemyMonHP - ld a,[hli] + ld hl, wEnemyMonHP + ld a, [hli] push af - ld a,[hli] + ld a, [hli] push af ; Save status ailment. inc hl - ld a,[hl] + ld a, [hl] push af push hl @@ -470,86 +470,86 @@ ItemUseBall: ; If the Pokémon is transformed, the Pokémon is assumed to be a Ditto. ; This is a bug because a wild Pokémon could have used Transform via ; Mirror Move even though the only wild Pokémon that knows Transform is Ditto. - ld hl,wEnemyBattleStatus3 - bit TRANSFORMED,[hl] - jr z,.notTransformed - ld a,DITTO - ld [wEnemyMonSpecies2],a + ld hl, wEnemyBattleStatus3 + bit TRANSFORMED, [hl] + jr z, .notTransformed + ld a, DITTO + ld [wEnemyMonSpecies2], a jr .skip6 .notTransformed ; If the Pokémon is not transformed, set the transformed bit and copy the ; DVs to wTransformedEnemyMonOriginalDVs so that LoadEnemyMonData won't generate ; new DVs. - set TRANSFORMED,[hl] - ld hl,wTransformedEnemyMonOriginalDVs - ld a,[wEnemyMonDVs] - ld [hli],a - ld a,[wEnemyMonDVs + 1] - ld [hl],a + set TRANSFORMED, [hl] + ld hl, wTransformedEnemyMonOriginalDVs + ld a, [wEnemyMonDVs] + ld [hli], a + ld a, [wEnemyMonDVs + 1] + ld [hl], a .skip6 - ld a,[wcf91] + ld a, [wcf91] push af - ld a,[wEnemyMonSpecies2] - ld [wcf91],a - ld a,[wEnemyMonLevel] - ld [wCurEnemyLVL],a + ld a, [wEnemyMonSpecies2] + ld [wcf91], a + ld a, [wEnemyMonLevel] + ld [wCurEnemyLVL], a callab LoadEnemyMonData pop af - ld [wcf91],a + ld [wcf91], a pop hl pop af - ld [hld],a + ld [hld], a dec hl pop af - ld [hld],a + ld [hld], a pop af - ld [hl],a - ld a,[wEnemyMonSpecies] - ld [wCapturedMonSpecies],a - ld [wcf91],a - ld [wd11e],a - ld a,[wBattleType] + ld [hl], a + ld a, [wEnemyMonSpecies] + ld [wCapturedMonSpecies], a + ld [wcf91], a + ld [wd11e], a + ld a, [wBattleType] dec a ; is this the old man battle? - jr z,.oldManCaughtMon ; if so, don't give the player the caught Pokémon + jr z, .oldManCaughtMon ; if so, don't give the player the caught Pokémon - ld hl,ItemUseBallText05 + ld hl, ItemUseBallText05 call PrintText ; Add the caught Pokémon to the Pokédex. predef IndexToPokedex - ld a,[wd11e] + ld a, [wd11e] dec a - ld c,a - ld b,FLAG_TEST - ld hl,wPokedexOwned + ld c, a + ld b, FLAG_TEST + ld hl, wPokedexOwned predef FlagActionPredef - ld a,c + ld a, c push af - ld a,[wd11e] + ld a, [wd11e] dec a - ld c,a - ld b,FLAG_SET + ld c, a + ld b, FLAG_SET predef FlagActionPredef pop af and a ; was the Pokémon already in the Pokédex? - jr nz,.skipShowingPokedexData ; if so, don't show the Pokédex data + jr nz, .skipShowingPokedexData ; if so, don't show the Pokédex data - ld hl,ItemUseBallText06 + ld hl, ItemUseBallText06 call PrintText call ClearSprites - ld a,[wEnemyMonSpecies] - ld [wd11e],a + ld a, [wEnemyMonSpecies] + ld [wd11e], a predef ShowPokedexData .skipShowingPokedexData - ld a,[wPartyCount] - cp a,PARTY_LENGTH ; is party full? - jr z,.sendToBox + ld a, [wPartyCount] + cp PARTY_LENGTH ; is party full? + jr z, .sendToBox xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation],a + ld [wMonDataLocation], a call ClearSprites call AddPartyMon jr .done @@ -557,30 +557,30 @@ ItemUseBall: .sendToBox call ClearSprites call SendNewMonToBox - ld hl,ItemUseBallText07 + ld hl, ItemUseBallText07 CheckEvent EVENT_MET_BILL - jr nz,.printTransferredToPCText - ld hl,ItemUseBallText08 + jr nz, .printTransferredToPCText + ld hl, ItemUseBallText08 .printTransferredToPCText call PrintText jr .done .oldManCaughtMon - ld hl,ItemUseBallText05 + ld hl, ItemUseBallText05 .printMessage call PrintText call ClearSprites .done - ld a,[wBattleType] + ld a, [wBattleType] and a ; is this the old man battle? ret nz ; if so, don't remove a ball from the bag ; Remove a ball from the bag. - ld hl,wNumBagItems + ld hl, wNumBagItems inc a - ld [wItemQuantity],a + ld [wItemQuantity], a jp RemoveItemFromInventory ItemUseBallText00: @@ -629,119 +629,119 @@ ItemUseBallText06: db "@" ItemUseTownMap: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime + jp nz, ItemUseNotTime jpba DisplayTownMap ItemUseBicycle: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime - ld a,[wWalkBikeSurfState] - ld [wWalkBikeSurfStateCopy],a - cp a,2 ; is the player surfing? - jp z,ItemUseNotTime + jp nz, ItemUseNotTime + ld a, [wWalkBikeSurfState] + ld [wWalkBikeSurfStateCopy], a + cp 2 ; is the player surfing? + jp z, ItemUseNotTime dec a ; is player already bicycling? - jr nz,.tryToGetOnBike + jr nz, .tryToGetOnBike .getOffBike call ItemUseReloadOverworldData xor a - ld [wWalkBikeSurfState],a ; change player state to walking + ld [wWalkBikeSurfState], a ; change player state to walking call PlayDefaultMusic ; play walking music - ld hl,GotOffBicycleText + ld hl, GotOffBicycleText jr .printText .tryToGetOnBike call IsBikeRidingAllowed - jp nc,NoCyclingAllowedHere + jp nc, NoCyclingAllowedHere call ItemUseReloadOverworldData xor a ; no keys pressed - ld [hJoyHeld],a ; current joypad state + ld [hJoyHeld], a ; current joypad state inc a - ld [wWalkBikeSurfState],a ; change player state to bicycling - ld hl,GotOnBicycleText + ld [wWalkBikeSurfState], a ; change player state to bicycling + ld hl, GotOnBicycleText call PlayDefaultMusic ; play bike riding music .printText jp PrintText ; used for Surf out-of-battle effect ItemUseSurfboard: - ld a,[wWalkBikeSurfState] - ld [wWalkBikeSurfStateCopy],a - cp a,2 ; is the player already surfing? - jr z,.tryToStopSurfing + ld a, [wWalkBikeSurfState] + ld [wWalkBikeSurfStateCopy], a + cp 2 ; is the player already surfing? + jr z, .tryToStopSurfing .tryToSurf call IsNextTileShoreOrWater - jp c,SurfingAttemptFailed - ld hl,TilePairCollisionsWater + jp c, SurfingAttemptFailed + ld hl, TilePairCollisionsWater call CheckForTilePairCollisions - jp c,SurfingAttemptFailed + jp c, SurfingAttemptFailed .surf call .makePlayerMoveForward - ld hl,wd730 - set 7,[hl] - ld a,2 - ld [wWalkBikeSurfState],a ; change player state to surfing + ld hl, wd730 + set 7, [hl] + ld a, 2 + ld [wWalkBikeSurfState], a ; change player state to surfing call PlayDefaultMusic ; play surfing music - ld hl,SurfingGotOnText + ld hl, SurfingGotOnText jp PrintText .tryToStopSurfing xor a - ld [hSpriteIndexOrTextID],a - ld d,16 ; talking range in pixels (normal range) + ld [hSpriteIndexOrTextID], a + ld d, 16 ; talking range in pixels (normal range) call IsSpriteInFrontOfPlayer2 - res 7,[hl] - ld a,[hSpriteIndexOrTextID] + res 7, [hl] + ld a, [hSpriteIndexOrTextID] and a ; is there a sprite in the way? - jr nz,.cannotStopSurfing - ld hl,TilePairCollisionsWater + jr nz, .cannotStopSurfing + ld hl, TilePairCollisionsWater call CheckForTilePairCollisions - jr c,.cannotStopSurfing - ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles - ld a,[hli] - ld h,[hl] - ld l,a ; hl now points to passable tiles - ld a,[wTileInFrontOfPlayer] ; tile in front of the player - ld b,a + jr c, .cannotStopSurfing + ld hl, wTilesetCollisionPtr ; pointer to list of passable tiles + ld a, [hli] + ld h, [hl] + ld l, a ; hl now points to passable tiles + ld a, [wTileInFrontOfPlayer] ; tile in front of the player + ld b, a .passableTileLoop - ld a,[hli] + ld a, [hli] cp b - jr z,.stopSurfing - cp a,$ff - jr nz,.passableTileLoop + jr z, .stopSurfing + cp $ff + jr nz, .passableTileLoop .cannotStopSurfing - ld hl,SurfingNoPlaceToGetOffText + ld hl, SurfingNoPlaceToGetOffText jp PrintText .stopSurfing call .makePlayerMoveForward - ld hl,wd730 - set 7,[hl] + ld hl, wd730 + set 7, [hl] xor a - ld [wWalkBikeSurfState],a ; change player state to walking + ld [wWalkBikeSurfState], a ; change player state to walking dec a - ld [wJoyIgnore],a + ld [wJoyIgnore], a call PlayDefaultMusic ; play walking music jp LoadWalkingPlayerSpriteGraphics ; uses a simulated button press to make the player move forward .makePlayerMoveForward - ld a,[wPlayerDirection] ; direction the player is going - bit PLAYER_DIR_BIT_UP,a - ld b,D_UP - jr nz,.storeSimulatedButtonPress - bit PLAYER_DIR_BIT_DOWN,a - ld b,D_DOWN - jr nz,.storeSimulatedButtonPress - bit PLAYER_DIR_BIT_LEFT,a - ld b,D_LEFT - jr nz,.storeSimulatedButtonPress - ld b,D_RIGHT + ld a, [wPlayerDirection] ; direction the player is going + bit PLAYER_DIR_BIT_UP, a + ld b, D_UP + jr nz, .storeSimulatedButtonPress + bit PLAYER_DIR_BIT_DOWN, a + ld b, D_DOWN + jr nz, .storeSimulatedButtonPress + bit PLAYER_DIR_BIT_LEFT, a + ld b, D_LEFT + jr nz, .storeSimulatedButtonPress + ld b, D_RIGHT .storeSimulatedButtonPress - ld a,b - ld [wSimulatedJoypadStatesEnd],a + ld a, b + ld [wSimulatedJoypadStatesEnd], a xor a - ld [wWastedByteCD39],a + ld [wWastedByteCD39], a inc a - ld [wSimulatedJoypadStatesIndex],a + ld [wSimulatedJoypadStatesIndex], a ret SurfingGotOnText: @@ -756,73 +756,73 @@ ItemUsePokedex: predef_jump ShowPokedexMenu ItemUseEvoStone: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime - ld a,[wWhichPokemon] + jp nz, ItemUseNotTime + ld a, [wWhichPokemon] push af - ld a,[wcf91] - ld [wEvoStoneItemID],a + ld a, [wcf91] + ld [wEvoStoneItemID], a push af - ld a,EVO_STONE_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a - ld a,$ff - ld [wUpdateSpritesEnabled],a + ld a, EVO_STONE_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a + ld a, $ff + ld [wUpdateSpritesEnabled], a call DisplayPartyMenu pop bc - jr c,.canceledItemUse - ld a,b - ld [wcf91],a - ld a,$01 - ld [wForceEvolution],a - ld a,SFX_HEAL_AILMENT + jr c, .canceledItemUse + ld a, b + ld [wcf91], a + ld a, $01 + ld [wForceEvolution], a + ld a, SFX_HEAL_AILMENT call PlaySoundWaitForCurrent call WaitForSoundToFinish callab TryEvolvingMon ; try to evolve pokemon - ld a,[wEvolutionOccurred] + ld a, [wEvolutionOccurred] and a - jr z,.noEffect + jr z, .noEffect pop af - ld [wWhichPokemon],a - ld hl,wNumBagItems - ld a,1 ; remove 1 stone - ld [wItemQuantity],a + ld [wWhichPokemon], a + ld hl, wNumBagItems + ld a, 1 ; remove 1 stone + ld [wItemQuantity], a jp RemoveItemFromInventory .noEffect call ItemUseNoEffect .canceledItemUse xor a - ld [wActionResultOrTookBattleTurn],a ; item not used + ld [wActionResultOrTookBattleTurn], a ; item not used pop af ret ItemUseVitamin: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime + jp nz, ItemUseNotTime ItemUseMedicine: - ld a,[wPartyCount] + ld a, [wPartyCount] and a - jp z,.emptyParty - ld a,[wWhichPokemon] + jp z, .emptyParty + ld a, [wWhichPokemon] push af - ld a,[wcf91] + ld a, [wcf91] push af - ld a,USE_ITEM_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a - ld a,$ff - ld [wUpdateSpritesEnabled],a - ld a,[wPseudoItemID] + ld a, USE_ITEM_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld a, [wPseudoItemID] and a ; using Softboiled? - jr z,.notUsingSoftboiled + jr z, .notUsingSoftboiled ; if using softboiled call GoBackToPartyMenu jr .getPartyMonDataAddress .emptyParty - ld hl,.emptyPartyText + ld hl, .emptyPartyText xor a - ld [wActionResultOrTookBattleTurn],a ; item use failed + ld [wActionResultOrTookBattleTurn], a ; item use failed jp PrintText .emptyPartyText text "You don't have" @@ -831,121 +831,121 @@ ItemUseMedicine: .notUsingSoftboiled call DisplayPartyMenu .getPartyMonDataAddress - jp c,.canceledItemUse - ld hl,wPartyMons - ld bc,wPartyMon2 - wPartyMon1 - ld a,[wWhichPokemon] + jp c, .canceledItemUse + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wWhichPokemon] call AddNTimes - ld a,[wWhichPokemon] - ld [wUsedItemOnWhichPokemon],a - ld d,a - ld a,[wcf91] - ld e,a - ld [wd0b5],a + ld a, [wWhichPokemon] + ld [wUsedItemOnWhichPokemon], a + ld d, a + ld a, [wcf91] + ld e, a + ld [wd0b5], a pop af - ld [wcf91],a + ld [wcf91], a pop af - ld [wWhichPokemon],a - ld a,[wPseudoItemID] + ld [wWhichPokemon], a + ld a, [wPseudoItemID] and a ; using Softboiled? - jr z,.checkItemType + jr z, .checkItemType ; if using softboiled - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] cp d ; is the pokemon trying to use softboiled on itself? - jr z,ItemUseMedicine ; if so, force another choice + jr z, ItemUseMedicine ; if so, force another choice .checkItemType - ld a,[wcf91] - cp a,REVIVE - jr nc,.healHP ; if it's a Revive or Max Revive - cp a,FULL_HEAL - jr z,.cureStatusAilment ; if it's a Full Heal - cp a,HP_UP - jp nc,.useVitamin ; if it's a vitamin or Rare Candy - cp a,FULL_RESTORE - jr nc,.healHP ; if it's a Full Restore or one of the potions + ld a, [wcf91] + cp REVIVE + jr nc, .healHP ; if it's a Revive or Max Revive + cp FULL_HEAL + jr z, .cureStatusAilment ; if it's a Full Heal + cp HP_UP + jp nc, .useVitamin ; if it's a vitamin or Rare Candy + cp FULL_RESTORE + jr nc, .healHP ; if it's a Full Restore or one of the potions ; fall through if it's one of the status-specific healing items .cureStatusAilment - ld bc,wPartyMon1Status - wPartyMon1 - add hl,bc ; hl now points to status - ld a,[wcf91] + ld bc, wPartyMon1Status - wPartyMon1 + add hl, bc ; hl now points to status + ld a, [wcf91] lb bc, ANTIDOTE_MSG, 1 << PSN - cp a,ANTIDOTE - jr z,.checkMonStatus + cp ANTIDOTE + jr z, .checkMonStatus lb bc, BURN_HEAL_MSG, 1 << BRN - cp a,BURN_HEAL - jr z,.checkMonStatus + cp BURN_HEAL + jr z, .checkMonStatus lb bc, ICE_HEAL_MSG, 1 << FRZ - cp a,ICE_HEAL - jr z,.checkMonStatus + cp ICE_HEAL + jr z, .checkMonStatus lb bc, AWAKENING_MSG, SLP - cp a,AWAKENING - jr z,.checkMonStatus + cp AWAKENING + jr z, .checkMonStatus lb bc, PARALYZ_HEAL_MSG, 1 << PAR - cp a,PARLYZ_HEAL - jr z,.checkMonStatus + cp PARLYZ_HEAL + jr z, .checkMonStatus lb bc, FULL_HEAL_MSG, $ff ; Full Heal .checkMonStatus - ld a,[hl] ; pokemon's status + ld a, [hl] ; pokemon's status and c ; does the pokemon have a status ailment the item can cure? - jp z,.healingItemNoEffect + jp z, .healingItemNoEffect ; if the pokemon has a status the item can heal xor a - ld [hl],a ; remove the status ailment in the party data - ld a,b - ld [wPartyMenuTypeOrMessageID],a ; the message to display for the item used - ld a,[wPlayerMonNumber] + ld [hl], a ; remove the status ailment in the party data + ld a, b + ld [wPartyMenuTypeOrMessageID], a ; the message to display for the item used + ld a, [wPlayerMonNumber] cp d ; is pokemon the item was used on active in battle? - jp nz,.doneHealing + jp nz, .doneHealing ; if it is active in battle xor a - ld [wBattleMonStatus],a ; remove the status ailment in the in-battle pokemon data + ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data push hl - ld hl,wPlayerBattleStatus3 - res BADLY_POISONED,[hl] ; heal Toxic status + ld hl, wPlayerBattleStatus3 + res BADLY_POISONED, [hl] ; heal Toxic status pop hl - ld bc,wPartyMon1Stats - wPartyMon1Status - add hl,bc ; hl now points to party stats - ld de,wBattleMonStats - ld bc,NUM_STATS * 2 + ld bc, wPartyMon1Stats - wPartyMon1Status + add hl, bc ; hl now points to party stats + ld de, wBattleMonStats + ld bc, NUM_STATS * 2 call CopyData ; copy party stats to in-battle stat data predef DoubleOrHalveSelectedStats jp .doneHealing .healHP inc hl ; hl = address of current HP - ld a,[hli] - ld b,a - ld [wHPBarOldHP+1],a - ld a,[hl] - ld c,a - ld [wHPBarOldHP],a ; current HP stored at wHPBarOldHP (2 bytes, big-endian) + ld a, [hli] + ld b, a + ld [wHPBarOldHP+1], a + ld a, [hl] + ld c, a + ld [wHPBarOldHP], a ; current HP stored at wHPBarOldHP (2 bytes, big-endian) or b - jr nz,.notFainted + jr nz, .notFainted .fainted - ld a,[wcf91] - cp a,REVIVE - jr z,.updateInBattleFaintedData - cp a,MAX_REVIVE - jr z,.updateInBattleFaintedData + ld a, [wcf91] + cp REVIVE + jr z, .updateInBattleFaintedData + cp MAX_REVIVE + jr z, .updateInBattleFaintedData jp .healingItemNoEffect .updateInBattleFaintedData - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jr z,.compareCurrentHPToMaxHP + jr z, .compareCurrentHPToMaxHP push hl push de push bc - ld a,[wUsedItemOnWhichPokemon] - ld c,a - ld hl,wPartyFoughtCurrentEnemyFlags - ld b,FLAG_TEST + ld a, [wUsedItemOnWhichPokemon] + ld c, a + ld hl, wPartyFoughtCurrentEnemyFlags + ld b, FLAG_TEST predef FlagActionPredef - ld a,c + ld a, c and a - jr z,.next - ld a,[wUsedItemOnWhichPokemon] - ld c,a - ld hl,wPartyGainExpFlags - ld b,FLAG_SET + jr z, .next + ld a, [wUsedItemOnWhichPokemon] + ld c, a + ld hl, wPartyGainExpFlags + ld b, FLAG_SET predef FlagActionPredef .next pop bc @@ -953,467 +953,467 @@ ItemUseMedicine: pop hl jr .compareCurrentHPToMaxHP .notFainted - ld a,[wcf91] - cp a,REVIVE - jp z,.healingItemNoEffect - cp a,MAX_REVIVE - jp z,.healingItemNoEffect + ld a, [wcf91] + cp REVIVE + jp z, .healingItemNoEffect + cp MAX_REVIVE + jp z, .healingItemNoEffect .compareCurrentHPToMaxHP push hl push bc - ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) - add hl,bc ; hl now points to max HP + ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) + add hl, bc ; hl now points to max HP pop bc - ld a,[hli] + ld a, [hli] cp b - jr nz,.skipComparingLSB ; no need to compare the LSB's if the MSB's don't match - ld a,[hl] + jr nz, .skipComparingLSB ; no need to compare the LSB's if the MSB's don't match + ld a, [hl] cp c .skipComparingLSB pop hl - jr nz,.notFullHP + jr nz, .notFullHP .fullHP ; if the pokemon's current HP equals its max HP - ld a,[wcf91] - cp a,FULL_RESTORE - jp nz,.healingItemNoEffect + ld a, [wcf91] + cp FULL_RESTORE + jp nz, .healingItemNoEffect inc hl inc hl - ld a,[hld] ; status ailment + ld a, [hld] ; status ailment and a ; does the pokemon have a status ailment? - jp z,.healingItemNoEffect - ld a,FULL_HEAL - ld [wcf91],a + jp z, .healingItemNoEffect + ld a, FULL_HEAL + ld [wcf91], a dec hl dec hl dec hl jp .cureStatusAilment .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a - ld [wLowHealthAlarm],a ;disable low health alarm - ld [wChannelSoundIDs + Ch4],a + ld [wLowHealthAlarm], a ;disable low health alarm + ld [wChannelSoundIDs + Ch4], a push hl push de - ld bc,wPartyMon1MaxHP - (wPartyMon1HP + 1) - add hl,bc ; hl now points to max HP - ld a,[hli] - ld [wHPBarMaxHP+1],a - ld a,[hl] - ld [wHPBarMaxHP],a ; max HP stored at wHPBarMaxHP (2 bytes, big-endian) - ld a,[wPseudoItemID] + ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) + add hl, bc ; hl now points to max HP + ld a, [hli] + ld [wHPBarMaxHP+1], a + ld a, [hl] + ld [wHPBarMaxHP], a ; max HP stored at wHPBarMaxHP (2 bytes, big-endian) + ld a, [wPseudoItemID] and a ; using Softboiled? - jp z,.notUsingSoftboiled2 + jp z, .notUsingSoftboiled2 ; if using softboiled - ld hl,wHPBarMaxHP - ld a,[hli] + ld hl, wHPBarMaxHP + ld a, [hli] push af - ld a,[hli] + ld a, [hli] push af - ld a,[hli] + ld a, [hli] push af - ld a,[hl] + ld a, [hl] push af - ld hl,wPartyMon1MaxHP - ld a,[wWhichPokemon] - ld bc,wPartyMon2 - wPartyMon1 + ld hl, wPartyMon1MaxHP + ld a, [wWhichPokemon] + ld bc, wPartyMon2 - wPartyMon1 call AddNTimes - ld a,[hli] - ld [wHPBarMaxHP + 1],a - ld [H_DIVIDEND],a - ld a,[hl] - ld [wHPBarMaxHP],a - ld [H_DIVIDEND + 1],a - ld a,5 - ld [H_DIVISOR],a - ld b,2 ; number of bytes + ld a, [hli] + ld [wHPBarMaxHP + 1], a + ld [H_DIVIDEND], a + ld a, [hl] + ld [wHPBarMaxHP], a + ld [H_DIVIDEND + 1], a + ld a, 5 + ld [H_DIVISOR], a + ld b, 2 ; number of bytes call Divide ; get 1/5 of max HP of pokemon that used Softboiled - ld bc,(wPartyMon1HP + 1) - (wPartyMon1MaxHP + 1) - add hl,bc ; hl now points to LSB of current HP of pokemon that used Softboiled + ld bc, (wPartyMon1HP + 1) - (wPartyMon1MaxHP + 1) + add hl, bc ; hl now points to LSB of current HP of pokemon that used Softboiled ; subtract 1/5 of max HP from current HP of pokemon that used Softboiled - ld a,[H_QUOTIENT + 3] + ld a, [H_QUOTIENT + 3] push af - ld b,a - ld a,[hl] - ld [wHPBarOldHP],a + ld b, a + ld a, [hl] + ld [wHPBarOldHP], a sub b - ld [hld],a - ld [wHPBarNewHP],a - ld a,[H_QUOTIENT + 2] - ld b,a - ld a,[hl] - ld [wHPBarOldHP+1],a + ld [hld], a + ld [wHPBarNewHP], a + ld a, [H_QUOTIENT + 2] + ld b, a + ld a, [hl] + ld [wHPBarOldHP+1], a sbc b - ld [hl],a - ld [wHPBarNewHP+1],a + ld [hl], a + ld [wHPBarNewHP+1], a coord hl, 4, 1 - ld a,[wWhichPokemon] - ld bc,2 * SCREEN_WIDTH + ld a, [wWhichPokemon] + ld bc, 2 * SCREEN_WIDTH call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled - ld a,SFX_HEAL_HP + ld a, SFX_HEAL_HP call PlaySoundWaitForCurrent - ld a,[hFlags_0xFFF6] - set 0,a - ld [hFlags_0xFFF6],a - ld a,$02 - ld [wHPBarType],a + ld a, [hFlags_0xFFF6] + set 0, a + ld [hFlags_0xFFF6], a + ld a, $02 + ld [wHPBarType], a predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled - ld a,[hFlags_0xFFF6] - res 0,a - ld [hFlags_0xFFF6],a + ld a, [hFlags_0xFFF6] + res 0, a + ld [hFlags_0xFFF6], a pop af - ld b,a ; store heal amount (1/5 of max HP) - ld hl,wHPBarOldHP + 1 + ld b, a ; store heal amount (1/5 of max HP) + ld hl, wHPBarOldHP + 1 pop af - ld [hld],a + ld [hld], a pop af - ld [hld],a + ld [hld], a pop af - ld [hld],a + ld [hld], a pop af - ld [hl],a + ld [hl], a jr .addHealAmount .notUsingSoftboiled2 - ld a,[wcf91] - cp a,SODA_POP - ld b,60 ; Soda Pop heal amount - jr z,.addHealAmount - ld b,80 ; Lemonade heal amount - jr nc,.addHealAmount - cp a,FRESH_WATER - ld b,50 ; Fresh Water heal amount - jr z,.addHealAmount - cp a,SUPER_POTION - ld b,200 ; Hyper Potion heal amount - jr c,.addHealAmount - ld b,50 ; Super Potion heal amount - jr z,.addHealAmount - ld b,20 ; Potion heal amount + ld a, [wcf91] + cp SODA_POP + ld b, 60 ; Soda Pop heal amount + jr z, .addHealAmount + ld b, 80 ; Lemonade heal amount + jr nc, .addHealAmount + cp FRESH_WATER + ld b, 50 ; Fresh Water heal amount + jr z, .addHealAmount + cp SUPER_POTION + ld b, 200 ; Hyper Potion heal amount + jr c, .addHealAmount + ld b, 50 ; Super Potion heal amount + jr z, .addHealAmount + ld b, 20 ; Potion heal amount .addHealAmount pop de pop hl - ld a,[hl] + ld a, [hl] add b - ld [hld],a - ld [wHPBarNewHP],a - ld a,[hl] - ld [wHPBarNewHP+1],a - jr nc,.noCarry + ld [hld], a + ld [wHPBarNewHP], a + ld a, [hl] + ld [wHPBarNewHP+1], a + jr nc, .noCarry inc [hl] - ld a,[hl] - ld [wHPBarNewHP + 1],a + ld a, [hl] + ld [wHPBarNewHP + 1], a .noCarry push de inc hl - ld d,h - ld e,l ; de now points to current HP - ld hl,(wPartyMon1MaxHP + 1) - (wPartyMon1HP + 1) - add hl,de ; hl now points to max HP - ld a,[wcf91] - cp a,REVIVE - jr z,.setCurrentHPToHalfMaxHP - ld a,[hld] - ld b,a - ld a,[de] + ld d, h + ld e, l ; de now points to current HP + ld hl, (wPartyMon1MaxHP + 1) - (wPartyMon1HP + 1) + add hl, de ; hl now points to max HP + ld a, [wcf91] + cp REVIVE + jr z, .setCurrentHPToHalfMaxHP + ld a, [hld] + ld b, a + ld a, [de] sub b dec de - ld b,[hl] - ld a,[de] + ld b, [hl] + ld a, [de] sbc b - jr nc,.setCurrentHPToMaxHp ; if current HP exceeds max HP after healing - ld a,[wcf91] - cp a,HYPER_POTION - jr c,.setCurrentHPToMaxHp ; if using a Full Restore or Max Potion - cp a,MAX_REVIVE - jr z,.setCurrentHPToMaxHp ; if using a Max Revive + jr nc, .setCurrentHPToMaxHp ; if current HP exceeds max HP after healing + ld a, [wcf91] + cp HYPER_POTION + jr c, .setCurrentHPToMaxHp ; if using a Full Restore or Max Potion + cp MAX_REVIVE + jr z, .setCurrentHPToMaxHp ; if using a Max Revive jr .updateInBattleData .setCurrentHPToHalfMaxHP dec hl dec de - ld a,[hli] + ld a, [hli] srl a - ld [de],a - ld [wHPBarNewHP+1],a - ld a,[hl] + ld [de], a + ld [wHPBarNewHP+1], a + ld a, [hl] rr a inc de - ld [de],a - ld [wHPBarNewHP],a + ld [de], a + ld [wHPBarNewHP], a dec de jr .doneHealingPartyHP .setCurrentHPToMaxHp - ld a,[hli] - ld [de],a - ld [wHPBarNewHP+1],a + ld a, [hli] + ld [de], a + ld [wHPBarNewHP+1], a inc de - ld a,[hl] - ld [de],a - ld [wHPBarNewHP],a + ld a, [hl] + ld [de], a + ld [wHPBarNewHP], a dec de .doneHealingPartyHP ; done updating the pokemon's current HP in the party data structure - ld a,[wcf91] - cp a,FULL_RESTORE - jr nz,.updateInBattleData - ld bc,wPartyMon1Status - (wPartyMon1MaxHP + 1) - add hl,bc + ld a, [wcf91] + cp FULL_RESTORE + jr nz, .updateInBattleData + ld bc, wPartyMon1Status - (wPartyMon1MaxHP + 1) + add hl, bc xor a - ld [hl],a ; remove the status ailment in the party data + ld [hl], a ; remove the status ailment in the party data .updateInBattleData - ld h,d - ld l,e + ld h, d + ld l, e pop de - ld a,[wPlayerMonNumber] + ld a, [wPlayerMonNumber] cp d ; is pokemon the item was used on active in battle? - jr nz,.calculateHPBarCoords + jr nz, .calculateHPBarCoords ; copy party HP to in-battle HP - ld a,[hli] - ld [wBattleMonHP],a - ld a,[hld] - ld [wBattleMonHP + 1],a - ld a,[wcf91] - cp a,FULL_RESTORE - jr nz,.calculateHPBarCoords + ld a, [hli] + ld [wBattleMonHP], a + ld a, [hld] + ld [wBattleMonHP + 1], a + ld a, [wcf91] + cp FULL_RESTORE + jr nz, .calculateHPBarCoords xor a - ld [wBattleMonStatus],a ; remove the status ailment in the in-battle pokemon data + ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data .calculateHPBarCoords - ld hl,wOAMBuffer + $90 - ld bc,2 * SCREEN_WIDTH + ld hl, wOAMBuffer + $90 + ld bc, 2 * SCREEN_WIDTH inc d .calculateHPBarCoordsLoop - add hl,bc + add hl, bc dec d - jr nz,.calculateHPBarCoordsLoop + jr nz, .calculateHPBarCoordsLoop jr .doneHealing .healingItemNoEffect call ItemUseNoEffect jp .done .doneHealing - ld a,[wPseudoItemID] + ld a, [wPseudoItemID] and a ; using Softboiled? - jr nz,.skipRemovingItem ; no item to remove if using Softboiled + jr nz, .skipRemovingItem ; no item to remove if using Softboiled push hl call RemoveUsedItem pop hl .skipRemovingItem - ld a,[wcf91] - cp a,FULL_RESTORE - jr c,.playStatusAilmentCuringSound - cp a,FULL_HEAL - jr z,.playStatusAilmentCuringSound - ld a,SFX_HEAL_HP + ld a, [wcf91] + cp FULL_RESTORE + jr c, .playStatusAilmentCuringSound + cp FULL_HEAL + jr z, .playStatusAilmentCuringSound + ld a, SFX_HEAL_HP call PlaySoundWaitForCurrent - ld a,[hFlags_0xFFF6] - set 0,a - ld [hFlags_0xFFF6],a - ld a,$02 - ld [wHPBarType],a + ld a, [hFlags_0xFFF6] + set 0, a + ld [hFlags_0xFFF6], a + ld a, $02 + ld [wHPBarType], a predef UpdateHPBar2 ; animate the HP bar lengthening - ld a,[hFlags_0xFFF6] - res 0,a - ld [hFlags_0xFFF6],a - ld a,REVIVE_MSG - ld [wPartyMenuTypeOrMessageID],a - ld a,[wcf91] - cp a,REVIVE - jr z,.showHealingItemMessage - cp a,MAX_REVIVE - jr z,.showHealingItemMessage - ld a,POTION_MSG - ld [wPartyMenuTypeOrMessageID],a + ld a, [hFlags_0xFFF6] + res 0, a + ld [hFlags_0xFFF6], a + ld a, REVIVE_MSG + ld [wPartyMenuTypeOrMessageID], a + ld a, [wcf91] + cp REVIVE + jr z, .showHealingItemMessage + cp MAX_REVIVE + jr z, .showHealingItemMessage + ld a, POTION_MSG + ld [wPartyMenuTypeOrMessageID], a jr .showHealingItemMessage .playStatusAilmentCuringSound - ld a,SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySoundWaitForCurrent .showHealingItemMessage xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a call ClearScreen dec a - ld [wUpdateSpritesEnabled],a + ld [wUpdateSpritesEnabled], a call RedrawPartyMenu ; redraws the party menu and displays the message - ld a,1 - ld [H_AUTOBGTRANSFERENABLED],a - ld c,50 + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a + ld c, 50 call DelayFrames call WaitForTextScrollButtonPress jr .done .canceledItemUse xor a - ld [wActionResultOrTookBattleTurn],a ; item use failed + ld [wActionResultOrTookBattleTurn], a ; item use failed pop af pop af .done - ld a,[wPseudoItemID] + ld a, [wPseudoItemID] and a ; using Softboiled? ret nz ; if so, return call GBPalWhiteOut - call z,RunDefaultPaletteCommand - ld a,[wIsInBattle] + call z, RunDefaultPaletteCommand + ld a, [wIsInBattle] and a ret nz jp ReloadMapData .useVitamin push hl - ld a,[hl] - ld [wd0b5],a - ld [wd11e],a - ld bc,wPartyMon1Level - wPartyMon1 - add hl,bc ; hl now points to level - ld a,[hl] ; a = level - ld [wCurEnemyLVL],a ; store level + ld a, [hl] + ld [wd0b5], a + ld [wd11e], a + ld bc, wPartyMon1Level - wPartyMon1 + add hl, bc ; hl now points to level + ld a, [hl] ; a = level + ld [wCurEnemyLVL], a ; store level call GetMonHeader push de - ld a,d - ld hl,wPartyMonNicks + ld a, d + ld hl, wPartyMonNicks call GetPartyMonName pop de pop hl - ld a,[wcf91] - cp a,RARE_CANDY - jp z,.useRareCandy + ld a, [wcf91] + cp RARE_CANDY + jp z, .useRareCandy push hl - sub a,HP_UP + sub HP_UP add a - ld bc,wPartyMon1HPExp - wPartyMon1 - add hl,bc + ld bc, wPartyMon1HPExp - wPartyMon1 + add hl, bc add l - ld l,a - jr nc,.noCarry2 + ld l, a + jr nc, .noCarry2 inc h .noCarry2 - ld a,10 - ld b,a - ld a,[hl] ; a = MSB of stat experience of the appropriate stat - cp a,100 ; is there already at least 25600 (256 * 100) stat experience? - jr nc,.vitaminNoEffect ; if so, vitamins can't add any more + ld a, 10 + ld b, a + ld a, [hl] ; a = MSB of stat experience of the appropriate stat + cp 100 ; is there already at least 25600 (256 * 100) stat experience? + jr nc, .vitaminNoEffect ; if so, vitamins can't add any more add b ; add 2560 (256 * 10) stat experience - jr nc,.noCarry3 ; a carry should be impossible here, so this will always jump - ld a,255 + jr nc, .noCarry3 ; a carry should be impossible here, so this will always jump + ld a, 255 .noCarry3 - ld [hl],a + ld [hl], a pop hl call .recalculateStats - ld hl,VitaminText - ld a,[wcf91] - sub a,HP_UP - 1 - ld c,a + ld hl, VitaminText + ld a, [wcf91] + sub HP_UP - 1 + ld c, a .statNameLoop ; loop to get the address of the name of the stat the vitamin increases dec c - jr z,.gotStatName + jr z, .gotStatName .statNameInnerLoop - ld a,[hli] - ld b,a - ld a,$50 + ld a, [hli] + ld b, a + ld a, $50 cp b - jr nz,.statNameInnerLoop + jr nz, .statNameInnerLoop jr .statNameLoop .gotStatName - ld de,wcf4b - ld bc,10 + ld de, wcf4b + ld bc, 10 call CopyData ; copy the stat's name to wcf4b - ld a,SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySound - ld hl,VitaminStatRoseText + ld hl, VitaminStatRoseText call PrintText jp RemoveUsedItem .vitaminNoEffect pop hl - ld hl,VitaminNoEffectText + ld hl, VitaminNoEffectText call PrintText jp GBPalWhiteOut .recalculateStats - ld bc,wPartyMon1Stats - wPartyMon1 - add hl,bc - ld d,h - ld e,l ; de now points to stats - ld bc,(wPartyMon1Exp + 2) - wPartyMon1Stats - add hl,bc ; hl now points to LSB of experience - ld b,1 + ld bc, wPartyMon1Stats - wPartyMon1 + add hl, bc + ld d, h + ld e, l ; de now points to stats + ld bc, (wPartyMon1Exp + 2) - wPartyMon1Stats + add hl, bc ; hl now points to LSB of experience + ld b, 1 jp CalcStats ; recalculate stats .useRareCandy push hl - ld bc,wPartyMon1Level - wPartyMon1 - add hl,bc ; hl now points to level - ld a,[hl] ; a = level - cp a, MAX_LEVEL - jr z,.vitaminNoEffect ; can't raise level above 100 + ld bc, wPartyMon1Level - wPartyMon1 + add hl, bc ; hl now points to level + ld a, [hl] ; a = level + cp MAX_LEVEL + jr z, .vitaminNoEffect ; can't raise level above 100 inc a - ld [hl],a ; store incremented level - ld [wCurEnemyLVL],a + ld [hl], a ; store incremented level + ld [wCurEnemyLVL], a push hl push de - ld d,a + ld d, a callab CalcExperience ; calculate experience for next level and store it at $ff96 pop de pop hl - ld bc,wPartyMon1Exp - wPartyMon1Level - add hl,bc ; hl now points to MSB of experience + ld bc, wPartyMon1Exp - wPartyMon1Level + add hl, bc ; hl now points to MSB of experience ; update experience to minimum for new level - ld a,[hExperience] - ld [hli],a - ld a,[hExperience + 1] - ld [hli],a - ld a,[hExperience + 2] - ld [hl],a + ld a, [hExperience] + ld [hli], a + ld a, [hExperience + 1] + ld [hli], a + ld a, [hExperience + 2] + ld [hl], a pop hl - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] push af - ld a,[wcf91] + ld a, [wcf91] push af push de push hl - ld bc,wPartyMon1MaxHP - wPartyMon1 - add hl,bc ; hl now points to MSB of max HP - ld a,[hli] - ld b,a - ld c,[hl] + ld bc, wPartyMon1MaxHP - wPartyMon1 + add hl, bc ; hl now points to MSB of max HP + ld a, [hli] + ld b, a + ld c, [hl] pop hl push bc push hl call .recalculateStats pop hl - ld bc,(wPartyMon1MaxHP + 1) - wPartyMon1 - add hl,bc ; hl now points to LSB of max HP + ld bc, (wPartyMon1MaxHP + 1) - wPartyMon1 + add hl, bc ; hl now points to LSB of max HP pop bc - ld a,[hld] + ld a, [hld] sub c - ld c,a - ld a,[hl] + ld c, a + ld a, [hl] sbc b - ld b,a ; bc = the amount of max HP gained from leveling up + ld b, a ; bc = the amount of max HP gained from leveling up ; add the amount gained to the current HP - ld de,(wPartyMon1HP + 1) - wPartyMon1MaxHP - add hl,de ; hl now points to LSB of current HP - ld a,[hl] + ld de, (wPartyMon1HP + 1) - wPartyMon1MaxHP + add hl, de ; hl now points to LSB of current HP + ld a, [hl] add c - ld [hld],a - ld a,[hl] + ld [hld], a + ld a, [hl] adc b - ld [hl],a - ld a,RARE_CANDY_MSG - ld [wPartyMenuTypeOrMessageID],a + ld [hl], a + ld a, RARE_CANDY_MSG + ld [wPartyMenuTypeOrMessageID], a call RedrawPartyMenu pop de - ld a,d - ld [wWhichPokemon],a - ld a,e - ld [wd11e],a + ld a, d + ld [wWhichPokemon], a + ld a, e + ld [wd11e], a xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation],a + ld [wMonDataLocation], a call LoadMonData - ld d,$01 + ld d, $01 callab PrintStatsBox ; display new stats text box call WaitForTextScrollButtonPress ; wait for button press xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation],a + ld [wMonDataLocation], a predef LearnMoveFromLevelUp ; learn level up move, if any xor a - ld [wForceEvolution],a + ld [wForceEvolution], a callab TryEvolvingMon ; evolve pokemon, if appropriate - ld a,$01 - ld [wUpdateSpritesEnabled],a + ld a, $01 + ld [wUpdateSpritesEnabled], a pop af - ld [wcf91],a + ld [wcf91], a pop af - ld [wWhichPokemon],a + ld [wWhichPokemon], a jp RemoveUsedItem VitaminStatRoseText: @@ -1432,50 +1432,50 @@ VitaminText: db "SPECIAL@" ItemUseBait: - ld hl,ThrewBaitText + ld hl, ThrewBaitText call PrintText - ld hl,wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonCatchRate ; catch rate srl [hl] ; halve catch rate - ld a,BAIT_ANIM - ld hl,wSafariBaitFactor ; bait factor - ld de,wSafariEscapeFactor ; escape factor + ld a, BAIT_ANIM + ld hl, wSafariBaitFactor ; bait factor + ld de, wSafariEscapeFactor ; escape factor jr BaitRockCommon ItemUseRock: - ld hl,ThrewRockText + ld hl, ThrewRockText call PrintText - ld hl,wEnemyMonCatchRate ; catch rate - ld a,[hl] + ld hl, wEnemyMonCatchRate ; catch rate + ld a, [hl] add a ; double catch rate - jr nc,.noCarry - ld a,$ff + jr nc, .noCarry + ld a, $ff .noCarry - ld [hl],a - ld a,ROCK_ANIM - ld hl,wSafariEscapeFactor ; escape factor - ld de,wSafariBaitFactor ; bait factor + ld [hl], a + ld a, ROCK_ANIM + ld hl, wSafariEscapeFactor ; escape factor + ld de, wSafariBaitFactor ; bait factor BaitRockCommon: - ld [wAnimationID],a + ld [wAnimationID], a xor a - ld [wAnimationType],a - ld [H_WHOSETURN],a - ld [de],a ; zero escape factor (for bait), zero bait factor (for rock) + ld [wAnimationType], a + ld [H_WHOSETURN], a + ld [de], a ; zero escape factor (for bait), zero bait factor (for rock) .randomLoop ; loop until a random number less than 5 is generated call Random - and a,7 - cp a,5 - jr nc,.randomLoop + and 7 + cp 5 + jr nc, .randomLoop inc a ; increment the random number, giving a range from 1 to 5 inclusive - ld b,a - ld a,[hl] + ld b, a + ld a, [hl] add b ; increase bait factor (for bait), increase escape factor (for rock) - jr nc,.noCarry - ld a,$ff + jr nc, .noCarry + ld a, $ff .noCarry - ld [hl],a + ld [hl], a predef MoveAnimation ; do animation - ld c,70 + ld c, 70 jp DelayFrames ThrewBaitText: @@ -1488,38 +1488,38 @@ ThrewRockText: ; also used for Dig out-of-battle effect ItemUseEscapeRope: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jr nz,.notUsable - ld a,[wCurMap] - cp a,AGATHAS_ROOM - jr z,.notUsable - ld a,[wCurMapTileset] - ld b,a - ld hl,EscapeRopeTilesets + jr nz, .notUsable + ld a, [wCurMap] + cp AGATHAS_ROOM + jr z, .notUsable + ld a, [wCurMapTileset] + ld b, a + ld hl, EscapeRopeTilesets .loop - ld a,[hli] - cp a,$ff - jr z,.notUsable + ld a, [hli] + cp $ff + jr z, .notUsable cp b - jr nz,.loop - ld hl,wd732 - set 3,[hl] - set 6,[hl] - ld hl,wd72e - res 4,[hl] + jr nz, .loop + ld hl, wd732 + set 3, [hl] + set 6, [hl] + ld hl, wd72e + res 4, [hl] ResetEvent EVENT_IN_SAFARI_ZONE xor a - ld [wNumSafariBalls],a - ld [wSafariZoneEntranceCurScript],a + ld [wNumSafariBalls], a + ld [wSafariZoneEntranceCurScript], a inc a - ld [wEscapedFromBattle],a - ld [wActionResultOrTookBattleTurn],a ; item used - ld a,[wPseudoItemID] + ld [wEscapedFromBattle], a + ld [wActionResultOrTookBattleTurn], a ; item used + ld a, [wPseudoItemID] and a ; using Dig? ret nz ; if so, return call ItemUseReloadOverworldData - ld c,30 + ld c, 30 call DelayFrames jp RemoveUsedItem .notUsable @@ -1530,62 +1530,62 @@ EscapeRopeTilesets: db $ff ; terminator ItemUseRepel: - ld b,100 + ld b, 100 ItemUseRepelCommon: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime - ld a,b - ld [wRepelRemainingSteps],a + jp nz, ItemUseNotTime + ld a, b + ld [wRepelRemainingSteps], a jp PrintItemUseTextAndRemoveItem ; handles X Accuracy item ItemUseXAccuracy: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp z,ItemUseNotTime - ld hl,wPlayerBattleStatus2 - set USING_X_ACCURACY,[hl] ; X Accuracy bit + jp z, ItemUseNotTime + ld hl, wPlayerBattleStatus2 + set USING_X_ACCURACY, [hl] ; X Accuracy bit jp PrintItemUseTextAndRemoveItem ; This function is bugged and never works. It always jumps to ItemUseNotTime. ; The Card Key is handled in a different way. ItemUseCardKey: xor a - ld [wUnusedD71F],a + ld [wUnusedD71F], a call GetTileAndCoordsInFrontOfPlayer - ld a,[GetTileAndCoordsInFrontOfPlayer] - cp a,$18 - jr nz,.next0 - ld hl,CardKeyTable1 + ld a, [GetTileAndCoordsInFrontOfPlayer] + cp $18 + jr nz, .next0 + ld hl, CardKeyTable1 jr .next1 .next0 - cp a,$24 - jr nz,.next2 - ld hl,CardKeyTable2 + cp $24 + jr nz, .next2 + ld hl, CardKeyTable2 jr .next1 .next2 - cp a,$5e - jp nz,ItemUseNotTime - ld hl,CardKeyTable3 + cp $5e + jp nz, ItemUseNotTime + ld hl, CardKeyTable3 .next1 - ld a,[wCurMap] - ld b,a + ld a, [wCurMap] + ld b, a .loop - ld a,[hli] - cp a,$ff - jp z,ItemUseNotTime + ld a, [hli] + cp $ff + jp z, ItemUseNotTime cp b - jr nz,.nextEntry1 - ld a,[hli] + jr nz, .nextEntry1 + ld a, [hli] cp d - jr nz,.nextEntry2 - ld a,[hli] + jr nz, .nextEntry2 + ld a, [hli] cp e - jr nz,.nextEntry3 - ld a,[hl] - ld [wUnusedD71F],a + jr nz, .nextEntry3 + ld a, [hl] + ld [wUnusedD71F], a jr .done .nextEntry1 inc hl @@ -1595,10 +1595,10 @@ ItemUseCardKey: inc hl jr .loop .done - ld hl,ItemUseText00 + ld hl, ItemUseText00 call PrintText - ld hl,wd728 - set 7,[hl] + ld hl, wd728 + set 7, [hl] ret ; These tables are probably supposed to be door locations in Silph Co., @@ -1643,145 +1643,145 @@ CardKeyTable3: db $ff ItemUsePokedoll: - ld a,[wIsInBattle] + ld a, [wIsInBattle] dec a - jp nz,ItemUseNotTime - ld a,$01 - ld [wEscapedFromBattle],a + jp nz, ItemUseNotTime + ld a, $01 + ld [wEscapedFromBattle], a jp PrintItemUseTextAndRemoveItem ItemUseGuardSpec: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp z,ItemUseNotTime - ld hl,wPlayerBattleStatus2 - set PROTECTED_BY_MIST,[hl] ; Mist bit + jp z, ItemUseNotTime + ld hl, wPlayerBattleStatus2 + set PROTECTED_BY_MIST, [hl] ; Mist bit jp PrintItemUseTextAndRemoveItem ItemUseSuperRepel: - ld b,200 + ld b, 200 jp ItemUseRepelCommon ItemUseMaxRepel: - ld b,250 + ld b, 250 jp ItemUseRepelCommon ItemUseDireHit: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp z,ItemUseNotTime - ld hl,wPlayerBattleStatus2 - set GETTING_PUMPED,[hl] ; Focus Energy bit + jp z, ItemUseNotTime + ld hl, wPlayerBattleStatus2 + set GETTING_PUMPED, [hl] ; Focus Energy bit jp PrintItemUseTextAndRemoveItem ItemUseXStat: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jr nz,.inBattle + jr nz, .inBattle call ItemUseNotTime - ld a,2 - ld [wActionResultOrTookBattleTurn],a ; item not used + ld a, 2 + ld [wActionResultOrTookBattleTurn], a ; item not used ret .inBattle - ld hl,wPlayerMoveNum - ld a,[hli] + ld hl, wPlayerMoveNum + ld a, [hli] push af ; save [wPlayerMoveNum] - ld a,[hl] + ld a, [hl] push af ; save [wPlayerMoveEffect] push hl - ld a,[wcf91] - sub a,X_ATTACK - ATTACK_UP1_EFFECT - ld [hl],a ; store player move effect + ld a, [wcf91] + sub X_ATTACK - ATTACK_UP1_EFFECT + ld [hl], a ; store player move effect call PrintItemUseTextAndRemoveItem - ld a,XSTATITEM_ANIM ; X stat item animation ID - ld [wPlayerMoveNum],a + ld a, XSTATITEM_ANIM ; X stat item animation ID + ld [wPlayerMoveNum], a call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 xor a - ld [H_WHOSETURN],a ; set turn to player's turn + ld [H_WHOSETURN], a ; set turn to player's turn callba StatModifierUpEffect ; do stat increase move pop hl pop af - ld [hld],a ; restore [wPlayerMoveEffect] + ld [hld], a ; restore [wPlayerMoveEffect] pop af - ld [hl],a ; restore [wPlayerMoveNum] + ld [hl], a ; restore [wPlayerMoveNum] ret ItemUsePokeflute: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jr nz,.inBattle + jr nz, .inBattle ; if not in battle call ItemUseReloadOverworldData - ld a,[wCurMap] - cp a,ROUTE_12 - jr nz,.notRoute12 + ld a, [wCurMap] + cp ROUTE_12 + jr nz, .notRoute12 CheckEvent EVENT_BEAT_ROUTE12_SNORLAX - jr nz,.noSnorlaxToWakeUp + jr nz, .noSnorlaxToWakeUp ; if the player hasn't beaten Route 12 Snorlax - ld hl,Route12SnorlaxFluteCoords + ld hl, Route12SnorlaxFluteCoords call ArePlayerCoordsInArray - jr nc,.noSnorlaxToWakeUp - ld hl,PlayedFluteHadEffectText + jr nc, .noSnorlaxToWakeUp + ld hl, PlayedFluteHadEffectText call PrintText SetEvent EVENT_FIGHT_ROUTE12_SNORLAX ret .notRoute12 - cp a,ROUTE_16 - jr nz,.noSnorlaxToWakeUp + cp ROUTE_16 + jr nz, .noSnorlaxToWakeUp CheckEvent EVENT_BEAT_ROUTE16_SNORLAX - jr nz,.noSnorlaxToWakeUp + jr nz, .noSnorlaxToWakeUp ; if the player hasn't beaten Route 16 Snorlax - ld hl,Route16SnorlaxFluteCoords + ld hl, Route16SnorlaxFluteCoords call ArePlayerCoordsInArray - jr nc,.noSnorlaxToWakeUp - ld hl,PlayedFluteHadEffectText + jr nc, .noSnorlaxToWakeUp + ld hl, PlayedFluteHadEffectText call PrintText SetEvent EVENT_FIGHT_ROUTE16_SNORLAX ret .noSnorlaxToWakeUp - ld hl,PlayedFluteNoEffectText + ld hl, PlayedFluteNoEffectText jp PrintText .inBattle xor a - ld [wWereAnyMonsAsleep],a - ld b,~SLP & $ff - ld hl,wPartyMon1Status + ld [wWereAnyMonsAsleep], a + ld b, ~SLP & $ff + ld hl, wPartyMon1Status call WakeUpEntireParty - ld a,[wIsInBattle] + ld a, [wIsInBattle] dec a ; is it a trainer battle? - jr z,.skipWakingUpEnemyParty + jr z, .skipWakingUpEnemyParty ; if it's a trainer battle - ld hl,wEnemyMon1Status + ld hl, wEnemyMon1Status call WakeUpEntireParty .skipWakingUpEnemyParty - ld hl,wBattleMonStatus - ld a,[hl] + ld hl, wBattleMonStatus + ld a, [hl] and b ; remove Sleep status - ld [hl],a - ld hl,wEnemyMonStatus - ld a,[hl] + ld [hl], a + ld hl, wEnemyMonStatus + ld a, [hl] and b ; remove Sleep status - ld [hl],a + ld [hl], a call LoadScreenTilesFromBuffer2 ; restore saved screen - ld a,[wWereAnyMonsAsleep] + ld a, [wWereAnyMonsAsleep] and a ; were any pokemon asleep before playing the flute? - ld hl,PlayedFluteNoEffectText - jp z,PrintText ; if no pokemon were asleep + ld hl, PlayedFluteNoEffectText + jp z, PrintText ; if no pokemon were asleep ; if some pokemon were asleep - ld hl,PlayedFluteHadEffectText + ld hl, PlayedFluteHadEffectText call PrintText - ld a,[wLowHealthAlarm] - and a,$80 - jr nz,.skipMusic + ld a, [wLowHealthAlarm] + and $80 + jr nz, .skipMusic call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + Ch6] + ld a, [wChannelSoundIDs + Ch6] and a ; music off? - jr nz,.musicWaitLoop + jr nz, .musicWaitLoop .skipMusic - ld hl,FluteWokeUpText + ld hl, FluteWokeUpText jp PrintText ; wakes up all party pokemon @@ -1792,22 +1792,22 @@ ItemUsePokeflute: ; OUTPUT: ; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep WakeUpEntireParty: - ld de,44 - ld c,6 + ld de, 44 + ld c, 6 .loop - ld a,[hl] + ld a, [hl] push af - and a,SLP ; is pokemon asleep? - jr z,.notAsleep - ld a,1 - ld [wWereAnyMonsAsleep],a ; indicate that a pokemon had to be woken up + and SLP ; is pokemon asleep? + jr z, .notAsleep + ld a, 1 + ld [wWereAnyMonsAsleep], a ; indicate that a pokemon had to be woken up .notAsleep pop af and b ; remove Sleep status - ld [hl],a - add hl,de + ld [hl], a + add hl, de dec c - jr nz,.loop + jr nz, .loop ret ; Format: @@ -1840,28 +1840,28 @@ PlayedFluteHadEffectText: TX_FAR _PlayedFluteHadEffectText TX_BLINK TX_ASM - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jr nz,.done + jr nz, .done ; play out-of-battle pokeflute music - ld a,$ff + ld a, $ff call PlaySound ; turn off music ld a, SFX_POKEFLUTE ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + Ch2] - cp a, SFX_POKEFLUTE - jr z,.musicWaitLoop + ld a, [wChannelSoundIDs + Ch2] + cp SFX_POKEFLUTE + jr z, .musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done jp TextScriptEnd ; end text ItemUseCoinCase: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime - ld hl,CoinCaseNumCoinsText + jp nz, ItemUseNotTime + ld hl, CoinCaseNumCoinsText jp PrintText CoinCaseNumCoinsText: @@ -1877,7 +1877,7 @@ ItemUseOldRod: ItemUseGoodRod: call FishingInit - jp c,ItemUseNotTime + jp c, ItemUseNotTime .RandomLoop call Random srl a @@ -1886,17 +1886,17 @@ ItemUseGoodRod: cp 2 jr nc, .RandomLoop ; choose which monster appears - ld hl,GoodRodMons - add a,a - ld c,a - ld b,0 - add hl,bc - ld b,[hl] + ld hl, GoodRodMons + add a + ld c, a + ld b, 0 + add hl, bc + ld b, [hl] inc hl - ld c,[hl] + ld c, [hl] and a .SetBite - ld a,0 + ld a, 0 rla xor 1 jr RodResponse @@ -1936,23 +1936,23 @@ RodResponse: ; checks if fishing is possible and if so, runs initialization code common to all rods ; unsets carry if fishing is possible, sets carry if not FishingInit: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jr z,.notInBattle + jr z, .notInBattle scf ; can't fish during battle ret .notInBattle call IsNextTileShoreOrWater ret c - ld a,[wWalkBikeSurfState] - cp a,2 ; Surfing? - jr z,.surfing + ld a, [wWalkBikeSurfState] + cp 2 ; Surfing? + jr z, .surfing call ItemUseReloadOverworldData - ld hl,ItemUseText00 + ld hl, ItemUseText00 call PrintText - ld a,SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySound - ld c,80 + ld c, 80 call DelayFrames and a ret @@ -1964,22 +1964,22 @@ ItemUseOaksParcel: jp ItemUseNotYoursToUse ItemUseItemfinder: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime + jp nz, ItemUseNotTime call ItemUseReloadOverworldData callba HiddenItemNear ; check for hidden items - ld hl,ItemfinderFoundNothingText - jr nc,.printText ; if no hidden items - ld c,4 + ld hl, ItemfinderFoundNothingText + jr nc, .printText ; if no hidden items + ld c, 4 .loop - ld a,SFX_HEALING_MACHINE + ld a, SFX_HEALING_MACHINE call PlaySoundWaitForCurrent - ld a,SFX_PURCHASE + ld a, SFX_PURCHASE call PlaySoundWaitForCurrent dec c - jr nz,.loop - ld hl,ItemfinderFoundItemText + jr nz, .loop + ld hl, ItemfinderFoundItemText .printText jp PrintText @@ -1992,136 +1992,136 @@ ItemfinderFoundNothingText: db "@" ItemUsePPUp: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime + jp nz, ItemUseNotTime ItemUsePPRestore: - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] push af - ld a,[wcf91] - ld [wPPRestoreItem],a + ld a, [wcf91] + ld [wPPRestoreItem], a .chooseMon xor a - ld [wUpdateSpritesEnabled],a - ld a,USE_ITEM_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a + ld [wUpdateSpritesEnabled], a + ld a, USE_ITEM_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a call DisplayPartyMenu - jr nc,.chooseMove + jr nc, .chooseMove jp .itemNotUsed .chooseMove - 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,[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 + ld a, [wPPRestoreItem] + cp ELIXER + jp nc, .useElixir ; if Elixir or Max Elixir + ld a, $02 + ld [wMoveMenuType], a + ld hl, RaisePPWhichTechniqueText + ld a, [wPPRestoreItem] + cp 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 .printWhichTechniqueMessage call PrintText xor a - ld [wPlayerMoveListIndex],a + ld [wPlayerMoveListIndex], a callab MoveSelectionMenu ; move selection menu - ld a,0 - ld [wPlayerMoveListIndex],a - jr nz,.chooseMon - ld hl,wPartyMon1Moves + ld a, 0 + ld [wPlayerMoveListIndex], a + jr nz, .chooseMon + ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 call GetSelectedMoveOffset push hl - ld a,[hl] - ld [wd11e],a + ld a, [hl] + ld [wd11e], a call GetMoveName call CopyStringToCF4B ; copy name to wcf4b pop hl - ld a,[wPPRestoreItem] - cp a,ETHER - jr nc,.useEther ; if Ether or Max Ether + ld a, [wPPRestoreItem] + cp ETHER + jr nc, .useEther ; if Ether or Max Ether .usePPUp - ld bc,wPartyMon1PP - wPartyMon1Moves - add hl,bc - ld a,[hl] ; move PP - cp a,3 << 6 ; have 3 PP Ups already been used? - jr c,.PPNotMaxedOut - ld hl,PPMaxedOutText + ld bc, wPartyMon1PP - wPartyMon1Moves + add hl, bc + ld a, [hl] ; move PP + cp 3 << 6 ; have 3 PP Ups already been used? + jr c, .PPNotMaxedOut + ld hl, PPMaxedOutText call PrintText jr .chooseMove .PPNotMaxedOut - ld a,[hl] - add a,1 << 6 ; increase PP Up count by 1 - ld [hl],a - ld a,1 ; 1 PP Up used - ld [wd11e],a + ld a, [hl] + add 1 << 6 ; increase PP Up count by 1 + ld [hl], a + ld a, 1 ; 1 PP Up used + ld [wd11e], a call RestoreBonusPP ; add the bonus PP to current PP - ld hl,PPIncreasedText + ld hl, PPIncreasedText call PrintText .done pop af - ld [wWhichPokemon],a + ld [wWhichPokemon], a call GBPalWhiteOut call RunDefaultPaletteCommand jp RemoveUsedItem .afterRestoringPP ; after using a (Max) Ether/Elixir - ld a,[wWhichPokemon] - ld b,a - ld a,[wPlayerMonNumber] + ld a, [wWhichPokemon] + ld b, a + ld a, [wPlayerMonNumber] cp b ; is the pokemon whose PP was restored active in battle? - jr nz,.skipUpdatingInBattleData - ld hl,wPartyMon1PP + jr nz, .skipUpdatingInBattleData + ld hl, wPartyMon1PP ld bc, wPartyMon2 - wPartyMon1 call AddNTimes - ld de,wBattleMonPP - ld bc,4 + ld de, wBattleMonPP + ld bc, 4 call CopyData ; copy party data to in-battle data .skipUpdatingInBattleData - ld a,SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySound - ld hl,PPRestoredText + ld hl, PPRestoredText call PrintText jr .done .useEther call .restorePP - jr nz,.afterRestoringPP + jr nz, .afterRestoringPP jp .noEffect ; unsets zero flag if PP was restored, sets zero flag if not ; however, this is bugged for Max Ethers and Max Elixirs (see below) .restorePP xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation],a + ld [wMonDataLocation], a call GetMaxPP - ld hl,wPartyMon1Moves + ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 call GetSelectedMoveOffset ld bc, wPartyMon1PP - wPartyMon1Moves - add hl,bc ; hl now points to move's PP - ld a,[wMaxPP] - ld b,a - ld a,[wPPRestoreItem] - cp a,MAX_ETHER - jr z,.fullyRestorePP - ld a,[hl] ; move PP - and a,%00111111 ; lower 6 bit bits store current PP + add hl, bc ; hl now points to move's PP + ld a, [wMaxPP] + ld b, a + ld a, [wPPRestoreItem] + cp MAX_ETHER + jr z, .fullyRestorePP + ld a, [hl] ; move PP + and %00111111 ; lower 6 bit bits store current PP cp b ; does current PP equal max PP? ret z ; if so, return - add a,10 ; increase current PP by 10 + add 10 ; increase current PP by 10 ; b holds the max PP amount and b will hold the new PP amount. ; So, if the new amount meets or exceeds the max amount, ; cap the amount to the max amount by leaving b unchanged. ; Otherwise, store the new amount in b. cp b ; does the new amount meet or exceed the maximum? - jr nc,.storeNewAmount - ld b,a + jr nc, .storeNewAmount + ld b, a .storeNewAmount - ld a,[hl] ; move PP - and a,%11000000 ; PP Up counter bits + ld a, [hl] ; move PP + and %11000000 ; PP Up counter bits add b - ld [hl],a + ld [hl], a ret .fullyRestorePP - ld a,[hl] ; move PP + ld a, [hl] ; move PP ; Note that this code has a bug. It doesn't mask out the upper two bits, which ; are used to count how many PP Ups have been used on the move. So, Max Ethers ; and Max Elixirs will not be detected as having no effect on a move with full @@ -2131,37 +2131,37 @@ ItemUsePPRestore: jr .storeNewAmount .useElixir ; decrement the item ID so that ELIXER becomes ETHER and MAX_ELIXER becomes MAX_ETHER - ld hl,wPPRestoreItem + ld hl, wPPRestoreItem dec [hl] dec [hl] xor a - ld hl,wCurrentMenuItem - ld [hli],a - ld [hl],a ; zero the counter for number of moves that had their PP restored - ld b,4 + ld hl, wCurrentMenuItem + ld [hli], a + ld [hl], a ; zero the counter for number of moves that had their PP restored + ld b, 4 ; loop through each move and restore PP .elixirLoop push bc - ld hl,wPartyMon1Moves + ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 call GetSelectedMoveOffset - ld a,[hl] + ld a, [hl] and a ; does the current slot have a move? - jr z,.nextMove + jr z, .nextMove call .restorePP - jr z,.nextMove + jr z, .nextMove ; if some PP was restored - ld hl,wTileBehindCursor ; counter for number of moves that had their PP restored + ld hl, wTileBehindCursor ; counter for number of moves that had their PP restored inc [hl] .nextMove - ld hl,wCurrentMenuItem + ld hl, wCurrentMenuItem inc [hl] pop bc dec b - jr nz,.elixirLoop - ld a,[wTileBehindCursor] + jr nz, .elixirLoop + ld a, [wTileBehindCursor] and a ; did any moves have their PP restored? - jp nz,.afterRestoringPP + jp nz, .afterRestoringPP .noEffect call ItemUseNoEffect .itemNotUsed @@ -2169,7 +2169,7 @@ ItemUsePPRestore: call RunDefaultPaletteCommand pop af xor a - ld [wActionResultOrTookBattleTurn],a ; item use failed + ld [wActionResultOrTookBattleTurn], a ; item use failed ret RaisePPWhichTechniqueText: @@ -2197,63 +2197,63 @@ UnusableItem: jp ItemUseNotTime ItemUseTMHM: - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,ItemUseNotTime - ld a,[wcf91] - sub a,TM_01 + jp nz, ItemUseNotTime + ld a, [wcf91] + sub TM_01 push af - jr nc,.skipAdding - add a,55 ; if item is an HM, add 55 + jr nc, .skipAdding + add 55 ; if item is an HM, add 55 .skipAdding inc a - ld [wd11e],a + ld [wd11e], a predef TMToMove ; get move ID from TM/HM ID - ld a,[wd11e] - ld [wMoveNum],a + ld a, [wd11e] + ld [wMoveNum], a call GetMoveName call CopyStringToCF4B ; copy name to wcf4b pop af - ld hl,BootedUpTMText - jr nc,.printBootedUpMachineText - ld hl,BootedUpHMText + ld hl, BootedUpTMText + jr nc, .printBootedUpMachineText + ld hl, BootedUpHMText .printBootedUpMachineText call PrintText - ld hl,TeachMachineMoveText + ld hl, TeachMachineMoveText call PrintText coord hl, 14, 7 lb bc, 8, 15 - ld a,TWO_OPTION_MENU - ld [wTextBoxID],a + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - jr z,.useMachine - ld a,2 - ld [wActionResultOrTookBattleTurn],a ; item not used + jr z, .useMachine + ld a, 2 + ld [wActionResultOrTookBattleTurn], a ; item not used ret .useMachine - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] push af - ld a,[wcf91] + ld a, [wcf91] push af .chooseMon - ld hl,wcf4b - ld de,wTempMoveNameBuffer - ld bc,14 + ld hl, wcf4b + ld de, wTempMoveNameBuffer + ld bc, 14 call CopyData ; save the move name because DisplayPartyMenu will overwrite it - ld a,$ff - ld [wUpdateSpritesEnabled],a - ld a,TMHM_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld a, TMHM_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a call DisplayPartyMenu push af - ld hl,wTempMoveNameBuffer - ld de,wcf4b - ld bc,14 + ld hl, wTempMoveNameBuffer + ld de, wcf4b + ld bc, 14 call CopyData pop af - jr nc,.checkIfAbleToLearnMove + jr nc, .checkIfAbleToLearnMove ; if the player canceled teaching the move pop af pop af @@ -2264,31 +2264,31 @@ ItemUseTMHM: .checkIfAbleToLearnMove predef CanLearnTM ; check if the pokemon can learn the move push bc - ld a,[wWhichPokemon] - ld hl,wPartyMonNicks + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks call GetPartyMonName pop bc - ld a,c + ld a, c and a ; can the pokemon learn the move? - jr nz,.checkIfAlreadyLearnedMove + jr nz, .checkIfAlreadyLearnedMove ; if the pokemon can't learn the move - ld a,SFX_DENIED + ld a, SFX_DENIED call PlaySoundWaitForCurrent - ld hl,MonCannotLearnMachineMoveText + ld hl, MonCannotLearnMachineMoveText call PrintText jr .chooseMon .checkIfAlreadyLearnedMove callab CheckIfMoveIsKnown ; check if the pokemon already knows the move - jr c,.chooseMon + jr c, .chooseMon predef LearnMove ; teach move pop af - ld [wcf91],a + ld [wcf91], a pop af - ld [wWhichPokemon],a - ld a,b + ld [wWhichPokemon], a + ld a, b and a ret z - ld a,[wcf91] + ld a, [wcf91] call IsItemHM ret c jp RemoveUsedItem @@ -2310,57 +2310,57 @@ MonCannotLearnMachineMoveText: db "@" PrintItemUseTextAndRemoveItem: - ld hl,ItemUseText00 + ld hl, ItemUseText00 call PrintText - ld a,SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySound call WaitForTextScrollButtonPress ; wait for button press RemoveUsedItem: - ld hl,wNumBagItems - ld a,1 ; one item - ld [wItemQuantity],a + ld hl, wNumBagItems + ld a, 1 ; one item + ld [wItemQuantity], a jp RemoveItemFromInventory ItemUseNoEffect: - ld hl,ItemUseNoEffectText + ld hl, ItemUseNoEffectText jr ItemUseFailed ItemUseNotTime: - ld hl,ItemUseNotTimeText + ld hl, ItemUseNotTimeText jr ItemUseFailed ItemUseNotYoursToUse: - ld hl,ItemUseNotYoursToUseText + ld hl, ItemUseNotYoursToUseText jr ItemUseFailed ThrowBallAtTrainerMon: call RunDefaultPaletteCommand call LoadScreenTilesFromBuffer1 ; restore saved screen call Delay3 - ld a,TOSS_ANIM - ld [wAnimationID],a + ld a, TOSS_ANIM + ld [wAnimationID], a predef MoveAnimation ; do animation - ld hl,ThrowBallAtTrainerMonText1 + ld hl, ThrowBallAtTrainerMonText1 call PrintText - ld hl,ThrowBallAtTrainerMonText2 + ld hl, ThrowBallAtTrainerMonText2 call PrintText jr RemoveUsedItem NoCyclingAllowedHere: - ld hl,NoCyclingAllowedHereText + ld hl, NoCyclingAllowedHereText jr ItemUseFailed BoxFullCannotThrowBall: - ld hl,BoxFullCannotThrowBallText + ld hl, BoxFullCannotThrowBallText jr ItemUseFailed SurfingAttemptFailed: - ld hl,NoSurfingHereText + ld hl, NoSurfingHereText ItemUseFailed: xor a - ld [wActionResultOrTookBattleTurn],a ; item use failed + ld [wActionResultOrTookBattleTurn], a ; item use failed jp PrintText ItemUseNotTimeText: @@ -2419,37 +2419,37 @@ GotOffBicycleText: ; [wWhichPokemon] = index of pokemon in party ; [wCurrentMenuItem] = index of move (when using a PP Up) RestoreBonusPP: - ld hl,wPartyMon1Moves + ld hl, wPartyMon1Moves ld bc, wPartyMon2 - wPartyMon1 - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] call AddNTimes push hl - ld de,wNormalMaxPPList - 1 + ld de, wNormalMaxPPList - 1 predef LoadMovePPs ; loads the normal max PP of each of the pokemon's moves to wNormalMaxPPList pop hl ld c, wPartyMon1PP - wPartyMon1Moves - ld b,0 - add hl,bc ; hl now points to move 1 PP - ld de,wNormalMaxPPList - ld b,0 ; initialize move counter to zero + ld b, 0 + add hl, bc ; hl now points to move 1 PP + ld de, wNormalMaxPPList + ld b, 0 ; initialize move counter to zero ; loop through the pokemon's moves .loop inc b - ld a,b - cp a,5 ; reached the end of the pokemon's moves? + ld a, b + cp 5 ; reached the end of the pokemon's moves? ret z ; if so, return - ld a,[wUsingPPUp] + ld a, [wUsingPPUp] dec a ; using a PP Up? - jr nz,.skipMenuItemIDCheck + jr nz, .skipMenuItemIDCheck ; if using a PP Up, check if this is the move it's being used on - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] inc a cp b - jr nz,.nextMove + jr nz, .nextMove .skipMenuItemIDCheck - ld a,[hl] - and a,%11000000 ; have any PP Ups been used? - call nz,AddBonusPP ; if so, add bonus PP + ld a, [hl] + and %11000000 ; have any PP Ups been used? + call nz, AddBonusPP ; if so, add bonus PP .nextMove inc hl inc de @@ -2462,38 +2462,38 @@ RestoreBonusPP: ; [hl] = move PP AddBonusPP: push bc - ld a,[de] ; normal max PP of move - ld [H_DIVIDEND + 3],a + ld a, [de] ; normal max PP of move + ld [H_DIVIDEND + 3], a xor a - ld [H_DIVIDEND],a - ld [H_DIVIDEND + 1],a - ld [H_DIVIDEND + 2],a - ld a,5 - ld [H_DIVISOR],a - ld b,4 + ld [H_DIVIDEND], a + ld [H_DIVIDEND + 1], a + ld [H_DIVIDEND + 2], a + ld a, 5 + ld [H_DIVISOR], a + ld b, 4 call Divide - ld a,[hl] ; move PP - ld b,a + ld a, [hl] ; move PP + ld b, a swap a - and a,%00001111 + and %00001111 srl a srl a - ld c,a ; c = number of PP Ups used + ld c, a ; c = number of PP Ups used .loop - ld a,[H_QUOTIENT + 3] - cp a,8 ; is the amount greater than or equal to 8? - jr c,.addAmount - ld a,7 ; cap the amount at 7 + ld a, [H_QUOTIENT + 3] + cp 8 ; is the amount greater than or equal to 8? + jr c, .addAmount + ld a, 7 ; cap the amount at 7 .addAmount add b - ld b,a - ld a,[wUsingPPUp] + ld b, a + ld a, [wUsingPPUp] dec a ; is the player using a PP Up right now? - jr z,.done ; if so, only add the bonus once + jr z, .done ; if so, only add the bonus once dec c - jr nz,.loop + jr nz, .loop .done - ld [hl],b + ld [hl], b pop bc ret @@ -2510,74 +2510,74 @@ AddBonusPP: ; OUTPUT: ; [wMaxPP] = max PP GetMaxPP: - ld a,[wMonDataLocation] + ld a, [wMonDataLocation] and a - ld hl,wPartyMon1Moves - ld bc,wPartyMon2 - wPartyMon1 - jr z,.sourceWithMultipleMon - ld hl,wEnemyMon1Moves + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + jr z, .sourceWithMultipleMon + ld hl, wEnemyMon1Moves dec a - jr z,.sourceWithMultipleMon - ld hl,wBoxMon1Moves - ld bc,wBoxMon2 - wBoxMon1 + jr z, .sourceWithMultipleMon + ld hl, wBoxMon1Moves + ld bc, wBoxMon2 - wBoxMon1 dec a - jr z,.sourceWithMultipleMon - ld hl,wDayCareMonMoves + jr z, .sourceWithMultipleMon + ld hl, wDayCareMonMoves dec a - jr z,.sourceWithOneMon - ld hl,wBattleMonMoves ; player's in-battle pokemon + jr z, .sourceWithOneMon + ld hl, wBattleMonMoves ; player's in-battle pokemon .sourceWithOneMon call GetSelectedMoveOffset2 jr .next .sourceWithMultipleMon call GetSelectedMoveOffset .next - ld a,[hl] + ld a, [hl] dec a push hl - ld hl,Moves - ld bc,MoveEnd - Moves + ld hl, Moves + ld bc, MoveEnd - Moves call AddNTimes - ld de,wcd6d - ld a,BANK(Moves) + ld de, wcd6d + ld a, BANK(Moves) call FarCopyData - ld de,wcd6d + 5 ; PP is byte 5 of move data - ld a,[de] - ld b,a ; b = normal max PP + ld de, wcd6d + 5 ; PP is byte 5 of move data + ld a, [de] + ld b, a ; b = normal max PP pop hl push bc - ld bc,wPartyMon1PP - wPartyMon1Moves ; PP offset if not player's in-battle pokemon data - ld a,[wMonDataLocation] - cp a,4 ; player's in-battle pokemon? - jr nz,.addPPOffset - ld bc,wBattleMonPP - wBattleMonMoves ; PP offset if player's in-battle pokemon data + ld bc, wPartyMon1PP - wPartyMon1Moves ; PP offset if not player's in-battle pokemon data + ld a, [wMonDataLocation] + cp 4 ; player's in-battle pokemon? + jr nz, .addPPOffset + ld bc, wBattleMonPP - wBattleMonMoves ; PP offset if player's in-battle pokemon data .addPPOffset - add hl,bc - ld a,[hl] ; a = current PP - and a,%11000000 ; get PP Up count + add hl, bc + ld a, [hl] ; a = current PP + and %11000000 ; get PP Up count pop bc or b ; place normal max PP in 6 lower bits of a - ld h,d - ld l,e + ld h, d + ld l, e inc hl ; hl = wcd73 - ld [hl],a + ld [hl], a xor a ; add the bonus for the existing PP Up count - ld [wUsingPPUp],a + ld [wUsingPPUp], a call AddBonusPP ; add bonus PP from PP Ups - ld a,[hl] - and a,%00111111 ; mask out the PP Up count - ld [wMaxPP],a ; store max PP + ld a, [hl] + and %00111111 ; mask out the PP Up count + ld [wMaxPP], a ; store max PP ret GetSelectedMoveOffset: - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] call AddNTimes GetSelectedMoveOffset2: - ld a,[wCurrentMenuItem] - ld c,a - ld b,0 - add hl,bc + ld a, [wCurrentMenuItem] + ld c, a + ld b, 0 + add hl, bc ret ; confirms the item toss and then tosses the item @@ -2590,49 +2590,49 @@ GetSelectedMoveOffset2: ; clears carry flag if the item is tossed, sets carry flag if not TossItem_: push hl - ld a,[wcf91] + ld a, [wcf91] call IsItemHM pop hl - jr c,.tooImportantToToss + jr c, .tooImportantToToss push hl call IsKeyItem_ - ld a,[wIsKeyItem] + ld a, [wIsKeyItem] pop hl and a - jr nz,.tooImportantToToss + jr nz, .tooImportantToToss push hl - ld a,[wcf91] - ld [wd11e],a + ld a, [wcf91] + ld [wd11e], a call GetItemName call CopyStringToCF4B ; copy name to wcf4b - ld hl,IsItOKToTossItemText + ld hl, IsItOKToTossItemText call PrintText coord hl, 14, 7 lb bc, 8, 15 - ld a,TWO_OPTION_MENU - ld [wTextBoxID],a + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu - ld a,[wMenuExitMethod] - cp a,CHOSE_SECOND_ITEM + ld a, [wMenuExitMethod] + cp CHOSE_SECOND_ITEM pop hl scf ret z ; return if the player chose No ; if the player chose Yes push hl - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] call RemoveItemFromInventory - ld a,[wcf91] - ld [wd11e],a + ld a, [wcf91] + ld [wd11e], a call GetItemName call CopyStringToCF4B ; copy name to wcf4b - ld hl,ThrewAwayItemText + ld hl, ThrewAwayItemText call PrintText pop hl and a ret .tooImportantToToss push hl - ld hl,TooImportantToTossText + ld hl, TooImportantToTossText call PrintText pop hl scf @@ -2658,32 +2658,32 @@ TooImportantToTossText: ; 00: item is not key item ; 01: item is key item IsKeyItem_: - ld a,$01 - ld [wIsKeyItem],a - ld a,[wcf91] - cp a,HM_01 ; is the item an HM or TM? - jr nc,.checkIfItemIsHM + ld a, $01 + ld [wIsKeyItem], a + ld a, [wcf91] + cp HM_01 ; is the item an HM or TM? + jr nc, .checkIfItemIsHM ; if the item is not an HM or TM push af - ld hl,KeyItemBitfield - ld de,wBuffer - ld bc,15 ; only 11 bytes are actually used + ld hl, KeyItemBitfield + ld de, wBuffer + ld bc, 15 ; only 11 bytes are actually used call CopyData pop af dec a - ld c,a - ld hl,wBuffer - ld b,FLAG_TEST + ld c, a + ld hl, wBuffer + ld b, FLAG_TEST predef FlagActionPredef - ld a,c + ld a, c and a ret nz .checkIfItemIsHM - ld a,[wcf91] + ld a, [wcf91] call IsItemHM ret c xor a - ld [wIsKeyItem],a + ld [wIsKeyItem], a ret INCLUDE "data/key_items.asm" @@ -2860,7 +2860,7 @@ SendNewMonToBox: IsNextTileShoreOrWater: ld a, [wCurMapTileset] ld hl, WaterTilesets - ld de,1 + ld de, 1 call IsInArray jr nc, .notShoreOrWater ld a, [wCurMapTileset] diff --git a/engine/load_pokedex_tiles.asm b/engine/load_pokedex_tiles.asm index 637b7a24..70bcf04d 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: call LoadHpBarAndStatusTilePatterns - ld de,PokedexTileGraphics - ld hl,vChars2 + $600 + ld de, PokedexTileGraphics + ld hl, vChars2 + $600 lb bc, BANK(PokedexTileGraphics), (PokedexTileGraphicsEnd - PokedexTileGraphics) / $10 call CopyVideoData - ld de,PokeballTileGraphics - ld hl,vChars2 + $720 + ld de, PokeballTileGraphics + ld hl, vChars2 + $720 lb bc, BANK(PokeballTileGraphics), $01 jp CopyVideoData ; load pokeball tile for marking caught mons diff --git a/engine/menu/draw_start_menu.asm b/engine/menu/draw_start_menu.asm index 83a81aac..11777dc6 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menu/draw_start_menu.asm @@ -3,60 +3,60 @@ DrawStartMenu: CheckEvent EVENT_GOT_POKEDEX ; menu with pokedex coord hl, 10, 0 - ld b,$0e - ld c,$08 - jr nz,.drawTextBoxBorder + ld b, $0e + ld c, $08 + jr nz, .drawTextBoxBorder ; shorter menu if the player doesn't have the pokedex coord hl, 10, 0 - ld b,$0c - ld c,$08 + ld b, $0c + ld c, $08 .drawTextBoxBorder call TextBoxBorder - 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 - ld a,$0b - ld [wTopMenuItemX],a ; X position of first menu choice - ld a,[wBattleAndStartSavedMenuItem] ; remembered menu selection from last time - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a + 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 + ld a, $0b + ld [wTopMenuItemX], a ; X position of first menu choice + ld a, [wBattleAndStartSavedMenuItem] ; remembered menu selection from last time + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a xor a - ld [wMenuWatchMovingOutOfBounds],a - ld hl,wd730 - set 6,[hl] ; no pauses between printing each letter + ld [wMenuWatchMovingOutOfBounds], a + ld hl, wd730 + set 6, [hl] ; no pauses between printing each letter coord hl, 12, 2 CheckEvent EVENT_GOT_POKEDEX ; case for not having pokedex - ld a,$06 - jr z,.storeMenuItemCount + ld a, $06 + jr z, .storeMenuItemCount ; case for having pokedex - ld de,StartMenuPokedexText + ld de, StartMenuPokedexText call PrintStartMenuItem - ld a,$07 + ld a, $07 .storeMenuItemCount - ld [wMaxMenuItem],a ; number of menu items - ld de,StartMenuPokemonText + ld [wMaxMenuItem], a ; number of menu items + ld de, StartMenuPokemonText call PrintStartMenuItem - ld de,StartMenuItemText + ld de, StartMenuItemText call PrintStartMenuItem - ld de,wPlayerName ; player's name + ld de, wPlayerName ; player's name call PrintStartMenuItem - ld a,[wd72e] - bit 6,a ; is the player using the link feature? + ld a, [wd72e] + bit 6, a ; is the player using the link feature? ; case for not using link feature - ld de,StartMenuSaveText - jr z,.printSaveOrResetText + ld de, StartMenuSaveText + jr z, .printSaveOrResetText ; case for using link feature - ld de,StartMenuResetText + ld de, StartMenuResetText .printSaveOrResetText call PrintStartMenuItem - ld de,StartMenuOptionText + ld de, StartMenuOptionText call PrintStartMenuItem - ld de,StartMenuExitText + ld de, StartMenuExitText call PlaceString - ld hl,wd730 - res 6,[hl] ; turn pauses between printing letters back on + ld hl, wd730 + res 6, [hl] ; turn pauses between printing letters back on ret StartMenuPokedexText: @@ -84,6 +84,6 @@ PrintStartMenuItem: push hl call PlaceString pop hl - ld de,SCREEN_WIDTH * 2 - add hl,de + ld de, SCREEN_WIDTH * 2 + add hl, de ret diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index cd4198b6..da2e98e4 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -2,133 +2,133 @@ MainMenu: ; Check save file call InitOptions xor a - ld [wOptionsInitialized],a + ld [wOptionsInitialized], a inc a - ld [wSaveFileStatus],a + ld [wSaveFileStatus], a call CheckForPlayerNameInSRAM - jr nc,.mainMenuLoop + jr nc, .mainMenuLoop predef LoadSAV .mainMenuLoop - ld c,20 + ld c, 20 call DelayFrames xor a ; LINK_STATE_NONE - ld [wLinkState],a - ld hl,wPartyAndBillsPCSavedMenuItem - ld [hli],a - ld [hli],a - ld [hli],a - ld [hl],a - ld [wDefaultMap],a - ld hl,wd72e - res 6,[hl] + ld [wLinkState], a + ld hl, wPartyAndBillsPCSavedMenuItem + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld [wDefaultMap], a + ld hl, wd72e + res 6, [hl] call ClearScreen call RunDefaultPaletteCommand call LoadTextBoxTilePatterns call LoadFontTilePatterns - ld hl,wd730 - set 6,[hl] - ld a,[wSaveFileStatus] - cp a,1 - jr z,.noSaveFile + ld hl, wd730 + set 6, [hl] + ld a, [wSaveFileStatus] + cp 1 + jr z, .noSaveFile ; there's a save file coord hl, 0, 0 - ld b,6 - ld c,13 + ld b, 6 + ld c, 13 call TextBoxBorder coord hl, 2, 2 - ld de,ContinueText + ld de, ContinueText call PlaceString jr .next2 .noSaveFile coord hl, 0, 0 - ld b,4 - ld c,13 + ld b, 4 + ld c, 13 call TextBoxBorder coord hl, 2, 2 - ld de,NewGameText + ld de, NewGameText call PlaceString .next2 - ld hl,wd730 - res 6,[hl] + ld hl, wd730 + res 6, [hl] call UpdateSprites xor a - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a - ld [wMenuJoypadPollCount],a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [wMenuJoypadPollCount], a inc a - ld [wTopMenuItemX],a + ld [wTopMenuItemX], a inc a - ld [wTopMenuItemY],a - ld a,A_BUTTON | B_BUTTON | START - ld [wMenuWatchedKeys],a - ld a,[wSaveFileStatus] - ld [wMaxMenuItem],a + ld [wTopMenuItemY], a + ld a, A_BUTTON | B_BUTTON | START + ld [wMenuWatchedKeys], a + ld a, [wSaveFileStatus] + ld [wMaxMenuItem], a call HandleMenuInput - bit 1,a ; pressed B? - jp nz,DisplayTitleScreen ; if so, go back to the title screen - ld c,20 + 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,[wSaveFileStatus] - cp a,2 - jp z,.skipInc + ld a, [wCurrentMenuItem] + ld b, a + ld a, [wSaveFileStatus] + cp 2 + 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 + ld a, b and a - jr z,.choseContinue - cp a,1 - jp z,StartNewGame + jr z, .choseContinue + cp 1 + jp z, StartNewGame call DisplayOptionMenu - ld a,1 - ld [wOptionsInitialized],a + ld a, 1 + ld [wOptionsInitialized], a jp .mainMenuLoop .choseContinue call DisplayContinueGameInfo - ld hl,wCurrentMapScriptFlags - set 5,[hl] + ld hl, wCurrentMapScriptFlags + set 5, [hl] .inputLoop xor a - ld [hJoyPressed],a - ld [hJoyReleased],a - ld [hJoyHeld],a + ld [hJoyPressed], a + ld [hJoyReleased], a + ld [hJoyHeld], a call Joypad - ld a,[hJoyHeld] - bit 0,a - jr nz,.pressedA - bit 1,a - jp nz,.mainMenuLoop ; pressed B + ld a, [hJoyHeld] + bit 0, a + jr nz, .pressedA + bit 1, a + jp nz, .mainMenuLoop ; pressed B jr .inputLoop .pressedA call GBPalWhiteOutWithDelay3 call ClearScreen - ld a,PLAYER_DIR_DOWN - ld [wPlayerDirection],a - ld c,10 + ld a, PLAYER_DIR_DOWN + ld [wPlayerDirection], a + ld c, 10 call DelayFrames - ld a,[wNumHoFTeams] + ld a, [wNumHoFTeams] and a - jp z,SpecialEnterMap - ld a,[wCurMap] ; map ID - cp a,HALL_OF_FAME - jp nz,SpecialEnterMap + jp z, SpecialEnterMap + ld a, [wCurMap] ; map ID + cp HALL_OF_FAME + jp nz, SpecialEnterMap xor a - ld [wDestinationMap],a - ld hl,wd732 - set 2,[hl] ; fly warp or dungeon warp + ld [wDestinationMap], a + ld hl, wd732 + set 2, [hl] ; fly warp or dungeon warp call SpecialWarpIn jp SpecialEnterMap InitOptions: - ld a,1 ; no delay - ld [wLetterPrintingDelayFlags],a - ld a,3 ; medium speed - ld [wOptions],a + ld a, 1 ; no delay + ld [wLetterPrintingDelayFlags], a + ld a, 3 ; medium speed + ld [wOptions], a ret LinkMenu: @@ -428,154 +428,154 @@ SaveScreenInfoText: DisplayOptionMenu: coord hl, 0, 0 - ld b,3 - ld c,18 + ld b, 3 + ld c, 18 call TextBoxBorder coord hl, 0, 5 - ld b,3 - ld c,18 + ld b, 3 + ld c, 18 call TextBoxBorder coord hl, 0, 10 - ld b,3 - ld c,18 + ld b, 3 + ld c, 18 call TextBoxBorder coord hl, 1, 1 - ld de,TextSpeedOptionText + ld de, TextSpeedOptionText call PlaceString coord hl, 1, 6 - ld de,BattleAnimationOptionText + ld de, BattleAnimationOptionText call PlaceString coord hl, 1, 11 - ld de,BattleStyleOptionText + ld de, BattleStyleOptionText call PlaceString coord hl, 2, 16 - ld de,OptionMenuCancelText + ld de, OptionMenuCancelText call PlaceString xor a - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a inc a - ld [wLetterPrintingDelayFlags],a - ld [wUnusedCD40],a - ld a,3 ; text speed cursor Y coordinate - ld [wTopMenuItemY],a + ld [wLetterPrintingDelayFlags], a + ld [wUnusedCD40], a + ld a, 3 ; text speed cursor Y coordinate + ld [wTopMenuItemY], a call SetCursorPositionsFromOptions - ld a,[wOptionsTextSpeedCursorX] ; text speed cursor X coordinate - ld [wTopMenuItemX],a - ld a,$01 - ld [H_AUTOBGTRANSFERENABLED],a ; enable auto background transfer + ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate + ld [wTopMenuItemX], a + ld a, $01 + ld [H_AUTOBGTRANSFERENABLED], a ; enable auto background transfer call Delay3 .loop call PlaceMenuCursor call SetOptionsFromCursorPositions .getJoypadStateLoop call JoypadLowSensitivity - ld a,[hJoy5] - ld b,a - 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 - bit 3,b ; Start button pressed? - jr nz,.exitMenu - bit 0,b ; A button pressed? - jr z,.checkDirectionKeys - ld a,[wTopMenuItemY] - cp a,16 ; is the cursor on Cancel? - jr nz,.loop + ld a, [hJoy5] + ld b, a + and 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 + bit 3, b ; Start button pressed? + jr nz, .exitMenu + bit 0, b ; A button pressed? + jr z, .checkDirectionKeys + ld a, [wTopMenuItemY] + cp 16 ; is the cursor on Cancel? + jr nz, .loop .exitMenu - ld a,SFX_PRESS_AB + ld a, SFX_PRESS_AB call PlaySound ret .eraseOldMenuCursor - ld [wTopMenuItemX],a + ld [wTopMenuItemX], a call EraseMenuCursor jp .loop .checkDirectionKeys - ld a,[wTopMenuItemY] - bit 7,b ; Down pressed? - jr nz,.downPressed - bit 6,b ; Up pressed? - jr nz,.upPressed - cp a,8 ; cursor in Battle Animation section? - jr z,.cursorInBattleAnimation - cp a,13 ; cursor in Battle Style section? - jr z,.cursorInBattleStyle - cp a,16 ; cursor on Cancel? - jr z,.loop + ld a, [wTopMenuItemY] + bit 7, b ; Down pressed? + jr nz, .downPressed + bit 6, b ; Up pressed? + jr nz, .upPressed + cp 8 ; cursor in Battle Animation section? + jr z, .cursorInBattleAnimation + cp 13 ; cursor in Battle Style section? + jr z, .cursorInBattleStyle + cp 16 ; cursor on Cancel? + jr z, .loop .cursorInTextSpeed - bit 5,b ; Left pressed? - jp nz,.pressedLeftInTextSpeed + bit 5, b ; Left pressed? + jp nz, .pressedLeftInTextSpeed jp .pressedRightInTextSpeed .downPressed - cp a,16 - ld b,-13 - ld hl,wOptionsTextSpeedCursorX - jr z,.updateMenuVariables - ld b,5 - cp a,3 + cp 16 + ld b, -13 + ld hl, wOptionsTextSpeedCursorX + jr z, .updateMenuVariables + ld b, 5 + cp 3 inc hl - jr z,.updateMenuVariables - cp a,8 + jr z, .updateMenuVariables + cp 8 inc hl - jr z,.updateMenuVariables - ld b,3 + jr z, .updateMenuVariables + ld b, 3 inc hl jr .updateMenuVariables .upPressed - cp a,8 - ld b,-5 - ld hl,wOptionsTextSpeedCursorX - jr z,.updateMenuVariables - cp a,13 + cp 8 + ld b, -5 + ld hl, wOptionsTextSpeedCursorX + jr z, .updateMenuVariables + cp 13 inc hl - jr z,.updateMenuVariables - cp a,16 - ld b,-3 + jr z, .updateMenuVariables + cp 16 + ld b, -3 inc hl - jr z,.updateMenuVariables - ld b,13 + jr z, .updateMenuVariables + ld b, 13 inc hl .updateMenuVariables add b - ld [wTopMenuItemY],a - ld a,[hl] - ld [wTopMenuItemX],a + ld [wTopMenuItemY], a + ld a, [hl] + ld [wTopMenuItemX], a call PlaceUnfilledArrowMenuCursor jp .loop .cursorInBattleAnimation - ld a,[wOptionsBattleAnimCursorX] ; battle animation cursor X coordinate - xor a,$0b ; toggle between 1 and 10 - ld [wOptionsBattleAnimCursorX],a + ld a, [wOptionsBattleAnimCursorX] ; battle animation cursor X coordinate + xor $0b ; toggle between 1 and 10 + ld [wOptionsBattleAnimCursorX], a jp .eraseOldMenuCursor .cursorInBattleStyle - ld a,[wOptionsBattleStyleCursorX] ; battle style cursor X coordinate - xor a,$0b ; toggle between 1 and 10 - ld [wOptionsBattleStyleCursorX],a + ld a, [wOptionsBattleStyleCursorX] ; battle style cursor X coordinate + xor $0b ; toggle between 1 and 10 + ld [wOptionsBattleStyleCursorX], a jp .eraseOldMenuCursor .pressedLeftInTextSpeed - ld a,[wOptionsTextSpeedCursorX] ; text speed cursor X coordinate - cp a,1 - jr z,.updateTextSpeedXCoord - cp a,7 - jr nz,.fromSlowToMedium - sub a,6 + ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate + cp 1 + jr z, .updateTextSpeedXCoord + cp 7 + jr nz, .fromSlowToMedium + sub 6 jr .updateTextSpeedXCoord .fromSlowToMedium - sub a,7 + sub 7 jr .updateTextSpeedXCoord .pressedRightInTextSpeed - ld a,[wOptionsTextSpeedCursorX] ; text speed cursor X coordinate - cp a,14 - jr z,.updateTextSpeedXCoord - cp a,7 - jr nz,.fromFastToMedium - add a,7 + ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate + cp 14 + jr z, .updateTextSpeedXCoord + cp 7 + jr nz, .fromFastToMedium + add 7 jr .updateTextSpeedXCoord .fromFastToMedium - add a,6 + add 6 .updateTextSpeedXCoord - ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate + ld [wOptionsTextSpeedCursorX], a ; text speed cursor X coordinate jp .eraseOldMenuCursor TextSpeedOptionText: @@ -595,79 +595,79 @@ OptionMenuCancelText: ; sets the options variable according to the current placement of the menu cursors in the options menu SetOptionsFromCursorPositions: - ld hl,TextSpeedOptionData - ld a,[wOptionsTextSpeedCursorX] ; text speed cursor X coordinate - ld c,a + ld hl, TextSpeedOptionData + ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate + ld c, a .loop - ld a,[hli] + ld a, [hli] cp c - jr z,.textSpeedMatchFound + jr z, .textSpeedMatchFound inc hl jr .loop .textSpeedMatchFound - ld a,[hl] - ld d,a - ld a,[wOptionsBattleAnimCursorX] ; battle animation cursor X coordinate + ld a, [hl] + ld d, a + ld a, [wOptionsBattleAnimCursorX] ; battle animation cursor X coordinate dec a - jr z,.battleAnimationOn + jr z, .battleAnimationOn .battleAnimationOff - set 7,d + set 7, d jr .checkBattleStyle .battleAnimationOn - res 7,d + res 7, d .checkBattleStyle - ld a,[wOptionsBattleStyleCursorX] ; battle style cursor X coordinate + ld a, [wOptionsBattleStyleCursorX] ; battle style cursor X coordinate dec a - jr z,.battleStyleShift + jr z, .battleStyleShift .battleStyleSet - set 6,d + set 6, d jr .storeOptions .battleStyleShift - res 6,d + res 6, d .storeOptions - ld a,d - ld [wOptions],a + ld a, d + ld [wOptions], a ret ; reads the options variable and places menu cursors in the correct positions within the options menu SetCursorPositionsFromOptions: - ld hl,TextSpeedOptionData + 1 - ld a,[wOptions] - ld c,a - and a,$3f + ld hl, TextSpeedOptionData + 1 + ld a, [wOptions] + ld c, a + and $3f push bc - ld de,2 + ld de, 2 call IsInArray pop bc dec hl - ld a,[hl] - ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate + ld a, [hl] + ld [wOptionsTextSpeedCursorX], a ; text speed cursor X coordinate coord hl, 0, 3 call .placeUnfilledRightArrow sla c - ld a,1 ; On - jr nc,.storeBattleAnimationCursorX - ld a,10 ; Off + ld a, 1 ; On + jr nc, .storeBattleAnimationCursorX + ld a, 10 ; Off .storeBattleAnimationCursorX - ld [wOptionsBattleAnimCursorX],a ; battle animation cursor X coordinate + ld [wOptionsBattleAnimCursorX], a ; battle animation cursor X coordinate coord hl, 0, 8 call .placeUnfilledRightArrow sla c - ld a,1 - jr nc,.storeBattleStyleCursorX - ld a,10 + ld a, 1 + jr nc, .storeBattleStyleCursorX + ld a, 10 .storeBattleStyleCursorX - ld [wOptionsBattleStyleCursorX],a ; battle style cursor X coordinate + ld [wOptionsBattleStyleCursorX], a ; battle style cursor X coordinate coord hl, 0, 13 call .placeUnfilledRightArrow ; cursor in front of Cancel coord hl, 0, 16 - ld a,1 + ld a, 1 .placeUnfilledRightArrow - ld e,a - ld d,0 - add hl,de - ld [hl],$ec ; unfilled right arrow menu cursor + ld e, a + ld d, 0 + add hl, de + ld [hl], $ec ; unfilled right arrow menu cursor ret ; table that indicates how the 3 text speed options affect frame delays diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index a35524ed..5149e5ab 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -19,83 +19,83 @@ ; f8: leveled up DrawPartyMenu_: xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a call ClearScreen call UpdateSprites callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics RedrawPartyMenu_: - ld a,[wPartyMenuTypeOrMessageID] - cp a,SWAP_MONS_PARTY_MENU - jp z,.printMessage + ld a, [wPartyMenuTypeOrMessageID] + cp SWAP_MONS_PARTY_MENU + jp z, .printMessage call ErasePartyMenuCursors callba InitPartyMenuBlkPacket coord hl, 3, 0 - ld de,wPartySpecies + ld de, wPartySpecies xor a - ld c,a - ld [hPartyMonIndex],a - ld [wWhichPartyMenuHPBar],a + ld c, a + ld [hPartyMonIndex], a + ld [wWhichPartyMenuHPBar], a .loop - ld a,[de] - cp a,$FF ; reached the terminator? - jp z,.afterDrawingMonEntries + ld a, [de] + cp $FF ; reached the terminator? + jp z, .afterDrawingMonEntries push bc push de push hl - ld a,c + ld a, c push hl - ld hl,wPartyMonNicks + ld hl, wPartyMonNicks call GetPartyMonName pop hl call PlaceString ; print the pokemon's name callba WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon - ld a,[hPartyMonIndex] - ld [wWhichPokemon],a + ld a, [hPartyMonIndex] + ld [wWhichPokemon], a inc a - ld [hPartyMonIndex],a + ld [hPartyMonIndex], a call LoadMonData pop hl push hl - ld a,[wMenuItemToSwap] + ld a, [wMenuItemToSwap] and a ; is the player swapping pokemon positions? - jr z,.skipUnfilledRightArrow + jr z, .skipUnfilledRightArrow ; if the player is swapping pokemon positions dec a - ld b,a - ld a,[wWhichPokemon] + ld b, a + ld a, [wWhichPokemon] cp b ; is the player swapping the current pokemon in the list? - jr nz,.skipUnfilledRightArrow + jr nz, .skipUnfilledRightArrow ; the player is swapping the current pokemon in the list dec hl dec hl dec hl - ld a,"▷" ; unfilled right arrow menu cursor - ld [hli],a ; place the cursor + ld a, "▷" ; unfilled right arrow menu cursor + ld [hli], a ; place the cursor inc hl inc hl .skipUnfilledRightArrow - ld a,[wPartyMenuTypeOrMessageID] ; menu type - cp a,TMHM_PARTY_MENU - jr z,.teachMoveMenu - cp a,EVO_STONE_PARTY_MENU - jr z,.evolutionStoneMenu + ld a, [wPartyMenuTypeOrMessageID] ; menu type + cp TMHM_PARTY_MENU + jr z, .teachMoveMenu + cp EVO_STONE_PARTY_MENU + jr z, .evolutionStoneMenu push hl - ld bc,14 ; 14 columns to the right - add hl,bc - ld de,wLoadedMonStatus + ld bc, 14 ; 14 columns to the right + add hl, bc + ld de, wLoadedMonStatus call PrintStatusCondition pop hl push hl - ld bc,SCREEN_WIDTH + 1 ; down 1 row and right 1 column - ld a,[hFlags_0xFFF6] - set 0,a - ld [hFlags_0xFFF6],a - add hl,bc + ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column + ld a, [hFlags_0xFFF6] + set 0, a + ld [hFlags_0xFFF6], a + add hl, bc predef DrawHP2 ; draw HP bar and prints current / max HP - ld a,[hFlags_0xFFF6] - res 0,a - ld [hFlags_0xFFF6],a + ld a, [hFlags_0xFFF6] + res 0, a + ld [hFlags_0xFFF6], a call SetPartyMenuHPBarColor ; color the HP bar (on SGB) pop hl jr .printLevel @@ -103,26 +103,26 @@ RedrawPartyMenu_: push hl predef CanLearnTM ; check if the pokemon can learn the move pop hl - ld de,.ableToLearnMoveText - ld a,c + ld de, .ableToLearnMoveText + ld a, c and a - jr nz,.placeMoveLearnabilityString - ld de,.notAbleToLearnMoveText + jr nz, .placeMoveLearnabilityString + ld de, .notAbleToLearnMoveText .placeMoveLearnabilityString - ld bc,20 + 9 ; down 1 row and right 9 columns + ld bc, 20 + 9 ; down 1 row and right 9 columns push hl - add hl,bc + add hl, bc call PlaceString pop hl .printLevel - ld bc,10 ; move 10 columns to the right - add hl,bc + ld bc, 10 ; move 10 columns to the right + add hl, bc call PrintLevel pop hl pop de inc de - ld bc,2 * 20 - add hl,bc + ld bc, 2 * 20 + add hl, bc pop bc inc c jp .loop @@ -132,54 +132,54 @@ RedrawPartyMenu_: db "NOT ABLE@" .evolutionStoneMenu push hl - ld hl,EvosMovesPointerTable - ld b,0 - ld a,[wLoadedMonSpecies] + ld hl, EvosMovesPointerTable + ld b, 0 + ld a, [wLoadedMonSpecies] dec a add a rl b - ld c,a - add hl,bc - ld de,wcd6d - ld a,BANK(EvosMovesPointerTable) - ld bc,2 + ld c, a + add hl, bc + ld de, wcd6d + ld a, BANK(EvosMovesPointerTable) + ld bc, 2 call FarCopyData - ld hl,wcd6d - ld a,[hli] - ld h,[hl] - ld l,a - ld de,wcd6d - ld a,BANK(EvosMovesPointerTable) - ld bc,Mon133_EvosEnd - Mon133_EvosMoves + ld hl, wcd6d + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wcd6d + ld a, BANK(EvosMovesPointerTable) + ld bc, Mon133_EvosEnd - Mon133_EvosMoves call FarCopyData - ld hl,wcd6d - ld de,.notAbleToEvolveText + ld hl, wcd6d + ld de, .notAbleToEvolveText ; loop through the pokemon's evolution entries .checkEvolutionsLoop - ld a,[hli] + ld a, [hli] and a ; reached terminator? - jr z,.placeEvolutionStoneString ; if so, place the "NOT ABLE" string + jr z, .placeEvolutionStoneString ; if so, place the "NOT ABLE" string inc hl inc hl - cp a,EV_ITEM - jr nz,.checkEvolutionsLoop + cp EV_ITEM + jr nz, .checkEvolutionsLoop ; if it's a stone evolution entry dec hl dec hl - ld b,[hl] - ld a,[wEvoStoneItemID] ; the stone the player used + ld b, [hl] + ld a, [wEvoStoneItemID] ; the stone the player used inc hl inc hl inc hl cp b ; does the player's stone match this evolution entry's stone? - jr nz,.checkEvolutionsLoop + jr nz, .checkEvolutionsLoop ; if it does match - ld de,.ableToEvolveText + ld de, .ableToEvolveText .placeEvolutionStoneString - ld bc,20 + 9 ; down 1 row and right 9 columns + ld bc, 20 + 9 ; down 1 row and right 9 columns pop hl push hl - add hl,bc + add hl, bc call PlaceString pop hl jr .printLevel @@ -191,44 +191,44 @@ RedrawPartyMenu_: ld b, SET_PAL_PARTY_MENU call RunPaletteCommand .printMessage - ld hl,wd730 - ld a,[hl] + ld hl, wd730 + ld a, [hl] push af push hl - set 6,[hl] ; turn off letter printing delay - ld a,[wPartyMenuTypeOrMessageID] ; message ID - cp a,$F0 - jr nc,.printItemUseMessage + set 6, [hl] ; turn off letter printing delay + ld a, [wPartyMenuTypeOrMessageID] ; message ID + cp $F0 + jr nc, .printItemUseMessage add a - ld hl,PartyMenuMessagePointers - ld b,0 - ld c,a - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a + ld hl, PartyMenuMessagePointers + ld b, 0 + ld c, a + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a call PrintText .done pop hl pop af - ld [hl],a - ld a,1 - ld [H_AUTOBGTRANSFERENABLED],a + ld [hl], a + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 jp GBPalNormal .printItemUseMessage - and a,$0F - ld hl,PartyMenuItemUseMessagePointers + and $0F + ld hl, PartyMenuItemUseMessagePointers add a - ld c,a - ld b,0 - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a + ld c, a + ld b, 0 + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a push hl - ld a,[wUsedItemOnWhichPokemon] - ld hl,wPartyMonNicks + ld a, [wUsedItemOnWhichPokemon] + ld hl, wPartyMonNicks call GetPartyMonName pop hl call PrintText diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index c9e2cf08..5639bd99 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -17,34 +17,34 @@ PCMainMenu: bit 1, a ;if player pressed B jp nz, LogOff ld a, [wMaxMenuItem] - cp a, 2 + cp 2 jr nz, .next ;if not 2 menu items (not counting log off) (2 occurs before you get the pokedex) ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc - cp a, 1 + cp 1 jr z, .playersPC ;if current menu item id is 1, it's players pc jp LogOff ;otherwise, it's 2, and you're logging off .next - cp a, 3 + cp 3 jr nz, .next2 ;if not 3 menu items (not counting log off) (3 occurs after you get the pokedex, before you beat the pokemon league) ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc - cp a, 1 + cp 1 jr z, .playersPC ;if current menu item id is 1, it's players pc - cp a, 2 + cp 2 jp z, OaksPC ;if current menu item id is 2, it's oaks pc jp LogOff ;otherwise, it's 3, and you're logging off .next2 ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc - cp a, 1 + cp 1 jr z, .playersPC ;if current menu item id is 1, it's players pc - cp a, 2 + cp 2 jp z, OaksPC ;if current menu item id is 2, it's oaks pc - cp a, 3 + cp 3 jp z, PKMNLeague ;if current menu item id is 3, it's pkmnleague jp LogOff ;otherwise, it's 4, and you're logging off .playersPC diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index bf8afaa9..8e1fd480 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -2,53 +2,53 @@ ShowPokedexMenu: call GBPalWhiteOut call ClearScreen call UpdateSprites - ld a,[wListScrollOffset] + ld a, [wListScrollOffset] push af xor a - ld [wCurrentMenuItem],a - ld [wListScrollOffset],a - ld [wLastMenuItem],a + ld [wCurrentMenuItem], a + ld [wListScrollOffset], a + ld [wLastMenuItem], a inc a - ld [wd11e],a - ld [hJoy7],a + ld [wd11e], a + ld [hJoy7], a .setUpGraphics ld b, SET_PAL_GENERIC call RunPaletteCommand callab LoadPokedexTilePatterns .doPokemonListMenu - ld hl,wTopMenuItemY - ld a,3 - ld [hli],a ; top menu item Y + ld hl, wTopMenuItemY + ld a, 3 + ld [hli], a ; top menu item Y xor a - ld [hli],a ; top menu item X + ld [hli], a ; top menu item X inc a - ld [wMenuWatchMovingOutOfBounds],a + ld [wMenuWatchMovingOutOfBounds], a inc hl inc hl - ld a,6 - ld [hli],a ; max menu item ID - ld [hl],D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON + ld a, 6 + ld [hli], a ; max menu item ID + ld [hl], D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON call HandlePokedexListMenu - jr c,.goToSideMenu ; if the player chose a pokemon from the list + jr c, .goToSideMenu ; if the player chose a pokemon from the list .exitPokedex xor a - ld [wMenuWatchMovingOutOfBounds],a - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a - ld [hJoy7],a - ld [wWastedByteCD3A],a - ld [wOverrideSimulatedJoypadStatesMask],a + ld [wMenuWatchMovingOutOfBounds], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [hJoy7], a + ld [wWastedByteCD3A], a + ld [wOverrideSimulatedJoypadStatesMask], a pop af - ld [wListScrollOffset],a + ld [wListScrollOffset], a call GBPalWhiteOutWithDelay3 call RunDefaultPaletteCommand jp ReloadMapData .goToSideMenu call HandlePokedexSideMenu dec b - jr z,.exitPokedex ; if the player chose Quit + jr z, .exitPokedex ; if the player chose Quit dec b - jr z,.doPokemonListMenu ; if pokemon not seen or player pressed B button + jr z, .doPokemonListMenu ; if pokemon not seen or player pressed B button jp .setUpGraphics ; if pokemon data or area was shown ; handles the menu on the lower right in the pokedex screen @@ -59,68 +59,68 @@ ShowPokedexMenu: ; 02: the pokemon has not been seen yet or the player pressed the B button HandlePokedexSideMenu: call PlaceUnfilledArrowMenuCursor - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] push af - ld b,a - ld a,[wLastMenuItem] + ld b, a + ld a, [wLastMenuItem] push af - ld a,[wListScrollOffset] + ld a, [wListScrollOffset] push af add b inc a - ld [wd11e],a - ld a,[wd11e] + ld [wd11e], a + ld a, [wd11e] push af - ld a,[wDexMaxSeenMon] + ld a, [wDexMaxSeenMon] push af ; this doesn't need to be preserved - ld hl,wPokedexSeen + ld hl, wPokedexSeen call IsPokemonBitSet - ld b,2 - jr z,.exitSideMenu + ld b, 2 + jr z, .exitSideMenu call PokedexToIndex - ld hl,wTopMenuItemY - ld a,10 - ld [hli],a ; top menu item Y - ld a,15 - ld [hli],a ; top menu item X + ld hl, wTopMenuItemY + ld a, 10 + ld [hli], a ; top menu item Y + ld a, 15 + ld [hli], a ; top menu item X xor a - ld [hli],a ; current menu item ID + ld [hli], a ; current menu item ID inc hl - ld a,3 - ld [hli],a ; max menu item ID + 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) + ld [hli], a ; menu watched keys (A button and B button) xor a - ld [hli],a ; old menu item ID - ld [wMenuWatchMovingOutOfBounds],a + ld [hli], a ; old menu item ID + ld [wMenuWatchMovingOutOfBounds], a .handleMenuInput call HandleMenuInput - bit 1,a ; was the B button pressed? - ld b,2 - jr nz,.buttonBPressed - ld a,[wCurrentMenuItem] + bit 1, a ; was the B button pressed? + ld b, 2 + jr nz, .buttonBPressed + ld a, [wCurrentMenuItem] and a - jr z,.choseData + jr z, .choseData dec a - jr z,.choseCry + jr z, .choseCry dec a - jr z,.choseArea + jr z, .choseArea .choseQuit - ld b,1 + ld b, 1 .exitSideMenu pop af - ld [wDexMaxSeenMon],a + ld [wDexMaxSeenMon], a pop af - ld [wd11e],a + ld [wd11e], a pop af - ld [wListScrollOffset],a + ld [wListScrollOffset], a pop af - ld [wLastMenuItem],a + ld [wLastMenuItem], a pop af - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a push bc coord hl, 0, 3 - ld de,20 + ld de, 20 lb bc, " ", 13 call DrawTileLine ; cover up the menu cursor in the pokemon list pop bc @@ -129,7 +129,7 @@ HandlePokedexSideMenu: .buttonBPressed push bc coord hl, 15, 10 - ld de,20 + ld de, 20 lb bc, " ", 7 call DrawTileLine ; cover up the menu cursor in the side menu pop bc @@ -137,130 +137,130 @@ HandlePokedexSideMenu: .choseData call ShowPokedexDataInternal - ld b,0 + ld b, 0 jr .exitSideMenu ; play pokemon cry .choseCry - ld a,[wd11e] + ld a, [wd11e] call GetCryData call PlaySound jr .handleMenuInput .choseArea predef LoadTownMap_Nest ; display pokemon areas - ld b,0 + ld b, 0 jr .exitSideMenu ; handles the list of pokemon on the left of the pokedex screen ; sets carry flag if player presses A, unsets carry flag if player presses B HandlePokedexListMenu: xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a ; draw the horizontal line separating the seen and owned amounts from the menu coord hl, 15, 8 - ld a,"─" - ld [hli],a - ld [hli],a - ld [hli],a - ld [hli],a - ld [hli],a + ld a, "─" + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a coord hl, 14, 0 - ld [hl],$71 ; vertical line tile + ld [hl], $71 ; vertical line tile coord hl, 14, 1 call DrawPokedexVerticalLine coord hl, 14, 9 call DrawPokedexVerticalLine - ld hl,wPokedexSeen - ld b,wPokedexSeenEnd - wPokedexSeen + ld hl, wPokedexSeen + ld b, wPokedexSeenEnd - wPokedexSeen call CountSetBits 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 + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld de, wNumSetBits coord hl, 16, 6 lb bc, 1, 3 call PrintNumber ; print number of owned pokemon coord hl, 16, 2 - ld de,PokedexSeenText + ld de, PokedexSeenText call PlaceString coord hl, 16, 5 - ld de,PokedexOwnText + ld de, PokedexOwnText call PlaceString coord hl, 1, 1 - ld de,PokedexContentsText + ld de, PokedexContentsText call PlaceString coord hl, 16, 10 - ld de,PokedexMenuItemsText + ld de, PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen - ld hl,wPokedexSeenEnd - 1 - ld b,(wPokedexSeenEnd - wPokedexSeen) * 8 + 1 + ld hl, wPokedexSeenEnd - 1 + ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 .maxSeenPokemonLoop - ld a,[hld] - ld c,8 + ld a, [hld] + ld c, 8 .maxSeenPokemonInnerLoop dec b sla a - jr c,.storeMaxSeenPokemon + jr c, .storeMaxSeenPokemon dec c - jr nz,.maxSeenPokemonInnerLoop + jr nz, .maxSeenPokemonInnerLoop jr .maxSeenPokemonLoop .storeMaxSeenPokemon - ld a,b - ld [wDexMaxSeenMon],a + ld a, b + ld [wDexMaxSeenMon], a .loop xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 2 lb bc, 14, 10 call ClearScreenArea coord hl, 1, 3 - ld a,[wListScrollOffset] - ld [wd11e],a - ld d,7 - ld a,[wDexMaxSeenMon] - cp a,7 - jr nc,.printPokemonLoop - ld d,a + ld a, [wListScrollOffset] + ld [wd11e], a + ld d, 7 + ld a, [wDexMaxSeenMon] + cp 7 + jr nc, .printPokemonLoop + ld d, a dec a - ld [wMaxMenuItem],a + ld [wMaxMenuItem], a ; loop to print pokemon pokedex numbers and names ; if the player has owned the pokemon, it puts a pokeball beside the name .printPokemonLoop - ld a,[wd11e] + ld a, [wd11e] inc a - ld [wd11e],a + ld [wd11e], a push af push de push hl - ld de,-SCREEN_WIDTH - add hl,de - ld de,wd11e + ld de, -SCREEN_WIDTH + add hl, de + ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print the pokedex number - ld de,SCREEN_WIDTH - add hl,de + ld de, SCREEN_WIDTH + add hl, de dec hl push hl - ld hl,wPokedexOwned + ld hl, wPokedexOwned call IsPokemonBitSet pop hl - ld a," " - jr z,.writeTile - ld a,$72 ; pokeball tile + ld a, " " + jr z, .writeTile + ld a, $72 ; pokeball tile .writeTile - ld [hl],a ; put a pokeball next to pokemon that the player has owned + ld [hl], a ; put a pokeball next to pokemon that the player has owned push hl - ld hl,wPokedexSeen + ld hl, wPokedexSeen call IsPokemonBitSet - jr nz,.getPokemonName ; if the player has seen the pokemon - ld de,.dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon + jr nz, .getPokemonName ; if the player has seen the pokemon + ld de, .dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon jr .skipGettingName .dashedLine ; for unseen pokemon in the list db "----------@" @@ -272,73 +272,73 @@ HandlePokedexListMenu: inc hl call PlaceString pop hl - ld bc,2 * SCREEN_WIDTH - add hl,bc + ld bc, 2 * SCREEN_WIDTH + add hl, bc pop de pop af - ld [wd11e],a + ld [wd11e], a dec d - jr nz,.printPokemonLoop - ld a,01 - ld [H_AUTOBGTRANSFERENABLED],a + jr nz, .printPokemonLoop + ld a, 01 + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 call GBPalNormal call HandleMenuInput - bit 1,a ; was the B button pressed? - jp nz,.buttonBPressed + bit 1, a ; was the B button pressed? + jp nz, .buttonBPressed .checkIfUpPressed - bit 6,a ; was Up pressed? - jr z,.checkIfDownPressed + bit 6, a ; was Up pressed? + jr z, .checkIfDownPressed .upPressed ; scroll up one row - ld a,[wListScrollOffset] + ld a, [wListScrollOffset] and a - jp z,.loop + jp z, .loop dec a - ld [wListScrollOffset],a + ld [wListScrollOffset], a jp .loop .checkIfDownPressed - bit 7,a ; was Down pressed? - jr z,.checkIfRightPressed + bit 7, a ; was Down pressed? + jr z, .checkIfRightPressed .downPressed ; scroll down one row - ld a,[wDexMaxSeenMon] - cp a,7 - jp c,.loop ; can't if the list is shorter than 7 - sub a,7 - ld b,a - ld a,[wListScrollOffset] + ld a, [wDexMaxSeenMon] + cp 7 + jp c, .loop ; can't if the list is shorter than 7 + sub 7 + ld b, a + ld a, [wListScrollOffset] cp b - jp z,.loop + jp z, .loop inc a - ld [wListScrollOffset],a + ld [wListScrollOffset], a jp .loop .checkIfRightPressed - bit 4,a ; was Right pressed? - jr z,.checkIfLeftPressed + bit 4, a ; was Right pressed? + jr z, .checkIfLeftPressed .rightPressed ; scroll down 7 rows - ld a,[wDexMaxSeenMon] - cp a,7 - jp c,.loop ; can't if the list is shorter than 7 - sub a,6 - ld b,a - ld a,[wListScrollOffset] - add a,7 - ld [wListScrollOffset],a + ld a, [wDexMaxSeenMon] + cp 7 + jp c, .loop ; can't if the list is shorter than 7 + sub 6 + ld b, a + ld a, [wListScrollOffset] + add 7 + ld [wListScrollOffset], a cp b - jp c,.loop + jp c, .loop dec b - ld a,b - ld [wListScrollOffset],a + ld a, b + ld [wListScrollOffset], a jp .loop .checkIfLeftPressed ; scroll up 7 rows - bit 5,a ; was Left pressed? - jr z,.buttonAPressed + bit 5, a ; was Left pressed? + jr z, .buttonAPressed .leftPressed - ld a,[wListScrollOffset] - sub a,7 - ld [wListScrollOffset],a - jp nc,.loop + ld a, [wListScrollOffset] + sub 7 + ld [wListScrollOffset], a + jp nc, .loop xor a - ld [wListScrollOffset],a + ld [wListScrollOffset], a jp .loop .buttonAPressed scf @@ -348,15 +348,15 @@ HandlePokedexListMenu: ret DrawPokedexVerticalLine: - ld c,9 ; height of line - ld de,SCREEN_WIDTH - ld a,$71 ; vertical line tile + ld c, 9 ; height of line + ld de, SCREEN_WIDTH + ld a, $71 ; vertical line tile .loop - ld [hl],a - add hl,de - xor a,1 ; toggle between vertical line tile and box tile + ld [hl], a + add hl, de + xor 1 ; toggle between vertical line tile and box tile dec c - jr nz,.loop + jr nz, .loop ret PokedexSeenText: @@ -379,12 +379,12 @@ PokedexMenuItemsText: ; [wd11e] = pokedex number ; hl = address of bit field IsPokemonBitSet: - ld a,[wd11e] + ld a, [wd11e] dec a - ld c,a - ld b,FLAG_TEST + ld c, a + ld b, FLAG_TEST predef FlagActionPredef - ld a,c + ld a, c and a ret @@ -397,26 +397,26 @@ ShowPokedexData: ; function to display pokedex data from inside the pokedex ShowPokedexDataInternal: - ld hl,wd72c - set 1,[hl] - ld a,$33 ; 3/7 volume - ld [rNR50],a + ld hl, wd72c + set 1, [hl] + ld a, $33 ; 3/7 volume + ld [rNR50], a call GBPalWhiteOut ; zero all palettes call ClearScreen - ld a,[wd11e] ; pokemon ID - ld [wcf91],a + ld a, [wd11e] ; pokemon ID + ld [wcf91], a push af ld b, SET_PAL_POKEDEX call RunPaletteCommand pop af - ld [wd11e],a - ld a,[hTilesetType] + ld [wd11e], a + ld a, [hTilesetType] push af xor a - ld [hTilesetType],a + ld [hTilesetType], a coord hl, 0, 0 - ld de,1 + ld de, 1 lb bc, $64, SCREEN_WIDTH call DrawTileLine ; draw top border @@ -425,71 +425,71 @@ ShowPokedexDataInternal: call DrawTileLine ; draw bottom border coord hl, 0, 1 - ld de,20 + ld de, 20 lb bc, $66, $10 call DrawTileLine ; draw left border coord hl, 19, 1 - ld b,$67 + ld b, $67 call DrawTileLine ; draw right border - ld a,$63 ; upper left corner tile + ld a, $63 ; upper left corner tile Coorda 0, 0 - ld a,$65 ; upper right corner tile + ld a, $65 ; upper right corner tile Coorda 19, 0 - ld a,$6c ; lower left corner tile + ld a, $6c ; lower left corner tile Coorda 0, 17 - ld a,$6e ; lower right corner tile + ld a, $6e ; lower right corner tile Coorda 19, 17 coord hl, 0, 9 - ld de,PokedexDataDividerLine + ld de, PokedexDataDividerLine call PlaceString ; draw horizontal divider line coord hl, 9, 6 - ld de,HeightWeightText + ld de, HeightWeightText call PlaceString call GetMonName coord hl, 9, 2 call PlaceString - ld hl,PokedexEntryPointers - ld a,[wd11e] + ld hl, PokedexEntryPointers + ld a, [wd11e] dec a - ld e,a - ld d,0 - add hl,de - add hl,de - ld a,[hli] - ld e,a - ld d,[hl] ; de = address of pokedex entry + ld e, a + ld d, 0 + add hl, de + add hl, de + ld a, [hli] + ld e, a + ld d, [hl] ; de = address of pokedex entry coord hl, 9, 4 call PlaceString ; print species name - ld h,b - ld l,c + ld h, b + ld l, c push de - ld a,[wd11e] + ld a, [wd11e] push af call IndexToPokedex coord hl, 2, 8 ld a, "№" - ld [hli],a - ld a,"⠄" - ld [hli],a - ld de,wd11e + ld [hli], a + ld a, "⠄" + ld [hli], a + ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print pokedex number - ld hl,wPokedexOwned + ld hl, wPokedexOwned call IsPokemonBitSet pop af - ld [wd11e],a - ld a,[wcf91] - ld [wd0b5],a + ld [wd11e], a + ld a, [wcf91] + ld [wd0b5], a pop de push af @@ -502,7 +502,7 @@ ShowPokedexDataInternal: call GetMonHeader ; load pokemon picture location coord hl, 1, 1 call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture - ld a,[wcf91] + ld a, [wcf91] call PlayCry ; play pokemon cry pop hl @@ -510,83 +510,83 @@ ShowPokedexDataInternal: pop bc pop af - ld a,c + ld a, c and a - jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description + 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 + ld a, [de] ; reads feet, but a is overwritten without being used coord hl, 12, 6 lb bc, 1, 2 call PrintNumber ; print feet (height) - ld a,$60 ; feet symbol tile (one tick) - ld [hl],a + ld a, $60 ; feet symbol tile (one tick) + ld [hl], a inc de inc de ; de = address of inches (height) coord hl, 15, 6 lb bc, LEADING_ZEROES | 1, 2 call PrintNumber ; print inches (height) - ld a,$61 ; inches symbol tile (two ticks) - ld [hl],a + ld a, $61 ; inches symbol tile (two ticks) + ld [hl], a ; now print the weight (note that weight is stored in tenths of pounds internally) inc de inc de inc de ; de = address of upper byte of weight push de ; put weight in big-endian order at hDexWeight - ld hl,hDexWeight - ld a,[hl] ; save existing value of [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 [hDexWeight] - ld a,[hl] ; save existing value of [hDexWeight + 1] + ld a, [de] ; a = upper byte of weight + 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 [hDexWeight + 1] - ld de,hDexWeight + ld a, [de] ; a = lower byte of weight + ld [hl], a ; store lower byte of weight in [hDexWeight + 1] + ld de, hDexWeight coord hl, 11, 8 lb bc, 2, 5 ; 2 bytes, 5 digits call PrintNumber ; print weight coord hl, 14, 8 - ld a,[hDexWeight + 1] - sub a,10 - 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 + ld a, [hDexWeight + 1] + sub 10 + ld a, [hDexWeight] + sbc 0 + jr nc, .next + ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point .next inc hl - ld a,[hli] - ld [hld],a ; make space for the decimal point by moving the last digit forward one tile - ld [hl],"⠄" ; decimal point tile + ld a, [hli] + ld [hld], a ; make space for the decimal point by moving the last digit forward one tile + ld [hl], "⠄" ; decimal point tile pop af - ld [hDexWeight + 1],a ; restore original value of [hDexWeight + 1] + ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1] pop af - ld [hDexWeight],a ; restore original value of [hDexWeight] + ld [hDexWeight], a ; restore original value of [hDexWeight] pop hl inc hl ; hl = address of pokedex description text coord bc, 1, 11 - ld a,2 - ld [$fff4],a + ld a, 2 + ld [$fff4], a call TextCommandProcessor ; print pokedex description text xor a - ld [$fff4],a + ld [$fff4], a .waitForButtonPress call JoypadLowSensitivity - ld a,[hJoy5] - and a,A_BUTTON | B_BUTTON - jr z,.waitForButtonPress + ld a, [hJoy5] + and A_BUTTON | B_BUTTON + jr z, .waitForButtonPress pop af - ld [hTilesetType],a + ld [hTilesetType], a call GBPalWhiteOut call ClearScreen call RunDefaultPaletteCommand call LoadTextBoxTilePatterns call GBPalNormal - ld hl,wd72c - res 1,[hl] - ld a,$77 ; max volume - ld [rNR50],a + ld hl, wd72c + res 1, [hl] + ld a, $77 ; max volume + ld [rNR50], a ret HeightWeightText: @@ -615,10 +615,10 @@ DrawTileLine: push bc push de .loop - ld [hl],b - add hl,de + ld [hl], b + add hl, de dec c - jr nz,.loop + jr nz, .loop pop de pop bc ret @@ -629,19 +629,19 @@ PokedexToIndex: ; converts the Pokédex number at wd11e to an index push bc push hl - ld a,[wd11e] - ld b,a - ld c,0 - ld hl,PokedexOrder + ld a, [wd11e] + ld b, a + ld c, 0 + ld hl, PokedexOrder .loop ; go through the list until we find an entry with a matching dex number inc c - ld a,[hli] + ld a, [hli] cp b - jr nz,.loop + jr nz, .loop - ld a,c - ld [wd11e],a + ld a, c + ld [wd11e], a pop hl pop bc ret @@ -650,14 +650,14 @@ IndexToPokedex: ; converts the index number at wd11e to a Pokédex number push bc push hl - ld a,[wd11e] + ld a, [wd11e] dec a - ld hl,PokedexOrder - ld b,0 - ld c,a - add hl,bc - ld a,[hl] - ld [wd11e],a + ld hl, PokedexOrder + ld b, 0 + ld c, a + add hl, bc + ld a, [hl] + ld [wd11e], a pop hl pop bc ret diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index f6ca013b..bcd0d4ea 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -1,26 +1,26 @@ CeladonPrizeMenu: - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag - jr nz,.havingCoinCase - ld hl,RequireCoinCaseTextPtr + jr nz, .havingCoinCase + ld hl, RequireCoinCaseTextPtr jp PrintText .havingCoinCase - ld hl,wd730 - set 6,[hl] ; disable letter-printing delay - ld hl,ExchangeCoinsForPrizesTextPtr + ld hl, wd730 + set 6, [hl] ; disable letter-printing delay + ld hl, ExchangeCoinsForPrizesTextPtr call PrintText ; the following are the menu settings xor a - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a - ld a,A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys],a - ld a,$03 - ld [wMaxMenuItem],a - ld a,$04 - ld [wTopMenuItemY],a - ld a,$01 - ld [wTopMenuItemX],a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $03 + ld [wMaxMenuItem], a + ld a, $04 + ld [wTopMenuItemY], a + ld a, $01 + ld [wTopMenuItemX], a call PrintPrizePrice coord hl, 0, 2 ld b, 8 @@ -28,18 +28,18 @@ CeladonPrizeMenu: call TextBoxBorder call GetPrizeMenuId call UpdateSprites - ld hl,WhichPrizeTextPtr + ld hl, WhichPrizeTextPtr call PrintText call HandleMenuInput ; menu choice handler - bit 1,a ; keypress = B (Cancel) + bit 1, a ; keypress = B (Cancel) jr nz, .noChoice - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] cp 3 ; "NO,THANKS" choice jr z, .noChoice call HandlePrizeChoice .noChoice - ld hl,wd730 - res 6,[hl] + ld hl, wd730 + res 6, [hl] ret RequireCoinCaseTextPtr: @@ -64,85 +64,85 @@ GetPrizeMenuId: ; display the three prizes' names ; (distinguishing between Pokemon names ; and Items (specifically TMs) names) - ld a,[hSpriteIndexOrTextID] + ld a, [hSpriteIndexOrTextID] sub 3 ; prize-texts' id are 3, 4 and 5 - ld [wWhichPrizeWindow],a ; prize-texts' id (relative, i.e. 0, 1 or 2) + ld [wWhichPrizeWindow], a ; prize-texts' id (relative, i.e. 0, 1 or 2) add a add a - ld d,0 - ld e,a - ld hl,PrizeDifferentMenuPtrs - add hl,de - ld a,[hli] - ld d,[hl] - ld e,a + ld d, 0 + ld e, a + ld hl, PrizeDifferentMenuPtrs + add hl, de + ld a, [hli] + ld d, [hl] + ld e, a inc hl push hl - ld hl,wPrize1 + ld hl, wPrize1 call CopyString pop hl - ld a,[hli] - ld h,[hl] - ld l,a - ld de,wPrize1Price - ld bc,6 + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wPrize1Price + ld bc, 6 call CopyData - ld a,[wWhichPrizeWindow] + ld a, [wWhichPrizeWindow] cp 2 ;is TM_menu? - jr nz,.putMonName - ld a,[wPrize1] - ld [wd11e],a + jr nz, .putMonName + ld a, [wPrize1] + ld [wd11e], a call GetItemName coord hl, 2, 4 call PlaceString - ld a,[wPrize2] - ld [wd11e],a + ld a, [wPrize2] + ld [wd11e], a call GetItemName coord hl, 2, 6 call PlaceString - ld a,[wPrize3] - ld [wd11e],a + ld a, [wPrize3] + ld [wd11e], a call GetItemName coord hl, 2, 8 call PlaceString jr .putNoThanksText .putMonName - ld a,[wPrize1] - ld [wd11e],a + ld a, [wPrize1] + ld [wd11e], a call GetMonName coord hl, 2, 4 call PlaceString - ld a,[wPrize2] - ld [wd11e],a + ld a, [wPrize2] + ld [wd11e], a call GetMonName coord hl, 2, 6 call PlaceString - ld a,[wPrize3] - ld [wd11e],a + ld a, [wPrize3] + ld [wd11e], a call GetMonName coord hl, 2, 8 call PlaceString .putNoThanksText coord hl, 2, 10 - ld de,NoThanksText + ld de, NoThanksText call PlaceString ; put prices on the right side of the textbox - ld de,wPrize1Price + ld de, wPrize1Price coord hl, 13, 5 ; reg. c: ; [low nybble] number of bytes ; [bit 765 = %100] space-padding (not zero-padding) - ld c,(1 << 7 | 2) + ld c, (1 << 7 | 2) ; Function $15CD displays BCD value (same routine ; used by text-command $02) call PrintBCDNumber - ld de,wPrize2Price + ld de, wPrize2Price coord hl, 13, 7 - ld c,(1 << 7 | 2) + ld c, (1 << 7 | 2) call PrintBCDNumber - ld de,wPrize3Price + ld de, wPrize3Price coord hl, 13, 9 - ld c,(1 << 7 | 2) + ld c, (1 << 7 | 2) jp PrintBCDNumber INCLUDE "data/prizes.asm" @@ -160,8 +160,8 @@ PrintPrizePrice: ld de, .SixSpacesString call PlaceString coord hl, 13, 1 - ld de,wPlayerCoins - ld c,%10000010 + ld de, wPlayerCoins + ld c, %10000010 call PrintBCDNumber ret @@ -172,30 +172,30 @@ PrintPrizePrice: db " @" LoadCoinsToSubtract: - ld a,[wWhichPrize] + ld a, [wWhichPrize] add a - ld d,0 - ld e,a - ld hl,wPrize1Price - add hl,de ; get selected prize's price + ld d, 0 + ld e, a + ld hl, wPrize1Price + add hl, de ; get selected prize's price xor a - ld [hUnusedCoinsByte],a - ld a,[hli] - ld [hCoins],a - ld a,[hl] - ld [hCoins + 1],a + ld [hUnusedCoinsByte], a + ld a, [hli] + ld [hCoins], a + ld a, [hl] + ld [hCoins + 1], a ret HandlePrizeChoice: - ld a,[wCurrentMenuItem] - ld [wWhichPrize],a - ld d,0 - ld e,a - ld hl,wPrize1 - add hl,de - ld a,[hl] - ld [wd11e],a - ld a,[wWhichPrizeWindow] + ld a, [wCurrentMenuItem] + ld [wWhichPrize], a + ld d, 0 + ld e, a + ld hl, wPrize1 + add hl, de + ld a, [hl] + ld [wd11e], a + ld a, [wWhichPrizeWindow] cp 2 ; is prize a TM? jr nz, .getMonName call GetItemName @@ -203,40 +203,40 @@ HandlePrizeChoice: .getMonName call GetMonName .givePrize - ld hl,SoYouWantPrizeTextPtr + ld hl, SoYouWantPrizeTextPtr call PrintText call YesNoChoice - ld a,[wCurrentMenuItem] ; yes/no answer (Y=0, N=1) + ld a, [wCurrentMenuItem] ; yes/no answer (Y=0, N=1) and a jr nz, .printOhFineThen call LoadCoinsToSubtract call HasEnoughCoins jr c, .notEnoughCoins - ld a,[wWhichPrizeWindow] + ld a, [wWhichPrizeWindow] cp $02 jr nz, .giveMon - ld a,[wd11e] - ld b,a - ld a,1 - ld c,a + ld a, [wd11e] + ld b, a + ld a, 1 + ld c, a call GiveItem jr nc, .bagFull jr .subtractCoins .giveMon - ld a,[wd11e] - ld [wcf91],a + ld a, [wd11e] + ld [wcf91], a push af call GetPrizeMonLevel - ld c,a + ld c, a pop af - ld b,a + ld b, a call GivePokemon ; If either the party or box was full, wait after displaying message. push af - ld a,[wAddedToParty] + ld a, [wAddedToParty] and a - call z,WaitForTextScrollButtonPress + call z, WaitForTextScrollButtonPress pop af ; If the mon couldn't be given to the player (because both the party and box @@ -245,19 +245,19 @@ HandlePrizeChoice: .subtractCoins call LoadCoinsToSubtract - ld hl,hCoins + 1 - ld de,wPlayerCoins + 1 - ld c,$02 ; how many bytes + ld hl, hCoins + 1 + ld de, wPlayerCoins + 1 + ld c, $02 ; how many bytes predef SubBCDPredef jp PrintPrizePrice .bagFull - ld hl,PrizeRoomBagIsFullTextPtr + ld hl, PrizeRoomBagIsFullTextPtr jp PrintText .notEnoughCoins - ld hl,SorryNeedMoreCoinsText + ld hl, SorryNeedMoreCoinsText jp PrintText .printOhFineThen - ld hl,OhFineThenTextPtr + ld hl, OhFineThenTextPtr jp PrintText UnknownPrizeData: @@ -289,18 +289,18 @@ OhFineThenTextPtr: db "@" GetPrizeMonLevel: - ld a,[wcf91] - ld b,a - ld hl,PrizeMonLevelDictionary + ld a, [wcf91] + ld b, a + ld hl, PrizeMonLevelDictionary .loop - ld a,[hli] + ld a, [hli] cp b - jr z,.matchFound + jr z, .matchFound inc hl jr .loop .matchFound - ld a,[hl] - ld [wCurEnemyLVL],a + ld a, [hl] + ld [wCurEnemyLVL], a ret INCLUDE "data/prize_mon_levels.asm" diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 029d8c01..eb4b4f2d 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -1,9 +1,9 @@ DisplayStartMenu:: - ld a,BANK(StartMenu_Pokedex) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld a,[wWalkBikeSurfState] ; walking/biking/surfing - ld [wWalkBikeSurfStateCopy],a + ld a, BANK(StartMenu_Pokedex) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld a, [wWalkBikeSurfState] ; walking/biking/surfing + ld [wWalkBikeSurfStateCopy], a ld a, SFX_START_MENU call PlaySound @@ -13,73 +13,73 @@ RedisplayStartMenu:: call UpdateSprites .loop call HandleMenuInput - ld b,a + ld b, a .checkIfUpPressed - bit 6,a ; was Up pressed? - jr z,.checkIfDownPressed - ld a,[wCurrentMenuItem] ; menu selection + bit 6, a ; was Up pressed? + jr z, .checkIfDownPressed + ld a, [wCurrentMenuItem] ; menu selection and a - jr nz,.loop - ld a,[wLastMenuItem] + jr nz, .loop + ld a, [wLastMenuItem] and a - jr nz,.loop + jr nz, .loop ; if the player pressed tried to go past the top item, wrap around to the bottom CheckEvent EVENT_GOT_POKEDEX - ld a,6 ; there are 7 menu items with the pokedex, so the max index is 6 - jr nz,.wrapMenuItemId + ld a, 6 ; there are 7 menu items with the pokedex, so the max index is 6 + jr nz, .wrapMenuItemId dec a ; there are only 6 menu items without the pokedex .wrapMenuItemId - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a call EraseMenuCursor jr .loop .checkIfDownPressed - bit 7,a - jr z,.buttonPressed + bit 7, a + jr z, .buttonPressed ; if the player pressed tried to go past the bottom item, wrap around to the top CheckEvent EVENT_GOT_POKEDEX - ld a,[wCurrentMenuItem] - ld c,7 ; there are 7 menu items with the pokedex - jr nz,.checkIfPastBottom + ld a, [wCurrentMenuItem] + ld c, 7 ; there are 7 menu items with the pokedex + jr nz, .checkIfPastBottom dec c ; there are only 6 menu items without the pokedex .checkIfPastBottom cp c - jr nz,.loop + jr nz, .loop ; the player went past the bottom, so wrap to the top xor a - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a call EraseMenuCursor jr .loop .buttonPressed ; A, B, or Start button pressed call PlaceUnfilledArrowMenuCursor - ld a,[wCurrentMenuItem] - ld [wBattleAndStartSavedMenuItem],a ; save current menu selection - ld a,b - and a,%00001010 ; was the Start button or B button pressed? - jp nz,CloseStartMenu + ld a, [wCurrentMenuItem] + ld [wBattleAndStartSavedMenuItem], a ; save current menu selection + ld a, b + and %00001010 ; was the Start button or B button pressed? + jp nz, CloseStartMenu call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2 CheckEvent EVENT_GOT_POKEDEX - ld a,[wCurrentMenuItem] - jr nz,.displayMenuItem + ld a, [wCurrentMenuItem] + jr nz, .displayMenuItem inc a ; adjust position to account for missing pokedex menu item .displayMenuItem - cp a,0 - jp z,StartMenu_Pokedex - cp a,1 - jp z,StartMenu_Pokemon - cp a,2 - jp z,StartMenu_Item - cp a,3 - jp z,StartMenu_TrainerInfo - cp a,4 - jp z,StartMenu_SaveReset - cp a,5 - jp z,StartMenu_Option + cp 0 + jp z, StartMenu_Pokedex + cp 1 + jp z, StartMenu_Pokemon + cp 2 + jp z, StartMenu_Item + cp 3 + jp z, StartMenu_TrainerInfo + cp 4 + jp z, StartMenu_SaveReset + cp 5 + jp z, StartMenu_Option ; EXIT falls through to here CloseStartMenu:: call Joypad - ld a,[hJoyPressed] - bit 0,a ; was A button newly pressed? - jr nz,CloseStartMenu + ld a, [hJoyPressed] + bit 0, a ; was A button newly pressed? + jr nz, CloseStartMenu call LoadTextBoxTilePatterns jp CloseTextDisplay diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 8c10266b..947837e3 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -7,22 +7,22 @@ StartMenu_Pokedex: jp RedisplayStartMenu StartMenu_Pokemon: - ld a,[wPartyCount] + ld a, [wPartyCount] and a - jp z,RedisplayStartMenu + jp z, RedisplayStartMenu xor a - ld [wMenuItemToSwap],a - ld [wPartyMenuTypeOrMessageID],a - ld [wUpdateSpritesEnabled],a + ld [wMenuItemToSwap], a + ld [wPartyMenuTypeOrMessageID], a + ld [wUpdateSpritesEnabled], a call DisplayPartyMenu jr .checkIfPokemonChosen .loop xor a - ld [wMenuItemToSwap],a - ld [wPartyMenuTypeOrMessageID],a + ld [wMenuItemToSwap], a + ld [wPartyMenuTypeOrMessageID], a call GoBackToPartyMenu .checkIfPokemonChosen - jr nc,.chosePokemon + jr nc, .chosePokemon .exitMenu call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns @@ -30,94 +30,94 @@ StartMenu_Pokemon: jp RedisplayStartMenu .chosePokemon call SaveScreenTilesToBuffer1 - ld a,FIELD_MOVE_MON_MENU - ld [wTextBoxID],a + ld a, FIELD_MOVE_MON_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; display pokemon menu options - ld hl,wFieldMoves + ld hl, wFieldMoves lb bc, 2, 12 ; max menu item ID, top menu item Y - ld e,5 + ld e, 5 .adjustMenuVariablesLoop dec e - jr z,.storeMenuVariables - ld a,[hli] + jr z, .storeMenuVariables + ld a, [hli] and a ; end of field moves? - jr z,.storeMenuVariables + jr z, .storeMenuVariables inc b dec c dec c jr .adjustMenuVariablesLoop .storeMenuVariables - ld hl,wTopMenuItemY - ld a,c - ld [hli],a ; top menu item Y - ld a,[hFieldMoveMonMenuTopMenuItemX] - ld [hli],a ; top menu item X + ld hl, wTopMenuItemY + ld a, c + ld [hli], a ; top menu item Y + ld a, [hFieldMoveMonMenuTopMenuItemX] + ld [hli], a ; top menu item X xor a - ld [hli],a ; current menu item ID + ld [hli], a ; current menu item ID inc hl - ld a,b - ld [hli],a ; max menu item ID - ld a,A_BUTTON | B_BUTTON - ld [hli],a ; menu watched keys + ld a, b + ld [hli], a ; max menu item ID + ld a, A_BUTTON | B_BUTTON + ld [hli], a ; menu watched keys xor a - ld [hl],a + ld [hl], a call HandleMenuInput push af call LoadScreenTilesFromBuffer1 ; restore saved screen pop af - bit 1,a ; was the B button pressed? - jp nz,.loop + bit 1, a ; was the B button pressed? + jp nz, .loop ; if the B button wasn't pressed - ld a,[wMaxMenuItem] - ld b,a - ld a,[wCurrentMenuItem] ; menu selection + ld a, [wMaxMenuItem] + ld b, a + ld a, [wCurrentMenuItem] ; menu selection cp b - jp z,.exitMenu ; if the player chose Cancel + jp z, .exitMenu ; if the player chose Cancel dec b cp b - jr z,.choseSwitch + jr z, .choseSwitch dec b cp b - jp z,.choseStats - ld c,a - ld b,0 - ld hl,wFieldMoves - add hl,bc + jp z, .choseStats + ld c, a + ld b, 0 + ld hl, wFieldMoves + add hl, bc jp .choseOutOfBattleMove .choseSwitch - ld a,[wPartyCount] - cp a,2 ; is there more than one pokemon in the party? - jp c,StartMenu_Pokemon ; if not, no switching + ld a, [wPartyCount] + cp 2 ; is there more than one pokemon in the party? + jp c, StartMenu_Pokemon ; if not, no switching call SwitchPartyMon_InitVarOrSwapData ; init [wMenuItemToSwap] - ld a,SWAP_MONS_PARTY_MENU - ld [wPartyMenuTypeOrMessageID],a + ld a, SWAP_MONS_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a call GoBackToPartyMenu jp .checkIfPokemonChosen .choseStats call ClearSprites xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation],a + ld [wMonDataLocation], a predef StatusScreen predef StatusScreen2 call ReloadMapData jp StartMenu_Pokemon .choseOutOfBattleMove push hl - ld a,[wWhichPokemon] - ld hl,wPartyMonNicks + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks call GetPartyMonName pop hl - ld a,[hl] + ld a, [hl] dec a add a - ld b,0 - ld c,a - ld hl,.outOfBattleMovePointers - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a - ld a,[wObtainedBadges] ; badges obtained + ld b, 0 + ld c, a + ld hl, .outOfBattleMovePointers + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wObtainedBadges] ; badges obtained jp hl .outOfBattleMovePointers dw .cut @@ -130,62 +130,62 @@ StartMenu_Pokemon: dw .teleport dw .softboiled .fly - bit 2,a ; does the player have the Thunder Badge? - jp z,.newBadgeRequired + bit 2, a ; does the player have the Thunder Badge? + jp z, .newBadgeRequired call CheckIfInOutsideMap - jr z,.canFly - ld a,[wWhichPokemon] - ld hl,wPartyMonNicks + jr z, .canFly + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks call GetPartyMonName - ld hl,.cannotFlyHereText + ld hl, .cannotFlyHereText call PrintText jp .loop .canFly call ChooseFlyDestination - ld a,[wd732] - bit 3,a ; did the player decide to fly? - jp nz,.goBackToMap + ld a, [wd732] + bit 3, a ; did the player decide to fly? + jp nz, .goBackToMap call LoadFontTilePatterns - ld hl,wd72e - set 1,[hl] + ld hl, wd72e + set 1, [hl] jp StartMenu_Pokemon .cut - bit 1,a ; does the player have the Cascade Badge? - jp z,.newBadgeRequired + bit 1, a ; does the player have the Cascade Badge? + jp z, .newBadgeRequired predef UsedCut - ld a,[wActionResultOrTookBattleTurn] + ld a, [wActionResultOrTookBattleTurn] and a - jp z,.loop + jp z, .loop jp CloseTextDisplay .surf - bit 4,a ; does the player have the Soul Badge? - jp z,.newBadgeRequired + bit 4, a ; does the player have the Soul Badge? + jp z, .newBadgeRequired callba IsSurfingAllowed - ld hl,wd728 - bit 1,[hl] - res 1,[hl] - jp z,.loop - ld a,SURFBOARD - ld [wcf91],a - ld [wPseudoItemID],a + ld hl, wd728 + bit 1, [hl] + res 1, [hl] + jp z, .loop + ld a, SURFBOARD + ld [wcf91], a + ld [wPseudoItemID], a call UseItem - ld a,[wActionResultOrTookBattleTurn] + ld a, [wActionResultOrTookBattleTurn] and a - jp z,.loop + jp z, .loop call GBPalWhiteOutWithDelay3 jp .goBackToMap .strength - bit 3,a ; does the player have the Rainbow Badge? - jp z,.newBadgeRequired + bit 3, a ; does the player have the Rainbow Badge? + jp z, .newBadgeRequired predef PrintStrengthTxt call GBPalWhiteOutWithDelay3 jp .goBackToMap .flash - bit 0,a ; does the player have the Boulder Badge? - jp z,.newBadgeRequired + bit 0, a ; does the player have the Boulder Badge? + jp z, .newBadgeRequired xor a - ld [wMapPalOffset],a - ld hl,.flashLightsAreaText + ld [wMapPalOffset], a + ld hl, .flashLightsAreaText call PrintText call GBPalWhiteOutWithDelay3 jp .goBackToMap @@ -193,34 +193,34 @@ StartMenu_Pokemon: TX_FAR _FlashLightsAreaText db "@" .dig - ld a,ESCAPE_ROPE - ld [wcf91],a - ld [wPseudoItemID],a + ld a, ESCAPE_ROPE + ld [wcf91], a + ld [wPseudoItemID], a call UseItem - ld a,[wActionResultOrTookBattleTurn] + ld a, [wActionResultOrTookBattleTurn] and a - jp z,.loop + jp z, .loop call GBPalWhiteOutWithDelay3 jp .goBackToMap .teleport call CheckIfInOutsideMap - jr z,.canTeleport - ld a,[wWhichPokemon] - ld hl,wPartyMonNicks + jr z, .canTeleport + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks call GetPartyMonName - ld hl,.cannotUseTeleportNowText + ld hl, .cannotUseTeleportNowText call PrintText jp .loop .canTeleport - ld hl,.warpToLastPokemonCenterText + ld hl, .warpToLastPokemonCenterText call PrintText - ld hl,wd732 - set 3,[hl] - set 6,[hl] - ld hl,wd72e - set 1,[hl] - res 4,[hl] - ld c,60 + ld hl, wd732 + set 3, [hl] + set 6, [hl] + ld hl, wd72e + set 1, [hl] + res 4, [hl] + ld c, 60 call DelayFrames call GBPalWhiteOutWithDelay3 jp .goBackToMap @@ -234,39 +234,39 @@ StartMenu_Pokemon: TX_FAR _CannotFlyHereText db "@" .softboiled - ld hl,wPartyMon1MaxHP - ld a,[wWhichPokemon] - ld bc,wPartyMon2 - wPartyMon1 + ld hl, wPartyMon1MaxHP + ld a, [wWhichPokemon] + ld bc, wPartyMon2 - wPartyMon1 call AddNTimes - ld a,[hli] - ld [H_DIVIDEND],a - ld a,[hl] - ld [H_DIVIDEND + 1],a - ld a,5 - ld [H_DIVISOR],a - ld b,2 ; number of bytes + ld a, [hli] + ld [H_DIVIDEND], a + ld a, [hl] + ld [H_DIVIDEND + 1], a + ld a, 5 + ld [H_DIVISOR], a + ld b, 2 ; number of bytes call Divide - ld bc,wPartyMon1HP - wPartyMon1MaxHP - add hl,bc - ld a,[hld] - ld b,a - ld a,[H_QUOTIENT + 3] + ld bc, wPartyMon1HP - wPartyMon1MaxHP + add hl, bc + ld a, [hld] + ld b, a + ld a, [H_QUOTIENT + 3] sub b - ld b,[hl] - ld a,[H_QUOTIENT + 2] + ld b, [hl] + ld a, [H_QUOTIENT + 2] sbc b - jp nc,.notHealthyEnough - ld a,[wPartyAndBillsPCSavedMenuItem] + jp nc, .notHealthyEnough + ld a, [wPartyAndBillsPCSavedMenuItem] push af - ld a,POTION - ld [wcf91],a - ld [wPseudoItemID],a + ld a, POTION + ld [wcf91], a + ld [wPseudoItemID], a call UseItem pop af - ld [wPartyAndBillsPCSavedMenuItem],a + ld [wPartyAndBillsPCSavedMenuItem], a jp .loop .notHealthyEnough ; if current HP is less than 1/5 of max HP - ld hl,.notHealthyEnoughText + ld hl, .notHealthyEnoughText call PrintText jp .loop .notHealthyEnoughText @@ -276,7 +276,7 @@ StartMenu_Pokemon: call RestoreScreenTilesAndReloadTilePatterns jp CloseTextDisplay .newBadgeRequired - ld hl,.newBadgeRequiredText + ld hl, .newBadgeRequiredText call PrintText jp .loop .newBadgeRequiredText @@ -286,13 +286,13 @@ StartMenu_Pokemon: ; writes a blank tile to all possible menu cursor positions on the party menu ErasePartyMenuCursors: coord hl, 0, 1 - ld bc,2 * 20 ; menu cursor positions are 2 rows apart - ld a,6 ; 6 menu cursor positions + ld bc, 2 * 20 ; menu cursor positions are 2 rows apart + ld a, 6 ; 6 menu cursor positions .loop - ld [hl]," " - add hl,bc + ld [hl], " " + add hl, bc dec a - jr nz,.loop + jr nz, .loop ret ItemMenuLoop: @@ -300,28 +300,28 @@ ItemMenuLoop: call RunDefaultPaletteCommand StartMenu_Item: - ld a,[wLinkState] + ld a, [wLinkState] dec a ; is the player in the Colosseum or Trade Centre? - jr nz,.notInCableClubRoom - ld hl,CannotUseItemsHereText + jr nz, .notInCableClubRoom + ld hl, CannotUseItemsHereText call PrintText jr .exitMenu .notInCableClubRoom - ld bc,wNumBagItems - ld hl,wListPointer - ld a,c - ld [hli],a - ld [hl],b ; store item bag pointer in wListPointer (for DisplayListMenuID) + ld bc, wNumBagItems + ld hl, wListPointer + ld a, c + ld [hli], a + ld [hl], b ; store item bag pointer in wListPointer (for DisplayListMenuID) xor a - ld [wPrintItemPrices],a - ld a,ITEMLISTMENU - ld [wListMenuID],a - ld a,[wBagSavedMenuItem] - ld [wCurrentMenuItem],a + ld [wPrintItemPrices], a + ld a, ITEMLISTMENU + ld [wListMenuID], a + ld a, [wBagSavedMenuItem] + ld [wCurrentMenuItem], a call DisplayListMenuID - ld a,[wCurrentMenuItem] - ld [wBagSavedMenuItem],a - jr nc,.choseItem + ld a, [wCurrentMenuItem] + ld [wBagSavedMenuItem], a + jr nc, .choseItem .exitMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call LoadTextBoxTilePatterns @@ -329,111 +329,111 @@ StartMenu_Item: jp RedisplayStartMenu .choseItem ; erase menu cursor (blank each tile in front of an item name) - ld a," " + ld a, " " Coorda 5, 4 Coorda 5, 6 Coorda 5, 8 Coorda 5, 10 call PlaceUnfilledArrowMenuCursor xor a - ld [wMenuItemToSwap],a - ld a,[wcf91] - cp a,BICYCLE - jp z,.useOrTossItem + ld [wMenuItemToSwap], a + ld a, [wcf91] + cp BICYCLE + jp z, .useOrTossItem .notBicycle1 - ld a,USE_TOSS_MENU_TEMPLATE - ld [wTextBoxID],a + ld a, USE_TOSS_MENU_TEMPLATE + ld [wTextBoxID], a call DisplayTextBoxID - ld hl,wTopMenuItemY - ld a,11 - ld [hli],a ; top menu item Y - ld a,14 - ld [hli],a ; top menu item X + ld hl, wTopMenuItemY + ld a, 11 + ld [hli], a ; top menu item Y + ld a, 14 + ld [hli], a ; top menu item X xor a - ld [hli],a ; current menu item ID + ld [hli], a ; current menu item ID inc hl inc a ; a = 1 - ld [hli],a ; max menu item ID - ld a,A_BUTTON | B_BUTTON - ld [hli],a ; menu watched keys + ld [hli], a ; max menu item ID + ld a, A_BUTTON | B_BUTTON + ld [hli], a ; menu watched keys xor a - ld [hl],a ; old menu item id + ld [hl], a ; old menu item id call HandleMenuInput call PlaceUnfilledArrowMenuCursor - bit 1,a ; was the B button pressed? - jr z,.useOrTossItem + bit 1, a ; was the B button pressed? + jr z, .useOrTossItem jp ItemMenuLoop .useOrTossItem ; if the player made the choice to use or toss the item - ld a,[wcf91] - ld [wd11e],a + ld a, [wcf91] + ld [wd11e], a call GetItemName call CopyStringToCF4B ; copy name to wcf4b - ld a,[wcf91] - cp a,BICYCLE - jr nz,.notBicycle2 - ld a,[wd732] - bit 5,a - jr z,.useItem_closeMenu - ld hl,CannotGetOffHereText + ld a, [wcf91] + cp BICYCLE + jr nz, .notBicycle2 + ld a, [wd732] + bit 5, a + jr z, .useItem_closeMenu + ld hl, CannotGetOffHereText call PrintText jp ItemMenuLoop .notBicycle2 - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - jr nz,.tossItem + jr nz, .tossItem ; use item - ld [wPseudoItemID],a ; a must be 0 due to above conditional jump - ld a,[wcf91] - cp a,HM_01 - jr nc,.useItem_partyMenu - ld hl,UsableItems_CloseMenu - ld de,1 + ld [wPseudoItemID], a ; a must be 0 due to above conditional jump + ld a, [wcf91] + cp HM_01 + jr nc, .useItem_partyMenu + ld hl, UsableItems_CloseMenu + ld de, 1 call IsInArray - jr c,.useItem_closeMenu - ld a,[wcf91] - ld hl,UsableItems_PartyMenu - ld de,1 + jr c, .useItem_closeMenu + ld a, [wcf91] + ld hl, UsableItems_PartyMenu + ld de, 1 call IsInArray - jr c,.useItem_partyMenu + jr c, .useItem_partyMenu call UseItem jp ItemMenuLoop .useItem_closeMenu xor a - ld [wPseudoItemID],a + ld [wPseudoItemID], a call UseItem - ld a,[wActionResultOrTookBattleTurn] + ld a, [wActionResultOrTookBattleTurn] and a - jp z,ItemMenuLoop + jp z, ItemMenuLoop jp CloseStartMenu .useItem_partyMenu - ld a,[wUpdateSpritesEnabled] + ld a, [wUpdateSpritesEnabled] push af call UseItem - ld a,[wActionResultOrTookBattleTurn] - cp a,$02 - jp z,.partyMenuNotDisplayed + ld a, [wActionResultOrTookBattleTurn] + cp $02 + jp z, .partyMenuNotDisplayed call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns pop af - ld [wUpdateSpritesEnabled],a + ld [wUpdateSpritesEnabled], a jp StartMenu_Item .partyMenuNotDisplayed pop af - ld [wUpdateSpritesEnabled],a + ld [wUpdateSpritesEnabled], a jp ItemMenuLoop .tossItem call IsKeyItem - ld a,[wIsKeyItem] + ld a, [wIsKeyItem] and a - jr nz,.skipAskingQuantity - ld a,[wcf91] + jr nz, .skipAskingQuantity + ld a, [wcf91] call IsItemHM - jr c,.skipAskingQuantity + jr c, .skipAskingQuantity call DisplayChooseQuantityMenu inc a - jr z,.tossZeroItems + jr z, .tossZeroItems .skipAskingQuantity - ld hl,wNumBagItems + ld hl, wNumBagItems call TossItem .tossZeroItems jp ItemMenuLoop @@ -500,10 +500,10 @@ StartMenu_TrainerInfo: call GBPalWhiteOut call ClearScreen call UpdateSprites - ld a,[hTilesetType] + ld a, [hTilesetType] push af xor a - ld [hTilesetType],a + ld [hTilesetType], a call DrawTrainerInfo predef DrawBadges ; draw badges ld b, SET_PAL_TRAINER_CARD @@ -517,101 +517,101 @@ StartMenu_TrainerInfo: call ReloadMapData call LoadGBPal pop af - ld [hTilesetType],a + ld [hTilesetType], a jp RedisplayStartMenu ; loads tile patterns and draws everything except for gym leader faces / badges DrawTrainerInfo: - ld de,RedPicFront + ld de, RedPicFront lb bc, BANK(RedPicFront), $01 predef DisplayPicCenteredOrUpperRight call DisableLCD coord hl, 0, 2 - ld a," " + ld a, " " call TrainerInfo_DrawVerticalLine coord hl, 1, 2 call TrainerInfo_DrawVerticalLine - ld hl,vChars2 + $70 - ld de,vChars2 - ld bc,$70 * 4 + ld hl, vChars2 + $70 + ld de, vChars2 + ld bc, $70 * 4 call CopyData - ld hl,TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns - ld de,vChars2 + $770 - ld bc,$0080 + ld hl, TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns + ld de, vChars2 + $770 + ld bc, $0080 push bc call TrainerInfo_FarCopyData - ld hl,BlankLeaderNames - ld de,vChars2 + $600 - ld bc,$0170 + ld hl, BlankLeaderNames + ld de, vChars2 + $600 + ld bc, $0170 call TrainerInfo_FarCopyData pop bc - ld hl,BadgeNumbersTileGraphics ; badge number tile patterns - ld de,vChars1 + $580 + ld hl, BadgeNumbersTileGraphics ; badge number tile patterns + ld de, vChars1 + $580 call TrainerInfo_FarCopyData - ld hl,GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns - ld de,vChars2 + $200 - ld bc,$0400 - ld a,$03 + 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 - ld de,$00d0 - add hl,de ; hl = colon tile pattern - ld de,vChars1 + $560 - ld bc,$0010 - ld a,$04 + ld hl, TextBoxGraphics + ld de, $00d0 + add hl, de ; hl = colon tile pattern + ld de, vChars1 + $560 + ld bc, $0010 + ld a, $04 push bc call FarCopyData2 pop bc - ld hl,TrainerInfoTextBoxTileGraphics + $80 ; background tile pattern - ld de,vChars1 + $570 + ld hl, TrainerInfoTextBoxTileGraphics + $80 ; background tile pattern + ld de, vChars1 + $570 call TrainerInfo_FarCopyData call EnableLCD - ld hl,wTrainerInfoTextBoxWidthPlus1 - ld a,18 + 1 - ld [hli],a + ld hl, wTrainerInfoTextBoxWidthPlus1 + ld a, 18 + 1 + ld [hli], a dec a - ld [hli],a - ld [hl],1 + ld [hli], a + ld [hl], 1 coord hl, 0, 0 call TrainerInfo_DrawTextBox - ld hl,wTrainerInfoTextBoxWidthPlus1 - ld a,16 + 1 - ld [hli],a + ld hl, wTrainerInfoTextBoxWidthPlus1 + ld a, 16 + 1 + ld [hli], a dec a - ld [hli],a - ld [hl],3 + ld [hli], a + ld [hl], 3 coord hl, 1, 10 call TrainerInfo_DrawTextBox coord hl, 0, 10 - ld a,$d7 + ld a, $d7 call TrainerInfo_DrawVerticalLine coord hl, 19, 10 call TrainerInfo_DrawVerticalLine coord hl, 6, 9 - ld de,TrainerInfo_BadgesText + ld de, TrainerInfo_BadgesText call PlaceString coord hl, 2, 2 - ld de,TrainerInfo_NameMoneyTimeText + ld de, TrainerInfo_NameMoneyTimeText call PlaceString coord hl, 7, 2 - ld de,wPlayerName + ld de, wPlayerName call PlaceString coord hl, 8, 4 - ld de,wPlayerMoney - ld c,$e3 + ld de, wPlayerMoney + ld c, $e3 call PrintBCDNumber coord hl, 9, 6 - ld de,wPlayTimeHours ; hours + ld de, wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 call PrintNumber - ld [hl],$d6 ; colon tile ID + ld [hl], $d6 ; colon tile ID inc hl - ld de,wPlayTimeMinutes ; minutes + ld de, wPlayTimeMinutes ; minutes lb bc, LEADING_ZEROES | 1, 2 jp PrintNumber TrainerInfo_FarCopyData: - ld a,BANK(TrainerInfoTextBoxTileGraphics) + ld a, BANK(TrainerInfoTextBoxTileGraphics) jp FarCopyData2 TrainerInfo_NameMoneyTimeText: @@ -631,43 +631,43 @@ TrainerInfo_BadgesText: ; [wTrainerInfoTextBoxWidth] = width - 1 ; [wTrainerInfoTextBoxNextRowOffset] = distance from the end of a text box row to the start of the next TrainerInfo_DrawTextBox: - ld a,$79 ; upper left corner tile ID + ld a, $79 ; upper left corner tile ID 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] - ld e,a - ld d,0 - ld c,6 ; height of the text box + ld a, [wTrainerInfoTextBoxWidthPlus1] + ld e, a + ld d, 0 + ld c, 6 ; height of the text box .loop - ld [hl],$7c ; left edge tile ID - add hl,de - ld [hl],$78 ; right edge tile ID + ld [hl], $7c ; left edge tile ID + add hl, de + ld [hl], $78 ; right edge tile ID call TrainerInfo_NextTextBoxRow dec c - jr nz,.loop - ld a,$7d ; lower left corner tile ID - lb de,$77, $7e ; bottom edge and lower right corner tile ID's + jr nz, .loop + ld a, $7d ; lower left corner tile ID + lb de, $77, $7e ; bottom edge and lower right corner tile ID's TrainerInfo_DrawHorizontalEdge: - ld [hli],a ; place left corner tile - ld a,[wTrainerInfoTextBoxWidth] - ld c,a - ld a,d + ld [hli], a ; place left corner tile + ld a, [wTrainerInfoTextBoxWidth] + ld c, a + ld a, d .loop - ld [hli],a ; place edge tile + ld [hli], a ; place edge tile dec c - jr nz,.loop - ld a,e - ld [hl],a ; place right corner tile + jr nz, .loop + ld a, e + ld [hl], a ; place right corner tile ret TrainerInfo_NextTextBoxRow: - ld a,[wTrainerInfoTextBoxNextRowOffset] ; distance to the start of the next row + ld a, [wTrainerInfoTextBoxNextRowOffset] ; distance to the start of the next row .loop inc hl dec a - jr nz,.loop + jr nz, .loop ret ; draws a vertical line @@ -675,26 +675,26 @@ TrainerInfo_NextTextBoxRow: ; hl = address of top tile in the line ; a = tile ID TrainerInfo_DrawVerticalLine: - ld de,SCREEN_WIDTH - ld c,8 + ld de, SCREEN_WIDTH + ld c, 8 .loop - ld [hl],a - add hl,de + ld [hl], a + add hl, de dec c - jr nz,.loop + jr nz, .loop ret StartMenu_SaveReset: - ld a,[wd72e] - bit 6,a ; is the player using the link feature? - jp nz,Init + ld a, [wd72e] + bit 6, a ; is the player using the link feature? + jp nz, Init predef SaveSAV ; save the game call LoadScreenTilesFromBuffer2 ; restore saved screen jp HoldTextDisplayOpen StartMenu_Option: xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a call ClearScreen call UpdateSprites callab DisplayOptionMenu diff --git a/engine/menu/swap_items.asm b/engine/menu/swap_items.asm index b1fa78be..563fc7d5 100644 --- a/engine/menu/swap_items.asm +++ b/engine/menu/swap_items.asm @@ -1,149 +1,149 @@ HandleItemListSwapping: - ld a,[wListMenuID] - cp a,ITEMLISTMENU - jp nz,DisplayListMenuIDLoop ; only rearrange item list menus + ld a, [wListMenuID] + cp ITEMLISTMENU + jp nz, DisplayListMenuIDLoop ; only rearrange item list menus push hl - ld hl,wListPointer - ld a,[hli] - ld h,[hl] - ld l,a + ld hl, wListPointer + ld a, [hli] + ld h, [hl] + ld l, a inc hl ; hl = beginning of list entries - ld a,[wCurrentMenuItem] - ld b,a - ld a,[wListScrollOffset] + ld a, [wCurrentMenuItem] + ld b, a + ld a, [wListScrollOffset] add b add a - ld c,a - ld b,0 - add hl,bc ; hl = address of currently selected item entry - ld a,[hl] + ld c, a + ld b, 0 + add hl, bc ; hl = address of currently selected item entry + ld a, [hl] pop hl inc a - jp z,DisplayListMenuIDLoop ; ignore attempts to swap the Cancel menu item - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + jp z, DisplayListMenuIDLoop ; ignore attempts to swap the Cancel menu item + ld a, [wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) and a ; has the first item to swap already been chosen? - jr nz,.swapItems + jr nz, .swapItems ; if not, set the currently selected item as the first item - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] inc a - ld b,a - ld a,[wListScrollOffset] ; index of top (visible) menu item within the list + ld b, a + ld a, [wListScrollOffset] ; index of top (visible) menu item within the list add b - ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) - ld c,20 + ld [wMenuItemToSwap], a ; ID of item chosen for swapping (counts from 1) + ld c, 20 call DelayFrames jp DisplayListMenuIDLoop .swapItems - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] inc a - ld b,a - ld a,[wListScrollOffset] + ld b, a + ld a, [wListScrollOffset] add b - ld b,a - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + ld b, a + ld a, [wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) cp b ; is the currently selected item the same as the first item to swap? - jp z,DisplayListMenuIDLoop ; ignore attempts to swap an item with itself + jp z, DisplayListMenuIDLoop ; ignore attempts to swap an item with itself dec a - ld [wMenuItemToSwap],a ; ID of item chosen for swapping (counts from 1) - ld c,20 + ld [wMenuItemToSwap], a ; ID of item chosen for swapping (counts from 1) + ld c, 20 call DelayFrames push hl push de - ld hl,wListPointer - ld a,[hli] - ld h,[hl] - ld l,a + ld hl, wListPointer + ld a, [hli] + ld h, [hl] + ld l, a inc hl ; hl = beginning of list entries - ld d,h - ld e,l ; de = beginning of list entries - ld a,[wCurrentMenuItem] - ld b,a - ld a,[wListScrollOffset] + ld d, h + ld e, l ; de = beginning of list entries + ld a, [wCurrentMenuItem] + ld b, a + ld a, [wListScrollOffset] add b add a - ld c,a - ld b,0 - add hl,bc ; hl = address of currently selected item entry - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + ld c, a + ld b, 0 + add hl, bc ; hl = address of currently selected item entry + ld a, [wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) add a add e - ld e,a - jr nc,.noCarry + ld e, a + jr nc, .noCarry inc d .noCarry ; de = address of first item to swap - ld a,[de] - ld b,a - ld a,[hli] + ld a, [de] + ld b, a + ld a, [hli] cp b - jr z,.swapSameItemType + jr z, .swapSameItemType .swapDifferentItems - ld [$ff95],a ; [$ff95] = second item ID - ld a,[hld] - ld [$ff96],a ; [$ff96] = second item quantity - ld a,[de] - ld [hli],a ; put first item ID in second item slot + ld [$ff95], a ; [$ff95] = second item ID + ld a, [hld] + ld [$ff96], a ; [$ff96] = second item quantity + ld a, [de] + ld [hli], a ; put first item ID in second item slot inc de - ld a,[de] - ld [hl],a ; put first item quantity in second item slot - ld a,[$ff96] - ld [de],a ; put second item quantity in first item slot + ld a, [de] + ld [hl], a ; put first item quantity in second item slot + ld a, [$ff96] + ld [de], a ; put second item quantity in first item slot dec de - ld a,[$ff95] - ld [de],a ; put second item ID in first item slot + ld a, [$ff95] + ld [de], a ; put second item ID in first item slot xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped pop de pop hl jp DisplayListMenuIDLoop .swapSameItemType inc de - ld a,[hl] - ld b,a - ld a,[de] + ld a, [hl] + ld b, a + ld a, [de] add b ; a = sum of both item quantities - cp a,100 ; is the sum too big for one item slot? - jr c,.combineItemSlots + cp 100 ; is the sum too big for one item slot? + jr c, .combineItemSlots ; swap enough items from the first slot to max out the second slot if they can't be combined - sub a,99 - ld [de],a - ld a,99 - ld [hl],a + sub 99 + ld [de], a + ld a, 99 + ld [hl], a jr .done .combineItemSlots - ld [hl],a ; put the sum in the second item slot - ld hl,wListPointer - ld a,[hli] - ld h,[hl] - ld l,a + ld [hl], a ; put the sum in the second item slot + ld hl, wListPointer + ld a, [hli] + ld h, [hl] + ld l, a dec [hl] ; decrease the number of items - ld a,[hl] - 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 + ld a, [hl] + ld [wListCount], a ; update number of items variable + cp 1 + jr nz, .skipSettingMaxMenuItemID + ld [wMaxMenuItem], a ; if the number of items is only one now, update the max menu item ID .skipSettingMaxMenuItemID dec de - ld h,d - ld l,e + ld h, d + ld l, e inc hl inc hl ; hl = address of item after first item to swap .moveItemsUpLoop ; erase the first item slot and move up all the following item slots to fill the gap - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de inc a ; reached the $ff terminator? - jr z,.afterMovingItemsUp - ld a,[hli] - ld [de],a + jr z, .afterMovingItemsUp + ld a, [hli] + ld [de], a inc de jr .moveItemsUpLoop .afterMovingItemsUp xor a - ld [wListScrollOffset],a - ld [wCurrentMenuItem],a + ld [wListScrollOffset], a + ld [wCurrentMenuItem], a .done xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped pop de pop hl jp DisplayListMenuIDLoop diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm index 90c35d25..b9a36652 100644 --- a/engine/menu/text_box.asm +++ b/engine/menu/text_box.asm @@ -1,28 +1,28 @@ ; function to draw various text boxes DisplayTextBoxID_: - ld a,[wTextBoxID] - cp a,TWO_OPTION_MENU - jp z,DisplayTwoOptionMenu - ld c,a - ld hl,TextBoxFunctionTable - ld de,3 + ld a, [wTextBoxID] + cp TWO_OPTION_MENU + jp z, DisplayTwoOptionMenu + ld c, a + ld hl, TextBoxFunctionTable + ld de, 3 call SearchTextBoxTable - jr c,.functionTableMatch - ld hl,TextBoxCoordTable - ld de,5 + jr c, .functionTableMatch + ld hl, TextBoxCoordTable + ld de, 5 call SearchTextBoxTable - jr c,.coordTableMatch - ld hl,TextBoxTextAndCoordTable - ld de,9 + jr c, .coordTableMatch + ld hl, TextBoxTextAndCoordTable + ld de, 9 call SearchTextBoxTable - jr c,.textAndCoordTableMatch + jr c, .textAndCoordTableMatch .done ret .functionTableMatch - ld a,[hli] - ld h,[hl] - ld l,a ; hl = address of function - ld de,.done + ld a, [hli] + ld h, [hl] + ld l, a ; hl = address of function + ld de, .done push de jp hl ; jump to the function .coordTableMatch @@ -37,14 +37,14 @@ DisplayTextBoxID_: call TextBoxBorder pop hl call GetTextBoxIDText - ld a,[wd730] + ld a, [wd730] push af - ld a,[wd730] - set 6,a ; no pauses between printing each letter - ld [wd730],a + ld a, [wd730] + set 6, a ; no pauses between printing each letter + ld [wd730], a call PlaceString pop af - ld [wd730],a + ld [wd730], a call UpdateSprites ret @@ -53,12 +53,12 @@ DisplayTextBoxID_: SearchTextBoxTable: dec de .loop - ld a,[hli] - cp a,$ff - jr z,.notFound + ld a, [hli] + cp $ff + jr z, .notFound cp c - jr z,.found - add hl,de + jr z, .found + add hl, de jr .loop .found scf @@ -74,31 +74,31 @@ SearchTextBoxTable: ; d = row of upper left corner ; e = column of upper left corner GetTextBoxIDCoords: - ld a,[hli] ; column of upper left corner - ld e,a - ld a,[hli] ; row of upper left corner - ld d,a - ld a,[hli] ; column of lower right corner + ld a, [hli] ; column of upper left corner + ld e, a + ld a, [hli] ; row of upper left corner + ld d, a + ld a, [hli] ; column of lower right corner sub e dec a - ld c,a ; c = width - ld a,[hli] ; row of lower right corner + ld c, a ; c = width + ld a, [hli] ; row of lower right corner sub d dec a - ld b,a ; b = height + ld b, a ; b = height ret ; function to load a text address and text coordinates from the TextBoxTextAndCoordTable GetTextBoxIDText: - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a ; de = address of text + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a ; de = address of text push de ; save text address - ld a,[hli] - ld e,a ; column of upper left corner of text - ld a,[hl] - ld d,a ; row of upper left corner of text + ld a, [hli] + ld e, a ; column of upper left corner of text + ld a, [hl] + ld d, a ; row of upper left corner of text call GetAddressOfScreenCoords pop de ; restore text address ret @@ -112,17 +112,17 @@ GetTextBoxIDText: GetAddressOfScreenCoords: push bc coord hl, 0, 0 - ld bc,20 + ld bc, 20 .loop ; loop to add d rows to the base address - ld a,d + ld a, d and a - jr z,.addedRows - add hl,bc + jr z, .addedRows + add hl, bc dec d jr .loop .addedRows pop bc - add hl,de + add hl, de ret ; Format: diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 43efecbc..b1acfb65 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -32,123 +32,123 @@ SetDefaultNames: jp CopyData OakSpeech: - ld a,$FF + ld a, $FF call PlaySound ; stop music ld a, BANK(Music_Routes2) - ld c,a + ld c, a ld a, MUSIC_ROUTES2 call PlayMusic call ClearScreen call LoadTextBoxTilePatterns call SetDefaultNames predef InitPlayerData2 - ld hl,wNumBoxItems - ld a,POTION - ld [wcf91],a - ld a,1 - ld [wItemQuantity],a + ld hl, wNumBoxItems + ld a, POTION + ld [wcf91], a + ld a, 1 + ld [wItemQuantity], a call AddItemToInventory ; give one potion - ld a,[wDefaultMap] - ld [wDestinationMap],a + ld a, [wDefaultMap] + ld [wDestinationMap], a call SpecialWarpIn xor a - ld [hTilesetType],a - ld a,[wd732] - bit 1,a ; possibly a debug mode bit - jp nz,.skipChoosingNames - ld de,ProfOakPic + ld [hTilesetType], a + ld a, [wd732] + bit 1, a ; possibly a debug mode bit + jp nz, .skipChoosingNames + ld de, ProfOakPic lb bc, Bank(ProfOakPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic - ld hl,OakSpeechText1 + ld hl, OakSpeechText1 call PrintText call GBFadeOutToWhite call ClearScreen - ld a,NIDORINO - ld [wd0b5],a - ld [wcf91],a + ld a, NIDORINO + ld [wd0b5], a + ld [wcf91], a call GetMonHeader coord hl, 6, 4 call LoadFlippedFrontSpriteByMonIndex call MovePicLeft - ld hl,OakSpeechText2 + ld hl, OakSpeechText2 call PrintText call GBFadeOutToWhite call ClearScreen - ld de,RedPicFront + ld de, RedPicFront lb bc, Bank(RedPicFront), $00 call IntroDisplayPicCenteredOrUpperRight call MovePicLeft - ld hl,IntroducePlayerText + ld hl, IntroducePlayerText call PrintText call ChoosePlayerName call GBFadeOutToWhite call ClearScreen - ld de,Rival1Pic + ld de, Rival1Pic lb bc, Bank(Rival1Pic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic - ld hl,IntroduceRivalText + ld hl, IntroduceRivalText call PrintText call ChooseRivalName .skipChoosingNames call GBFadeOutToWhite call ClearScreen - ld de,RedPicFront + ld de, RedPicFront lb bc, Bank(RedPicFront), $00 call IntroDisplayPicCenteredOrUpperRight call GBFadeInFromWhite - ld a,[wd72d] + ld a, [wd72d] and a - jr nz,.next - ld hl,OakSpeechText3 + jr nz, .next + ld hl, OakSpeechText3 call PrintText .next - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,SFX_SHRINK + ld a, SFX_SHRINK call PlaySound pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld c,4 + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld c, 4 call DelayFrames - ld de,RedSprite - ld hl,vSprites + ld de, RedSprite + ld hl, vSprites lb bc, BANK(RedSprite), $0C call CopyVideoData - ld de,ShrinkPic1 + ld de, ShrinkPic1 lb bc, BANK(ShrinkPic1), $00 call IntroDisplayPicCenteredOrUpperRight - ld c,4 + ld c, 4 call DelayFrames - ld de,ShrinkPic2 + ld de, ShrinkPic2 lb bc, BANK(ShrinkPic2), $00 call IntroDisplayPicCenteredOrUpperRight call ResetPlayerSpriteData - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af ld a, BANK(Music_PalletTown) - ld [wAudioROMBank],a - ld [wAudioSavedROMBank],a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, 10 - ld [wAudioFadeOutControl],a - ld a,$FF - ld [wNewSoundID],a + ld [wAudioFadeOutControl], a + ld a, $FF + ld [wNewSoundID], a call PlaySound ; stop music pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld c,20 + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld c, 20 call DelayFrames coord hl, 6, 5 - ld b,7 - ld c,7 + ld b, 7 + ld c, 7 call ClearScreenArea call LoadTextBoxTilePatterns - ld a,1 - ld [wUpdateSpritesEnabled],a - ld c,50 + ld a, 1 + ld [wUpdateSpritesEnabled], a + ld c, 50 call DelayFrames call GBFadeOutToWhite jp ClearScreen @@ -171,15 +171,15 @@ OakSpeechText3: db "@" FadeInIntroPic: - ld hl,IntroFadePalettes - ld b,6 + ld hl, IntroFadePalettes + ld b, 6 .next - ld a,[hli] - ld [rBGP],a - ld c,10 + ld a, [hli] + ld [rBGP], a + ld c, 10 call DelayFrames dec b - jr nz,.next + jr nz, .next ret IntroFadePalettes: @@ -191,19 +191,19 @@ IntroFadePalettes: db %11100100 MovePicLeft: - ld a,119 - ld [rWX],a + ld a, 119 + ld [rWX], a call DelayFrame - ld a,%11100100 - ld [rBGP],a + ld a, %11100100 + ld [rBGP], a .next call DelayFrame - ld a,[rWX] + ld a, [rWX] sub 8 cp $FF ret z - ld [rWX],a + ld [rWX], a jr .next DisplayPicCenteredOrUpperRight: @@ -213,21 +213,21 @@ IntroDisplayPicCenteredOrUpperRight: ; de = address of compressed pic ; c: 0 = centred, non-zero = upper-right push bc - ld a,b + ld a, b call UncompressSpriteFromDE - ld hl,sSpriteBuffer1 - ld de,sSpriteBuffer0 - ld bc,$310 + ld hl, sSpriteBuffer1 + ld de, sSpriteBuffer0 + ld bc, $310 call CopyData - ld de,vFrontPic + ld de, vFrontPic call InterlaceMergeSpriteBuffers pop bc - ld a,c + ld a, c and a coord hl, 15, 1 - jr nz,.next + jr nz, .next coord hl, 6, 4 .next xor a - ld [hStartTileID],a + ld [hStartTileID], a predef_jump CopyUncompressedPicToTilemap diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 2a221c7e..8a6057a0 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -12,113 +12,113 @@ InitMapSprites: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) ; if the map is an inside map (i.e. mapID >= $25) - ld hl,wSpriteStateData1 - ld de,wSpriteStateData2 + $0d + ld hl, wSpriteStateData1 + ld de, wSpriteStateData2 + $0d ; Loop to copy picture ID's from $C1X0 to $C2XD for LoadMapSpriteTilePatterns. .copyPictureIDLoop - ld a,[hl] ; $C1X0 (picture ID) - ld [de],a ; $C2XD - ld a,$10 + ld a, [hl] ; $C1X0 (picture ID) + ld [de], a ; $C2XD + ld a, $10 add e - ld e,a - ld a,$10 + ld e, a + ld a, $10 add l - ld l,a - jr nz,.copyPictureIDLoop + ld l, a + jr nz, .copyPictureIDLoop ; This is used for both inside and outside maps, since it is called by ; InitOutsideMapSprites. ; Loads tile pattern data for sprites into VRAM. LoadMapSpriteTilePatterns: - ld a,[wNumSprites] + ld a, [wNumSprites] and a ; are there any sprites? - jr nz,.spritesExist + jr nz, .spritesExist ret .spritesExist - ld c,a ; c = [wNumSprites] - ld b,$10 ; number of sprite slots - ld hl,wSpriteStateData2 + $0d + ld c, a ; c = [wNumSprites] + ld b, $10 ; number of sprite slots + ld hl, wSpriteStateData2 + $0d xor a - ld [hFourTileSpriteCount],a + ld [hFourTileSpriteCount], a .copyPictureIDLoop ; loop to copy picture ID from $C2XD to $C2XE - ld a,[hli] ; $C2XD (sprite picture ID) - ld [hld],a ; $C2XE - ld a,l - add a,$10 - ld l,a + ld a, [hli] ; $C2XD (sprite picture ID) + ld [hld], a ; $C2XE + ld a, l + add $10 + ld l, a dec b - jr nz,.copyPictureIDLoop - ld hl,wSpriteStateData2 + $1e + jr nz, .copyPictureIDLoop + ld hl, wSpriteStateData2 + $1e .loadTilePatternLoop - ld de,wSpriteStateData2 + $1d + ld de, wSpriteStateData2 + $1d ; Check if the current picture ID has already had its tile patterns loaded. ; This done by looping through the previous sprite slots and seeing if any of ; their picture ID's match that of the current sprite slot. .checkIfAlreadyLoadedLoop - ld a,e - and a,$f0 - ld b,a ; b = offset of the wSpriteStateData2 sprite slot being checked against - ld a,l - and a,$f0 ; a = offset of current wSpriteStateData2 sprite slot + ld a, e + and $f0 + ld b, a ; b = offset of the wSpriteStateData2 sprite slot being checked against + ld a, l + and $f0 ; a = offset of current wSpriteStateData2 sprite slot cp b ; done checking all previous sprite slots? - jr z,.notAlreadyLoaded - ld a,[de] ; picture ID of the wSpriteStateData2 sprite slot being checked against + jr z, .notAlreadyLoaded + ld a, [de] ; picture ID of the wSpriteStateData2 sprite slot being checked against cp [hl] ; do the picture ID's match? - jp z,.alreadyLoaded - ld a,e - add a,$10 - ld e,a + jp z, .alreadyLoaded + ld a, e + add $10 + ld e, a jr .checkIfAlreadyLoadedLoop .notAlreadyLoaded - ld de,wSpriteStateData2 + $0e - ld b,$01 + ld de, wSpriteStateData2 + $0e + ld b, $01 ; loop to find the highest tile pattern VRAM slot (among the first 10 slots) used by a previous sprite slot ; this is done in order to find the first free VRAM slot available .findNextVRAMSlotLoop - ld a,e - add a,$10 - ld e,a - ld a,l + ld a, e + add $10 + ld e, a + ld a, l cp e ; reached current slot? - jr z,.foundNextVRAMSlot - ld a,[de] ; $C2YE (VRAM slot) - cp a,11 ; is it one of the first 10 slots? - jr nc,.findNextVRAMSlotLoop + jr z, .foundNextVRAMSlot + ld a, [de] ; $C2YE (VRAM slot) + cp 11 ; is it one of the first 10 slots? + jr nc, .findNextVRAMSlotLoop cp b ; compare the slot being checked to the current max - jr c,.findNextVRAMSlotLoop ; if the slot being checked is less than the current max + jr c, .findNextVRAMSlotLoop ; if the slot being checked is less than the current max ; if the slot being checked is greater than or equal to the current max - ld b,a ; store new max VRAM slot + ld b, a ; store new max VRAM slot jr .findNextVRAMSlotLoop .foundNextVRAMSlot inc b ; increment previous max value to get next VRAM tile pattern slot - ld a,b ; a = next VRAM tile pattern slot + ld a, b ; a = next VRAM tile pattern slot push af - ld a,[hl] ; $C2XE (sprite picture ID) - ld b,a ; b = current sprite picture ID - cp a,SPRITE_BALL ; is it a 4-tile sprite? - jr c,.notFourTileSprite + ld a, [hl] ; $C2XE (sprite picture ID) + ld b, a ; b = current sprite picture ID + cp SPRITE_BALL ; is it a 4-tile sprite? + jr c, .notFourTileSprite pop af - ld a,[hFourTileSpriteCount] - add a,11 + ld a, [hFourTileSpriteCount] + add 11 jr .storeVRAMSlot .notFourTileSprite pop af .storeVRAMSlot - ld [hl],a ; store VRAM slot at $C2XE - ld [hVRAMSlot],a ; used to determine if it's 4-tile sprite later - ld a,b ; a = current sprite picture ID + ld [hl], a ; store VRAM slot at $C2XE + 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 add a push bc push hl - ld hl,SpriteSheetPointerTable - jr nc,.noCarry + ld hl, SpriteSheetPointerTable + jr nc, .noCarry inc h .noCarry add l - ld l,a - jr nc,.noCarry2 + ld l, a + jr nc, .noCarry2 inc h .noCarry2 push hl @@ -126,69 +126,69 @@ LoadMapSpriteTilePatterns: push af push de push bc - ld hl,vNPCSprites ; VRAM base address - ld bc,$c0 ; number of bytes per VRAM slot - ld a,[hVRAMSlot] - cp a,11 ; is it a 4-tile sprite? - jr nc,.fourTileSpriteVRAMAddr - ld d,a + ld hl, vNPCSprites ; VRAM base address + ld bc, $c0 ; number of bytes per VRAM slot + ld a, [hVRAMSlot] + cp 11 ; is it a 4-tile sprite? + jr nc, .fourTileSpriteVRAMAddr + ld d, a dec d ; Equivalent to multiplying $C0 (number of bytes in 12 tiles) times the VRAM ; slot and adding the result to $8000 (the VRAM base address). .calculateVRAMAddrLoop - add hl,bc + add hl, bc dec d - jr nz,.calculateVRAMAddrLoop + jr nz, .calculateVRAMAddrLoop jr .loadStillTilePattern .fourTileSpriteVRAMAddr - ld hl,vSprites + $7c0 ; address for second 4-tile sprite - ld a,[hFourTileSpriteCount] + ld hl, vSprites + $7c0 ; address for second 4-tile sprite + ld a, [hFourTileSpriteCount] and a - jr nz,.loadStillTilePattern + jr nz, .loadStillTilePattern ; if it's the first 4-tile sprite - ld hl,vSprites + $780 ; address for first 4-tile sprite + ld hl, vSprites + $780 ; address for first 4-tile sprite inc a - ld [hFourTileSpriteCount],a + ld [hFourTileSpriteCount], a .loadStillTilePattern pop bc pop de pop af push hl push hl - ld h,d - ld l,e + ld h, d + ld l, e pop de - ld b,a - ld a,[wFontLoaded] - bit 0,a ; reloading upper half of tile patterns after displaying text? - jr nz,.skipFirstLoad ; if so, skip loading data into the lower half - ld a,b - ld b,0 + ld b, a + ld a, [wFontLoaded] + bit 0, a ; reloading upper half of tile patterns after displaying text? + jr nz, .skipFirstLoad ; if so, skip loading data into the lower half + ld a, b + ld b, 0 call FarCopyData2 ; load tile pattern data for sprite when standing still .skipFirstLoad pop de pop hl - ld a,[hVRAMSlot] - cp a,11 ; is it a 4-tile sprite? - jr nc,.skipSecondLoad ; if so, there is no second block + ld a, [hVRAMSlot] + cp 11 ; is it a 4-tile sprite? + jr nc, .skipSecondLoad ; if so, there is no second block push de call ReadSpriteSheetData push af - ld a,$c0 + ld a, $c0 add e - ld e,a - jr nc,.noCarry3 + ld e, a + jr nc, .noCarry3 inc d .noCarry3 - ld a,[wFontLoaded] - bit 0,a ; reloading upper half of tile patterns after displaying text? - jr nz,.loadWhileLCDOn + ld a, [wFontLoaded] + bit 0, a ; reloading upper half of tile patterns after displaying text? + jr nz, .loadWhileLCDOn pop af pop hl - set 3,h ; add $800 to hl + set 3, h ; add $800 to hl push hl - ld h,d - ld l,e + ld h, d + ld l, e pop de call FarCopyData2 ; load tile pattern data for sprite when walking jr .skipSecondLoad @@ -198,8 +198,8 @@ LoadMapSpriteTilePatterns: .loadWhileLCDOn pop af pop hl - set 3,h ; add $800 to hl - ld b,a + set 3, h ; add $800 to hl + ld b, a swap c call CopyVideoData ; load tile pattern data for sprite when walking .skipSecondLoad @@ -208,25 +208,25 @@ LoadMapSpriteTilePatterns: jr .nextSpriteSlot .alreadyLoaded ; if the current picture ID has already had its tile patterns loaded inc de - ld a,[de] ; a = VRAM slot for the current picture ID (from $C2YE) - ld [hl],a ; store VRAM slot in current wSpriteStateData2 sprite slot (at $C2XE) + ld a, [de] ; a = VRAM slot for the current picture ID (from $C2YE) + ld [hl], a ; store VRAM slot in current wSpriteStateData2 sprite slot (at $C2XE) .nextSpriteSlot - ld a,l - add a,$10 - ld l,a + ld a, l + add $10 + ld l, a dec c - jp nz,.loadTilePatternLoop - ld hl,wSpriteStateData2 + $0d - ld b,$10 + jp nz, .loadTilePatternLoop + ld hl, wSpriteStateData2 + $0d + ld b, $10 ; the pictures ID's stored at $C2XD are no longer needed, so zero them .zeroStoredPictureIDLoop xor a - ld [hl],a ; $C2XD - ld a,$10 + ld [hl], a ; $C2XD + ld a, $10 add l - ld l,a + ld l, a dec b - jr nz,.zeroStoredPictureIDLoop + jr nz, .zeroStoredPictureIDLoop ret ; reads data from SpriteSheetPointerTable @@ -237,108 +237,108 @@ LoadMapSpriteTilePatterns: ; bc = length in bytes ; a = ROM bank ReadSpriteSheetData: - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a - ld a,[hli] - ld c,a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a xor a - ld b,a - ld a,[hli] + ld b, a + ld a, [hli] ret ; Loads sprite set for outside maps (cities and routes) and sets VRAM slots. ; sets carry if the map is a city or route, unsets carry if not InitOutsideMapSprites: - ld a,[wCurMap] - cp a,REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? + ld a, [wCurMap] + cp REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? ret nc ; if not, return - ld hl,MapSpriteSets + ld hl, MapSpriteSets add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry - ld a,[hl] ; a = spriteSetID - cp a,$f0 ; does the map have 2 sprite sets? - call nc,GetSplitMapSpriteSetID ; if so, choose the appropriate one - ld b,a ; b = spriteSetID - ld a,[wFontLoaded] - bit 0,a ; reloading upper half of tile patterns after displaying text? - jr nz,.loadSpriteSet ; if so, forcibly reload the sprite set - ld a,[wSpriteSetID] + ld a, [hl] ; a = spriteSetID + cp $f0 ; does the map have 2 sprite sets? + call nc, GetSplitMapSpriteSetID ; if so, choose the appropriate one + ld b, a ; b = spriteSetID + ld a, [wFontLoaded] + bit 0, a ; reloading upper half of tile patterns after displaying text? + jr nz, .loadSpriteSet ; if so, forcibly reload the sprite set + ld a, [wSpriteSetID] cp b ; has the sprite set ID changed? - jr z,.skipLoadingSpriteSet ; if not, don't load it again + jr z, .skipLoadingSpriteSet ; if not, don't load it again .loadSpriteSet - ld a,b - ld [wSpriteSetID],a + ld a, b + ld [wSpriteSetID], a dec a - ld b,a + ld b, a sla a - ld c,a + ld c, a sla a sla a add c add b ; a = (spriteSetID - 1) * 11 - ld de,SpriteSets + ld de, SpriteSets ; add a to de to get offset of sprite set add e - ld e,a - jr nc,.noCarry2 + ld e, a + jr nc, .noCarry2 inc d .noCarry2 - ld hl,wSpriteStateData2 + $0d - ld a,SPRITE_RED - ld [hl],a - ld bc,wSpriteSet + ld hl, wSpriteStateData2 + $0d + ld a, SPRITE_RED + ld [hl], a + ld bc, wSpriteSet ; Load the sprite set into RAM. ; This loop also fills $C2XD (sprite picture ID) where X is from $0 to $A ; with picture ID's. This is done so that LoadMapSpriteTilePatterns will ; load tile patterns for all sprite pictures in the sprite set. .loadSpriteSetLoop - ld a,$10 + ld a, $10 add l - ld l,a - ld a,[de] ; sprite picture ID from sprite set - ld [hl],a ; $C2XD (sprite picture ID) - ld [bc],a + ld l, a + ld a, [de] ; sprite picture ID from sprite set + ld [hl], a ; $C2XD (sprite picture ID) + ld [bc], a inc de inc bc - ld a,l - cp a,$bd ; reached 11th sprite slot? - jr nz,.loadSpriteSetLoop - ld b,4 ; 4 remaining sprite slots + ld a, l + cp $bd ; reached 11th sprite slot? + jr nz, .loadSpriteSetLoop + ld b, 4 ; 4 remaining sprite slots .zeroRemainingSlotsLoop ; loop to zero the picture ID's of the remaining sprite slots - ld a,$10 + ld a, $10 add l - ld l,a + ld l, a xor a - ld [hl],a ; $C2XD (sprite picture ID) + ld [hl], a ; $C2XD (sprite picture ID) dec b - jr nz,.zeroRemainingSlotsLoop - ld a,[wNumSprites] + jr nz, .zeroRemainingSlotsLoop + ld a, [wNumSprites] push af ; save number of sprites - ld a,11 ; 11 sprites in sprite set - ld [wNumSprites],a + ld a, 11 ; 11 sprites in sprite set + ld [wNumSprites], a call LoadMapSpriteTilePatterns pop af - ld [wNumSprites],a ; restore number of sprites - ld hl,wSpriteStateData2 + $1e - ld b,$0f + ld [wNumSprites], a ; restore number of sprites + ld hl, wSpriteStateData2 + $1e + ld b, $0f ; The VRAM tile pattern slots that LoadMapSpriteTilePatterns set are in the ; order of the map's sprite set, not the order of the actual sprites loaded ; for the current map. So, they are not needed and are zeroed by this loop. .zeroVRAMSlotsLoop xor a - ld [hl],a ; $C2XE (VRAM slot) - ld a,$10 + ld [hl], a ; $C2XE (VRAM slot) + ld a, $10 add l - ld l,a + ld l, a dec b - jr nz,.zeroVRAMSlotsLoop + jr nz, .zeroVRAMSlotsLoop .skipLoadingSpriteSet - ld hl,wSpriteStateData1 + $10 + ld hl, wSpriteStateData1 + $10 ; This loop stores the correct VRAM tile pattern slots according the sprite ; data from the map's header. Since the VRAM tile pattern slots are filled in ; the order of the sprite set, in order to find the VRAM tile pattern slot @@ -347,94 +347,94 @@ InitOutsideMapSprites: ; (since the Red sprite always has the first VRAM tile pattern slot) is the ; VRAM tile pattern slot. .storeVRAMSlotsLoop - ld c,0 - ld a,[hl] ; $C1X0 (picture ID) (zero if sprite slot is not used) + ld c, 0 + ld a, [hl] ; $C1X0 (picture ID) (zero if sprite slot is not used) and a ; is the sprite slot used? - jr z,.skipGettingPictureIndex ; if the sprite slot is not used - ld b,a ; b = picture ID - ld de,wSpriteSet + jr z, .skipGettingPictureIndex ; if the sprite slot is not used + ld b, a ; b = picture ID + ld de, wSpriteSet ; Loop to find the index of the sprite's picture ID within the sprite set. .getPictureIndexLoop inc c - ld a,[de] + ld a, [de] inc de cp b ; does the picture ID match? - jr nz,.getPictureIndexLoop + jr nz, .getPictureIndexLoop inc c .skipGettingPictureIndex push hl inc h - ld a,$0e + ld a, $0e add l - ld l,a - ld a,c ; a = VRAM slot (zero if sprite slot is not used) - ld [hl],a ; $C2XE (VRAM slot) + ld l, a + ld a, c ; a = VRAM slot (zero if sprite slot is not used) + ld [hl], a ; $C2XE (VRAM slot) pop hl - ld a,$10 + ld a, $10 add l - ld l,a + ld l, a and a - jr nz,.storeVRAMSlotsLoop + jr nz, .storeVRAMSlotsLoop scf ret ; Chooses the correct sprite set ID depending on the player's position within ; the map for maps with two sprite sets. GetSplitMapSpriteSetID: - cp a,$f8 - jr z,.route20 - ld hl,SplitMapSpriteSets - and a,$0f + cp $f8 + jr z, .route20 + ld hl, SplitMapSpriteSets + and $0f dec a sla a sla a add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry - ld a,[hli] ; determines whether the map is split East/West or North/South - cp a,$01 - ld a,[hli] ; position of dividing line - ld b,a - jr z,.eastWestDivide + ld a, [hli] ; determines whether the map is split East/West or North/South + cp $01 + ld a, [hli] ; position of dividing line + ld b, a + jr z, .eastWestDivide .northSouthDivide - ld a,[wYCoord] + ld a, [wYCoord] jr .compareCoord .eastWestDivide - ld a,[wXCoord] + ld a, [wXCoord] .compareCoord cp b - jr c,.loadSpriteSetID + jr c, .loadSpriteSetID ; if in the East side or South side inc hl .loadSpriteSetID - ld a,[hl] + ld a, [hl] ret ; Uses sprite set $01 for West side and $0A for East side. ; Route 20 is a special case because the two map sections have a more complex ; shape instead of the map simply being split horizontally or vertically. .route20 - ld hl,wXCoord - ld a,[hl] - cp a,$2b - ld a,$01 + ld hl, wXCoord + ld a, [hl] + cp $2b + ld a, $01 ret c - ld a,[hl] - cp a,$3e - ld a,$0a + ld a, [hl] + cp $3e + ld a, $0a ret nc - ld a,[hl] - cp a,$37 - ld b,$08 - jr nc,.next - ld b,$0d + ld a, [hl] + cp $37 + ld b, $08 + jr nc, .next + ld b, $0d .next - ld a,[wYCoord] + ld a, [wYCoord] cp b - ld a,$0a + ld a, $0a ret c - ld a,$01 + ld a, $01 ret INCLUDE "data/sprite_sets.asm" diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index 823939b1..dc5b29b5 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -1,230 +1,230 @@ DisplayPokemartDialogue_: - ld a,[wListScrollOffset] - ld [wSavedListScrollOffset],a + ld a, [wListScrollOffset] + ld [wSavedListScrollOffset], a call UpdateSprites xor a - ld [wBoughtOrSoldItemInMart],a + ld [wBoughtOrSoldItemInMart], a .loop xor a - ld [wListScrollOffset],a - ld [wCurrentMenuItem],a - ld [wPlayerMonNumber],a + ld [wListScrollOffset], a + ld [wCurrentMenuItem], a + ld [wPlayerMonNumber], a inc a - ld [wPrintItemPrices],a - ld a,MONEY_BOX - ld [wTextBoxID],a + ld [wPrintItemPrices], a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID - ld a,BUY_SELL_QUIT_MENU - ld [wTextBoxID],a + ld a, BUY_SELL_QUIT_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; This code is useless. It copies the address of the pokemart's inventory to hl, ; but the address is never used. - ld hl,wItemListPointer - ld a,[hli] - ld l,[hl] - ld h,a + ld hl, wItemListPointer + ld a, [hli] + ld l, [hl] + ld h, a - ld a,[wMenuExitMethod] - cp a,CANCELLED_MENU - jp z,.done - ld a,[wChosenMenuItem] + ld a, [wMenuExitMethod] + cp CANCELLED_MENU + jp z, .done + ld a, [wChosenMenuItem] and a ; buying? - jp z,.buyMenu + jp z, .buyMenu dec a ; selling? - jp z,.sellMenu + jp z, .sellMenu dec a ; quitting? - jp z,.done + jp z, .done .sellMenu ; the same variables are set again below, so this code has no effect xor a - ld [wPrintItemPrices],a - ld a,INIT_BAG_ITEM_LIST - ld [wInitListType],a + ld [wPrintItemPrices], a + ld a, INIT_BAG_ITEM_LIST + ld [wInitListType], a callab InitList - ld a,[wNumBagItems] + ld a, [wNumBagItems] and a - jp z,.bagEmpty - ld hl,PokemonSellingGreetingText + jp z, .bagEmpty + ld hl, PokemonSellingGreetingText call PrintText call SaveScreenTilesToBuffer1 ; save screen .sellMenuLoop call LoadScreenTilesFromBuffer1 ; restore saved screen - ld a,MONEY_BOX - ld [wTextBoxID],a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID ; draw money text box - ld hl,wNumBagItems - ld a,l - ld [wListPointer],a - ld a,h - ld [wListPointer + 1],a + ld hl, wNumBagItems + ld a, l + ld [wListPointer], a + ld a, h + ld [wListPointer + 1], a xor a - ld [wPrintItemPrices],a - ld [wCurrentMenuItem],a - ld a,ITEMLISTMENU - ld [wListMenuID],a + ld [wPrintItemPrices], a + ld [wCurrentMenuItem], a + ld a, ITEMLISTMENU + ld [wListMenuID], a call DisplayListMenuID - jp c,.returnToMainPokemartMenu ; if the player closed the menu + jp c, .returnToMainPokemartMenu ; if the player closed the menu .confirmItemSale ; if the player is trying to sell a specific item call IsKeyItem - ld a,[wIsKeyItem] + ld a, [wIsKeyItem] and a - jr nz,.unsellableItem - ld a,[wcf91] + jr nz, .unsellableItem + ld a, [wcf91] call IsItemHM - jr c,.unsellableItem - ld a,PRICEDITEMLISTMENU - ld [wListMenuID],a - ld [hHalveItemPrices],a ; halve prices when selling + jr c, .unsellableItem + ld a, PRICEDITEMLISTMENU + ld [wListMenuID], a + ld [hHalveItemPrices], a ; halve prices when selling call DisplayChooseQuantityMenu inc a - jr z,.sellMenuLoop ; if the player closed the choose quantity menu with the B button - ld hl,PokemartTellSellPriceText + jr z, .sellMenuLoop ; if the player closed the choose quantity menu with the B button + ld hl, PokemartTellSellPriceText lb bc, 14, 1 ; location that PrintText always prints to, this is useless call PrintText coord hl, 14, 7 lb bc, 8, 15 - ld a,TWO_OPTION_MENU - ld [wTextBoxID],a + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu - ld a,[wMenuExitMethod] - cp a,CHOSE_SECOND_ITEM - jr z,.sellMenuLoop ; if the player chose No or pressed the B button + ld a, [wMenuExitMethod] + cp CHOSE_SECOND_ITEM + jr z, .sellMenuLoop ; if the player chose No or pressed the B button ; The following code is supposed to check if the player chose No, but the above ; check already catches it. - ld a,[wChosenMenuItem] + ld a, [wChosenMenuItem] dec a - jr z,.sellMenuLoop + jr z, .sellMenuLoop .sellItem - ld a,[wBoughtOrSoldItemInMart] + ld a, [wBoughtOrSoldItemInMart] and a - jr nz,.skipSettingFlag1 + jr nz, .skipSettingFlag1 inc a - ld [wBoughtOrSoldItemInMart],a + ld [wBoughtOrSoldItemInMart], a .skipSettingFlag1 call AddAmountSoldToMoney - ld hl,wNumBagItems + ld hl, wNumBagItems call RemoveItemFromInventory jp .sellMenuLoop .unsellableItem - ld hl,PokemartUnsellableItemText + ld hl, PokemartUnsellableItemText call PrintText jp .returnToMainPokemartMenu .bagEmpty - ld hl,PokemartItemBagEmptyText + ld hl, PokemartItemBagEmptyText call PrintText call SaveScreenTilesToBuffer1 jp .returnToMainPokemartMenu .buyMenu ; the same variables are set again below, so this code has no effect - ld a,1 - ld [wPrintItemPrices],a - ld a,INIT_OTHER_ITEM_LIST - ld [wInitListType],a + ld a, 1 + ld [wPrintItemPrices], a + ld a, INIT_OTHER_ITEM_LIST + ld [wInitListType], a callab InitList - ld hl,PokemartBuyingGreetingText + ld hl, PokemartBuyingGreetingText call PrintText call SaveScreenTilesToBuffer1 .buyMenuLoop call LoadScreenTilesFromBuffer1 - ld a,MONEY_BOX - ld [wTextBoxID],a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID - ld hl,wItemList - ld a,l - ld [wListPointer],a - ld a,h - ld [wListPointer + 1],a + ld hl, wItemList + ld a, l + ld [wListPointer], a + ld a, h + ld [wListPointer + 1], a xor a - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a inc a - ld [wPrintItemPrices],a + ld [wPrintItemPrices], a inc a ; a = 2 (PRICEDITEMLISTMENU) - ld [wListMenuID],a + ld [wListMenuID], a call DisplayListMenuID - jr c,.returnToMainPokemartMenu ; if the player closed the menu - ld a,99 - ld [wMaxItemQuantity],a + jr c, .returnToMainPokemartMenu ; if the player closed the menu + ld a, 99 + ld [wMaxItemQuantity], a xor a - ld [hHalveItemPrices],a ; don't halve item prices when buying + ld [hHalveItemPrices], a ; don't halve item prices when buying call DisplayChooseQuantityMenu inc a - jr z,.buyMenuLoop ; if the player closed the choose quantity menu with the B button - ld a,[wcf91] ; item ID - ld [wd11e],a ; store item ID for GetItemName + jr z, .buyMenuLoop ; if the player closed the choose quantity menu with the B button + ld a, [wcf91] ; item ID + ld [wd11e], a ; store item ID for GetItemName call GetItemName call CopyStringToCF4B ; copy name to wcf4b - ld hl,PokemartTellBuyPriceText + ld hl, PokemartTellBuyPriceText call PrintText coord hl, 14, 7 lb bc, 8, 15 - ld a,TWO_OPTION_MENU - ld [wTextBoxID],a + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu - ld a,[wMenuExitMethod] - cp a,CHOSE_SECOND_ITEM - jp z,.buyMenuLoop ; if the player chose No or pressed the B button + ld a, [wMenuExitMethod] + cp CHOSE_SECOND_ITEM + jp z, .buyMenuLoop ; if the player chose No or pressed the B button ; The following code is supposed to check if the player chose No, but the above ; check already catches it. - ld a,[wChosenMenuItem] + ld a, [wChosenMenuItem] dec a - jr z,.buyMenuLoop + jr z, .buyMenuLoop .buyItem call .isThereEnoughMoney - jr c,.notEnoughMoney - ld hl,wNumBagItems + jr c, .notEnoughMoney + ld hl, wNumBagItems call AddItemToInventory - jr nc,.bagFull + jr nc, .bagFull call SubtractAmountPaidFromMoney - ld a,[wBoughtOrSoldItemInMart] + ld a, [wBoughtOrSoldItemInMart] and a - jr nz,.skipSettingFlag2 - ld a,1 - ld [wBoughtOrSoldItemInMart],a + jr nz, .skipSettingFlag2 + ld a, 1 + ld [wBoughtOrSoldItemInMart], a .skipSettingFlag2 - ld a,SFX_PURCHASE + ld a, SFX_PURCHASE call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld hl,PokemartBoughtItemText + ld hl, PokemartBoughtItemText call PrintText jp .buyMenuLoop .returnToMainPokemartMenu call LoadScreenTilesFromBuffer1 - ld a,MONEY_BOX - ld [wTextBoxID],a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID - ld hl,PokemartAnythingElseText + ld hl, PokemartAnythingElseText call PrintText jp .loop .isThereEnoughMoney - ld de,wPlayerMoney - ld hl,hMoney - ld c,3 ; length of money in bytes + ld de, wPlayerMoney + ld hl, hMoney + ld c, 3 ; length of money in bytes jp StringCmp .notEnoughMoney - ld hl,PokemartNotEnoughMoneyText + ld hl, PokemartNotEnoughMoneyText call PrintText jr .returnToMainPokemartMenu .bagFull - ld hl,PokemartItemBagFullText + ld hl, PokemartItemBagFullText call PrintText jr .returnToMainPokemartMenu .done - ld hl,PokemartThankYouText + ld hl, PokemartThankYouText call PrintText - ld a,1 - ld [wUpdateSpritesEnabled],a + ld a, 1 + ld [wUpdateSpritesEnabled], a call UpdateSprites - ld a,[wSavedListScrollOffset] - ld [wListScrollOffset],a + ld a, [wSavedListScrollOffset] + ld [wListScrollOffset], a ret PokemartBuyingGreetingText: diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm index 6444ab7e..dae57f23 100644 --- a/engine/overworld/wild_mons.asm +++ b/engine/overworld/wild_mons.asm @@ -1,33 +1,33 @@ LoadWildData: - ld hl,WildDataPointers - ld a,[wCurMap] + ld hl, WildDataPointers + ld a, [wCurMap] ; get wild data for current map - ld c,a - ld b,0 - add hl,bc - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a ; hl now points to wild data for current map - ld a,[hli] - ld [wGrassRate],a + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a ; hl now points to wild data for current map + ld a, [hli] + ld [wGrassRate], a and a - jr z,.NoGrassData ; if no grass data, skip to surfing data + jr z, .NoGrassData ; if no grass data, skip to surfing data push hl - ld de,wGrassMons ; otherwise, load grass data - ld bc,$0014 + ld de, wGrassMons ; otherwise, load grass data + ld bc, $0014 call CopyData pop hl - ld bc,$0014 - add hl,bc + ld bc, $0014 + add hl, bc .NoGrassData - ld a,[hli] - ld [wWaterRate],a + ld a, [hli] + ld [wWaterRate], a and a ret z ; if no water data, we're done - ld de,wWaterMons ; otherwise, load surfing data - ld bc,$0014 + ld de, wWaterMons ; otherwise, load surfing data + ld bc, $0014 jp CopyData INCLUDE "data/wild_mons.asm" diff --git a/engine/palettes.asm b/engine/palettes.asm index 1ac5e56a..4808776e 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -325,11 +325,11 @@ UpdatePartyMenuBlkPacket: SendSGBPacket: ;check number of packets - ld a,[hl] - and a,$07 + ld a, [hl] + and $07 ret z ; store number of packets in B - ld b,a + ld b, a .loop2 ; save B for later use push bc @@ -338,46 +338,46 @@ SendSGBPacket: ld [hDisableJoypadPolling], a ; send RESET signal (P14=LOW, P15=LOW) xor a - ld [rJOYP],a + ld [rJOYP], a ; set P14=HIGH, P15=HIGH - ld a,$30 - ld [rJOYP],a + ld a, $30 + ld [rJOYP], a ;load length of packets (16 bytes) - ld b,$10 + ld b, $10 .nextByte ;set bit counter (8 bits per byte) - ld e,$08 + ld e, $08 ; get next byte in the packet - ld a,[hli] - ld d,a + ld a, [hli] + ld d, a .nextBit0 - bit 0,d + bit 0, d ; if 0th bit is not zero set P14=HIGH,P15=LOW (send bit 1) - ld a,$10 - jr nz,.next0 + ld a, $10 + jr nz, .next0 ; else (if 0th bit is zero) set P14=LOW,P15=HIGH (send bit 0) - ld a,$20 + ld a, $20 .next0 - ld [rJOYP],a + ld [rJOYP], a ; must set P14=HIGH,P15=HIGH between each "pulse" - ld a,$30 - ld [rJOYP],a + ld a, $30 + 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 ; decrease bit counter so we know when we have sent all 8 bits of current byte dec e - jr nz,.nextBit0 + jr nz, .nextBit0 dec b - jr nz,.nextByte + jr nz, .nextByte ; send bit 1 as a "stop bit" (end of parameter data) - ld a,$20 - ld [rJOYP],a + ld a, $20 + ld [rJOYP], a ; set P14=HIGH,P15=HIGH - ld a,$30 - ld [rJOYP],a + ld a, $30 + ld [rJOYP], a xor a - ld [hDisableJoypadPolling],a + ld [hDisableJoypadPolling], a ; wait for about 70000 cycles call Wait7000 ; restore (previously pushed) number of packets diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm index f8e29e5c..aff9769e 100755 --- a/engine/pokedex_rating.asm +++ b/engine/pokedex_rating.asm @@ -42,7 +42,7 @@ DisplayDexRating: inc de .copyRatingTextLoop ld a, [hli] - cp a, "@" + cp "@" jr z, .doneCopying ld [de], a inc de diff --git a/engine/predefs.asm b/engine/predefs.asm index 605cba3a..6f605043 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -4,48 +4,48 @@ GetPredefPointer: ; Then put the bank and address of predef ; wPredefID in [wPredefBank] and hl. - ld a,h - ld [wPredefRegisters],a - ld a,l - ld [wPredefRegisters + 1],a + ld a, h + ld [wPredefRegisters], a + ld a, l + ld [wPredefRegisters + 1], a - ld hl,wPredefRegisters + 2 - ld a,d - ld [hli],a - ld a,e - ld [hli],a + ld hl, wPredefRegisters + 2 + ld a, d + ld [hli], a + ld a, e + ld [hli], a - ld a,b - ld [hli],a - ld [hl],c + ld a, b + ld [hli], a + ld [hl], c - ld hl,PredefPointers - ld de,0 + ld hl, PredefPointers + ld de, 0 - ld a,[wPredefID] - ld e,a + ld a, [wPredefID] + ld e, a add a add e - ld e,a + ld e, a jr nc, .nocarry inc d .nocarry - add hl,de - ld d,h - ld e,l + add hl, de + ld d, h + ld e, l ; get bank of predef routine - ld a,[de] - ld [wPredefBank],a + ld a, [de] + ld [wPredefBank], a ; get pointer inc de - ld a,[de] - ld l,a + ld a, [de] + ld l, a inc de - ld a,[de] - ld h,a + ld a, [de] + ld h, a ret diff --git a/engine/save.asm b/engine/save.asm index e5f67a62..97935dbb 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -139,16 +139,16 @@ LoadSAVIgnoreBadCheckSum: SaveSAV: callba PrintSaveScreenText - ld hl,WouldYouLikeToSaveText + ld hl, WouldYouLikeToSaveText call SaveSAVConfirm and a ;|0 = Yes|1 = No| ret nz - ld a,[wSaveFileStatus] + ld a, [wSaveFileStatus] dec a - jr z,.save + jr z, .save call SAVCheckRandomID - jr z,.save - ld hl,OlderFileWillBeErasedText + jr z, .save + ld hl, OlderFileWillBeErasedText call SaveSAVConfirm and a ret nz @@ -158,16 +158,16 @@ SaveSAV: lb bc, 4, 18 call ClearScreenArea coord hl, 1, 14 - ld de,NowSavingString + ld de, NowSavingString call PlaceString - ld c,120 + ld c, 120 call DelayFrames - ld hl,GameSavedText + ld hl, GameSavedText call PrintText ld a, SFX_SAVE call PlaySoundWaitForCurrent call WaitForSoundToFinish - ld c,30 + ld c, 30 jp DelayFrames NowSavingString: @@ -177,10 +177,10 @@ SaveSAVConfirm: call PrintText coord hl, 0, 7 lb bc, 8, 1 - ld a,TWO_OPTION_MENU - ld [wTextBoxID],a + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a call DisplayTextBoxID ; yes/no menu - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] ret WouldYouLikeToSaveText: @@ -604,34 +604,34 @@ SAVCheckRandomID: ;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)s - ld a,$0a - ld [MBC1SRamEnable],a - ld a,$01 - ld [MBC1SRamBankingMode],a - ld [MBC1SRamBank],a - ld a,[sPlayerName] + ld a, $0a + ld [MBC1SRamEnable], a + ld a, $01 + ld [MBC1SRamBankingMode], a + ld [MBC1SRamBank], a + ld a, [sPlayerName] and a - jr z,.next - ld hl,sPlayerName + jr z, .next + ld hl, sPlayerName ld bc, sMainDataCheckSum - sPlayerName call SAVCheckSum - ld c,a - ld a,[sMainDataCheckSum] + ld c, a + ld a, [sMainDataCheckSum] cp c - jr nz,.next - ld hl,sMainData + (wPlayerID - wMainDataStart) ; player ID - ld a,[hli] - ld h,[hl] - ld l,a - ld a,[wPlayerID] + jr nz, .next + ld hl, sMainData + (wPlayerID - wMainDataStart) ; player ID + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wPlayerID] cp l - jr nz,.next - ld a,[wPlayerID + 1] + jr nz, .next + ld a, [wPlayerID + 1] cp h .next - ld a,$00 - ld [MBC1SRamBankingMode],a - ld [MBC1SRamEnable],a + ld a, $00 + ld [MBC1SRamBankingMode], a + ld [MBC1SRamEnable], a ret SaveHallOfFameTeams: diff --git a/engine/special_warps.asm b/engine/special_warps.asm index de00a817..3a8b8b86 100644 --- a/engine/special_warps.asm +++ b/engine/special_warps.asm @@ -1,31 +1,31 @@ SpecialWarpIn: call LoadSpecialWarpData predef LoadTilesetHeader - ld hl,wd732 - bit 2,[hl] ; dungeon warp or fly warp? - res 2,[hl] - jr z,.next + ld hl, wd732 + bit 2, [hl] ; dungeon warp or fly warp? + res 2, [hl] + jr z, .next ; if dungeon warp or fly warp - ld a,[wDestinationMap] + ld a, [wDestinationMap] jr .next2 .next - bit 1,[hl] - jr z,.next3 + bit 1, [hl] + jr z, .next3 call EmptyFunc .next3 - ld a,0 + ld a, 0 .next2 - ld b,a - ld a,[wd72d] + ld b, a + ld a, [wd72d] and a - jr nz,.next4 - ld a,b + jr nz, .next4 + ld a, b .next4 - ld hl,wd732 - bit 4,[hl] ; dungeon warp? + ld hl, wd732 + bit 4, [hl] ; dungeon warp? ret nz ; if not dungeon warp - ld [wLastMap],a + ld [wLastMap], a ret ; gets the map ID, tile block map view pointer, tileset, and coordinates diff --git a/engine/subtract_paid_money.asm b/engine/subtract_paid_money.asm index 2888c3fb..a6a6ec2e 100644 --- a/engine/subtract_paid_money.asm +++ b/engine/subtract_paid_money.asm @@ -1,17 +1,17 @@ ; subtracts the amount the player paid from their money ; sets carry flag if there is enough money and unsets carry flag if not SubtractAmountPaidFromMoney_: - ld de,wPlayerMoney - ld hl,hMoney ; total price of items - ld c,3 ; length of money in bytes + ld de, wPlayerMoney + ld hl, hMoney ; total price of items + ld c, 3 ; length of money in bytes call StringCmp ret c - ld de,wPlayerMoney + 2 - ld hl,hMoney + 2 ; total price of items - ld c,3 ; length of money in bytes + ld de, wPlayerMoney + 2 + ld hl, hMoney + 2 ; total price of items + ld c, 3 ; length of money in bytes predef SubBCDPredef ; subtract total price from money - ld a,MONEY_BOX - ld [wTextBoxID],a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID ; redraw money text box and a ret diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index f4cce5b4..03a5832d 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -56,7 +56,7 @@ DisplayTitleScreen: ld a, BANK(PokemonLogoGraphics) call FarCopyData2 ; second chunk ld hl, Version_GFX - ld de,vChars2 + $600 - (Version_GFXEnd - Version_GFX - $50) + ld de, vChars2 + $600 - (Version_GFXEnd - Version_GFX - $50) ld bc, Version_GFXEnd - Version_GFX ld a, BANK(Version_GFX) call FarCopyDataDouble @@ -118,10 +118,10 @@ DisplayTitleScreen: call LoadScreenTilesFromBuffer2 call EnableLCD IF DEF(_RED) - ld a,CHARMANDER ; which Pokemon to show first on the title screen + ld a, CHARMANDER ; which Pokemon to show first on the title screen ENDC IF DEF(_BLUE) - ld a,SQUIRTLE ; which Pokemon to show first on the title screen + ld a, SQUIRTLE ; which Pokemon to show first on the title screen ENDC ld [wTitleMonSpecies], a diff --git a/engine/trade2.asm b/engine/trade2.asm index 062d5285..2c79e077 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,44 +1,44 @@ Trade_PrintPlayerMonInfoText: coord hl, 5, 0 - ld de,Trade_MonInfoText + ld de, Trade_MonInfoText call PlaceString - ld a,[wTradedPlayerMonSpecies] - ld [wd11e],a + ld a, [wTradedPlayerMonSpecies] + ld [wd11e], a predef IndexToPokedex coord hl, 9, 0 - ld de,wd11e + ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber coord hl, 5, 2 - ld de,wcf4b + ld de, wcf4b call PlaceString coord hl, 8, 4 - ld de,wTradedPlayerMonOT + ld de, wTradedPlayerMonOT call PlaceString coord hl, 8, 6 - ld de,wTradedPlayerMonOTID + ld de, wTradedPlayerMonOTID lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber Trade_PrintEnemyMonInfoText: coord hl, 5, 10 - ld de,Trade_MonInfoText + ld de, Trade_MonInfoText call PlaceString - ld a,[wTradedEnemyMonSpecies] - ld [wd11e],a + ld a, [wTradedEnemyMonSpecies] + ld [wd11e], a predef IndexToPokedex coord hl, 9, 10 - ld de,wd11e + ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber coord hl, 5, 12 - ld de,wcd6d + ld de, wcd6d call PlaceString coord hl, 8, 14 - ld de,wTradedEnemyMonOT + ld de, wTradedEnemyMonOT call PlaceString coord hl, 8, 16 - ld de,wTradedEnemyMonOTID + ld de, wTradedEnemyMonOTID lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber diff --git a/home.asm b/home.asm index 2e765b81..18580a93 100644 --- a/home.asm +++ b/home.asm @@ -148,24 +148,24 @@ CheckForUserInterruption:: ; INPUT: ; a = ID of destination warp within destination map LoadDestinationWarpPosition:: - ld b,a - ld a,[H_LOADEDROMBANK] + ld b, a + ld a, [H_LOADEDROMBANK] push af - ld a,[wPredefParentBank] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld a,b + ld a, [wPredefParentBank] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld a, b add a add a - ld c,a - ld b,0 - add hl,bc - ld bc,4 - ld de,wCurrentTileBlockMapViewPointer + ld c, a + ld b, 0 + add hl, bc + ld bc, 4 + ld de, wCurrentTileBlockMapViewPointer call CopyData pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret @@ -189,18 +189,18 @@ DrawHPBar:: ; Middle ld a, $63 ; empty .draw - ld [hli],a + ld [hli], a dec d jr nz, .draw ; Right - ld a,[wHPBarType] + ld a, [wHPBarType] dec a ld a, $6d ; status screen and battle jr z, .ok dec a ; pokemon menu .ok - ld [hl],a + ld [hl], a pop hl @@ -346,10 +346,10 @@ GetCryData:: ret DisplayPartyMenu:: - ld a,[hTilesetType] + ld a, [hTilesetType] push af xor a - ld [hTilesetType],a + ld [hTilesetType], a call GBPalWhiteOutWithDelay3 call ClearSprites call PartyMenuInit @@ -357,10 +357,10 @@ DisplayPartyMenu:: jp HandlePartyMenuInput GoBackToPartyMenu:: - ld a,[hTilesetType] + ld a, [hTilesetType] push af xor a - ld [hTilesetType],a + ld [hTilesetType], a call PartyMenuInit call RedrawPartyMenu jp HandlePartyMenuInput @@ -405,38 +405,38 @@ PartyMenuInit:: ret HandlePartyMenuInput:: - ld a,1 - ld [wMenuWrappingEnabled],a - ld a,$40 - ld [wPartyMenuAnimMonEnabled],a + ld a, 1 + ld [wMenuWrappingEnabled], a + ld a, $40 + ld [wPartyMenuAnimMonEnabled], a call HandleMenuInput_ call PlaceUnfilledArrowMenuCursor - ld b,a + ld b, a xor a - ld [wPartyMenuAnimMonEnabled],a - ld a,[wCurrentMenuItem] - ld [wPartyAndBillsPCSavedMenuItem],a - ld hl,wd730 - res 6,[hl] ; turn on letter printing delay - ld a,[wMenuItemToSwap] + ld [wPartyMenuAnimMonEnabled], a + ld a, [wCurrentMenuItem] + ld [wPartyAndBillsPCSavedMenuItem], a + ld hl, wd730 + res 6, [hl] ; turn on letter printing delay + ld a, [wMenuItemToSwap] and a - jp nz,.swappingPokemon + jp nz, .swappingPokemon pop af - ld [hTilesetType],a - bit 1,b - jr nz,.noPokemonChosen - ld a,[wPartyCount] + ld [hTilesetType], a + bit 1, b + jr nz, .noPokemonChosen + ld a, [wPartyCount] and a - jr z,.noPokemonChosen - ld a,[wCurrentMenuItem] - ld [wWhichPokemon],a - ld hl,wPartySpecies - ld b,0 - ld c,a - add hl,bc - ld a,[hl] - ld [wcf91],a - ld [wBattleMonSpecies2],a + jr z, .noPokemonChosen + ld a, [wCurrentMenuItem] + ld [wWhichPokemon], a + ld hl, wPartySpecies + ld b, 0 + ld c, a + add hl, bc + ld a, [hl] + ld [wcf91], a + ld [wBattleMonSpecies2], a call BankswitchBack and a ret @@ -445,18 +445,18 @@ HandlePartyMenuInput:: scf ret .swappingPokemon - bit 1,b ; was the B button pressed? - jr z,.handleSwap ; if not, handle swapping the pokemon + bit 1, b ; was the B button pressed? + jr z, .handleSwap ; if not, handle swapping the pokemon .cancelSwap ; if the B button was pressed callba ErasePartyMenuCursors xor a - ld [wMenuItemToSwap],a - ld [wPartyMenuTypeOrMessageID],a + ld [wMenuItemToSwap], a + ld [wPartyMenuTypeOrMessageID], a call RedrawPartyMenu jr HandlePartyMenuInput .handleSwap - ld a,[wCurrentMenuItem] - ld [wWhichPokemon],a + ld a, [wCurrentMenuItem] + ld [wWhichPokemon], a callba SwitchPartyMon jr HandlePartyMenuInput @@ -479,33 +479,33 @@ PrintStatusCondition:: push de dec de dec de ; de = address of current HP - ld a,[de] - ld b,a + ld a, [de] + ld b, a dec de - ld a,[de] + ld a, [de] or b ; is the pokemon's HP zero? pop de - jr nz,PrintStatusConditionNotFainted + jr nz, PrintStatusConditionNotFainted ; if the pokemon's HP is 0, print "FNT" - ld a,"F" - ld [hli],a - ld a,"N" - ld [hli],a - ld [hl],"T" + ld a, "F" + ld [hli], a + ld a, "N" + ld [hli], a + ld [hl], "T" and a ret PrintStatusConditionNotFainted: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(PrintStatusAilment) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, BANK(PrintStatusAilment) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call PrintStatusAilment ; print status condition pop bc - ld a,b - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, b + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; function to print pokemon level, leaving off the ":L" if the level is at least 100 @@ -513,12 +513,12 @@ PrintStatusConditionNotFainted: ; hl = destination address ; [wLoadedMonLevel] = level PrintLevel:: - ld a,$6e ; ":L" tile ID - ld [hli],a - ld c,2 ; number of digits - ld a,[wLoadedMonLevel] ; level + ld a, $6e ; ":L" tile ID + ld [hli], a + ld c, 2 ; number of digits + ld a, [wLoadedMonLevel] ; level cp 100 - jr c,PrintLevelCommon + jr c, PrintLevelCommon ; if level at least 100, write over the ":L" tile dec hl inc c ; increment number of digits to 3 @@ -529,105 +529,105 @@ PrintLevel:: ; hl = destination address ; [wLoadedMonLevel] = level PrintLevelFull:: - ld a,$6e ; ":L" tile ID - ld [hli],a - ld c,3 ; number of digits - ld a,[wLoadedMonLevel] ; level + ld a, $6e ; ":L" tile ID + ld [hli], a + ld c, 3 ; number of digits + ld a, [wLoadedMonLevel] ; level PrintLevelCommon:: - ld [wd11e],a - ld de,wd11e - ld b,LEFT_ALIGN | 1 ; 1 byte + ld [wd11e], a + ld de, wd11e + ld b, LEFT_ALIGN | 1 ; 1 byte jp PrintNumber GetwMoves:: ; Unused. Returns the move at index a from wMoves in a - ld hl,wMoves - ld c,a - ld b,0 - add hl,bc - ld a,[hl] + ld hl, wMoves + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] ret ; copies the base stat data of a pokemon to wMonHeader ; INPUT: ; [wd0b5] = pokemon ID GetMonHeader:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(BaseStats) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, BANK(BaseStats) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a push bc push de push hl - ld a,[wd11e] + ld a, [wd11e] push af - ld a,[wd0b5] - ld [wd11e],a - ld de,FossilKabutopsPic - ld b,$66 ; size of Kabutops fossil and Ghost sprites + ld a, [wd0b5] + ld [wd11e], a + ld de, FossilKabutopsPic + ld b, $66 ; size of Kabutops fossil and Ghost sprites cp FOSSIL_KABUTOPS ; Kabutops fossil - jr z,.specialID - ld de,GhostPic + jr z, .specialID + ld de, GhostPic cp MON_GHOST ; Ghost - jr z,.specialID - ld de,FossilAerodactylPic - ld b,$77 ; size of Aerodactyl fossil sprite + jr z, .specialID + ld de, FossilAerodactylPic + ld b, $77 ; size of Aerodactyl fossil sprite cp FOSSIL_AERODACTYL ; Aerodactyl fossil - jr z,.specialID - cp a,MEW - jr z,.mew + jr z, .specialID + cp MEW + jr z, .mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number - ld a,[wd11e] + ld a, [wd11e] dec a ld bc, MonBaseStatsEnd - MonBaseStats - ld hl,BaseStats + ld hl, BaseStats call AddNTimes - ld de,wMonHeader + ld de, wMonHeader ld bc, MonBaseStatsEnd - MonBaseStats call CopyData jr .done .specialID - ld hl,wMonHSpriteDim - ld [hl],b ; write sprite dimensions + ld hl, wMonHSpriteDim + ld [hl], b ; write sprite dimensions inc hl - ld [hl],e ; write front sprite pointer + ld [hl], e ; write front sprite pointer inc hl - ld [hl],d + ld [hl], d jr .done .mew - ld hl,MewBaseStats - ld de,wMonHeader - ld bc,MonBaseStatsEnd - MonBaseStats - ld a,BANK(MewBaseStats) + ld hl, MewBaseStats + ld de, wMonHeader + ld bc, MonBaseStatsEnd - MonBaseStats + ld a, BANK(MewBaseStats) call FarCopyData .done - ld a,[wd0b5] - ld [wMonHIndex],a + ld a, [wd0b5] + ld [wMonHIndex], a pop af - ld [wd11e],a + ld [wd11e], a pop hl pop de pop bc pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; copy party pokemon's name to wcd6d GetPartyMonName2:: - ld a,[wWhichPokemon] ; index within party - ld hl,wPartyMonNicks + ld a, [wWhichPokemon] ; index within party + ld hl, wPartyMonNicks ; this is called more often GetPartyMonName:: push hl push bc call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times - ld de,wcd6d + ld de, wcd6d push de - ld bc,NAME_LENGTH + ld bc, NAME_LENGTH call CopyData pop de pop bc @@ -648,38 +648,38 @@ GetPartyMonName:: ; Note that bits 5 and 7 are modified during execution. The above reflects ; their meaning at the beginning of the functions's execution. PrintBCDNumber:: - ld b,c ; save flags in b - res 7,c - res 6,c - res 5,c ; c now holds the length - bit 5,b - jr z,.loop - bit 7,b - jr nz,.loop - ld [hl],"¥" + ld b, c ; save flags in b + res 7, c + res 6, c + res 5, c ; c now holds the length + bit 5, b + jr z, .loop + bit 7, b + jr nz, .loop + ld [hl], "¥" inc hl .loop - ld a,[de] + ld a, [de] swap a call PrintBCDDigit ; print upper digit - ld a,[de] + ld a, [de] call PrintBCDDigit ; print lower digit inc de dec c - jr nz,.loop - bit 7,b ; were any non-zero digits printed? - jr z,.done ; if so, we are done + jr nz, .loop + bit 7, b ; were any non-zero digits printed? + jr z, .done ; if so, we are done .numberEqualsZero ; if every digit of the BCD number is zero - bit 6,b ; left or right alignment? - jr nz,.skipRightAlignmentAdjustment + bit 6, b ; left or right alignment? + jr nz, .skipRightAlignmentAdjustment dec hl ; if the string is right-aligned, it needs to be moved back one space .skipRightAlignmentAdjustment - bit 5,b - jr z,.skipCurrencySymbol - ld [hl],"¥" + bit 5, b + jr z, .skipCurrencySymbol + ld [hl], "¥" inc hl .skipCurrencySymbol - ld [hl],"0" + ld [hl], "0" call PrintLetterDelay inc hl .done @@ -688,26 +688,26 @@ PrintBCDNumber:: PrintBCDDigit:: and $f and a - jr z,.zeroDigit + jr z, .zeroDigit .nonzeroDigit - bit 7,b ; have any non-space characters been printed? - jr z,.outputDigit + bit 7, b ; have any non-space characters been printed? + jr z, .outputDigit ; if bit 7 is set, then no numbers have been printed yet - bit 5,b ; print the currency symbol? - jr z,.skipCurrencySymbol - ld [hl],"¥" + bit 5, b ; print the currency symbol? + jr z, .skipCurrencySymbol + ld [hl], "¥" inc hl - res 5,b + res 5, b .skipCurrencySymbol - res 7,b ; unset 7 to indicate that a nonzero digit has been reached + res 7, b ; unset 7 to indicate that a nonzero digit has been reached .outputDigit add "0" - ld [hli],a + ld [hli], a jp PrintLetterDelay .zeroDigit - bit 7,b ; either printing leading zeroes or already reached a nonzero digit? - jr z,.outputDigit ; if so, print a zero digit - bit 6,b ; left or right alignment? + bit 7, b ; either printing leading zeroes or already reached a nonzero digit? + jr z, .outputDigit ; if so, print a zero digit + bit 6, b ; left or right alignment? ret nz inc hl ; if right-aligned, "print" a space by advancing the pointer ret @@ -716,12 +716,12 @@ PrintBCDDigit:: ; assumes the corresponding mon header is already loaded ; hl contains offset to sprite pointer ($b for front or $d for back) UncompressMonSprite:: - ld bc,wMonHeader - add hl,bc - ld a,[hli] - ld [wSpriteInputPtr],a ; fetch sprite input pointer - ld a,[hl] - ld [wSpriteInputPtr+1],a + ld bc, wMonHeader + add hl, bc + ld a, [hli] + ld [wSpriteInputPtr], a ; fetch sprite input pointer + ld a, [hl] + ld [wSpriteInputPtr+1], a ; define (by index number) the bank that a pokemon's image is in ; index = Mew, bank 1 ; index = Kabutops fossil, bank $B @@ -730,32 +730,32 @@ UncompressMonSprite:: ; $4A ≤ index < $74, bank $B ; $74 ≤ index < $99, bank $C ; $99 ≤ index, bank $D - ld a,[wcf91] ; XXX name for this ram location - ld b,a + ld a, [wcf91] ; XXX name for this ram location + ld b, a cp MEW - ld a,BANK(MewPicFront) - jr z,.GotBank - ld a,b + ld a, BANK(MewPicFront) + jr z, .GotBank + ld a, b cp FOSSIL_KABUTOPS - ld a,BANK(FossilKabutopsPic) - jr z,.GotBank - ld a,b + ld a, BANK(FossilKabutopsPic) + jr z, .GotBank + ld a, b cp TANGELA + 1 - ld a,BANK(TangelaPicFront) - jr c,.GotBank - ld a,b + ld a, BANK(TangelaPicFront) + jr c, .GotBank + ld a, b cp MOLTRES + 1 - ld a,BANK(MoltresPicFront) - jr c,.GotBank - ld a,b + ld a, BANK(MoltresPicFront) + jr c, .GotBank + ld a, b cp BEEDRILL + 2 - ld a,BANK(BeedrillPicFront) - jr c,.GotBank - ld a,b + ld a, BANK(BeedrillPicFront) + jr c, .GotBank + ld a, b cp STARMIE + 1 - ld a,BANK(StarmiePicFront) - jr c,.GotBank - ld a,BANK(VictreebelPicFront) + ld a, BANK(StarmiePicFront) + jr c, .GotBank + ld a, BANK(VictreebelPicFront) .GotBank jp UncompressSpriteData @@ -942,7 +942,7 @@ INCLUDE "data/mart_inventories.asm" TextScriptEndingChar:: db "@" TextScriptEnd:: - ld hl,TextScriptEndingChar + ld hl, TextScriptEndingChar ret ExclamationText:: @@ -1047,41 +1047,41 @@ FadeOutAudio:: ; this function is used to display sign messages, sprite dialog, etc. ; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID DisplayTextID:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af callba DisplayTextIDInit ; initialization - ld hl,wTextPredefFlag - bit 0,[hl] - res 0,[hl] - jr nz,.skipSwitchToMapBank - ld a,[wCurMap] + ld hl, wTextPredefFlag + bit 0, [hl] + res 0, [hl] + jr nz, .skipSwitchToMapBank + ld a, [wCurMap] call SwitchToMapRomBank .skipSwitchToMapBank - ld a,30 ; half a second - ld [H_FRAMECOUNTER],a ; used as joypad poll timer - ld hl,wMapTextPtr - ld a,[hli] - ld h,[hl] - ld l,a ; hl = map text pointer - ld d,$00 - ld a,[hSpriteIndexOrTextID] ; text ID - ld [wSpriteIndex],a + ld a, 30 ; half a second + ld [H_FRAMECOUNTER], a ; used as joypad poll timer + ld hl, wMapTextPtr + ld a, [hli] + ld h, [hl] + ld l, a ; hl = map text pointer + ld d, $00 + ld a, [hSpriteIndexOrTextID] ; text ID + ld [wSpriteIndex], a and a - jp z,DisplayStartMenu + jp z, DisplayStartMenu cp TEXT_SAFARI_GAME_OVER - jp z,DisplaySafariGameOverText + jp z, DisplaySafariGameOverText cp TEXT_MON_FAINTED - jp z,DisplayPokemonFaintedText + jp z, DisplayPokemonFaintedText cp TEXT_BLACKED_OUT - jp z,DisplayPlayerBlackedOutText + jp z, DisplayPlayerBlackedOutText cp TEXT_REPEL_WORE_OFF - jp z,DisplayRepelWoreOffText - ld a,[wNumSprites] - ld e,a - ld a,[hSpriteIndexOrTextID] ; sprite ID + jp z, DisplayRepelWoreOffText + ld a, [wNumSprites] + ld e, a + ld a, [hSpriteIndexOrTextID] ; sprite ID cp e - jr z,.spriteHandling - jr nc,.skipSpriteHandling + jr z, .spriteHandling + jr nc, .skipSpriteHandling .spriteHandling ; get the text ID of the sprite push hl @@ -1090,123 +1090,123 @@ DisplayTextID:: callba UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction) pop bc pop de - ld hl,wMapSpriteData ; NPC text entries - ld a,[hSpriteIndexOrTextID] + ld hl, wMapSpriteData ; NPC text entries + ld a, [hSpriteIndexOrTextID] dec a add a add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry inc hl - ld a,[hl] ; a = text ID of the sprite + ld a, [hl] ; a = text ID of the sprite pop hl .skipSpriteHandling ; look up the address of the text in the map's text entries dec a - ld e,a + ld e, a sla e - add hl,de - ld a,[hli] - ld h,[hl] - ld l,a ; hl = address of the text - ld a,[hl] ; a = first byte of text + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a ; hl = address of the text + ld a, [hl] ; a = first byte of text ; check first byte of text for special cases cp $fe ; Pokemart NPC - jp z,DisplayPokemartDialogue + jp z, DisplayPokemartDialogue cp $ff ; Pokemon Center NPC - jp z,DisplayPokemonCenterDialogue + jp z, DisplayPokemonCenterDialogue cp $fc ; Item Storage PC - jp z,FuncTX_ItemStoragePC + jp z, FuncTX_ItemStoragePC cp $fd ; Bill's PC - jp z,FuncTX_BillsPC + jp z, FuncTX_BillsPC cp $f9 ; Pokemon Center PC - jp z,FuncTX_PokemonCenterPC + jp z, FuncTX_PokemonCenterPC cp $f5 ; Vending Machine - jr nz,.notVendingMachine + jr nz, .notVendingMachine callba VendingMachineMenu ; jump banks to vending machine routine jr AfterDisplayingTextID .notVendingMachine cp $f7 ; prize menu jp z, FuncTX_GameCornerPrizeMenu cp $f6 ; cable connection NPC in Pokemon Center - jr nz,.notSpecialCase + jr nz, .notSpecialCase callab CableClubNPC jr AfterDisplayingTextID .notSpecialCase call PrintText_NoCreatingTextBox ; display the text - ld a,[wDoNotWaitForButtonPressAfterDisplayingText] + ld a, [wDoNotWaitForButtonPressAfterDisplayingText] and a - jr nz,HoldTextDisplayOpen + jr nz, HoldTextDisplayOpen AfterDisplayingTextID:: - ld a,[wEnteringCableClub] + ld a, [wEnteringCableClub] and a - jr nz,HoldTextDisplayOpen + jr nz, HoldTextDisplayOpen call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text ; loop to hold the dialogue box open as long as the player keeps holding down the A button HoldTextDisplayOpen:: call Joypad - ld a,[hJoyHeld] - bit 0,a ; is the A button being pressed? - jr nz,HoldTextDisplayOpen + ld a, [hJoyHeld] + bit 0, a ; is the A button being pressed? + jr nz, HoldTextDisplayOpen CloseTextDisplay:: - ld a,[wCurMap] + ld a, [wCurMap] call SwitchToMapRomBank - ld a,$90 - ld [hWY],a ; move the window off the screen + ld a, $90 + ld [hWY], a ; move the window off the screen call DelayFrame call LoadGBPal xor a - ld [H_AUTOBGTRANSFERENABLED],a ; disable continuous WRAM to VRAM transfer each V-blank + ld [H_AUTOBGTRANSFERENABLED], a ; disable continuous WRAM to VRAM transfer each V-blank ; loop to make sprites face the directions they originally faced before the dialogue - ld hl,wSpriteStateData2 + $19 - ld c,$0f - ld de,$0010 + ld hl, wSpriteStateData2 + $19 + ld c, $0f + ld de, $0010 .restoreSpriteFacingDirectionLoop - ld a,[hl] + ld a, [hl] dec h - ld [hl],a + ld [hl], a inc h - add hl,de + add hl, de dec c - jr nz,.restoreSpriteFacingDirectionLoop - ld a,BANK(InitMapSprites) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + jr nz, .restoreSpriteFacingDirectionLoop + ld a, BANK(InitMapSprites) + ld [H_LOADEDROMBANK], 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] - ld a,[wd732] - bit 3,a ; used fly warp - call z,LoadPlayerSpriteGraphics + ld hl, wFontLoaded + res 0, [hl] + ld a, [wd732] + bit 3, a ; used fly warp + call z, LoadPlayerSpriteGraphics call LoadCurrentMapView pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a jp UpdateSprites DisplayPokemartDialogue:: push hl - ld hl,PokemartGreetingText + ld hl, PokemartGreetingText call PrintText pop hl inc hl call LoadItemList - ld a,PRICEDITEMLISTMENU - ld [wListMenuID],a - ld a,[H_LOADEDROMBANK] + ld a, PRICEDITEMLISTMENU + ld [wListMenuID], a + ld a, [H_LOADEDROMBANK] push af - ld a,Bank(DisplayPokemartDialogue_) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, Bank(DisplayPokemartDialogue_) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call DisplayPokemartDialogue_ pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a jp AfterDisplayingTextID PokemartGreetingText:: @@ -1214,38 +1214,38 @@ PokemartGreetingText:: db "@" LoadItemList:: - ld a,1 - ld [wUpdateSpritesEnabled],a - ld a,h - ld [wItemListPointer],a - ld a,l - ld [wItemListPointer + 1],a - ld de,wItemList + ld a, 1 + ld [wUpdateSpritesEnabled], a + ld a, h + ld [wItemListPointer], a + ld a, l + ld [wItemListPointer + 1], a + ld de, wItemList .loop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de cp $ff - jr nz,.loop + jr nz, .loop ret DisplayPokemonCenterDialogue:: ; zeroing these doesn't appear to serve any purpose xor a - ld [$ff8b],a - ld [$ff8c],a - ld [$ff8d],a + ld [$ff8b], a + ld [$ff8c], a + ld [$ff8d], a inc hl - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,Bank(DisplayPokemonCenterDialogue_) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, Bank(DisplayPokemonCenterDialogue_) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call DisplayPokemonCenterDialogue_ pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a jp AfterDisplayingTextID DisplaySafariGameOverText:: @@ -1253,7 +1253,7 @@ DisplaySafariGameOverText:: jp AfterDisplayingTextID DisplayPokemonFaintedText:: - ld hl,PokemonFaintedText + ld hl, PokemonFaintedText call PrintText jp AfterDisplayingTextID @@ -1262,11 +1262,11 @@ PokemonFaintedText:: db "@" DisplayPlayerBlackedOutText:: - ld hl,PlayerBlackedOutText + ld hl, PlayerBlackedOutText call PrintText - ld a,[wd732] - res 5,a ; reset forced to use bike bit - ld [wd732],a + ld a, [wd732] + res 5, a ; reset forced to use bike bit + ld [wd732], a jp HoldTextDisplayOpen PlayerBlackedOutText:: @@ -1274,7 +1274,7 @@ PlayerBlackedOutText:: db "@" DisplayRepelWoreOffText:: - ld hl,RepelWoreOffText + ld hl, RepelWoreOffText call PrintText jp AfterDisplayingTextID @@ -1291,22 +1291,22 @@ INCLUDE "engine/menu/start_menu.asm" ; OUTPUT: ; [wNumSetBits] = number of set bits CountSetBits:: - ld c,0 + ld c, 0 .loop - ld a,[hli] - ld e,a - ld d,8 + ld a, [hli] + ld e, a + ld d, 8 .innerLoop ; count how many bits are set in the current byte srl e - ld a,0 + ld a, 0 adc c - ld c,a + ld c, a dec d - jr nz,.innerLoop + jr nz, .innerLoop dec b - jr nz,.loop - ld a,c - ld [wNumSetBits],a + jr nz, .loop + ld a, c + ld [wNumSetBits], a ret ; subtracts the amount the player paid from their money @@ -1316,12 +1316,12 @@ SubtractAmountPaidFromMoney:: ; adds the amount the player sold to their money AddAmountSoldToMoney:: - ld de,wPlayerMoney + 2 - ld hl,$ffa1 ; total price of items - ld c,3 ; length of money in bytes + ld de, wPlayerMoney + 2 + ld hl, $ffa1 ; total price of items + ld c, 3 ; length of money in bytes predef AddBCDPredef ; add total price to money - ld a,MONEY_BOX - ld [wTextBoxID],a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID ; redraw money text box ld a, SFX_PURCHASE call PlaySoundWaitForCurrent @@ -1333,15 +1333,15 @@ AddAmountSoldToMoney:: ; [wWhichPokemon] = index (within the inventory) of the item to remove ; [wItemQuantity] = quantity to remove RemoveItemFromInventory:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(RemoveItemFromInventory_) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, BANK(RemoveItemFromInventory_) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call RemoveItemFromInventory_ pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; function to add an item (in varying quantities) to the player's bag or PC box @@ -1352,16 +1352,16 @@ RemoveItemFromInventory:: ; sets carry flag if successful, unsets carry flag if unsuccessful AddItemToInventory:: push bc - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(AddItemToInventory_) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, BANK(AddItemToInventory_) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call AddItemToInventory_ pop bc - ld a,b - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, b + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a pop bc ret @@ -1370,80 +1370,80 @@ AddItemToInventory:: ; [wListPointer] = address of the list (2 bytes) DisplayListMenuID:: xor a - ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer - ld a,1 - ld [hJoy7],a ; joypad state update flag - ld a,[wBattleType] + ld [H_AUTOBGTRANSFERENABLED], a ; disable auto-transfer + ld a, 1 + ld [hJoy7], a ; joypad state update flag + ld a, [wBattleType] and a ; is it the Old Man battle? - jr nz,.specialBattleType - ld a,$01 ; hardcoded bank + jr nz, .specialBattleType + ld a, $01 ; hardcoded bank jr .bankswitch .specialBattleType ; Old Man battle ld a, BANK(DisplayBattleMenu) .bankswitch call BankswitchHome - ld hl,wd730 - set 6,[hl] ; turn off letter printing delay + ld hl, wd730 + set 6, [hl] ; turn off letter printing delay xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped - ld [wListCount],a - ld a,[wListPointer] - ld l,a - ld a,[wListPointer + 1] - ld h,a ; hl = address of the list - 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 + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped + ld [wListCount], a + ld a, [wListPointer] + ld l, a + ld a, [wListPointer + 1] + ld h, a ; hl = address of the list + 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 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 lb de, 9, 14 ; height and width of menu text box - ld a,[wListMenuID] + ld a, [wListMenuID] and a ; is it a PC pokemon list? - jr nz,.skipMovingSprites + jr nz, .skipMovingSprites call UpdateSprites .skipMovingSprites - ld a,1 ; max menu item ID is 1 if the list has less than 2 entries - ld [wMenuWatchMovingOutOfBounds],a - ld a,[wListCount] + ld a, 1 ; max menu item ID is 1 if the list has less than 2 entries + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wListCount] cp 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 + jr c, .setMenuVariables + ld a, 2 ; max menu item ID is 2 if the list has at least 2 entries .setMenuVariables - ld [wMaxMenuItem],a - ld a,4 - ld [wTopMenuItemY],a - ld a,5 - ld [wTopMenuItemX],a - ld a,A_BUTTON | B_BUTTON | SELECT - ld [wMenuWatchedKeys],a - ld c,10 + ld [wMaxMenuItem], a + ld a, 4 + ld [wTopMenuItemY], a + ld a, 5 + ld [wTopMenuItemX], a + ld a, A_BUTTON | B_BUTTON | SELECT + ld [wMenuWatchedKeys], a + ld c, 10 call DelayFrames DisplayListMenuIDLoop:: xor a - ld [H_AUTOBGTRANSFERENABLED],a ; disable transfer + ld [H_AUTOBGTRANSFERENABLED], a ; disable transfer call PrintListMenuEntries - ld a,1 - ld [H_AUTOBGTRANSFERENABLED],a ; enable transfer + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a ; enable transfer call Delay3 - ld a,[wBattleType] + ld a, [wBattleType] and a ; is it the Old Man battle? - jr z,.notOldManBattle + jr z, .notOldManBattle .oldManBattle - ld a,"▶" + ld a, "▶" Coorda 5, 4 ; place menu cursor in front of first menu entry - ld c,80 + ld c, 80 call DelayFrames xor a - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a coord hl, 5, 4 - ld a,l - ld [wMenuCursorLocation],a - ld a,h - ld [wMenuCursorLocation + 1],a + ld a, l + ld [wMenuCursorLocation], a + ld a, h + ld [wMenuCursorLocation + 1], a jr .buttonAPressed .notOldManBattle call LoadGBPal @@ -1451,231 +1451,231 @@ DisplayListMenuIDLoop:: push af call PlaceMenuCursor pop af - bit 0,a ; was the A button pressed? - jp z,.checkOtherKeys + bit 0, a ; was the A button pressed? + jp z, .checkOtherKeys .buttonAPressed - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] call PlaceUnfilledArrowMenuCursor ; pointless because both values are overwritten before they are read - ld a,$01 - ld [wMenuExitMethod],a - ld [wChosenMenuItem],a + ld a, $01 + ld [wMenuExitMethod], a + ld [wChosenMenuItem], a xor a - ld [wMenuWatchMovingOutOfBounds],a - ld a,[wCurrentMenuItem] - ld c,a - ld a,[wListScrollOffset] + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wCurrentMenuItem] + ld c, a + ld a, [wListScrollOffset] add c - ld c,a - ld a,[wListCount] + ld c, a + ld a, [wListCount] and a ; is the list empty? - jp z,ExitListMenu ; if so, exit the menu + jp z, ExitListMenu ; if so, exit the menu dec a cp c ; did the player select Cancel? - jp c,ExitListMenu ; if so, exit the menu - ld a,c - ld [wWhichPokemon],a - ld a,[wListMenuID] + jp c, ExitListMenu ; if so, exit the menu + ld a, c + ld [wWhichPokemon], a + ld a, [wListMenuID] cp ITEMLISTMENU - jr nz,.skipMultiplying + jr nz, .skipMultiplying ; if it's an item menu sla c ; item entries are 2 bytes long, so multiply by 2 .skipMultiplying - ld a,[wListPointer] - ld l,a - ld a,[wListPointer + 1] - ld h,a + ld a, [wListPointer] + ld l, a + ld a, [wListPointer + 1] + ld h, a inc hl ; hl = beginning of list entries - ld b,0 - add hl,bc - ld a,[hl] - ld [wcf91],a - ld a,[wListMenuID] + ld b, 0 + add hl, bc + ld a, [hl] + ld [wcf91], a + ld a, [wListMenuID] and a ; is it a PC pokemon list? - jr z,.pokemonList + jr z, .pokemonList push hl call GetItemPrice pop hl - ld a,[wListMenuID] + ld a, [wListMenuID] cp ITEMLISTMENU - jr nz,.skipGettingQuantity + jr nz, .skipGettingQuantity ; if it's an item menu inc hl - ld a,[hl] ; a = item quantity - ld [wMaxItemQuantity],a + ld a, [hl] ; a = item quantity + ld [wMaxItemQuantity], a .skipGettingQuantity - ld a,[wcf91] - ld [wd0b5],a - ld a,BANK(ItemNames) - ld [wPredefBank],a + ld a, [wcf91] + ld [wd0b5], a + ld a, BANK(ItemNames) + ld [wPredefBank], a call GetName jr .storeChosenEntry .pokemonList - ld hl,wPartyCount - ld a,[wListPointer] + ld hl, wPartyCount + ld a, [wListPointer] cp l ; is it a list of party pokemon or box pokemon? - ld hl,wPartyMonNicks - jr z,.getPokemonName + ld hl, wPartyMonNicks + jr z, .getPokemonName ld hl, wBoxMonNicks ; box pokemon names .getPokemonName - ld a,[wWhichPokemon] + ld a, [wWhichPokemon] call GetPartyMonName .storeChosenEntry ; store the menu entry that the player chose and return - ld de,wcd6d + ld de, wcd6d call CopyStringToCF4B ; copy name to wcf4b - ld a,CHOSE_MENU_ITEM - ld [wMenuExitMethod],a - ld a,[wCurrentMenuItem] - ld [wChosenMenuItem],a + ld a, CHOSE_MENU_ITEM + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a xor a - ld [hJoy7],a ; joypad state update flag - ld hl,wd730 - res 6,[hl] ; turn on letter printing delay + ld [hJoy7], a ; joypad state update flag + ld hl, wd730 + res 6, [hl] ; turn on letter printing delay jp BankswitchBack .checkOtherKeys ; check B, SELECT, Up, and Down keys - bit 1,a ; was the B button pressed? - jp nz,ExitListMenu ; if so, exit the menu - bit 2,a ; was the select button pressed? - jp nz,HandleItemListSwapping ; if so, allow the player to swap menu entries - ld b,a - bit 7,b ; was Down pressed? - ld hl,wListScrollOffset - jr z,.upPressed + bit 1, a ; was the B button pressed? + jp nz, ExitListMenu ; if so, exit the menu + bit 2, a ; was the select button pressed? + jp nz, HandleItemListSwapping ; if so, allow the player to swap menu entries + ld b, a + bit 7, b ; was Down pressed? + ld hl, wListScrollOffset + jr z, .upPressed .downPressed - ld a,[hl] + ld a, [hl] add 3 - ld b,a - ld a,[wListCount] + ld b, a + ld a, [wListCount] cp b ; will going down scroll past the Cancel button? - jp c,DisplayListMenuIDLoop + jp c, DisplayListMenuIDLoop inc [hl] ; if not, go down jp DisplayListMenuIDLoop .upPressed - ld a,[hl] + ld a, [hl] and a - jp z,DisplayListMenuIDLoop + jp z, DisplayListMenuIDLoop dec [hl] jp DisplayListMenuIDLoop DisplayChooseQuantityMenu:: ; text box dimensions/coordinates for just quantity coord hl, 15, 9 - ld b,1 ; height - ld c,3 ; width - ld a,[wListMenuID] + ld b, 1 ; height + ld c, 3 ; width + ld a, [wListMenuID] cp PRICEDITEMLISTMENU - jr nz,.drawTextBox + jr nz, .drawTextBox ; text box dimensions/coordinates for quantity and price coord hl, 7, 9 - ld b,1 ; height - ld c,11 ; width + ld b, 1 ; height + ld c, 11 ; width .drawTextBox call TextBoxBorder coord hl, 16, 10 - ld a,[wListMenuID] + ld a, [wListMenuID] cp PRICEDITEMLISTMENU - jr nz,.printInitialQuantity + jr nz, .printInitialQuantity coord hl, 8, 10 .printInitialQuantity - ld de,InitialQuantityText + ld de, InitialQuantityText call PlaceString xor a - ld [wItemQuantity],a ; initialize current quantity to 0 + ld [wItemQuantity], a ; initialize current quantity to 0 jp .incrementQuantity .waitForKeyPressLoop call JoypadLowSensitivity - ld a,[hJoyPressed] ; newly pressed buttons - bit 0,a ; was the A button pressed? - jp nz,.buttonAPressed - bit 1,a ; was the B button pressed? - jp nz,.buttonBPressed - bit 6,a ; was Up pressed? - jr nz,.incrementQuantity - bit 7,a ; was Down pressed? - jr nz,.decrementQuantity + ld a, [hJoyPressed] ; newly pressed buttons + bit 0, a ; was the A button pressed? + jp nz, .buttonAPressed + bit 1, a ; was the B button pressed? + jp nz, .buttonBPressed + bit 6, a ; was Up pressed? + jr nz, .incrementQuantity + bit 7, a ; was Down pressed? + jr nz, .decrementQuantity jr .waitForKeyPressLoop .incrementQuantity - ld a,[wMaxItemQuantity] + ld a, [wMaxItemQuantity] inc a - ld b,a - ld hl,wItemQuantity ; current quantity + ld b, a + ld hl, wItemQuantity ; current quantity inc [hl] - ld a,[hl] + ld a, [hl] cp b - jr nz,.handleNewQuantity + jr nz, .handleNewQuantity ; wrap to 1 if the player goes above the max quantity - ld a,1 - ld [hl],a + ld a, 1 + ld [hl], a jr .handleNewQuantity .decrementQuantity - ld hl,wItemQuantity ; current quantity + ld hl, wItemQuantity ; current quantity dec [hl] - jr nz,.handleNewQuantity + jr nz, .handleNewQuantity ; wrap to the max quantity if the player goes below 1 - ld a,[wMaxItemQuantity] - ld [hl],a + ld a, [wMaxItemQuantity] + ld [hl], a .handleNewQuantity coord hl, 17, 10 - ld a,[wListMenuID] + ld a, [wListMenuID] cp PRICEDITEMLISTMENU - jr nz,.printQuantity + jr nz, .printQuantity .printPrice - ld c,$03 - ld a,[wItemQuantity] - ld b,a - ld hl,hMoney ; total price + ld c, $03 + ld a, [wItemQuantity] + ld b, a + ld hl, hMoney ; total price ; initialize total price to 0 xor a - ld [hli],a - ld [hli],a - ld [hl],a + ld [hli], a + ld [hli], a + ld [hl], a .addLoop ; loop to multiply the individual price by the quantity to get the total price - ld de,hMoney + 2 - ld hl,hItemPrice + 2 + ld de, hMoney + 2 + ld hl, hItemPrice + 2 push bc predef AddBCDPredef ; add the individual price to the current sum pop bc dec b - jr nz,.addLoop - ld a,[hHalveItemPrices] + jr nz, .addLoop + ld a, [hHalveItemPrices] and a ; should the price be halved (for selling items)? - jr z,.skipHalvingPrice + jr z, .skipHalvingPrice xor a - ld [hDivideBCDDivisor],a - ld [hDivideBCDDivisor + 1],a - ld a,$02 - ld [hDivideBCDDivisor + 2],a + ld [hDivideBCDDivisor], a + ld [hDivideBCDDivisor + 1], a + ld a, $02 + ld [hDivideBCDDivisor + 2], a predef DivideBCDPredef3 ; halves the price ; store the halved price - ld a,[hDivideBCDQuotient] - ld [hMoney],a - ld a,[hDivideBCDQuotient + 1] - ld [hMoney + 1],a - ld a,[hDivideBCDQuotient + 2] - ld [hMoney + 2],a + ld a, [hDivideBCDQuotient] + ld [hMoney], a + ld a, [hDivideBCDQuotient + 1] + ld [hMoney + 1], a + ld a, [hDivideBCDQuotient + 2] + ld [hMoney + 2], a .skipHalvingPrice coord hl, 12, 10 - ld de,SpacesBetweenQuantityAndPriceText + ld de, SpacesBetweenQuantityAndPriceText call PlaceString - ld de,hMoney ; total price - ld c,$a3 + ld de, hMoney ; total price + ld c, $a3 call PrintBCDNumber coord hl, 9, 10 .printQuantity - ld de,wItemQuantity ; current quantity + ld de, wItemQuantity ; current quantity lb bc, LEADING_ZEROES | 1, 2 ; 1 byte, 2 digits call PrintNumber jp .waitForKeyPressLoop .buttonAPressed ; the player chose to make the transaction xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped ret .buttonBPressed ; the player chose to cancel the transaction xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped - ld a,$ff + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped + ld a, $ff ret InitialQuantityText:: @@ -1685,84 +1685,84 @@ SpacesBetweenQuantityAndPriceText:: db " @" ExitListMenu:: - ld a,[wCurrentMenuItem] - ld [wChosenMenuItem],a - ld a,CANCELLED_MENU - ld [wMenuExitMethod],a - ld [wMenuWatchMovingOutOfBounds],a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + ld [wMenuWatchMovingOutOfBounds], a xor a - ld [hJoy7],a - ld hl,wd730 - res 6,[hl] + ld [hJoy7], a + ld hl, wd730 + res 6, [hl] call BankswitchBack xor a - ld [wMenuItemToSwap],a ; 0 means no item is currently being swapped + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped scf ret PrintListMenuEntries:: coord hl, 5, 3 - ld b,9 - ld c,14 + ld b, 9 + ld c, 14 call ClearScreenArea - ld a,[wListPointer] - ld e,a - ld a,[wListPointer + 1] - ld d,a + ld a, [wListPointer] + ld e, a + ld a, [wListPointer + 1] + ld d, a inc de ; de = beginning of list entries - ld a,[wListScrollOffset] - ld c,a - ld a,[wListMenuID] + ld a, [wListScrollOffset] + ld c, a + ld a, [wListMenuID] cp ITEMLISTMENU - ld a,c - jr nz,.skipMultiplying + ld a, c + jr nz, .skipMultiplying ; if it's an item menu ; item entries are 2 bytes long, so multiply by 2 sla a sla c .skipMultiplying add e - ld e,a - jr nc,.noCarry + ld e, a + jr nc, .noCarry inc d .noCarry coord hl, 6, 4 ; coordinates of first list entry name - ld b,4 ; print 4 names + ld b, 4 ; print 4 names .loop - ld a,b - ld [wWhichPokemon],a - ld a,[de] - ld [wd11e],a + ld a, b + ld [wWhichPokemon], a + ld a, [de] + ld [wd11e], a cp $ff - jp z,.printCancelMenuItem + jp z, .printCancelMenuItem push bc push de push hl push hl push de - ld a,[wListMenuID] + ld a, [wListMenuID] and a - jr z,.pokemonPCMenu + jr z, .pokemonPCMenu cp MOVESLISTMENU - jr z,.movesMenu + jr z, .movesMenu .itemMenu call GetItemName jr .placeNameString .pokemonPCMenu push hl - ld hl,wPartyCount - ld a,[wListPointer] + ld hl, wPartyCount + ld a, [wListPointer] cp l ; is it a list of party pokemon or box pokemon? - ld hl,wPartyMonNicks - jr z,.getPokemonName + ld hl, wPartyMonNicks + jr z, .getPokemonName ld hl, wBoxMonNicks ; box pokemon names .getPokemonName - ld a,[wWhichPokemon] - ld b,a - ld a,4 + ld a, [wWhichPokemon] + ld b, a + ld a, 4 sub b - ld b,a - ld a,[wListScrollOffset] + ld b, a + ld a, [wListScrollOffset] add b call GetPartyMonName pop hl @@ -1773,90 +1773,90 @@ PrintListMenuEntries:: call PlaceString pop de pop hl - ld a,[wPrintItemPrices] + ld a, [wPrintItemPrices] and a ; should prices be printed? - jr z,.skipPrintingItemPrice + jr z, .skipPrintingItemPrice .printItemPrice push hl - ld a,[de] - ld de,ItemPrices - ld [wcf91],a + ld a, [de] + ld de, ItemPrices + ld [wcf91], a call GetItemPrice ; get price pop hl 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 + add hl, bc + ld c, $a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes call PrintBCDNumber .skipPrintingItemPrice - ld a,[wListMenuID] + ld a, [wListMenuID] and a - jr nz,.skipPrintingPokemonLevel + jr nz, .skipPrintingPokemonLevel .printPokemonLevel - ld a,[wd11e] + ld a, [wd11e] push af push hl - ld hl,wPartyCount - ld a,[wListPointer] + ld hl, wPartyCount + ld a, [wListPointer] cp l ; is it a list of party pokemon or box pokemon? - ld a,PLAYER_PARTY_DATA - jr z,.next - ld a,BOX_DATA + ld a, PLAYER_PARTY_DATA + jr z, .next + ld a, BOX_DATA .next - ld [wMonDataLocation],a - ld hl,wWhichPokemon - ld a,[hl] - ld b,a - ld a,$04 + ld [wMonDataLocation], a + ld hl, wWhichPokemon + ld a, [hl] + ld b, a + ld a, $04 sub b - ld b,a - ld a,[wListScrollOffset] + ld b, a + ld a, [wListScrollOffset] add b - ld [hl],a + ld [hl], a call LoadMonData - ld a,[wMonDataLocation] + ld a, [wMonDataLocation] and a ; is it a list of party pokemon or box pokemon? - jr z,.skipCopyingLevel + jr z, .skipCopyingLevel .copyLevel - ld a,[wLoadedMonBoxLevel] - ld [wLoadedMonLevel],a + ld a, [wLoadedMonBoxLevel] + ld [wLoadedMonLevel], a .skipCopyingLevel pop hl - ld bc,$001c - add hl,bc + ld bc, $001c + add hl, bc call PrintLevel pop af - ld [wd11e],a + ld [wd11e], a .skipPrintingPokemonLevel pop hl pop de inc de - ld a,[wListMenuID] + ld a, [wListMenuID] cp ITEMLISTMENU - jr nz,.nextListEntry + jr nz, .nextListEntry .printItemQuantity - ld a,[wd11e] - ld [wcf91],a + ld a, [wd11e] + ld [wcf91], a call IsKeyItem ; check if item is unsellable - ld a,[wIsKeyItem] + ld a, [wIsKeyItem] and a ; is the item unsellable? - jr nz,.skipPrintingItemQuantity ; if so, don't print the quantity + jr nz, .skipPrintingItemQuantity ; if so, don't print the quantity push hl ld bc, SCREEN_WIDTH + 8 ; 1 row down and 8 columns right - add hl,bc - ld a,"×" - ld [hli],a - ld a,[wd11e] + add hl, bc + ld a, "×" + ld [hli], a + ld a, [wd11e] push af - ld a,[de] - ld [wMaxItemQuantity],a + ld a, [de] + ld [wMaxItemQuantity], a push de - ld de,wd11e - ld [de],a + ld de, wd11e + ld [de], a lb bc, 1, 2 call PrintNumber pop de pop af - ld [wd11e],a + ld [wd11e], a pop hl .skipPrintingItemQuantity inc de @@ -1864,29 +1864,29 @@ PrintListMenuEntries:: inc c push bc inc c - ld a,[wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + ld a, [wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) and a ; is an item being swapped? - jr z,.nextListEntry + jr z, .nextListEntry sla a cp c ; is it this item? - jr nz,.nextListEntry + jr nz, .nextListEntry dec hl - ld a,$ec ; unfilled right arrow menu cursor to indicate an item being swapped - ld [hli],a + ld a, $ec ; unfilled right arrow menu cursor to indicate an item being swapped + ld [hli], a .nextListEntry - ld bc,2 * SCREEN_WIDTH ; 2 rows - add hl,bc + ld bc, 2 * SCREEN_WIDTH ; 2 rows + add hl, bc pop bc inc c dec b - jp nz,.loop - ld bc,-8 - add hl,bc - ld a,"▼" - ld [hl],a + jp nz, .loop + ld bc, -8 + add hl, bc + ld a, "▼" + ld [hl], a ret .printCancelMenuItem - ld de,ListMenuCancelText + ld de, ListMenuCancelText jp PlaceString ListMenuCancelText:: @@ -1894,27 +1894,27 @@ ListMenuCancelText:: GetMonName:: push hl - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(MonsterNames) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld a,[wd11e] + ld a, BANK(MonsterNames) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld a, [wd11e] dec a - ld hl,MonsterNames - ld c,10 - ld b,0 + ld hl, MonsterNames + ld c, 10 + ld b, 0 call AddNTimes - ld de,wcd6d + ld de, wcd6d push de - ld bc,10 + ld bc, 10 call CopyData - ld hl,wcd6d + 10 + ld hl, wcd6d + 10 ld [hl], "@" pop de pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a pop hl ret @@ -1923,22 +1923,22 @@ GetItemName:: ; starting at wcd6d push hl push bc - ld a,[wd11e] + ld a, [wd11e] cp HM_01 ; is this a TM/HM? - jr nc,.Machine + jr nc, .Machine - ld [wd0b5],a - ld a,ITEM_NAME - ld [wNameListType],a - ld a,BANK(ItemNames) - ld [wPredefBank],a + ld [wd0b5], a + ld a, ITEM_NAME + ld [wNameListType], a + ld a, BANK(ItemNames) + ld [wPredefBank], a call GetName jr .Finish .Machine call GetMachineName .Finish - ld de,wcd6d ; pointer to where item name is stored in RAM + ld de, wcd6d ; pointer to where item name is stored in RAM pop bc pop hl ret @@ -1948,48 +1948,48 @@ GetMachineName:: push hl push de push bc - ld a,[wd11e] + ld a, [wd11e] push af cp TM_01 ; is this a TM? [not HM] - jr nc,.WriteTM + jr nc, .WriteTM ; if HM, then write "HM" and add 5 to the item ID, so we can reuse the ; TM printing code add 5 - ld [wd11e],a - ld hl,HiddenPrefix ; points to "HM" - ld bc,2 + ld [wd11e], a + ld hl, HiddenPrefix ; points to "HM" + ld bc, 2 jr .WriteMachinePrefix .WriteTM - ld hl,TechnicalPrefix ; points to "TM" - ld bc,2 + ld hl, TechnicalPrefix ; points to "TM" + ld bc, 2 .WriteMachinePrefix - ld de,wcd6d + ld de, wcd6d call CopyData ; now get the machine number and convert it to text - ld a,[wd11e] + ld a, [wd11e] sub TM_01 - 1 ld b, "0" .FirstDigit sub 10 - jr c,.SecondDigit + jr c, .SecondDigit inc b jr .FirstDigit .SecondDigit add 10 push af - ld a,b - ld [de],a + ld a, b + ld [de], a inc de pop af ld b, "0" add b - ld [de],a + ld [de], a inc de - ld a,"@" - ld [de],a + ld a, "@" + ld [de], a pop af - ld [wd11e],a + ld [wd11e], a pop bc pop de pop hl @@ -2004,7 +2004,7 @@ HiddenPrefix:: ; Input: a = item ID IsItemHM:: cp HM_01 - jr c,.notHM + jr c, .notHM cp TM_01 ret .notHM @@ -2014,8 +2014,8 @@ IsItemHM:: ; sets carry if move is an HM, clears carry if move is not an HM ; Input: a = move ID IsMoveHM:: - ld hl,HMMoves - ld de,1 + ld hl, HMMoves + ld de, 1 jp IsInArray HMMoves:: @@ -2024,22 +2024,22 @@ HMMoves:: GetMoveName:: push hl - ld a,MOVE_NAME - ld [wNameListType],a - ld a,[wd11e] - ld [wd0b5],a - ld a,BANK(MoveNames) - ld [wPredefBank],a + ld a, MOVE_NAME + ld [wNameListType], a + ld a, [wd11e] + ld [wd0b5], a + ld a, BANK(MoveNames) + ld [wPredefBank], a call GetName - ld de,wcd6d ; pointer to where move name is stored in RAM + ld de, wcd6d ; pointer to where move name is stored in RAM pop hl ret ; reloads text box tile patterns, current map view, and tileset tile patterns ReloadMapData:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,[wCurMap] + ld a, [wCurMap] call SwitchToMapRomBank call DisableLCD call LoadTextBoxTilePatterns @@ -2047,34 +2047,34 @@ ReloadMapData:: call LoadTilesetTilePatternData call EnableLCD pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; reloads tileset tile patterns ReloadTilesetTilePatterns:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,[wCurMap] + ld a, [wCurMap] call SwitchToMapRomBank call DisableLCD call LoadTilesetTilePatternData call EnableLCD pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; shows the town map and lets the player choose a destination to fly to ChooseFlyDestination:: - ld hl,wd72e - res 4,[hl] + ld hl, wd72e + res 4, [hl] jpba LoadTownMap_Fly ; causes the text box to close without waiting for a button press after displaying text DisableWaitingAfterTextDisplay:: - ld a,$01 - ld [wDoNotWaitForButtonPressAfterDisplayingText],a + ld a, $01 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret ; uses an item @@ -2098,16 +2098,16 @@ UseItem:: ; OUTPUT: ; clears carry flag if the item is tossed, sets carry flag if not TossItem:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(TossItem_) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, BANK(TossItem_) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call TossItem_ pop de - ld a,d - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, d + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; checks if an item is a key item @@ -2132,16 +2132,16 @@ IsKeyItem:: ; [wTextBoxID] = text box ID ; b, c = y, x cursor position (TWO_OPTION_MENU only) DisplayTextBoxID:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,BANK(DisplayTextBoxID_) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, BANK(DisplayTextBoxID_) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call DisplayTextBoxID_ pop bc - ld a,b - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, b + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; not zero if an NPC movement script is running, the player character is @@ -2679,8 +2679,8 @@ FuncTX_BillsPC:: FuncTX_GameCornerPrizeMenu:: ; XXX find a better name for this function ; special_F7 - ld b,BANK(CeladonPrizeMenu) - ld hl,CeladonPrizeMenu + ld b, BANK(CeladonPrizeMenu) + ld hl, CeladonPrizeMenu bankswitchAndContinue:: call Bankswitch jp HoldTextDisplayOpen ; continue to main text-engine function @@ -2704,7 +2704,7 @@ IsItemInBag:: ; else reset zero flag ; related to Pokémon Tower and ghosts predef GetQuantityOfItemInBag - ld a,b + ld a, b and a ret @@ -2738,32 +2738,32 @@ SetSpriteImageIndexAfterSettingFacingDirection:: ; [wCoordIndex] = if there is match, the matching array index ; sets carry if the coordinates are in the array, clears carry if not ArePlayerCoordsInArray:: - ld a,[wYCoord] - ld b,a - ld a,[wXCoord] - ld c,a + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a ; fallthrough CheckCoords:: xor a - ld [wCoordIndex],a + ld [wCoordIndex], a .loop - ld a,[hli] + ld a, [hli] cp $ff ; reached terminator? - jr z,.notInArray + jr z, .notInArray push hl - ld hl,wCoordIndex + ld hl, wCoordIndex inc [hl] pop hl .compareYCoord cp b - jr z,.compareXCoord + jr z, .compareXCoord inc hl jr .loop .compareXCoord - ld a,[hli] + ld a, [hli] cp c - jr nz,.loop + jr nz, .loop .inArray scf ret @@ -2857,31 +2857,31 @@ SetSpriteMovementBytesToFE:: SetSpriteMovementBytesToFF:: push hl call GetSpriteMovementByte1Pointer - ld [hl],$FF + ld [hl], $FF call GetSpriteMovementByte2Pointer - ld [hl],$FF ; prevent person from walking? + ld [hl], $FF ; prevent person from walking? pop hl ret ; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte1Pointer:: - ld h,$C2 - ld a,[H_SPRITEINDEX] + ld h, $C2 + ld a, [H_SPRITEINDEX] swap a add 6 - ld l,a + ld l, a ret ; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte2Pointer:: push de - ld hl,wMapSpriteData - ld a,[H_SPRITEINDEX] + ld hl, wMapSpriteData + ld a, [H_SPRITEINDEX] dec a add a - ld d,0 - ld e,a - add hl,de + ld d, 0 + ld e, a + add hl, de pop de ret @@ -2941,37 +2941,37 @@ HasEnoughCoins:: BankswitchHome:: ; switches to bank # in a ; Only use this when in the home bank! - ld [wBankswitchHomeTemp],a - ld a,[H_LOADEDROMBANK] - ld [wBankswitchHomeSavedROMBank],a - ld a,[wBankswitchHomeTemp] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [wBankswitchHomeTemp], a + ld a, [H_LOADEDROMBANK] + ld [wBankswitchHomeSavedROMBank], a + ld a, [wBankswitchHomeTemp] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret BankswitchBack:: ; returns from BankswitchHome - ld a,[wBankswitchHomeSavedROMBank] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, [wBankswitchHomeSavedROMBank] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret Bankswitch:: ; self-contained bankswitch, use this when not in the home bank ; switches to the bank in b - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,b - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld bc,.Return + ld a, b + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld bc, .Return push bc jp hl .Return pop bc - ld a,b - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, b + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; displays yes/no choice @@ -3033,31 +3033,31 @@ MoveSprite_:: push bc call GetSpriteMovementByte1Pointer xor a - ld [hl],a - ld hl,wNPCMovementDirections - ld c,0 + ld [hl], a + ld hl, wNPCMovementDirections + ld c, 0 .loop - ld a,[de] - ld [hli],a + ld a, [de] + ld [hli], a inc de inc c cp $FF ; have we reached the end of the movement data? - jr nz,.loop + jr nz, .loop - ld a,c - ld [wNPCNumScriptedSteps],a ; number of steps taken + ld a, c + ld [wNPCNumScriptedSteps], a ; number of steps taken pop bc - ld hl,wd730 - set 0,[hl] + ld hl, wd730 + set 0, [hl] pop hl xor a - ld [wOverrideSimulatedJoypadStatesMask],a - ld [wSimulatedJoypadStatesEnd],a + ld [wOverrideSimulatedJoypadStatesMask], a + ld [wSimulatedJoypadStatesEnd], a dec a - ld [wJoyIgnore],a - ld [wWastedByteCD3A],a + ld [wJoyIgnore], a + ld [wWastedByteCD3A], a ret ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] @@ -3198,7 +3198,7 @@ DelayFrames:: ; wait c frames call DelayFrame dec c - jr nz,DelayFrames + jr nz, DelayFrames ret PlaySoundWaitForCurrent:: @@ -3242,82 +3242,82 @@ GetName:: ; [wPredefBank] = bank of list ; ; returns pointer to name in de - ld a,[wd0b5] - ld [wd11e],a + ld a, [wd0b5] + ld [wd11e], a ; TM names are separate from item names. ; BUG: This applies to all names instead of just items. cp HM_01 jp nc, GetMachineName - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af push hl push bc push de - ld a,[wNameListType] ;List3759_entrySelector + ld a, [wNameListType] ;List3759_entrySelector dec a - jr nz,.otherEntries + jr nz, .otherEntries ;1 = MON_NAMES call GetMonName - ld hl,NAME_LENGTH - add hl,de - ld e,l - ld d,h + ld hl, NAME_LENGTH + add hl, de + ld e, l + ld d, h jr .gotPtr .otherEntries ;2-7 = OTHER ENTRIES - ld a,[wPredefBank] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a - ld a,[wNameListType] ;VariousNames' entryID + ld a, [wPredefBank] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a + ld a, [wNameListType] ;VariousNames' entryID dec a add a - ld d,0 - ld e,a - jr nc,.skip + ld d, 0 + ld e, a + jr nc, .skip inc d .skip - ld hl,NamePointers - add hl,de - ld a,[hli] - ld [$ff96],a - ld a,[hl] - ld [$ff95],a - ld a,[$ff95] - ld h,a - ld a,[$ff96] - ld l,a - ld a,[wd0b5] - ld b,a - ld c,0 + ld hl, NamePointers + add hl, de + ld a, [hli] + ld [$ff96], a + ld a, [hl] + ld [$ff95], a + ld a, [$ff95] + ld h, a + ld a, [$ff96] + ld l, a + ld a, [wd0b5] + ld b, a + ld c, 0 .nextName - ld d,h - ld e,l + ld d, h + ld e, l .nextChar - ld a,[hli] + ld a, [hli] cp "@" - jr nz,.nextChar + jr nz, .nextChar inc c ;entry counter - ld a,b ;wanted entry + ld a, b ;wanted entry cp c - jr nz,.nextName - ld h,d - ld l,e - ld de,wcd6d - ld bc,$0014 + jr nz, .nextName + ld h, d + ld l, e + ld de, wcd6d + ld bc, $0014 call CopyData .gotPtr - ld a,e - ld [wUnusedCF8D],a - ld a,d - ld [wUnusedCF8D + 1],a + ld a, e + ld [wUnusedCF8D], a + ld a, d + ld [wUnusedCF8D + 1], a pop de pop bc pop hl pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret GetItemPrice:: @@ -3396,41 +3396,41 @@ CopyString:: ; ([hJoy7] == 1, [hJoy6] == 0) JoypadLowSensitivity:: call Joypad - ld a,[hJoy7] ; flag + ld a, [hJoy7] ; flag and a ; get all currently pressed buttons or only newly pressed buttons? - ld a,[hJoyPressed] ; newly pressed buttons - jr z,.storeButtonState - ld a,[hJoyHeld] ; all currently pressed buttons + ld a, [hJoyPressed] ; newly pressed buttons + jr z, .storeButtonState + ld a, [hJoyHeld] ; all currently pressed buttons .storeButtonState - ld [hJoy5],a - ld a,[hJoyPressed] ; newly pressed buttons + ld [hJoy5], a + ld a, [hJoyPressed] ; newly pressed buttons and a ; have any buttons been newly pressed since last check? - jr z,.noNewlyPressedButtons + jr z, .noNewlyPressedButtons .newlyPressedButtons - ld a,30 ; half a second delay - ld [H_FRAMECOUNTER],a + ld a, 30 ; half a second delay + ld [H_FRAMECOUNTER], a ret .noNewlyPressedButtons - ld a,[H_FRAMECOUNTER] + ld a, [H_FRAMECOUNTER] and a ; is the delay over? - jr z,.delayOver + jr z, .delayOver .delayNotOver xor a - ld [hJoy5],a ; report no buttons as pressed + ld [hJoy5], a ; report no buttons as pressed ret .delayOver ; if [hJoy6] = 0 and A or B is pressed, report no buttons as pressed - ld a,[hJoyHeld] + ld a, [hJoyHeld] and A_BUTTON | B_BUTTON - jr z,.setShortDelay - ld a,[hJoy6] ; flag + jr z, .setShortDelay + ld a, [hJoy6] ; flag and a - jr nz,.setShortDelay + jr nz, .setShortDelay xor a - ld [hJoy5],a + ld [hJoy5], a .setShortDelay - ld a,5 ; 1/12 of a second delay - ld [H_FRAMECOUNTER],a + ld a, 5 ; 1/12 of a second delay + ld [H_FRAMECOUNTER], a ret WaitForTextScrollButtonPress:: @@ -3503,15 +3503,15 @@ Divide:: push hl push de push bc - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,Bank(_Divide) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, Bank(_Divide) + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call _Divide pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a pop bc pop de pop hl @@ -3521,42 +3521,42 @@ Divide:: ; screen unless the player presses the A/B button or the delay is turned off ; through the [wd730] or [wLetterPrintingDelayFlags] flags. PrintLetterDelay:: - ld a,[wd730] - bit 6,a + ld a, [wd730] + bit 6, a ret nz - ld a,[wLetterPrintingDelayFlags] - bit 1,a + ld a, [wLetterPrintingDelayFlags] + bit 1, a ret z push hl push de push bc - ld a,[wLetterPrintingDelayFlags] - bit 0,a - jr z,.waitOneFrame - ld a,[wOptions] + ld a, [wLetterPrintingDelayFlags] + bit 0, a + jr z, .waitOneFrame + ld a, [wOptions] and $f - ld [H_FRAMECOUNTER],a + ld [H_FRAMECOUNTER], a jr .checkButtons .waitOneFrame - ld a,1 - ld [H_FRAMECOUNTER],a + ld a, 1 + ld [H_FRAMECOUNTER], a .checkButtons call Joypad - ld a,[hJoyHeld] + ld a, [hJoyHeld] .checkAButton - bit 0,a ; is the A button pressed? - jr z,.checkBButton + bit 0, a ; is the A button pressed? + jr z, .checkBButton jr .endWait .checkBButton - bit 1,a ; is the B button pressed? - jr z,.buttonsNotPressed + bit 1, a ; is the B button pressed? + jr z, .buttonsNotPressed .endWait call DelayFrame jr .done .buttonsNotPressed ; if neither A nor B is pressed - ld a,[H_FRAMECOUNTER] + ld a, [H_FRAMECOUNTER] and a - jr nz,.checkButtons + jr nz, .checkButtons .done pop bc pop de @@ -3567,15 +3567,15 @@ PrintLetterDelay:: ; In other words, the source data is from hl up to but not including bc, ; and the destination is de. CopyDataUntil:: - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de - ld a,h + ld a, h cp b - jr nz,CopyDataUntil - ld a,l + jr nz, CopyDataUntil + ld a, l cp c - jr nz,CopyDataUntil + jr nz, CopyDataUntil ret ; Function to remove a pokemon from the party or the current box. @@ -3838,21 +3838,21 @@ AddNTimes:: and a ret z .loop - add hl,bc + add hl, bc dec a - jr nz,.loop + jr nz, .loop ret ; Compare strings, c bytes in length, at de and hl. ; Often used to compare big endian numbers in battle calculations. StringCmp:: - ld a,[de] + ld a, [de] cp [hl] ret nz inc de inc hl dec c - jr nz,StringCmp + jr nz, StringCmp ret ; INPUT: @@ -3861,228 +3861,228 @@ StringCmp:: ; c = X coordinate of upper left corner of sprite ; de = base address of 4 tile number and attribute pairs WriteOAMBlock:: - ld h,wOAMBuffer / $100 + ld h, wOAMBuffer / $100 swap a ; multiply by 16 - ld l,a + ld l, a call .writeOneEntry ; upper left push bc - ld a,8 + ld a, 8 add c - ld c,a + ld c, a call .writeOneEntry ; upper right pop bc - ld a,8 + ld a, 8 add b - ld b,a + ld b, a call .writeOneEntry ; lower left - ld a,8 + ld a, 8 add c - ld c,a + ld c, a ; lower right .writeOneEntry - ld [hl],b ; Y coordinate + ld [hl], b ; Y coordinate inc hl - ld [hl],c ; X coordinate + ld [hl], c ; X coordinate inc hl - ld a,[de] ; tile number + ld a, [de] ; tile number inc de - ld [hli],a - ld a,[de] ; attribute + ld [hli], a + ld a, [de] ; attribute inc de - ld [hli],a + ld [hli], a ret HandleMenuInput:: xor a - ld [wPartyMenuAnimMonEnabled],a + ld [wPartyMenuAnimMonEnabled], a HandleMenuInput_:: - ld a,[H_DOWNARROWBLINKCNT1] + ld a, [H_DOWNARROWBLINKCNT1] push af - ld a,[H_DOWNARROWBLINKCNT2] + ld a, [H_DOWNARROWBLINKCNT2] push af ; save existing values on stack xor a - ld [H_DOWNARROWBLINKCNT1],a ; blinking down arrow timing value 1 - ld a,6 - ld [H_DOWNARROWBLINKCNT2],a ; blinking down arrow timing value 2 + ld [H_DOWNARROWBLINKCNT1], a ; blinking down arrow timing value 1 + ld a, 6 + ld [H_DOWNARROWBLINKCNT2], a ; blinking down arrow timing value 2 .loop1 xor a - ld [wAnimCounter],a ; counter for pokemon shaking animation + ld [wAnimCounter], a ; counter for pokemon shaking animation call PlaceMenuCursor call Delay3 .loop2 push hl - ld a,[wPartyMenuAnimMonEnabled] + ld a, [wPartyMenuAnimMonEnabled] and a ; is it a pokemon selection menu? - jr z,.getJoypadState + jr z, .getJoypadState callba AnimatePartyMon ; shake mini sprite of selected pokemon .getJoypadState pop hl call JoypadLowSensitivity - ld a,[hJoy5] + ld a, [hJoy5] and a ; was a key pressed? - jr nz,.keyPressed + jr nz, .keyPressed push hl coord hl, 18, 11 ; coordinates of blinking down arrow in some menus call HandleDownArrowBlinkTiming ; blink down arrow (if any) pop hl - ld a,[wMenuJoypadPollCount] + ld a, [wMenuJoypadPollCount] dec a - jr z,.giveUpWaiting + jr z, .giveUpWaiting jr .loop2 .giveUpWaiting ; if a key wasn't pressed within the specified number of checks pop af - ld [H_DOWNARROWBLINKCNT2],a + ld [H_DOWNARROWBLINKCNT2], a pop af - ld [H_DOWNARROWBLINKCNT1],a ; restore previous values + ld [H_DOWNARROWBLINKCNT1], a ; restore previous values xor a - ld [wMenuWrappingEnabled],a ; disable menu wrapping + ld [wMenuWrappingEnabled], a ; disable menu wrapping ret .keyPressed xor a - ld [wCheckFor180DegreeTurn],a - ld a,[hJoy5] - ld b,a - bit 6,a ; pressed Up key? - jr z,.checkIfDownPressed + ld [wCheckFor180DegreeTurn], a + ld a, [hJoy5] + ld b, a + bit 6, a ; pressed Up key? + jr z, .checkIfDownPressed .upPressed - ld a,[wCurrentMenuItem] ; selected menu item + ld a, [wCurrentMenuItem] ; selected menu item and a ; already at the top of the menu? - jr z,.alreadyAtTop + jr z, .alreadyAtTop .notAtTop dec a - ld [wCurrentMenuItem],a ; move selected menu item up one space + ld [wCurrentMenuItem], a ; move selected menu item up one space jr .checkOtherKeys .alreadyAtTop - ld a,[wMenuWrappingEnabled] + ld a, [wMenuWrappingEnabled] and a ; is wrapping around enabled? - jr z,.noWrappingAround - ld a,[wMaxMenuItem] - ld [wCurrentMenuItem],a ; wrap to the bottom of the menu + jr z, .noWrappingAround + ld a, [wMaxMenuItem] + ld [wCurrentMenuItem], a ; wrap to the bottom of the menu jr .checkOtherKeys .checkIfDownPressed - bit 7,a - jr z,.checkOtherKeys + bit 7, a + jr z, .checkOtherKeys .downPressed - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] inc a - ld c,a - ld a,[wMaxMenuItem] + ld c, a + ld a, [wMaxMenuItem] cp c - jr nc,.notAtBottom + jr nc, .notAtBottom .alreadyAtBottom - ld a,[wMenuWrappingEnabled] + ld a, [wMenuWrappingEnabled] and a ; is wrapping around enabled? - jr z,.noWrappingAround - ld c,$00 ; wrap from bottom to top + jr z, .noWrappingAround + ld c, $00 ; wrap from bottom to top .notAtBottom - ld a,c - ld [wCurrentMenuItem],a + ld a, c + ld [wCurrentMenuItem], a .checkOtherKeys - ld a,[wMenuWatchedKeys] + ld a, [wMenuWatchedKeys] and b ; does the menu care about any of the pressed keys? - jp z,.loop1 + jp z, .loop1 .checkIfAButtonOrBButtonPressed - ld a,[hJoy5] + ld a, [hJoy5] and A_BUTTON | B_BUTTON - jr z,.skipPlayingSound + jr z, .skipPlayingSound .AButtonOrBButtonPressed push hl - ld hl,wFlags_0xcd60 - bit 5,[hl] + ld hl, wFlags_0xcd60 + bit 5, [hl] pop hl - jr nz,.skipPlayingSound - ld a,SFX_PRESS_AB + jr nz, .skipPlayingSound + ld a, SFX_PRESS_AB call PlaySound .skipPlayingSound pop af - ld [H_DOWNARROWBLINKCNT2],a + ld [H_DOWNARROWBLINKCNT2], a pop af - ld [H_DOWNARROWBLINKCNT1],a ; restore previous values + ld [H_DOWNARROWBLINKCNT1], a ; restore previous values xor a - ld [wMenuWrappingEnabled],a ; disable menu wrapping - ld a,[hJoy5] + ld [wMenuWrappingEnabled], a ; disable menu wrapping + ld a, [hJoy5] ret .noWrappingAround - ld a,[wMenuWatchMovingOutOfBounds] + ld a, [wMenuWatchMovingOutOfBounds] and a ; should we return if the user tried to go past the top or bottom? - jr z,.checkOtherKeys + jr z, .checkOtherKeys jr .checkIfAButtonOrBButtonPressed PlaceMenuCursor:: - ld a,[wTopMenuItemY] + ld a, [wTopMenuItemY] and a ; is the y coordinate 0? - jr z,.adjustForXCoord + jr z, .adjustForXCoord coord hl, 0, 0 - ld bc,SCREEN_WIDTH + ld bc, SCREEN_WIDTH .topMenuItemLoop - add hl,bc + add hl, bc dec a - jr nz,.topMenuItemLoop + jr nz, .topMenuItemLoop .adjustForXCoord - ld a,[wTopMenuItemX] - ld b,0 - ld c,a - add hl,bc + ld a, [wTopMenuItemX] + ld b, 0 + ld c, a + add hl, bc push hl - ld a,[wLastMenuItem] + ld a, [wLastMenuItem] and a ; was the previous menu id 0? - jr z,.checkForArrow1 + jr z, .checkForArrow1 push af - ld a,[hFlags_0xFFF6] - bit 1,a ; is the menu double spaced? - jr z,.doubleSpaced1 - ld bc,20 + ld a, [hFlags_0xFFF6] + bit 1, a ; is the menu double spaced? + jr z, .doubleSpaced1 + ld bc, 20 jr .getOldMenuItemScreenPosition .doubleSpaced1 - ld bc,40 + ld bc, 40 .getOldMenuItemScreenPosition pop af .oldMenuItemLoop - add hl,bc + add hl, bc dec a - jr nz,.oldMenuItemLoop + jr nz, .oldMenuItemLoop .checkForArrow1 - ld a,[hl] - cp a,"▶" ; was an arrow next to the previously selected menu item? - jr nz,.skipClearingArrow + ld a, [hl] + cp "▶" ; was an arrow next to the previously selected menu item? + jr nz, .skipClearingArrow .clearArrow - ld a,[wTileBehindCursor] - ld [hl],a + ld a, [wTileBehindCursor] + ld [hl], a .skipClearingArrow pop hl - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - jr z,.checkForArrow2 + jr z, .checkForArrow2 push af - ld a,[hFlags_0xFFF6] - bit 1,a ; is the menu double spaced? - jr z,.doubleSpaced2 - ld bc,20 + ld a, [hFlags_0xFFF6] + bit 1, a ; is the menu double spaced? + jr z, .doubleSpaced2 + ld bc, 20 jr .getCurrentMenuItemScreenPosition .doubleSpaced2 - ld bc,40 + ld bc, 40 .getCurrentMenuItemScreenPosition pop af .currentMenuItemLoop - add hl,bc + add hl, bc dec a - jr nz,.currentMenuItemLoop + jr nz, .currentMenuItemLoop .checkForArrow2 - ld a,[hl] + ld a, [hl] cp "▶" ; has the right arrow already been placed? - jr z,.skipSavingTile ; if so, don't lose the saved tile - ld [wTileBehindCursor],a ; save tile before overwriting with right arrow + jr z, .skipSavingTile ; if so, don't lose the saved tile + ld [wTileBehindCursor], a ; save tile before overwriting with right arrow .skipSavingTile - ld a,"▶" ; place right arrow - ld [hl],a - ld a,l - ld [wMenuCursorLocation],a - ld a,h - ld [wMenuCursorLocation + 1],a - ld a,[wCurrentMenuItem] - ld [wLastMenuItem],a + ld a, "▶" ; place right arrow + ld [hl], a + ld a, l + ld [wMenuCursorLocation], a + ld a, h + ld [wMenuCursorLocation + 1], a + ld a, [wCurrentMenuItem] + ld [wLastMenuItem], a ret ; This is used to mark a menu cursor other than the one currently being @@ -4090,22 +4090,22 @@ PlaceMenuCursor:: ; the menu cursor in the parent menu. In the case of swapping items in list, ; this is used to mark the item that was first chosen to be swapped. PlaceUnfilledArrowMenuCursor:: - ld b,a - ld a,[wMenuCursorLocation] - ld l,a - ld a,[wMenuCursorLocation + 1] - ld h,a - ld [hl],$ec ; outline of right arrow - ld a,b + ld b, a + ld a, [wMenuCursorLocation] + ld l, a + ld a, [wMenuCursorLocation + 1] + ld h, a + ld [hl], $ec ; outline of right arrow + ld a, b ret ; Replaces the menu cursor with a blank space. EraseMenuCursor:: - ld a,[wMenuCursorLocation] - ld l,a - ld a,[wMenuCursorLocation + 1] - ld h,a - ld [hl]," " + ld a, [wMenuCursorLocation] + ld l, a + ld a, [wMenuCursorLocation + 1] + ld h, a + ld [hl], " " ret ; This toggles a blinking down arrow at hl on and off after a delay has passed. @@ -4117,44 +4117,44 @@ EraseMenuCursor:: ; That allows this to be called without worrying about if a down arrow should ; be blinking. HandleDownArrowBlinkTiming:: - ld a,[hl] - ld b,a - ld a,"▼" + ld a, [hl] + ld b, a + ld a, "▼" cp b - jr nz,.downArrowOff + jr nz, .downArrowOff .downArrowOn - ld a,[H_DOWNARROWBLINKCNT1] + ld a, [H_DOWNARROWBLINKCNT1] dec a - ld [H_DOWNARROWBLINKCNT1],a + ld [H_DOWNARROWBLINKCNT1], a ret nz - ld a,[H_DOWNARROWBLINKCNT2] + ld a, [H_DOWNARROWBLINKCNT2] dec a - ld [H_DOWNARROWBLINKCNT2],a + ld [H_DOWNARROWBLINKCNT2], a ret nz - ld a," " - ld [hl],a - ld a,$ff - ld [H_DOWNARROWBLINKCNT1],a - ld a,$06 - ld [H_DOWNARROWBLINKCNT2],a + ld a, " " + ld [hl], a + ld a, $ff + ld [H_DOWNARROWBLINKCNT1], a + ld a, $06 + ld [H_DOWNARROWBLINKCNT2], a ret .downArrowOff - ld a,[H_DOWNARROWBLINKCNT1] + ld a, [H_DOWNARROWBLINKCNT1] and a ret z dec a - ld [H_DOWNARROWBLINKCNT1],a + ld [H_DOWNARROWBLINKCNT1], a ret nz dec a - ld [H_DOWNARROWBLINKCNT1],a - ld a,[H_DOWNARROWBLINKCNT2] + ld [H_DOWNARROWBLINKCNT1], a + ld a, [H_DOWNARROWBLINKCNT2] dec a - ld [H_DOWNARROWBLINKCNT2],a + ld [H_DOWNARROWBLINKCNT2], a ret nz - ld a,$06 - ld [H_DOWNARROWBLINKCNT2],a - ld a,"▼" - ld [hl],a + ld a, $06 + ld [H_DOWNARROWBLINKCNT2], a + ld a, "▼" + ld [hl], a ret ; The following code either enables or disables the automatic drawing of @@ -4166,19 +4166,19 @@ EnableAutoTextBoxDrawing:: jr AutoTextBoxDrawingCommon DisableAutoTextBoxDrawing:: - ld a,$01 + ld a, $01 AutoTextBoxDrawingCommon:: - ld [wAutoTextBoxDrawingControl],a + ld [wAutoTextBoxDrawingControl], a xor a - ld [wDoNotWaitForButtonPressAfterDisplayingText],a ; make DisplayTextID wait for button press + ld [wDoNotWaitForButtonPressAfterDisplayingText], a ; make DisplayTextID wait for button press ret PrintText:: ; Print text hl at (1, 14). push hl - ld a,MESSAGE_BOX - ld [wTextBoxID],a + ld a, MESSAGE_BOX + ld [wTextBoxID], a call DisplayTextBoxID call UpdateSprites call Delay3 @@ -4488,16 +4488,16 @@ GBPalNormal:: GBPalWhiteOut:: ; White out all palettes. xor a - ld [rBGP],a - ld [rOBP0],a - ld [rOBP1],a + ld [rBGP], a + ld [rOBP0], a + ld [rOBP1], a ret RunDefaultPaletteCommand:: - ld b,$ff + ld b, $ff RunPaletteCommand:: - ld a,[wOnSGB] + ld a, [wOnSGB] and a ret z predef_jump _RunPaletteCommand @@ -4547,7 +4547,7 @@ GiveItem:: ld [wcf91], a ld a, c ld [wItemQuantity], a - ld hl,wNumBagItems + ld hl, wNumBagItems call AddItemToInventory ret nc call GetItemName diff --git a/home/copy2.asm b/home/copy2.asm index 830440b0..d4f35668 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,62 +1,62 @@ FarCopyData2:: ; Identical to FarCopyData, but uses hROMBankTemp ; as temp space instead of wBuffer. - ld [hROMBankTemp],a - ld a,[H_LOADEDROMBANK] + ld [hROMBankTemp], a + ld a, [H_LOADEDROMBANK] push af - ld a,[hROMBankTemp] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, [hROMBankTemp] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a call CopyData pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret FarCopyData3:: ; Copy bc bytes from a:de to hl. - ld [hROMBankTemp],a - ld a,[H_LOADEDROMBANK] + ld [hROMBankTemp], a + ld a, [H_LOADEDROMBANK] push af - ld a,[hROMBankTemp] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, [hROMBankTemp] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a push hl push de push de - ld d,h - ld e,l + ld d, h + ld e, l pop hl call CopyData pop de pop hl pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret FarCopyDataDouble:: ; Expand bc bytes of 1bpp image data ; from a:hl to 2bpp data at de. - ld [hROMBankTemp],a - ld a,[H_LOADEDROMBANK] + ld [hROMBankTemp], a + ld a, [H_LOADEDROMBANK] push af - ld a,[hROMBankTemp] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, [hROMBankTemp] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a .loop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de - ld [de],a + ld [de], a inc de dec bc - ld a,c + ld a, c or b - jr nz,.loop + jr nz, .loop pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret CopyVideoData:: diff --git a/home/overworld.asm b/home/overworld.asm index 509b699b..317459ce 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -43,152 +43,152 @@ OverworldLoop:: OverworldLoopLessDelay:: call DelayFrame call LoadGBPal - ld a,[wd736] - bit 6,a ; jumping down a ledge? + ld a, [wd736] + bit 6, a ; jumping down a ledge? call nz, HandleMidJump - ld a,[wWalkCounter] + ld a, [wWalkCounter] and a - jp nz,.moveAhead ; if the player sprite has not yet completed the walking animation + jp nz, .moveAhead ; if the player sprite has not yet completed the walking animation call JoypadOverworld ; get joypad state (which is possibly simulated) callba SafariZoneCheck - ld a,[wSafariZoneGameOver] + ld a, [wSafariZoneGameOver] and a - jp nz,WarpFound2 - ld hl,wd72d - bit 3,[hl] - res 3,[hl] - jp nz,WarpFound2 - ld a,[wd732] + jp nz, WarpFound2 + ld hl, wd72d + bit 3, [hl] + res 3, [hl] + jp nz, WarpFound2 + ld a, [wd732] and 1 << 4 | 1 << 3 ; fly warp or dungeon warp - jp nz,HandleFlyWarpOrDungeonWarp - ld a,[wCurOpponent] + jp nz, HandleFlyWarpOrDungeonWarp + ld a, [wCurOpponent] and a - jp nz,.newBattle - ld a,[wd730] - bit 7,a ; are we simulating button presses? - jr z,.notSimulating - ld a,[hJoyHeld] + jp nz, .newBattle + ld a, [wd730] + bit 7, a ; are we simulating button presses? + jr z, .notSimulating + ld a, [hJoyHeld] jr .checkIfStartIsPressed .notSimulating - ld a,[hJoyPressed] + ld a, [hJoyPressed] .checkIfStartIsPressed - bit 3,a ; start button - jr z,.startButtonNotPressed + bit 3, a ; start button + jr z, .startButtonNotPressed ; if START is pressed xor a - ld [hSpriteIndexOrTextID],a ; start menu text ID + ld [hSpriteIndexOrTextID], a ; start menu text ID jp .displayDialogue .startButtonNotPressed - bit 0,a ; A button - jp z,.checkIfDownButtonIsPressed + bit 0, a ; A button + jp z, .checkIfDownButtonIsPressed ; if A is pressed - ld a,[wd730] - bit 2,a - jp nz,.noDirectionButtonsPressed + ld a, [wd730] + bit 2, a + jp nz, .noDirectionButtonsPressed call IsPlayerCharacterBeingControlledByGame - jr nz,.checkForOpponent + jr nz, .checkForOpponent call CheckForHiddenObjectOrBookshelfOrCardKeyDoor - ld a,[$ffeb] + ld a, [$ffeb] and a - jp z,OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found + jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found call IsSpriteOrSignInFrontOfPlayer - ld a,[hSpriteIndexOrTextID] + ld a, [hSpriteIndexOrTextID] and a - jp z,OverworldLoop + jp z, OverworldLoop .displayDialogue predef GetTileAndCoordsInFrontOfPlayer call UpdateSprites - ld a,[wFlags_0xcd60] - bit 2,a - jr nz,.checkForOpponent - bit 0,a - jr nz,.checkForOpponent + ld a, [wFlags_0xcd60] + bit 2, a + jr nz, .checkForOpponent + bit 0, a + jr nz, .checkForOpponent aCoord 8, 9 - ld [wTilePlayerStandingOn],a ; unused? + ld [wTilePlayerStandingOn], a ; unused? call DisplayTextID ; display either the start menu or the NPC/sign text - ld a,[wEnteringCableClub] + ld a, [wEnteringCableClub] and a - jr z,.checkForOpponent + jr z, .checkForOpponent dec a - ld a,0 - ld [wEnteringCableClub],a - jr z,.changeMap + ld a, 0 + ld [wEnteringCableClub], a + jr z, .changeMap ; XXX can this code be reached? predef LoadSAV - ld a,[wCurMap] - ld [wDestinationMap],a + ld a, [wCurMap] + ld [wDestinationMap], a call SpecialWarpIn - ld a,[wCurMap] + ld a, [wCurMap] call SwitchToMapRomBank ; switch to the ROM bank of the current map - ld hl,wCurMapTileset - set 7,[hl] + ld hl, wCurMapTileset + set 7, [hl] .changeMap jp EnterMap .checkForOpponent - ld a,[wCurOpponent] + ld a, [wCurOpponent] and a - jp nz,.newBattle + jp nz, .newBattle jp OverworldLoop .noDirectionButtonsPressed - ld hl,wFlags_0xcd60 - res 2,[hl] + ld hl, wFlags_0xcd60 + res 2, [hl] call UpdateSprites ld a, 1 - ld [wCheckFor180DegreeTurn],a - ld a,[wPlayerMovingDirection] ; the direction that was pressed last time + ld [wCheckFor180DegreeTurn], a + ld a, [wPlayerMovingDirection] ; the direction that was pressed last time and a - jp z,OverworldLoop + jp z, OverworldLoop ; if a direction was pressed last time - ld [wPlayerLastStopDirection],a ; save the last direction + ld [wPlayerLastStopDirection], a ; save the last direction xor a - ld [wPlayerMovingDirection],a ; zero the direction + ld [wPlayerMovingDirection], a ; zero the direction jp OverworldLoop .checkIfDownButtonIsPressed - ld a,[hJoyHeld] ; current joypad state - bit 7,a ; down button - jr z,.checkIfUpButtonIsPressed - ld a,1 - ld [wSpriteStateData1 + 3],a ; delta Y - ld a,PLAYER_DIR_DOWN + ld a, [hJoyHeld] ; current joypad state + bit 7, a ; down button + jr z, .checkIfUpButtonIsPressed + ld a, 1 + ld [wSpriteStateData1 + 3], a ; delta Y + ld a, PLAYER_DIR_DOWN jr .handleDirectionButtonPress .checkIfUpButtonIsPressed - bit 6,a ; up button - jr z,.checkIfLeftButtonIsPressed - ld a,-1 - ld [wSpriteStateData1 + 3],a ; delta Y - ld a,PLAYER_DIR_UP + bit 6, a ; up button + jr z, .checkIfLeftButtonIsPressed + ld a, -1 + ld [wSpriteStateData1 + 3], a ; delta Y + ld a, PLAYER_DIR_UP jr .handleDirectionButtonPress .checkIfLeftButtonIsPressed - bit 5,a ; left button - jr z,.checkIfRightButtonIsPressed - ld a,-1 - ld [wSpriteStateData1 + 5],a ; delta X - ld a,PLAYER_DIR_LEFT + bit 5, a ; left button + jr z, .checkIfRightButtonIsPressed + ld a, -1 + ld [wSpriteStateData1 + 5], a ; delta X + ld a, PLAYER_DIR_LEFT jr .handleDirectionButtonPress .checkIfRightButtonIsPressed - bit 4,a ; right button - jr z,.noDirectionButtonsPressed + bit 4, a ; right button + jr z, .noDirectionButtonsPressed ld a, 1 - ld [wSpriteStateData1 + 5],a ; delta X + ld [wSpriteStateData1 + 5], a ; delta X .handleDirectionButtonPress - ld [wPlayerDirection],a ; new direction - ld a,[wd730] - bit 7,a ; are we simulating button presses? - jr nz,.noDirectionChange ; ignore direction changes if we are - ld a,[wCheckFor180DegreeTurn] + ld [wPlayerDirection], a ; new direction + ld a, [wd730] + bit 7, a ; are we simulating button presses? + jr nz, .noDirectionChange ; ignore direction changes if we are + ld a, [wCheckFor180DegreeTurn] and a - jr z,.noDirectionChange - ld a,[wPlayerDirection] ; new direction - ld b,a - ld a,[wPlayerLastStopDirection] ; old direction + jr z, .noDirectionChange + ld a, [wPlayerDirection] ; new direction + ld b, a + ld a, [wPlayerLastStopDirection] ; old direction cp b - jr z,.noDirectionChange + jr z, .noDirectionChange ; Check whether the player did a 180-degree turn. ; It appears that this code was supposed to show the player rotate by having ; the player's sprite face an intermediate direction before facing the opposite @@ -199,175 +199,175 @@ OverworldLoopLessDelay:: ; direction is set for V-blank to occur while the direction is still set. swap a ; put old direction in upper half or b ; put new direction in lower half - cp a,(PLAYER_DIR_DOWN << 4) | PLAYER_DIR_UP ; change dir from down to up - jr nz,.notDownToUp - ld a,PLAYER_DIR_LEFT - ld [wPlayerMovingDirection],a + cp (PLAYER_DIR_DOWN << 4) | PLAYER_DIR_UP ; change dir from down to up + jr nz, .notDownToUp + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a jr .holdIntermediateDirectionLoop .notDownToUp - cp a,(PLAYER_DIR_UP << 4) | PLAYER_DIR_DOWN ; change dir from up to down - jr nz,.notUpToDown - ld a,PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection],a + cp (PLAYER_DIR_UP << 4) | PLAYER_DIR_DOWN ; change dir from up to down + jr nz, .notUpToDown + ld a, PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a jr .holdIntermediateDirectionLoop .notUpToDown - cp a,(PLAYER_DIR_RIGHT << 4) | PLAYER_DIR_LEFT ; change dir from right to left - jr nz,.notRightToLeft - ld a,PLAYER_DIR_DOWN - ld [wPlayerMovingDirection],a + cp (PLAYER_DIR_RIGHT << 4) | PLAYER_DIR_LEFT ; change dir from right to left + jr nz, .notRightToLeft + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a jr .holdIntermediateDirectionLoop .notRightToLeft - cp a,(PLAYER_DIR_LEFT << 4) | PLAYER_DIR_RIGHT ; change dir from left to right - jr nz,.holdIntermediateDirectionLoop - ld a,PLAYER_DIR_UP - ld [wPlayerMovingDirection],a + cp (PLAYER_DIR_LEFT << 4) | PLAYER_DIR_RIGHT ; change dir from left to right + jr nz, .holdIntermediateDirectionLoop + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a .holdIntermediateDirectionLoop - ld hl,wFlags_0xcd60 - set 2,[hl] - ld hl,wCheckFor180DegreeTurn + ld hl, wFlags_0xcd60 + set 2, [hl] + ld hl, wCheckFor180DegreeTurn dec [hl] - jr nz,.holdIntermediateDirectionLoop - ld a,[wPlayerDirection] - ld [wPlayerMovingDirection],a + jr nz, .holdIntermediateDirectionLoop + ld a, [wPlayerDirection] + ld [wPlayerMovingDirection], a call NewBattle - jp c,.battleOccurred + jp c, .battleOccurred jp OverworldLoop .noDirectionChange - ld a,[wPlayerDirection] ; current direction - ld [wPlayerMovingDirection],a ; save direction + ld a, [wPlayerDirection] ; current direction + ld [wPlayerMovingDirection], a ; save direction call UpdateSprites - ld a,[wWalkBikeSurfState] + ld a, [wWalkBikeSurfState] cp $02 ; surfing - jr z,.surfing + jr z, .surfing ; not surfing call CollisionCheckOnLand - jr nc,.noCollision + jr nc, .noCollision ; collision occurred push hl - ld hl,wd736 - bit 2,[hl] ; standing on warp flag + ld hl, wd736 + bit 2, [hl] ; standing on warp flag pop hl - jp z,OverworldLoop + jp z, OverworldLoop ; collision occurred while standing on a warp push hl call ExtraWarpCheck ; sets carry if there is a potential to warp pop hl - jp c,CheckWarpsCollision + jp c, CheckWarpsCollision jp OverworldLoop .surfing call CollisionCheckOnWater - jp c,OverworldLoop + jp c, OverworldLoop .noCollision - ld a,$08 - ld [wWalkCounter],a + ld a, $08 + ld [wWalkCounter], a jr .moveAhead2 .moveAhead - ld a,[wd736] - bit 7,a - jr z,.noSpinning + ld a, [wd736] + bit 7, a + jr z, .noSpinning callba LoadSpinnerArrowTiles .noSpinning call UpdateSprites .moveAhead2 - ld hl,wFlags_0xcd60 - res 2,[hl] - ld a,[wWalkBikeSurfState] + ld hl, wFlags_0xcd60 + res 2, [hl] + ld a, [wWalkBikeSurfState] dec a ; riding a bike? - jr nz,.normalPlayerSpriteAdvancement - ld a,[wd736] - bit 6,a ; jumping a ledge? - jr nz,.normalPlayerSpriteAdvancement + jr nz, .normalPlayerSpriteAdvancement + ld a, [wd736] + bit 6, a ; jumping a ledge? + jr nz, .normalPlayerSpriteAdvancement call DoBikeSpeedup .normalPlayerSpriteAdvancement call AdvancePlayerSprite - ld a,[wWalkCounter] + ld a, [wWalkCounter] and a - jp nz,CheckMapConnections ; it seems like this check will never succeed (the other place where CheckMapConnections is run works) + jp nz, CheckMapConnections ; it seems like this check will never succeed (the other place where CheckMapConnections is run works) ; walking animation finished - ld a,[wd730] - bit 7,a - jr nz,.doneStepCounting ; if button presses are being simulated, don't count steps + ld a, [wd730] + bit 7, a + jr nz, .doneStepCounting ; if button presses are being simulated, don't count steps ; step counting - ld hl,wStepCounter + ld hl, wStepCounter dec [hl] - ld a,[wd72c] - bit 0,a - jr z,.doneStepCounting - ld hl,wNumberOfNoRandomBattleStepsLeft + ld a, [wd72c] + bit 0, a + jr z, .doneStepCounting + ld hl, wNumberOfNoRandomBattleStepsLeft dec [hl] - jr nz,.doneStepCounting - ld hl,wd72c - res 0,[hl] ; indicate that the player has stepped thrice since the last battle + jr nz, .doneStepCounting + ld hl, wd72c + res 0, [hl] ; indicate that the player has stepped thrice since the last battle .doneStepCounting CheckEvent EVENT_IN_SAFARI_ZONE - jr z,.notSafariZone + jr z, .notSafariZone callba SafariZoneCheckSteps - ld a,[wSafariZoneGameOver] + ld a, [wSafariZoneGameOver] and a - jp nz,WarpFound2 + jp nz, WarpFound2 .notSafariZone - ld a,[wIsInBattle] + ld a, [wIsInBattle] and a - jp nz,CheckWarpsNoCollision + jp nz, CheckWarpsNoCollision predef ApplyOutOfBattlePoisonDamage ; also increment daycare mon exp - ld a,[wOutOfBattleBlackout] + ld a, [wOutOfBattleBlackout] and a - jp nz,HandleBlackOut ; if all pokemon fainted + jp nz, HandleBlackOut ; if all pokemon fainted .newBattle call NewBattle - ld hl,wd736 - res 2,[hl] ; standing on warp flag - jp nc,CheckWarpsNoCollision ; check for warps if there was no battle + ld hl, wd736 + res 2, [hl] ; standing on warp flag + jp nc, CheckWarpsNoCollision ; check for warps if there was no battle .battleOccurred - ld hl,wd72d - res 6,[hl] - ld hl,wFlags_D733 - res 3,[hl] - ld hl,wCurrentMapScriptFlags - set 5,[hl] - set 6,[hl] + ld hl, wd72d + res 6, [hl] + ld hl, wFlags_D733 + res 3, [hl] + ld hl, wCurrentMapScriptFlags + set 5, [hl] + set 6, [hl] xor a - ld [hJoyHeld],a - ld a,[wCurMap] + ld [hJoyHeld], a + ld a, [wCurMap] cp CINNABAR_GYM - jr nz,.notCinnabarGym + jr nz, .notCinnabarGym SetEvent EVENT_2A7 .notCinnabarGym - ld hl,wd72e - set 5,[hl] - ld a,[wCurMap] + ld hl, wd72e + set 5, [hl] + ld a, [wCurMap] cp OAKS_LAB - jp z,.noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab + jp z, .noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab callab AnyPartyAlive - ld a,d + ld a, d and a - jr z,.allPokemonFainted + jr z, .allPokemonFainted .noFaintCheck - ld c,10 + ld c, 10 call DelayFrames jp EnterMap .allPokemonFainted - ld a,$ff - ld [wIsInBattle],a + ld a, $ff + ld [wIsInBattle], a call RunMapScript jp HandleBlackOut ; function to determine if there will be a battle and execute it (either a trainer battle or wild battle) ; sets carry if a battle occurred and unsets carry if not NewBattle:: - ld a,[wd72d] - bit 4,a - jr nz,.noBattle + ld a, [wd72d] + bit 4, a + jr nz, .noBattle call IsPlayerCharacterBeingControlledByGame - jr nz,.noBattle ; no battle if the player character is under the game's control - ld a,[wd72e] - bit 4,a - jr nz,.noBattle + jr nz, .noBattle ; no battle if the player character is under the game's control + ld a, [wd72e] + bit 4, a + jr nz, .noBattle jpba InitBattle .noBattle and a @@ -375,13 +375,13 @@ NewBattle:: ; function to make bikes twice as fast as walking DoBikeSpeedup:: - ld a,[wNPCMovementScriptPointerTableNum] + ld a, [wNPCMovementScriptPointerTableNum] and a ret nz - ld a,[wCurMap] + ld a, [wCurMap] cp ROUTE_17 ; Cycling Road - jr nz,.goFaster - ld a,[hJoyHeld] + jr nz, .goFaster + ld a, [hJoyHeld] and D_UP | D_LEFT | D_RIGHT ret nz .goFaster @@ -389,73 +389,73 @@ DoBikeSpeedup:: ; check if the player has stepped onto a warp after having not collided CheckWarpsNoCollision:: - ld a,[wNumberOfWarps] + ld a, [wNumberOfWarps] and a - jp z,CheckMapConnections - ld a,[wNumberOfWarps] - ld b,0 - ld c,a - ld a,[wYCoord] - ld d,a - ld a,[wXCoord] - ld e,a - ld hl,wWarpEntries + jp z, CheckMapConnections + ld a, [wNumberOfWarps] + ld b, 0 + ld c, a + ld a, [wYCoord] + ld d, a + ld a, [wXCoord] + ld e, a + ld hl, wWarpEntries CheckWarpsNoCollisionLoop:: - ld a,[hli] ; check if the warp's Y position matches + ld a, [hli] ; check if the warp's Y position matches cp d - jr nz,CheckWarpsNoCollisionRetry1 - ld a,[hli] ; check if the warp's X position matches + jr nz, CheckWarpsNoCollisionRetry1 + ld a, [hli] ; check if the warp's X position matches cp e - jr nz,CheckWarpsNoCollisionRetry2 + jr nz, CheckWarpsNoCollisionRetry2 ; if a match was found push hl push bc - ld hl,wd736 - set 2,[hl] ; standing on warp flag + ld hl, wd736 + set 2, [hl] ; standing on warp flag callba IsPlayerStandingOnDoorTileOrWarpTile pop bc pop hl - jr c,WarpFound1 ; jump if standing on door or warp + jr c, WarpFound1 ; jump if standing on door or warp push hl push bc call ExtraWarpCheck pop bc pop hl - jr nc,CheckWarpsNoCollisionRetry2 + jr nc, CheckWarpsNoCollisionRetry2 ; if the extra check passed - ld a,[wFlags_D733] - bit 2,a - jr nz,WarpFound1 + ld a, [wFlags_D733] + bit 2, a + jr nz, WarpFound1 push de push bc call Joypad pop bc pop de - ld a,[hJoyHeld] + ld a, [hJoyHeld] and D_DOWN | D_UP | D_LEFT | D_RIGHT - jr z,CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp + jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp jr WarpFound1 ; check if the player has stepped onto a warp after having collided CheckWarpsCollision:: - ld a,[wNumberOfWarps] - ld c,a - ld hl,wWarpEntries + ld a, [wNumberOfWarps] + ld c, a + ld hl, wWarpEntries .loop - ld a,[hli] ; Y coordinate of warp - ld b,a - ld a,[wYCoord] + ld a, [hli] ; Y coordinate of warp + ld b, a + ld a, [wYCoord] cp b - jr nz,.retry1 - ld a,[hli] ; X coordinate of warp - ld b,a - ld a,[wXCoord] + jr nz, .retry1 + ld a, [hli] ; X coordinate of warp + ld b, a + ld a, [wXCoord] cp b - jr nz,.retry2 - ld a,[hli] - ld [wDestinationWarpID],a - ld a,[hl] - ld [hWarpDestinationMap],a + jr nz, .retry2 + ld a, [hli] + ld [wDestinationWarpID], a + ld a, [hl] + ld [hWarpDestinationMap], a jr WarpFound2 .retry1 inc hl @@ -463,7 +463,7 @@ CheckWarpsCollision:: inc hl inc hl dec c - jr nz,.loop + jr nz, .loop jp OverworldLoop CheckWarpsNoCollisionRetry1:: @@ -474,30 +474,30 @@ CheckWarpsNoCollisionRetry2:: jp ContinueCheckWarpsNoCollisionLoop WarpFound1:: - ld a,[hli] - ld [wDestinationWarpID],a - ld a,[hli] - ld [hWarpDestinationMap],a + ld a, [hli] + ld [wDestinationWarpID], a + ld a, [hli] + ld [hWarpDestinationMap], a WarpFound2:: - ld a,[wNumberOfWarps] + ld a, [wNumberOfWarps] sub c - ld [wWarpedFromWhichWarp],a ; save ID of used warp - ld a,[wCurMap] - ld [wWarpedFromWhichMap],a + ld [wWarpedFromWhichWarp], a ; save ID of used warp + ld a, [wCurMap] + ld [wWarpedFromWhichMap], a call CheckIfInOutsideMap - jr nz,.indoorMaps + jr nz, .indoorMaps ; this is for handling "outside" maps that can't have the 0xFF destination map - ld a,[wCurMap] - ld [wLastMap],a - ld a,[wCurMapWidth] - ld [wUnusedD366],a ; not read - ld a,[hWarpDestinationMap] - ld [wCurMap],a + ld a, [wCurMap] + ld [wLastMap], a + ld a, [wCurMapWidth] + ld [wUnusedD366], a ; not read + ld a, [hWarpDestinationMap] + ld [wCurMap], a cp ROCK_TUNNEL_1 - jr nz,.notRockTunnel - ld a,$06 - ld [wMapPalOffset],a + jr nz, .notRockTunnel + ld a, $06 + ld [wMapPalOffset], a call GBFadeOutToBlack .notRockTunnel call PlayMapChangeSound @@ -506,172 +506,172 @@ WarpFound2:: ; 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,[hWarpDestinationMap] ; destination map + ld a, [hWarpDestinationMap] ; destination map cp $ff - jr z,.goBackOutside + jr z, .goBackOutside ; if not going back to the previous map - ld [wCurMap],a + ld [wCurMap], a callba IsPlayerStandingOnWarpPadOrHole - ld a,[wStandingOnWarpPadOrHole] + ld a, [wStandingOnWarpPadOrHole] dec a ; is the player on a warp pad? - jr nz,.notWarpPad + jr nz, .notWarpPad ; if the player is on a warp pad - ld hl,wd732 - set 3,[hl] + ld hl, wd732 + set 3, [hl] call LeaveMapAnim jr .skipMapChangeSound .notWarpPad call PlayMapChangeSound .skipMapChangeSound - ld hl,wd736 - res 0,[hl] - res 1,[hl] + ld hl, wd736 + res 0, [hl] + res 1, [hl] jr .done .goBackOutside - ld a,[wLastMap] - ld [wCurMap],a + ld a, [wLastMap] + ld [wCurMap], a call PlayMapChangeSound xor a - ld [wMapPalOffset],a + ld [wMapPalOffset], a .done - ld hl,wd736 - set 0,[hl] ; have the player's sprite step out from the door (if there is one) + ld hl, wd736 + set 0, [hl] ; have the player's sprite step out from the door (if there is one) call IgnoreInputForHalfSecond jp EnterMap ContinueCheckWarpsNoCollisionLoop:: inc b ; increment warp number dec c ; decrement number of warps - jp nz,CheckWarpsNoCollisionLoop + jp nz, CheckWarpsNoCollisionLoop ; if no matching warp was found CheckMapConnections:: .checkWestMap - ld a,[wXCoord] + ld a, [wXCoord] cp $ff - jr nz,.checkEastMap - ld a,[wMapConn3Ptr] - ld [wCurMap],a - ld a,[wWestConnectedMapXAlignment] ; new X coordinate upon entering west map - ld [wXCoord],a - ld a,[wYCoord] - ld c,a - ld a,[wWestConnectedMapYAlignment] ; Y adjustment upon entering west map + jr nz, .checkEastMap + ld a, [wMapConn3Ptr] + ld [wCurMap], a + ld a, [wWestConnectedMapXAlignment] ; new X coordinate upon entering west map + ld [wXCoord], a + ld a, [wYCoord] + ld c, a + ld a, [wWestConnectedMapYAlignment] ; Y adjustment upon entering west map add c - ld c,a - ld [wYCoord],a - ld a,[wWestConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position - ld l,a - ld a,[wWestConnectedMapViewPointer + 1] - ld h,a + ld c, a + ld [wYCoord], a + ld a, [wWestConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position + ld l, a + ld a, [wWestConnectedMapViewPointer + 1] + ld h, a srl c - jr z,.savePointer1 + jr z, .savePointer1 .pointerAdjustmentLoop1 - ld a,[wWestConnectedMapWidth] ; width of connected map + ld a, [wWestConnectedMapWidth] ; width of connected map add MAP_BORDER * 2 - ld e,a - ld d,0 - ld b,0 - add hl,de + ld e, a + ld d, 0 + ld b, 0 + add hl, de dec c - jr nz,.pointerAdjustmentLoop1 + jr nz, .pointerAdjustmentLoop1 .savePointer1 - ld a,l - ld [wCurrentTileBlockMapViewPointer],a ; pointer to upper left corner of current tile block map section - ld a,h - ld [wCurrentTileBlockMapViewPointer + 1],a + ld a, l + ld [wCurrentTileBlockMapViewPointer], a ; pointer to upper left corner of current tile block map section + ld a, h + ld [wCurrentTileBlockMapViewPointer + 1], a jp .loadNewMap .checkEastMap - ld b,a - ld a,[wCurrentMapWidth2] ; map width + ld b, a + ld a, [wCurrentMapWidth2] ; map width cp b - jr nz,.checkNorthMap - ld a,[wMapConn4Ptr] - ld [wCurMap],a - ld a,[wEastConnectedMapXAlignment] ; new X coordinate upon entering east map - ld [wXCoord],a - ld a,[wYCoord] - ld c,a - ld a,[wEastConnectedMapYAlignment] ; Y adjustment upon entering east map + jr nz, .checkNorthMap + ld a, [wMapConn4Ptr] + ld [wCurMap], a + ld a, [wEastConnectedMapXAlignment] ; new X coordinate upon entering east map + ld [wXCoord], a + ld a, [wYCoord] + ld c, a + ld a, [wEastConnectedMapYAlignment] ; Y adjustment upon entering east map add c - ld c,a - ld [wYCoord],a - ld a,[wEastConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position - ld l,a - ld a,[wEastConnectedMapViewPointer + 1] - ld h,a + ld c, a + ld [wYCoord], a + ld a, [wEastConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position + ld l, a + ld a, [wEastConnectedMapViewPointer + 1] + ld h, a srl c - jr z,.savePointer2 + jr z, .savePointer2 .pointerAdjustmentLoop2 - ld a,[wEastConnectedMapWidth] + ld a, [wEastConnectedMapWidth] add MAP_BORDER * 2 - ld e,a - ld d,0 - ld b,0 - add hl,de + ld e, a + ld d, 0 + ld b, 0 + add hl, de dec c - jr nz,.pointerAdjustmentLoop2 + jr nz, .pointerAdjustmentLoop2 .savePointer2 - ld a,l - ld [wCurrentTileBlockMapViewPointer],a ; pointer to upper left corner of current tile block map section - ld a,h - ld [wCurrentTileBlockMapViewPointer + 1],a + ld a, l + ld [wCurrentTileBlockMapViewPointer], a ; pointer to upper left corner of current tile block map section + ld a, h + ld [wCurrentTileBlockMapViewPointer + 1], a jp .loadNewMap .checkNorthMap - ld a,[wYCoord] + ld a, [wYCoord] cp $ff - jr nz,.checkSouthMap - ld a,[wMapConn1Ptr] - ld [wCurMap],a - ld a,[wNorthConnectedMapYAlignment] ; new Y coordinate upon entering north map - ld [wYCoord],a - ld a,[wXCoord] - ld c,a - ld a,[wNorthConnectedMapXAlignment] ; X adjustment upon entering north map + jr nz, .checkSouthMap + ld a, [wMapConn1Ptr] + ld [wCurMap], a + ld a, [wNorthConnectedMapYAlignment] ; new Y coordinate upon entering north map + ld [wYCoord], a + ld a, [wXCoord] + ld c, a + ld a, [wNorthConnectedMapXAlignment] ; X adjustment upon entering north map add c - ld c,a - ld [wXCoord],a - ld a,[wNorthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position - ld l,a - ld a,[wNorthConnectedMapViewPointer + 1] - ld h,a - ld b,0 + ld c, a + ld [wXCoord], a + ld a, [wNorthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position + ld l, a + ld a, [wNorthConnectedMapViewPointer + 1] + ld h, a + ld b, 0 srl c - add hl,bc - ld a,l - ld [wCurrentTileBlockMapViewPointer],a ; pointer to upper left corner of current tile block map section - ld a,h - ld [wCurrentTileBlockMapViewPointer + 1],a + add hl, bc + ld a, l + ld [wCurrentTileBlockMapViewPointer], a ; pointer to upper left corner of current tile block map section + ld a, h + ld [wCurrentTileBlockMapViewPointer + 1], a jp .loadNewMap .checkSouthMap - ld b,a - ld a,[wCurrentMapHeight2] + ld b, a + ld a, [wCurrentMapHeight2] cp b - jr nz,.didNotEnterConnectedMap - ld a,[wMapConn2Ptr] - ld [wCurMap],a - ld a,[wSouthConnectedMapYAlignment] ; new Y coordinate upon entering south map - ld [wYCoord],a - ld a,[wXCoord] - ld c,a - ld a,[wSouthConnectedMapXAlignment] ; X adjustment upon entering south map + jr nz, .didNotEnterConnectedMap + ld a, [wMapConn2Ptr] + ld [wCurMap], a + ld a, [wSouthConnectedMapYAlignment] ; new Y coordinate upon entering south map + ld [wYCoord], a + ld a, [wXCoord] + ld c, a + ld a, [wSouthConnectedMapXAlignment] ; X adjustment upon entering south map add c - ld c,a - ld [wXCoord],a - ld a,[wSouthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position - ld l,a - ld a,[wSouthConnectedMapViewPointer + 1] - ld h,a - ld b,0 + ld c, a + ld [wXCoord], a + ld a, [wSouthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position + ld l, a + ld a, [wSouthConnectedMapViewPointer + 1] + ld h, a + ld b, 0 srl c - add hl,bc - ld a,l - ld [wCurrentTileBlockMapViewPointer],a ; pointer to upper left corner of current tile block map section - ld a,h - ld [wCurrentTileBlockMapViewPointer + 1],a + add hl, bc + ld a, l + ld [wCurrentTileBlockMapViewPointer], a ; pointer to upper left corner of current tile block map section + ld a, h + ld [wCurrentTileBlockMapViewPointer + 1], a .loadNewMap ; load the connected map that was entered call LoadMapHeader call PlayDefaultMusicFadeOutCurrent @@ -690,14 +690,14 @@ CheckMapConnections:: PlayMapChangeSound:: aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on cp $0b ; door tile in tileset 0 - jr nz,.didNotGoThroughDoor - ld a,SFX_GO_INSIDE + jr nz, .didNotGoThroughDoor + ld a, SFX_GO_INSIDE jr .playSound .didNotGoThroughDoor - ld a,SFX_GO_OUTSIDE + ld a, SFX_GO_OUTSIDE .playSound call PlaySound - ld a,[wMapPalOffset] + ld a, [wMapPalOffset] and a ret nz jp GBFadeOutToBlack @@ -748,9 +748,9 @@ ExtraWarpCheck:: MapEntryAfterBattle:: callba IsPlayerStandingOnWarp ; for enabling warp testing after collisions - ld a,[wMapPalOffset] + ld a, [wMapPalOffset] and a - jp z,GBFadeInFromWhite + jp z, GBFadeInFromWhite jp LoadGBPal HandleBlackOut:: @@ -871,205 +871,205 @@ INCLUDE "data/bike_riding_tilesets.asm" ; load the tile pattern data of the current tileset into VRAM LoadTilesetTilePatternData:: - ld a,[wTilesetGfxPtr] - ld l,a - ld a,[wTilesetGfxPtr + 1] - ld h,a - ld de,vTileset - ld bc,$600 - ld a,[wTilesetBank] + ld a, [wTilesetGfxPtr] + ld l, a + ld a, [wTilesetGfxPtr + 1] + ld h, a + ld de, vTileset + ld bc, $600 + ld a, [wTilesetBank] jp FarCopyData2 ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8 ; it can also load partial tile maps of connected maps into a border of length 3 around the current map LoadTileBlockMap:: ; fill C6E8-CBFB with the background tile - ld hl,wOverworldMap - ld a,[wMapBackgroundTile] - ld d,a - ld bc,$0514 + ld hl, wOverworldMap + ld a, [wMapBackgroundTile] + ld d, a + ld bc, $0514 .backgroundTileLoop - ld a,d - ld [hli],a + ld a, d + ld [hli], a dec bc - ld a,c + ld a, c or b - jr nz,.backgroundTileLoop + jr nz, .backgroundTileLoop ; load tile map of current map (made of tile block IDs) ; 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,[wCurMapWidth] - ld [hMapWidth],a + ld hl, wOverworldMap + ld a, [wCurMapWidth] + ld [hMapWidth], a add MAP_BORDER * 2 ; east and west - ld [hMapStride],a ; map width + border - ld b,0 - ld c,a + ld [hMapStride], a ; map width + border + ld b, 0 + ld c, a ; make space for north border (next 3 lines) - add hl,bc - add hl,bc - add hl,bc - ld c,MAP_BORDER - add hl,bc ; this puts us past the (west) border - ld a,[wMapDataPtr] ; tile map pointer - ld e,a - ld a,[wMapDataPtr + 1] - ld d,a ; de = tile map pointer - ld a,[wCurMapHeight] - ld b,a + add hl, bc + add hl, bc + add hl, bc + ld c, MAP_BORDER + add hl, bc ; this puts us past the (west) border + ld a, [wMapDataPtr] ; tile map pointer + ld e, a + ld a, [wMapDataPtr + 1] + ld d, a ; de = tile map pointer + ld a, [wCurMapHeight] + ld b, a .rowLoop ; copy one row each iteration push hl - ld a,[hMapWidth] ; map width (without border) - ld c,a + ld a, [hMapWidth] ; map width (without border) + ld c, a .rowInnerLoop - ld a,[de] + ld a, [de] inc de - ld [hli],a + ld [hli], a dec c - jr nz,.rowInnerLoop + 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,[hMapStride] ; map width + border + ld a, [hMapStride] ; map width + border add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry dec b - jr nz,.rowLoop + jr nz, .rowLoop .northConnection - ld a,[wMapConn1Ptr] + ld a, [wMapConn1Ptr] cp $ff - jr z,.southConnection + jr z, .southConnection call SwitchToMapRomBank - ld a,[wNorthConnectionStripSrc] - ld l,a - ld a,[wNorthConnectionStripSrc + 1] - ld h,a - ld a,[wNorthConnectionStripDest] - ld e,a - ld a,[wNorthConnectionStripDest + 1] - ld d,a - ld a,[wNorthConnectionStripWidth] - ld [hNorthSouthConnectionStripWidth],a - ld a,[wNorthConnectedMapWidth] - ld [hNorthSouthConnectedMapWidth],a + ld a, [wNorthConnectionStripSrc] + ld l, a + ld a, [wNorthConnectionStripSrc + 1] + ld h, a + ld a, [wNorthConnectionStripDest] + ld e, a + ld a, [wNorthConnectionStripDest + 1] + ld d, a + ld a, [wNorthConnectionStripWidth] + ld [hNorthSouthConnectionStripWidth], a + ld a, [wNorthConnectedMapWidth] + ld [hNorthSouthConnectedMapWidth], a call LoadNorthSouthConnectionsTileMap .southConnection - ld a,[wMapConn2Ptr] + ld a, [wMapConn2Ptr] cp $ff - jr z,.westConnection + jr z, .westConnection call SwitchToMapRomBank - ld a,[wSouthConnectionStripSrc] - ld l,a - ld a,[wSouthConnectionStripSrc + 1] - ld h,a - ld a,[wSouthConnectionStripDest] - ld e,a - ld a,[wSouthConnectionStripDest + 1] - ld d,a - ld a,[wSouthConnectionStripWidth] - ld [hNorthSouthConnectionStripWidth],a - ld a,[wSouthConnectedMapWidth] - ld [hNorthSouthConnectedMapWidth],a + ld a, [wSouthConnectionStripSrc] + ld l, a + ld a, [wSouthConnectionStripSrc + 1] + ld h, a + ld a, [wSouthConnectionStripDest] + ld e, a + ld a, [wSouthConnectionStripDest + 1] + ld d, a + ld a, [wSouthConnectionStripWidth] + ld [hNorthSouthConnectionStripWidth], a + ld a, [wSouthConnectedMapWidth] + ld [hNorthSouthConnectedMapWidth], a call LoadNorthSouthConnectionsTileMap .westConnection - ld a,[wMapConn3Ptr] + ld a, [wMapConn3Ptr] cp $ff - jr z,.eastConnection + jr z, .eastConnection call SwitchToMapRomBank - ld a,[wWestConnectionStripSrc] - ld l,a - ld a,[wWestConnectionStripSrc + 1] - ld h,a - ld a,[wWestConnectionStripDest] - ld e,a - ld a,[wWestConnectionStripDest + 1] - ld d,a - ld a,[wWestConnectionStripHeight] - ld b,a - ld a,[wWestConnectedMapWidth] - ld [hEastWestConnectedMapWidth],a + ld a, [wWestConnectionStripSrc] + ld l, a + ld a, [wWestConnectionStripSrc + 1] + ld h, a + ld a, [wWestConnectionStripDest] + ld e, a + ld a, [wWestConnectionStripDest + 1] + ld d, a + ld a, [wWestConnectionStripHeight] + ld b, a + ld a, [wWestConnectedMapWidth] + ld [hEastWestConnectedMapWidth], a call LoadEastWestConnectionsTileMap .eastConnection - ld a,[wMapConn4Ptr] + ld a, [wMapConn4Ptr] cp $ff - jr z,.done + jr z, .done call SwitchToMapRomBank - ld a,[wEastConnectionStripSrc] - ld l,a - ld a,[wEastConnectionStripSrc + 1] - ld h,a - ld a,[wEastConnectionStripDest] - ld e,a - ld a,[wEastConnectionStripDest + 1] - ld d,a - ld a,[wEastConnectionStripHeight] - ld b,a - ld a,[wEastConnectedMapWidth] - ld [hEastWestConnectedMapWidth],a + ld a, [wEastConnectionStripSrc] + ld l, a + ld a, [wEastConnectionStripSrc + 1] + ld h, a + ld a, [wEastConnectionStripDest] + ld e, a + ld a, [wEastConnectionStripDest + 1] + ld d, a + ld a, [wEastConnectionStripHeight] + ld b, a + ld a, [wEastConnectedMapWidth] + ld [hEastWestConnectedMapWidth], a call LoadEastWestConnectionsTileMap .done ret LoadNorthSouthConnectionsTileMap:: - ld c,MAP_BORDER + ld c, MAP_BORDER .loop push de push hl - ld a,[hNorthSouthConnectionStripWidth] - ld b,a + ld a, [hNorthSouthConnectionStripWidth] + ld b, a .innerLoop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec b - jr nz,.innerLoop + jr nz, .innerLoop pop hl pop de - ld a,[hNorthSouthConnectedMapWidth] + ld a, [hNorthSouthConnectedMapWidth] add l - ld l,a - jr nc,.noCarry1 + ld l, a + jr nc, .noCarry1 inc h .noCarry1 - ld a,[wCurMapWidth] + ld a, [wCurMapWidth] add MAP_BORDER * 2 add e - ld e,a - jr nc,.noCarry2 + ld e, a + jr nc, .noCarry2 inc d .noCarry2 dec c - jr nz,.loop + jr nz, .loop ret LoadEastWestConnectionsTileMap:: push hl push de - ld c,MAP_BORDER + ld c, MAP_BORDER .innerLoop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec c - jr nz,.innerLoop + jr nz, .innerLoop pop de pop hl - ld a,[hEastWestConnectedMapWidth] + ld a, [hEastWestConnectedMapWidth] add l - ld l,a - jr nc,.noCarry1 + ld l, a + jr nc, .noCarry1 inc h .noCarry1 - ld a,[wCurMapWidth] + ld a, [wCurMapWidth] add MAP_BORDER * 2 add e - ld e,a - jr nc,.noCarry2 + ld e, a + jr nc, .noCarry2 inc d .noCarry2 dec b - jr nz,LoadEastWestConnectionsTileMap + jr nz, LoadEastWestConnectionsTileMap ret ; function to check if there is a sign or sprite in front of the player @@ -1077,177 +1077,177 @@ LoadEastWestConnectionsTileMap:: ; if not, [hSpriteIndexOrTextID] is set to 0 IsSpriteOrSignInFrontOfPlayer:: xor a - ld [hSpriteIndexOrTextID],a - ld a,[wNumSigns] + ld [hSpriteIndexOrTextID], a + ld a, [wNumSigns] and a - jr z,.extendRangeOverCounter + jr z, .extendRangeOverCounter ; if there are signs predef GetTileAndCoordsInFrontOfPlayer ; get the coordinates in front of the player in de - ld hl,wSignCoords - ld a,[wNumSigns] - ld b,a - ld c,0 + ld hl, wSignCoords + ld a, [wNumSigns] + ld b, a + ld c, 0 .signLoop inc c - ld a,[hli] ; sign Y + ld a, [hli] ; sign Y cp d - jr z,.yCoordMatched + jr z, .yCoordMatched inc hl jr .retry .yCoordMatched - ld a,[hli] ; sign X + ld a, [hli] ; sign X cp e - jr nz,.retry + jr nz, .retry .xCoordMatched ; found sign push hl push bc - ld hl,wSignTextIDs - ld b,0 + ld hl, wSignTextIDs + ld b, 0 dec c - add hl,bc - ld a,[hl] - ld [hSpriteIndexOrTextID],a ; store sign text ID + add hl, bc + ld a, [hl] + ld [hSpriteIndexOrTextID], a ; store sign text ID pop bc pop hl ret .retry dec b - jr nz,.signLoop + jr nz, .signLoop ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC .extendRangeOverCounter predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player in c - ld hl,wTilesetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) - ld b,3 - ld d,$20 ; talking range in pixels (long range) + ld hl, wTilesetTalkingOverTiles ; list of tiles that extend talking range (counter tiles) + ld b, 3 + ld d, $20 ; talking range in pixels (long range) .counterTilesLoop - ld a,[hli] + ld a, [hli] cp c - jr z,IsSpriteInFrontOfPlayer2 ; jumps if the tile in front of the player is a counter tile + jr z, IsSpriteInFrontOfPlayer2 ; jumps if the tile in front of the player is a counter tile dec b - jr nz,.counterTilesLoop + jr nz, .counterTilesLoop ; part of the above function, but sometimes its called on its own, when signs are irrelevant ; the caller must zero [hSpriteIndexOrTextID] IsSpriteInFrontOfPlayer:: - ld d,$10 ; talking range in pixels (normal range) + ld d, $10 ; talking range in pixels (normal range) IsSpriteInFrontOfPlayer2:: lb bc, $3c, $40 ; Y and X position of player sprite - ld a,[wSpriteStateData1 + 9] ; direction the player is facing + ld a, [wSpriteStateData1 + 9] ; direction the player is facing .checkIfPlayerFacingUp cp SPRITE_FACING_UP - jr nz,.checkIfPlayerFacingDown + jr nz, .checkIfPlayerFacingDown ; facing up - ld a,b + ld a, b sub d - ld b,a - ld a,PLAYER_DIR_UP + ld b, a + ld a, PLAYER_DIR_UP jr .doneCheckingDirection .checkIfPlayerFacingDown cp SPRITE_FACING_DOWN - jr nz,.checkIfPlayerFacingRight + jr nz, .checkIfPlayerFacingRight ; facing down - ld a,b + ld a, b add d - ld b,a - ld a,PLAYER_DIR_DOWN + ld b, a + ld a, PLAYER_DIR_DOWN jr .doneCheckingDirection .checkIfPlayerFacingRight cp SPRITE_FACING_RIGHT - jr nz,.playerFacingLeft + jr nz, .playerFacingLeft ; facing right - ld a,c + ld a, c add d - ld c,a - ld a,PLAYER_DIR_RIGHT + ld c, a + ld a, PLAYER_DIR_RIGHT jr .doneCheckingDirection .playerFacingLeft ; facing left - ld a,c + ld a, c sub d - ld c,a - ld a,PLAYER_DIR_LEFT + ld c, a + ld a, PLAYER_DIR_LEFT .doneCheckingDirection - ld [wPlayerDirection],a - ld a,[wNumSprites] ; number of sprites + ld [wPlayerDirection], a + ld a, [wNumSprites] ; number of sprites and a ret z ; if there are sprites - ld hl,wSpriteStateData1 + $10 - ld d,a - ld e,$01 + ld hl, wSpriteStateData1 + $10 + ld d, a + ld e, $01 .spriteLoop push hl - ld a,[hli] ; image (0 if no sprite) + ld a, [hli] ; image (0 if no sprite) and a - jr z,.nextSprite + jr z, .nextSprite inc l - ld a,[hli] ; sprite visibility + ld a, [hli] ; sprite visibility inc a - jr z,.nextSprite + jr z, .nextSprite inc l - ld a,[hli] ; Y location + ld a, [hli] ; Y location cp b - jr nz,.nextSprite + jr nz, .nextSprite inc l - ld a,[hl] ; X location + ld a, [hl] ; X location cp c - jr z,.foundSpriteInFrontOfPlayer + jr z, .foundSpriteInFrontOfPlayer .nextSprite pop hl - ld a,l - add a,$10 - ld l,a + ld a, l + add $10 + ld l, a inc e dec d - jr nz,.spriteLoop + jr nz, .spriteLoop ret .foundSpriteInFrontOfPlayer pop hl - ld a,l - and a,$f0 + ld a, l + and $f0 inc a - ld l,a ; hl = $c1x1 - set 7,[hl] ; set flag to make the sprite face the player - ld a,e - ld [hSpriteIndexOrTextID],a + ld l, a ; hl = $c1x1 + set 7, [hl] ; set flag to make the sprite face the player + ld a, e + ld [hSpriteIndexOrTextID], a ret ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing) ; sets the carry flag if there is a collision, and unsets it if there isn't a collision CollisionCheckOnLand:: - ld a,[wd736] - bit 6,a ; is the player jumping? - jr nz,.noCollision + ld a, [wd736] + bit 6, a ; is the player jumping? + jr nz, .noCollision ; if not jumping a ledge - ld a,[wSimulatedJoypadStatesIndex] + ld a, [wSimulatedJoypadStatesIndex] and a - jr nz,.noCollision ; no collisions when the player's movements are being controlled by the game - ld a,[wPlayerDirection] ; the direction that the player is trying to go in - ld d,a - ld a,[wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) + jr nz, .noCollision ; no collisions when the player's movements are being controlled by the game + ld a, [wPlayerDirection] ; the direction that the player is trying to go in + ld d, a + ld a, [wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) and d ; check if a sprite is in the direction the player is trying to go - jr nz,.collision + jr nz, .collision xor a - ld [hSpriteIndexOrTextID],a + ld [hSpriteIndexOrTextID], a call IsSpriteInFrontOfPlayer ; check for sprite collisions again? when does the above check fail to detect a sprite collision? - ld a,[hSpriteIndexOrTextID] + ld a, [hSpriteIndexOrTextID] and a ; was there a sprite collision? - jr nz,.collision + jr nz, .collision ; if no sprite collision - ld hl,TilePairCollisionsLand + ld hl, TilePairCollisionsLand call CheckForJumpingAndTilePairCollisions - jr c,.collision + jr c, .collision call CheckTilePassable - jr nc,.noCollision + jr nc, .noCollision .collision - ld a,[wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_COLLISION ; check if collision sound is already playing - jr z,.setCarry - ld a,SFX_COLLISION + jr z, .setCarry + ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry scf @@ -1260,16 +1260,16 @@ CollisionCheckOnLand:: ; clears carry if it is, sets carry if not CheckTilePassable:: predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player - ld a,[wTileInFrontOfPlayer] ; tile in front of player - ld c,a - ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles - ld a,[hli] - ld h,[hl] - ld l,a ; hl now points to passable tiles + ld a, [wTileInFrontOfPlayer] ; tile in front of player + ld c, a + ld hl, wTilesetCollisionPtr ; pointer to list of passable tiles + ld a, [hli] + ld h, [hl] + ld l, a ; hl now points to passable tiles .loop - ld a,[hli] - cp a,$ff - jr z,.tileNotPassable + ld a, [hli] + cp $ff + jr z, .tileNotPassable cp c ret z jr .loop @@ -1291,53 +1291,53 @@ CheckForJumpingAndTilePairCollisions:: pop de pop hl and a - ld a,[wd736] - bit 6,a ; is the player jumping? + ld a, [wd736] + bit 6, a ; is the player jumping? ret nz ; if not jumping CheckForTilePairCollisions2:: aCoord 8, 9 ; tile the player is on - ld [wTilePlayerStandingOn],a + ld [wTilePlayerStandingOn], a CheckForTilePairCollisions:: - ld a,[wTileInFrontOfPlayer] - ld c,a + ld a, [wTileInFrontOfPlayer] + ld c, a .tilePairCollisionLoop - ld a,[wCurMapTileset] ; tileset number - ld b,a - ld a,[hli] + ld a, [wCurMapTileset] ; tileset number + ld b, a + ld a, [hli] cp $ff - jr z,.noMatch + jr z, .noMatch cp b - jr z,.tilesetMatches + jr z, .tilesetMatches inc hl .retry inc hl jr .tilePairCollisionLoop .tilesetMatches - ld a,[wTilePlayerStandingOn] ; tile the player is on - ld b,a - ld a,[hl] + ld a, [wTilePlayerStandingOn] ; tile the player is on + ld b, a + ld a, [hl] cp b - jr z,.currentTileMatchesFirstInPair + jr z, .currentTileMatchesFirstInPair inc hl - ld a,[hl] + ld a, [hl] cp b - jr z,.currentTileMatchesSecondInPair + jr z, .currentTileMatchesSecondInPair jr .retry .currentTileMatchesFirstInPair inc hl - ld a,[hl] + ld a, [hl] cp c - jr z,.foundMatch + jr z, .foundMatch jr .tilePairCollisionLoop .currentTileMatchesSecondInPair dec hl - ld a,[hli] + ld a, [hli] cp c inc hl - jr nz,.tilePairCollisionLoop + jr nz, .tilePairCollisionLoop .foundMatch scf ret @@ -1372,27 +1372,27 @@ TilePairCollisionsWater:: ; this builds a tile map from the tile block map based on the current X/Y coordinates of the player's character LoadCurrentMapView:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,[wTilesetBank] ; tile data ROM bank - ld [H_LOADEDROMBANK],a - 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] - ld d,a - ld hl,wTileMapBackup - ld b,$05 + ld a, [wTilesetBank] ; tile data ROM bank + ld [H_LOADEDROMBANK], a + 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] + ld d, a + ld hl, wTileMapBackup + ld b, $05 .rowLoop ; each loop iteration fills in one row of tile blocks push hl push de - ld c,$06 + ld c, $06 .rowInnerLoop ; loop to draw each tile block of the current row push bc push de push hl - ld a,[de] - ld c,a ; tile block number + ld a, [de] + ld c, a ; tile block number call DrawTileBlock pop hl pop de @@ -1403,256 +1403,256 @@ LoadCurrentMapView:: inc hl inc de dec c - jr nz,.rowInnerLoop + jr nz, .rowInnerLoop ; update tile block map pointer to next row's address pop de - ld a,[wCurMapWidth] + ld a, [wCurMapWidth] add MAP_BORDER * 2 add e - ld e,a - jr nc,.noCarry + ld e, a + jr nc, .noCarry inc d .noCarry ; update tile map pointer to next row's address pop hl - ld a,$60 + ld a, $60 add l - ld l,a - jr nc,.noCarry2 + ld l, a + jr nc, .noCarry2 inc h .noCarry2 dec b - jr nz,.rowLoop - ld hl,wTileMapBackup - ld bc,$0000 + jr nz, .rowLoop + ld hl, wTileMapBackup + ld bc, $0000 .adjustForYCoordWithinTileBlock - ld a,[wYBlockCoord] + ld a, [wYBlockCoord] and a - jr z,.adjustForXCoordWithinTileBlock - ld bc,$0030 - add hl,bc + jr z, .adjustForXCoordWithinTileBlock + ld bc, $0030 + add hl, bc .adjustForXCoordWithinTileBlock - ld a,[wXBlockCoord] + ld a, [wXBlockCoord] and a - jr z,.copyToVisibleAreaBuffer - ld bc,$0002 - add hl,bc + jr z, .copyToVisibleAreaBuffer + ld bc, $0002 + add hl, bc .copyToVisibleAreaBuffer coord de, 0, 0 ; base address for the tiles that are directly transferred to VRAM during V-blank ld b, SCREEN_HEIGHT .rowLoop2 ld c, SCREEN_WIDTH .rowInnerLoop2 - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec c - jr nz,.rowInnerLoop2 - ld a,$04 + jr nz, .rowInnerLoop2 + ld a, $04 add l - ld l,a - jr nc,.noCarry3 + ld l, a + jr nc, .noCarry3 inc h .noCarry3 dec b - jr nz,.rowLoop2 + jr nz, .rowLoop2 pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a ; restore previous ROM bank + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ; restore previous ROM bank ret AdvancePlayerSprite:: - ld a,[wSpriteStateData1 + 3] ; delta Y - ld b,a - ld a,[wSpriteStateData1 + 5] ; delta X - ld c,a - ld hl,wWalkCounter ; walking animation counter + ld a, [wSpriteStateData1 + 3] ; delta Y + ld b, a + ld a, [wSpriteStateData1 + 5] ; delta X + ld c, a + ld hl, wWalkCounter ; walking animation counter dec [hl] - jr nz,.afterUpdateMapCoords + jr nz, .afterUpdateMapCoords ; if it's the end of the animation, update the player's map coordinates - ld a,[wYCoord] + ld a, [wYCoord] add b - ld [wYCoord],a - ld a,[wXCoord] + ld [wYCoord], a + ld a, [wXCoord] add c - ld [wXCoord],a + ld [wXCoord], a .afterUpdateMapCoords - ld a,[wWalkCounter] ; walking animation counter - cp a,$07 - jp nz,.scrollBackgroundAndSprites + ld a, [wWalkCounter] ; walking animation counter + cp $07 + jp nz, .scrollBackgroundAndSprites ; if this is the first iteration of the animation - ld a,c - cp a,$01 - jr nz,.checkIfMovingWest + ld a, c + cp $01 + jr nz, .checkIfMovingWest ; moving east - ld a,[wMapViewVRAMPointer] - ld e,a - and a,$e0 - ld d,a - ld a,e - add a,$02 - and a,$1f + ld a, [wMapViewVRAMPointer] + ld e, a + and $e0 + ld d, a + ld a, e + add $02 + and $1f or d - ld [wMapViewVRAMPointer],a + ld [wMapViewVRAMPointer], a jr .adjustXCoordWithinBlock .checkIfMovingWest - cp a,$ff - jr nz,.checkIfMovingSouth + cp $ff + jr nz, .checkIfMovingSouth ; moving west - ld a,[wMapViewVRAMPointer] - ld e,a - and a,$e0 - ld d,a - ld a,e - sub a,$02 - and a,$1f + ld a, [wMapViewVRAMPointer] + ld e, a + and $e0 + ld d, a + ld a, e + sub $02 + and $1f or d - ld [wMapViewVRAMPointer],a + ld [wMapViewVRAMPointer], a jr .adjustXCoordWithinBlock .checkIfMovingSouth - ld a,b - cp a,$01 - jr nz,.checkIfMovingNorth + ld a, b + cp $01 + jr nz, .checkIfMovingNorth ; moving south - ld a,[wMapViewVRAMPointer] - add a,$40 - ld [wMapViewVRAMPointer],a - jr nc,.adjustXCoordWithinBlock - ld a,[wMapViewVRAMPointer + 1] + ld a, [wMapViewVRAMPointer] + add $40 + ld [wMapViewVRAMPointer], a + jr nc, .adjustXCoordWithinBlock + ld a, [wMapViewVRAMPointer + 1] inc a - and a,$03 - or a,$98 - ld [wMapViewVRAMPointer + 1],a + and $03 + or $98 + ld [wMapViewVRAMPointer + 1], a jr .adjustXCoordWithinBlock .checkIfMovingNorth - cp a,$ff - jr nz,.adjustXCoordWithinBlock + cp $ff + jr nz, .adjustXCoordWithinBlock ; moving north - ld a,[wMapViewVRAMPointer] - sub a,$40 - ld [wMapViewVRAMPointer],a - jr nc,.adjustXCoordWithinBlock - ld a,[wMapViewVRAMPointer + 1] + ld a, [wMapViewVRAMPointer] + sub $40 + ld [wMapViewVRAMPointer], a + jr nc, .adjustXCoordWithinBlock + ld a, [wMapViewVRAMPointer + 1] dec a - and a,$03 - or a,$98 - ld [wMapViewVRAMPointer + 1],a + and $03 + or $98 + ld [wMapViewVRAMPointer + 1], a .adjustXCoordWithinBlock - ld a,c + ld a, c and a - jr z,.pointlessJump ; mistake? + jr z, .pointlessJump ; mistake? .pointlessJump - ld hl,wXBlockCoord - ld a,[hl] + ld hl, wXBlockCoord + ld a, [hl] add c - ld [hl],a - cp a,$02 - jr nz,.checkForMoveToWestBlock + ld [hl], a + cp $02 + jr nz, .checkForMoveToWestBlock ; moved into the tile block to the east xor a - ld [hl],a - ld hl,wXOffsetSinceLastSpecialWarp + ld [hl], a + ld hl, wXOffsetSinceLastSpecialWarp inc [hl] - ld de,wCurrentTileBlockMapViewPointer + ld de, wCurrentTileBlockMapViewPointer call MoveTileBlockMapPointerEast jr .updateMapView .checkForMoveToWestBlock - cp a,$ff - jr nz,.adjustYCoordWithinBlock + cp $ff + jr nz, .adjustYCoordWithinBlock ; moved into the tile block to the west - ld a,$01 - ld [hl],a - ld hl,wXOffsetSinceLastSpecialWarp + ld a, $01 + ld [hl], a + ld hl, wXOffsetSinceLastSpecialWarp dec [hl] - ld de,wCurrentTileBlockMapViewPointer + ld de, wCurrentTileBlockMapViewPointer call MoveTileBlockMapPointerWest jr .updateMapView .adjustYCoordWithinBlock - ld hl,wYBlockCoord - ld a,[hl] + ld hl, wYBlockCoord + ld a, [hl] add b - ld [hl],a - cp a,$02 - jr nz,.checkForMoveToNorthBlock + ld [hl], a + cp $02 + jr nz, .checkForMoveToNorthBlock ; moved into the tile block to the south xor a - ld [hl],a - ld hl,wYOffsetSinceLastSpecialWarp + ld [hl], a + ld hl, wYOffsetSinceLastSpecialWarp inc [hl] - ld de,wCurrentTileBlockMapViewPointer - ld a,[wCurMapWidth] + ld de, wCurrentTileBlockMapViewPointer + ld a, [wCurMapWidth] call MoveTileBlockMapPointerSouth jr .updateMapView .checkForMoveToNorthBlock - cp a,$ff - jr nz,.updateMapView + cp $ff + jr nz, .updateMapView ; moved into the tile block to the north - ld a,$01 - ld [hl],a - ld hl,wYOffsetSinceLastSpecialWarp + ld a, $01 + ld [hl], a + ld hl, wYOffsetSinceLastSpecialWarp dec [hl] - ld de,wCurrentTileBlockMapViewPointer - ld a,[wCurMapWidth] + ld de, wCurrentTileBlockMapViewPointer + ld a, [wCurMapWidth] call MoveTileBlockMapPointerNorth .updateMapView call LoadCurrentMapView - ld a,[wSpriteStateData1 + 3] ; delta Y - cp a,$01 - jr nz,.checkIfMovingNorth2 + ld a, [wSpriteStateData1 + 3] ; delta Y + cp $01 + jr nz, .checkIfMovingNorth2 ; if moving south call ScheduleSouthRowRedraw jr .scrollBackgroundAndSprites .checkIfMovingNorth2 - cp a,$ff - jr nz,.checkIfMovingEast2 + cp $ff + jr nz, .checkIfMovingEast2 ; if moving north call ScheduleNorthRowRedraw jr .scrollBackgroundAndSprites .checkIfMovingEast2 - ld a,[wSpriteStateData1 + 5] ; delta X - cp a,$01 - jr nz,.checkIfMovingWest2 + ld a, [wSpriteStateData1 + 5] ; delta X + cp $01 + jr nz, .checkIfMovingWest2 ; if moving east call ScheduleEastColumnRedraw jr .scrollBackgroundAndSprites .checkIfMovingWest2 - cp a,$ff - jr nz,.scrollBackgroundAndSprites + cp $ff + jr nz, .scrollBackgroundAndSprites ; if moving west call ScheduleWestColumnRedraw .scrollBackgroundAndSprites - ld a,[wSpriteStateData1 + 3] ; delta Y - ld b,a - ld a,[wSpriteStateData1 + 5] ; delta X - ld c,a + ld a, [wSpriteStateData1 + 3] ; delta Y + ld b, a + ld a, [wSpriteStateData1 + 5] ; delta X + ld c, a sla b sla c - ld a,[hSCY] + ld a, [hSCY] add b - ld [hSCY],a ; update background scroll Y - ld a,[hSCX] + ld [hSCY], a ; update background scroll Y + ld a, [hSCX] add c - ld [hSCX],a ; update background scroll X + ld [hSCX], a ; update background scroll X ; shift all the sprites in the direction opposite of the player's motion ; so that the player appears to move relative to them - ld hl,wSpriteStateData1 + $14 - ld a,[wNumSprites] ; number of sprites + ld hl, wSpriteStateData1 + $14 + ld a, [wNumSprites] ; number of sprites and a ; are there any sprites? - jr z,.done - ld e,a + jr z, .done + ld e, a .spriteShiftLoop - ld a,[hl] + ld a, [hl] sub b - ld [hli],a + ld [hli], a inc l - ld a,[hl] + ld a, [hl] sub c - ld [hl],a - ld a,$0e + ld [hl], a + ld a, $0e add l - ld l,a + ld l, a dec e - jr nz,.spriteShiftLoop + jr nz, .spriteShiftLoop .done ret @@ -1660,51 +1660,51 @@ AdvancePlayerSprite:: ; corner of the tile block map in the direction of motion MoveTileBlockMapPointerEast:: - ld a,[de] - add a,$01 - ld [de],a + ld a, [de] + add $01 + ld [de], a ret nc inc de - ld a,[de] + ld a, [de] inc a - ld [de],a + ld [de], a ret MoveTileBlockMapPointerWest:: - ld a,[de] - sub a,$01 - ld [de],a + ld a, [de] + sub $01 + ld [de], a ret nc inc de - ld a,[de] + ld a, [de] dec a - ld [de],a + ld [de], a ret MoveTileBlockMapPointerSouth:: - add a,MAP_BORDER * 2 - ld b,a - ld a,[de] + add MAP_BORDER * 2 + ld b, a + ld a, [de] add b - ld [de],a + ld [de], a ret nc inc de - ld a,[de] + ld a, [de] inc a - ld [de],a + ld [de], a ret MoveTileBlockMapPointerNorth:: - add a,MAP_BORDER * 2 - ld b,a - ld a,[de] + add MAP_BORDER * 2 + ld b, a + ld a, [de] sub b - ld [de],a + ld [de], a ret nc inc de - ld a,[de] + ld a, [de] dec a - ld [de],a + ld [de], a ret ; the following 6 functions are used to tell the V-blank handler to redraw @@ -1713,196 +1713,196 @@ MoveTileBlockMapPointerNorth:: ScheduleNorthRowRedraw:: coord hl, 0, 0 call CopyToRedrawRowOrColumnSrcTiles - ld a,[wMapViewVRAMPointer] - ld [hRedrawRowOrColumnDest],a - ld a,[wMapViewVRAMPointer + 1] - ld [hRedrawRowOrColumnDest + 1],a - ld a,REDRAW_ROW - ld [hRedrawRowOrColumnMode],a + ld a, [wMapViewVRAMPointer] + ld [hRedrawRowOrColumnDest], a + ld a, [wMapViewVRAMPointer + 1] + ld [hRedrawRowOrColumnDest + 1], a + ld a, REDRAW_ROW + ld [hRedrawRowOrColumnMode], a ret CopyToRedrawRowOrColumnSrcTiles:: - ld de,wRedrawRowOrColumnSrcTiles - ld c,2 * SCREEN_WIDTH + ld de, wRedrawRowOrColumnSrcTiles + ld c, 2 * SCREEN_WIDTH .loop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec c - jr nz,.loop + jr nz, .loop ret ScheduleSouthRowRedraw:: coord hl, 0, 16 call CopyToRedrawRowOrColumnSrcTiles - ld a,[wMapViewVRAMPointer] - ld l,a - ld a,[wMapViewVRAMPointer + 1] - ld h,a - ld bc,$0200 - add hl,bc - ld a,h + ld a, [wMapViewVRAMPointer] + ld l, a + ld a, [wMapViewVRAMPointer + 1] + ld h, a + ld bc, $0200 + add hl, bc + ld a, h and $03 or $98 - ld [hRedrawRowOrColumnDest + 1],a - ld a,l - ld [hRedrawRowOrColumnDest],a - ld a,REDRAW_ROW - ld [hRedrawRowOrColumnMode],a + ld [hRedrawRowOrColumnDest + 1], a + ld a, l + ld [hRedrawRowOrColumnDest], a + ld a, REDRAW_ROW + ld [hRedrawRowOrColumnMode], a ret ScheduleEastColumnRedraw:: coord hl, 18, 0 call ScheduleColumnRedrawHelper - ld a,[wMapViewVRAMPointer] - ld c,a + ld a, [wMapViewVRAMPointer] + ld c, a and $e0 - ld b,a - ld a,c + ld b, a + ld a, c add 18 and $1f or b - ld [hRedrawRowOrColumnDest],a - ld a,[wMapViewVRAMPointer + 1] - ld [hRedrawRowOrColumnDest + 1],a - ld a,REDRAW_COL - ld [hRedrawRowOrColumnMode],a + ld [hRedrawRowOrColumnDest], a + ld a, [wMapViewVRAMPointer + 1] + ld [hRedrawRowOrColumnDest + 1], a + ld a, REDRAW_COL + ld [hRedrawRowOrColumnMode], a ret ScheduleColumnRedrawHelper:: - ld de,wRedrawRowOrColumnSrcTiles - ld c,SCREEN_HEIGHT + ld de, wRedrawRowOrColumnSrcTiles + ld c, SCREEN_HEIGHT .loop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de - ld a,[hl] - ld [de],a + ld a, [hl] + ld [de], a inc de - ld a,19 + ld a, 19 add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry dec c - jr nz,.loop + jr nz, .loop ret ScheduleWestColumnRedraw:: coord hl, 0, 0 call ScheduleColumnRedrawHelper - ld a,[wMapViewVRAMPointer] - ld [hRedrawRowOrColumnDest],a - ld a,[wMapViewVRAMPointer + 1] - ld [hRedrawRowOrColumnDest + 1],a - ld a,REDRAW_COL - ld [hRedrawRowOrColumnMode],a + ld a, [wMapViewVRAMPointer] + ld [hRedrawRowOrColumnDest], a + ld a, [wMapViewVRAMPointer + 1] + ld [hRedrawRowOrColumnDest + 1], a + ld a, REDRAW_COL + ld [hRedrawRowOrColumnMode], a ret ; function to write the tiles that make up a tile block to memory ; Input: c = tile block ID, hl = destination address DrawTileBlock:: push hl - ld a,[wTilesetBlocksPtr] ; pointer to tiles - ld l,a - ld a,[wTilesetBlocksPtr + 1] - ld h,a - ld a,c + ld a, [wTilesetBlocksPtr] ; pointer to tiles + ld l, a + ld a, [wTilesetBlocksPtr + 1] + ld h, a + ld a, c swap a - ld b,a + ld b, a and $f0 - ld c,a - ld a,b + ld c, a + ld a, b and $0f - ld b,a ; bc = tile block ID * 0x10 - add hl,bc - ld d,h - ld e,l ; de = address of the tile block's tiles + ld b, a ; bc = tile block ID * 0x10 + add hl, bc + ld d, h + ld e, l ; de = address of the tile block's tiles pop hl - ld c,$04 ; 4 loop iterations + ld c, $04 ; 4 loop iterations .loop ; each loop iteration, write 4 tile numbers push bc - ld a,[de] - ld [hli],a + ld a, [de] + ld [hli], a inc de - ld a,[de] - ld [hli],a + ld a, [de] + ld [hli], a inc de - ld a,[de] - ld [hli],a + ld a, [de] + ld [hli], a inc de - ld a,[de] - ld [hl],a + ld a, [de] + ld [hl], a inc de - ld bc,$0015 - add hl,bc + ld bc, $0015 + add hl, bc pop bc dec c - jr nz,.loop + jr nz, .loop ret ; function to update joypad state and simulate button presses JoypadOverworld:: xor a - ld [wSpriteStateData1 + 3],a - ld [wSpriteStateData1 + 5],a + ld [wSpriteStateData1 + 3], a + ld [wSpriteStateData1 + 5], a call RunMapScript call Joypad - ld a,[wFlags_D733] - bit 3,a ; check if a trainer wants a challenge - jr nz,.notForcedDownwards - ld a,[wCurMap] + ld a, [wFlags_D733] + bit 3, a ; check if a trainer wants a challenge + jr nz, .notForcedDownwards + ld a, [wCurMap] cp ROUTE_17 ; Cycling Road - jr nz,.notForcedDownwards - ld a,[hJoyHeld] + jr nz, .notForcedDownwards + ld a, [hJoyHeld] and D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON - jr nz,.notForcedDownwards - ld a,D_DOWN - ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press + jr nz, .notForcedDownwards + ld a, D_DOWN + ld [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press .notForcedDownwards - ld a,[wd730] - bit 7,a + ld a, [wd730] + bit 7, a ret z ; if simulating button presses - ld a,[hJoyHeld] - ld b,a - ld a,[wOverrideSimulatedJoypadStatesMask] ; bit mask for button presses that override simulated ones + ld a, [hJoyHeld] + ld b, a + ld a, [wOverrideSimulatedJoypadStatesMask] ; bit mask for button presses that override simulated ones and b ret nz ; return if the simulated button presses are overridden - ld hl,wSimulatedJoypadStatesIndex + ld hl, wSimulatedJoypadStatesIndex dec [hl] - ld a,[hl] - cp a,$ff - jr z,.doneSimulating ; if the end of the simulated button presses has been reached - ld hl,wSimulatedJoypadStatesEnd + ld a, [hl] + cp $ff + jr z, .doneSimulating ; if the end of the simulated button presses has been reached + ld hl, wSimulatedJoypadStatesEnd add l - ld l,a - jr nc,.noCarry + ld l, a + jr nc, .noCarry inc h .noCarry - ld a,[hl] - ld [hJoyHeld],a ; store simulated button press in joypad state + ld a, [hl] + ld [hJoyHeld], a ; store simulated button press in joypad state and a ret nz - ld [hJoyPressed],a - ld [hJoyReleased],a + ld [hJoyPressed], a + ld [hJoyReleased], a ret ; if done simulating button presses .doneSimulating xor a - ld [wWastedByteCD3A],a - ld [wSimulatedJoypadStatesIndex],a - ld [wSimulatedJoypadStatesEnd],a - ld [wJoyIgnore],a - ld [hJoyHeld],a - ld hl,wd736 - ld a,[hl] + ld [wWastedByteCD3A], a + ld [wSimulatedJoypadStatesIndex], a + ld [wSimulatedJoypadStatesEnd], a + ld [wJoyIgnore], a + ld [hJoyHeld], a + ld hl, wd736 + ld a, [hl] and $f8 - ld [hl],a - ld hl,wd730 - res 7,[hl] + ld [hl], a + ld hl, wd730 + res 7, [hl] ret ; function to check the tile ahead to determine if the character should get on land or keep surfing @@ -1915,43 +1915,43 @@ JoypadOverworld:: ; and 2429 always sets c to 0xF0. There is no 0xF0 background tile, so it ; is considered impassable and it is detected as a collision. CollisionCheckOnWater:: - ld a,[wd730] - bit 7,a - jp nz,.noCollision ; return and clear carry if button presses are being simulated - ld a,[wPlayerDirection] ; the direction that the player is trying to go in - ld d,a - ld a,[wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) + ld a, [wd730] + bit 7, a + jp nz, .noCollision ; return and clear carry if button presses are being simulated + ld a, [wPlayerDirection] ; the direction that the player is trying to go in + ld d, a + ld a, [wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) and d ; check if a sprite is in the direction the player is trying to go - jr nz,.checkIfNextTileIsPassable ; bug? - ld hl,TilePairCollisionsWater + jr nz, .checkIfNextTileIsPassable ; bug? + ld hl, TilePairCollisionsWater call CheckForJumpingAndTilePairCollisions - jr c,.collision + jr c, .collision predef GetTileAndCoordsInFrontOfPlayer ; get tile in front of player (puts it in c and [wTileInFrontOfPlayer]) - ld a,[wTileInFrontOfPlayer] ; tile in front of player - cp a,$14 ; water tile - jr z,.noCollision ; keep surfing if it's a water tile - cp a,$32 ; either the left tile of the S.S. Anne boarding platform or the tile on eastern coastlines (depending on the current tileset) - jr z,.checkIfVermilionDockTileset - cp a,$48 ; tile on right on coast lines in Safari Zone - jr z,.noCollision ; keep surfing + ld a, [wTileInFrontOfPlayer] ; tile in front of player + cp $14 ; water tile + jr z, .noCollision ; keep surfing if it's a water tile + cp $32 ; either the left tile of the S.S. Anne boarding platform or the tile on eastern coastlines (depending on the current tileset) + jr z, .checkIfVermilionDockTileset + cp $48 ; tile on right on coast lines in Safari Zone + jr z, .noCollision ; keep surfing ; check if the [land] tile in front of the player is passable .checkIfNextTileIsPassable - ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles - ld a,[hli] - ld h,[hl] - ld l,a + ld hl, wTilesetCollisionPtr ; pointer to list of passable tiles + ld a, [hli] + ld h, [hl] + ld l, a .loop - ld a,[hli] - cp a,$ff - jr z,.collision + ld a, [hli] + cp $ff + jr z, .collision cp c - jr z,.stopSurfing ; stop surfing if the tile is passable + jr z, .stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a,[wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch4] cp SFX_COLLISION ; check if collision sound is already playing - jr z,.setCarry - ld a,SFX_COLLISION + jr z, .setCarry + ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry scf @@ -1962,7 +1962,7 @@ CollisionCheckOnWater:: ret .stopSurfing xor a - ld [wWalkBikeSurfState],a + ld [wWalkBikeSurfState], a call LoadPlayerSpriteGraphics call PlayDefaultMusic jr .noCollision @@ -1978,40 +1978,40 @@ RunMapScript:: push de push bc callba TryPushingBoulder - ld a,[wFlags_0xcd60] - bit 1,a ; play boulder dust animation - jr z,.afterBoulderEffect + ld a, [wFlags_0xcd60] + bit 1, a ; play boulder dust animation + jr z, .afterBoulderEffect callba DoBoulderDustAnimation .afterBoulderEffect pop bc pop de pop hl call RunNPCMovementScript - ld a,[wCurMap] ; current map number + ld a, [wCurMap] ; current map number call SwitchToMapRomBank ; change to the ROM bank the map's data is in - ld hl,wMapScriptPtr - ld a,[hli] - ld h,[hl] - ld l,a - ld de,.return + ld hl, wMapScriptPtr + ld a, [hli] + ld h, [hl] + ld l, a + ld de, .return push de jp hl ; jump to script .return ret LoadWalkingPlayerSpriteGraphics:: - ld de,RedSprite - ld hl,vNPCSprites + ld de, RedSprite + ld hl, vNPCSprites jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics:: - ld de,SeelSprite - ld hl,vNPCSprites + ld de, SeelSprite + ld hl, vNPCSprites jr LoadPlayerSpriteGraphicsCommon LoadBikePlayerSpriteGraphics:: - ld de,RedCyclingSprite - ld hl,vNPCSprites + ld de, RedCyclingSprite + ld hl, vNPCSprites LoadPlayerSpriteGraphicsCommon:: push de @@ -2020,321 +2020,321 @@ LoadPlayerSpriteGraphicsCommon:: call CopyVideoData pop hl pop de - ld a,$c0 + ld a, $c0 add e - ld e,a - jr nc,.noCarry + ld e, a + jr nc, .noCarry inc d .noCarry - set 3,h + set 3, h lb bc, BANK(RedSprite), $0c jp CopyVideoData ; function to load data from the map header LoadMapHeader:: callba MarkTownVisitedAndLoadMissableObjects - ld a,[wCurMapTileset] - ld [wUnusedD119],a - ld a,[wCurMap] + ld a, [wCurMapTileset] + ld [wUnusedD119], a + ld a, [wCurMap] call SwitchToMapRomBank - ld a,[wCurMapTileset] - ld b,a - res 7,a - ld [wCurMapTileset],a - ld [hPreviousTileset],a - bit 7,b + ld a, [wCurMapTileset] + ld b, a + res 7, a + ld [wCurMapTileset], a + ld [hPreviousTileset], a + bit 7, b ret nz - ld hl,MapHeaderPointers - ld a,[wCurMap] + ld hl, MapHeaderPointers + ld a, [wCurMap] sla a - jr nc,.noCarry1 + jr nc, .noCarry1 inc h .noCarry1 add l - ld l,a - jr nc,.noCarry2 + ld l, a + jr nc, .noCarry2 inc h .noCarry2 - ld a,[hli] - ld h,[hl] - ld l,a ; hl = base of map header + ld a, [hli] + ld h, [hl] + ld l, a ; hl = base of map header ; copy the first 10 bytes (the fixed area) of the map data to D367-D370 - ld de,wCurMapTileset - ld c,$0a + ld de, wCurMapTileset + ld c, $0a .copyFixedHeaderLoop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec c - jr nz,.copyFixedHeaderLoop + jr nz, .copyFixedHeaderLoop ; initialize all the connected maps to disabled at first, before loading the actual values - ld a,$ff - ld [wMapConn1Ptr],a - ld [wMapConn2Ptr],a - ld [wMapConn3Ptr],a - ld [wMapConn4Ptr],a + ld a, $ff + ld [wMapConn1Ptr], a + ld [wMapConn2Ptr], a + ld [wMapConn3Ptr], a + ld [wMapConn4Ptr], a ; copy connection data (if any) to WRAM - ld a,[wMapConnections] - ld b,a + ld a, [wMapConnections] + ld b, a .checkNorth - bit 3,b - jr z,.checkSouth - ld de,wMapConn1Ptr + bit 3, b + jr z, .checkSouth + ld de, wMapConn1Ptr call CopyMapConnectionHeader .checkSouth - bit 2,b - jr z,.checkWest - ld de,wMapConn2Ptr + bit 2, b + jr z, .checkWest + ld de, wMapConn2Ptr call CopyMapConnectionHeader .checkWest - bit 1,b - jr z,.checkEast - ld de,wMapConn3Ptr + bit 1, b + jr z, .checkEast + ld de, wMapConn3Ptr call CopyMapConnectionHeader .checkEast - bit 0,b - jr z,.getObjectDataPointer - ld de,wMapConn4Ptr + bit 0, b + jr z, .getObjectDataPointer + ld de, wMapConn4Ptr call CopyMapConnectionHeader .getObjectDataPointer - ld a,[hli] - ld [wObjectDataPointerTemp],a - ld a,[hli] - ld [wObjectDataPointerTemp + 1],a + ld a, [hli] + ld [wObjectDataPointerTemp], a + ld a, [hli] + ld [wObjectDataPointerTemp + 1], a push hl - ld a,[wObjectDataPointerTemp] - ld l,a - ld a,[wObjectDataPointerTemp + 1] - ld h,a ; hl = base of object data - ld de,wMapBackgroundTile - ld a,[hli] - ld [de],a + ld a, [wObjectDataPointerTemp] + ld l, a + ld a, [wObjectDataPointerTemp + 1] + ld h, a ; hl = base of object data + ld de, wMapBackgroundTile + ld a, [hli] + ld [de], a .loadWarpData - ld a,[hli] - ld [wNumberOfWarps],a + ld a, [hli] + ld [wNumberOfWarps], a and a - jr z,.loadSignData - ld c,a - ld de,wWarpEntries + jr z, .loadSignData + ld c, a + ld de, wWarpEntries .warpLoop ; one warp per loop iteration - ld b,$04 + ld b, $04 .warpInnerLoop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec b - jr nz,.warpInnerLoop + jr nz, .warpInnerLoop dec c - jr nz,.warpLoop + jr nz, .warpLoop .loadSignData - ld a,[hli] ; number of signs - ld [wNumSigns],a + ld a, [hli] ; number of signs + ld [wNumSigns], a and a ; are there any signs? - jr z,.loadSpriteData ; if not, skip this - ld c,a - ld de,wSignTextIDs - ld a,d - ld [hSignCoordPointer],a - ld a,e - ld [hSignCoordPointer + 1],a - ld de,wSignCoords + jr z, .loadSpriteData ; if not, skip this + ld c, a + ld de, wSignTextIDs + ld a, d + ld [hSignCoordPointer], a + ld a, e + ld [hSignCoordPointer + 1], a + ld de, wSignCoords .signLoop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de push de - ld a,[hSignCoordPointer] - ld d,a - ld a,[hSignCoordPointer + 1] - ld e,a - ld a,[hli] - ld [de],a + ld a, [hSignCoordPointer] + ld d, a + ld a, [hSignCoordPointer + 1] + ld e, a + ld a, [hli] + ld [de], a inc de - ld a,d - ld [hSignCoordPointer],a - ld a,e - ld [hSignCoordPointer + 1],a + ld a, d + ld [hSignCoordPointer], a + ld a, e + ld [hSignCoordPointer + 1], a pop de dec c - jr nz,.signLoop + jr nz, .signLoop .loadSpriteData - ld a,[wd72e] - bit 5,a ; did a battle happen immediately before this? - jp nz,.finishUp ; if so, skip this because battles don't destroy this data - ld a,[hli] - ld [wNumSprites],a ; save the number of sprites + ld a, [wd72e] + bit 5, a ; did a battle happen immediately before this? + jp nz, .finishUp ; if so, skip this because battles don't destroy this data + ld a, [hli] + ld [wNumSprites], a ; save the number of sprites push hl ; zero C110-C1FF and C210-C2FF - ld hl,wSpriteStateData1 + $10 - ld de,wSpriteStateData2 + $10 + ld hl, wSpriteStateData1 + $10 + ld de, wSpriteStateData2 + $10 xor a - ld b,$f0 + ld b, $f0 .zeroSpriteDataLoop - ld [hli],a - ld [de],a + ld [hli], a + ld [de], a inc e dec b - jr nz,.zeroSpriteDataLoop + jr nz, .zeroSpriteDataLoop ; initialize all C100-C1FF sprite entries to disabled (other than player's) - ld hl,wSpriteStateData1 + $12 - ld de,$0010 - ld c,$0f + ld hl, wSpriteStateData1 + $12 + ld de, $0010 + ld c, $0f .disableSpriteEntriesLoop - ld [hl],$ff - add hl,de + ld [hl], $ff + add hl, de dec c - jr nz,.disableSpriteEntriesLoop + jr nz, .disableSpriteEntriesLoop pop hl - ld de,wSpriteStateData1 + $10 - ld a,[wNumSprites] ; number of sprites + ld de, wSpriteStateData1 + $10 + ld a, [wNumSprites] ; number of sprites and a ; are there any sprites? - jp z,.finishUp ; if there are no sprites, skip the rest - ld b,a - ld c,$00 + jp z, .finishUp ; if there are no sprites, skip the rest + ld b, a + ld c, $00 .loadSpriteLoop - ld a,[hli] - ld [de],a ; store picture ID at C1X0 + ld a, [hli] + ld [de], a ; store picture ID at C1X0 inc d - ld a,$04 + ld a, $04 add e - ld e,a - ld a,[hli] - ld [de],a ; store Y position at C2X4 + ld e, a + ld a, [hli] + ld [de], a ; store Y position at C2X4 inc e - ld a,[hli] - ld [de],a ; store X position at C2X5 + ld a, [hli] + ld [de], a ; store X position at C2X5 inc e - ld a,[hli] - ld [de],a ; store movement byte 1 at C2X6 - ld a,[hli] - ld [hLoadSpriteTemp1],a ; save movement byte 2 - ld a,[hli] - ld [hLoadSpriteTemp2],a ; save text ID and flags byte + ld a, [hli] + ld [de], a ; store movement byte 1 at C2X6 + ld a, [hli] + ld [hLoadSpriteTemp1], a ; save movement byte 2 + ld a, [hli] + ld [hLoadSpriteTemp2], a ; save text ID and flags byte push bc push hl - ld b,$00 - ld hl,wMapSpriteData - add hl,bc - ld a,[hLoadSpriteTemp1] - ld [hli],a ; store movement byte 2 in byte 0 of sprite entry - ld a,[hLoadSpriteTemp2] - ld [hl],a ; this appears pointless, since the value is overwritten immediately after - ld a,[hLoadSpriteTemp2] - ld [hLoadSpriteTemp1],a - and a,$3f - ld [hl],a ; store text ID in byte 1 of sprite entry + ld b, $00 + ld hl, wMapSpriteData + add hl, bc + ld a, [hLoadSpriteTemp1] + ld [hli], a ; store movement byte 2 in byte 0 of sprite entry + ld a, [hLoadSpriteTemp2] + ld [hl], a ; this appears pointless, since the value is overwritten immediately after + ld a, [hLoadSpriteTemp2] + ld [hLoadSpriteTemp1], a + and $3f + ld [hl], a ; store text ID in byte 1 of sprite entry pop hl - ld a,[hLoadSpriteTemp1] - bit 6,a - jr nz,.trainerSprite - bit 7,a - jr nz,.itemBallSprite + ld a, [hLoadSpriteTemp1] + bit 6, a + jr nz, .trainerSprite + bit 7, a + jr nz, .itemBallSprite jr .regularSprite .trainerSprite - ld a,[hli] - ld [hLoadSpriteTemp1],a ; save trainer class - ld a,[hli] - ld [hLoadSpriteTemp2],a ; save trainer number (within class) + ld a, [hli] + ld [hLoadSpriteTemp1], a ; save trainer class + ld a, [hli] + ld [hLoadSpriteTemp2], a ; save trainer number (within class) push hl - ld hl,wMapSpriteExtraData - add hl,bc - ld a,[hLoadSpriteTemp1] - ld [hli],a ; store trainer class in byte 0 of the entry - ld a,[hLoadSpriteTemp2] - ld [hl],a ; store trainer number in byte 1 of the entry + ld hl, wMapSpriteExtraData + add hl, bc + ld a, [hLoadSpriteTemp1] + ld [hli], a ; store trainer class in byte 0 of the entry + ld a, [hLoadSpriteTemp2] + ld [hl], a ; store trainer number in byte 1 of the entry pop hl jr .nextSprite .itemBallSprite - ld a,[hli] - ld [hLoadSpriteTemp1],a ; save item number + ld a, [hli] + ld [hLoadSpriteTemp1], a ; save item number push hl - ld hl,wMapSpriteExtraData - add hl,bc - ld a,[hLoadSpriteTemp1] - ld [hli],a ; store item number in byte 0 of the entry + ld hl, wMapSpriteExtraData + add hl, bc + 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 + ld [hl], a ; zero byte 1, since it is not used pop hl jr .nextSprite .regularSprite push hl - ld hl,wMapSpriteExtraData - add hl,bc + ld hl, wMapSpriteExtraData + add hl, bc ; zero both bytes, since regular sprites don't use this extra space xor a - ld [hli],a - ld [hl],a + ld [hli], a + ld [hl], a pop hl .nextSprite pop bc dec d - ld a,$0a + ld a, $0a add e - ld e,a + ld e, a inc c inc c dec b - jp nz,.loadSpriteLoop + jp nz, .loadSpriteLoop .finishUp predef LoadTilesetHeader callab LoadWildData pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) - ld a,[wCurMapHeight] ; map height in 4x4 tile blocks + ld a, [wCurMapHeight] ; map height in 4x4 tile blocks add a ; double it - ld [wCurrentMapHeight2],a ; store map height in 2x2 tile blocks - ld a,[wCurMapWidth] ; map width in 4x4 tile blocks + ld [wCurrentMapHeight2], a ; store map height in 2x2 tile blocks + ld a, [wCurMapWidth] ; map width in 4x4 tile blocks add a ; double it - ld [wCurrentMapWidth2],a ; map width in 2x2 tile blocks - ld a,[wCurMap] - ld c,a - ld b,$00 - ld a,[H_LOADEDROMBANK] + ld [wCurrentMapWidth2], a ; map width in 2x2 tile blocks + ld a, [wCurMap] + ld c, a + ld b, $00 + ld a, [H_LOADEDROMBANK] push af ld a, BANK(MapSongBanks) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ld hl, MapSongBanks - add hl,bc - add hl,bc - ld a,[hli] - ld [wMapMusicSoundID],a ; music 1 - ld a,[hl] - ld [wMapMusicROMBank],a ; music 2 + add hl, bc + add hl, bc + ld a, [hli] + ld [wMapMusicSoundID], a ; music 1 + ld a, [hl] + ld [wMapMusicROMBank], a ; music 2 pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; function to copy map connection data from ROM to WRAM ; Input: hl = source, de = destination CopyMapConnectionHeader:: - ld c,$0b + ld c, $0b .loop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec c - jr nz,.loop + jr nz, .loop ret ; function to load map data LoadMapData:: - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af call DisableLCD - ld a,$98 - ld [wMapViewVRAMPointer + 1],a + ld a, $98 + ld [wMapViewVRAMPointer + 1], a xor a - ld [wMapViewVRAMPointer],a - ld [hSCY],a - ld [hSCX],a - ld [wWalkCounter],a - ld [wUnusedD119],a - ld [wWalkBikeSurfStateCopy],a - ld [wSpriteSetID],a + ld [wMapViewVRAMPointer], a + ld [hSCY], a + ld [hSCX], a + ld [wWalkCounter], a + ld [wUnusedD119], a + ld [wWalkBikeSurfStateCopy], a + ld [wSpriteSetID], a call LoadTextBoxTilePatterns call LoadMapHeader callba InitMapSprites ; load tile pattern data for sprites @@ -2343,42 +2343,42 @@ LoadMapData:: call LoadCurrentMapView ; copy current map view to VRAM coord hl, 0, 0 - ld de,vBGMap0 - ld b,18 + ld de, vBGMap0 + ld b, 18 .vramCopyLoop - ld c,20 + ld c, 20 .vramCopyInnerLoop - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc e dec c - jr nz,.vramCopyInnerLoop - ld a,32 - 20 + jr nz, .vramCopyInnerLoop + ld a, 32 - 20 add e - ld e,a - jr nc,.noCarry + ld e, a + jr nc, .noCarry inc d .noCarry dec b - jr nz,.vramCopyLoop - ld a,$01 - ld [wUpdateSpritesEnabled],a + jr nz, .vramCopyLoop + ld a, $01 + ld [wUpdateSpritesEnabled], a call EnableLCD ld b, SET_PAL_OVERWORLD call RunPaletteCommand call LoadPlayerSpriteGraphics - ld a,[wd732] - and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp - jr nz,.restoreRomBank - ld a,[wFlags_D733] - bit 1,a - jr nz,.restoreRomBank + ld a, [wd732] + and 1 << 4 | 1 << 3 ; fly warp or dungeon warp + jr nz, .restoreRomBank + ld a, [wFlags_D733] + bit 1, a + jr nz, .restoreRomBank call UpdateMusic6Times call PlayDefaultMusicFadeOutCurrent .restoreRomBank pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ret ; function to switch to the ROM bank that a map is stored in @@ -2386,18 +2386,18 @@ LoadMapData:: SwitchToMapRomBank:: push hl push bc - ld c,a - ld b,$00 - ld a,Bank(MapHeaderBanks) + ld c, a + ld b, $00 + ld a, Bank(MapHeaderBanks) call BankswitchHome ; switch to ROM bank 3 - ld hl,MapHeaderBanks - add hl,bc - ld a,[hl] - ld [$ffe8],a ; save map ROM bank + ld hl, MapHeaderBanks + add hl, bc + ld a, [hl] + ld [$ffe8], a ; save map ROM bank call BankswitchBack - ld a,[$ffe8] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a ; switch to map ROM bank + ld a, [$ffe8] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a ; switch to map ROM bank pop bc pop hl ret diff --git a/home/text.asm b/home/text.asm index b983f609..9db81530 100644 --- a/home/text.asm +++ b/home/text.asm @@ -18,7 +18,7 @@ TextBoxBorder:: .next push hl ld a, "│" - ld [hli],a + ld [hli], a ld a, " " call NPlaceChar ld [hl], "│" @@ -49,12 +49,12 @@ NPlaceChar:: PlaceString:: push hl PlaceNextChar:: - ld a,[de] + ld a, [de] cp "@" jr nz, Char4ETest - ld b,h - ld c,l + ld b, h + ld c, l pop hl ret @@ -62,19 +62,19 @@ Char4ETest:: cp $4E ; next jr nz, .char4FTest ld bc, 2 * SCREEN_WIDTH - ld a,[hFlags_0xFFF6] - bit 2,a - jr z,.ok - ld bc,SCREEN_WIDTH + ld a, [hFlags_0xFFF6] + bit 2, a + jr z, .ok + ld bc, SCREEN_WIDTH .ok pop hl - add hl,bc + add hl, bc push hl jp PlaceNextChar_inc .char4FTest cp $4F ; line - jr nz,.next3 + jr nz, .next3 pop hl coord hl, 1, 16 push hl @@ -111,17 +111,17 @@ endm dict $59, Char59 ; TARGET dict $5A, Char5A ; USER - ld [hli],a + ld [hli], a call PrintLetterDelay PlaceNextChar_inc:: inc de jp PlaceNextChar Char00:: - ld b,h - ld c,l + ld b, h + ld c, l pop hl - ld de,Char00Text + ld de, Char00Text dec de ret @@ -131,47 +131,47 @@ Char00Text:: ; “%d ERROR.” Char52:: ; player’s name push de - ld de,wPlayerName + ld de, wPlayerName jr FinishDTE Char53:: ; rival’s name push de - ld de,wRivalName + ld de, wRivalName jr FinishDTE Char5D:: ; TRAINER push de - ld de,Char5DText + ld de, Char5DText jr FinishDTE Char5C:: ; TM push de - ld de,Char5CText + ld de, Char5CText jr FinishDTE Char5B:: ; PC push de - ld de,Char5BText + ld de, Char5BText jr FinishDTE Char5E:: ; ROCKET push de - ld de,Char5EText + ld de, Char5EText jr FinishDTE Char54:: ; POKé push de - ld de,Char54Text + ld de, Char54Text jr FinishDTE Char56:: ; …… push de - ld de,Char56Text + ld de, Char56Text jr FinishDTE Char4A:: ; PKMN push de - ld de,Char4AText + ld de, Char4AText jr FinishDTE Char59:: @@ -180,7 +180,7 @@ Char59:: ; or ; player active monster’s name ; (like Char5A but flipped) - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] xor 1 jr MonsterNameCharsCommon @@ -189,26 +189,26 @@ Char5A:: ; player active monster’s name ; or ; enemy active monster’s name, prefixed with “Enemy ” - ld a,[H_WHOSETURN] + ld a, [H_WHOSETURN] MonsterNameCharsCommon:: push de and a - jr nz,.Enemy - ld de,wBattleMonNick ; player active monster name + jr nz, .Enemy + ld de, wBattleMonNick ; player active monster name jr FinishDTE .Enemy ; print “Enemy ” - ld de,Char5AText + ld de, Char5AText call PlaceString - ld h,b - ld l,c - ld de,wEnemyMonNick ; enemy active monster name + ld h, b + ld l, c + ld de, wEnemyMonNick ; enemy active monster name FinishDTE:: call PlaceString - ld h,b - ld l,c + ld h, b + ld l, c pop de inc de jp PlaceNextChar @@ -232,12 +232,12 @@ Char4AText:: Char55:: push de - ld b,h - ld c,l - ld hl,Char55Text + ld b, h + ld c, l + ld hl, Char55Text call TextCommandProcessor - ld h,b - ld l,c + ld h, b + ld l, c pop de inc de jp PlaceNextChar @@ -249,12 +249,12 @@ Char55Text:: Char5F:: ; ends a Pokédex entry - ld [hl],"." + ld [hl], "." pop hl ret Char58:: ; prompt - ld a,[wLinkState] + ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, .ok ld a, "▼" @@ -290,14 +290,14 @@ Char51:: ; para Char49:: push de - ld a,"▼" + ld a, "▼" Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll coord hl, 1, 10 lb bc, 7, 18 call ClearScreenArea - ld c,20 + ld c, 20 call DelayFrames pop de pop hl @@ -306,7 +306,7 @@ Char49:: jp PlaceNextChar_inc Char4B:: - ld a,"▼" + ld a, "▼" Coorda 18, 16 call ProtectedDelay3 push de @@ -332,25 +332,25 @@ ScrollTextUpOneLine:: coord de, 0, 13 ; empty line above text ld b, SCREEN_WIDTH * 3 .copyText - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de dec b - jr nz,.copyText + jr nz, .copyText coord hl, 1, 16 ld a, " " - ld b,SCREEN_WIDTH - 2 + ld b, SCREEN_WIDTH - 2 .clearText - ld [hli],a + ld [hli], a dec b - jr nz,.clearText + jr nz, .clearText ; wait five frames - ld b,5 + ld b, 5 .WaitFrame call DelayFrame dec b - jr nz,.WaitFrame + jr nz, .WaitFrame ret @@ -361,33 +361,33 @@ ProtectedDelay3:: ret TextCommandProcessor:: - ld a,[wLetterPrintingDelayFlags] + ld a, [wLetterPrintingDelayFlags] push af - set 1,a - ld e,a + set 1, a + ld e, a ld a, [$fff4] xor e - ld [wLetterPrintingDelayFlags],a - ld a,c - ld [wTextDest],a - ld a,b - ld [wTextDest + 1],a + ld [wLetterPrintingDelayFlags], a + ld a, c + ld [wTextDest], a + ld a, b + ld [wTextDest + 1], a NextTextCommand:: - ld a,[hli] - cp a, "@" ; terminator - jr nz,.doTextCommand + ld a, [hli] + cp "@" ; terminator + jr nz, .doTextCommand pop af - ld [wLetterPrintingDelayFlags],a + ld [wLetterPrintingDelayFlags], a ret .doTextCommand push hl - cp a, $17 + cp $17 jp z, TextCommand17 - cp a, $0e - jp nc,TextCommand0B ; if a != 0x17 and a >= 0xE, go to command 0xB + cp $0e + jp nc, TextCommand0B ; if a != 0x17 and a >= 0xE, go to command 0xB ; if a < 0xE, use a jump table - ld hl,TextCommandJumpTable + ld hl, TextCommandJumpTable push bc add a ld b, 0 @@ -406,17 +406,17 @@ NextTextCommand:: ; CC = width TextCommand04:: pop hl - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a - ld a,[hli] - ld b,a - ld a,[hli] - ld c,a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld b, a + ld a, [hli] + ld c, a push hl - ld h,d - ld l,e + ld h, d + ld l, e call TextBoxBorder pop hl jr NextTextCommand @@ -425,13 +425,13 @@ TextCommand04:: ; 00{string} TextCommand00:: pop hl - ld d,h - ld e,l - ld h,b - ld l,c + ld d, h + ld e, l + ld h, b + ld l, c call PlaceString - ld h,d - ld l,e + ld h, d + ld l, e inc hl jr NextTextCommand @@ -440,13 +440,13 @@ TextCommand00:: ; AAAA = address of string TextCommand01:: pop hl - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a push hl - ld h,b - ld l,c + ld h, b + ld l, c call PlaceString pop hl jr NextTextCommand @@ -459,18 +459,18 @@ TextCommand01:: ; bits 5-7 = unknown flags TextCommand02:: pop hl - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a - ld a,[hli] + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] push hl - ld h,b - ld l,c - ld c,a + ld h, b + ld l, c + ld c, a call PrintBCDNumber - ld b,h - ld c,l + ld b, h + ld c, l pop hl jr NextTextCommand @@ -479,12 +479,12 @@ TextCommand02:: ; AAAA = new destination address TextCommand03:: pop hl - ld a,[hli] - ld [wTextDest],a - ld c,a - ld a,[hli] - ld [wTextDest + 1],a - ld b,a + ld a, [hli] + ld [wTextDest], a + ld c, a + ld a, [hli] + ld [wTextDest + 1], a + ld b, a jp NextTextCommand ; repoint destination to second line of dialogue text box @@ -499,15 +499,15 @@ TextCommand05:: ; 06 ; (no arguments) TextCommand06:: - ld a,[wLinkState] - cp a,LINK_STATE_BATTLING - jp z,TextCommand0D - ld a,"▼" + ld a, [wLinkState] + cp LINK_STATE_BATTLING + jp z, TextCommand0D + ld a, "▼" Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box push bc call ManualTextScroll ; blink arrow and wait for A or B to be pressed pop bc - ld a," " + ld a, " " Coorda 18, 16 ; overwrite down arrow with blank space pop hl jp NextTextCommand @@ -528,7 +528,7 @@ TextCommand07:: ; 08{code} TextCommand08:: pop hl - ld de,NextTextCommand + ld de, NextTextCommand push de ; return address jp hl @@ -540,25 +540,25 @@ TextCommand08:: ; bits 4-7 = how long the number is in bytes TextCommand09:: pop hl - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a - ld a,[hli] + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] push hl - ld h,b - ld l,c - ld b,a - and a,$0f - ld c,a - ld a,b - and a,$f0 + ld h, b + ld l, c + ld b, a + and $0f + ld c, a + ld a, b + and $f0 swap a set BIT_LEFT_ALIGN,a - ld b,a + ld b, a call PrintNumber - ld b,h - ld c,l + ld b, h + ld c, l pop hl jp NextTextCommand @@ -568,10 +568,10 @@ TextCommand09:: TextCommand0A:: push bc call Joypad - ld a,[hJoyHeld] - and a,A_BUTTON | B_BUTTON - jr nz,.skipDelay - ld c,30 + ld a, [hJoyHeld] + and A_BUTTON | B_BUTTON + jr nz, .skipDelay + ld c, 30 call DelayFrames .skipDelay pop bc @@ -585,24 +585,24 @@ TextCommand0B:: pop hl push bc dec hl - ld a,[hli] - ld b,a ; b = command number that got us here + ld a, [hli] + ld b, a ; b = command number that got us here push hl - ld hl,TextCommandSounds + ld hl, TextCommandSounds .loop - ld a,[hli] + ld a, [hli] cp b - jr z,.matchFound + jr z, .matchFound inc hl jr .loop .matchFound - cp a,$14 - jr z,.pokemonCry - cp a,$15 - jr z,.pokemonCry - cp a,$16 - jr z,.pokemonCry - ld a,[hl] + cp $14 + jr z, .pokemonCry + cp $15 + jr z, .pokemonCry + cp $16 + jr z, .pokemonCry + ld a, [hl] call PlaySound call WaitForSoundToFinish pop hl @@ -610,7 +610,7 @@ TextCommand0B:: jp NextTextCommand .pokemonCry push de - ld a,[hl] + ld a, [hl] call PlayCry pop de pop hl @@ -635,27 +635,27 @@ TextCommandSounds:: ; AA = number of ellipses to draw TextCommand0C:: pop hl - ld a,[hli] - ld d,a + ld a, [hli] + ld d, a push hl - ld h,b - ld l,c + ld h, b + ld l, c .loop - ld a,"…" - ld [hli],a + ld a, "…" + ld [hli], a push de call Joypad pop de - ld a,[hJoyHeld] ; joypad state - and a,A_BUTTON | B_BUTTON - jr nz,.skipDelay ; if so, skip the delay - ld c,10 + ld a, [hJoyHeld] ; joypad state + and A_BUTTON | B_BUTTON + jr nz, .skipDelay ; if so, skip the delay + ld c, 10 call DelayFrames .skipDelay dec d - jr nz,.loop - ld b,h - ld c,l + jr nz, .loop + ld b, h + ld c, l pop hl jp NextTextCommand @@ -675,23 +675,23 @@ TextCommand0D:: ; BB = bank TextCommand17:: pop hl - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,[hli] - ld e,a - ld a,[hli] - ld d,a - ld a,[hli] - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a push hl - ld l,e - ld h,d + ld l, e + ld h, d call TextCommandProcessor pop hl pop af - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a + ld [H_LOADEDROMBANK], a + ld [MBC1RomBank], a jp NextTextCommand TextCommandJumpTable:: diff --git a/home/vcopy.asm b/home/vcopy.asm index ad92e8fb..3f49ad3e 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -10,27 +10,27 @@ GetRowColAddressBgMap:: srl h rr a or l - ld l,a - ld a,b + ld l, a + ld a, b or h - ld h,a + ld h, a ret ; clears a VRAM background map with blank space tiles ; INPUT: h - high byte of background tile map address in VRAM ClearBgMap:: - ld a," " + ld a, " " jr .next - ld a,l + ld a, l .next - ld de,$400 ; size of VRAM background map - ld l,e + ld de, $400 ; size of VRAM background map + ld l, e .loop - ld [hli],a + ld [hli], a dec e - jr nz,.loop + jr nz, .loop dec d - jr nz,.loop + jr nz, .loop ret ; This function redraws a BG row of height 2 or a BG column of width 2. @@ -40,76 +40,76 @@ ClearBgMap:: ; However, this function is also called repeatedly to redraw the whole screen ; when necessary. It is also used in trade animation and elevator code. RedrawRowOrColumn:: - ld a,[hRedrawRowOrColumnMode] + ld a, [hRedrawRowOrColumnMode] and a ret z - ld b,a + ld b, a xor a - ld [hRedrawRowOrColumnMode],a + ld [hRedrawRowOrColumnMode], a dec b - jr nz,.redrawRow + jr nz, .redrawRow .redrawColumn - ld hl,wRedrawRowOrColumnSrcTiles - ld a,[hRedrawRowOrColumnDest] - ld e,a - ld a,[hRedrawRowOrColumnDest + 1] - ld d,a - ld c,SCREEN_HEIGHT + ld hl, wRedrawRowOrColumnSrcTiles + ld a, [hRedrawRowOrColumnDest] + ld e, a + ld a, [hRedrawRowOrColumnDest + 1] + ld d, a + ld c, SCREEN_HEIGHT .loop1 - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de - ld a,[hli] - ld [de],a - ld a,BG_MAP_WIDTH - 1 + ld a, [hli] + ld [de], a + ld a, BG_MAP_WIDTH - 1 add e - ld e,a - jr nc,.noCarry + ld e, a + jr nc, .noCarry inc d .noCarry ; the following 4 lines wrap us from bottom to top if necessary - ld a,d - and a,$03 - or a,$98 - ld d,a + ld a, d + and $03 + or $98 + ld d, a dec c - jr nz,.loop1 + jr nz, .loop1 xor a - ld [hRedrawRowOrColumnMode],a + ld [hRedrawRowOrColumnMode], a ret .redrawRow - ld hl,wRedrawRowOrColumnSrcTiles - ld a,[hRedrawRowOrColumnDest] - ld e,a - ld a,[hRedrawRowOrColumnDest + 1] - ld d,a + ld hl, wRedrawRowOrColumnSrcTiles + ld a, [hRedrawRowOrColumnDest] + ld e, a + ld a, [hRedrawRowOrColumnDest + 1] + ld d, a push de call .DrawHalf ; draw upper half pop de - ld a,BG_MAP_WIDTH ; width of VRAM background map + ld a, BG_MAP_WIDTH ; width of VRAM background map add e - ld e,a + ld e, a ; fall through and draw lower half .DrawHalf - ld c,SCREEN_WIDTH / 2 + ld c, SCREEN_WIDTH / 2 .loop2 - ld a,[hli] - ld [de],a + ld a, [hli] + ld [de], a inc de - ld a,[hli] - ld [de],a - ld a,e + ld a, [hli] + ld [de], a + ld a, e inc a ; the following 6 lines wrap us from the right edge to the left edge if necessary - and a,$1f - ld b,a - ld a,e - and a,$e0 + and $1f + ld b, a + ld a, e + and $e0 or b - ld e,a + ld e, a dec c - jr nz,.loop2 + jr nz, .loop2 ret ; This function automatically transfers tile number data from the tile map at @@ -120,52 +120,52 @@ RedrawRowOrColumn:: ; the above function, RedrawRowOrColumn, is used when walking to ; improve efficiency. AutoBgMapTransfer:: - ld a,[H_AUTOBGTRANSFERENABLED] + ld a, [H_AUTOBGTRANSFERENABLED] and a ret z - ld hl,sp + 0 - ld a,h - ld [H_SPTEMP],a - ld a,l - ld [H_SPTEMP + 1],a ; save stack pinter - ld a,[H_AUTOBGTRANSFERPORTION] + ld hl, sp + 0 + ld a, h + ld [H_SPTEMP], a + ld a, l + ld [H_SPTEMP + 1], a ; save stack pinter + ld a, [H_AUTOBGTRANSFERPORTION] and a - jr z,.transferTopThird + jr z, .transferTopThird dec a - jr z,.transferMiddleThird + jr z, .transferMiddleThird .transferBottomThird coord hl, 0, 12 - ld sp,hl - ld a,[H_AUTOBGTRANSFERDEST + 1] - ld h,a - ld a,[H_AUTOBGTRANSFERDEST] - ld l,a - ld de,(12 * 32) - add hl,de + ld sp, hl + ld a, [H_AUTOBGTRANSFERDEST + 1] + ld h, a + ld a, [H_AUTOBGTRANSFERDEST] + ld l, a + ld de, (12 * 32) + add hl, de xor a ; TRANSFERTOP jr .doTransfer .transferTopThird coord hl, 0, 0 - ld sp,hl - ld a,[H_AUTOBGTRANSFERDEST + 1] - ld h,a - ld a,[H_AUTOBGTRANSFERDEST] - ld l,a - ld a,TRANSFERMIDDLE + ld sp, hl + ld a, [H_AUTOBGTRANSFERDEST + 1] + ld h, a + ld a, [H_AUTOBGTRANSFERDEST] + ld l, a + ld a, TRANSFERMIDDLE jr .doTransfer .transferMiddleThird coord hl, 0, 6 - ld sp,hl - ld a,[H_AUTOBGTRANSFERDEST + 1] - ld h,a - ld a,[H_AUTOBGTRANSFERDEST] - ld l,a - ld de,(6 * 32) - add hl,de - ld a,TRANSFERBOTTOM + ld sp, hl + ld a, [H_AUTOBGTRANSFERDEST + 1] + ld h, a + ld a, [H_AUTOBGTRANSFERDEST] + ld l, a + ld de, (6 * 32) + add hl, de + ld a, TRANSFERBOTTOM .doTransfer - ld [H_AUTOBGTRANSFERPORTION],a ; store next portion - ld b,6 + ld [H_AUTOBGTRANSFERPORTION], a ; store next portion + ld b, 6 TransferBgRows:: ; unrolled loop and using pop for speed @@ -202,27 +202,27 @@ TransferBgRows:: ; Copies [H_VBCOPYBGNUMROWS] rows from H_VBCOPYBGSRC to H_VBCOPYBGDEST. ; If H_VBCOPYBGSRC is XX00, the transfer is disabled. VBlankCopyBgMap:: - ld a,[H_VBCOPYBGSRC] ; doubles as enabling byte + ld a, [H_VBCOPYBGSRC] ; doubles as enabling byte and a ret z - ld hl,sp + 0 - ld a,h - ld [H_SPTEMP],a - ld a,l - ld [H_SPTEMP + 1],a ; save stack pointer - ld a,[H_VBCOPYBGSRC] - ld l,a - ld a,[H_VBCOPYBGSRC + 1] - ld h,a - ld sp,hl - ld a,[H_VBCOPYBGDEST] - ld l,a - ld a,[H_VBCOPYBGDEST + 1] - ld h,a - ld a,[H_VBCOPYBGNUMROWS] - ld b,a + ld hl, sp + 0 + ld a, h + ld [H_SPTEMP], a + ld a, l + ld [H_SPTEMP + 1], a ; save stack pointer + ld a, [H_VBCOPYBGSRC] + ld l, a + ld a, [H_VBCOPYBGSRC + 1] + ld h, a + ld sp, hl + ld a, [H_VBCOPYBGDEST] + ld l, a + ld a, [H_VBCOPYBGDEST + 1] + ld h, a + ld a, [H_VBCOPYBGNUMROWS] + ld b, a xor a - ld [H_VBCOPYBGSRC],a ; disable transfer so it doesn't continue next V-blank + ld [H_VBCOPYBGSRC], a ; disable transfer so it doesn't continue next V-blank jr TransferBgRows diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 09d2df37..cc81b076 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -144,7 +144,7 @@ CeladonGameCornerText2: ld a, [wCurrentMenuItem] and a jr nz, .asm_48d0f - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag jr z, .asm_48d19 call Has9990Coins @@ -362,7 +362,7 @@ CeladonGameCornerText10: jr nz, .asm_48e75 ld hl, CeladonGameCornerText_48e88 call PrintText - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag jr z, .asm_48e7f call Has9990Coins diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index d6269a64..555e75f1 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -113,10 +113,10 @@ CeruleanCityMovement1: db $FF CeruleanCityScript_1955d: - ld a,1 - ld [H_SPRITEINDEX],a + ld a, 1 + ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection],a + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay ; face object CeruleanCityScript1: diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index fa0cdca2..5c7704f5 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -302,7 +302,7 @@ FightingDojoText7: jr nz, .done ld a, [wcf91] ld b, a - ld c,30 + ld c, 30 call GivePokemon jr nc, .done SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index f9307c04..6d49fb2f 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -12,7 +12,7 @@ FuchsiaHouse2Text1: TX_ASM CheckEvent EVENT_GOT_HM04 jr nz, .subtract - ld b,GOLD_TEETH + ld b, GOLD_TEETH call IsItemInBag jr nz, .asm_3f30f CheckEvent EVENT_GAVE_GOLD_TEETH diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index e73d7cf8..aa84fab9 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -981,7 +981,7 @@ OaksLabText5: predef DisplayDexRating jp .asm_1d2ed .asm_1d279 - ld b,POKE_BALL + ld b, POKE_BALL call IsItemInBag jr nz, .asm_1d2e7 CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index a06dfd54..5b2d2a35 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -1,11 +1,11 @@ PalletTownScript: CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK - jr z,.next + jr z, .next SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS .next call EnableAutoTextBoxDrawing - ld hl,PalletTownScriptPointers - ld a,[wPalletTownCurScript] + ld hl, PalletTownScriptPointers + ld a, [wPalletTownCurScript] jp CallFunctionInTable PalletTownScriptPointers: @@ -20,126 +20,126 @@ PalletTownScriptPointers: PalletTownScript0: CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB ret nz - ld a,[wYCoord] + ld a, [wYCoord] cp 1 ; is player near north exit? ret nz xor a - ld [hJoyHeld],a - ld a,PLAYER_DIR_DOWN - ld [wPlayerMovingDirection],a - ld a,$FF + ld [hJoyHeld], a + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, $FF call PlaySound ; stop music ld a, BANK(Music_MeetProfOak) - ld c,a + ld c, a ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music call PlayMusic - ld a,$FC - ld [wJoyIgnore],a + ld a, $FC + ld [wJoyIgnore], a SetEvent EVENT_OAK_APPEARED_IN_PALLET ; trigger the next script - ld a,1 - ld [wPalletTownCurScript],a + ld a, 1 + ld [wPalletTownCurScript], a ret PalletTownScript1: xor a - ld [wcf0d],a - ld a,1 - ld [hSpriteIndexOrTextID],a + ld [wcf0d], a + ld a, 1 + ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a,$FF - ld [wJoyIgnore],a - ld a,HS_PALLET_TOWN_OAK - ld [wMissableObjectIndex],a + ld a, $FF + ld [wJoyIgnore], a + ld a, HS_PALLET_TOWN_OAK + ld [wMissableObjectIndex], a predef ShowObject ; trigger the next script - ld a,2 - ld [wPalletTownCurScript],a + ld a, 2 + ld [wPalletTownCurScript], a ret PalletTownScript2: - ld a,1 - ld [H_SPRITEINDEX],a - ld a,SPRITE_FACING_UP - ld [hSpriteFacingDirection],a + ld a, 1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 - ld a,1 - ld [wYCoord],a - ld a,1 - ld [hNPCPlayerRelativePosPerspective],a - ld a,1 + ld a, 1 + ld [wYCoord], a + ld a, 1 + ld [hNPCPlayerRelativePosPerspective], a + ld a, 1 swap a - ld [hNPCSpriteOffset],a + ld [hNPCSpriteOffset], a predef CalcPositionOfPlayerRelativeToNPC - ld hl,hNPCPlayerYDistance + ld hl, hNPCPlayerYDistance dec [hl] predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2 - ld de,wNPCMovementDirections2 - ld a,1 ; oak - ld [H_SPRITEINDEX],a + ld de, wNPCMovementDirections2 + ld a, 1 ; oak + ld [H_SPRITEINDEX], a call MoveSprite - ld a,$FF - ld [wJoyIgnore],a + ld a, $FF + ld [wJoyIgnore], a ; trigger the next script - ld a,3 - ld [wPalletTownCurScript],a + ld a, 3 + ld [wPalletTownCurScript], a ret PalletTownScript3: - ld a,[wd730] - bit 0,a + ld a, [wd730] + bit 0, a ret nz xor a ; ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 9],a - ld a,1 - ld [wcf0d],a - ld a,$FC - ld [wJoyIgnore],a - ld a,1 - ld [hSpriteIndexOrTextID],a + ld [wSpriteStateData1 + 9], a + ld a, 1 + ld [wcf0d], a + ld a, $FC + ld [wJoyIgnore], a + ld a, 1 + ld [hSpriteIndexOrTextID], a call DisplayTextID ; set up movement script that causes the player to follow Oak to his lab - ld a,$FF - ld [wJoyIgnore],a - ld a,1 - ld [wSpriteIndex],a + ld a, $FF + ld [wJoyIgnore], a + ld a, 1 + ld [wSpriteIndex], a xor a - ld [wNPCMovementScriptFunctionNum],a - ld a,1 - ld [wNPCMovementScriptPointerTableNum],a - ld a,[H_LOADEDROMBANK] - ld [wNPCMovementScriptBank],a + ld [wNPCMovementScriptFunctionNum], a + ld a, 1 + ld [wNPCMovementScriptPointerTableNum], a + ld a, [H_LOADEDROMBANK] + ld [wNPCMovementScriptBank], a ; trigger the next script - ld a,4 - ld [wPalletTownCurScript],a + ld a, 4 + ld [wPalletTownCurScript], a ret PalletTownScript4: - ld a,[wNPCMovementScriptPointerTableNum] + ld a, [wNPCMovementScriptPointerTableNum] and a ; is the movement script over? ret nz ; trigger the next script - ld a,5 - ld [wPalletTownCurScript],a + ld a, 5 + ld [wPalletTownCurScript], a ret PalletTownScript5: CheckEvent EVENT_DAISY_WALKING - jr nz,.next + jr nz, .next CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1 - jr nz,.next + jr nz, .next SetEvent EVENT_DAISY_WALKING - ld a,HS_DAISY_SITTING - ld [wMissableObjectIndex],a + ld a, HS_DAISY_SITTING + ld [wMissableObjectIndex], a predef HideObject - ld a,HS_DAISY_WALKING - ld [wMissableObjectIndex],a + ld a, HS_DAISY_WALKING + ld [wMissableObjectIndex], a predef_jump ShowObject .next CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK @@ -159,15 +159,15 @@ PalletTownTextPointers: PalletTownText1: TX_ASM - ld a,[wcf0d] + ld a, [wcf0d] and a - jr nz,.next - ld a,1 - ld [wDoNotWaitForButtonPressAfterDisplayingText],a - ld hl,OakAppearsText + jr nz, .next + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, OakAppearsText jr .done .next - ld hl,OakWalksUpText + ld hl, OakWalksUpText .done call PrintText jp TextScriptEnd @@ -175,14 +175,14 @@ PalletTownText1: OakAppearsText: TX_FAR _OakAppearsText TX_ASM - ld c,10 + ld c, 10 call DelayFrames xor a - ld [wEmotionBubbleSpriteIndex],a ; player's sprite - ld [wWhichEmotionBubble],a ; EXCLAMATION_BUBBLE + ld [wEmotionBubbleSpriteIndex], a ; player's sprite + ld [wWhichEmotionBubble], a ; EXCLAMATION_BUBBLE predef EmotionBubble - ld a,PLAYER_DIR_DOWN - ld [wPlayerMovingDirection],a + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a jp TextScriptEnd OakWalksUpText: diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index cbfb35c8..59323b8e 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -51,11 +51,11 @@ MomHealText2: RedsHouse1FText2: ; TV TX_ASM - ld a,[wSpriteStateData1 + 9] + ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP - ld hl,TVWrongSideText - jr nz,.notUp - ld hl,StandByMeText + ld hl, TVWrongSideText + jr nz, .notUp + ld hl, StandByMeText .notUp call PrintText jp TextScriptEnd diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 60c3ea67..0ec59077 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -1,7 +1,7 @@ RedsHouse2FScript: call EnableAutoTextBoxDrawing - ld hl,RedsHouse2FScriptPointers - ld a,[wRedsHouse2CurScript] + ld hl, RedsHouse2FScriptPointers + ld a, [wRedsHouse2CurScript] jp CallFunctionInTable RedsHouse2FScriptPointers: @@ -10,11 +10,11 @@ RedsHouse2FScriptPointers: RedsHouse2FScript0: xor a - ld [hJoyHeld],a - ld a,PLAYER_DIR_UP - ld [wPlayerMovingDirection],a - ld a,1 - ld [wRedsHouse2CurScript],a + ld [hJoyHeld], a + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + ld a, 1 + ld [wRedsHouse2CurScript], a ret RedsHouse2FScript1: diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 80551e69..5c6002a9 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -117,10 +117,10 @@ SafariZoneEntranceScriptPointers: SafariZoneEntranceAutoWalk: push af - ld b,0 - ld a,c - ld [wSimulatedJoypadStatesIndex],a - ld hl,wSimulatedJoypadStatesEnd + ld b, 0 + ld a, c + ld [wSimulatedJoypadStatesIndex], a + ld hl, wSimulatedJoypadStatesEnd pop af call FillMemory jp StartSimulatingJoypadStates @@ -146,64 +146,64 @@ SafariZoneEntranceTextPointers: TX_FAR SafariZoneEntranceText_9e6e4 TX_ASM ld a, MONEY_BOX - ld [wTextBoxID],a + ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - jp nz,.PleaseComeAgain + jp nz, .PleaseComeAgain xor a - ld [hMoney],a - ld a,$05 - ld [hMoney + 1],a - ld a,$00 - ld [hMoney + 2],a + ld [hMoney], a + ld a, $05 + ld [hMoney + 1], a + ld a, $00 + ld [hMoney + 2], a call HasEnoughMoney - jr nc,.success - ld hl,.NotEnoughMoneyText + jr nc, .success + ld hl, .NotEnoughMoneyText call PrintText jr .CantPayWalkDown .success xor a - ld [wPriceTemp],a - ld a,$05 - ld [wPriceTemp + 1],a - ld a,$00 - ld [wPriceTemp + 2],a - ld hl,wPriceTemp + 2 - ld de,wPlayerMoney + 2 - ld c,3 + ld [wPriceTemp], a + ld a, $05 + ld [wPriceTemp + 1], a + ld a, $00 + ld [wPriceTemp + 2], a + ld hl, wPriceTemp + 2 + ld de, wPlayerMoney + 2 + ld c, 3 predef SubBCDPredef - ld a,MONEY_BOX - ld [wTextBoxID],a + ld a, MONEY_BOX + ld [wTextBoxID], a call DisplayTextBoxID - ld hl,.MakePaymentText + ld hl, .MakePaymentText call PrintText - ld a,30 - ld [wNumSafariBalls],a - ld a,502 / $100 - ld [wSafariSteps],a + ld a, 30 + ld [wNumSafariBalls], a + ld a, 502 / $100 + ld [wSafariSteps], a ld a, 502 % $100 - ld [wSafariSteps + 1],a - ld a,D_UP - ld c,3 + ld [wSafariSteps + 1], a + ld a, D_UP + ld c, 3 call SafariZoneEntranceAutoWalk SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER - ld a,3 - ld [wSafariZoneEntranceCurScript],a + ld a, 3 + ld [wSafariZoneEntranceCurScript], a jr .done .PleaseComeAgain - ld hl,.PleaseComeAgainText + ld hl, .PleaseComeAgainText call PrintText .CantPayWalkDown - ld a,D_DOWN - ld c,1 + ld a, D_DOWN + ld c, 1 call SafariZoneEntranceAutoWalk - ld a,4 - ld [wSafariZoneEntranceCurScript],a + ld a, 4 + ld [wSafariZoneEntranceCurScript], a .done jp TextScriptEnd @@ -225,7 +225,7 @@ SafariZoneEntranceTextPointers: TX_FAR SafariZoneEntranceText_9e814 TX_ASM call YesNoChoice - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a jr nz, .asm_7539c ld hl, .SafariZoneEntranceText_753bb @@ -268,14 +268,14 @@ SafariZoneEntranceTextPointers: .SafariZoneEntranceText2 TX_ASM - ld hl,.FirstTimeQuestionText + ld hl, .FirstTimeQuestionText call PrintText call YesNoChoice - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] and a - ld hl,.RegularText - jr nz,.Explanation - ld hl,.ExplanationText + ld hl, .RegularText + jr nz, .Explanation + ld hl, .ExplanationText .Explanation call PrintText jp TextScriptEnd -- cgit v1.2.3 From c84667c4df36918071bb7487c456d7adafb921ca Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 31 Dec 2017 13:23:25 -0500 Subject: Add pokegold and pokefirered. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 6d5ebe4f..a12514a0 100644 --- a/README.md +++ b/README.md @@ -13,19 +13,23 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). ## See also * Disassembly of [**Pokémon Yellow**][pokeyellow] +* Disassembly of [**Pokémon Gold**][pokegold] * Disassembly of [**Pokémon Crystal**][pokecrystal] * Disassembly of [**Pokémon Pinball**][pokepinball] * Disassembly of [**Pokémon TCG**][poketcg] * Disassembly of [**Pokémon Ruby**][pokeruby] +* Disassembly of [**Pokémon Fire Red**][pokefirered] * Disassembly of [**Pokémon Emerald**][pokeemerald] * Discord: [**pret**][Discord] * irc: **irc.freenode.net** [**#pret**][irc] [pokeyellow]: https://github.com/pret/pokeyellow +[pokegold]: https://github.com/pret/pokegold [pokecrystal]: https://github.com/pret/pokecrystal [pokepinball]: https://github.com/pret/pokepinball [poketcg]: https://github.com/pret/poketcg [pokeruby]: https://github.com/pret/pokeruby +[pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald [Discord]: https://discord.gg/cJxDDVP [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret -- cgit v1.2.3 From d271d6917549074e721f3e5064b77e1ad1dbe44a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 02:31:32 -0500 Subject: Add warp, sign, and warp_to macros for data/mapObjects definitions --- data/mapObjects/agatha.asm | 16 +-- data/mapObjects/bikeshop.asm | 8 +- data/mapObjects/billshouse.asm | 8 +- data/mapObjects/blueshouse.asm | 8 +- data/mapObjects/bruno.asm | 16 +-- data/mapObjects/celadoncity.asm | 70 +++++------ data/mapObjects/celadondiner.asm | 8 +- data/mapObjects/celadongamecorner.asm | 14 +-- data/mapObjects/celadongym.asm | 8 +- data/mapObjects/celadonhotel.asm | 8 +- data/mapObjects/celadonhouse.asm | 8 +- data/mapObjects/celadonmansion1.asm | 22 ++-- data/mapObjects/celadonmansion2.asm | 18 +-- data/mapObjects/celadonmansion3.asm | 24 ++-- data/mapObjects/celadonmansion4.asm | 14 +-- data/mapObjects/celadonmansion5.asm | 8 +- data/mapObjects/celadonmart1.asm | 28 ++--- data/mapObjects/celadonmart2.asm | 14 +-- data/mapObjects/celadonmart3.asm | 36 +++--- data/mapObjects/celadonmart4.asm | 14 +-- data/mapObjects/celadonmart5.asm | 14 +-- data/mapObjects/celadonmartelevator.asm | 10 +- data/mapObjects/celadonmartroof.asm | 12 +- data/mapObjects/celadonpokecenter.asm | 8 +- data/mapObjects/celadonprizeroom.asm | 14 +-- data/mapObjects/ceruleancity.asm | 52 ++++----- data/mapObjects/ceruleangym.asm | 8 +- data/mapObjects/ceruleanhouse1.asm | 8 +- data/mapObjects/ceruleanhouse2.asm | 12 +- data/mapObjects/ceruleanhousetrashed.asm | 14 +-- data/mapObjects/ceruleanmart.asm | 8 +- data/mapObjects/ceruleanpokecenter.asm | 8 +- data/mapObjects/cinnabargym.asm | 8 +- data/mapObjects/cinnabarisland.asm | 30 ++--- data/mapObjects/cinnabarmart.asm | 8 +- data/mapObjects/cinnabarpokecenter.asm | 8 +- data/mapObjects/copycatshouse1f.asm | 12 +- data/mapObjects/copycatshouse2f.asm | 8 +- data/mapObjects/daycarem.asm | 8 +- data/mapObjects/diglettscave.asm | 8 +- data/mapObjects/diglettscaveroute11.asm | 12 +- data/mapObjects/diglettscaveroute2.asm | 12 +- data/mapObjects/fanclub.asm | 12 +- data/mapObjects/fightingdojo.asm | 8 +- data/mapObjects/fuchsiacity.asm | 64 +++++------ data/mapObjects/fuchsiagym.asm | 8 +- data/mapObjects/fuchsiahouse1.asm | 8 +- data/mapObjects/fuchsiahouse2.asm | 12 +- data/mapObjects/fuchsiahouse3.asm | 12 +- data/mapObjects/fuchsiamart.asm | 8 +- data/mapObjects/fuchsiameetingroom.asm | 8 +- data/mapObjects/fuchsiapokecenter.asm | 8 +- data/mapObjects/gary.asm | 16 +-- data/mapObjects/halloffameroom.asm | 8 +- data/mapObjects/indigoplateau.asm | 8 +- data/mapObjects/indigoplateaulobby.asm | 12 +- data/mapObjects/lab1.asm | 28 ++--- data/mapObjects/lab2.asm | 8 +- data/mapObjects/lab3.asm | 14 +-- data/mapObjects/lab4.asm | 8 +- data/mapObjects/lance.asm | 12 +- data/mapObjects/lavenderhouse1.asm | 8 +- data/mapObjects/lavenderhouse2.asm | 8 +- data/mapObjects/lavendermart.asm | 8 +- data/mapObjects/lavenderpokecenter.asm | 8 +- data/mapObjects/lavendertown.asm | 36 +++--- data/mapObjects/lorelei.asm | 16 +-- data/mapObjects/mansion1.asm | 32 +++--- data/mapObjects/mansion2.asm | 16 +-- data/mapObjects/mansion3.asm | 12 +- data/mapObjects/mansion4.asm | 4 +- data/mapObjects/mtmoon1.asm | 22 ++-- data/mapObjects/mtmoon2.asm | 32 +++--- data/mapObjects/mtmoon3.asm | 16 +-- data/mapObjects/mtmoonpokecenter.asm | 8 +- data/mapObjects/museum1f.asm | 20 ++-- data/mapObjects/museum2f.asm | 8 +- data/mapObjects/namerater.asm | 8 +- data/mapObjects/oakslab.asm | 8 +- data/mapObjects/pallettown.asm | 20 ++-- data/mapObjects/pewtercity.asm | 42 +++---- data/mapObjects/pewtergym.asm | 8 +- data/mapObjects/pewterhouse1.asm | 8 +- data/mapObjects/pewterhouse2.asm | 8 +- data/mapObjects/pewtermart.asm | 8 +- data/mapObjects/pewterpokecenter.asm | 8 +- data/mapObjects/pokemontower1.asm | 12 +- data/mapObjects/pokemontower2.asm | 8 +- data/mapObjects/pokemontower3.asm | 8 +- data/mapObjects/pokemontower4.asm | 8 +- data/mapObjects/pokemontower5.asm | 8 +- data/mapObjects/pokemontower6.asm | 8 +- data/mapObjects/pokemontower7.asm | 4 +- data/mapObjects/powerplant.asm | 12 +- data/mapObjects/redshouse1f.asm | 14 +-- data/mapObjects/redshouse2f.asm | 4 +- data/mapObjects/rockethideout1.asm | 20 ++-- data/mapObjects/rockethideout2.asm | 20 ++-- data/mapObjects/rockethideout3.asm | 8 +- data/mapObjects/rockethideout4.asm | 12 +- data/mapObjects/rockethideoutelevator.asm | 10 +- data/mapObjects/rocktunnel1.asm | 34 +++--- data/mapObjects/rocktunnel2.asm | 16 +-- data/mapObjects/rocktunnelpokecenter.asm | 8 +- data/mapObjects/route1.asm | 4 +- data/mapObjects/route10.asm | 24 ++-- data/mapObjects/route11.asm | 22 ++-- data/mapObjects/route11gate.asm | 20 ++-- data/mapObjects/route11gateupstairs.asm | 8 +- data/mapObjects/route12.asm | 20 ++-- data/mapObjects/route12gate.asm | 20 ++-- data/mapObjects/route12gateupstairs.asm | 8 +- data/mapObjects/route12house.asm | 8 +- data/mapObjects/route13.asm | 6 +- data/mapObjects/route14.asm | 2 +- data/mapObjects/route15.asm | 18 +-- data/mapObjects/route15gate.asm | 20 ++-- data/mapObjects/route15gateupstairs.asm | 6 +- data/mapObjects/route16.asm | 40 +++---- data/mapObjects/route16gate.asm | 36 +++--- data/mapObjects/route16gateupstairs.asm | 8 +- data/mapObjects/route16house.asm | 8 +- data/mapObjects/route17.asm | 12 +- data/mapObjects/route18.asm | 20 ++-- data/mapObjects/route18gate.asm | 20 ++-- data/mapObjects/route18gateupstairs.asm | 8 +- data/mapObjects/route19.asm | 2 +- data/mapObjects/route2.asm | 38 +++--- data/mapObjects/route20.asm | 12 +- data/mapObjects/route22.asm | 6 +- data/mapObjects/route22gate.asm | 16 +-- data/mapObjects/route23.asm | 18 +-- data/mapObjects/route25.asm | 6 +- data/mapObjects/route2gate.asm | 16 +-- data/mapObjects/route2house.asm | 8 +- data/mapObjects/route3.asm | 2 +- data/mapObjects/route4.asm | 18 +-- data/mapObjects/route5.asm | 22 ++-- data/mapObjects/route5gate.asm | 16 +-- data/mapObjects/route6.asm | 18 +-- data/mapObjects/route6gate.asm | 16 +-- data/mapObjects/route7.asm | 22 ++-- data/mapObjects/route7gate.asm | 16 +-- data/mapObjects/route8.asm | 22 ++-- data/mapObjects/route8gate.asm | 16 +-- data/mapObjects/route9.asm | 2 +- data/mapObjects/safarizonecenter.asm | 40 +++---- data/mapObjects/safarizoneeast.asm | 26 ++--- data/mapObjects/safarizoneentrance.asm | 16 +-- data/mapObjects/safarizonenorth.asm | 46 ++++---- data/mapObjects/safarizoneresthouse1.asm | 8 +- data/mapObjects/safarizoneresthouse2.asm | 8 +- data/mapObjects/safarizoneresthouse3.asm | 8 +- data/mapObjects/safarizoneresthouse4.asm | 8 +- data/mapObjects/safarizonesecrethouse.asm | 8 +- data/mapObjects/safarizonewest.asm | 40 +++---- data/mapObjects/saffroncity.asm | 52 ++++----- data/mapObjects/saffrongym.asm | 128 ++++++++++----------- data/mapObjects/saffronhouse1.asm | 8 +- data/mapObjects/saffronhouse2.asm | 8 +- data/mapObjects/saffronmart.asm | 8 +- data/mapObjects/saffronpokecenter.asm | 8 +- data/mapObjects/school.asm | 8 +- data/mapObjects/seafoamislands1.asm | 32 +++--- data/mapObjects/seafoamislands2.asm | 28 ++--- data/mapObjects/seafoamislands3.asm | 28 ++--- data/mapObjects/seafoamislands4.asm | 28 ++--- data/mapObjects/seafoamislands5.asm | 20 ++-- data/mapObjects/silphco1.asm | 20 ++-- data/mapObjects/silphco10.asm | 24 ++-- data/mapObjects/silphco11.asm | 16 +-- data/mapObjects/silphco2.asm | 28 ++--- data/mapObjects/silphco3.asm | 40 +++---- data/mapObjects/silphco4.asm | 28 ++--- data/mapObjects/silphco5.asm | 28 ++--- data/mapObjects/silphco6.asm | 20 ++-- data/mapObjects/silphco7.asm | 24 ++-- data/mapObjects/silphco8.asm | 28 ++--- data/mapObjects/silphco9.asm | 20 ++-- data/mapObjects/silphcoelevator.asm | 10 +- data/mapObjects/ssanne1.asm | 44 +++---- data/mapObjects/ssanne10.asm | 40 +++---- data/mapObjects/ssanne2.asm | 36 +++--- data/mapObjects/ssanne3.asm | 8 +- data/mapObjects/ssanne4.asm | 24 ++-- data/mapObjects/ssanne5.asm | 8 +- data/mapObjects/ssanne6.asm | 4 +- data/mapObjects/ssanne7.asm | 8 +- data/mapObjects/ssanne8.asm | 24 ++-- data/mapObjects/ssanne9.asm | 48 ++++---- data/mapObjects/undergroundpathentranceroute5.asm | 12 +- data/mapObjects/undergroundpathentranceroute6.asm | 12 +- data/mapObjects/undergroundpathentranceroute7.asm | 12 +- .../undergroundpathentranceroute7copy.asm | 12 +- data/mapObjects/undergroundpathentranceroute8.asm | 12 +- data/mapObjects/undergroundpathns.asm | 8 +- data/mapObjects/undergroundpathwe.asm | 8 +- data/mapObjects/unknowndungeon1.asm | 36 +++--- data/mapObjects/unknowndungeon2.asm | 24 ++-- data/mapObjects/unknowndungeon3.asm | 4 +- data/mapObjects/vermilioncity.asm | 50 ++++---- data/mapObjects/vermiliondock.asm | 8 +- data/mapObjects/vermiliongym.asm | 8 +- data/mapObjects/vermilionhouse1.asm | 8 +- data/mapObjects/vermilionhouse2.asm | 8 +- data/mapObjects/vermilionhouse3.asm | 8 +- data/mapObjects/vermilionmart.asm | 8 +- data/mapObjects/vermilionpokecenter.asm | 8 +- data/mapObjects/victoryroad1.asm | 12 +- data/mapObjects/victoryroad2.asm | 28 ++--- data/mapObjects/victoryroad3.asm | 16 +-- data/mapObjects/viridiancity.asm | 32 +++--- data/mapObjects/viridianforest.asm | 36 +++--- data/mapObjects/viridianforestentrance.asm | 16 +-- data/mapObjects/viridianforestexit.asm | 16 +-- data/mapObjects/viridiangym.asm | 8 +- data/mapObjects/viridianhouse.asm | 8 +- data/mapObjects/viridianmart.asm | 8 +- data/mapObjects/viridianpokecenter.asm | 8 +- macros/data_macros.asm | 22 ++++ 220 files changed, 1841 insertions(+), 1819 deletions(-) diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index 22000dde..2651b10a 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -2,10 +2,10 @@ AgathaObject: db $0 ; border block db $4 ; warps - db $b, $4, $2, BRUNOS_ROOM - db $b, $5, $3, BRUNOS_ROOM - db $0, $4, $0, LANCES_ROOM - db $0, $5, $0, LANCES_ROOM + warp $4, $b, $2, BRUNOS_ROOM + warp $5, $b, $3, BRUNOS_ROOM + warp $4, $0, $0, LANCES_ROOM + warp $5, $0, $0, LANCES_ROOM db $0 ; signs @@ -13,7 +13,7 @@ AgathaObject: object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1 ; warp-to - EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM - EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $5 ; BRUNOS_ROOM - EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $4 ; LANCES_ROOM - EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $5 ; LANCES_ROOM + warp_to $4, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $5, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $4, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM + warp_to $5, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index 5a7e832c..ce5fe9b8 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -2,8 +2,8 @@ BikeShopObject: db $e ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ BikeShopObject: object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person ; warp-to - EVENT_DISP BIKE_SHOP_WIDTH, $7, $2 - EVENT_DISP BIKE_SHOP_WIDTH, $7, $3 + warp_to $2, $7, BIKE_SHOP_WIDTH + warp_to $3, $7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index ef52e1dd..eb90ed78 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -2,8 +2,8 @@ BillsHouseObject: db $d ; border block db $2 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff db $0 ; signs @@ -13,5 +13,5 @@ BillsHouseObject: object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2 - EVENT_DISP BILLS_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, BILLS_HOUSE_WIDTH + warp_to $3, $7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 231e852d..3a798562 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -2,8 +2,8 @@ BluesHouseObject: db $0A ; border block db $2 ; warps - db $7, $2, $1, $FF - db $7, $3, $1, $FF + warp $2, $7, $1, $FF + warp $3, $7, $1, $FF db $0 ; signs @@ -13,5 +13,5 @@ BluesHouseObject: object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table ; warp-to - EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 - EVENT_DISP BLUES_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, BLUES_HOUSE_WIDTH + warp_to $3, $7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index a734b07b..b0df7215 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -2,10 +2,10 @@ BrunoObject: db $3 ; border block db $4 ; warps - db $b, $4, $2, LORELEIS_ROOM - db $b, $5, $3, LORELEIS_ROOM - db $0, $4, $0, AGATHAS_ROOM - db $0, $5, $1, AGATHAS_ROOM + warp $4, $b, $2, LORELEIS_ROOM + warp $5, $b, $3, LORELEIS_ROOM + warp $4, $0, $0, AGATHAS_ROOM + warp $5, $0, $1, AGATHAS_ROOM db $0 ; signs @@ -13,7 +13,7 @@ BrunoObject: object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 ; warp-to - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM + warp_to $4, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to $5, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to $4, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index c2a7fd78..536b46ee 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -2,30 +2,30 @@ CeladonCityObject: db $f ; border block db $d ; warps - db $d, $8, $0, CELADON_MART_1 - db $d, $a, $2, CELADON_MART_1 - db $9, $18, $0, CELADON_MANSION_1 - db $3, $18, $2, CELADON_MANSION_1 - db $3, $19, $2, CELADON_MANSION_1 - db $9, $29, $0, CELADON_POKECENTER - db $1b, $c, $0, CELADON_GYM - db $13, $1c, $0, GAME_CORNER - db $13, $27, $0, CELADON_MART_5 ; beta warp! no longer used - db $13, $21, $0, CELADON_PRIZE_ROOM - db $1b, $1f, $0, CELADON_DINER - db $1b, $23, $0, CELADON_HOUSE - db $1b, $2b, $0, CELADON_HOTEL + warp $8, $d, $0, CELADON_MART_1 + warp $a, $d, $2, CELADON_MART_1 + warp $18, $9, $0, CELADON_MANSION_1 + warp $18, $3, $2, CELADON_MANSION_1 + warp $19, $3, $2, CELADON_MANSION_1 + warp $29, $9, $0, CELADON_POKECENTER + warp $c, $1b, $0, CELADON_GYM + warp $1c, $13, $0, GAME_CORNER + warp $27, $13, $0, CELADON_MART_5 ; beta warp! no longer used + warp $21, $13, $0, CELADON_PRIZE_ROOM + warp $1f, $1b, $0, CELADON_DINER + warp $23, $1b, $0, CELADON_HOUSE + warp $2b, $1b, $0, CELADON_HOTEL db $9 ; signs - db $f, $1b, $a ; CeladonCityText10 - db $f, $13, $b ; CeladonCityText11 - db $9, $2a, $c ; PokeCenterSignText - db $1d, $d, $d ; CeladonCityText13 - db $9, $15, $e ; CeladonCityText14 - db $d, $c, $f ; CeladonCityText15 - db $15, $27, $10 ; CeladonCityText16 - db $15, $21, $11 ; CeladonCityText17 - db $15, $1b, $12 ; CeladonCityText18 + sign $1b, $f, $a ; CeladonCityText10 + sign $13, $f, $b ; CeladonCityText11 + sign $2a, $9, $c ; PokeCenterSignText + sign $d, $1d, $d ; CeladonCityText13 + sign $15, $9, $e ; CeladonCityText14 + sign $c, $d, $f ; CeladonCityText15 + sign $27, $15, $10 ; CeladonCityText16 + sign $21, $15, $11 ; CeladonCityText17 + sign $1b, $15, $12 ; CeladonCityText18 db $9 ; objects object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person @@ -39,16 +39,16 @@ CeladonCityObject: object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person ; warp-to - EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1 - EVENT_DISP CELADON_CITY_WIDTH, $d, $a ; CELADON_MART_1 - EVENT_DISP CELADON_CITY_WIDTH, $9, $18 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $3, $18 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $3, $19 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $9, $29 ; CELADON_POKECENTER - EVENT_DISP CELADON_CITY_WIDTH, $1b, $c ; CELADON_GYM - EVENT_DISP CELADON_CITY_WIDTH, $13, $1c ; GAME_CORNER - EVENT_DISP CELADON_CITY_WIDTH, $13, $27 ; CELADON_MART_5 - EVENT_DISP CELADON_CITY_WIDTH, $13, $21 ; CELADON_PRIZE_ROOM - EVENT_DISP CELADON_CITY_WIDTH, $1b, $1f ; CELADON_DINER - EVENT_DISP CELADON_CITY_WIDTH, $1b, $23 ; CELADON_HOUSE - EVENT_DISP CELADON_CITY_WIDTH, $1b, $2b ; CELADON_HOTEL + warp_to $8, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to $a, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to $18, $9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $18, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $19, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $29, $9, CELADON_CITY_WIDTH ; CELADON_POKECENTER + warp_to $c, $1b, CELADON_CITY_WIDTH ; CELADON_GYM + warp_to $1c, $13, CELADON_CITY_WIDTH ; GAME_CORNER + warp_to $27, $13, CELADON_CITY_WIDTH ; CELADON_MART_5 + warp_to $21, $13, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM + warp_to $1f, $1b, CELADON_CITY_WIDTH ; CELADON_DINER + warp_to $23, $1b, CELADON_CITY_WIDTH ; CELADON_HOUSE + warp_to $2b, $1b, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index fd202a96..f1327612 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -2,8 +2,8 @@ CeladonDinerObject: db $f ; border block db $2 ; warps - db $7, $3, $a, $ff - db $7, $4, $a, $ff + warp $3, $7, $a, $ff + warp $4, $7, $a, $ff db $0 ; signs @@ -15,5 +15,5 @@ CeladonDinerObject: object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP CELADON_DINER_WIDTH, $7, $3 - EVENT_DISP CELADON_DINER_WIDTH, $7, $4 + warp_to $3, $7, CELADON_DINER_WIDTH + warp_to $4, $7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 46b1c906..f1b91d56 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -2,12 +2,12 @@ CeladonGameCornerObject: db $f ; border block db $3 ; warps - db $11, $f, $7, $ff - db $11, $10, $7, $ff - db $4, $11, $1, ROCKET_HIDEOUT_1 + warp $f, $11, $7, $ff + warp $10, $11, $7, $ff + warp $11, $4, $1, ROCKET_HIDEOUT_1 db $1 ; signs - db $4, $9, $c ; CeladonGameCornerText12 + sign $9, $4, $c ; CeladonGameCornerText12 db $b ; objects object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person @@ -23,6 +23,6 @@ CeladonGameCornerObject: object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 ; warp-to - EVENT_DISP GAME_CORNER_WIDTH, $11, $f - EVENT_DISP GAME_CORNER_WIDTH, $11, $10 - EVENT_DISP GAME_CORNER_WIDTH, $4, $11 ; ROCKET_HIDEOUT_1 + warp_to $f, $11, GAME_CORNER_WIDTH + warp_to $10, $11, GAME_CORNER_WIDTH + warp_to $11, $4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 212c389e..b9ebcb93 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -2,8 +2,8 @@ CeladonGymObject: db $3 ; border block db $2 ; warps - db $11, $4, $6, $ff - db $11, $5, $6, $ff + warp $4, $11, $6, $ff + warp $5, $11, $6, $ff db $0 ; signs @@ -18,5 +18,5 @@ CeladonGymObject: object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 ; warp-to - EVENT_DISP CELADON_GYM_WIDTH, $11, $4 - EVENT_DISP CELADON_GYM_WIDTH, $11, $5 + warp_to $4, $11, CELADON_GYM_WIDTH + warp_to $5, $11, CELADON_GYM_WIDTH diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 8d7dcb03..0737304c 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -2,8 +2,8 @@ CeladonHotelObject: db $0 ; border block db $2 ; warps - db $7, $3, $c, $ff - db $7, $4, $c, $ff + warp $3, $7, $c, $ff + warp $4, $7, $c, $ff db $0 ; signs @@ -13,5 +13,5 @@ CeladonHotelObject: object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3 - EVENT_DISP CELADON_HOTEL_WIDTH, $7, $4 + warp_to $3, $7, CELADON_HOTEL_WIDTH + warp_to $4, $7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 6bd847a4..3fc86c40 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -2,8 +2,8 @@ CeladonHouseObject: db $f ; border block db $2 ; warps - db $7, $2, $b, $ff - db $7, $3, $b, $ff + warp $2, $7, $b, $ff + warp $3, $7, $b, $ff db $0 ; signs @@ -13,5 +13,5 @@ CeladonHouseObject: object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person ; warp-to - EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2 - EVENT_DISP CELADON_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, CELADON_HOUSE_WIDTH + warp_to $3, $7, CELADON_HOUSE_WIDTH diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index 47fbb0e5..bb38825c 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -2,14 +2,14 @@ CeladonMansion1Object: db $f ; border block db $5 ; warps - db $b, $4, $2, $ff - db $b, $5, $2, $ff - db $0, $4, $4, $ff - db $1, $7, $1, CELADON_MANSION_2 - db $1, $2, $2, CELADON_MANSION_2 + warp $4, $b, $2, $ff + warp $5, $b, $2, $ff + warp $4, $0, $4, $ff + warp $7, $1, $1, CELADON_MANSION_2 + warp $2, $1, $2, CELADON_MANSION_2 db $1 ; signs - db $9, $4, $5 ; CeladonMansion1Text5 + sign $4, $9, $5 ; CeladonMansion1Text5 db $4 ; objects object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person @@ -18,8 +18,8 @@ CeladonMansion1Object: object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person ; warp-to - EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4 - EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $5 - EVENT_DISP CELADON_MANSION_1_WIDTH, $0, $4 - EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $7 ; CELADON_MANSION_2 - EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $2 ; CELADON_MANSION_2 + warp_to $4, $b, CELADON_MANSION_1_WIDTH + warp_to $5, $b, CELADON_MANSION_1_WIDTH + warp_to $4, $0, CELADON_MANSION_1_WIDTH + warp_to $7, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to $2, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 883cae36..675afdc7 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -2,18 +2,18 @@ CeladonMansion2Object: db $f ; border block db $4 ; warps - db $1, $6, $0, CELADON_MANSION_3 - db $1, $7, $3, CELADON_MANSION_1 - db $1, $2, $4, CELADON_MANSION_1 - db $1, $4, $3, CELADON_MANSION_3 + warp $6, $1, $0, CELADON_MANSION_3 + warp $7, $1, $3, CELADON_MANSION_1 + warp $2, $1, $4, CELADON_MANSION_1 + warp $4, $1, $3, CELADON_MANSION_3 db $1 ; signs - db $9, $4, $1 ; CeladonMansion2Text1 + sign $4, $9, $1 ; CeladonMansion2Text1 db $0 ; objects ; warp-to - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3 + warp_to $6, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to $7, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to $2, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to $4, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index 0564b1cb..f6e66a1a 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -2,16 +2,16 @@ CeladonMansion3Object: db $f ; border block db $4 ; warps - db $1, $6, $0, CELADON_MANSION_2 - db $1, $7, $0, CELADON_MANSION_4 - db $1, $2, $1, CELADON_MANSION_4 - db $1, $4, $3, CELADON_MANSION_2 + warp $6, $1, $0, CELADON_MANSION_2 + warp $7, $1, $0, CELADON_MANSION_4 + warp $2, $1, $1, CELADON_MANSION_4 + warp $4, $1, $3, CELADON_MANSION_2 db $4 ; signs - db $3, $1, $5 ; CeladonMansion3Text5 - db $3, $4, $6 ; CeladonMansion3Text6 - db $6, $1, $7 ; CeladonMansion3Text7 - db $9, $4, $8 ; CeladonMansion3Text8 + sign $1, $3, $5 ; CeladonMansion3Text5 + sign $4, $3, $6 ; CeladonMansion3Text6 + sign $1, $6, $7 ; CeladonMansion3Text7 + sign $4, $9, $8 ; CeladonMansion3Text8 db $4 ; objects object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person @@ -20,7 +20,7 @@ CeladonMansion3Object: object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2 - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $7 ; CELADON_MANSION_4 - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $2 ; CELADON_MANSION_4 - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $4 ; CELADON_MANSION_2 + warp_to $6, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 + warp_to $7, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 + warp_to $2, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 + warp_to $4, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index c4f667fa..4f0fa214 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -2,16 +2,16 @@ CeladonMansion4Object: db $9 ; border block db $3 ; warps - db $1, $6, $1, CELADON_MANSION_3 - db $1, $2, $2, CELADON_MANSION_3 - db $7, $2, $0, CELADON_MANSION_5 + warp $6, $1, $1, CELADON_MANSION_3 + warp $2, $1, $2, CELADON_MANSION_3 + warp $2, $7, $0, CELADON_MANSION_5 db $1 ; signs - db $7, $3, $1 ; CeladonMansion4Text1 + sign $3, $7, $1 ; CeladonMansion4Text1 db $0 ; objects ; warp-to - EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $2 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_4_WIDTH, $7, $2 ; CELADON_MANSION_5 + warp_to $6, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to $2, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to $2, $7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index 243e345b..438484bf 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -2,8 +2,8 @@ CeladonMansion5Object: db $a ; border block db $2 ; warps - db $7, $2, $2, CELADON_MANSION_4 - db $7, $3, $2, CELADON_MANSION_4 + warp $2, $7, $2, CELADON_MANSION_4 + warp $3, $7, $2, CELADON_MANSION_4 db $0 ; signs @@ -12,5 +12,5 @@ CeladonMansion5Object: object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4 - EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $3 ; CELADON_MANSION_4 + warp_to $2, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 + warp_to $3, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index af647cf2..3442e3cc 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -2,24 +2,24 @@ CeladonMart1Object: db $f ; border block db $6 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $7, $10, $1, $ff - db $7, $11, $1, $ff - db $1, $c, $0, CELADON_MART_2 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $10, $7, $1, $ff + warp $11, $7, $1, $ff + warp $c, $1, $0, CELADON_MART_2 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $2 ; signs - db $4, $b, $2 ; CeladonMart1Text2 - db $1, $e, $3 ; CeladonMart1Text3 + sign $b, $4, $2 ; CeladonMart1Text2 + sign $e, $1, $3 ; CeladonMart1Text3 db $1 ; objects object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP CELADON_MART_1_WIDTH, $7, $2 - EVENT_DISP CELADON_MART_1_WIDTH, $7, $3 - EVENT_DISP CELADON_MART_1_WIDTH, $7, $10 - EVENT_DISP CELADON_MART_1_WIDTH, $7, $11 - EVENT_DISP CELADON_MART_1_WIDTH, $1, $c ; CELADON_MART_2 - EVENT_DISP CELADON_MART_1_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $2, $7, CELADON_MART_1_WIDTH + warp_to $3, $7, CELADON_MART_1_WIDTH + warp_to $10, $7, CELADON_MART_1_WIDTH + warp_to $11, $7, CELADON_MART_1_WIDTH + warp_to $c, $1, CELADON_MART_1_WIDTH ; CELADON_MART_2 + warp_to $1, $1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index a6c9af59..3b88d49f 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -2,12 +2,12 @@ CeladonMart2Object: db $f ; border block db $3 ; warps - db $1, $c, $4, CELADON_MART_1 - db $1, $10, $1, CELADON_MART_3 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $4, CELADON_MART_1 + warp $10, $1, $1, CELADON_MART_3 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $5 ; CeladonMart2Text5 + sign $e, $1, $5 ; CeladonMart2Text5 db $4 ; objects object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person @@ -16,6 +16,6 @@ CeladonMart2Object: object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person ; warp-to - EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1 - EVENT_DISP CELADON_MART_2_WIDTH, $1, $10 ; CELADON_MART_3 - EVENT_DISP CELADON_MART_2_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_2_WIDTH ; CELADON_MART_1 + warp_to $10, $1, CELADON_MART_2_WIDTH ; CELADON_MART_3 + warp_to $1, $1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 41054371..803ff6ff 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -2,23 +2,23 @@ CeladonMart3Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_4 - db $1, $10, $1, CELADON_MART_2 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_4 + warp $10, $1, $1, CELADON_MART_2 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $c ; signs - db $4, $2, $6 ; CeladonMart3Text6 - db $4, $3, $7 ; CeladonMart3Text7 - db $4, $5, $8 ; CeladonMart3Text8 - db $4, $6, $9 ; CeladonMart3Text9 - db $6, $2, $a ; CeladonMart3Text10 - db $6, $3, $b ; CeladonMart3Text11 - db $6, $5, $c ; CeladonMart3Text12 - db $6, $6, $d ; CeladonMart3Text13 - db $1, $e, $e ; CeladonMart3Text14 - db $1, $4, $f ; CeladonMart3Text15 - db $1, $6, $10 ; CeladonMart3Text16 - db $1, $a, $11 ; CeladonMart3Text17 + sign $2, $4, $6 ; CeladonMart3Text6 + sign $3, $4, $7 ; CeladonMart3Text7 + sign $5, $4, $8 ; CeladonMart3Text8 + sign $6, $4, $9 ; CeladonMart3Text9 + sign $2, $6, $a ; CeladonMart3Text10 + sign $3, $6, $b ; CeladonMart3Text11 + sign $5, $6, $c ; CeladonMart3Text12 + sign $6, $6, $d ; CeladonMart3Text13 + sign $e, $1, $e ; CeladonMart3Text14 + sign $4, $1, $f ; CeladonMart3Text15 + sign $6, $1, $10 ; CeladonMart3Text16 + sign $a, $1, $11 ; CeladonMart3Text17 db $5 ; objects object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person @@ -28,6 +28,6 @@ CeladonMart3Object: object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person ; warp-to - EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4 - EVENT_DISP CELADON_MART_3_WIDTH, $1, $10 ; CELADON_MART_2 - EVENT_DISP CELADON_MART_3_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_3_WIDTH ; CELADON_MART_4 + warp_to $10, $1, CELADON_MART_3_WIDTH ; CELADON_MART_2 + warp_to $1, $1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 386dba8c..b7e3e68f 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -2,12 +2,12 @@ CeladonMart4Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_3 - db $1, $10, $1, CELADON_MART_5 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_3 + warp $10, $1, $1, CELADON_MART_5 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $4 ; CeladonMart4Text4 + sign $e, $1, $4 ; CeladonMart4Text4 db $3 ; objects object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person @@ -15,6 +15,6 @@ CeladonMart4Object: object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3 - EVENT_DISP CELADON_MART_4_WIDTH, $1, $10 ; CELADON_MART_5 - EVENT_DISP CELADON_MART_4_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_4_WIDTH ; CELADON_MART_3 + warp_to $10, $1, CELADON_MART_4_WIDTH ; CELADON_MART_5 + warp_to $1, $1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index df47a70d..f729943d 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -2,12 +2,12 @@ CeladonMart5Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_ROOF - db $1, $10, $1, CELADON_MART_4 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_ROOF + warp $10, $1, $1, CELADON_MART_4 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $5 ; CeladonMart5Text5 + sign $e, $1, $5 ; CeladonMart5Text5 db $4 ; objects object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person @@ -16,6 +16,6 @@ CeladonMart5Object: object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF - EVENT_DISP CELADON_MART_5_WIDTH, $1, $10 ; CELADON_MART_4 - EVENT_DISP CELADON_MART_5_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF + warp_to $10, $1, CELADON_MART_5_WIDTH ; CELADON_MART_4 + warp_to $1, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index 2db8635a..ca52dcf6 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -2,14 +2,14 @@ CeladonMartElevatorObject: db $f ; border block db $2 ; warps - db $3, $1, $5, CELADON_MART_1 - db $3, $2, $5, CELADON_MART_1 + warp $1, $3, $5, CELADON_MART_1 + warp $2, $3, $5, CELADON_MART_1 db $1 ; signs - db $0, $3, $1 ; CeladonMartElevatorText1 + sign $3, $0, $1 ; CeladonMartElevatorText1 db $0 ; objects ; warp-to - EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1 - EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $2 ; CELADON_MART_1 + warp_to $1, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 + warp_to $2, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 63a1b4d7..e6fda0e7 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -2,17 +2,17 @@ CeladonMartRoofObject: db $42 ; border block db $1 ; warps - db $2, $f, $0, CELADON_MART_5 + warp $f, $2, $0, CELADON_MART_5 db $4 ; signs - db $1, $a, $3 ; CeladonMartRoofText3 - db $1, $b, $4 ; CeladonMartRoofText4 - db $2, $c, $5 ; CeladonMartRoofText5 - db $2, $d, $6 ; CeladonMartRoofText6 + sign $a, $1, $3 ; CeladonMartRoofText3 + sign $b, $1, $4 ; CeladonMartRoofText4 + sign $c, $2, $5 ; CeladonMartRoofText5 + sign $d, $2, $6 ; CeladonMartRoofText6 db $2 ; objects object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person ; warp-to - EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5 + warp_to $f, $2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index c4ce1700..bf08a4aa 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -2,8 +2,8 @@ CeladonPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff + warp $3, $7, $5, $ff + warp $4, $7, $5, $ff db $0 ; signs @@ -14,5 +14,5 @@ CeladonPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3 - EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, CELADON_POKECENTER_WIDTH + warp_to $4, $7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index c440bad5..8acea80c 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -2,18 +2,18 @@ CeladonPrizeRoomObject: db $f ; border block db $2 ; warps - db $7, $4, $9, $ff - db $7, $5, $9, $ff + warp $4, $7, $9, $ff + warp $5, $7, $9, $ff db $3 ; signs - db $2, $2, $3 ; CeladonPrizeRoomText3 - db $2, $4, $4 ; CeladonPrizeRoomText4 - db $2, $6, $5 ; CeladonPrizeRoomText5 + sign $2, $2, $3 ; CeladonPrizeRoomText3 + sign $4, $2, $4 ; CeladonPrizeRoomText4 + sign $6, $2, $5 ; CeladonPrizeRoomText5 db $2 ; objects object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person ; warp-to - EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4 - EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5 + warp_to $4, $7, CELADON_PRIZE_ROOM_WIDTH + warp_to $5, $7, CELADON_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index b6317e2c..a20e6252 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -2,24 +2,24 @@ CeruleanCityObject: db $f ; border block db $a ; warps - db $b, $1b, $0, TRASHED_HOUSE - db $f, $d, $0, CERULEAN_HOUSE_1 - db $11, $13, $0, CERULEAN_POKECENTER - db $13, $1e, $0, CERULEAN_GYM - db $19, $d, $0, BIKE_SHOP - db $19, $19, $0, CERULEAN_MART - db $b, $4, $0, UNKNOWN_DUNGEON_1 - db $9, $1b, $2, TRASHED_HOUSE - db $b, $9, $1, CERULEAN_HOUSE_2 - db $9, $9, $0, CERULEAN_HOUSE_2 + warp $1b, $b, $0, TRASHED_HOUSE + warp $d, $f, $0, CERULEAN_HOUSE_1 + warp $13, $11, $0, CERULEAN_POKECENTER + warp $1e, $13, $0, CERULEAN_GYM + warp $d, $19, $0, BIKE_SHOP + warp $19, $19, $0, CERULEAN_MART + warp $4, $b, $0, UNKNOWN_DUNGEON_1 + warp $1b, $9, $2, TRASHED_HOUSE + warp $9, $b, $1, CERULEAN_HOUSE_2 + warp $9, $9, $0, CERULEAN_HOUSE_2 db $6 ; signs - db $13, $17, $c ; CeruleanCityText12 - db $1d, $11, $d ; CeruleanCityText13 - db $19, $1a, $e ; MartSignText - db $11, $14, $f ; PokeCenterSignText - db $19, $b, $10 ; CeruleanCityText16 - db $15, $1b, $11 ; CeruleanCityText17 + sign $17, $13, $c ; CeruleanCityText12 + sign $11, $1d, $d ; CeruleanCityText13 + sign $1a, $19, $e ; MartSignText + sign $14, $11, $f ; PokeCenterSignText + sign $b, $19, $10 ; CeruleanCityText16 + sign $1b, $15, $11 ; CeruleanCityText17 db $b ; objects object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person @@ -35,13 +35,13 @@ CeruleanCityObject: object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person ; warp-to - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1 - EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER - EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM - EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP - EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2 + warp_to $1b, $b, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE + warp_to $d, $f, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 + warp_to $13, $11, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER + warp_to $1e, $13, CERULEAN_CITY_WIDTH ; CERULEAN_GYM + warp_to $d, $19, CERULEAN_CITY_WIDTH ; BIKE_SHOP + warp_to $19, $19, CERULEAN_CITY_WIDTH ; CERULEAN_MART + warp_to $4, $b, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $1b, $9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE + warp_to $9, $b, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 + warp_to $9, $9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 66d22260..5a35e9e7 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -2,8 +2,8 @@ CeruleanGymObject: db $3 ; border block db $2 ; warps - db $d, $4, $3, $ff - db $d, $5, $3, $ff + warp $4, $d, $3, $ff + warp $5, $d, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ CeruleanGymObject: object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4 - EVENT_DISP CERULEAN_GYM_WIDTH, $d, $5 + warp_to $4, $d, CERULEAN_GYM_WIDTH + warp_to $5, $d, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 27373825..08359b80 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -2,8 +2,8 @@ CeruleanHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $0 ; signs @@ -12,5 +12,5 @@ CeruleanHouse1Object: object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, CERULEAN_HOUSE_1_WIDTH + warp_to $3, $7, CERULEAN_HOUSE_1_WIDTH diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 669cd098..c7c4beae 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -2,9 +2,9 @@ CeruleanHouse2Object: db $c ; border block db $3 ; warps - db $0, $2, $9, $ff - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $0, $9, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -12,6 +12,6 @@ CeruleanHouse2Object: object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2 - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $0, CERULEAN_HOUSE_2_WIDTH + warp_to $2, $7, CERULEAN_HOUSE_2_WIDTH + warp_to $3, $7, CERULEAN_HOUSE_2_WIDTH diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 4f154191..70857293 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -2,18 +2,18 @@ CeruleanHouseTrashedObject: db $a ; border block db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $0, $3, $7, $ff + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $3, $0, $7, $ff db $1 ; signs - db $0, $3, $3 ; CeruleanHouseTrashedText3 + sign $3, $0, $3 ; CeruleanHouseTrashedText3 db $2 ; objects object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person ; warp-to - EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2 - EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $3 - EVENT_DISP TRASHED_HOUSE_WIDTH, $0, $3 + warp_to $2, $7, TRASHED_HOUSE_WIDTH + warp_to $3, $7, TRASHED_HOUSE_WIDTH + warp_to $3, $0, TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index 301d11a2..13e86d81 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -2,8 +2,8 @@ CeruleanMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff + warp $3, $7, $5, $ff + warp $4, $7, $5, $ff db $0 ; signs @@ -13,5 +13,5 @@ CeruleanMartObject: object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CERULEAN_MART_WIDTH, $7, $3 - EVENT_DISP CERULEAN_MART_WIDTH, $7, $4 + warp_to $3, $7, CERULEAN_MART_WIDTH + warp_to $4, $7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 1e92ec07..45c3c263 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -2,8 +2,8 @@ CeruleanPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $2, $ff - db $7, $4, $2, $ff + warp $3, $7, $2, $ff + warp $4, $7, $2, $ff db $0 ; signs @@ -14,5 +14,5 @@ CeruleanPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3 - EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, CERULEAN_POKECENTER_WIDTH + warp_to $4, $7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 24bdba3d..509a721e 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -2,8 +2,8 @@ CinnabarGymObject: db $2e ; border block db $2 ; warps - db $11, $10, $1, $ff - db $11, $11, $1, $ff + warp $10, $11, $1, $ff + warp $11, $11, $1, $ff db $0 ; signs @@ -19,5 +19,5 @@ CinnabarGymObject: object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person ; warp-to - EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10 - EVENT_DISP CINNABAR_GYM_WIDTH, $11, $11 + warp_to $10, $11, CINNABAR_GYM_WIDTH + warp_to $11, $11, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 05f4c06c..27a425f2 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -2,26 +2,26 @@ CinnabarIslandObject: db $43 ; border block db $5 ; warps - db $3, $6, $1, MANSION_1 - db $3, $12, $0, CINNABAR_GYM - db $9, $6, $0, CINNABAR_LAB_1 - db $b, $b, $0, CINNABAR_POKECENTER - db $b, $f, $0, CINNABAR_MART + warp $6, $3, $1, MANSION_1 + warp $12, $3, $0, CINNABAR_GYM + warp $6, $9, $0, CINNABAR_LAB_1 + warp $b, $b, $0, CINNABAR_POKECENTER + warp $f, $b, $0, CINNABAR_MART db $5 ; signs - db $5, $9, $3 ; CinnabarIslandText3 - db $b, $10, $4 ; MartSignText - db $b, $c, $5 ; PokeCenterSignText - db $b, $9, $6 ; CinnabarIslandText6 - db $3, $d, $7 ; CinnabarIslandText7 + sign $9, $5, $3 ; CinnabarIslandText3 + sign $10, $b, $4 ; MartSignText + sign $c, $b, $5 ; PokeCenterSignText + sign $9, $b, $6 ; CinnabarIslandText6 + sign $d, $3, $7 ; CinnabarIslandText7 db $2 ; objects object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1 - EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $12 ; CINNABAR_GYM - EVENT_DISP CINNABAR_ISLAND_WIDTH, $9, $6 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $b ; CINNABAR_POKECENTER - EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $f ; CINNABAR_MART + warp_to $6, $3, CINNABAR_ISLAND_WIDTH ; MANSION_1 + warp_to $12, $3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM + warp_to $6, $9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to $b, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER + warp_to $f, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 79494686..5297930e 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -2,8 +2,8 @@ CinnabarMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ CinnabarMartObject: object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP CINNABAR_MART_WIDTH, $7, $3 - EVENT_DISP CINNABAR_MART_WIDTH, $7, $4 + warp_to $3, $7, CINNABAR_MART_WIDTH + warp_to $4, $7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 7d15f050..6df12279 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -2,8 +2,8 @@ CinnabarPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ CinnabarPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3 - EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, CINNABAR_POKECENTER_WIDTH + warp_to $4, $7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 7d842cad..49eb8168 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -2,9 +2,9 @@ CopycatsHouse1FObject: db $a ; border block db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $1, $7, $0, COPYCATS_HOUSE_2F + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $7, $1, $0, COPYCATS_HOUSE_2F db $0 ; signs @@ -14,6 +14,6 @@ CopycatsHouse1FObject: object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person ; warp-to - EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2 - EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $3 - EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $1, $7 ; COPYCATS_HOUSE_2F + warp_to $2, $7, COPYCATS_HOUSE_1F_WIDTH + warp_to $3, $7, COPYCATS_HOUSE_1F_WIDTH + warp_to $7, $1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 0d53965a..5d2de9ef 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -2,11 +2,11 @@ CopycatsHouse2FObject: db $a ; border block db $1 ; warps - db $1, $7, $2, COPYCATS_HOUSE_1F + warp $7, $1, $2, COPYCATS_HOUSE_1F db $2 ; signs - db $5, $3, $6 ; CopycatsHouse2FText6 - db $1, $0, $7 ; CopycatsHouse2FText7 + sign $3, $5, $6 ; CopycatsHouse2FText6 + sign $0, $1, $7 ; CopycatsHouse2FText7 db $5 ; objects object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person @@ -16,4 +16,4 @@ CopycatsHouse2FObject: object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person ; warp-to - EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F + warp_to $7, $1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 98d4c184..dfc1d8fb 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -2,8 +2,8 @@ DayCareMObject: db $a ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -11,5 +11,5 @@ DayCareMObject: object SPRITE_GENTLEMAN, $2, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP DAYCAREM_WIDTH, $7, $2 - EVENT_DISP DAYCAREM_WIDTH, $7, $3 + warp_to $2, $7, DAYCAREM_WIDTH + warp_to $3, $7, DAYCAREM_WIDTH diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index cdcffce0..160a9f43 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -2,13 +2,13 @@ DiglettsCaveObject: db $19 ; border block db $2 ; warps - db $5, $5, $2, DIGLETTS_CAVE_EXIT - db $1f, $25, $2, DIGLETTS_CAVE_ENTRANCE + warp $5, $5, $2, DIGLETTS_CAVE_EXIT + warp $25, $1f, $2, DIGLETTS_CAVE_ENTRANCE db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; DIGLETTS_CAVE_EXIT - EVENT_DISP DIGLETTS_CAVE_WIDTH, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE + warp_to $5, $5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to $25, $1f, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index e5d6b69f..627f1f5e 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -2,9 +2,9 @@ DiglettsCaveEntranceRoute11Object: db $7d ; border block db $3 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff - db $4, $4, $1, DIGLETTS_CAVE + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff + warp $4, $4, $1, DIGLETTS_CAVE db $0 ; signs @@ -12,6 +12,6 @@ DiglettsCaveEntranceRoute11Object: object SPRITE_GAMBLER, $2, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2 - EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $3 - EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $4, $4 ; DIGLETTS_CAVE + warp_to $2, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH + warp_to $3, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH + warp_to $4, $4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index f1310cce..f52dbe1f 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -2,9 +2,9 @@ DiglettsCaveRoute2Object: db $7d ; border block db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $4, $4, $0, DIGLETTS_CAVE + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $4, $4, $0, DIGLETTS_CAVE db $0 ; signs @@ -12,6 +12,6 @@ DiglettsCaveRoute2Object: object SPRITE_FISHER, $3, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2 - EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $3 - EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $4, $4 ; DIGLETTS_CAVE + warp_to $2, $7, DIGLETTS_CAVE_EXIT_WIDTH + warp_to $3, $7, DIGLETTS_CAVE_EXIT_WIDTH + warp_to $4, $4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index f0f544ef..c310ed53 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -2,12 +2,12 @@ FanClubObject: db $d ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $2 ; signs - db $0, $1, $7 ; FanClubText7 - db $0, $6, $8 ; FanClubText8 + sign $1, $0, $7 ; FanClubText7 + sign $6, $0, $8 ; FanClubText8 db $6 ; objects object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person @@ -18,5 +18,5 @@ FanClubObject: object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person ; warp-to - EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2 - EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $3 + warp_to $2, $7, POKEMON_FAN_CLUB_WIDTH + warp_to $3, $7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index 44fed88f..a54a60f4 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -2,8 +2,8 @@ FightingDojoObject: db $3 ; border block db $2 ; warps - db $b, $4, $1, $ff - db $b, $5, $1, $ff + warp $4, $b, $1, $ff + warp $5, $b, $1, $ff db $0 ; signs @@ -17,5 +17,5 @@ FightingDojoObject: object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person ; warp-to - EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4 - EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $5 + warp_to $4, $b, FIGHTING_DOJO_WIDTH + warp_to $5, $b, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index bcca4004..71533132 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -2,31 +2,31 @@ FuchsiaCityObject: db $f ; border block db $9 ; warps - db $d, $5, $0, FUCHSIA_MART - db $1b, $b, $0, FUCHSIA_HOUSE_1 - db $1b, $13, $0, FUCHSIA_POKECENTER - db $1b, $1b, $0, FUCHSIA_HOUSE_2 - db $3, $12, $0, SAFARI_ZONE_ENTRANCE - db $1b, $5, $0, FUCHSIA_GYM - db $d, $16, $0, FUCHSIA_MEETING_ROOM - db $1b, $1f, $1, FUCHSIA_HOUSE_3 - db $18, $1f, $0, FUCHSIA_HOUSE_3 + warp $5, $d, $0, FUCHSIA_MART + warp $b, $1b, $0, FUCHSIA_HOUSE_1 + warp $13, $1b, $0, FUCHSIA_POKECENTER + warp $1b, $1b, $0, FUCHSIA_HOUSE_2 + warp $12, $3, $0, SAFARI_ZONE_ENTRANCE + warp $5, $1b, $0, FUCHSIA_GYM + warp $16, $d, $0, FUCHSIA_MEETING_ROOM + warp $1f, $1b, $1, FUCHSIA_HOUSE_3 + warp $1f, $18, $0, FUCHSIA_HOUSE_3 db $e ; signs - db $17, $f, $b ; FuchsiaCityText11 - db $f, $19, $c ; FuchsiaCityText12 - db $5, $11, $d ; FuchsiaCityText13 - db $d, $6, $e ; MartSignText - db $1b, $14, $f ; PokeCenterSignText - db $1d, $1b, $10 ; FuchsiaCityText16 - db $f, $15, $11 ; FuchsiaCityText17 - db $1d, $5, $12 ; FuchsiaCityText18 - db $7, $21, $13 ; FuchsiaCityText19 - db $7, $1b, $14 ; FuchsiaCityText20 - db $7, $d, $15 ; FuchsiaCityText21 - db $d, $1f, $16 ; FuchsiaCityText22 - db $f, $d, $17 ; FuchsiaCityText23 - db $7, $7, $18 ; FuchsiaCityText24 + sign $f, $17, $b ; FuchsiaCityText11 + sign $19, $f, $c ; FuchsiaCityText12 + sign $11, $5, $d ; FuchsiaCityText13 + sign $6, $d, $e ; MartSignText + sign $14, $1b, $f ; PokeCenterSignText + sign $1b, $1d, $10 ; FuchsiaCityText16 + sign $15, $f, $11 ; FuchsiaCityText17 + sign $5, $1d, $12 ; FuchsiaCityText18 + sign $21, $7, $13 ; FuchsiaCityText19 + sign $1b, $7, $14 ; FuchsiaCityText20 + sign $d, $7, $15 ; FuchsiaCityText21 + sign $1f, $d, $16 ; FuchsiaCityText22 + sign $d, $f, $17 ; FuchsiaCityText23 + sign $7, $7, $18 ; FuchsiaCityText24 db $a ; objects object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person @@ -41,12 +41,12 @@ FuchsiaCityObject: object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person ; warp-to - EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $b ; FUCHSIA_HOUSE_1 - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $13 ; FUCHSIA_POKECENTER - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1b ; FUCHSIA_HOUSE_2 - EVENT_DISP FUCHSIA_CITY_WIDTH, $3, $12 ; SAFARI_ZONE_ENTRANCE - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $5 ; FUCHSIA_GYM - EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $16 ; FUCHSIA_MEETING_ROOM - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1f ; FUCHSIA_HOUSE_3 - EVENT_DISP FUCHSIA_CITY_WIDTH, $18, $1f ; FUCHSIA_HOUSE_3 + warp_to $5, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART + warp_to $b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 + warp_to $13, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER + warp_to $1b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 + warp_to $12, $3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $5, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM + warp_to $16, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM + warp_to $1f, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to $1f, $18, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 023c23d3..14175052 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -2,8 +2,8 @@ FuchsiaGymObject: db $3 ; border block db $2 ; warps - db $11, $4, $5, $ff - db $11, $5, $5, $ff + warp $4, $11, $5, $ff + warp $5, $11, $5, $ff db $0 ; signs @@ -18,5 +18,5 @@ FuchsiaGymObject: object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person ; warp-to - EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4 - EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $5 + warp_to $4, $11, FUCHSIA_GYM_WIDTH + warp_to $5, $11, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 4d3c3b6e..d528bc00 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -2,8 +2,8 @@ FuchsiaHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $0 ; signs @@ -13,5 +13,5 @@ FuchsiaHouse1Object: object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, FUCHSIA_HOUSE_1_WIDTH + warp_to $3, $7, FUCHSIA_HOUSE_1_WIDTH diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index 3a3d07c3..3e549857 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -2,12 +2,12 @@ FuchsiaHouse2Object: db $17 ; border block db $2 ; warps - db $7, $4, $3, $ff - db $7, $5, $3, $ff + warp $4, $7, $3, $ff + warp $5, $7, $3, $ff db $2 ; signs - db $3, $4, $4 ; FuchsiaHouse2Text4 - db $3, $5, $5 ; FuchsiaHouse2Text5 + sign $4, $3, $4 ; FuchsiaHouse2Text4 + sign $5, $3, $5 ; FuchsiaHouse2Text5 db $3 ; objects object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person @@ -15,5 +15,5 @@ FuchsiaHouse2Object: object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 - EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $5 + warp_to $4, $7, FUCHSIA_HOUSE_2_WIDTH + warp_to $5, $7, FUCHSIA_HOUSE_2_WIDTH diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index aaf05bd6..9f731397 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -2,9 +2,9 @@ FuchsiaHouse3Object: db $c ; border block db $3 ; warps - db $0, $2, $8, $ff - db $7, $2, $7, $ff - db $7, $3, $7, $ff + warp $2, $0, $8, $ff + warp $2, $7, $7, $ff + warp $3, $7, $7, $ff db $0 ; signs @@ -12,6 +12,6 @@ FuchsiaHouse3Object: object SPRITE_FISHER, $5, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2 - EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $2 - EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $3 + warp_to $2, $0, FUCHSIA_HOUSE_3_WIDTH + warp_to $2, $7, FUCHSIA_HOUSE_3_WIDTH + warp_to $3, $7, FUCHSIA_HOUSE_3_WIDTH diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index 431e7c2f..7b837824 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -2,8 +2,8 @@ FuchsiaMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -13,5 +13,5 @@ FuchsiaMartObject: object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_MART_WIDTH, $7, $3 - EVENT_DISP FUCHSIA_MART_WIDTH, $7, $4 + warp_to $3, $7, FUCHSIA_MART_WIDTH + warp_to $4, $7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 8106b9ec..f8b8bb43 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -2,8 +2,8 @@ FuchsiaMeetingRoomObject: db $17 ; border block db $2 ; warps - db $7, $4, $6, $ff - db $7, $5, $6, $ff + warp $4, $7, $6, $ff + warp $5, $7, $6, $ff db $0 ; signs @@ -13,5 +13,5 @@ FuchsiaMeetingRoomObject: object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4 - EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5 + warp_to $4, $7, FUCHSIA_MEETING_ROOM_WIDTH + warp_to $5, $7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 8cf103fa..048319fd 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -2,8 +2,8 @@ FuchsiaPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $2, $ff - db $7, $4, $2, $ff + warp $3, $7, $2, $ff + warp $4, $7, $2, $ff db $0 ; signs @@ -14,5 +14,5 @@ FuchsiaPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3 - EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, FUCHSIA_POKECENTER_WIDTH + warp_to $4, $7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index e0f37b91..f26ed787 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -2,10 +2,10 @@ GaryObject: db $3 ; border block db $4 ; warps - db $7, $3, $1, LANCES_ROOM - db $7, $4, $2, LANCES_ROOM - db $0, $3, $0, HALL_OF_FAME - db $0, $4, $0, HALL_OF_FAME + warp $3, $7, $1, LANCES_ROOM + warp $4, $7, $2, LANCES_ROOM + warp $3, $0, $0, HALL_OF_FAME + warp $4, $0, $0, HALL_OF_FAME db $0 ; signs @@ -14,7 +14,7 @@ GaryObject: object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person ; warp-to - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $4 ; LANCES_ROOM - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $3 ; HALL_OF_FAME - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $4 ; HALL_OF_FAME + warp_to $3, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to $4, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to $3, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to $4, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index 8e245c2c..54e284ae 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -2,8 +2,8 @@ HallofFameRoomObject: db $3 ; border block db $2 ; warps - db $7, $4, $2, CHAMPIONS_ROOM - db $7, $5, $3, CHAMPIONS_ROOM + warp $4, $7, $2, CHAMPIONS_ROOM + warp $5, $7, $3, CHAMPIONS_ROOM db $0 ; signs @@ -11,5 +11,5 @@ HallofFameRoomObject: object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM - EVENT_DISP HALL_OF_FAME_WIDTH, $7, $5 ; CHAMPIONS_ROOM + warp_to $4, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM + warp_to $5, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index 145f2f39..45ddc6d6 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -2,13 +2,13 @@ IndigoPlateauObject: db $e ; border block db $2 ; warps - db $5, $9, $0, INDIGO_PLATEAU_LOBBY - db $5, $a, $0, INDIGO_PLATEAU_LOBBY + warp $9, $5, $0, INDIGO_PLATEAU_LOBBY + warp $a, $5, $0, INDIGO_PLATEAU_LOBBY db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $9 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $a ; INDIGO_PLATEAU_LOBBY + warp_to $9, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $a, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index 13438153..94ddab50 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -2,9 +2,9 @@ IndigoPlateauLobbyObject: db $0 ; border block db $3 ; warps - db $b, $7, $0, $ff - db $b, $8, $1, $ff - db $0, $8, $0, LORELEIS_ROOM + warp $7, $b, $0, $ff + warp $8, $b, $1, $ff + warp $8, $0, $0, LORELEIS_ROOM db $0 ; signs @@ -16,6 +16,6 @@ IndigoPlateauLobbyObject: object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $8 - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $0, $8 ; LORELEIS_ROOM + warp_to $7, $b, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to $8, $b, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to $8, $0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index e0adaedc..d801b948 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -2,24 +2,24 @@ Lab1Object: db $17 ; border block db $5 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff - db $4, $8, $0, CINNABAR_LAB_2 - db $4, $c, $0, CINNABAR_LAB_3 - db $4, $10, $0, CINNABAR_LAB_4 + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff + warp $8, $4, $0, CINNABAR_LAB_2 + warp $c, $4, $0, CINNABAR_LAB_3 + warp $10, $4, $0, CINNABAR_LAB_4 db $4 ; signs - db $2, $3, $2 ; Lab1Text2 - db $4, $9, $3 ; Lab1Text3 - db $4, $d, $4 ; Lab1Text4 - db $4, $11, $5 ; Lab1Text5 + sign $3, $2, $2 ; Lab1Text2 + sign $9, $4, $3 ; Lab1Text3 + sign $d, $4, $4 ; Lab1Text4 + sign $11, $4, $5 ; Lab1Text5 db $1 ; objects object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $3 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $8 ; CINNABAR_LAB_2 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $c ; CINNABAR_LAB_3 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $10 ; CINNABAR_LAB_4 + warp_to $2, $7, CINNABAR_LAB_1_WIDTH + warp_to $3, $7, CINNABAR_LAB_1_WIDTH + warp_to $8, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 + warp_to $c, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 + warp_to $10, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index ed541ada..77d1eef6 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -2,8 +2,8 @@ Lab2Object: db $17 ; border block db $2 ; warps - db $7, $2, $2, CINNABAR_LAB_1 - db $7, $3, $2, CINNABAR_LAB_1 + warp $2, $7, $2, CINNABAR_LAB_1 + warp $3, $7, $2, CINNABAR_LAB_1 db $0 ; signs @@ -13,5 +13,5 @@ Lab2Object: object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to $2, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to $3, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index c5ee01c3..ebea056c 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -2,18 +2,18 @@ Lab3Object: db $17 ; border block db $2 ; warps - db $7, $2, $3, CINNABAR_LAB_1 - db $7, $3, $3, CINNABAR_LAB_1 + warp $2, $7, $3, CINNABAR_LAB_1 + warp $3, $7, $3, CINNABAR_LAB_1 db $3 ; signs - db $4, $0, $3 ; Lab3Text3 - db $4, $1, $4 ; Lab3Text4 - db $1, $2, $5 ; Lab3Text5 + sign $0, $4, $3 ; Lab3Text3 + sign $1, $4, $4 ; Lab3Text4 + sign $2, $1, $5 ; Lab3Text5 db $2 ; objects object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to $2, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 + warp_to $3, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 361f9533..2939142a 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -2,8 +2,8 @@ Lab4Object: db $17 ; border block db $2 ; warps - db $7, $2, $4, CINNABAR_LAB_1 - db $7, $3, $4, CINNABAR_LAB_1 + warp $2, $7, $4, CINNABAR_LAB_1 + warp $3, $7, $4, CINNABAR_LAB_1 db $0 ; signs @@ -12,5 +12,5 @@ Lab4Object: object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to $2, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 + warp_to $3, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index e7bf0ad6..73ed8e63 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -2,9 +2,9 @@ LanceObject: db $3 ; border block db $3 ; warps - db $10, $18, $2, AGATHAS_ROOM - db $0, $5, $0, CHAMPIONS_ROOM - db $0, $6, $0, CHAMPIONS_ROOM + warp $18, $10, $2, AGATHAS_ROOM + warp $5, $0, $0, CHAMPIONS_ROOM + warp $6, $0, $0, CHAMPIONS_ROOM db $0 ; signs @@ -12,6 +12,6 @@ LanceObject: object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to - EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM + warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 54f57270..4353a192 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -2,8 +2,8 @@ LavenderHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff db $0 ; signs @@ -16,5 +16,5 @@ LavenderHouse1Object: object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person ; warp-to - EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, LAVENDER_HOUSE_1_WIDTH + warp_to $3, $7, LAVENDER_HOUSE_1_WIDTH diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index 7638ff66..991f1adb 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -2,8 +2,8 @@ LavenderHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -12,5 +12,5 @@ LavenderHouse2Object: object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person ; warp-to - EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, LAVENDER_HOUSE_2_WIDTH + warp_to $3, $7, LAVENDER_HOUSE_2_WIDTH diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 2d8e7636..1b459d5c 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -2,8 +2,8 @@ LavenderMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff db $0 ; signs @@ -13,5 +13,5 @@ LavenderMartObject: object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP LAVENDER_MART_WIDTH, $7, $3 - EVENT_DISP LAVENDER_MART_WIDTH, $7, $4 + warp_to $3, $7, LAVENDER_MART_WIDTH + warp_to $4, $7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index 617e7fb8..c2d3ee46 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -2,8 +2,8 @@ LavenderPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ LavenderPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3 - EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, LAVENDER_POKECENTER_WIDTH + warp_to $4, $7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 49347aba..d2d37589 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -2,20 +2,20 @@ LavenderTownObject: db $2c ; border block db $6 ; warps - db $5, $3, $0, LAVENDER_POKECENTER - db $5, $e, $0, POKEMONTOWER_1 - db $9, $7, $0, LAVENDER_HOUSE_1 - db $d, $f, $0, LAVENDER_MART - db $d, $3, $0, LAVENDER_HOUSE_2 - db $d, $7, $0, NAME_RATERS_HOUSE + warp $3, $5, $0, LAVENDER_POKECENTER + warp $e, $5, $0, POKEMONTOWER_1 + warp $7, $9, $0, LAVENDER_HOUSE_1 + warp $f, $d, $0, LAVENDER_MART + warp $3, $d, $0, LAVENDER_HOUSE_2 + warp $7, $d, $0, NAME_RATERS_HOUSE db $6 ; signs - db $9, $b, $4 ; LavenderTownText4 - db $3, $9, $5 ; LavenderTownText5 - db $d, $10, $6 ; MartSignText - db $5, $4, $7 ; PokeCenterSignText - db $9, $5, $8 ; LavenderTownText8 - db $7, $11, $9 ; LavenderTownText9 + sign $b, $9, $4 ; LavenderTownText4 + sign $9, $3, $5 ; LavenderTownText5 + sign $10, $d, $6 ; MartSignText + sign $4, $5, $7 ; PokeCenterSignText + sign $5, $9, $8 ; LavenderTownText8 + sign $11, $7, $9 ; LavenderTownText9 db $3 ; objects object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person @@ -23,9 +23,9 @@ LavenderTownObject: object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person ; warp-to - EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $3 ; LAVENDER_POKECENTER - EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $e ; POKEMONTOWER_1 - EVENT_DISP LAVENDER_TOWN_WIDTH, $9, $7 ; LAVENDER_HOUSE_1 - EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $f ; LAVENDER_MART - EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $3 ; LAVENDER_HOUSE_2 - EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $7 ; NAME_RATERS_HOUSE + warp_to $3, $5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER + warp_to $e, $5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1 + warp_to $7, $9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1 + warp_to $f, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_MART + warp_to $3, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2 + warp_to $7, $d, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 5b985369..9791b859 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -2,10 +2,10 @@ LoreleiObject: db $3 ; border block db $4 ; warps - db $b, $4, $2, INDIGO_PLATEAU_LOBBY - db $b, $5, $2, INDIGO_PLATEAU_LOBBY - db $0, $4, $0, BRUNOS_ROOM - db $0, $5, $1, BRUNOS_ROOM + warp $4, $b, $2, INDIGO_PLATEAU_LOBBY + warp $5, $b, $2, INDIGO_PLATEAU_LOBBY + warp $4, $0, $0, BRUNOS_ROOM + warp $5, $0, $1, BRUNOS_ROOM db $0 ; signs @@ -13,7 +13,7 @@ LoreleiObject: object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 ; warp-to - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM + warp_to $4, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $5, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $4, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $5, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index ed6529f2..ae2c88ca 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -2,14 +2,14 @@ Mansion1Object: db $2e ; border block db $8 ; warps - db $1b, $4, $0, $ff - db $1b, $5, $0, $ff - db $1b, $6, $0, $ff - db $1b, $7, $0, $ff - db $a, $5, $0, MANSION_2 - db $17, $15, $0, MANSION_4 - db $1b, $1a, $0, $ff - db $1b, $1b, $0, $ff + warp $4, $1b, $0, $ff + warp $5, $1b, $0, $ff + warp $6, $1b, $0, $ff + warp $7, $1b, $0, $ff + warp $5, $a, $0, MANSION_2 + warp $15, $17, $0, MANSION_4 + warp $1a, $1b, $0, $ff + warp $1b, $1b, $0, $ff db $0 ; signs @@ -19,11 +19,11 @@ Mansion1Object: object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS ; warp-to - EVENT_DISP MANSION_1_WIDTH, $1b, $4 - EVENT_DISP MANSION_1_WIDTH, $1b, $5 - EVENT_DISP MANSION_1_WIDTH, $1b, $6 - EVENT_DISP MANSION_1_WIDTH, $1b, $7 - EVENT_DISP MANSION_1_WIDTH, $a, $5 ; MANSION_2 - EVENT_DISP MANSION_1_WIDTH, $17, $15 ; MANSION_4 - EVENT_DISP MANSION_1_WIDTH, $1b, $1a - EVENT_DISP MANSION_1_WIDTH, $1b, $1b + warp_to $4, $1b, MANSION_1_WIDTH + warp_to $5, $1b, MANSION_1_WIDTH + warp_to $6, $1b, MANSION_1_WIDTH + warp_to $7, $1b, MANSION_1_WIDTH + warp_to $5, $a, MANSION_1_WIDTH ; MANSION_2 + warp_to $15, $17, MANSION_1_WIDTH ; MANSION_4 + warp_to $1a, $1b, MANSION_1_WIDTH + warp_to $1b, $1b, MANSION_1_WIDTH diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index bda2ad27..cbb546c1 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -2,10 +2,10 @@ Mansion2Object: db $1 ; border block db $4 ; warps - db $a, $5, $4, MANSION_1 - db $a, $7, $0, MANSION_3 - db $e, $19, $2, MANSION_3 - db $1, $6, $1, MANSION_3 + warp $5, $a, $4, MANSION_1 + warp $7, $a, $0, MANSION_3 + warp $19, $e, $2, MANSION_3 + warp $6, $1, $1, MANSION_3 db $0 ; signs @@ -16,7 +16,7 @@ Mansion2Object: object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1 - EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3 - EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3 - EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3 + warp_to $5, $a, MANSION_2_WIDTH ; MANSION_1 + warp_to $7, $a, MANSION_2_WIDTH ; MANSION_3 + warp_to $19, $e, MANSION_2_WIDTH ; MANSION_3 + warp_to $6, $1, MANSION_2_WIDTH ; MANSION_3 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 72431402..b2b2230c 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -2,9 +2,9 @@ Mansion3Object: db $1 ; border block db $3 ; warps - db $a, $7, $1, MANSION_2 - db $1, $6, $3, MANSION_2 - db $e, $19, $2, MANSION_2 + warp $7, $a, $1, MANSION_2 + warp $6, $1, $3, MANSION_2 + warp $19, $e, $2, MANSION_2 db $0 ; signs @@ -16,6 +16,6 @@ Mansion3Object: object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person ; warp-to - EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2 - EVENT_DISP MANSION_3_WIDTH, $1, $6 ; MANSION_2 - EVENT_DISP MANSION_3_WIDTH, $e, $19 ; MANSION_2 + warp_to $7, $a, MANSION_3_WIDTH ; MANSION_2 + warp_to $6, $1, MANSION_3_WIDTH ; MANSION_2 + warp_to $19, $e, MANSION_3_WIDTH ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 94a6f612..9a333258 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -2,7 +2,7 @@ Mansion4Object: db $1 ; border block db $1 ; warps - db $16, $17, $5, MANSION_1 + warp $17, $16, $5, MANSION_1 db $0 ; signs @@ -17,4 +17,4 @@ Mansion4Object: object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY ; warp-to - EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1 + warp_to $17, $16, MANSION_4_WIDTH ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 42c45016..87697a2e 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -2,14 +2,14 @@ MtMoon1Object: db $3 ; border block db $5 ; warps - db $23, $e, $1, $ff - db $23, $f, $1, $ff - db $5, $5, $0, MT_MOON_2 - db $b, $11, $2, MT_MOON_2 - db $f, $19, $3, MT_MOON_2 + warp $e, $23, $1, $ff + warp $f, $23, $1, $ff + warp $5, $5, $0, MT_MOON_2 + warp $11, $b, $2, MT_MOON_2 + warp $19, $f, $3, MT_MOON_2 db $1 ; signs - db $17, $f, $e ; MtMoon1Text14 + sign $f, $17, $e ; MtMoon1Text14 db $d ; objects object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1 @@ -27,8 +27,8 @@ MtMoon1Object: object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12 ; warp-to - EVENT_DISP MT_MOON_1_WIDTH, $23, $e - EVENT_DISP MT_MOON_1_WIDTH, $23, $f - EVENT_DISP MT_MOON_1_WIDTH, $5, $5 ; MT_MOON_2 - EVENT_DISP MT_MOON_1_WIDTH, $b, $11 ; MT_MOON_2 - EVENT_DISP MT_MOON_1_WIDTH, $f, $19 ; MT_MOON_2 + warp_to $e, $23, MT_MOON_1_WIDTH + warp_to $f, $23, MT_MOON_1_WIDTH + warp_to $5, $5, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to $11, $b, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to $19, $f, MT_MOON_1_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index f39cd4a5..5346d838 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -2,25 +2,25 @@ MtMoon2Object: db $3 ; border block db $8 ; warps - db $5, $5, $2, MT_MOON_1 - db $b, $11, $0, MT_MOON_3 - db $9, $19, $3, MT_MOON_1 - db $f, $19, $4, MT_MOON_1 - db $11, $15, $1, MT_MOON_3 - db $1b, $d, $2, MT_MOON_3 - db $3, $17, $3, MT_MOON_3 - db $3, $1b, $2, $ff + warp $5, $5, $2, MT_MOON_1 + warp $11, $b, $0, MT_MOON_3 + warp $19, $9, $3, MT_MOON_1 + warp $19, $f, $4, MT_MOON_1 + warp $15, $11, $1, MT_MOON_3 + warp $d, $1b, $2, MT_MOON_3 + warp $17, $3, $3, MT_MOON_3 + warp $1b, $3, $2, $ff db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $b, $11 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $9, $19 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $f, $19 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $11, $15 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $1b, $d ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $3, $17 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $3, $1b + warp_to $5, $5, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to $11, $b, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $19, $9, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to $19, $f, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to $15, $11, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $d, $1b, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $17, $3, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $1b, $3, MT_MOON_2_WIDTH diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 7fe29180..f9472e74 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -2,10 +2,10 @@ MtMoon3Object: db $3 ; border block db $4 ; warps - db $9, $19, $1, MT_MOON_2 - db $11, $15, $4, MT_MOON_2 - db $1b, $f, $5, MT_MOON_2 - db $7, $5, $6, MT_MOON_2 + warp $19, $9, $1, MT_MOON_2 + warp $15, $11, $4, MT_MOON_2 + warp $f, $1b, $5, MT_MOON_2 + warp $5, $7, $6, MT_MOON_2 db $0 ; signs @@ -21,7 +21,7 @@ MtMoon3Object: object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 ; warp-to - EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 - EVENT_DISP MT_MOON_3_WIDTH, $11, $15 ; MT_MOON_2 - EVENT_DISP MT_MOON_3_WIDTH, $1b, $f ; MT_MOON_2 - EVENT_DISP MT_MOON_3_WIDTH, $7, $5 ; MT_MOON_2 + warp_to $19, $9, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to $15, $11, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to $f, $1b, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to $5, $7, MT_MOON_3_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index 1e168895..27a4fbc3 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -2,8 +2,8 @@ MtMoonPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -16,5 +16,5 @@ MtMoonPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person ; warp-to - EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 - EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, MT_MOON_POKECENTER_WIDTH + warp_to $4, $7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 56932af8..d05ff623 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -2,11 +2,11 @@ Museum1FObject: db $a ; border block db $5 ; warps - db $7, $a, $0, $ff - db $7, $b, $0, $ff - db $7, $10, $1, $ff - db $7, $11, $1, $ff - db $7, $7, $0, MUSEUM_2F + warp $a, $7, $0, $ff + warp $b, $7, $0, $ff + warp $10, $7, $1, $ff + warp $11, $7, $1, $ff + warp $7, $7, $0, MUSEUM_2F db $0 ; signs @@ -18,8 +18,8 @@ Museum1FObject: object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person ; warp-to - EVENT_DISP MUSEUM_1F_WIDTH, $7, $a - EVENT_DISP MUSEUM_1F_WIDTH, $7, $b - EVENT_DISP MUSEUM_1F_WIDTH, $7, $10 - EVENT_DISP MUSEUM_1F_WIDTH, $7, $11 - EVENT_DISP MUSEUM_1F_WIDTH, $7, $7 ; MUSEUM_2F + warp_to $a, $7, MUSEUM_1F_WIDTH + warp_to $b, $7, MUSEUM_1F_WIDTH + warp_to $10, $7, MUSEUM_1F_WIDTH + warp_to $11, $7, MUSEUM_1F_WIDTH + warp_to $7, $7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 689391d9..e93a6837 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -2,11 +2,11 @@ Museum2FObject: db $a ; border block db $1 ; warps - db $7, $7, $4, MUSEUM_1F + warp $7, $7, $4, MUSEUM_1F db $2 ; signs - db $2, $b, $6 ; Museum2FText6 - db $5, $2, $7 ; Museum2FText7 + sign $b, $2, $6 ; Museum2FText6 + sign $2, $5, $7 ; Museum2FText7 db $5 ; objects object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person @@ -16,4 +16,4 @@ Museum2FObject: object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F + warp_to $7, $7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 0118b2f7..9f0280f7 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -2,8 +2,8 @@ NameRaterObject: db $a ; border block db $2 ; warps - db $7, $2, $5, $ff - db $7, $3, $5, $ff + warp $2, $7, $5, $ff + warp $3, $7, $5, $ff db $0 ; signs @@ -11,5 +11,5 @@ NameRaterObject: object SPRITE_MR_MASTERBALL, $5, $3, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2 - EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, NAME_RATERS_HOUSE_WIDTH + warp_to $3, $7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 3834c49a..c23c5afe 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -2,8 +2,8 @@ OaksLabObject: db $3 ; border block db $2 ; warps - db $b, $4, $2, $ff - db $b, $5, $2, $ff + warp $4, $b, $2, $ff + warp $5, $b, $2, $ff db $0 ; signs @@ -21,5 +21,5 @@ OaksLabObject: object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person ; warp-to - EVENT_DISP OAKS_LAB_WIDTH, $b, $4 - EVENT_DISP OAKS_LAB_WIDTH, $b, $5 + warp_to $4, $b, OAKS_LAB_WIDTH + warp_to $5, $b, OAKS_LAB_WIDTH diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index d02cbae2..c6158b68 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -2,15 +2,15 @@ PalletTownObject: db $b ; border block db $3 ; warps - db $5, $5, $0, REDS_HOUSE_1F - db $5, $d, $0, BLUES_HOUSE - db $b, $c, $1, OAKS_LAB + warp $5, $5, $0, REDS_HOUSE_1F + warp $d, $5, $0, BLUES_HOUSE + warp $c, $b, $1, OAKS_LAB db $4 ; signs - db $d, $d, $4 ; PalletTownText4 - db $9, $7, $5 ; PalletTownText5 - db $5, $3, $6 ; PalletTownText6 - db $5, $b, $7 ; PalletTownText7 + sign $d, $d, $4 ; PalletTownText4 + sign $7, $9, $5 ; PalletTownText5 + sign $3, $5, $6 ; PalletTownText6 + sign $b, $5, $7 ; PalletTownText7 db $3 ; objects object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person @@ -18,6 +18,6 @@ PalletTownObject: object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person ; warp-to - EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F - EVENT_DISP PALLET_TOWN_WIDTH, $5, $d ; BLUES_HOUSE - EVENT_DISP PALLET_TOWN_WIDTH, $b, $c ; OAKS_LAB + warp_to $5, $5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F + warp_to $d, $5, PALLET_TOWN_WIDTH ; BLUES_HOUSE + warp_to $c, $b, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 7b389bd2..08985e08 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -2,22 +2,22 @@ PewterCityObject: db $a ; border block db $7 ; warps - db $7, $e, $0, MUSEUM_1F - db $5, $13, $2, MUSEUM_1F - db $11, $10, $0, PEWTER_GYM - db $d, $1d, $0, PEWTER_HOUSE_1 - db $11, $17, $0, PEWTER_MART - db $1d, $7, $0, PEWTER_HOUSE_2 - db $19, $d, $0, PEWTER_POKECENTER + warp $e, $7, $0, MUSEUM_1F + warp $13, $5, $2, MUSEUM_1F + warp $10, $11, $0, PEWTER_GYM + warp $1d, $d, $0, PEWTER_HOUSE_1 + warp $17, $11, $0, PEWTER_MART + warp $7, $1d, $0, PEWTER_HOUSE_2 + warp $d, $19, $0, PEWTER_POKECENTER db $7 ; signs - db $1d, $13, $6 ; PewterCityText6 - db $13, $21, $7 ; PewterCityText7 - db $11, $18, $8 ; MartSignText - db $19, $e, $9 ; PokeCenterSignText - db $9, $f, $a ; PewterCityText10 - db $11, $b, $b ; PewterCityText11 - db $17, $19, $c ; PewterCityText12 + sign $13, $1d, $6 ; PewterCityText6 + sign $21, $13, $7 ; PewterCityText7 + sign $18, $11, $8 ; MartSignText + sign $e, $19, $9 ; PokeCenterSignText + sign $f, $9, $a ; PewterCityText10 + sign $b, $11, $b ; PewterCityText11 + sign $19, $17, $c ; PewterCityText12 db $5 ; objects object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person @@ -27,10 +27,10 @@ PewterCityObject: object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F - EVENT_DISP PEWTER_CITY_WIDTH, $5, $13 ; MUSEUM_1F - EVENT_DISP PEWTER_CITY_WIDTH, $11, $10 ; PEWTER_GYM - EVENT_DISP PEWTER_CITY_WIDTH, $d, $1d ; PEWTER_HOUSE_1 - EVENT_DISP PEWTER_CITY_WIDTH, $11, $17 ; PEWTER_MART - EVENT_DISP PEWTER_CITY_WIDTH, $1d, $7 ; PEWTER_HOUSE_2 - EVENT_DISP PEWTER_CITY_WIDTH, $19, $d ; PEWTER_POKECENTER + warp_to $e, $7, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to $13, $5, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to $10, $11, PEWTER_CITY_WIDTH ; PEWTER_GYM + warp_to $1d, $d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 + warp_to $17, $11, PEWTER_CITY_WIDTH ; PEWTER_MART + warp_to $7, $1d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 + warp_to $d, $19, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 280f1a7e..b4098813 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -2,8 +2,8 @@ PewterGymObject: db $3 ; border block db $2 ; warps - db $d, $4, $2, $ff - db $d, $5, $2, $ff + warp $4, $d, $2, $ff + warp $5, $d, $2, $ff db $0 ; signs @@ -13,5 +13,5 @@ PewterGymObject: object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to - EVENT_DISP PEWTER_GYM_WIDTH, $d, $4 - EVENT_DISP PEWTER_GYM_WIDTH, $d, $5 + warp_to $4, $d, PEWTER_GYM_WIDTH + warp_to $5, $d, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index d973e53b..4f1c2e8b 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -2,8 +2,8 @@ PewterHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -13,5 +13,5 @@ PewterHouse1Object: object SPRITE_FAT_BALD_GUY, $1, $2, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, PEWTER_HOUSE_1_WIDTH + warp_to $3, $7, PEWTER_HOUSE_1_WIDTH diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index 6c111acb..f74601ed 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -2,8 +2,8 @@ PewterHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $5, $ff - db $7, $3, $5, $ff + warp $2, $7, $5, $ff + warp $3, $7, $5, $ff db $0 ; signs @@ -12,5 +12,5 @@ PewterHouse2Object: object SPRITE_BUG_CATCHER, $4, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, PEWTER_HOUSE_2_WIDTH + warp_to $3, $7, PEWTER_HOUSE_2_WIDTH diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 50ccd288..8272c7d2 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -2,8 +2,8 @@ PewterMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ PewterMartObject: object SPRITE_BLACK_HAIR_BOY_2, $5, $5, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP PEWTER_MART_WIDTH, $7, $3 - EVENT_DISP PEWTER_MART_WIDTH, $7, $4 + warp_to $3, $7, PEWTER_MART_WIDTH + warp_to $4, $7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 44e10ed6..1b6b9969 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -2,8 +2,8 @@ PewterPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $6, $ff - db $7, $4, $6, $ff + warp $3, $7, $6, $ff + warp $4, $7, $6, $ff db $0 ; signs @@ -14,5 +14,5 @@ PewterPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 - EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, PEWTER_POKECENTER_WIDTH + warp_to $4, $7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 54af9efc..fdddcd9c 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -2,9 +2,9 @@ PokemonTower1Object: db $1 ; border block db $3 ; warps - db $11, $a, $1, $ff - db $11, $b, $1, $ff - db $9, $12, $1, POKEMONTOWER_2 + warp $a, $11, $1, $ff + warp $b, $11, $1, $ff + warp $12, $9, $1, POKEMONTOWER_2 db $0 ; signs @@ -16,6 +16,6 @@ PokemonTower1Object: object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person ; warp-to - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b - EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2 + warp_to $a, $11, POKEMONTOWER_1_WIDTH + warp_to $b, $11, POKEMONTOWER_1_WIDTH + warp_to $12, $9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 33bc048d..2d96f12c 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -2,8 +2,8 @@ PokemonTower2Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_3 - db $9, $12, $2, POKEMONTOWER_1 + warp $3, $9, $0, POKEMONTOWER_3 + warp $12, $9, $2, POKEMONTOWER_1 db $0 ; signs @@ -12,5 +12,5 @@ PokemonTower2Object: object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person ; warp-to - EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3 - EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1 + warp_to $3, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3 + warp_to $12, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 9899276a..804d6008 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -2,8 +2,8 @@ PokemonTower3Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_2 - db $9, $12, $1, POKEMONTOWER_4 + warp $3, $9, $0, POKEMONTOWER_2 + warp $12, $9, $1, POKEMONTOWER_4 db $0 ; signs @@ -14,5 +14,5 @@ PokemonTower3Object: object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE ; warp-to - EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2 - EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4 + warp_to $3, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2 + warp_to $12, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 19f4f4e3..5bd521e5 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -2,8 +2,8 @@ PokemonTower4Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_5 - db $9, $12, $1, POKEMONTOWER_3 + warp $3, $9, $0, POKEMONTOWER_5 + warp $12, $9, $1, POKEMONTOWER_3 db $0 ; signs @@ -16,5 +16,5 @@ PokemonTower4Object: object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP ; warp-to - EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5 - EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $12 ; POKEMONTOWER_3 + warp_to $3, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 + warp_to $12, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 5a73825c..72401577 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -2,8 +2,8 @@ PokemonTower5Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_4 - db $9, $12, $0, POKEMONTOWER_6 + warp $3, $9, $0, POKEMONTOWER_4 + warp $12, $9, $0, POKEMONTOWER_6 db $0 ; signs @@ -16,5 +16,5 @@ PokemonTower5Object: object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET ; warp-to - EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4 - EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $12 ; POKEMONTOWER_6 + warp_to $3, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4 + warp_to $12, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index d0035faa..62513fb4 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -2,8 +2,8 @@ PokemonTower6Object: db $1 ; border block db $2 ; warps - db $9, $12, $1, POKEMONTOWER_5 - db $10, $9, $0, POKEMONTOWER_7 + warp $12, $9, $1, POKEMONTOWER_5 + warp $9, $10, $0, POKEMONTOWER_7 db $0 ; signs @@ -15,5 +15,5 @@ PokemonTower6Object: object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY ; warp-to - EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5 - EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7 + warp_to $12, $9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 + warp_to $9, $10, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 6ee1e8fd..e78d6181 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -2,7 +2,7 @@ PokemonTower7Object: db $1 ; border block db $1 ; warps - db $10, $9, $1, POKEMONTOWER_6 + warp $9, $10, $1, POKEMONTOWER_6 db $0 ; signs @@ -13,4 +13,4 @@ PokemonTower7Object: object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 + warp_to $9, $10, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index a04cb657..01fc94c7 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -2,9 +2,9 @@ PowerPlantObject: db $2e ; border block db $3 ; warps - db $23, $4, $3, $ff - db $23, $5, $3, $ff - db $b, $0, $3, $ff + warp $4, $23, $3, $ff + warp $5, $23, $3, $ff + warp $0, $b, $3, $ff db $0 ; signs @@ -25,6 +25,6 @@ PowerPlantObject: object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33 ; warp-to - EVENT_DISP POWER_PLANT_WIDTH, $23, $4 - EVENT_DISP POWER_PLANT_WIDTH, $23, $5 - EVENT_DISP POWER_PLANT_WIDTH, $b, $0 + warp_to $4, $23, POWER_PLANT_WIDTH + warp_to $5, $23, POWER_PLANT_WIDTH + warp_to $0, $b, POWER_PLANT_WIDTH diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4d32ea3d..8c30fb84 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -2,17 +2,17 @@ RedsHouse1FObject: db $0A ; border block db $3 ; warps - db $7, $2, $0, $FF ; exit1 - db $7, $3, $0, $FF ; exit2 - db $1, $7, $0, REDS_HOUSE_2F ; staircase + warp $2, $7, $0, $FF ; exit1 + warp $3, $7, $0, $FF ; exit2 + warp $7, $1, $0, REDS_HOUSE_2F ; staircase db $1 ; signs - db $1, $3, $2 ; TV + sign $3, $1, $2 ; TV db $1 ; objects object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom ; warp-to - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2 - EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3 - EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $7 + warp_to $2, $7, REDS_HOUSE_1F_WIDTH + warp_to $3, $7, REDS_HOUSE_1F_WIDTH + warp_to $7, $1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index ebd57e59..d36f0672 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -2,11 +2,11 @@ RedsHouse2FObject: db $0A ; border block db $1 ; warps - db $1, $7, $2, REDS_HOUSE_1F + warp $7, $1, $2, REDS_HOUSE_1F db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $7 + warp_to $7, $1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 0b2bf374..75b3569d 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -2,11 +2,11 @@ RocketHideout1Object: db $2e ; border block db $5 ; warps - db $2, $17, $0, ROCKET_HIDEOUT_2 - db $2, $15, $2, GAME_CORNER - db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $18, $15, $3, ROCKET_HIDEOUT_2 - db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $17, $2, $0, ROCKET_HIDEOUT_2 + warp $15, $2, $2, GAME_CORNER + warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR + warp $15, $18, $3, ROCKET_HIDEOUT_2 + warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -20,8 +20,8 @@ RocketHideout1Object: object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION ; warp-to - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $15 ; GAME_CORNER - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $18, $15 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $17, $2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $15, $2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER + warp_to $18, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $15, $18, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $19, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 6689110c..08e7ccf1 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -2,11 +2,11 @@ RocketHideout2Object: db $2e ; border block db $5 ; warps - db $8, $1b, $0, ROCKET_HIDEOUT_1 - db $8, $15, $0, ROCKET_HIDEOUT_3 - db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $16, $15, $3, ROCKET_HIDEOUT_1 - db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $1b, $8, $0, ROCKET_HIDEOUT_1 + warp $15, $8, $0, ROCKET_HIDEOUT_3 + warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR + warp $15, $16, $3, ROCKET_HIDEOUT_1 + warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -18,8 +18,8 @@ RocketHideout2Object: object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION ; warp-to - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $1b, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $15, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 + warp_to $18, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $15, $16, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $19, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 90bfbb57..694b39ee 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -2,8 +2,8 @@ RocketHideout3Object: db $2e ; border block db $2 ; warps - db $6, $19, $1, ROCKET_HIDEOUT_2 - db $12, $13, $0, ROCKET_HIDEOUT_4 + warp $19, $6, $1, ROCKET_HIDEOUT_2 + warp $13, $12, $0, ROCKET_HIDEOUT_4 db $0 ; signs @@ -14,5 +14,5 @@ RocketHideout3Object: object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY ; warp-to - EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $12, $13 ; ROCKET_HIDEOUT_4 + warp_to $19, $6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $13, $12, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index b4e98d04..2450af12 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -2,9 +2,9 @@ RocketHideout4Object: db $2e ; border block db $3 ; warps - db $a, $13, $1, ROCKET_HIDEOUT_3 - db $f, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $f, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $13, $a, $1, ROCKET_HIDEOUT_3 + warp $18, $f, $0, ROCKET_HIDEOUT_ELEVATOR + warp $19, $f, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -20,6 +20,6 @@ RocketHideout4Object: object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY ; warp-to - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3 - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $13, $a, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 + warp_to $18, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $19, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index c1dfe961..c1407769 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -2,14 +2,14 @@ RocketHideoutElevatorObject: db $f ; border block db $2 ; warps - db $1, $2, $2, ROCKET_HIDEOUT_1 - db $1, $3, $4, ROCKET_HIDEOUT_1 + warp $2, $1, $2, ROCKET_HIDEOUT_1 + warp $3, $1, $4, ROCKET_HIDEOUT_1 db $1 ; signs - db $1, $1, $1 ; RocketHideoutElevatorText1 + sign $1, $1, $1 ; RocketHideoutElevatorText1 db $0 ; objects ; warp-to - EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $2 ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $3 ; ROCKET_HIDEOUT_1 + warp_to $2, $1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $3, $1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 932efb87..945f419d 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -2,17 +2,17 @@ RockTunnel1Object: db $3 ; border block db $8 ; warps - db $3, $f, $1, $ff - db $0, $f, $1, $ff - db $21, $f, $2, $ff - db $23, $f, $2, $ff - db $3, $25, $0, ROCK_TUNNEL_2 - db $3, $5, $1, ROCK_TUNNEL_2 - db $b, $11, $2, ROCK_TUNNEL_2 - db $11, $25, $3, ROCK_TUNNEL_2 + warp $f, $3, $1, $ff + warp $f, $0, $1, $ff + warp $f, $21, $2, $ff + warp $f, $23, $2, $ff + warp $25, $3, $0, ROCK_TUNNEL_2 + warp $5, $3, $1, ROCK_TUNNEL_2 + warp $11, $b, $2, ROCK_TUNNEL_2 + warp $25, $11, $3, ROCK_TUNNEL_2 db $1 ; signs - db $1d, $b, $8 ; RockTunnel1Text8 + sign $b, $1d, $8 ; RockTunnel1Text8 db $7 ; objects object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c @@ -24,11 +24,11 @@ RockTunnel1Object: object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13 ; warp-to - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $0, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $21, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $23, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $25 ; ROCK_TUNNEL_2 - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $5 ; ROCK_TUNNEL_2 - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $b, $11 ; ROCK_TUNNEL_2 - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $11, $25 ; ROCK_TUNNEL_2 + warp_to $f, $3, ROCK_TUNNEL_1_WIDTH + warp_to $f, $0, ROCK_TUNNEL_1_WIDTH + warp_to $f, $21, ROCK_TUNNEL_1_WIDTH + warp_to $f, $23, ROCK_TUNNEL_1_WIDTH + warp_to $25, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to $5, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to $11, $b, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to $25, $11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 3589ec60..7acffb9a 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -2,10 +2,10 @@ RockTunnel2Object: db $3 ; border block db $4 ; warps - db $19, $21, $4, ROCK_TUNNEL_1 - db $3, $1b, $5, ROCK_TUNNEL_1 - db $b, $17, $6, ROCK_TUNNEL_1 - db $3, $3, $7, ROCK_TUNNEL_1 + warp $21, $19, $4, ROCK_TUNNEL_1 + warp $1b, $3, $5, ROCK_TUNNEL_1 + warp $17, $b, $6, ROCK_TUNNEL_1 + warp $3, $3, $7, ROCK_TUNNEL_1 db $0 ; signs @@ -20,7 +20,7 @@ RockTunnel2Object: object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 ; warp-to - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $1b ; ROCK_TUNNEL_1 - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $b, $17 ; ROCK_TUNNEL_1 - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $3 ; ROCK_TUNNEL_1 + warp_to $21, $19, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to $1b, $3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to $17, $b, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to $3, $3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 90efc3ea..400b5998 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -2,8 +2,8 @@ RockTunnelPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ RockTunnelPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 - EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, ROCK_TUNNEL_POKECENTER_WIDTH + warp_to $4, $7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index 0e6237e7..ae4fec99 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -4,11 +4,11 @@ Route1Object: db $0 ; warps db $1 ; signs - db $1b, $9, $3 ; Route1Text3 + sign $9, $1b, $3 ; Route1Text3 db $2 ; objects object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person ; warp-to (unused) - EVENT_DISP $4, $7, $2 + warp_to $2, $7, $4 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index a1590ded..3f052bf8 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -2,16 +2,16 @@ Route10Object: db $2c ; border block db $4 ; warps - db $13, $b, $0, ROCK_TUNNEL_POKECENTER - db $11, $8, $0, ROCK_TUNNEL_1 - db $35, $8, $2, ROCK_TUNNEL_1 - db $27, $6, $0, POWER_PLANT + warp $b, $13, $0, ROCK_TUNNEL_POKECENTER + warp $8, $11, $0, ROCK_TUNNEL_1 + warp $8, $35, $2, ROCK_TUNNEL_1 + warp $6, $27, $0, POWER_PLANT db $4 ; signs - db $13, $7, $7 ; Route10Text7 - db $13, $c, $8 ; PokeCenterSignText - db $37, $9, $9 ; Route10Text9 - db $29, $5, $a ; Route10Text10 + sign $7, $13, $7 ; Route10Text7 + sign $c, $13, $8 ; PokeCenterSignText + sign $9, $37, $9 ; Route10Text9 + sign $5, $29, $a ; Route10Text10 db $6 ; objects object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 @@ -22,7 +22,7 @@ Route10Object: object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8 ; warp-to - EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER - EVENT_DISP ROUTE_10_WIDTH, $11, $8 ; ROCK_TUNNEL_1 - EVENT_DISP ROUTE_10_WIDTH, $35, $8 ; ROCK_TUNNEL_1 - EVENT_DISP ROUTE_10_WIDTH, $27, $6 ; POWER_PLANT + warp_to $b, $13, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER + warp_to $8, $11, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to $8, $35, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to $6, $27, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 0c7828f2..2427e20a 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -2,14 +2,14 @@ Route11Object: db $f ; border block db $5 ; warps - db $8, $31, $0, ROUTE_11_GATE_1F - db $9, $31, $1, ROUTE_11_GATE_1F - db $8, $3a, $2, ROUTE_11_GATE_1F - db $9, $3a, $3, ROUTE_11_GATE_1F - db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE + warp $31, $8, $0, ROUTE_11_GATE_1F + warp $31, $9, $1, ROUTE_11_GATE_1F + warp $3a, $8, $2, ROUTE_11_GATE_1F + warp $3a, $9, $3, ROUTE_11_GATE_1F + warp $4, $5, $0, DIGLETTS_CAVE_ENTRANCE db $1 ; signs - db $5, $1, $b ; Route11Text11 + sign $1, $5, $b ; Route11Text11 db $a ; objects object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 @@ -24,8 +24,8 @@ Route11Object: object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c ; warp-to - EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $9, $31 ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $8, $3a ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $9, $3a ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $5, $4 ; DIGLETTS_CAVE_ENTRANCE + warp_to $31, $8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $31, $9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $3a, $8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $3a, $9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $4, $5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index d8e6bff1..98a183a0 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -2,11 +2,11 @@ Route11GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_11_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_11_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route11GateObject: object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $8, $6 ; ROUTE_11_GATE_2F + warp_to $0, $4, ROUTE_11_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_11_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_11_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_11_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 6228851d..3f33e1ce 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -2,15 +2,15 @@ Route11GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_11_GATE_1F + warp $7, $7, $4, ROUTE_11_GATE_1F db $2 ; signs - db $2, $1, $3 ; Route11GateUpstairsText3 - db $2, $6, $4 ; Route11GateUpstairsText4 + sign $1, $2, $3 ; Route11GateUpstairsText3 + sign $6, $2, $4 ; Route11GateUpstairsText4 db $2 ; objects object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person object SPRITE_OAK_AIDE, $2, $6, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F + warp_to $7, $7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index dd461e6c..c950cadc 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -2,14 +2,14 @@ Route12Object: db $43 ; border block db $4 ; warps - db $f, $a, $0, ROUTE_12_GATE_1F - db $f, $b, $1, ROUTE_12_GATE_1F - db $15, $a, $2, ROUTE_12_GATE_1F - db $4d, $b, $0, ROUTE_12_HOUSE + warp $a, $f, $0, ROUTE_12_GATE_1F + warp $b, $f, $1, ROUTE_12_GATE_1F + warp $a, $15, $2, ROUTE_12_GATE_1F + warp $b, $4d, $0, ROUTE_12_HOUSE db $2 ; signs - db $d, $d, $b ; Route12Text11 - db $3f, $b, $c ; Route12Text12 + sign $d, $d, $b ; Route12Text11 + sign $b, $3f, $c ; Route12Text12 db $a ; objects object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person @@ -24,7 +24,7 @@ Route12Object: object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON ; warp-to - EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F - EVENT_DISP ROUTE_12_WIDTH, $f, $b ; ROUTE_12_GATE_1F - EVENT_DISP ROUTE_12_WIDTH, $15, $a ; ROUTE_12_GATE_1F - EVENT_DISP ROUTE_12_WIDTH, $4d, $b ; ROUTE_12_HOUSE + warp_to $a, $f, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to $b, $f, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to $a, $15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to $b, $4d, ROUTE_12_WIDTH ; ROUTE_12_HOUSE diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 27e8532a..be4e3cb8 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -2,11 +2,11 @@ Route12GateObject: db $a ; border block db $5 ; warps - db $0, $4, $0, $ff - db $0, $5, $1, $ff - db $7, $4, $2, $ff - db $7, $5, $2, $ff - db $6, $8, $0, ROUTE_12_GATE_2F + warp $4, $0, $0, $ff + warp $5, $0, $1, $ff + warp $4, $7, $2, $ff + warp $5, $7, $2, $ff + warp $8, $6, $0, ROUTE_12_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route12GateObject: object SPRITE_GUARD, $1, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $5 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $4 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $5 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $6, $8 ; ROUTE_12_GATE_2F + warp_to $4, $0, ROUTE_12_GATE_1F_WIDTH + warp_to $5, $0, ROUTE_12_GATE_1F_WIDTH + warp_to $4, $7, ROUTE_12_GATE_1F_WIDTH + warp_to $5, $7, ROUTE_12_GATE_1F_WIDTH + warp_to $8, $6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index f1221c44..b1c92f95 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -2,14 +2,14 @@ Route12GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_12_GATE_1F + warp $7, $7, $4, ROUTE_12_GATE_1F db $2 ; signs - db $2, $1, $2 ; Route12GateUpstairsText2 - db $2, $6, $3 ; Route12GateUpstairsText3 + sign $1, $2, $2 ; Route12GateUpstairsText2 + sign $6, $2, $3 ; Route12GateUpstairsText3 db $1 ; objects object SPRITE_BRUNETTE_GIRL, $3, $4, WALK, $1, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_GATE_2F_WIDTH, $7, $7 ; ROUTE_12_GATE_1F + warp_to $7, $7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 104b01f7..7c91caa2 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -2,8 +2,8 @@ Route12HouseObject: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -11,5 +11,5 @@ Route12HouseObject: object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2 - EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, ROUTE_12_HOUSE_WIDTH + warp_to $3, $7, ROUTE_12_HOUSE_WIDTH diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index a01e25a3..05fe1dd9 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -4,9 +4,9 @@ Route13Object: db $0 ; warps db $3 ; signs - db $d, $f, $b ; Route13Text11 - db $5, $21, $c ; Route13Text12 - db $b, $1f, $d ; Route13Text13 + sign $f, $d, $b ; Route13Text11 + sign $21, $5, $c ; Route13Text12 + sign $1f, $b, $d ; Route13Text13 db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 48edd284..81819f0d 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -4,7 +4,7 @@ Route14Object: db $0 ; warps db $1 ; signs - db $d, $11, $b ; Route14Text11 + sign $11, $d, $b ; Route14Text11 db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 1d83b20d..38fbae4d 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -2,13 +2,13 @@ Route15Object: db $43 ; border block db $4 ; warps - db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F - db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + warp $7, $8, $0, ROUTE_15_GATE_1F + warp $7, $9, $1, ROUTE_15_GATE_1F + warp $e, $8, $2, ROUTE_15_GATE_1F + warp $e, $9, $3, ROUTE_15_GATE_1F db $1 ; signs - db $9, $27, $c ; Route15Text12 + sign $27, $9, $c ; Route15Text12 db $b ; objects object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 @@ -24,7 +24,7 @@ Route15Object: object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to - EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $8, $e ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $e ; ROUTE_15_GATE_1F + warp_to $7, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $7, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $e, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $e, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index 06a6790a..a5902851 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -2,11 +2,11 @@ Route15GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_15_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_15_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route15GateObject: object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $8, $6 ; ROUTE_15_GATE_2F + warp_to $0, $4, ROUTE_15_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_15_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_15_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_15_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index c4cdcea8..09c3b322 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -2,13 +2,13 @@ Route15GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_15_GATE_1F + warp $7, $7, $4, ROUTE_15_GATE_1F db $1 ; signs - db $2, $6, $2 ; Route15GateUpstairsText2 + sign $6, $2, $2 ; Route15GateUpstairsText2 db $1 ; objects object SPRITE_OAK_AIDE, $4, $2, STAY, DOWN, $1 ; warp-to - EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F + warp_to $7, $7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index a342d106..d65ea9c8 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -2,19 +2,19 @@ Route16Object: db $f ; border block db $9 ; warps - db $a, $11, $0, ROUTE_16_GATE_1F - db $b, $11, $1, ROUTE_16_GATE_1F - db $a, $18, $2, ROUTE_16_GATE_1F - db $b, $18, $3, ROUTE_16_GATE_1F - db $4, $11, $4, ROUTE_16_GATE_1F - db $5, $11, $5, ROUTE_16_GATE_1F - db $4, $18, $6, ROUTE_16_GATE_1F - db $5, $18, $7, ROUTE_16_GATE_1F - db $5, $7, $0, ROUTE_16_HOUSE + warp $11, $a, $0, ROUTE_16_GATE_1F + warp $11, $b, $1, ROUTE_16_GATE_1F + warp $18, $a, $2, ROUTE_16_GATE_1F + warp $18, $b, $3, ROUTE_16_GATE_1F + warp $11, $4, $4, ROUTE_16_GATE_1F + warp $11, $5, $5, ROUTE_16_GATE_1F + warp $18, $4, $6, ROUTE_16_GATE_1F + warp $18, $5, $7, ROUTE_16_GATE_1F + warp $7, $5, $0, ROUTE_16_HOUSE db $2 ; signs - db $b, $1b, $8 ; Route16Text8 - db $11, $5, $9 ; Route16Text9 + sign $1b, $b, $8 ; Route16Text8 + sign $5, $11, $9 ; Route16Text9 db $7 ; objects object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5 @@ -26,12 +26,12 @@ Route16Object: object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person ; warp-to - EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $b, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $a, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $b, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $4, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $5, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $4, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $5, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $5, $7 ; ROUTE_16_HOUSE + warp_to $11, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $11, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $11, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $11, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $7, $5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index fce6c292..a94c4e9b 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -2,15 +2,15 @@ Route16GateObject: db $a ; border block db $9 ; warps - db $8, $0, $0, $ff - db $9, $0, $1, $ff - db $8, $7, $2, $ff - db $9, $7, $2, $ff - db $2, $0, $4, $ff - db $3, $0, $5, $ff - db $2, $7, $6, $ff - db $3, $7, $7, $ff - db $c, $6, $0, ROUTE_16_GATE_2F + warp $0, $8, $0, $ff + warp $0, $9, $1, $ff + warp $7, $8, $2, $ff + warp $7, $9, $2, $ff + warp $0, $2, $4, $ff + warp $0, $3, $5, $ff + warp $7, $2, $6, $ff + warp $7, $3, $7, $ff + warp $6, $c, $0, ROUTE_16_GATE_2F db $0 ; signs @@ -19,12 +19,12 @@ Route16GateObject: object SPRITE_GAMBLER, $4, $3, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $c, $6 ; ROUTE_16_GATE_2F + warp_to $0, $8, ROUTE_16_GATE_1F_WIDTH + warp_to $0, $9, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $8, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $9, ROUTE_16_GATE_1F_WIDTH + warp_to $0, $2, ROUTE_16_GATE_1F_WIDTH + warp_to $0, $3, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $2, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $3, ROUTE_16_GATE_1F_WIDTH + warp_to $6, $c, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 9119bf5e..3d18bcb0 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -2,15 +2,15 @@ Route16GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $8, ROUTE_16_GATE_1F + warp $7, $7, $8, ROUTE_16_GATE_1F db $2 ; signs - db $2, $1, $3 ; Route16GateUpstairsText3 - db $2, $6, $4 ; Route16GateUpstairsText4 + sign $1, $2, $3 ; Route16GateUpstairsText3 + sign $6, $2, $4 ; Route16GateUpstairsText4 db $2 ; objects object SPRITE_YOUNG_BOY, $4, $2, STAY, NONE, $1 ; person object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person ; warp-to - EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F + warp_to $7, $7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index e1e4244d..56de89d2 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -2,8 +2,8 @@ Route16HouseObject: db $a ; border block db $2 ; warps - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -12,5 +12,5 @@ Route16HouseObject: object SPRITE_BIRD, $6, $4, WALK, $0, $2 ; person ; warp-to - EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $2 - EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, ROUTE_16_HOUSE_WIDTH + warp_to $3, $7, ROUTE_16_HOUSE_WIDTH diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index 3c8e3bce..b13a2878 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -4,12 +4,12 @@ Route17Object: db $0 ; warps db $6 ; signs - db $33, $9, $b ; Route17Text11 - db $3f, $9, $c ; Route17Text12 - db $4b, $9, $d ; Route17Text13 - db $57, $9, $e ; Route17Text14 - db $6f, $9, $f ; Route17Text15 - db $8d, $9, $10 ; Route17Text16 + sign $9, $33, $b ; Route17Text11 + sign $9, $3f, $c ; Route17Text12 + sign $9, $4b, $d ; Route17Text13 + sign $9, $57, $e ; Route17Text14 + sign $9, $6f, $f ; Route17Text15 + sign $9, $8d, $10 ; Route17Text16 db $a ; objects object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4 diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 8b36ab7c..5cfb7ddb 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -2,14 +2,14 @@ Route18Object: db $43 ; border block db $4 ; warps - db $8, $21, $0, ROUTE_18_GATE_1F - db $9, $21, $1, ROUTE_18_GATE_1F - db $8, $28, $2, ROUTE_18_GATE_1F - db $9, $28, $3, ROUTE_18_GATE_1F + warp $21, $8, $0, ROUTE_18_GATE_1F + warp $21, $9, $1, ROUTE_18_GATE_1F + warp $28, $8, $2, ROUTE_18_GATE_1F + warp $28, $9, $3, ROUTE_18_GATE_1F db $2 ; signs - db $7, $2b, $4 ; Route18Text4 - db $5, $21, $5 ; Route18Text5 + sign $2b, $7, $4 ; Route18Text4 + sign $21, $5, $5 ; Route18Text5 db $3 ; objects object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 @@ -17,7 +17,7 @@ Route18Object: object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a ; warp-to - EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $9, $21 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $8, $28 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $9, $28 ; ROUTE_18_GATE_1F + warp_to $21, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to $21, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to $28, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to $28, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 08b10050..06aa03ba 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -2,11 +2,11 @@ Route18GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_18_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_18_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route18GateObject: object SPRITE_GUARD, $4, $1, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $8, $6 ; ROUTE_18_GATE_2F + warp_to $0, $4, ROUTE_18_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_18_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_18_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_18_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 671b3215..db0671b7 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -2,14 +2,14 @@ Route18GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_18_GATE_1F + warp $7, $7, $4, ROUTE_18_GATE_1F db $2 ; signs - db $2, $1, $2 ; Route18GateUpstairsText2 - db $2, $6, $3 ; Route18GateUpstairsText3 + sign $1, $2, $2 ; Route18GateUpstairsText2 + sign $6, $2, $3 ; Route18GateUpstairsText3 db $1 ; objects object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person ; warp-to - EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F + warp_to $7, $7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 956caa6e..48cee7a6 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -4,7 +4,7 @@ Route19Object: db $0 ; warps db $1 ; signs - db $9, $b, $b ; Route19Text11 + sign $b, $9, $b ; Route19Text11 db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 7db8fe09..0c14d76f 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -2,32 +2,32 @@ Route2Object: db $f ; border block db $6 ; warps - db $9, $c, $0, DIGLETTS_CAVE_EXIT - db $b, $3, $1, VIRIDIAN_FOREST_EXIT - db $13, $f, $0, ROUTE_2_HOUSE - db $23, $10, $1, ROUTE_2_GATE - db $27, $f, $2, ROUTE_2_GATE - db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE + warp $c, $9, $0, DIGLETTS_CAVE_EXIT + warp $3, $b, $1, VIRIDIAN_FOREST_EXIT + warp $f, $13, $0, ROUTE_2_HOUSE + warp $10, $23, $1, ROUTE_2_GATE + warp $f, $27, $2, ROUTE_2_GATE + warp $3, $2b, $2, VIRIDIAN_FOREST_ENTRANCE db $2 ; signs - db $41, $5, $3 ; Route2Text3 - db $b, $b, $4 ; Route2Text4 + sign $5, $41, $3 ; Route2Text3 + sign $b, $b, $4 ; Route2Text4 db $2 ; objects object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP ; warp-to - EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT - EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE - EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE - EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE - EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE + warp_to $c, $9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to $3, $b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to $f, $13, ROUTE_2_WIDTH ; ROUTE_2_HOUSE + warp_to $10, $23, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to $f, $27, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to $3, $2b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE ; unused - EVENT_DISP $4, $7, $2 - db $12, $c7, $9, $7 - EVENT_DISP $4, $7, $2 - EVENT_DISP $4, $7, $2 - EVENT_DISP $4, $7, $2 + warp_to $2, $7, $4 + db $12, $c7, $9, $7 + warp_to $2, $7, $4 + warp_to $2, $7, $4 + warp_to $2, $7, $4 diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index a3527525..0be02ca7 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -2,12 +2,12 @@ Route20Object: db $43 ; border block db $2 ; warps - db $5, $30, $0, SEAFOAM_ISLANDS_1 - db $9, $3a, $2, SEAFOAM_ISLANDS_1 + warp $30, $5, $0, SEAFOAM_ISLANDS_1 + warp $3a, $9, $2, SEAFOAM_ISLANDS_1 db $2 ; signs - db $7, $33, $b ; Route20Text11 - db $b, $39, $c ; Route20Text12 + sign $33, $7, $b ; Route20Text11 + sign $39, $b, $c ; Route20Text12 db $a ; objects object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 @@ -22,5 +22,5 @@ Route20Object: object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 ; warp-to - EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 - EVENT_DISP ROUTE_20_WIDTH, $9, $3a ; SEAFOAM_ISLANDS_1 + warp_to $30, $5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to $3a, $9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index ef568ae8..258c29a1 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -2,14 +2,14 @@ Route22Object: db $2c ; border block db $1 ; warps - db $5, $8, $0, ROUTE_22_GATE + warp $8, $5, $0, ROUTE_22_GATE db $1 ; signs - db $b, $7, $3 ; Route22FrontGateText + sign $7, $b, $3 ; Route22FrontGateText db $2 ; objects object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE + warp_to $8, $5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 2798311b..e321d95d 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -2,10 +2,10 @@ Route22GateObject: db $a ; border block db $4 ; warps - db $7, $4, $0, $ff - db $7, $5, $0, $ff - db $0, $4, $0, $ff - db $0, $5, $1, $ff + warp $4, $7, $0, $ff + warp $5, $7, $0, $ff + warp $4, $0, $0, $ff + warp $5, $0, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route22GateObject: object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4 - EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $5 - EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $4 - EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $5 + warp_to $4, $7, ROUTE_22_GATE_WIDTH + warp_to $5, $7, ROUTE_22_GATE_WIDTH + warp_to $4, $0, ROUTE_22_GATE_WIDTH + warp_to $5, $0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 3995e510..08358bd9 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -2,13 +2,13 @@ Route23Object: db $f ; border block db $4 ; warps - db $8b, $7, $2, ROUTE_22_GATE - db $8b, $8, $3, ROUTE_22_GATE - db $1f, $4, $0, VICTORY_ROAD_1 - db $1f, $e, $1, VICTORY_ROAD_2 + warp $7, $8b, $2, ROUTE_22_GATE + warp $8, $8b, $3, ROUTE_22_GATE + warp $4, $1f, $0, VICTORY_ROAD_1 + warp $e, $1f, $1, VICTORY_ROAD_2 db $1 ; signs - db $21, $3, $8 ; Route23Text8 + sign $3, $21, $8 ; Route23Text8 db $7 ; objects object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person @@ -20,7 +20,7 @@ Route23Object: object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person ; warp-to - EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE - EVENT_DISP ROUTE_23_WIDTH, $8b, $8 ; ROUTE_22_GATE - EVENT_DISP ROUTE_23_WIDTH, $1f, $4 ; VICTORY_ROAD_1 - EVENT_DISP ROUTE_23_WIDTH, $1f, $e ; VICTORY_ROAD_2 + warp_to $7, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to $8, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to $4, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_1 + warp_to $e, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index b26f62ef..d0870b13 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -2,10 +2,10 @@ Route25Object: db $2c ; border block db $1 ; warps - db $3, $2d, $0, BILLS_HOUSE + warp $2d, $3, $0, BILLS_HOUSE db $1 ; signs - db $3, $2b, $b ; Route25Text11 + sign $2b, $3, $b ; Route25Text11 db $a ; objects object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 @@ -20,4 +20,4 @@ Route25Object: object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 ; warp-to - EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE + warp_to $2d, $3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 53590f69..4caba6e1 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -2,10 +2,10 @@ Route2GateObject: db $a ; border block db $4 ; warps - db $0, $4, $3, $ff - db $0, $5, $3, $ff - db $7, $4, $4, $ff - db $7, $5, $4, $ff + warp $4, $0, $3, $ff + warp $5, $0, $3, $ff + warp $4, $7, $4, $ff + warp $5, $7, $4, $ff db $0 ; signs @@ -14,7 +14,7 @@ Route2GateObject: object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person ; warp-to - EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4 - EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $5 - EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $4 - EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $5 + warp_to $4, $0, ROUTE_2_GATE_WIDTH + warp_to $5, $0, ROUTE_2_GATE_WIDTH + warp_to $4, $7, ROUTE_2_GATE_WIDTH + warp_to $5, $7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index d6665020..70991e43 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -2,8 +2,8 @@ Route2HouseObject: db $a ; border block db $2 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff db $0 ; signs @@ -12,5 +12,5 @@ Route2HouseObject: object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person ; warp-to - EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 - EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, ROUTE_2_HOUSE_WIDTH + warp_to $3, $7, ROUTE_2_HOUSE_WIDTH diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index ba446dca..44c80382 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -4,7 +4,7 @@ Route3Object: db $0 ; warps db $1 ; signs - db $9, $3b, $a ; Route3Text10 + sign $3b, $9, $a ; Route3Text10 db $9 ; objects object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index e52f4909..c997212e 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -2,14 +2,14 @@ Route4Object: db $2c ; border block db $3 ; warps - db $5, $b, $0, MT_MOON_POKECENTER - db $5, $12, $0, MT_MOON_1 - db $5, $18, $7, MT_MOON_2 + warp $b, $5, $0, MT_MOON_POKECENTER + warp $12, $5, $0, MT_MOON_1 + warp $18, $5, $7, MT_MOON_2 db $3 ; signs - db $5, $c, $4 ; PokeCenterSignText - db $7, $11, $5 ; Route4Text5 - db $7, $1b, $6 ; Route4Text6 + sign $c, $5, $4 ; PokeCenterSignText + sign $11, $7, $5 ; Route4Text5 + sign $1b, $7, $6 ; Route4Text6 db $3 ; objects object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person @@ -17,6 +17,6 @@ Route4Object: object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 ; warp-to - EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER - EVENT_DISP ROUTE_4_WIDTH, $5, $12 ; MT_MOON_1 - EVENT_DISP ROUTE_4_WIDTH, $5, $18 ; MT_MOON_2 + warp_to $b, $5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER + warp_to $12, $5, ROUTE_4_WIDTH ; MT_MOON_1 + warp_to $18, $5, ROUTE_4_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 6065f599..e9048db8 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -2,20 +2,20 @@ Route5Object: db $a ; border block db $5 ; warps - db $1d, $a, $3, ROUTE_5_GATE - db $1d, $9, $2, ROUTE_5_GATE - db $21, $a, $0, ROUTE_5_GATE - db $1b, $11, $0, PATH_ENTRANCE_ROUTE_5 - db $15, $a, $0, DAYCAREM + warp $a, $1d, $3, ROUTE_5_GATE + warp $9, $1d, $2, ROUTE_5_GATE + warp $a, $21, $0, ROUTE_5_GATE + warp $11, $1b, $0, PATH_ENTRANCE_ROUTE_5 + warp $a, $15, $0, DAYCAREM db $1 ; signs - db $1d, $11, $1 ; Route5Text1 + sign $11, $1d, $1 ; Route5Text1 db $0 ; objects ; warp-to - EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE - EVENT_DISP ROUTE_5_WIDTH, $1d, $9 ; ROUTE_5_GATE - EVENT_DISP ROUTE_5_WIDTH, $21, $a ; ROUTE_5_GATE - EVENT_DISP ROUTE_5_WIDTH, $1b, $11 ; PATH_ENTRANCE_ROUTE_5 - EVENT_DISP ROUTE_5_WIDTH, $15, $a ; DAYCAREM + warp_to $a, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to $9, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to $a, $21, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to $11, $1b, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to $a, $15, ROUTE_5_WIDTH ; DAYCAREM diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index 9588f511..453412f7 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -2,10 +2,10 @@ Route5GateObject: db $a ; border block db $4 ; warps - db $5, $3, $2, $ff - db $5, $4, $2, $ff - db $0, $3, $1, $ff - db $0, $4, $0, $ff + warp $3, $5, $2, $ff + warp $4, $5, $2, $ff + warp $3, $0, $1, $ff + warp $4, $0, $0, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route5GateObject: object SPRITE_GUARD, $1, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3 - EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $4 - EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $3 - EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $4 + warp_to $3, $5, ROUTE_5_GATE_WIDTH + warp_to $4, $5, ROUTE_5_GATE_WIDTH + warp_to $3, $0, ROUTE_5_GATE_WIDTH + warp_to $4, $0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index bfd88fac..c7b505d4 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -2,13 +2,13 @@ Route6Object: db $f ; border block db $4 ; warps - db $1, $9, $2, ROUTE_6_GATE - db $1, $a, $2, ROUTE_6_GATE - db $7, $a, $0, ROUTE_6_GATE - db $d, $11, $0, PATH_ENTRANCE_ROUTE_6 + warp $9, $1, $2, ROUTE_6_GATE + warp $a, $1, $2, ROUTE_6_GATE + warp $a, $7, $0, ROUTE_6_GATE + warp $11, $d, $0, PATH_ENTRANCE_ROUTE_6 db $1 ; signs - db $f, $13, $7 ; Route6Text7 + sign $13, $f, $7 ; Route6Text7 db $6 ; objects object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 @@ -19,7 +19,7 @@ Route6Object: object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b ; warp-to - EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE - EVENT_DISP ROUTE_6_WIDTH, $1, $a ; ROUTE_6_GATE - EVENT_DISP ROUTE_6_WIDTH, $7, $a ; ROUTE_6_GATE - EVENT_DISP ROUTE_6_WIDTH, $d, $11 ; PATH_ENTRANCE_ROUTE_6 + warp_to $9, $1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to $a, $1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to $a, $7, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to $11, $d, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 79f17007..2c52f0d6 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -2,10 +2,10 @@ Route6GateObject: db $a ; border block db $4 ; warps - db $5, $3, $2, $ff - db $5, $4, $2, $ff - db $0, $3, $1, $ff - db $0, $4, $1, $ff + warp $3, $5, $2, $ff + warp $4, $5, $2, $ff + warp $3, $0, $1, $ff + warp $4, $0, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route6GateObject: object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3 - EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $4 - EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $3 - EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $4 + warp_to $3, $5, ROUTE_6_GATE_WIDTH + warp_to $4, $5, ROUTE_6_GATE_WIDTH + warp_to $3, $0, ROUTE_6_GATE_WIDTH + warp_to $4, $0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index d039cb3c..44982068 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -2,20 +2,20 @@ Route7Object: db $f ; border block db $5 ; warps - db $9, $12, $2, ROUTE_7_GATE - db $a, $12, $3, ROUTE_7_GATE - db $9, $b, $0, ROUTE_7_GATE - db $a, $b, $1, ROUTE_7_GATE - db $d, $5, $0, PATH_ENTRANCE_ROUTE_7 + warp $12, $9, $2, ROUTE_7_GATE + warp $12, $a, $3, ROUTE_7_GATE + warp $b, $9, $0, ROUTE_7_GATE + warp $b, $a, $1, ROUTE_7_GATE + warp $5, $d, $0, PATH_ENTRANCE_ROUTE_7 db $1 ; signs - db $d, $3, $1 ; Route7Text1 + sign $3, $d, $1 ; Route7Text1 db $0 ; objects ; warp-to - EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $a, $12 ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $9, $b ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $a, $b ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $d, $5 ; PATH_ENTRANCE_ROUTE_7 + warp_to $12, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $12, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $b, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $b, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $5, $d, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 3aea6a88..293be913 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -2,10 +2,10 @@ Route7GateObject: db $a ; border block db $4 ; warps - db $3, $0, $3, $ff - db $4, $0, $3, $ff - db $3, $5, $0, $ff - db $4, $5, $1, $ff + warp $0, $3, $3, $ff + warp $0, $4, $3, $ff + warp $5, $3, $0, $ff + warp $5, $4, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route7GateObject: object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0 - EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0 - EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5 - EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5 + warp_to $0, $3, ROUTE_7_GATE_WIDTH + warp_to $0, $4, ROUTE_7_GATE_WIDTH + warp_to $5, $3, ROUTE_7_GATE_WIDTH + warp_to $5, $4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 8aa16b82..c3e35f92 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -2,14 +2,14 @@ Route8Object: db $2c ; border block db $5 ; warps - db $9, $1, $0, ROUTE_8_GATE - db $a, $1, $1, ROUTE_8_GATE - db $9, $8, $2, ROUTE_8_GATE - db $a, $8, $3, ROUTE_8_GATE - db $3, $d, $0, PATH_ENTRANCE_ROUTE_8 + warp $1, $9, $0, ROUTE_8_GATE + warp $1, $a, $1, ROUTE_8_GATE + warp $8, $9, $2, ROUTE_8_GATE + warp $8, $a, $3, ROUTE_8_GATE + warp $d, $3, $0, PATH_ENTRANCE_ROUTE_8 db $1 ; signs - db $3, $11, $a ; Route8Text10 + sign $11, $3, $a ; Route8Text10 db $9 ; objects object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 @@ -23,8 +23,8 @@ Route8Object: object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 ; warp-to - EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $a, $1 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $9, $8 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $a, $8 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $3, $d ; PATH_ENTRANCE_ROUTE_8 + warp_to $1, $9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $1, $a, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $8, $9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $8, $a, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $d, $3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index b059fb36..46ed94dd 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -2,10 +2,10 @@ Route8GateObject: db $a ; border block db $4 ; warps - db $3, $0, $0, $ff - db $4, $0, $1, $ff - db $3, $5, $2, $ff - db $4, $5, $3, $ff + warp $0, $3, $0, $ff + warp $0, $4, $1, $ff + warp $5, $3, $2, $ff + warp $5, $4, $3, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route8GateObject: object SPRITE_GUARD, $2, $1, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0 - EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $0 - EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $5 - EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $5 + warp_to $0, $3, ROUTE_8_GATE_WIDTH + warp_to $0, $4, ROUTE_8_GATE_WIDTH + warp_to $5, $3, ROUTE_8_GATE_WIDTH + warp_to $5, $4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 9e079eab..848c6924 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -4,7 +4,7 @@ Route9Object: db $0 ; warps db $1 ; signs - db $7, $19, $b ; Route9Text11 + sign $19, $7, $b ; Route9Text11 db $a ; objects object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index b5fa0107..681e81e1 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -2,30 +2,30 @@ SafariZoneCenterObject: db $0 ; border block db $9 ; warps - db $19, $e, $2, SAFARI_ZONE_ENTRANCE - db $19, $f, $3, SAFARI_ZONE_ENTRANCE - db $a, $0, $4, SAFARI_ZONE_WEST - db $b, $0, $5, SAFARI_ZONE_WEST - db $0, $e, $4, SAFARI_ZONE_NORTH - db $0, $f, $5, SAFARI_ZONE_NORTH - db $a, $1d, $2, SAFARI_ZONE_EAST - db $b, $1d, $3, SAFARI_ZONE_EAST - db $13, $11, $0, SAFARI_ZONE_REST_HOUSE_1 + warp $e, $19, $2, SAFARI_ZONE_ENTRANCE + warp $f, $19, $3, SAFARI_ZONE_ENTRANCE + warp $0, $a, $4, SAFARI_ZONE_WEST + warp $0, $b, $5, SAFARI_ZONE_WEST + warp $e, $0, $4, SAFARI_ZONE_NORTH + warp $f, $0, $5, SAFARI_ZONE_NORTH + warp $1d, $a, $2, SAFARI_ZONE_EAST + warp $1d, $b, $3, SAFARI_ZONE_EAST + warp $11, $13, $0, SAFARI_ZONE_REST_HOUSE_1 db $2 ; signs - db $14, $12, $2 ; SafariZoneCenterText2 - db $16, $e, $3 ; SafariZoneCenterText3 + sign $12, $14, $2 ; SafariZoneCenterText2 + sign $e, $16, $3 ; SafariZoneCenterText3 db $1 ; objects object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET ; warp-to - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $f ; SAFARI_ZONE_ENTRANCE - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $0 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $0 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $e ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $f ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $1d ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $1d ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1 + warp_to $e, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $f, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $0, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to $0, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to $e, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to $f, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1d, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to $1d, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to $11, $13, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1 diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 6c2f8138..4ce97b87 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -2,16 +2,16 @@ SafariZoneEastObject: db $0 ; border block db $5 ; warps - db $4, $0, $6, SAFARI_ZONE_NORTH - db $5, $0, $7, SAFARI_ZONE_NORTH - db $16, $0, $6, SAFARI_ZONE_CENTER - db $17, $0, $6, SAFARI_ZONE_CENTER - db $9, $19, $0, SAFARI_ZONE_REST_HOUSE_3 + warp $0, $4, $6, SAFARI_ZONE_NORTH + warp $0, $5, $7, SAFARI_ZONE_NORTH + warp $0, $16, $6, SAFARI_ZONE_CENTER + warp $0, $17, $6, SAFARI_ZONE_CENTER + warp $19, $9, $0, SAFARI_ZONE_REST_HOUSE_3 db $3 ; signs - db $a, $1a, $5 ; SafariZoneEastText5 - db $4, $6, $6 ; SafariZoneEastText6 - db $17, $5, $7 ; SafariZoneEastText7 + sign $1a, $a, $5 ; SafariZoneEastText5 + sign $6, $4, $6 ; SafariZoneEastText6 + sign $5, $17, $7 ; SafariZoneEastText7 db $4 ; objects object SPRITE_BALL, $15, $a, STAY, NONE, $1, FULL_RESTORE @@ -20,8 +20,8 @@ SafariZoneEastObject: object SPRITE_BALL, $f, $c, STAY, NONE, $4, TM_37 ; warp-to - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $5, $0 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $16, $0 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $17, $0 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $9, $19 ; SAFARI_ZONE_REST_HOUSE_3 + warp_to $0, $4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $0, $5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $0, $16, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $0, $17, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $19, $9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3 diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 9d26aa17..5154e8e0 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -2,10 +2,10 @@ SafariZoneEntranceObject: db $a ; border block db $4 ; warps - db $5, $3, $4, $ff - db $5, $4, $4, $ff - db $0, $3, $0, SAFARI_ZONE_CENTER - db $0, $4, $1, SAFARI_ZONE_CENTER + warp $3, $5, $4, $ff + warp $4, $5, $4, $ff + warp $3, $0, $0, SAFARI_ZONE_CENTER + warp $4, $0, $1, SAFARI_ZONE_CENTER db $0 ; signs @@ -14,7 +14,7 @@ SafariZoneEntranceObject: object SPRITE_WHITE_PLAYER, $1, $4, STAY, RIGHT, $2 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3 - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $4 - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $3 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $4 ; SAFARI_ZONE_CENTER + warp_to $3, $5, SAFARI_ZONE_ENTRANCE_WIDTH + warp_to $4, $5, SAFARI_ZONE_ENTRANCE_WIDTH + warp_to $3, $0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER + warp_to $4, $0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index d0305507..421cd4e2 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -2,34 +2,34 @@ SafariZoneNorthObject: db $0 ; border block db $9 ; warps - db $23, $2, $0, SAFARI_ZONE_WEST - db $23, $3, $1, SAFARI_ZONE_WEST - db $23, $8, $2, SAFARI_ZONE_WEST - db $23, $9, $3, SAFARI_ZONE_WEST - db $23, $14, $4, SAFARI_ZONE_CENTER - db $23, $15, $5, SAFARI_ZONE_CENTER - db $1e, $27, $0, SAFARI_ZONE_EAST - db $1f, $27, $1, SAFARI_ZONE_EAST - db $3, $23, $0, SAFARI_ZONE_REST_HOUSE_4 + warp $2, $23, $0, SAFARI_ZONE_WEST + warp $3, $23, $1, SAFARI_ZONE_WEST + warp $8, $23, $2, SAFARI_ZONE_WEST + warp $9, $23, $3, SAFARI_ZONE_WEST + warp $14, $23, $4, SAFARI_ZONE_CENTER + warp $15, $23, $5, SAFARI_ZONE_CENTER + warp $27, $1e, $0, SAFARI_ZONE_EAST + warp $27, $1f, $1, SAFARI_ZONE_EAST + warp $23, $3, $0, SAFARI_ZONE_REST_HOUSE_4 db $5 ; signs - db $4, $24, $3 ; SafariZoneNorthText3 - db $19, $4, $4 ; SafariZoneNorthText4 - db $1f, $d, $5 ; SafariZoneNorthText5 - db $21, $13, $6 ; SafariZoneNorthText6 - db $1c, $1a, $7 ; SafariZoneNorthText7 + sign $24, $4, $3 ; SafariZoneNorthText3 + sign $4, $19, $4 ; SafariZoneNorthText4 + sign $d, $1f, $5 ; SafariZoneNorthText5 + sign $13, $21, $6 ; SafariZoneNorthText6 + sign $1a, $1c, $7 ; SafariZoneNorthText7 db $2 ; objects object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40 ; warp-to - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $3 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $8 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $9 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $14 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $15 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1e, $27 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1f, $27 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4 + warp_to $2, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $8, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $9, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $14, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to $15, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to $27, $1e, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to $27, $1f, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to $23, $3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index 79156825..ded590c8 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $8, SAFARI_ZONE_CENTER - db $7, $3, $8, SAFARI_ZONE_CENTER + warp $2, $7, $8, SAFARI_ZONE_CENTER + warp $3, $7, $8, SAFARI_ZONE_CENTER db $0 ; signs @@ -12,5 +12,5 @@ SafariZoneRestHouse1Object: object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $3 ; SAFARI_ZONE_CENTER + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 82f04f9d..0532c505 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $7, SAFARI_ZONE_WEST - db $7, $3, $7, SAFARI_ZONE_WEST + warp $2, $7, $7, SAFARI_ZONE_WEST + warp $3, $7, $7, SAFARI_ZONE_WEST db $0 ; signs @@ -13,5 +13,5 @@ SafariZoneRestHouse2Object: object SPRITE_ERIKA, $6, $2, STAY, DOWN, $3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $3 ; SAFARI_ZONE_WEST + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index ae973fa8..a83e451a 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse3Object: db $a ; border block db $2 ; warps - db $7, $2, $4, SAFARI_ZONE_EAST - db $7, $3, $4, SAFARI_ZONE_EAST + warp $2, $7, $4, SAFARI_ZONE_EAST + warp $3, $7, $4, SAFARI_ZONE_EAST db $0 ; signs @@ -13,5 +13,5 @@ SafariZoneRestHouse3Object: object SPRITE_LAPRAS_GIVER, $5, $2, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $3 ; SAFARI_ZONE_EAST + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 7502732c..6db675ee 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse4Object: db $a ; border block db $2 ; warps - db $7, $2, $8, SAFARI_ZONE_NORTH - db $7, $3, $8, SAFARI_ZONE_NORTH + warp $2, $7, $8, SAFARI_ZONE_NORTH + warp $3, $7, $8, SAFARI_ZONE_NORTH db $0 ; signs @@ -13,5 +13,5 @@ SafariZoneRestHouse4Object: object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $3 ; SAFARI_ZONE_NORTH + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index a96115b8..dfefa02f 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -2,8 +2,8 @@ SafariZoneSecretHouseObject: db $17 ; border block db $2 ; warps - db $7, $2, $6, SAFARI_ZONE_WEST - db $7, $3, $6, SAFARI_ZONE_WEST + warp $2, $7, $6, SAFARI_ZONE_WEST + warp $3, $7, $6, SAFARI_ZONE_WEST db $0 ; signs @@ -11,5 +11,5 @@ SafariZoneSecretHouseObject: object SPRITE_FISHER, $3, $3, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $3 ; SAFARI_ZONE_WEST + warp_to $2, $7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 64ed0876..6a667fcc 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -2,20 +2,20 @@ SafariZoneWestObject: db $0 ; border block db $8 ; warps - db $0, $14, $0, SAFARI_ZONE_NORTH - db $0, $15, $1, SAFARI_ZONE_NORTH - db $0, $1a, $2, SAFARI_ZONE_NORTH - db $0, $1b, $3, SAFARI_ZONE_NORTH - db $16, $1d, $2, SAFARI_ZONE_CENTER - db $17, $1d, $3, SAFARI_ZONE_CENTER - db $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE - db $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2 + warp $14, $0, $0, SAFARI_ZONE_NORTH + warp $15, $0, $1, SAFARI_ZONE_NORTH + warp $1a, $0, $2, SAFARI_ZONE_NORTH + warp $1b, $0, $3, SAFARI_ZONE_NORTH + warp $1d, $16, $2, SAFARI_ZONE_CENTER + warp $1d, $17, $3, SAFARI_ZONE_CENTER + warp $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE + warp $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2 db $4 ; signs - db $c, $c, $5 ; SafariZoneWestText5 - db $3, $11, $6 ; SafariZoneWestText6 - db $4, $1a, $7 ; SafariZoneWestText7 - db $16, $18, $8 ; SafariZoneWestText8 + sign $c, $c, $5 ; SafariZoneWestText5 + sign $11, $3, $6 ; SafariZoneWestText6 + sign $1a, $4, $7 ; SafariZoneWestText7 + sign $18, $16, $8 ; SafariZoneWestText8 db $4 ; objects object SPRITE_BALL, $8, $14, STAY, NONE, $1, MAX_POTION @@ -24,11 +24,11 @@ SafariZoneWestObject: object SPRITE_BALL, $13, $7, STAY, NONE, $4, GOLD_TEETH ; warp-to - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $15 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1a ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1b ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $16, $1d ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $17, $1d ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $b, $b ; SAFARI_ZONE_REST_HOUSE_2 + warp_to $14, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $15, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1a, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1b, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1d, $16, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $1d, $17, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $3, $3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE + warp_to $b, $b, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 7275800a..6c1c9b14 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -2,26 +2,26 @@ SaffronCityObject: db $f ; border block db $8 ; warps - db $5, $7, $0, COPYCATS_HOUSE_1F - db $3, $1a, $0, FIGHTING_DOJO - db $3, $22, $0, SAFFRON_GYM - db $b, $d, $0, SAFFRON_HOUSE_1 - db $b, $19, $0, SAFFRON_MART - db $15, $12, $0, SILPH_CO_1F - db $1d, $9, $0, SAFFRON_POKECENTER - db $1d, $1d, $0, SAFFRON_HOUSE_2 + warp $7, $5, $0, COPYCATS_HOUSE_1F + warp $1a, $3, $0, FIGHTING_DOJO + warp $22, $3, $0, SAFFRON_GYM + warp $d, $b, $0, SAFFRON_HOUSE_1 + warp $19, $b, $0, SAFFRON_MART + warp $12, $15, $0, SILPH_CO_1F + warp $9, $1d, $0, SAFFRON_POKECENTER + warp $1d, $1d, $0, SAFFRON_HOUSE_2 db $a ; signs - db $5, $11, $10 ; SaffronCityText16 - db $5, $1b, $11 ; SaffronCityText17 - db $5, $23, $12 ; SaffronCityText18 - db $b, $1a, $13 ; MartSignText - db $13, $27, $14 ; SaffronCityText20 - db $15, $5, $15 ; SaffronCityText21 - db $15, $f, $16 ; SaffronCityText22 - db $1d, $a, $17 ; PokeCenterSignText - db $1d, $1b, $18 ; SaffronCityText24 - db $13, $1, $19 ; SaffronCityText25 + sign $11, $5, $10 ; SaffronCityText16 + sign $1b, $5, $11 ; SaffronCityText17 + sign $23, $5, $12 ; SaffronCityText18 + sign $1a, $b, $13 ; MartSignText + sign $27, $13, $14 ; SaffronCityText20 + sign $5, $15, $15 ; SaffronCityText21 + sign $f, $15, $16 ; SaffronCityText22 + sign $a, $1d, $17 ; PokeCenterSignText + sign $1b, $1d, $18 ; SaffronCityText24 + sign $1, $13, $19 ; SaffronCityText25 db $f ; objects object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person @@ -41,11 +41,11 @@ SaffronCityObject: object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to - EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $1a ; FIGHTING_DOJO - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $22 ; SAFFRON_GYM - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $d ; SAFFRON_HOUSE_1 - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $19 ; SAFFRON_MART - EVENT_DISP SAFFRON_CITY_WIDTH, $15, $12 ; SILPH_CO_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $9 ; SAFFRON_POKECENTER - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $1d ; SAFFRON_HOUSE_2 + warp_to $7, $5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F + warp_to $1a, $3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO + warp_to $22, $3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM + warp_to $d, $b, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 + warp_to $19, $b, SAFFRON_CITY_WIDTH ; SAFFRON_MART + warp_to $12, $15, SAFFRON_CITY_WIDTH ; SILPH_CO_1F + warp_to $9, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER + warp_to $1d, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 6a770fdc..95e44aa9 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -2,38 +2,38 @@ SaffronGymObject: db $2e ; border block db $20 ; warps - db $11, $8, $2, $ff - db $11, $9, $2, $ff - db $3, $1, $16, SAFFRON_GYM - db $3, $5, $f, SAFFRON_GYM - db $5, $1, $12, SAFFRON_GYM - db $5, $5, $8, SAFFRON_GYM - db $9, $1, $1b, SAFFRON_GYM - db $9, $5, $10, SAFFRON_GYM - db $b, $1, $5, SAFFRON_GYM - db $b, $5, $d, SAFFRON_GYM - db $f, $1, $17, SAFFRON_GYM - db $f, $5, $1e, SAFFRON_GYM - db $11, $1, $11, SAFFRON_GYM - db $11, $5, $9, SAFFRON_GYM - db $3, $9, $1a, SAFFRON_GYM - db $3, $b, $3, SAFFRON_GYM - db $5, $9, $7, SAFFRON_GYM - db $5, $b, $c, SAFFRON_GYM - db $b, $b, $4, SAFFRON_GYM - db $f, $b, $1f, SAFFRON_GYM - db $3, $f, $18, SAFFRON_GYM - db $3, $13, $1c, SAFFRON_GYM - db $5, $f, $2, SAFFRON_GYM - db $5, $13, $a, SAFFRON_GYM - db $9, $f, $14, SAFFRON_GYM - db $9, $13, $1d, SAFFRON_GYM - db $b, $f, $e, SAFFRON_GYM - db $b, $13, $6, SAFFRON_GYM - db $f, $f, $15, SAFFRON_GYM - db $f, $13, $19, SAFFRON_GYM - db $11, $f, $b, SAFFRON_GYM - db $11, $13, $13, SAFFRON_GYM + warp $8, $11, $2, $ff + warp $9, $11, $2, $ff + warp $1, $3, $16, SAFFRON_GYM + warp $5, $3, $f, SAFFRON_GYM + warp $1, $5, $12, SAFFRON_GYM + warp $5, $5, $8, SAFFRON_GYM + warp $1, $9, $1b, SAFFRON_GYM + warp $5, $9, $10, SAFFRON_GYM + warp $1, $b, $5, SAFFRON_GYM + warp $5, $b, $d, SAFFRON_GYM + warp $1, $f, $17, SAFFRON_GYM + warp $5, $f, $1e, SAFFRON_GYM + warp $1, $11, $11, SAFFRON_GYM + warp $5, $11, $9, SAFFRON_GYM + warp $9, $3, $1a, SAFFRON_GYM + warp $b, $3, $3, SAFFRON_GYM + warp $9, $5, $7, SAFFRON_GYM + warp $b, $5, $c, SAFFRON_GYM + warp $b, $b, $4, SAFFRON_GYM + warp $b, $f, $1f, SAFFRON_GYM + warp $f, $3, $18, SAFFRON_GYM + warp $13, $3, $1c, SAFFRON_GYM + warp $f, $5, $2, SAFFRON_GYM + warp $13, $5, $a, SAFFRON_GYM + warp $f, $9, $14, SAFFRON_GYM + warp $13, $9, $1d, SAFFRON_GYM + warp $f, $b, $e, SAFFRON_GYM + warp $13, $b, $6, SAFFRON_GYM + warp $f, $f, $15, SAFFRON_GYM + warp $13, $f, $19, SAFFRON_GYM + warp $f, $11, $b, SAFFRON_GYM + warp $13, $11, $13, SAFFRON_GYM db $0 ; signs @@ -49,35 +49,35 @@ SaffronGymObject: object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person ; warp-to - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8 - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $9 - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $9 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $9 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $13 ; SAFFRON_GYM + warp_to $8, $11, SAFFRON_GYM_WIDTH + warp_to $9, $11, SAFFRON_GYM_WIDTH + warp_to $1, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $9, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $9, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 9f6d7750..f7691f78 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -2,8 +2,8 @@ SaffronHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ SaffronHouse1Object: object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, SAFFRON_HOUSE_1_WIDTH + warp_to $3, $7, SAFFRON_HOUSE_1_WIDTH diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index e57bdbb7..d8f7cd4d 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -2,8 +2,8 @@ SaffronHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $7, $ff - db $7, $3, $7, $ff + warp $2, $7, $7, $ff + warp $3, $7, $7, $ff db $0 ; signs @@ -11,5 +11,5 @@ SaffronHouse2Object: object SPRITE_FISHER, $5, $3, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, SAFFRON_HOUSE_2_WIDTH + warp_to $3, $7, SAFFRON_HOUSE_2_WIDTH diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 113a1ea9..93c5aa2d 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -2,8 +2,8 @@ SaffronMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ SaffronMartObject: object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person ; warp-to - EVENT_DISP SAFFRON_MART_WIDTH, $7, $3 - EVENT_DISP SAFFRON_MART_WIDTH, $7, $4 + warp_to $3, $7, SAFFRON_MART_WIDTH + warp_to $4, $7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 896b550a..07230c0c 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -2,8 +2,8 @@ SaffronPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $6, $ff - db $7, $4, $6, $ff + warp $3, $7, $6, $ff + warp $4, $7, $6, $ff db $0 ; signs @@ -14,5 +14,5 @@ SaffronPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 - EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, SAFFRON_POKECENTER_WIDTH + warp_to $4, $7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 53f7fc00..4482776c 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -2,8 +2,8 @@ SchoolObject: db $a ; border block db $2 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff db $0 ; signs @@ -12,5 +12,5 @@ SchoolObject: object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 - EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $3 + warp_to $2, $7, VIRIDIAN_SCHOOL_WIDTH + warp_to $3, $7, VIRIDIAN_SCHOOL_WIDTH diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 4f7f7a8e..027c4abe 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -2,13 +2,13 @@ SeafoamIslands1Object: db $7d ; border block db $7 ; warps - db $11, $4, $0, $ff - db $11, $5, $0, $ff - db $11, $1a, $1, $ff - db $11, $1b, $1, $ff - db $5, $7, $1, SEAFOAM_ISLANDS_2 - db $3, $19, $6, SEAFOAM_ISLANDS_2 - db $f, $17, $4, SEAFOAM_ISLANDS_2 + warp $4, $11, $0, $ff + warp $5, $11, $0, $ff + warp $1a, $11, $1, $ff + warp $1b, $11, $1, $ff + warp $7, $5, $1, SEAFOAM_ISLANDS_2 + warp $19, $3, $6, SEAFOAM_ISLANDS_2 + warp $17, $f, $4, SEAFOAM_ISLANDS_2 db $0 ; signs @@ -17,14 +17,14 @@ SeafoamIslands1Object: object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $5 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1a - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1b - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2 + warp_to $4, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $5, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $1a, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $1b, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $7, $5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $19, $3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $17, $f, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 ; holes - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18 + warp_to $11, $6, SEAFOAM_ISLANDS_1_WIDTH + warp_to $18, $6, SEAFOAM_ISLANDS_1_WIDTH diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index d25e5375..e2cdc09a 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -2,13 +2,13 @@ SeafoamIslands2Object: db $7d ; border block db $7 ; warps - db $2, $4, $0, SEAFOAM_ISLANDS_3 - db $5, $7, $4, SEAFOAM_ISLANDS_1 - db $7, $d, $2, SEAFOAM_ISLANDS_3 - db $f, $13, $3, SEAFOAM_ISLANDS_3 - db $f, $17, $6, SEAFOAM_ISLANDS_1 - db $b, $19, $5, SEAFOAM_ISLANDS_3 - db $3, $19, $5, SEAFOAM_ISLANDS_1 + warp $4, $2, $0, SEAFOAM_ISLANDS_3 + warp $7, $5, $4, SEAFOAM_ISLANDS_1 + warp $d, $7, $2, SEAFOAM_ISLANDS_3 + warp $13, $f, $3, SEAFOAM_ISLANDS_3 + warp $17, $f, $6, SEAFOAM_ISLANDS_1 + warp $19, $b, $5, SEAFOAM_ISLANDS_3 + warp $19, $3, $5, SEAFOAM_ISLANDS_1 db $0 ; signs @@ -17,10 +17,10 @@ SeafoamIslands2Object: object SPRITE_BOULDER, $16, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_1 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $7, $d ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_1 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_1 + warp_to $4, $2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $7, $5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to $d, $7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $13, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $17, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to $19, $b, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $19, $3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index a660f2ed..087cba58 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -2,13 +2,13 @@ SeafoamIslands3Object: db $7d ; border block db $7 ; warps - db $3, $5, $0, SEAFOAM_ISLANDS_2 - db $d, $5, $0, SEAFOAM_ISLANDS_4 - db $7, $d, $2, SEAFOAM_ISLANDS_2 - db $f, $13, $3, SEAFOAM_ISLANDS_2 - db $3, $19, $3, SEAFOAM_ISLANDS_4 - db $b, $19, $5, SEAFOAM_ISLANDS_2 - db $e, $19, $4, SEAFOAM_ISLANDS_4 + warp $5, $3, $0, SEAFOAM_ISLANDS_2 + warp $5, $d, $0, SEAFOAM_ISLANDS_4 + warp $d, $7, $2, SEAFOAM_ISLANDS_2 + warp $13, $f, $3, SEAFOAM_ISLANDS_2 + warp $19, $3, $3, SEAFOAM_ISLANDS_4 + warp $19, $b, $5, SEAFOAM_ISLANDS_2 + warp $19, $e, $4, SEAFOAM_ISLANDS_4 db $0 ; signs @@ -17,10 +17,10 @@ SeafoamIslands3Object: object SPRITE_BOULDER, $17, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $d, $5 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $7, $d ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_4 + warp_to $5, $3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $5, $d, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $d, $7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $13, $f, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $19, $3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $19, $b, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $19, $e, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index c7043a93..06b2fb78 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -2,13 +2,13 @@ SeafoamIslands4Object: db $7d ; border block db $7 ; warps - db $c, $5, $1, SEAFOAM_ISLANDS_3 - db $6, $8, $2, SEAFOAM_ISLANDS_5 - db $4, $19, $3, SEAFOAM_ISLANDS_5 - db $3, $19, $4, SEAFOAM_ISLANDS_3 - db $e, $19, $6, SEAFOAM_ISLANDS_3 - db $11, $14, $0, SEAFOAM_ISLANDS_5 - db $11, $15, $1, SEAFOAM_ISLANDS_5 + warp $5, $c, $1, SEAFOAM_ISLANDS_3 + warp $8, $6, $2, SEAFOAM_ISLANDS_5 + warp $19, $4, $3, SEAFOAM_ISLANDS_5 + warp $19, $3, $4, SEAFOAM_ISLANDS_3 + warp $19, $e, $6, SEAFOAM_ISLANDS_3 + warp $14, $11, $0, SEAFOAM_ISLANDS_5 + warp $15, $11, $1, SEAFOAM_ISLANDS_5 db $0 ; signs @@ -21,10 +21,10 @@ SeafoamIslands4Object: object SPRITE_BOULDER, $13, $6, STAY, NONE, $6 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $6, $8 ; SEAFOAM_ISLANDS_5 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_5 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_5 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_5 + warp_to $5, $c, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $8, $6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to $19, $4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to $19, $3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $19, $e, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $14, $11, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to $15, $11, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index a05c00cc..dd2d77f0 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -2,14 +2,14 @@ SeafoamIslands5Object: db $7d ; border block db $4 ; warps - db $11, $14, $5, SEAFOAM_ISLANDS_4 - db $11, $15, $6, SEAFOAM_ISLANDS_4 - db $7, $b, $1, SEAFOAM_ISLANDS_4 - db $4, $19, $2, SEAFOAM_ISLANDS_4 + warp $14, $11, $5, SEAFOAM_ISLANDS_4 + warp $15, $11, $6, SEAFOAM_ISLANDS_4 + warp $b, $7, $1, SEAFOAM_ISLANDS_4 + warp $19, $4, $2, SEAFOAM_ISLANDS_4 db $2 ; signs - db $f, $9, $4 ; SeafoamIslands5Text4 - db $1, $17, $5 ; SeafoamIslands5Text5 + sign $9, $f, $4 ; SeafoamIslands5Text4 + sign $17, $1, $5 ; SeafoamIslands5Text5 db $3 ; objects object SPRITE_BOULDER, $4, $f, STAY, NONE, $1 ; person @@ -17,7 +17,7 @@ SeafoamIslands5Object: object SPRITE_BIRD, $6, $1, STAY, DOWN, $3, ARTICUNO, 50 ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $7, $b ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_4 + warp_to $14, $11, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $15, $11, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $b, $7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $19, $4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index fe779393..0ef17156 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -2,11 +2,11 @@ SilphCo1Object: db $2e ; border block db $5 ; warps - db $11, $a, $5, $ff - db $11, $b, $5, $ff - db $0, $1a, $0, SILPH_CO_2F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $a, $10, $6, SILPH_CO_3F + warp $a, $11, $5, $ff + warp $b, $11, $5, $ff + warp $1a, $0, $0, SILPH_CO_2F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $10, $a, $6, SILPH_CO_3F db $0 ; signs @@ -14,8 +14,8 @@ SilphCo1Object: object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a - EVENT_DISP SILPH_CO_1F_WIDTH, $11, $b - EVENT_DISP SILPH_CO_1F_WIDTH, $0, $1a ; SILPH_CO_2F - EVENT_DISP SILPH_CO_1F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_1F_WIDTH, $a, $10 ; SILPH_CO_3F + warp_to $a, $11, SILPH_CO_1F_WIDTH + warp_to $b, $11, SILPH_CO_1F_WIDTH + warp_to $1a, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F + warp_to $14, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $10, $a, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index 185a23c9..d2ddd338 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -2,12 +2,12 @@ SilphCo10Object: db $2e ; border block db $6 ; warps - db $0, $8, $0, SILPH_CO_9F - db $0, $a, $0, SILPH_CO_11F - db $0, $c, $0, SILPH_CO_ELEVATOR - db $b, $9, $3, SILPH_CO_4F - db $f, $d, $5, SILPH_CO_4F - db $7, $d, $6, SILPH_CO_4F + warp $8, $0, $0, SILPH_CO_9F + warp $a, $0, $0, SILPH_CO_11F + warp $c, $0, $0, SILPH_CO_ELEVATOR + warp $9, $b, $3, SILPH_CO_4F + warp $d, $f, $5, SILPH_CO_4F + warp $d, $7, $6, SILPH_CO_4F db $0 ; signs @@ -20,9 +20,9 @@ SilphCo10Object: object SPRITE_BALL, $5, $b, STAY, NONE, $6, CARBOS ; warp-to - EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_10F_WIDTH, $0, $a ; SILPH_CO_11F - EVENT_DISP SILPH_CO_10F_WIDTH, $0, $c ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_10F_WIDTH, $b, $9 ; SILPH_CO_4F - EVENT_DISP SILPH_CO_10F_WIDTH, $f, $d ; SILPH_CO_4F - EVENT_DISP SILPH_CO_10F_WIDTH, $7, $d ; SILPH_CO_4F + warp_to $8, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F + warp_to $a, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F + warp_to $c, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $9, $b, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to $d, $f, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to $d, $7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 95712629..da97ef89 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -2,10 +2,10 @@ SilphCo11Object: db $d ; border block db $4 ; warps - db $0, $9, $1, SILPH_CO_10F - db $0, $d, $0, SILPH_CO_ELEVATOR - db $5, $5, $9, $ff - db $2, $3, $3, SILPH_CO_7F + warp $9, $0, $1, SILPH_CO_10F + warp $d, $0, $0, SILPH_CO_ELEVATOR + warp $5, $5, $9, $ff + warp $3, $2, $3, SILPH_CO_7F db $0 ; signs @@ -17,7 +17,7 @@ SilphCo11Object: object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 ; warp-to - EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F - EVENT_DISP SILPH_CO_11F_WIDTH, $0, $d ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_11F_WIDTH, $5, $5 - EVENT_DISP SILPH_CO_11F_WIDTH, $2, $3 ; SILPH_CO_7F + warp_to $9, $0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F + warp_to $d, $0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $5, $5, SILPH_CO_11F_WIDTH + warp_to $3, $2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index ae3aca74..98a50355 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -2,13 +2,13 @@ SilphCo2Object: db $2e ; border block db $7 ; warps - db $0, $18, $2, SILPH_CO_1F - db $0, $1a, $0, SILPH_CO_3F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $3, $3, $6, SILPH_CO_3F - db $3, $d, $4, SILPH_CO_8F - db $f, $1b, $5, SILPH_CO_8F - db $f, $9, $4, SILPH_CO_6F + warp $18, $0, $2, SILPH_CO_1F + warp $1a, $0, $0, SILPH_CO_3F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $3, $3, $6, SILPH_CO_3F + warp $d, $3, $4, SILPH_CO_8F + warp $1b, $f, $5, SILPH_CO_8F + warp $9, $f, $4, SILPH_CO_6F db $0 ; signs @@ -20,10 +20,10 @@ SilphCo2Object: object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 ; warp-to - EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F - EVENT_DISP SILPH_CO_2F_WIDTH, $0, $1a ; SILPH_CO_3F - EVENT_DISP SILPH_CO_2F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_2F_WIDTH, $3, $3 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_2F_WIDTH, $3, $d ; SILPH_CO_8F - EVENT_DISP SILPH_CO_2F_WIDTH, $f, $1b ; SILPH_CO_8F - EVENT_DISP SILPH_CO_2F_WIDTH, $f, $9 ; SILPH_CO_6F + warp_to $18, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F + warp_to $1a, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to $14, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $3, $3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to $d, $3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to $1b, $f, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to $9, $f, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index ddea9062..d04e74c7 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -2,16 +2,16 @@ SilphCo3Object: db $2e ; border block db $a ; warps - db $0, $1a, $1, SILPH_CO_2F - db $0, $18, $0, SILPH_CO_4F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $b, $17, $9, SILPH_CO_3F - db $3, $3, $5, SILPH_CO_5F - db $f, $3, $6, SILPH_CO_5F - db $3, $1b, $3, SILPH_CO_2F - db $b, $3, $3, SILPH_CO_9F - db $b, $b, $4, SILPH_CO_7F - db $f, $1b, $3, SILPH_CO_3F + warp $1a, $0, $1, SILPH_CO_2F + warp $18, $0, $0, SILPH_CO_4F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $17, $b, $9, SILPH_CO_3F + warp $3, $3, $5, SILPH_CO_5F + warp $3, $f, $6, SILPH_CO_5F + warp $1b, $3, $3, SILPH_CO_2F + warp $3, $b, $3, SILPH_CO_9F + warp $b, $b, $4, SILPH_CO_7F + warp $1b, $f, $3, SILPH_CO_3F db $0 ; signs @@ -22,13 +22,13 @@ SilphCo3Object: object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION ; warp-to - EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F - EVENT_DISP SILPH_CO_3F_WIDTH, $0, $18 ; SILPH_CO_4F - EVENT_DISP SILPH_CO_3F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_3F_WIDTH, $b, $17 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_3F_WIDTH, $3, $3 ; SILPH_CO_5F - EVENT_DISP SILPH_CO_3F_WIDTH, $f, $3 ; SILPH_CO_5F - EVENT_DISP SILPH_CO_3F_WIDTH, $3, $1b ; SILPH_CO_2F - EVENT_DISP SILPH_CO_3F_WIDTH, $b, $3 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_3F_WIDTH, $b, $b ; SILPH_CO_7F - EVENT_DISP SILPH_CO_3F_WIDTH, $f, $1b ; SILPH_CO_3F + warp_to $1a, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to $18, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F + warp_to $14, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $17, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_3F + warp_to $3, $3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to $3, $f, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to $1b, $3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to $3, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_9F + warp_to $b, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_7F + warp_to $1b, $f, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index a2320112..66443046 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -2,13 +2,13 @@ SilphCo4Object: db $2e ; border block db $7 ; warps - db $0, $18, $1, SILPH_CO_3F - db $0, $1a, $1, SILPH_CO_5F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $7, $b, $3, SILPH_CO_10F - db $3, $11, $3, SILPH_CO_6F - db $f, $3, $4, SILPH_CO_10F - db $b, $11, $5, SILPH_CO_10F + warp $18, $0, $1, SILPH_CO_3F + warp $1a, $0, $1, SILPH_CO_5F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $b, $7, $3, SILPH_CO_10F + warp $11, $3, $3, SILPH_CO_6F + warp $3, $f, $4, SILPH_CO_10F + warp $11, $b, $5, SILPH_CO_10F db $0 ; signs @@ -22,10 +22,10 @@ SilphCo4Object: object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE ; warp-to - EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_4F_WIDTH, $0, $1a ; SILPH_CO_5F - EVENT_DISP SILPH_CO_4F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_4F_WIDTH, $7, $b ; SILPH_CO_10F - EVENT_DISP SILPH_CO_4F_WIDTH, $3, $11 ; SILPH_CO_6F - EVENT_DISP SILPH_CO_4F_WIDTH, $f, $3 ; SILPH_CO_10F - EVENT_DISP SILPH_CO_4F_WIDTH, $b, $11 ; SILPH_CO_10F + warp_to $18, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F + warp_to $1a, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F + warp_to $14, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $b, $7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to $11, $3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F + warp_to $3, $f, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to $11, $b, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 62e30fac..0063b94c 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -2,13 +2,13 @@ SilphCo5Object: db $2e ; border block db $7 ; warps - db $0, $18, $1, SILPH_CO_6F - db $0, $1a, $1, SILPH_CO_4F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $3, $1b, $5, SILPH_CO_7F - db $f, $9, $4, SILPH_CO_9F - db $5, $b, $4, SILPH_CO_3F - db $f, $3, $5, SILPH_CO_3F + warp $18, $0, $1, SILPH_CO_6F + warp $1a, $0, $1, SILPH_CO_4F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $1b, $3, $5, SILPH_CO_7F + warp $9, $f, $4, SILPH_CO_9F + warp $b, $5, $4, SILPH_CO_3F + warp $3, $f, $5, SILPH_CO_3F db $0 ; signs @@ -26,10 +26,10 @@ SilphCo5Object: object SPRITE_CLIPBOARD, $18, $6, STAY, NONE, $b ; person ; warp-to - EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F - EVENT_DISP SILPH_CO_5F_WIDTH, $0, $1a ; SILPH_CO_4F - EVENT_DISP SILPH_CO_5F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_5F_WIDTH, $3, $1b ; SILPH_CO_7F - EVENT_DISP SILPH_CO_5F_WIDTH, $f, $9 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_5F_WIDTH, $5, $b ; SILPH_CO_3F - EVENT_DISP SILPH_CO_5F_WIDTH, $f, $3 ; SILPH_CO_3F + warp_to $18, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F + warp_to $1a, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F + warp_to $14, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $1b, $3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F + warp_to $9, $f, SILPH_CO_5F_WIDTH ; SILPH_CO_9F + warp_to $b, $5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F + warp_to $3, $f, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index 19d66e50..9409a4b5 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -2,11 +2,11 @@ SilphCo6Object: db $2e ; border block db $5 ; warps - db $0, $10, $1, SILPH_CO_7F - db $0, $e, $0, SILPH_CO_5F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $3, $3, $4, SILPH_CO_4F - db $3, $17, $6, SILPH_CO_2F + warp $10, $0, $1, SILPH_CO_7F + warp $e, $0, $0, SILPH_CO_5F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $3, $3, $4, SILPH_CO_4F + warp $17, $3, $6, SILPH_CO_2F db $0 ; signs @@ -23,8 +23,8 @@ SilphCo6Object: object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY ; warp-to - EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F - EVENT_DISP SILPH_CO_6F_WIDTH, $0, $e ; SILPH_CO_5F - EVENT_DISP SILPH_CO_6F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_6F_WIDTH, $3, $3 ; SILPH_CO_4F - EVENT_DISP SILPH_CO_6F_WIDTH, $3, $17 ; SILPH_CO_2F + warp_to $10, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F + warp_to $e, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F + warp_to $12, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $3, $3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F + warp_to $17, $3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index 47e881fe..1eb12713 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -2,12 +2,12 @@ SilphCo7Object: db $2e ; border block db $6 ; warps - db $0, $10, $1, SILPH_CO_8F - db $0, $16, $0, SILPH_CO_6F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $7, $5, $3, SILPH_CO_11F - db $3, $5, $8, SILPH_CO_3F - db $f, $15, $3, SILPH_CO_5F + warp $10, $0, $1, SILPH_CO_8F + warp $16, $0, $0, SILPH_CO_6F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $5, $7, $3, SILPH_CO_11F + warp $5, $3, $8, SILPH_CO_3F + warp $15, $f, $3, SILPH_CO_5F db $0 ; signs @@ -25,9 +25,9 @@ SilphCo7Object: object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 ; warp-to - EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F - EVENT_DISP SILPH_CO_7F_WIDTH, $0, $16 ; SILPH_CO_6F - EVENT_DISP SILPH_CO_7F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_7F_WIDTH, $7, $5 ; SILPH_CO_11F - EVENT_DISP SILPH_CO_7F_WIDTH, $3, $5 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_7F_WIDTH, $f, $15 ; SILPH_CO_5F + warp_to $10, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F + warp_to $16, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F + warp_to $12, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $5, $7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F + warp_to $5, $3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F + warp_to $15, $f, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 188b27b6..5574e18e 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -2,13 +2,13 @@ SilphCo8Object: db $2e ; border block db $7 ; warps - db $0, $10, $1, SILPH_CO_9F - db $0, $e, $0, SILPH_CO_7F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $b, $3, $6, SILPH_CO_8F - db $f, $3, $4, SILPH_CO_2F - db $5, $b, $5, SILPH_CO_2F - db $9, $b, $3, SILPH_CO_8F + warp $10, $0, $1, SILPH_CO_9F + warp $e, $0, $0, SILPH_CO_7F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $3, $b, $6, SILPH_CO_8F + warp $3, $f, $4, SILPH_CO_2F + warp $b, $5, $5, SILPH_CO_2F + warp $b, $9, $3, SILPH_CO_8F db $0 ; signs @@ -19,10 +19,10 @@ SilphCo8Object: object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 ; warp-to - EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_8F_WIDTH, $0, $e ; SILPH_CO_7F - EVENT_DISP SILPH_CO_8F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_8F_WIDTH, $b, $3 ; SILPH_CO_8F - EVENT_DISP SILPH_CO_8F_WIDTH, $f, $3 ; SILPH_CO_2F - EVENT_DISP SILPH_CO_8F_WIDTH, $5, $b ; SILPH_CO_2F - EVENT_DISP SILPH_CO_8F_WIDTH, $9, $b ; SILPH_CO_8F_WIDTH + warp_to $10, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F + warp_to $e, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F + warp_to $12, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $3, $b, SILPH_CO_8F_WIDTH ; SILPH_CO_8F + warp_to $3, $f, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to $b, $5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to $b, $9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 76d82895..1a89997f 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -2,11 +2,11 @@ SilphCo9Object: db $2e ; border block db $5 ; warps - db $0, $e, $0, SILPH_CO_10F - db $0, $10, $0, SILPH_CO_8F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $3, $9, $7, SILPH_CO_3F - db $f, $11, $4, SILPH_CO_5F + warp $e, $0, $0, SILPH_CO_10F + warp $10, $0, $0, SILPH_CO_8F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $9, $3, $7, SILPH_CO_3F + warp $11, $f, $4, SILPH_CO_5F db $0 ; signs @@ -17,8 +17,8 @@ SilphCo9Object: object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to - EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F - EVENT_DISP SILPH_CO_9F_WIDTH, $0, $10 ; SILPH_CO_8F - EVENT_DISP SILPH_CO_9F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_9F_WIDTH, $3, $9 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_9F_WIDTH, $f, $11 ; SILPH_CO_5F + warp_to $e, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F + warp_to $10, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F + warp_to $12, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $9, $3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F + warp_to $11, $f, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index 2de795ae..13a13739 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -2,14 +2,14 @@ SilphCoElevatorObject: db $f ; border block db $2 ; warps - db $3, $1, $0, $ed - db $3, $2, $0, $ed + warp $1, $3, $0, $ed + warp $2, $3, $0, $ed db $1 ; signs - db $0, $3, $1 ; SilphCoElevatorText1 + sign $3, $0, $1 ; SilphCoElevatorText1 db $0 ; objects ; warp-to - EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $1 - EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $2 + warp_to $1, $3, SILPH_CO_ELEVATOR_WIDTH + warp_to $2, $3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index 7f6a826c..c3f96ef4 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -2,17 +2,17 @@ SSAnne1Object: db $c ; border block db $b ; warps - db $0, $1a, $1, VERMILION_DOCK - db $0, $1b, $1, VERMILION_DOCK - db $8, $1f, $0, SS_ANNE_8 - db $8, $17, $1, SS_ANNE_8 - db $8, $13, $2, SS_ANNE_8 - db $8, $f, $3, SS_ANNE_8 - db $8, $b, $4, SS_ANNE_8 - db $8, $7, $5, SS_ANNE_8 - db $6, $2, $6, SS_ANNE_2 - db $f, $25, $5, SS_ANNE_4 - db $10, $3, $0, SS_ANNE_6 + warp $1a, $0, $1, VERMILION_DOCK + warp $1b, $0, $1, VERMILION_DOCK + warp $1f, $8, $0, SS_ANNE_8 + warp $17, $8, $1, SS_ANNE_8 + warp $13, $8, $2, SS_ANNE_8 + warp $f, $8, $3, SS_ANNE_8 + warp $b, $8, $4, SS_ANNE_8 + warp $7, $8, $5, SS_ANNE_8 + warp $2, $6, $6, SS_ANNE_2 + warp $25, $f, $5, SS_ANNE_4 + warp $3, $10, $0, SS_ANNE_6 db $0 ; signs @@ -21,14 +21,14 @@ SSAnne1Object: object SPRITE_SAILOR, $1b, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK - EVENT_DISP SS_ANNE_1_WIDTH, $0, $1b ; VERMILION_DOCK - EVENT_DISP SS_ANNE_1_WIDTH, $8, $1f ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $17 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $13 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $f ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $b ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $7 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $6, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_1_WIDTH, $f, $25 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_1_WIDTH, $10, $3 ; SS_ANNE_6 + warp_to $1a, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to $1b, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to $1f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $17, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $13, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $b, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $7, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $2, $6, SS_ANNE_1_WIDTH ; SS_ANNE_2 + warp_to $25, $f, SS_ANNE_1_WIDTH ; SS_ANNE_4 + warp_to $3, $10, SS_ANNE_1_WIDTH ; SS_ANNE_6 diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index a8f49cf7..a281316c 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -2,16 +2,16 @@ SSAnne10Object: db $c ; border block db $a ; warps - db $5, $2, $4, SS_ANNE_4 - db $5, $3, $4, SS_ANNE_4 - db $5, $c, $3, SS_ANNE_4 - db $5, $d, $3, SS_ANNE_4 - db $5, $16, $2, SS_ANNE_4 - db $5, $17, $2, SS_ANNE_4 - db $f, $2, $1, SS_ANNE_4 - db $f, $3, $1, SS_ANNE_4 - db $f, $c, $0, SS_ANNE_4 - db $f, $d, $0, SS_ANNE_4 + warp $2, $5, $4, SS_ANNE_4 + warp $3, $5, $4, SS_ANNE_4 + warp $c, $5, $3, SS_ANNE_4 + warp $d, $5, $3, SS_ANNE_4 + warp $16, $5, $2, SS_ANNE_4 + warp $17, $5, $2, SS_ANNE_4 + warp $2, $f, $1, SS_ANNE_4 + warp $3, $f, $1, SS_ANNE_4 + warp $c, $f, $0, SS_ANNE_4 + warp $d, $f, $0, SS_ANNE_4 db $0 ; signs @@ -29,13 +29,13 @@ SSAnne10Object: object SPRITE_BALL, $c, $b, STAY, NONE, $b, MAX_POTION ; warp-to - EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $3 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $c ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $d ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $16 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $17 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $2 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $3 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $c ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $d ; SS_ANNE_4 + warp_to $2, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $3, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $c, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $d, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $16, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $17, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $2, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $3, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $c, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $d, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index eb761685..208cf88c 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -2,15 +2,15 @@ SSAnne2Object: db $c ; border block db $9 ; warps - db $b, $9, $0, SS_ANNE_9 - db $b, $d, $2, SS_ANNE_9 - db $b, $11, $4, SS_ANNE_9 - db $b, $15, $6, SS_ANNE_9 - db $b, $19, $8, SS_ANNE_9 - db $b, $1d, $a, SS_ANNE_9 - db $4, $2, $8, SS_ANNE_1 - db $c, $2, $1, SS_ANNE_3 - db $4, $24, $0, SS_ANNE_7 + warp $9, $b, $0, SS_ANNE_9 + warp $d, $b, $2, SS_ANNE_9 + warp $11, $b, $4, SS_ANNE_9 + warp $15, $b, $6, SS_ANNE_9 + warp $19, $b, $8, SS_ANNE_9 + warp $1d, $b, $a, SS_ANNE_9 + warp $2, $4, $8, SS_ANNE_1 + warp $2, $c, $1, SS_ANNE_3 + warp $24, $4, $0, SS_ANNE_7 db $0 ; signs @@ -19,12 +19,12 @@ SSAnne2Object: object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, OPP_SONY1, $1 ; warp-to - EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $d ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $11 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $15 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $19 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $1d ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $4, $2 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_2_WIDTH, $c, $2 ; SS_ANNE_3 - EVENT_DISP SS_ANNE_2_WIDTH, $4, $24 ; SS_ANNE_7 + warp_to $9, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $d, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $11, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $15, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $19, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $1d, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $2, $4, SS_ANNE_2_WIDTH ; SS_ANNE_1 + warp_to $2, $c, SS_ANNE_2_WIDTH ; SS_ANNE_3 + warp_to $24, $4, SS_ANNE_2_WIDTH ; SS_ANNE_7 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 567f0363..f431fe46 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -2,8 +2,8 @@ SSAnne3Object: db $c ; border block db $2 ; warps - db $3, $0, $0, SS_ANNE_5 - db $3, $13, $7, SS_ANNE_2 + warp $0, $3, $0, SS_ANNE_5 + warp $13, $3, $7, SS_ANNE_2 db $0 ; signs @@ -11,5 +11,5 @@ SSAnne3Object: object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person ; warp-to - EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5 - EVENT_DISP SS_ANNE_3_WIDTH, $3, $13 ; SS_ANNE_2 + warp_to $0, $3, SS_ANNE_3_WIDTH ; SS_ANNE_5 + warp_to $13, $3, SS_ANNE_3_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index fbd1df5b..d1e72162 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -2,21 +2,21 @@ SSAnne4Object: db $c ; border block db $6 ; warps - db $3, $17, $8, SS_ANNE_10 - db $3, $13, $6, SS_ANNE_10 - db $3, $f, $4, SS_ANNE_10 - db $3, $b, $2, SS_ANNE_10 - db $3, $7, $0, SS_ANNE_10 - db $5, $1b, $9, SS_ANNE_1 + warp $17, $3, $8, SS_ANNE_10 + warp $13, $3, $6, SS_ANNE_10 + warp $f, $3, $4, SS_ANNE_10 + warp $b, $3, $2, SS_ANNE_10 + warp $7, $3, $0, SS_ANNE_10 + warp $1b, $5, $9, SS_ANNE_1 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $13 ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $f ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $b ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $7 ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $5, $1b ; SS_ANNE_1 + warp_to $17, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $13, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $f, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $b, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $7, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $1b, $5, SS_ANNE_4_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 6031327e..44816883 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -2,8 +2,8 @@ SSAnne5Object: db $23 ; border block db $2 ; warps - db $6, $d, $0, SS_ANNE_3 - db $7, $d, $0, SS_ANNE_3 + warp $d, $6, $0, SS_ANNE_3 + warp $d, $7, $0, SS_ANNE_3 db $0 ; signs @@ -15,5 +15,5 @@ SSAnne5Object: object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2 ; warp-to - EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 - EVENT_DISP SS_ANNE_5_WIDTH, $7, $d ; SS_ANNE_3 + warp_to $d, $6, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to $d, $7, SS_ANNE_5_WIDTH ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 8c2444f8..25568e99 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -2,7 +2,7 @@ SSAnne6Object: db $c ; border block db $1 ; warps - db $0, $6, $a, SS_ANNE_1 + warp $6, $0, $a, SS_ANNE_1 db $0 ; signs @@ -16,4 +16,4 @@ SSAnne6Object: object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person ; warp-to - EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 + warp_to $6, $0, SS_ANNE_6_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 6002e85b..8e9c9194 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -2,14 +2,14 @@ SSAnne7Object: db $c ; border block db $1 ; warps - db $7, $0, $8, SS_ANNE_2 + warp $0, $7, $8, SS_ANNE_2 db $2 ; signs - db $1, $4, $2 ; SSAnne7Text2 - db $2, $1, $3 ; SSAnne7Text3 + sign $4, $1, $2 ; SSAnne7Text2 + sign $1, $2, $3 ; SSAnne7Text3 db $1 ; objects object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person ; warp-to - EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2 + warp_to $0, $7, SS_ANNE_7_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 37c8cf61..b298f179 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -2,12 +2,12 @@ SSAnne8Object: db $c ; border block db $6 ; warps - db $0, $0, $2, SS_ANNE_1 - db $0, $a, $3, SS_ANNE_1 - db $0, $14, $4, SS_ANNE_1 - db $a, $0, $5, SS_ANNE_1 - db $a, $a, $6, SS_ANNE_1 - db $a, $14, $7, SS_ANNE_1 + warp $0, $0, $2, SS_ANNE_1 + warp $a, $0, $3, SS_ANNE_1 + warp $14, $0, $4, SS_ANNE_1 + warp $0, $a, $5, SS_ANNE_1 + warp $a, $a, $6, SS_ANNE_1 + warp $14, $a, $7, SS_ANNE_1 db $0 ; signs @@ -25,9 +25,9 @@ SSAnne8Object: object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person ; warp-to - EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $0, $a ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $0, $14 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $a, $0 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $a, $a ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $a, $14 ; SS_ANNE_1 + warp_to $0, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $a, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $14, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $0, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $a, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $14, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 6b5e4b7d..c3cc9e6a 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -2,18 +2,18 @@ SSAnne9Object: db $c ; border block db $c ; warps - db $5, $2, $0, SS_ANNE_2 - db $5, $3, $0, SS_ANNE_2 - db $5, $c, $1, SS_ANNE_2 - db $5, $d, $1, SS_ANNE_2 - db $5, $16, $2, SS_ANNE_2 - db $5, $17, $2, SS_ANNE_2 - db $f, $2, $3, SS_ANNE_2 - db $f, $3, $3, SS_ANNE_2 - db $f, $c, $4, SS_ANNE_2 - db $f, $d, $4, SS_ANNE_2 - db $f, $16, $5, SS_ANNE_2 - db $f, $17, $5, SS_ANNE_2 + warp $2, $5, $0, SS_ANNE_2 + warp $3, $5, $0, SS_ANNE_2 + warp $c, $5, $1, SS_ANNE_2 + warp $d, $5, $1, SS_ANNE_2 + warp $16, $5, $2, SS_ANNE_2 + warp $17, $5, $2, SS_ANNE_2 + warp $2, $f, $3, SS_ANNE_2 + warp $3, $f, $3, SS_ANNE_2 + warp $c, $f, $4, SS_ANNE_2 + warp $d, $f, $4, SS_ANNE_2 + warp $16, $f, $5, SS_ANNE_2 + warp $17, $f, $5, SS_ANNE_2 db $0 ; signs @@ -33,15 +33,15 @@ SSAnne9Object: object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person ; warp-to - EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $3 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $c ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $d ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $16 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $17 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $3 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $c ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $d ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $16 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $17 ; SS_ANNE_2 + warp_to $2, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $3, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $c, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $d, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $16, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $17, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $2, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $3, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $c, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $d, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $16, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $17, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index 14d7232e..1c63b2e7 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute5Object: db $a ; border block db $3 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff - db $4, $4, $0, UNDERGROUND_PATH_NS + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff + warp $4, $4, $0, UNDERGROUND_PATH_NS db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute5Object: object SPRITE_LITTLE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS + warp_to $3, $7, PATH_ENTRANCE_ROUTE_5_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_5_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 7bce8774..41e375b0 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute6Object: db $a ; border block db $3 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff - db $4, $4, $1, UNDERGROUND_PATH_NS + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff + warp $4, $4, $1, UNDERGROUND_PATH_NS db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute6Object: object SPRITE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS + warp_to $3, $7, PATH_ENTRANCE_ROUTE_6_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_6_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 51b4bcda..29f971d0 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute7Object: db $a ; border block db $3 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff - db $4, $4, $0, UNDERGROUND_PATH_WE + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff + warp $4, $4, $0, UNDERGROUND_PATH_WE db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute7Object: object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE + warp_to $3, $7, PATH_ENTRANCE_ROUTE_7_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_7_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 04a5bf2f..7d595d5f 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute7CopyObject: db $a ; border block db $3 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff - db $4, $4, $0, UNDERGROUND_PATH_WE + warp $3, $7, $5, $ff + warp $4, $7, $5, $ff + warp $4, $4, $0, UNDERGROUND_PATH_WE db $0 ; signs @@ -13,6 +13,6 @@ UndergroundPathEntranceRoute7CopyObject: object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE + warp_to $3, $7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 9e98c987..84548b8c 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute8Object: db $a ; border block db $3 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff - db $4, $4, $1, UNDERGROUND_PATH_WE + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff + warp $4, $4, $1, UNDERGROUND_PATH_WE db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute8Object: object SPRITE_GIRL, $3, $4, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE + warp_to $3, $7, PATH_ENTRANCE_ROUTE_8_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_8_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index d0188a76..4fcb2feb 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -2,13 +2,13 @@ UndergroundPathNSObject: db $1 ; border block db $2 ; warps - db $4, $5, $2, PATH_ENTRANCE_ROUTE_5 - db $29, $2, $2, PATH_ENTRANCE_ROUTE_6 + warp $5, $4, $2, PATH_ENTRANCE_ROUTE_5 + warp $2, $29, $2, PATH_ENTRANCE_ROUTE_6 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $4, $5 ; PATH_ENTRANCE_ROUTE_5 - EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $29, $2 ; PATH_ENTRANCE_ROUTE_6 + warp_to $5, $4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to $2, $29, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index 42bbb9bf..292db488 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -2,13 +2,13 @@ UndergroundPathWEObject: db $1 ; border block db $2 ; warps - db $5, $2, $2, PATH_ENTRANCE_ROUTE_7 - db $2, $2f, $2, PATH_ENTRANCE_ROUTE_8 + warp $2, $5, $2, PATH_ENTRANCE_ROUTE_7 + warp $2f, $2, $2, PATH_ENTRANCE_ROUTE_8 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7 - EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $2, $2f ; PATH_ENTRANCE_ROUTE_8 + warp_to $2, $5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7 + warp_to $2f, $2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index e0393f2e..1f5663b9 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -2,15 +2,15 @@ UnknownDungeon1Object: db $7d ; border block db $9 ; warps - db $11, $18, $6, $ff - db $11, $19, $6, $ff - db $1, $1b, $0, UNKNOWN_DUNGEON_2 - db $7, $17, $1, UNKNOWN_DUNGEON_2 - db $9, $12, $2, UNKNOWN_DUNGEON_2 - db $1, $7, $3, UNKNOWN_DUNGEON_2 - db $3, $1, $4, UNKNOWN_DUNGEON_2 - db $b, $3, $5, UNKNOWN_DUNGEON_2 - db $6, $0, $0, UNKNOWN_DUNGEON_3 + warp $18, $11, $6, $ff + warp $19, $11, $6, $ff + warp $1b, $1, $0, UNKNOWN_DUNGEON_2 + warp $17, $7, $1, UNKNOWN_DUNGEON_2 + warp $12, $9, $2, UNKNOWN_DUNGEON_2 + warp $7, $1, $3, UNKNOWN_DUNGEON_2 + warp $1, $3, $4, UNKNOWN_DUNGEON_2 + warp $3, $b, $5, UNKNOWN_DUNGEON_2 + warp $0, $6, $0, UNKNOWN_DUNGEON_3 db $0 ; signs @@ -20,12 +20,12 @@ UnknownDungeon1Object: object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $19 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $1b ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $7, $17 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $9, $12 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $7 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $6, $0 ; UNKNOWN_DUNGEON_3 + warp_to $18, $11, UNKNOWN_DUNGEON_1_WIDTH + warp_to $19, $11, UNKNOWN_DUNGEON_1_WIDTH + warp_to $1b, $1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $17, $7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $12, $9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $7, $1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $1, $3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $3, $b, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $0, $6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e1a443bb..a8fb25f9 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -2,12 +2,12 @@ UnknownDungeon2Object: db $7d ; border block db $6 ; warps - db $1, $1d, $2, UNKNOWN_DUNGEON_1 - db $6, $16, $3, UNKNOWN_DUNGEON_1 - db $7, $13, $4, UNKNOWN_DUNGEON_1 - db $1, $9, $5, UNKNOWN_DUNGEON_1 - db $3, $1, $6, UNKNOWN_DUNGEON_1 - db $b, $3, $7, UNKNOWN_DUNGEON_1 + warp $1d, $1, $2, UNKNOWN_DUNGEON_1 + warp $16, $6, $3, UNKNOWN_DUNGEON_1 + warp $13, $7, $4, UNKNOWN_DUNGEON_1 + warp $9, $1, $5, UNKNOWN_DUNGEON_1 + warp $1, $3, $6, UNKNOWN_DUNGEON_1 + warp $3, $b, $7, UNKNOWN_DUNGEON_1 db $0 ; signs @@ -17,9 +17,9 @@ UnknownDungeon2Object: object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $6, $16 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $7, $13 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $9 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_1 + warp_to $1d, $1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $16, $6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $13, $7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $9, $1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $1, $3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $3, $b, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 84fe5e5d..98abcf7c 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -2,7 +2,7 @@ UnknownDungeon3Object: db $7d ; border block db $1 ; warps - db $6, $3, $8, UNKNOWN_DUNGEON_1 + warp $3, $6, $8, UNKNOWN_DUNGEON_1 db $0 ; signs @@ -12,4 +12,4 @@ UnknownDungeon3Object: object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 + warp_to $3, $6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 8f64e894..6b3d6011 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -2,24 +2,24 @@ VermilionCityObject: db $43 ; border block db $9 ; warps - db $3, $b, $0, VERMILION_POKECENTER - db $d, $9, $0, POKEMON_FAN_CLUB - db $d, $17, $0, VERMILION_MART - db $13, $c, $0, VERMILION_GYM - db $13, $17, $0, VERMILION_HOUSE_1 - db $1f, $12, $0, VERMILION_DOCK - db $1f, $13, $0, VERMILION_DOCK - db $d, $f, $0, VERMILION_HOUSE_3 - db $3, $7, $0, VERMILION_HOUSE_2 + warp $b, $3, $0, VERMILION_POKECENTER + warp $9, $d, $0, POKEMON_FAN_CLUB + warp $17, $d, $0, VERMILION_MART + warp $c, $13, $0, VERMILION_GYM + warp $17, $13, $0, VERMILION_HOUSE_1 + warp $12, $1f, $0, VERMILION_DOCK + warp $13, $1f, $0, VERMILION_DOCK + warp $f, $d, $0, VERMILION_HOUSE_3 + warp $7, $3, $0, VERMILION_HOUSE_2 db $7 ; signs - db $3, $1b, $7 ; VermilionCityText7 - db $d, $25, $8 ; VermilionCityText8 - db $d, $18, $9 ; MartSignText - db $3, $c, $a ; PokeCenterSignText - db $d, $7, $b ; VermilionCityText11 - db $13, $7, $c ; VermilionCityText12 - db $f, $1d, $d ; VermilionCityText13 + sign $1b, $3, $7 ; VermilionCityText7 + sign $25, $d, $8 ; VermilionCityText8 + sign $18, $d, $9 ; MartSignText + sign $c, $3, $a ; PokeCenterSignText + sign $7, $d, $b ; VermilionCityText11 + sign $7, $13, $c ; VermilionCityText12 + sign $1d, $f, $d ; VermilionCityText13 db $6 ; objects object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person @@ -30,12 +30,12 @@ VermilionCityObject: object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person ; warp-to - EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER - EVENT_DISP VERMILION_CITY_WIDTH, $d, $9 ; POKEMON_FAN_CLUB - EVENT_DISP VERMILION_CITY_WIDTH, $d, $17 ; VERMILION_MART - EVENT_DISP VERMILION_CITY_WIDTH, $13, $c ; VERMILION_GYM - EVENT_DISP VERMILION_CITY_WIDTH, $13, $17 ; VERMILION_HOUSE_1 - EVENT_DISP VERMILION_CITY_WIDTH, $1f, $12 ; VERMILION_DOCK - EVENT_DISP VERMILION_CITY_WIDTH, $1f, $13 ; VERMILION_DOCK - EVENT_DISP VERMILION_CITY_WIDTH, $d, $f ; VERMILION_HOUSE_3 - EVENT_DISP VERMILION_CITY_WIDTH, $3, $7 ; VERMILION_HOUSE_2 + warp_to $b, $3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER + warp_to $9, $d, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB + warp_to $17, $d, VERMILION_CITY_WIDTH ; VERMILION_MART + warp_to $c, $13, VERMILION_CITY_WIDTH ; VERMILION_GYM + warp_to $17, $13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1 + warp_to $12, $1f, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to $13, $1f, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to $f, $d, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3 + warp_to $7, $3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2 diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 54d6790a..1c0f2f44 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -2,13 +2,13 @@ VermilionDockObject: db $f ; border block db $2 ; warps - db $0, $e, $5, $ff - db $2, $e, $1, SS_ANNE_1 + warp $e, $0, $5, $ff + warp $e, $2, $1, SS_ANNE_1 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e - EVENT_DISP VERMILION_DOCK_WIDTH, $2, $e ; SS_ANNE_1 + warp_to $e, $0, VERMILION_DOCK_WIDTH + warp_to $e, $2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 9058ec4c..16af5f5b 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -2,8 +2,8 @@ VermilionGymObject: db $3 ; border block db $2 ; warps - db $11, $4, $3, $ff - db $11, $5, $3, $ff + warp $4, $11, $3, $ff + warp $5, $11, $3, $ff db $0 ; signs @@ -15,5 +15,5 @@ VermilionGymObject: object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP VERMILION_GYM_WIDTH, $11, $4 - EVENT_DISP VERMILION_GYM_WIDTH, $11, $5 + warp_to $4, $11, VERMILION_GYM_WIDTH + warp_to $5, $11, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 199489ba..6a36b043 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -2,8 +2,8 @@ VermilionHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ VermilionHouse1Object: object SPRITE_PAPER_SHEET, $4, $3, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, VERMILION_HOUSE_1_WIDTH + warp_to $3, $7, VERMILION_HOUSE_1_WIDTH diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index 0108233b..e66744b6 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -2,8 +2,8 @@ VermilionHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -11,5 +11,5 @@ VermilionHouse2Object: object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, VERMILION_HOUSE_2_WIDTH + warp_to $3, $7, VERMILION_HOUSE_2_WIDTH diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 2b8e007b..7bafcd88 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -2,8 +2,8 @@ VermilionHouse3Object: db $a ; border block db $2 ; warps - db $7, $2, $7, $ff - db $7, $3, $7, $ff + warp $2, $7, $7, $ff + warp $3, $7, $7, $ff db $0 ; signs @@ -11,5 +11,5 @@ VermilionHouse3Object: object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person ; warp-to - EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2 - EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $3 + warp_to $2, $7, VERMILION_HOUSE_3_WIDTH + warp_to $3, $7, VERMILION_HOUSE_3_WIDTH diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 01df824e..2b1c578d 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -2,8 +2,8 @@ VermilionMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $2, $ff - db $7, $4, $2, $ff + warp $3, $7, $2, $ff + warp $4, $7, $2, $ff db $0 ; signs @@ -13,5 +13,5 @@ VermilionMartObject: object SPRITE_LASS, $3, $3, WALK, $2, $3 ; person ; warp-to - EVENT_DISP VERMILION_MART_WIDTH, $7, $3 - EVENT_DISP VERMILION_MART_WIDTH, $7, $4 + warp_to $3, $7, VERMILION_MART_WIDTH + warp_to $4, $7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index 727af039..0934cd4f 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -2,8 +2,8 @@ VermilionPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ VermilionPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3 - EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, VERMILION_POKECENTER_WIDTH + warp_to $4, $7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 05680b9f..a354328d 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -2,9 +2,9 @@ VictoryRoad1Object: db $7d ; border block db $3 ; warps - db $11, $8, $2, $ff - db $11, $9, $2, $ff - db $1, $1, $0, VICTORY_ROAD_2 + warp $8, $11, $2, $ff + warp $9, $11, $2, $ff + warp $1, $1, $0, VICTORY_ROAD_2 db $0 ; signs @@ -18,6 +18,6 @@ VictoryRoad1Object: object SPRITE_BOULDER, $2, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person ; warp-to - EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8 - EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $9 - EVENT_DISP VICTORY_ROAD_1_WIDTH, $1, $1 ; VICTORY_ROAD_2 + warp_to $8, $11, VICTORY_ROAD_1_WIDTH + warp_to $9, $11, VICTORY_ROAD_1_WIDTH + warp_to $1, $1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 1bada62a..7d8c6e3c 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -2,13 +2,13 @@ VictoryRoad2Object: db $7d ; border block db $7 ; warps - db $8, $0, $2, VICTORY_ROAD_1 - db $7, $1d, $3, $ff - db $8, $1d, $3, $ff - db $7, $17, $0, VICTORY_ROAD_3 - db $e, $19, $2, VICTORY_ROAD_3 - db $7, $1b, $1, VICTORY_ROAD_3 - db $1, $1, $3, VICTORY_ROAD_3 + warp $0, $8, $2, VICTORY_ROAD_1 + warp $1d, $7, $3, $ff + warp $1d, $8, $3, $ff + warp $17, $7, $0, VICTORY_ROAD_3 + warp $19, $e, $2, VICTORY_ROAD_3 + warp $1b, $7, $1, VICTORY_ROAD_3 + warp $1, $1, $3, VICTORY_ROAD_3 db $0 ; signs @@ -28,10 +28,10 @@ VictoryRoad2Object: object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person ; warp-to - EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1d - EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $1d - EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $17 ; VICTORY_ROAD_3 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $e, $19 ; VICTORY_ROAD_3 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1b ; VICTORY_ROAD_3 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $1, $1 ; VICTORY_ROAD_3 + warp_to $0, $8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1 + warp_to $1d, $7, VICTORY_ROAD_2_WIDTH + warp_to $1d, $8, VICTORY_ROAD_2_WIDTH + warp_to $17, $7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to $19, $e, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to $1b, $7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to $1, $1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 20e43583..c83026ef 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -2,10 +2,10 @@ VictoryRoad3Object: db $7d ; border block db $4 ; warps - db $7, $17, $3, VICTORY_ROAD_2 - db $8, $1a, $5, VICTORY_ROAD_2 - db $f, $1b, $4, VICTORY_ROAD_2 - db $0, $2, $6, VICTORY_ROAD_2 + warp $17, $7, $3, VICTORY_ROAD_2 + warp $1a, $8, $5, VICTORY_ROAD_2 + warp $1b, $f, $4, VICTORY_ROAD_2 + warp $2, $0, $6, VICTORY_ROAD_2 db $0 ; signs @@ -22,7 +22,7 @@ VictoryRoad3Object: object SPRITE_BOULDER, $16, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $a ; person ; warp-to - EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2 - EVENT_DISP VICTORY_ROAD_3_WIDTH, $8, $1a ; VICTORY_ROAD_2 - EVENT_DISP VICTORY_ROAD_3_WIDTH, $f, $1b ; VICTORY_ROAD_2 - EVENT_DISP VICTORY_ROAD_3_WIDTH, $0, $2 ; VICTORY_ROAD_2 + warp_to $17, $7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to $1a, $8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to $1b, $f, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to $2, $0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index ca40cc4f..754a26fe 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -2,19 +2,19 @@ ViridianCityObject: db $f ; border block db $5 ; warps - db $19, $17, $0, VIRIDIAN_POKECENTER - db $13, $1d, $0, VIRIDIAN_MART - db $f, $15, $0, VIRIDIAN_SCHOOL - db $9, $15, $0, VIRIDIAN_HOUSE - db $7, $20, $0, VIRIDIAN_GYM + warp $17, $19, $0, VIRIDIAN_POKECENTER + warp $1d, $13, $0, VIRIDIAN_MART + warp $15, $f, $0, VIRIDIAN_SCHOOL + warp $15, $9, $0, VIRIDIAN_HOUSE + warp $20, $7, $0, VIRIDIAN_GYM db $6 ; signs - db $11, $11, $8 ; ViridianCityText8 - db $1, $13, $9 ; ViridianCityText9 - db $1d, $15, $a ; ViridianCityText10 - db $13, $1e, $b ; MartSignText - db $19, $18, $c ; PokeCenterSignText - db $7, $1b, $d ; ViridianCityText13 + sign $11, $11, $8 ; ViridianCityText8 + sign $13, $1, $9 ; ViridianCityText9 + sign $15, $1d, $a ; ViridianCityText10 + sign $1e, $13, $b ; MartSignText + sign $18, $19, $c ; PokeCenterSignText + sign $1b, $7, $d ; ViridianCityText13 db $7 ; objects object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person @@ -26,8 +26,8 @@ ViridianCityObject: object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person ; warp-to - EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER - EVENT_DISP VIRIDIAN_CITY_WIDTH, $13, $1d ; VIRIDIAN_MART - EVENT_DISP VIRIDIAN_CITY_WIDTH, $f, $15 ; VIRIDIAN_SCHOOL - EVENT_DISP VIRIDIAN_CITY_WIDTH, $9, $15 ; VIRIDIAN_HOUSE - EVENT_DISP VIRIDIAN_CITY_WIDTH, $7, $20 ; VIRIDIAN_GYM + warp_to $17, $19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER + warp_to $1d, $13, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART + warp_to $15, $f, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL + warp_to $15, $9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE + warp_to $20, $7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 0e466a70..31189bb4 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -2,20 +2,20 @@ ViridianForestObject: db $3 ; border block db $6 ; warps - db $0, $1, $2, VIRIDIAN_FOREST_EXIT - db $0, $2, $3, VIRIDIAN_FOREST_EXIT - db $2f, $f, $1, VIRIDIAN_FOREST_ENTRANCE - db $2f, $10, $1, VIRIDIAN_FOREST_ENTRANCE - db $2f, $11, $1, VIRIDIAN_FOREST_ENTRANCE - db $2f, $12, $1, VIRIDIAN_FOREST_ENTRANCE + warp $1, $0, $2, VIRIDIAN_FOREST_EXIT + warp $2, $0, $3, VIRIDIAN_FOREST_EXIT + warp $f, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + warp $10, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + warp $11, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + warp $12, $2f, $1, VIRIDIAN_FOREST_ENTRANCE db $6 ; signs - db $28, $18, $9 ; ViridianForestText9 - db $20, $10, $a ; ViridianForestText10 - db $11, $1a, $b ; ViridianForestText11 - db $18, $4, $c ; ViridianForestText12 - db $2d, $12, $d ; ViridianForestText13 - db $1, $2, $e ; ViridianForestText14 + sign $18, $28, $9 ; ViridianForestText9 + sign $10, $20, $a ; ViridianForestText10 + sign $1a, $11, $b ; ViridianForestText11 + sign $4, $18, $c ; ViridianForestText12 + sign $12, $2d, $d ; ViridianForestText13 + sign $2, $1, $e ; ViridianForestText14 db $8 ; objects object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person @@ -28,9 +28,9 @@ ViridianForestObject: object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $2 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE + warp_to $1, $0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to $2, $0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to $f, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to $10, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to $11, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to $12, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 06faad72..40b1b42e 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -2,10 +2,10 @@ ViridianForestEntranceObject: db $a ; border block db $4 ; warps - db $0, $4, $3, VIRIDIAN_FOREST - db $0, $5, $4, VIRIDIAN_FOREST - db $7, $4, $5, $ff - db $7, $5, $5, $ff + warp $4, $0, $3, VIRIDIAN_FOREST + warp $5, $0, $4, VIRIDIAN_FOREST + warp $4, $7, $5, $ff + warp $5, $7, $5, $ff db $0 ; signs @@ -14,7 +14,7 @@ ViridianForestEntranceObject: object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $5 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $4 - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $5 + warp_to $4, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to $5, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to $4, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to $5, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 0f48fd1c..278f5770 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -2,10 +2,10 @@ ViridianForestExitObject: db $a ; border block db $4 ; warps - db $0, $4, $1, $ff - db $0, $5, $1, $ff - db $7, $4, $0, VIRIDIAN_FOREST - db $7, $5, $0, VIRIDIAN_FOREST + warp $4, $0, $1, $ff + warp $5, $0, $1, $ff + warp $4, $7, $0, VIRIDIAN_FOREST + warp $5, $7, $0, VIRIDIAN_FOREST db $0 ; signs @@ -14,7 +14,7 @@ ViridianForestExitObject: object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4 - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $5 - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $4 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $5 ; VIRIDIAN_FOREST + warp_to $4, $0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to $5, $0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to $4, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to $5, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 8efa5e22..5b2ce100 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -2,8 +2,8 @@ ViridianGymObject: db $3 ; border block db $2 ; warps - db $11, $10, $4, $ff - db $11, $11, $4, $ff + warp $10, $11, $4, $ff + warp $11, $11, $4, $ff db $0 ; signs @@ -21,5 +21,5 @@ ViridianGymObject: object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE ; warp-to - EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10 - EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $11 + warp_to $10, $11, VIRIDIAN_GYM_WIDTH + warp_to $11, $11, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index c06bb9c8..e6bdd88e 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -2,8 +2,8 @@ ViridianHouseObject: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ ViridianHouseObject: object SPRITE_CLIPBOARD, $4, $0, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2 - EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, VIRIDIAN_HOUSE_WIDTH + warp_to $3, $7, VIRIDIAN_HOUSE_WIDTH diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index 4b90bee3..fc47718f 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -2,8 +2,8 @@ ViridianMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $1, $ff - db $7, $4, $1, $ff + warp $3, $7, $1, $ff + warp $4, $7, $1, $ff db $0 ; signs @@ -13,5 +13,5 @@ ViridianMartObject: object SPRITE_BLACK_HAIR_BOY_1, $3, $3, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3 - EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $4 + warp_to $3, $7, VIRIDIAN_MART_WIDTH + warp_to $4, $7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 2e96ca58..4f337e16 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -2,8 +2,8 @@ ViridianPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ ViridianPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 - EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, VIRIDIAN_POKECENTER_WIDTH + warp_to $4, $7, VIRIDIAN_POKECENTER_WIDTH diff --git a/macros/data_macros.asm b/macros/data_macros.asm index 4c6457be..9085cf76 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -118,6 +118,28 @@ object: MACRO ENDC ENDM +;\1 x position +;\2 y position +;\3 destination warp id +;\4 destination map ($ff = wLastMap) +warp: MACRO + db \2, \1, \3, \4 +ENDM + +;\1 x position +;\2 y position +;\3 sign id +sign: MACRO + db \2, \1, \3 +ENDM + +;\1 x position +;\2 y position +;\3 map width +warp_to: MACRO + EVENT_DISP \3, \2, \1 +ENDM + ;\1 (byte) = current map id ;\2 (byte) = connected map id ;\3 (byte) = x movement of connection strip -- cgit v1.2.3 From dd4f0a0064921f74fd68750848fca87ae21c4545 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 11:12:59 -0500 Subject: Use base 10 (note, the previous commit resolves #173) --- data/mapObjects/agatha.asm | 26 ++-- data/mapObjects/bikeshop.asm | 22 +-- data/mapObjects/billshouse.asm | 22 +-- data/mapObjects/blueshouse.asm | 22 +-- data/mapObjects/bruno.asm | 26 ++-- data/mapObjects/celadoncity.asm | 96 ++++++------- data/mapObjects/celadondiner.asm | 26 ++-- data/mapObjects/celadongamecorner.asm | 44 +++--- data/mapObjects/celadongym.asm | 32 ++--- data/mapObjects/celadonhotel.asm | 22 +-- data/mapObjects/celadonhouse.asm | 22 +-- data/mapObjects/celadonmansion1.asm | 38 ++--- data/mapObjects/celadonmansion2.asm | 26 ++-- data/mapObjects/celadonmansion3.asm | 40 +++--- data/mapObjects/celadonmansion4.asm | 22 +-- data/mapObjects/celadonmansion5.asm | 20 +-- data/mapObjects/celadonmart1.asm | 38 ++--- data/mapObjects/celadonmart2.asm | 30 ++-- data/mapObjects/celadonmart3.asm | 54 ++++---- data/mapObjects/celadonmart4.asm | 28 ++-- data/mapObjects/celadonmart5.asm | 30 ++-- data/mapObjects/celadonmartelevator.asm | 18 +-- data/mapObjects/celadonmartroof.asm | 24 ++-- data/mapObjects/celadonpokecenter.asm | 24 ++-- data/mapObjects/celadonprizeroom.asm | 26 ++-- data/mapObjects/ceruleancity.asm | 82 +++++------ data/mapObjects/ceruleangym.asm | 24 ++-- data/mapObjects/ceruleanhouse1.asm | 20 +-- data/mapObjects/ceruleanhouse2.asm | 22 +-- data/mapObjects/ceruleanhousetrashed.asm | 26 ++-- data/mapObjects/ceruleanmart.asm | 22 +-- data/mapObjects/ceruleanpokecenter.asm | 24 ++-- data/mapObjects/cinnabargym.asm | 34 ++--- data/mapObjects/cinnabarisland.asm | 42 +++--- data/mapObjects/cinnabarmart.asm | 22 +-- data/mapObjects/cinnabarpokecenter.asm | 24 ++-- data/mapObjects/colosseum.asm | 10 +- data/mapObjects/copycatshouse1f.asm | 26 ++-- data/mapObjects/copycatshouse2f.asm | 26 ++-- data/mapObjects/daycarem.asm | 18 +-- data/mapObjects/diglettscave.asm | 16 +-- data/mapObjects/diglettscaveroute11.asm | 22 +-- data/mapObjects/diglettscaveroute2.asm | 22 +-- data/mapObjects/fanclub.asm | 32 ++--- data/mapObjects/fightingdojo.asm | 30 ++-- data/mapObjects/fuchsiacity.asm | 92 ++++++------ data/mapObjects/fuchsiagym.asm | 32 ++--- data/mapObjects/fuchsiahouse1.asm | 22 +-- data/mapObjects/fuchsiahouse2.asm | 26 ++-- data/mapObjects/fuchsiahouse3.asm | 22 +-- data/mapObjects/fuchsiamart.asm | 22 +-- data/mapObjects/fuchsiameetingroom.asm | 22 +-- data/mapObjects/fuchsiapokecenter.asm | 24 ++-- data/mapObjects/gary.asm | 28 ++-- data/mapObjects/halloffameroom.asm | 18 +-- data/mapObjects/indigoplateau.asm | 16 +-- data/mapObjects/indigoplateaulobby.asm | 30 ++-- data/mapObjects/lab1.asm | 38 ++--- data/mapObjects/lab2.asm | 22 +-- data/mapObjects/lab3.asm | 26 ++-- data/mapObjects/lab4.asm | 20 +-- data/mapObjects/lance.asm | 22 +-- data/mapObjects/lavenderhouse1.asm | 28 ++-- data/mapObjects/lavenderhouse2.asm | 20 +-- data/mapObjects/lavendermart.asm | 22 +-- data/mapObjects/lavenderpokecenter.asm | 24 ++-- data/mapObjects/lavendertown.asm | 50 +++---- data/mapObjects/lorelei.asm | 26 ++-- data/mapObjects/mansion1.asm | 46 +++--- data/mapObjects/mansion2.asm | 32 ++--- data/mapObjects/mansion3.asm | 30 ++-- data/mapObjects/mansion4.asm | 28 ++-- data/mapObjects/mtmoon1.asm | 56 ++++---- data/mapObjects/mtmoon2.asm | 40 +++--- data/mapObjects/mtmoon3.asm | 42 +++--- data/mapObjects/mtmoonpokecenter.asm | 28 ++-- data/mapObjects/museum1f.asm | 38 ++--- data/mapObjects/museum2f.asm | 26 ++-- data/mapObjects/namerater.asm | 18 +-- data/mapObjects/oakslab.asm | 38 ++--- data/mapObjects/pallettown.asm | 34 ++--- data/mapObjects/pewtercity.asm | 60 ++++---- data/mapObjects/pewtergym.asm | 22 +-- data/mapObjects/pewterhouse1.asm | 22 +-- data/mapObjects/pewterhouse2.asm | 20 +-- data/mapObjects/pewtermart.asm | 22 +-- data/mapObjects/pewterpokecenter.asm | 24 ++-- data/mapObjects/pokemontower1.asm | 30 ++-- data/mapObjects/pokemontower2.asm | 20 +-- data/mapObjects/pokemontower3.asm | 24 ++-- data/mapObjects/pokemontower4.asm | 28 ++-- data/mapObjects/pokemontower5.asm | 28 ++-- data/mapObjects/pokemontower6.asm | 26 ++-- data/mapObjects/pokemontower7.asm | 18 +-- data/mapObjects/powerplant.asm | 48 +++---- data/mapObjects/redshouse1f.asm | 24 ++-- data/mapObjects/redshouse2f.asm | 12 +- data/mapObjects/rockethideout1.asm | 42 +++--- data/mapObjects/rockethideout2.asm | 38 ++--- data/mapObjects/rockethideout3.asm | 24 ++-- data/mapObjects/rockethideout4.asm | 38 ++--- data/mapObjects/rockethideoutelevator.asm | 18 +-- data/mapObjects/rocktunnel1.asm | 56 ++++---- data/mapObjects/rocktunnel2.asm | 40 +++--- data/mapObjects/rocktunnelpokecenter.asm | 24 ++-- data/mapObjects/route1.asm | 16 +-- data/mapObjects/route10.asm | 44 +++--- data/mapObjects/route11.asm | 50 +++---- data/mapObjects/route11gate.asm | 30 ++-- data/mapObjects/route11gateupstairs.asm | 20 +-- data/mapObjects/route12.asm | 48 +++---- data/mapObjects/route12gate.asm | 30 ++-- data/mapObjects/route12gateupstairs.asm | 18 +-- data/mapObjects/route12house.asm | 18 +-- data/mapObjects/route13.asm | 34 ++--- data/mapObjects/route14.asm | 30 ++-- data/mapObjects/route15.asm | 48 +++---- data/mapObjects/route15gate.asm | 30 ++-- data/mapObjects/route15gateupstairs.asm | 16 +-- data/mapObjects/route16.asm | 62 ++++----- data/mapObjects/route16gate.asm | 48 +++---- data/mapObjects/route16gateupstairs.asm | 20 +-- data/mapObjects/route16house.asm | 20 +-- data/mapObjects/route17.asm | 40 +++--- data/mapObjects/route18.asm | 34 ++--- data/mapObjects/route18gate.asm | 30 ++-- data/mapObjects/route18gateupstairs.asm | 18 +-- data/mapObjects/route19.asm | 30 ++-- data/mapObjects/route2.asm | 48 +++---- data/mapObjects/route20.asm | 40 +++--- data/mapObjects/route21.asm | 26 ++-- data/mapObjects/route22.asm | 18 +-- data/mapObjects/route22gate.asm | 26 ++-- data/mapObjects/route23.asm | 40 +++--- data/mapObjects/route24.asm | 24 ++-- data/mapObjects/route25.asm | 34 ++--- data/mapObjects/route2gate.asm | 28 ++-- data/mapObjects/route2house.asm | 20 +-- data/mapObjects/route3.asm | 28 ++-- data/mapObjects/route4.asm | 32 ++--- data/mapObjects/route5.asm | 30 ++-- data/mapObjects/route5gate.asm | 26 ++-- data/mapObjects/route6.asm | 38 ++--- data/mapObjects/route6gate.asm | 26 ++-- data/mapObjects/route7.asm | 30 ++-- data/mapObjects/route7gate.asm | 26 ++-- data/mapObjects/route8.asm | 48 +++---- data/mapObjects/route8gate.asm | 26 ++-- data/mapObjects/route9.asm | 30 ++-- data/mapObjects/safarizonecenter.asm | 50 +++---- data/mapObjects/safarizoneeast.asm | 42 +++--- data/mapObjects/safarizoneentrance.asm | 28 ++-- data/mapObjects/safarizonenorth.asm | 58 ++++---- data/mapObjects/safarizoneresthouse1.asm | 20 +-- data/mapObjects/safarizoneresthouse2.asm | 22 +-- data/mapObjects/safarizoneresthouse3.asm | 22 +-- data/mapObjects/safarizoneresthouse4.asm | 22 +-- data/mapObjects/safarizonesecrethouse.asm | 18 +-- data/mapObjects/safarizonewest.asm | 56 ++++---- data/mapObjects/saffroncity.asm | 90 ++++++------ data/mapObjects/saffrongym.asm | 154 ++++++++++----------- data/mapObjects/saffronhouse1.asm | 24 ++-- data/mapObjects/saffronhouse2.asm | 18 +-- data/mapObjects/saffronmart.asm | 22 +-- data/mapObjects/saffronpokecenter.asm | 24 ++-- data/mapObjects/school.asm | 20 +-- data/mapObjects/seafoamislands1.asm | 44 +++--- data/mapObjects/seafoamislands2.asm | 40 +++--- data/mapObjects/seafoamislands3.asm | 40 +++--- data/mapObjects/seafoamislands4.asm | 48 +++---- data/mapObjects/seafoamislands5.asm | 34 ++--- data/mapObjects/silphco1.asm | 30 ++-- data/mapObjects/silphco10.asm | 44 +++--- data/mapObjects/silphco11.asm | 34 ++--- data/mapObjects/silphco2.asm | 46 +++--- data/mapObjects/silphco3.asm | 56 ++++---- data/mapObjects/silphco4.asm | 50 +++---- data/mapObjects/silphco5.asm | 58 ++++---- data/mapObjects/silphco6.asm | 48 +++---- data/mapObjects/silphco7.asm | 54 ++++---- data/mapObjects/silphco8.asm | 44 +++--- data/mapObjects/silphco9.asm | 36 ++--- data/mapObjects/silphcoelevator.asm | 18 +-- data/mapObjects/ssanne1.asm | 56 ++++---- data/mapObjects/ssanne10.asm | 70 +++++----- data/mapObjects/ssanne2.asm | 48 +++---- data/mapObjects/ssanne3.asm | 18 +-- data/mapObjects/ssanne4.asm | 32 ++--- data/mapObjects/ssanne5.asm | 26 ++-- data/mapObjects/ssanne6.asm | 26 ++-- data/mapObjects/ssanne7.asm | 18 +-- data/mapObjects/ssanne8.asm | 54 ++++---- data/mapObjects/ssanne9.asm | 82 +++++------ data/mapObjects/tradecenter.asm | 10 +- data/mapObjects/undergroundpathentranceroute5.asm | 22 +-- data/mapObjects/undergroundpathentranceroute6.asm | 22 +-- data/mapObjects/undergroundpathentranceroute7.asm | 22 +-- .../undergroundpathentranceroute7copy.asm | 24 ++-- data/mapObjects/undergroundpathentranceroute8.asm | 22 +-- data/mapObjects/undergroundpathns.asm | 16 +-- data/mapObjects/undergroundpathwe.asm | 16 +-- data/mapObjects/unknowndungeon1.asm | 50 +++---- data/mapObjects/unknowndungeon2.asm | 38 ++--- data/mapObjects/unknowndungeon3.asm | 18 +-- data/mapObjects/vermilioncity.asm | 70 +++++----- data/mapObjects/vermiliondock.asm | 16 +-- data/mapObjects/vermiliongym.asm | 26 ++-- data/mapObjects/vermilionhouse1.asm | 22 +-- data/mapObjects/vermilionhouse2.asm | 18 +-- data/mapObjects/vermilionhouse3.asm | 18 +-- data/mapObjects/vermilionmart.asm | 22 +-- data/mapObjects/vermilionpokecenter.asm | 24 ++-- data/mapObjects/victoryroad1.asm | 34 ++--- data/mapObjects/victoryroad2.asm | 62 ++++----- data/mapObjects/victoryroad3.asm | 44 +++--- data/mapObjects/viridiancity.asm | 54 ++++---- data/mapObjects/viridianforest.asm | 60 ++++---- data/mapObjects/viridianforestentrance.asm | 28 ++-- data/mapObjects/viridianforestexit.asm | 28 ++-- data/mapObjects/viridiangym.asm | 38 ++--- data/mapObjects/viridianhouse.asm | 24 ++-- data/mapObjects/viridianmart.asm | 22 +-- data/mapObjects/viridianpokecenter.asm | 24 ++-- macros/data_macros.asm | 2 +- 224 files changed, 3628 insertions(+), 3628 deletions(-) diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index 2651b10a..b61dff29 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -1,19 +1,19 @@ AgathaObject: - db $0 ; border block + db 0 ; border block - db $4 ; warps - warp $4, $b, $2, BRUNOS_ROOM - warp $5, $b, $3, BRUNOS_ROOM - warp $4, $0, $0, LANCES_ROOM - warp $5, $0, $0, LANCES_ROOM + db 4 ; warps + warp 4, 11, 2, BRUNOS_ROOM + warp 5, 11, 3, BRUNOS_ROOM + warp 4, 0, 0, LANCES_ROOM + warp 5, 0, 0, LANCES_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1 + db 1 ; objects + object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 ; warp-to - warp_to $4, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to $5, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to $4, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM - warp_to $5, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM + warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM + warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index ce5fe9b8..e5ff250c 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -1,17 +1,17 @@ BikeShopObject: - db $e ; border block + db 14 ; border block - db $2 ; warps - warp $2, $7, $4, $ff - warp $3, $7, $4, $ff + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BIKE_SHOP_GUY, $6, $2, STAY, NONE, $1 ; person - object SPRITE_MOM_GEISHA, $5, $6, WALK, $1, $2 ; person - object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person + db 3 ; objects + object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person + object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person + object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person ; warp-to - warp_to $2, $7, BIKE_SHOP_WIDTH - warp_to $3, $7, BIKE_SHOP_WIDTH + warp_to 2, 7, BIKE_SHOP_WIDTH + warp_to 3, 7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index eb90ed78..e152dadd 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -1,17 +1,17 @@ BillsHouseObject: - db $d ; border block + db 13 ; border block - db $2 ; warps - warp $2, $7, $0, $ff - warp $3, $7, $0, $ff + db 2 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_SLOWBRO, $6, $5, STAY, NONE, $1 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $4, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person ; warp-to - warp_to $2, $7, BILLS_HOUSE_WIDTH - warp_to $3, $7, BILLS_HOUSE_WIDTH + warp_to 2, 7, BILLS_HOUSE_WIDTH + warp_to 3, 7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 3a798562..302c18ac 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -1,17 +1,17 @@ BluesHouseObject: - db $0A ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $1, $FF - warp $3, $7, $1, $FF + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map - object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table + db 3 ; objects + object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map + object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table ; warp-to - warp_to $2, $7, BLUES_HOUSE_WIDTH - warp_to $3, $7, BLUES_HOUSE_WIDTH + warp_to 2, 7, BLUES_HOUSE_WIDTH + warp_to 3, 7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index b0df7215..85d789cc 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,19 +1,19 @@ BrunoObject: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $4, $b, $2, LORELEIS_ROOM - warp $5, $b, $3, LORELEIS_ROOM - warp $4, $0, $0, AGATHAS_ROOM - warp $5, $0, $1, AGATHAS_ROOM + db 4 ; warps + warp 4, 11, 2, LORELEIS_ROOM + warp 5, 11, 3, LORELEIS_ROOM + warp 4, 0, 0, AGATHAS_ROOM + warp 5, 0, 1, AGATHAS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 + db 1 ; objects + object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 ; warp-to - warp_to $4, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to $5, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to $4, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM - warp_to $5, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 536b46ee..7471563c 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -1,54 +1,54 @@ CeladonCityObject: - db $f ; border block + db 15 ; border block - db $d ; warps - warp $8, $d, $0, CELADON_MART_1 - warp $a, $d, $2, CELADON_MART_1 - warp $18, $9, $0, CELADON_MANSION_1 - warp $18, $3, $2, CELADON_MANSION_1 - warp $19, $3, $2, CELADON_MANSION_1 - warp $29, $9, $0, CELADON_POKECENTER - warp $c, $1b, $0, CELADON_GYM - warp $1c, $13, $0, GAME_CORNER - warp $27, $13, $0, CELADON_MART_5 ; beta warp! no longer used - warp $21, $13, $0, CELADON_PRIZE_ROOM - warp $1f, $1b, $0, CELADON_DINER - warp $23, $1b, $0, CELADON_HOUSE - warp $2b, $1b, $0, CELADON_HOTEL + db 13 ; warps + warp 8, 13, 0, CELADON_MART_1 + warp 10, 13, 2, CELADON_MART_1 + warp 24, 9, 0, CELADON_MANSION_1 + warp 24, 3, 2, CELADON_MANSION_1 + warp 25, 3, 2, CELADON_MANSION_1 + warp 41, 9, 0, CELADON_POKECENTER + warp 12, 27, 0, CELADON_GYM + warp 28, 19, 0, GAME_CORNER + warp 39, 19, 0, CELADON_MART_5 ; beta warp! no longer used + warp 33, 19, 0, CELADON_PRIZE_ROOM + warp 31, 27, 0, CELADON_DINER + warp 35, 27, 0, CELADON_HOUSE + warp 43, 27, 0, CELADON_HOTEL - db $9 ; signs - sign $1b, $f, $a ; CeladonCityText10 - sign $13, $f, $b ; CeladonCityText11 - sign $2a, $9, $c ; PokeCenterSignText - sign $d, $1d, $d ; CeladonCityText13 - sign $15, $9, $e ; CeladonCityText14 - sign $c, $d, $f ; CeladonCityText15 - sign $27, $15, $10 ; CeladonCityText16 - sign $21, $15, $11 ; CeladonCityText17 - sign $1b, $15, $12 ; CeladonCityText18 + db 9 ; signs + sign 27, 15, 10 ; CeladonCityText10 + sign 19, 15, 11 ; CeladonCityText11 + sign 42, 9, 12 ; PokeCenterSignText + sign 13, 29, 13 ; CeladonCityText13 + sign 21, 9, 14 ; CeladonCityText14 + sign 12, 13, 15 ; CeladonCityText15 + sign 39, 21, 16 ; CeladonCityText16 + sign 33, 21, 17 ; CeladonCityText17 + sign 27, 21, 18 ; CeladonCityText18 - db $9 ; objects - object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person - object SPRITE_OLD_PERSON, $b, $1c, STAY, UP, $2 ; person - object SPRITE_GIRL, $e, $13, WALK, $1, $3 ; person - object SPRITE_OLD_PERSON, $19, $16, STAY, DOWN, $4 ; person - object SPRITE_OLD_PERSON, $16, $10, STAY, DOWN, $5 ; person - object SPRITE_FISHER2, $20, $c, STAY, LEFT, $6 ; person - object SPRITE_SLOWBRO, $1e, $c, STAY, RIGHT, $7 ; person - object SPRITE_ROCKET, $20, $1d, WALK, $2, $8 ; person - object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person + db 9 ; objects + object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person + object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person + object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person + object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person + object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person + object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person + object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person + object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person + object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person ; warp-to - warp_to $8, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 - warp_to $a, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 - warp_to $18, $9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to $18, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to $19, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to $29, $9, CELADON_CITY_WIDTH ; CELADON_POKECENTER - warp_to $c, $1b, CELADON_CITY_WIDTH ; CELADON_GYM - warp_to $1c, $13, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to $27, $13, CELADON_CITY_WIDTH ; CELADON_MART_5 - warp_to $21, $13, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM - warp_to $1f, $1b, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to $23, $1b, CELADON_CITY_WIDTH ; CELADON_HOUSE - warp_to $2b, $1b, CELADON_CITY_WIDTH ; CELADON_HOTEL + warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER + warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM + warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER + warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5 + warp_to 33, 19, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM + warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER + warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_HOUSE + warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index f1327612..63426279 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -1,19 +1,19 @@ CeladonDinerObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $3, $7, $a, $ff - warp $4, $7, $a, $ff + db 2 ; warps + warp 3, 7, 10, -1 + warp 4, 7, 10, -1 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person - object SPRITE_MOM_GEISHA, $7, $2, STAY, NONE, $2 ; person - object SPRITE_FAT_BALD_GUY, $1, $4, STAY, DOWN, $3 ; person - object SPRITE_FISHER2, $5, $3, STAY, RIGHT, $4 ; person - object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person + object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person + object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person + object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person + object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person ; warp-to - warp_to $3, $7, CELADON_DINER_WIDTH - warp_to $4, $7, CELADON_DINER_WIDTH + warp_to 3, 7, CELADON_DINER_WIDTH + warp_to 4, 7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index f1b91d56..028a0839 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -1,28 +1,28 @@ CeladonGameCornerObject: - db $f ; border block + db 15 ; border block - db $3 ; warps - warp $f, $11, $7, $ff - warp $10, $11, $7, $ff - warp $11, $4, $1, ROCKET_HIDEOUT_1 + db 3 ; warps + warp 15, 17, 7, -1 + warp 16, 17, 7, -1 + warp 17, 4, 1, ROCKET_HIDEOUT_1 - db $1 ; signs - sign $9, $4, $c ; CeladonGameCornerText12 + db 1 ; signs + sign 9, 4, 12 ; CeladonGameCornerText12 - db $b ; objects - object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person - object SPRITE_MART_GUY, $5, $6, STAY, DOWN, $2 ; person - object SPRITE_FAT_BALD_GUY, $2, $a, STAY, LEFT, $3 ; person - object SPRITE_FOULARD_WOMAN, $2, $d, STAY, LEFT, $4 ; person - object SPRITE_FISHER, $5, $b, STAY, RIGHT, $5 ; person - object SPRITE_MOM_GEISHA, $8, $b, STAY, LEFT, $6 ; person - object SPRITE_GYM_HELPER, $8, $e, STAY, LEFT, $7 ; person - object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person - object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person - object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person - object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 + db 11 ; objects + object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person + object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person + object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person + object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person + object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person + object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person + object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person + object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person + object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person + object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person + object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 ; warp-to - warp_to $f, $11, GAME_CORNER_WIDTH - warp_to $10, $11, GAME_CORNER_WIDTH - warp_to $11, $4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 15, 17, GAME_CORNER_WIDTH + warp_to 16, 17, GAME_CORNER_WIDTH + warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index b9ebcb93..0045bf73 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -1,22 +1,22 @@ CeladonGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $11, $6, $ff - warp $5, $11, $6, $ff + db 2 ; warps + warp 4, 17, 6, -1 + warp 5, 17, 6, -1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 - object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 - object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 - object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b - object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 - object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 - object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 - object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 + db 8 ; objects + object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 + object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 ; warp-to - warp_to $4, $11, CELADON_GYM_WIDTH - warp_to $5, $11, CELADON_GYM_WIDTH + warp_to 4, 17, CELADON_GYM_WIDTH + warp_to 5, 17, CELADON_GYM_WIDTH diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 0737304c..1f7916f7 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -1,17 +1,17 @@ CeladonHotelObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $c, $ff - warp $4, $7, $c, $ff + db 2 ; warps + warp 3, 7, 12, -1 + warp 4, 7, 12, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_FOULARD_WOMAN, $2, $4, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person + db 3 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person ; warp-to - warp_to $3, $7, CELADON_HOTEL_WIDTH - warp_to $4, $7, CELADON_HOTEL_WIDTH + warp_to 3, 7, CELADON_HOTEL_WIDTH + warp_to 4, 7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 3fc86c40..83b91723 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -1,17 +1,17 @@ CeladonHouseObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $2, $7, $b, $ff - warp $3, $7, $b, $ff + db 2 ; warps + warp 2, 7, 11, -1 + warp 3, 7, 11, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OLD_PERSON, $4, $2, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person - object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person + db 3 ; objects + object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person + object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person ; warp-to - warp_to $2, $7, CELADON_HOUSE_WIDTH - warp_to $3, $7, CELADON_HOUSE_WIDTH + warp_to 2, 7, CELADON_HOUSE_WIDTH + warp_to 3, 7, CELADON_HOUSE_WIDTH diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index bb38825c..c07ff521 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -1,25 +1,25 @@ CeladonMansion1Object: - db $f ; border block + db 15 ; border block - db $5 ; warps - warp $4, $b, $2, $ff - warp $5, $b, $2, $ff - warp $4, $0, $4, $ff - warp $7, $1, $1, CELADON_MANSION_2 - warp $2, $1, $2, CELADON_MANSION_2 + db 5 ; warps + warp 4, 11, 2, -1 + warp 5, 11, 2, -1 + warp 4, 0, 4, -1 + warp 7, 1, 1, CELADON_MANSION_2 + warp 2, 1, 2, CELADON_MANSION_2 - db $1 ; signs - sign $4, $9, $5 ; CeladonMansion1Text5 + db 1 ; signs + sign 4, 9, 5 ; CeladonMansion1Text5 - db $4 ; objects - object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, STAY, DOWN, $2 ; person - object SPRITE_CLEFAIRY, $1, $8, WALK, $2, $3 ; person - object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person + db 4 ; objects + object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person + object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person + object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person ; warp-to - warp_to $4, $b, CELADON_MANSION_1_WIDTH - warp_to $5, $b, CELADON_MANSION_1_WIDTH - warp_to $4, $0, CELADON_MANSION_1_WIDTH - warp_to $7, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 - warp_to $2, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to 4, 11, CELADON_MANSION_1_WIDTH + warp_to 5, 11, CELADON_MANSION_1_WIDTH + warp_to 4, 0, CELADON_MANSION_1_WIDTH + warp_to 7, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to 2, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 675afdc7..fd7e58b9 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,19 +1,19 @@ CeladonMansion2Object: - db $f ; border block + db 15 ; border block - db $4 ; warps - warp $6, $1, $0, CELADON_MANSION_3 - warp $7, $1, $3, CELADON_MANSION_1 - warp $2, $1, $4, CELADON_MANSION_1 - warp $4, $1, $3, CELADON_MANSION_3 + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_3 + warp 7, 1, 3, CELADON_MANSION_1 + warp 2, 1, 4, CELADON_MANSION_1 + warp 4, 1, 3, CELADON_MANSION_3 - db $1 ; signs - sign $4, $9, $1 ; CeladonMansion2Text1 + db 1 ; signs + sign 4, 9, 1 ; CeladonMansion2Text1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $6, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 - warp_to $7, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to $2, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to $4, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index f6e66a1a..d96c906f 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -1,26 +1,26 @@ CeladonMansion3Object: - db $f ; border block + db 15 ; border block - db $4 ; warps - warp $6, $1, $0, CELADON_MANSION_2 - warp $7, $1, $0, CELADON_MANSION_4 - warp $2, $1, $1, CELADON_MANSION_4 - warp $4, $1, $3, CELADON_MANSION_2 + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_2 + warp 7, 1, 0, CELADON_MANSION_4 + warp 2, 1, 1, CELADON_MANSION_4 + warp 4, 1, 3, CELADON_MANSION_2 - db $4 ; signs - sign $1, $3, $5 ; CeladonMansion3Text5 - sign $4, $3, $6 ; CeladonMansion3Text6 - sign $1, $6, $7 ; CeladonMansion3Text7 - sign $4, $9, $8 ; CeladonMansion3Text8 + db 4 ; signs + sign 1, 3, 5 ; CeladonMansion3Text5 + sign 4, 3, 6 ; CeladonMansion3Text6 + sign 1, 6, 7 ; CeladonMansion3Text7 + sign 4, 9, 8 ; CeladonMansion3Text8 - db $4 ; objects - object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person - object SPRITE_MART_GUY, $3, $4, STAY, UP, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $0, $7, STAY, UP, $3 ; person - object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person + db 4 ; objects + object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person + object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person + object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person ; warp-to - warp_to $6, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 - warp_to $7, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 - warp_to $2, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 - warp_to $4, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 + warp_to 6, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 + warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 + warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 + warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 4f0fa214..5bd2db06 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -1,17 +1,17 @@ CeladonMansion4Object: - db $9 ; border block + db 9 ; border block - db $3 ; warps - warp $6, $1, $1, CELADON_MANSION_3 - warp $2, $1, $2, CELADON_MANSION_3 - warp $2, $7, $0, CELADON_MANSION_5 + db 3 ; warps + warp 6, 1, 1, CELADON_MANSION_3 + warp 2, 1, 2, CELADON_MANSION_3 + warp 2, 7, 0, CELADON_MANSION_5 - db $1 ; signs - sign $3, $7, $1 ; CeladonMansion4Text1 + db 1 ; signs + sign 3, 7, 1 ; CeladonMansion4Text1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $6, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to $2, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to $2, $7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 + warp_to 6, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index 438484bf..f439c5eb 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -1,16 +1,16 @@ CeladonMansion5Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $2, CELADON_MANSION_4 - warp $3, $7, $2, CELADON_MANSION_4 + db 2 ; warps + warp 2, 7, 2, CELADON_MANSION_4 + warp 3, 7, 2, CELADON_MANSION_4 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_HIKER, $2, $2, STAY, DOWN, $1 ; person - object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person ; warp-to - warp_to $2, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 - warp_to $3, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 + warp_to 2, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 + warp_to 3, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index 3442e3cc..f9869322 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -1,25 +1,25 @@ CeladonMart1Object: - db $f ; border block + db 15 ; border block - db $6 ; warps - warp $2, $7, $0, $ff - warp $3, $7, $0, $ff - warp $10, $7, $1, $ff - warp $11, $7, $1, $ff - warp $c, $1, $0, CELADON_MART_2 - warp $1, $1, $0, CELADON_MART_ELEVATOR + db 6 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 16, 7, 1, -1 + warp 17, 7, 1, -1 + warp 12, 1, 0, CELADON_MART_2 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $2 ; signs - sign $b, $4, $2 ; CeladonMart1Text2 - sign $e, $1, $3 ; CeladonMart1Text3 + db 2 ; signs + sign 11, 4, 2 ; CeladonMart1Text2 + sign 14, 1, 3 ; CeladonMart1Text3 - db $1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person ; warp-to - warp_to $2, $7, CELADON_MART_1_WIDTH - warp_to $3, $7, CELADON_MART_1_WIDTH - warp_to $10, $7, CELADON_MART_1_WIDTH - warp_to $11, $7, CELADON_MART_1_WIDTH - warp_to $c, $1, CELADON_MART_1_WIDTH ; CELADON_MART_2 - warp_to $1, $1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR + warp_to 2, 7, CELADON_MART_1_WIDTH + warp_to 3, 7, CELADON_MART_1_WIDTH + warp_to 16, 7, CELADON_MART_1_WIDTH + warp_to 17, 7, CELADON_MART_1_WIDTH + warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2 + warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 3b88d49f..ab69c91a 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,21 +1,21 @@ CeladonMart2Object: - db $f ; border block + db 15 ; border block - db $3 ; warps - warp $c, $1, $4, CELADON_MART_1 - warp $10, $1, $1, CELADON_MART_3 - warp $1, $1, $0, CELADON_MART_ELEVATOR + db 3 ; warps + warp 12, 1, 4, CELADON_MART_1 + warp 16, 1, 1, CELADON_MART_3 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $1 ; signs - sign $e, $1, $5 ; CeladonMart2Text5 + db 1 ; signs + sign 14, 1, 5 ; CeladonMart2Text5 - db $4 ; objects - object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person - object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person - object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person - object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person + db 4 ; objects + object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person + object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person ; warp-to - warp_to $c, $1, CELADON_MART_2_WIDTH ; CELADON_MART_1 - warp_to $10, $1, CELADON_MART_2_WIDTH ; CELADON_MART_3 - warp_to $1, $1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1 + warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3 + warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 803ff6ff..ba913e06 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -1,33 +1,33 @@ CeladonMart3Object: - db $f ; border block + db 15 ; border block - db $3 ; warps - warp $c, $1, $0, CELADON_MART_4 - warp $10, $1, $1, CELADON_MART_2 - warp $1, $1, $0, CELADON_MART_ELEVATOR + db 3 ; warps + warp 12, 1, 0, CELADON_MART_4 + warp 16, 1, 1, CELADON_MART_2 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $c ; signs - sign $2, $4, $6 ; CeladonMart3Text6 - sign $3, $4, $7 ; CeladonMart3Text7 - sign $5, $4, $8 ; CeladonMart3Text8 - sign $6, $4, $9 ; CeladonMart3Text9 - sign $2, $6, $a ; CeladonMart3Text10 - sign $3, $6, $b ; CeladonMart3Text11 - sign $5, $6, $c ; CeladonMart3Text12 - sign $6, $6, $d ; CeladonMart3Text13 - sign $e, $1, $e ; CeladonMart3Text14 - sign $4, $1, $f ; CeladonMart3Text15 - sign $6, $1, $10 ; CeladonMart3Text16 - sign $a, $1, $11 ; CeladonMart3Text17 + db 12 ; signs + sign 2, 4, 6 ; CeladonMart3Text6 + sign 3, 4, 7 ; CeladonMart3Text7 + sign 5, 4, 8 ; CeladonMart3Text8 + sign 6, 4, 9 ; CeladonMart3Text9 + sign 2, 6, 10 ; CeladonMart3Text10 + sign 3, 6, 11 ; CeladonMart3Text11 + sign 5, 6, 12 ; CeladonMart3Text12 + sign 6, 6, 13 ; CeladonMart3Text13 + sign 14, 1, 14 ; CeladonMart3Text14 + sign 4, 1, 15 ; CeladonMart3Text15 + sign 6, 1, 16 ; CeladonMart3Text16 + sign 10, 1, 17 ; CeladonMart3Text17 - db $5 ; objects - object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $b, $6, STAY, RIGHT, $2 ; person - object SPRITE_GAMEBOY_KID_COPY, $7, $2, STAY, DOWN, $3 ; person - object SPRITE_GAMEBOY_KID_COPY, $8, $2, STAY, DOWN, $4 ; person - object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person + db 5 ; objects + object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person + object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person + object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person + object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person + object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person ; warp-to - warp_to $c, $1, CELADON_MART_3_WIDTH ; CELADON_MART_4 - warp_to $10, $1, CELADON_MART_3_WIDTH ; CELADON_MART_2 - warp_to $1, $1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_3_WIDTH ; CELADON_MART_4 + warp_to 16, 1, CELADON_MART_3_WIDTH ; CELADON_MART_2 + warp_to 1, 1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index b7e3e68f..749cc401 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -1,20 +1,20 @@ CeladonMart4Object: - db $f ; border block + db 15 ; border block - db $3 ; warps - warp $c, $1, $0, CELADON_MART_3 - warp $10, $1, $1, CELADON_MART_5 - warp $1, $1, $0, CELADON_MART_ELEVATOR + db 3 ; warps + warp 12, 1, 0, CELADON_MART_3 + warp 16, 1, 1, CELADON_MART_5 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $1 ; signs - sign $e, $1, $4 ; CeladonMart4Text4 + db 1 ; signs + sign 14, 1, 4 ; CeladonMart4Text4 - db $3 ; objects - object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person - object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person - object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person + object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person ; warp-to - warp_to $c, $1, CELADON_MART_4_WIDTH ; CELADON_MART_3 - warp_to $10, $1, CELADON_MART_4_WIDTH ; CELADON_MART_5 - warp_to $1, $1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_4_WIDTH ; CELADON_MART_3 + warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5 + warp_to 1, 1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index f729943d..bf184d5f 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -1,21 +1,21 @@ CeladonMart5Object: - db $f ; border block + db 15 ; border block - db $3 ; warps - warp $c, $1, $0, CELADON_MART_ROOF - warp $10, $1, $1, CELADON_MART_4 - warp $1, $1, $0, CELADON_MART_ELEVATOR + db 3 ; warps + warp 12, 1, 0, CELADON_MART_ROOF + warp 16, 1, 1, CELADON_MART_4 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $1 ; signs - sign $e, $1, $5 ; CeladonMart5Text5 + db 1 ; signs + sign 14, 1, 5 ; CeladonMart5Text5 - db $4 ; objects - object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person - object SPRITE_SAILOR, $2, $6, STAY, NONE, $2 ; person - object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $3 ; person - object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person + object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person + object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person + object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person ; warp-to - warp_to $c, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF - warp_to $10, $1, CELADON_MART_5_WIDTH ; CELADON_MART_4 - warp_to $1, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF + warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4 + warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index ca52dcf6..f7bd1ede 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -1,15 +1,15 @@ CeladonMartElevatorObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $1, $3, $5, CELADON_MART_1 - warp $2, $3, $5, CELADON_MART_1 + db 2 ; warps + warp 1, 3, 5, CELADON_MART_1 + warp 2, 3, 5, CELADON_MART_1 - db $1 ; signs - sign $3, $0, $1 ; CeladonMartElevatorText1 + db 1 ; signs + sign 3, 0, 1 ; CeladonMartElevatorText1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $1, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 - warp_to $2, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 + warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 + warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index e6fda0e7..7a2d1a7f 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -1,18 +1,18 @@ CeladonMartRoofObject: - db $42 ; border block + db 66 ; border block - db $1 ; warps - warp $f, $2, $0, CELADON_MART_5 + db 1 ; warps + warp 15, 2, 0, CELADON_MART_5 - db $4 ; signs - sign $a, $1, $3 ; CeladonMartRoofText3 - sign $b, $1, $4 ; CeladonMartRoofText4 - sign $c, $2, $5 ; CeladonMartRoofText5 - sign $d, $2, $6 ; CeladonMartRoofText6 + db 4 ; signs + sign 10, 1, 3 ; CeladonMartRoofText3 + sign 11, 1, 4 ; CeladonMartRoofText4 + sign 12, 2, 5 ; CeladonMartRoofText5 + sign 13, 2, 6 ; CeladonMartRoofText6 - db $2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person - object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person + db 2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person ; warp-to - warp_to $f, $2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 + warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index bf08a4aa..6393ee69 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -1,18 +1,18 @@ CeladonPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $5, $ff - warp $4, $7, $5, $ff + db 2 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person - object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person + object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, CELADON_POKECENTER_WIDTH - warp_to $4, $7, CELADON_POKECENTER_WIDTH + warp_to 3, 7, CELADON_POKECENTER_WIDTH + warp_to 4, 7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index 8acea80c..dbffa9b9 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -1,19 +1,19 @@ CeladonPrizeRoomObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $4, $7, $9, $ff - warp $5, $7, $9, $ff + db 2 ; warps + warp 4, 7, 9, -1 + warp 5, 7, 9, -1 - db $3 ; signs - sign $2, $2, $3 ; CeladonPrizeRoomText3 - sign $4, $2, $4 ; CeladonPrizeRoomText4 - sign $6, $2, $5 ; CeladonPrizeRoomText5 + db 3 ; signs + sign 2, 2, 3 ; CeladonPrizeRoomText3 + sign 4, 2, 4 ; CeladonPrizeRoomText4 + sign 6, 2, 5 ; CeladonPrizeRoomText5 - db $2 ; objects - object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person - object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person + object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person ; warp-to - warp_to $4, $7, CELADON_PRIZE_ROOM_WIDTH - warp_to $5, $7, CELADON_PRIZE_ROOM_WIDTH + warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH + warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index a20e6252..bdff2047 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,47 +1,47 @@ CeruleanCityObject: - db $f ; border block + db 15 ; border block - db $a ; warps - warp $1b, $b, $0, TRASHED_HOUSE - warp $d, $f, $0, CERULEAN_HOUSE_1 - warp $13, $11, $0, CERULEAN_POKECENTER - warp $1e, $13, $0, CERULEAN_GYM - warp $d, $19, $0, BIKE_SHOP - warp $19, $19, $0, CERULEAN_MART - warp $4, $b, $0, UNKNOWN_DUNGEON_1 - warp $1b, $9, $2, TRASHED_HOUSE - warp $9, $b, $1, CERULEAN_HOUSE_2 - warp $9, $9, $0, CERULEAN_HOUSE_2 + db 10 ; warps + warp 27, 11, 0, TRASHED_HOUSE + warp 13, 15, 0, CERULEAN_HOUSE_1 + warp 19, 17, 0, CERULEAN_POKECENTER + warp 30, 19, 0, CERULEAN_GYM + warp 13, 25, 0, BIKE_SHOP + warp 25, 25, 0, CERULEAN_MART + warp 4, 11, 0, UNKNOWN_DUNGEON_1 + warp 27, 9, 2, TRASHED_HOUSE + warp 9, 11, 1, CERULEAN_HOUSE_2 + warp 9, 9, 0, CERULEAN_HOUSE_2 - db $6 ; signs - sign $17, $13, $c ; CeruleanCityText12 - sign $11, $1d, $d ; CeruleanCityText13 - sign $1a, $19, $e ; MartSignText - sign $14, $11, $f ; PokeCenterSignText - sign $b, $19, $10 ; CeruleanCityText16 - sign $1b, $15, $11 ; CeruleanCityText17 + db 6 ; signs + sign 23, 19, 12 ; CeruleanCityText12 + sign 17, 29, 13 ; CeruleanCityText13 + sign 26, 25, 14 ; MartSignText + sign 20, 17, 15 ; PokeCenterSignText + sign 11, 25, 16 ; CeruleanCityText16 + sign 27, 21, 17 ; CeruleanCityText17 - db $b ; objects - object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, OPP_ROCKET, $5 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person - object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person - object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person - object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person - object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person - object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person - object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person - object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person + db 11 ; objects + object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 + object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person + object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person + object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person + object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person + object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person + object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person + object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person + object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person + object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person ; warp-to - warp_to $1b, $b, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to $d, $f, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 - warp_to $13, $11, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER - warp_to $1e, $13, CERULEAN_CITY_WIDTH ; CERULEAN_GYM - warp_to $d, $19, CERULEAN_CITY_WIDTH ; BIKE_SHOP - warp_to $19, $19, CERULEAN_CITY_WIDTH ; CERULEAN_MART - warp_to $4, $b, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to $1b, $9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to $9, $b, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 - warp_to $9, $9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 + warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE + warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 + warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER + warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM + warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP + warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART + warp_to 4, 11, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE + warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 + warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 5a35e9e7..e4ce6250 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -1,18 +1,18 @@ CeruleanGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $d, $3, $ff - warp $5, $d, $3, $ff + db 2 ; warps + warp 4, 13, 3, -1 + warp 5, 13, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 - object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR_TRAINER_F, $1 - object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 - object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 + object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 + object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 + object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person ; warp-to - warp_to $4, $d, CERULEAN_GYM_WIDTH - warp_to $5, $d, CERULEAN_GYM_WIDTH + warp_to 4, 13, CERULEAN_GYM_WIDTH + warp_to 5, 13, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 08359b80..6c47bba9 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -1,16 +1,16 @@ CeruleanHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $1, $ff - warp $3, $7, $1, $ff + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person - object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person ; warp-to - warp_to $2, $7, CERULEAN_HOUSE_1_WIDTH - warp_to $3, $7, CERULEAN_HOUSE_1_WIDTH + warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH + warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index c7c4beae..65f457bc 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -1,17 +1,17 @@ CeruleanHouse2Object: - db $c ; border block + db 12 ; border block - db $3 ; warps - warp $2, $0, $9, $ff - warp $2, $7, $8, $ff - warp $3, $7, $8, $ff + db 3 ; warps + warp 2, 0, 9, -1 + warp 2, 7, 8, -1 + warp 3, 7, 8, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person + db 1 ; objects + object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to $2, $0, CERULEAN_HOUSE_2_WIDTH - warp_to $2, $7, CERULEAN_HOUSE_2_WIDTH - warp_to $3, $7, CERULEAN_HOUSE_2_WIDTH + warp_to 2, 0, CERULEAN_HOUSE_2_WIDTH + warp_to 2, 7, CERULEAN_HOUSE_2_WIDTH + warp_to 3, 7, CERULEAN_HOUSE_2_WIDTH diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 70857293..c5a88424 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -1,19 +1,19 @@ CeruleanHouseTrashedObject: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $2, $7, $0, $ff - warp $3, $7, $0, $ff - warp $3, $0, $7, $ff + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 3, 0, 7, -1 - db $1 ; signs - sign $3, $0, $3 ; CeruleanHouseTrashedText3 + db 1 ; signs + sign 3, 0, 3 ; CeruleanHouseTrashedText3 - db $2 ; objects - object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person - object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person + object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person ; warp-to - warp_to $2, $7, TRASHED_HOUSE_WIDTH - warp_to $3, $7, TRASHED_HOUSE_WIDTH - warp_to $3, $0, TRASHED_HOUSE_WIDTH + warp_to 2, 7, TRASHED_HOUSE_WIDTH + warp_to 3, 7, TRASHED_HOUSE_WIDTH + warp_to 3, 0, TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index 13e86d81..5c30bf03 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -1,17 +1,17 @@ CeruleanMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $5, $ff - warp $4, $7, $5, $ff + db 2 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $3, $4, WALK, $1, $2 ; person - object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person + object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person ; warp-to - warp_to $3, $7, CERULEAN_MART_WIDTH - warp_to $4, $7, CERULEAN_MART_WIDTH + warp_to 3, 7, CERULEAN_MART_WIDTH + warp_to 4, 7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 45c3c263..7a862ec3 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -1,18 +1,18 @@ CeruleanPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $2, $ff - warp $4, $7, $2, $ff + db 2 ; warps + warp 3, 7, 2, -1 + warp 4, 7, 2, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person + object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, CERULEAN_POKECENTER_WIDTH - warp_to $4, $7, CERULEAN_POKECENTER_WIDTH + warp_to 3, 7, CERULEAN_POKECENTER_WIDTH + warp_to 4, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 509a721e..b9fb420e 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -1,23 +1,23 @@ CinnabarGymObject: - db $2e ; border block + db 46 ; border block - db $2 ; warps - warp $10, $11, $1, $ff - warp $11, $11, $1, $ff + db 2 ; warps + warp 16, 17, 1, -1 + warp 17, 17, 1, -1 - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 - object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9 - object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4 - object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a - object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, OPP_BURGLAR, $5 - object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, OPP_SUPER_NERD, $b - object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, OPP_BURGLAR, $6 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, OPP_SUPER_NERD, $c - object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person + db 9 ; objects + object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 + object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 + object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 + object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 + object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 + object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 + object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 + object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 + object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person ; warp-to - warp_to $10, $11, CINNABAR_GYM_WIDTH - warp_to $11, $11, CINNABAR_GYM_WIDTH + warp_to 16, 17, CINNABAR_GYM_WIDTH + warp_to 17, 17, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 27a425f2..0fcfed38 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -1,27 +1,27 @@ CinnabarIslandObject: - db $43 ; border block + db 67 ; border block - db $5 ; warps - warp $6, $3, $1, MANSION_1 - warp $12, $3, $0, CINNABAR_GYM - warp $6, $9, $0, CINNABAR_LAB_1 - warp $b, $b, $0, CINNABAR_POKECENTER - warp $f, $b, $0, CINNABAR_MART + db 5 ; warps + warp 6, 3, 1, MANSION_1 + warp 18, 3, 0, CINNABAR_GYM + warp 6, 9, 0, CINNABAR_LAB_1 + warp 11, 11, 0, CINNABAR_POKECENTER + warp 15, 11, 0, CINNABAR_MART - db $5 ; signs - sign $9, $5, $3 ; CinnabarIslandText3 - sign $10, $b, $4 ; MartSignText - sign $c, $b, $5 ; PokeCenterSignText - sign $9, $b, $6 ; CinnabarIslandText6 - sign $d, $3, $7 ; CinnabarIslandText7 + db 5 ; signs + sign 9, 5, 3 ; CinnabarIslandText3 + sign 16, 11, 4 ; MartSignText + sign 12, 11, 5 ; PokeCenterSignText + sign 9, 11, 6 ; CinnabarIslandText6 + sign 13, 3, 7 ; CinnabarIslandText7 - db $2 ; objects - object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person - object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person ; warp-to - warp_to $6, $3, CINNABAR_ISLAND_WIDTH ; MANSION_1 - warp_to $12, $3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM - warp_to $6, $9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 - warp_to $b, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER - warp_to $f, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART + warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1 + warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM + warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER + warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 5297930e..2c740a05 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -1,17 +1,17 @@ CinnabarMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $4, $ff + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_ERIKA, $6, $2, STAY, NONE, $2 ; person - object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person + object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person ; warp-to - warp_to $3, $7, CINNABAR_MART_WIDTH - warp_to $4, $7, CINNABAR_MART_WIDTH + warp_to 3, 7, CINNABAR_MART_WIDTH + warp_to 4, 7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 6df12279..19baee75 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -1,18 +1,18 @@ CinnabarPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $3, $ff - warp $4, $7, $3, $ff + db 2 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person + object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, CINNABAR_POKECENTER_WIDTH - warp_to $4, $7, CINNABAR_POKECENTER_WIDTH + warp_to 3, 7, CINNABAR_POKECENTER_WIDTH + warp_to 4, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 91fea6b9..f879d9e9 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -1,9 +1,9 @@ ColosseumObject: - db $e ; border block + db 14 ; border block - db $0 ; warps + db 0 ; warps - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_RED, $2, $2, STAY, $0, $1 ; person + db 1 ; objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 49eb8168..02ca3859 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -1,19 +1,19 @@ CopycatsHouse1FObject: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $2, $7, $0, $ff - warp $3, $7, $0, $ff - warp $7, $1, $0, COPYCATS_HOUSE_2F + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 7, 1, 0, COPYCATS_HOUSE_2F - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person - object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person - object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person + db 3 ; objects + object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person + object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person ; warp-to - warp_to $2, $7, COPYCATS_HOUSE_1F_WIDTH - warp_to $3, $7, COPYCATS_HOUSE_1F_WIDTH - warp_to $7, $1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F + warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH + warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH + warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 5d2de9ef..1f36b2e5 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -1,19 +1,19 @@ CopycatsHouse2FObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $1, $2, COPYCATS_HOUSE_1F + db 1 ; warps + warp 7, 1, 2, COPYCATS_HOUSE_1F - db $2 ; signs - sign $3, $5, $6 ; CopycatsHouse2FText6 - sign $0, $1, $7 ; CopycatsHouse2FText7 + db 2 ; signs + sign 3, 5, 6 ; CopycatsHouse2FText6 + sign 0, 1, 7 ; CopycatsHouse2FText7 - db $5 ; objects - object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person - object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person - object SPRITE_SLOWBRO, $5, $1, STAY, DOWN, $3 ; person - object SPRITE_BIRD, $2, $0, STAY, DOWN, $4 ; person - object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person + db 5 ; objects + object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person + object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person + object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person + object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person ; warp-to - warp_to $7, $1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F + warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index dfc1d8fb..c435d7fe 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -1,15 +1,15 @@ DayCareMObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $4, $ff - warp $3, $7, $4, $ff + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GENTLEMAN, $2, $3, STAY, RIGHT, $1 ; person + db 1 ; objects + object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to $2, $7, DAYCAREM_WIDTH - warp_to $3, $7, DAYCAREM_WIDTH + warp_to 2, 7, DAYCAREM_WIDTH + warp_to 3, 7, DAYCAREM_WIDTH diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index 160a9f43..da2b8656 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -1,14 +1,14 @@ DiglettsCaveObject: - db $19 ; border block + db 25 ; border block - db $2 ; warps - warp $5, $5, $2, DIGLETTS_CAVE_EXIT - warp $25, $1f, $2, DIGLETTS_CAVE_ENTRANCE + db 2 ; warps + warp 5, 5, 2, DIGLETTS_CAVE_EXIT + warp 37, 31, 2, DIGLETTS_CAVE_ENTRANCE - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $5, $5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to $25, $1f, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE + warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index 627f1f5e..45cbfc49 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -1,17 +1,17 @@ DiglettsCaveEntranceRoute11Object: - db $7d ; border block + db 125 ; border block - db $3 ; warps - warp $2, $7, $4, $ff - warp $3, $7, $4, $ff - warp $4, $4, $1, DIGLETTS_CAVE + db 3 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 + warp 4, 4, 1, DIGLETTS_CAVE - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GAMBLER, $2, $3, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person ; warp-to - warp_to $2, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH - warp_to $3, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH - warp_to $4, $4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE + warp_to 2, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index f52dbe1f..ef4d45ad 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -1,17 +1,17 @@ DiglettsCaveRoute2Object: - db $7d ; border block + db 125 ; border block - db $3 ; warps - warp $2, $7, $0, $ff - warp $3, $7, $0, $ff - warp $4, $4, $0, DIGLETTS_CAVE + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 4, 4, 0, DIGLETTS_CAVE - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $3, $3, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person ; warp-to - warp_to $2, $7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to $3, $7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to $4, $4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE + warp_to 2, 7, DIGLETTS_CAVE_EXIT_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_EXIT_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index c310ed53..3cfc6c00 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -1,22 +1,22 @@ FanClubObject: - db $d ; border block + db 13 ; border block - db $2 ; warps - warp $2, $7, $1, $ff - warp $3, $7, $1, $ff + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $2 ; signs - sign $1, $0, $7 ; FanClubText7 - sign $6, $0, $8 ; FanClubText8 + db 2 ; signs + sign 1, 0, 7 ; FanClubText7 + sign 6, 0, 8 ; FanClubText8 - db $6 ; objects - object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person - object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person - object SPRITE_CLEFAIRY, $6, $4, STAY, LEFT, $3 ; person - object SPRITE_SEEL, $1, $4, STAY, RIGHT, $4 ; person - object SPRITE_GENTLEMAN, $3, $1, STAY, DOWN, $5 ; person - object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person + db 6 ; objects + object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person + object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person + object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person + object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person + object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person + object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person ; warp-to - warp_to $2, $7, POKEMON_FAN_CLUB_WIDTH - warp_to $3, $7, POKEMON_FAN_CLUB_WIDTH + warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH + warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index a54a60f4..952da1a4 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -1,21 +1,21 @@ FightingDojoObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $b, $1, $ff - warp $5, $b, $1, $ff + db 2 ; warps + warp 4, 11, 1, -1 + warp 5, 11, 1, -1 - db $0 ; signs + db 0 ; signs - db $7 ; objects - object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, OPP_BLACKBELT, $1 - object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, OPP_BLACKBELT, $2 - object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, OPP_BLACKBELT, $3 - object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, OPP_BLACKBELT, $4 - object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, OPP_BLACKBELT, $5 - object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person - object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person + db 7 ; objects + object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 + object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 + object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 + object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 + object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 + object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person + object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person ; warp-to - warp_to $4, $b, FIGHTING_DOJO_WIDTH - warp_to $5, $b, FIGHTING_DOJO_WIDTH + warp_to 4, 11, FIGHTING_DOJO_WIDTH + warp_to 5, 11, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 71533132..180c051a 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -1,52 +1,52 @@ FuchsiaCityObject: - db $f ; border block + db 15 ; border block - db $9 ; warps - warp $5, $d, $0, FUCHSIA_MART - warp $b, $1b, $0, FUCHSIA_HOUSE_1 - warp $13, $1b, $0, FUCHSIA_POKECENTER - warp $1b, $1b, $0, FUCHSIA_HOUSE_2 - warp $12, $3, $0, SAFARI_ZONE_ENTRANCE - warp $5, $1b, $0, FUCHSIA_GYM - warp $16, $d, $0, FUCHSIA_MEETING_ROOM - warp $1f, $1b, $1, FUCHSIA_HOUSE_3 - warp $1f, $18, $0, FUCHSIA_HOUSE_3 + db 9 ; warps + warp 5, 13, 0, FUCHSIA_MART + warp 11, 27, 0, FUCHSIA_HOUSE_1 + warp 19, 27, 0, FUCHSIA_POKECENTER + warp 27, 27, 0, FUCHSIA_HOUSE_2 + warp 18, 3, 0, SAFARI_ZONE_ENTRANCE + warp 5, 27, 0, FUCHSIA_GYM + warp 22, 13, 0, FUCHSIA_MEETING_ROOM + warp 31, 27, 1, FUCHSIA_HOUSE_3 + warp 31, 24, 0, FUCHSIA_HOUSE_3 - db $e ; signs - sign $f, $17, $b ; FuchsiaCityText11 - sign $19, $f, $c ; FuchsiaCityText12 - sign $11, $5, $d ; FuchsiaCityText13 - sign $6, $d, $e ; MartSignText - sign $14, $1b, $f ; PokeCenterSignText - sign $1b, $1d, $10 ; FuchsiaCityText16 - sign $15, $f, $11 ; FuchsiaCityText17 - sign $5, $1d, $12 ; FuchsiaCityText18 - sign $21, $7, $13 ; FuchsiaCityText19 - sign $1b, $7, $14 ; FuchsiaCityText20 - sign $d, $7, $15 ; FuchsiaCityText21 - sign $1f, $d, $16 ; FuchsiaCityText22 - sign $d, $f, $17 ; FuchsiaCityText23 - sign $7, $7, $18 ; FuchsiaCityText24 + db 14 ; signs + sign 15, 23, 11 ; FuchsiaCityText11 + sign 25, 15, 12 ; FuchsiaCityText12 + sign 17, 5, 13 ; FuchsiaCityText13 + sign 6, 13, 14 ; MartSignText + sign 20, 27, 15 ; PokeCenterSignText + sign 27, 29, 16 ; FuchsiaCityText16 + sign 21, 15, 17 ; FuchsiaCityText17 + sign 5, 29, 18 ; FuchsiaCityText18 + sign 33, 7, 19 ; FuchsiaCityText19 + sign 27, 7, 20 ; FuchsiaCityText20 + sign 13, 7, 21 ; FuchsiaCityText21 + sign 31, 13, 22 ; FuchsiaCityText22 + sign 13, 15, 23 ; FuchsiaCityText23 + sign 7, 7, 24 ; FuchsiaCityText24 - db $a ; objects - object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person - object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person - object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person - object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person - object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person - object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person - object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person - object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person - object SPRITE_SEEL, $8, $11, WALK, $0, $9 ; person - object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person + db 10 ; objects + object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person + object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person + object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person + object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person + object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person + object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person + object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person + object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person + object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person ; warp-to - warp_to $5, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to $b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 - warp_to $13, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to $1b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 - warp_to $12, $3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to $5, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM - warp_to $16, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to $1f, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 - warp_to $1f, $18, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART + warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 + warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER + warp_to 27, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 + warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM + warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM + warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 14175052..7578323c 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -1,22 +1,22 @@ FuchsiaGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $11, $5, $ff - warp $5, $11, $5, $ff + db 2 ; warps + warp 4, 17, 5, -1 + warp 5, 17, 5, -1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1 - object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7 - object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3 - object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8 - object SPRITE_ROCKER, $3, $5, STAY, UP, $5, OPP_TAMER, $1 - object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, OPP_TAMER, $2 - object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, OPP_JUGGLER, $4 - object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person + db 8 ; objects + object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 + object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 + object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 + object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 + object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 + object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 + object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person ; warp-to - warp_to $4, $11, FUCHSIA_GYM_WIDTH - warp_to $5, $11, FUCHSIA_GYM_WIDTH + warp_to 4, 17, FUCHSIA_GYM_WIDTH + warp_to 5, 17, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index d528bc00..89745485 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -1,17 +1,17 @@ FuchsiaHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $1, $ff - warp $3, $7, $1, $ff + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MOM_GEISHA, $2, $3, STAY, RIGHT, $1 ; person - object SPRITE_GAMBLER, $7, $2, STAY, UP, $2 ; person - object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person + object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person ; warp-to - warp_to $2, $7, FUCHSIA_HOUSE_1_WIDTH - warp_to $3, $7, FUCHSIA_HOUSE_1_WIDTH + warp_to 2, 7, FUCHSIA_HOUSE_1_WIDTH + warp_to 3, 7, FUCHSIA_HOUSE_1_WIDTH diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index 3e549857..a1c3aefe 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -1,19 +1,19 @@ FuchsiaHouse2Object: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $4, $7, $3, $ff - warp $5, $7, $3, $ff + db 2 ; warps + warp 4, 7, 3, -1 + warp 5, 7, 3, -1 - db $2 ; signs - sign $4, $3, $4 ; FuchsiaHouse2Text4 - sign $5, $3, $5 ; FuchsiaHouse2Text5 + db 2 ; signs + sign 4, 3, 4 ; FuchsiaHouse2Text4 + sign 5, 3, 5 ; FuchsiaHouse2Text5 - db $3 ; objects - object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person - object SPRITE_BALL, $8, $3, STAY, NONE, $2, RARE_CANDY - object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person + db 3 ; objects + object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person + object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY + object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person ; warp-to - warp_to $4, $7, FUCHSIA_HOUSE_2_WIDTH - warp_to $5, $7, FUCHSIA_HOUSE_2_WIDTH + warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH + warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 9f731397..ea17c953 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -1,17 +1,17 @@ FuchsiaHouse3Object: - db $c ; border block + db 12 ; border block - db $3 ; warps - warp $2, $0, $8, $ff - warp $2, $7, $7, $ff - warp $3, $7, $7, $ff + db 3 ; warps + warp 2, 0, 8, -1 + warp 2, 7, 7, -1 + warp 3, 7, 7, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $5, $3, STAY, RIGHT, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to $2, $0, FUCHSIA_HOUSE_3_WIDTH - warp_to $2, $7, FUCHSIA_HOUSE_3_WIDTH - warp_to $3, $7, FUCHSIA_HOUSE_3_WIDTH + warp_to 2, 0, FUCHSIA_HOUSE_3_WIDTH + warp_to 2, 7, FUCHSIA_HOUSE_3_WIDTH + warp_to 3, 7, FUCHSIA_HOUSE_3_WIDTH diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index 7b837824..ab06366d 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -1,17 +1,17 @@ FuchsiaMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $0, $ff - warp $4, $7, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_FAT_BALD_GUY, $4, $2, STAY, NONE, $2 ; person - object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person + object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person ; warp-to - warp_to $3, $7, FUCHSIA_MART_WIDTH - warp_to $4, $7, FUCHSIA_MART_WIDTH + warp_to 3, 7, FUCHSIA_MART_WIDTH + warp_to 4, 7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index f8b8bb43..4330b59e 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -1,17 +1,17 @@ FuchsiaMeetingRoomObject: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $4, $7, $6, $ff - warp $5, $7, $6, $ff + db 2 ; warps + warp 4, 7, 6, -1 + warp 5, 7, 6, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_WHITE_PLAYER, $4, $1, STAY, DOWN, $1 ; person - object SPRITE_WHITE_PLAYER, $0, $2, STAY, UP, $2 ; person - object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person + db 3 ; objects + object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person + object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person + object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person ; warp-to - warp_to $4, $7, FUCHSIA_MEETING_ROOM_WIDTH - warp_to $5, $7, FUCHSIA_MEETING_ROOM_WIDTH + warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH + warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 048319fd..7db09516 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -1,18 +1,18 @@ FuchsiaPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $2, $ff - warp $4, $7, $2, $ff + db 2 ; warps + warp 3, 7, 2, -1 + warp 4, 7, 2, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person - object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person + object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, FUCHSIA_POKECENTER_WIDTH - warp_to $4, $7, FUCHSIA_POKECENTER_WIDTH + warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH + warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index f26ed787..c16bdec8 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -1,20 +1,20 @@ GaryObject: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $3, $7, $1, LANCES_ROOM - warp $4, $7, $2, LANCES_ROOM - warp $3, $0, $0, HALL_OF_FAME - warp $4, $0, $0, HALL_OF_FAME + db 4 ; warps + warp 3, 7, 1, LANCES_ROOM + warp 4, 7, 2, LANCES_ROOM + warp 3, 0, 0, HALL_OF_FAME + warp 4, 0, 0, HALL_OF_FAME - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BLUE, $4, $2, STAY, DOWN, $1 ; person - object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person ; warp-to - warp_to $3, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to $4, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to $3, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME - warp_to $4, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index 54e284ae..dc63d777 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -1,15 +1,15 @@ HallofFameRoomObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $7, $2, CHAMPIONS_ROOM - warp $5, $7, $3, CHAMPIONS_ROOM + db 2 ; warps + warp 4, 7, 2, CHAMPIONS_ROOM + warp 5, 7, 3, CHAMPIONS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person ; warp-to - warp_to $4, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM - warp_to $5, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM + warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM + warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index 45ddc6d6..cfabb44c 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -1,14 +1,14 @@ IndigoPlateauObject: - db $e ; border block + db 14 ; border block - db $2 ; warps - warp $9, $5, $0, INDIGO_PLATEAU_LOBBY - warp $a, $5, $0, INDIGO_PLATEAU_LOBBY + db 2 ; warps + warp 9, 5, 0, INDIGO_PLATEAU_LOBBY + warp 10, 5, 0, INDIGO_PLATEAU_LOBBY - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $9, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to $a, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index 94ddab50..b7149d3f 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -1,21 +1,21 @@ IndigoPlateauLobbyObject: - db $0 ; border block + db 0 ; border block - db $3 ; warps - warp $7, $b, $0, $ff - warp $8, $b, $1, $ff - warp $8, $0, $0, LORELEIS_ROOM + db 3 ; warps + warp 7, 11, 0, -1 + warp 8, 11, 1, -1 + warp 8, 0, 0, LORELEIS_ROOM - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person - object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person - object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person - object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person + object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person + object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person ; warp-to - warp_to $7, $b, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to $8, $b, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to $8, $0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM + warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index d801b948..cbd8e179 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -1,25 +1,25 @@ Lab1Object: - db $17 ; border block + db 23 ; border block - db $5 ; warps - warp $2, $7, $2, $ff - warp $3, $7, $2, $ff - warp $8, $4, $0, CINNABAR_LAB_2 - warp $c, $4, $0, CINNABAR_LAB_3 - warp $10, $4, $0, CINNABAR_LAB_4 + db 5 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 + warp 8, 4, 0, CINNABAR_LAB_2 + warp 12, 4, 0, CINNABAR_LAB_3 + warp 16, 4, 0, CINNABAR_LAB_4 - db $4 ; signs - sign $3, $2, $2 ; Lab1Text2 - sign $9, $4, $3 ; Lab1Text3 - sign $d, $4, $4 ; Lab1Text4 - sign $11, $4, $5 ; Lab1Text5 + db 4 ; signs + sign 3, 2, 2 ; Lab1Text2 + sign 9, 4, 3 ; Lab1Text3 + sign 13, 4, 4 ; Lab1Text4 + sign 17, 4, 5 ; Lab1Text5 - db $1 ; objects - object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person ; warp-to - warp_to $2, $7, CINNABAR_LAB_1_WIDTH - warp_to $3, $7, CINNABAR_LAB_1_WIDTH - warp_to $8, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 - warp_to $c, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 - warp_to $10, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 + warp_to 2, 7, CINNABAR_LAB_1_WIDTH + warp_to 3, 7, CINNABAR_LAB_1_WIDTH + warp_to 8, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 + warp_to 12, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 + warp_to 16, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 77d1eef6..81fdbc8a 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,17 +1,17 @@ Lab2Object: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $2, $7, $2, CINNABAR_LAB_1 - warp $3, $7, $2, CINNABAR_LAB_1 + db 2 ; warps + warp 2, 7, 2, CINNABAR_LAB_1 + warp 3, 7, 2, CINNABAR_LAB_1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, DOWN, $1 ; person - object SPRITE_OLD_PERSON, $1, $4, STAY, NONE, $2 ; person - object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person + object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person ; warp-to - warp_to $2, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 - warp_to $3, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index ebea056c..fea6581e 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -1,19 +1,19 @@ Lab3Object: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $2, $7, $3, CINNABAR_LAB_1 - warp $3, $7, $3, CINNABAR_LAB_1 + db 2 ; warps + warp 2, 7, 3, CINNABAR_LAB_1 + warp 3, 7, 3, CINNABAR_LAB_1 - db $3 ; signs - sign $0, $4, $3 ; Lab3Text3 - sign $1, $4, $4 ; Lab3Text4 - sign $2, $1, $5 ; Lab3Text5 + db 3 ; signs + sign 0, 4, 3 ; Lab3Text3 + sign 1, 4, 4 ; Lab3Text4 + sign 2, 1, 5 ; Lab3Text5 - db $2 ; objects - object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person - object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person ; warp-to - warp_to $2, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 - warp_to $3, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 + warp_to 3, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 2939142a..cee79528 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -1,16 +1,16 @@ Lab4Object: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $2, $7, $4, CINNABAR_LAB_1 - warp $3, $7, $4, CINNABAR_LAB_1 + db 2 ; warps + warp 2, 7, 4, CINNABAR_LAB_1 + warp 3, 7, 4, CINNABAR_LAB_1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_OAK_AIDE, $5, $2, WALK, $2, $1 ; person - object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person + db 2 ; objects + object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person + object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person ; warp-to - warp_to $2, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 - warp_to $3, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 + warp_to 3, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 73ed8e63..572ae77c 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -1,17 +1,17 @@ LanceObject: - db $3 ; border block + db 3 ; border block - db $3 ; warps - warp $18, $10, $2, AGATHAS_ROOM - warp $5, $0, $0, CHAMPIONS_ROOM - warp $6, $0, $0, CHAMPIONS_ROOM + db 3 ; warps + warp 24, 16, 2, AGATHAS_ROOM + warp 5, 0, 0, CHAMPIONS_ROOM + warp 6, 0, 0, CHAMPIONS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 + db 1 ; objects + object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 ; warp-to - warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM - warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM - warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 4353a192..cd925419 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -1,20 +1,20 @@ LavenderHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $2, $ff - warp $3, $7, $2, $ff + db 2 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, NONE, $1 ; person - object SPRITE_LITTLE_GIRL, $6, $3, STAY, DOWN, $2 ; person - object SPRITE_SLOWBRO, $6, $4, STAY, UP, $3 ; person - object SPRITE_SLOWBRO, $1, $3, STAY, NONE, $4 ; person - object SPRITE_MR_FUJI, $3, $1, STAY, NONE, $5 ; person - object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person + db 6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person + object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person + object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person + object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person ; warp-to - warp_to $2, $7, LAVENDER_HOUSE_1_WIDTH - warp_to $3, $7, LAVENDER_HOUSE_1_WIDTH + warp_to 2, 7, LAVENDER_HOUSE_1_WIDTH + warp_to 3, 7, LAVENDER_HOUSE_1_WIDTH diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index 991f1adb..a70b4e66 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -1,16 +1,16 @@ LavenderHouse2Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $4, $ff - warp $3, $7, $4, $ff + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_SLOWBRO, $3, $5, STAY, UP, $1 ; person - object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person + db 2 ; objects + object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person + object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person ; warp-to - warp_to $2, $7, LAVENDER_HOUSE_2_WIDTH - warp_to $3, $7, LAVENDER_HOUSE_2_WIDTH + warp_to 2, 7, LAVENDER_HOUSE_2_WIDTH + warp_to 3, 7, LAVENDER_HOUSE_2_WIDTH diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 1b459d5c..68ae3ada 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -1,17 +1,17 @@ LavenderMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $3, $ff - warp $4, $7, $3, $ff + db 2 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BALDING_GUY, $3, $4, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person ; warp-to - warp_to $3, $7, LAVENDER_MART_WIDTH - warp_to $4, $7, LAVENDER_MART_WIDTH + warp_to 3, 7, LAVENDER_MART_WIDTH + warp_to 4, 7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index c2d3ee46..e7825178 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -1,18 +1,18 @@ LavenderPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $0, $ff - warp $4, $7, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $5, $3, STAY, NONE, $2 ; person - object SPRITE_LITTLE_GIRL, $2, $6, WALK, $1, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person + object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, LAVENDER_POKECENTER_WIDTH - warp_to $4, $7, LAVENDER_POKECENTER_WIDTH + warp_to 3, 7, LAVENDER_POKECENTER_WIDTH + warp_to 4, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index d2d37589..16fc183f 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -1,31 +1,31 @@ LavenderTownObject: - db $2c ; border block + db 44 ; border block - db $6 ; warps - warp $3, $5, $0, LAVENDER_POKECENTER - warp $e, $5, $0, POKEMONTOWER_1 - warp $7, $9, $0, LAVENDER_HOUSE_1 - warp $f, $d, $0, LAVENDER_MART - warp $3, $d, $0, LAVENDER_HOUSE_2 - warp $7, $d, $0, NAME_RATERS_HOUSE + db 6 ; warps + warp 3, 5, 0, LAVENDER_POKECENTER + warp 14, 5, 0, POKEMONTOWER_1 + warp 7, 9, 0, LAVENDER_HOUSE_1 + warp 15, 13, 0, LAVENDER_MART + warp 3, 13, 0, LAVENDER_HOUSE_2 + warp 7, 13, 0, NAME_RATERS_HOUSE - db $6 ; signs - sign $b, $9, $4 ; LavenderTownText4 - sign $9, $3, $5 ; LavenderTownText5 - sign $10, $d, $6 ; MartSignText - sign $4, $5, $7 ; PokeCenterSignText - sign $5, $9, $8 ; LavenderTownText8 - sign $11, $7, $9 ; LavenderTownText9 + db 6 ; signs + sign 11, 9, 4 ; LavenderTownText4 + sign 9, 3, 5 ; LavenderTownText5 + sign 16, 13, 6 ; MartSignText + sign 4, 5, 7 ; PokeCenterSignText + sign 5, 9, 8 ; LavenderTownText8 + sign 17, 7, 9 ; LavenderTownText9 - db $3 ; objects - object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $9, $a, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person + db 3 ; objects + object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person ; warp-to - warp_to $3, $5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER - warp_to $e, $5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1 - warp_to $7, $9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1 - warp_to $f, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_MART - warp_to $3, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2 - warp_to $7, $d, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE + warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER + warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1 + warp_to 7, 9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1 + warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART + warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2 + warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 9791b859..82f0c47f 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -1,19 +1,19 @@ LoreleiObject: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $4, $b, $2, INDIGO_PLATEAU_LOBBY - warp $5, $b, $2, INDIGO_PLATEAU_LOBBY - warp $4, $0, $0, BRUNOS_ROOM - warp $5, $0, $1, BRUNOS_ROOM + db 4 ; warps + warp 4, 11, 2, INDIGO_PLATEAU_LOBBY + warp 5, 11, 2, INDIGO_PLATEAU_LOBBY + warp 4, 0, 0, BRUNOS_ROOM + warp 5, 0, 1, BRUNOS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 + db 1 ; objects + object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 ; warp-to - warp_to $4, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to $5, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to $4, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to $5, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index ae2c88ca..6e639865 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -1,29 +1,29 @@ Mansion1Object: - db $2e ; border block + db 46 ; border block - db $8 ; warps - warp $4, $1b, $0, $ff - warp $5, $1b, $0, $ff - warp $6, $1b, $0, $ff - warp $7, $1b, $0, $ff - warp $5, $a, $0, MANSION_2 - warp $15, $17, $0, MANSION_4 - warp $1a, $1b, $0, $ff - warp $1b, $1b, $0, $ff + db 8 ; warps + warp 4, 27, 0, -1 + warp 5, 27, 0, -1 + warp 6, 27, 0, -1 + warp 7, 27, 0, -1 + warp 5, 10, 0, MANSION_2 + warp 21, 23, 0, MANSION_4 + warp 26, 27, 0, -1 + warp 27, 27, 0, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, OPP_SCIENTIST, $4 - object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE - object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS + db 3 ; objects + object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS ; warp-to - warp_to $4, $1b, MANSION_1_WIDTH - warp_to $5, $1b, MANSION_1_WIDTH - warp_to $6, $1b, MANSION_1_WIDTH - warp_to $7, $1b, MANSION_1_WIDTH - warp_to $5, $a, MANSION_1_WIDTH ; MANSION_2 - warp_to $15, $17, MANSION_1_WIDTH ; MANSION_4 - warp_to $1a, $1b, MANSION_1_WIDTH - warp_to $1b, $1b, MANSION_1_WIDTH + warp_to 4, 27, MANSION_1_WIDTH + warp_to 5, 27, MANSION_1_WIDTH + warp_to 6, 27, MANSION_1_WIDTH + warp_to 7, 27, MANSION_1_WIDTH + warp_to 5, 10, MANSION_1_WIDTH ; MANSION_2 + warp_to 21, 23, MANSION_1_WIDTH ; MANSION_4 + warp_to 26, 27, MANSION_1_WIDTH + warp_to 27, 27, MANSION_1_WIDTH diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index cbb546c1..b005aff5 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -1,22 +1,22 @@ Mansion2Object: - db $1 ; border block + db 1 ; border block - db $4 ; warps - warp $5, $a, $4, MANSION_1 - warp $7, $a, $0, MANSION_3 - warp $19, $e, $2, MANSION_3 - warp $6, $1, $1, MANSION_3 + db 4 ; warps + warp 5, 10, 4, MANSION_1 + warp 7, 10, 0, MANSION_3 + warp 25, 14, 2, MANSION_3 + warp 6, 1, 1, MANSION_3 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, OPP_BURGLAR, $7 - object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM - object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person - object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person + db 4 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 + object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person ; warp-to - warp_to $5, $a, MANSION_2_WIDTH ; MANSION_1 - warp_to $7, $a, MANSION_2_WIDTH ; MANSION_3 - warp_to $19, $e, MANSION_2_WIDTH ; MANSION_3 - warp_to $6, $1, MANSION_2_WIDTH ; MANSION_3 + warp_to 5, 10, MANSION_2_WIDTH ; MANSION_1 + warp_to 7, 10, MANSION_2_WIDTH ; MANSION_3 + warp_to 25, 14, MANSION_2_WIDTH ; MANSION_3 + warp_to 6, 1, MANSION_2_WIDTH ; MANSION_3 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index b2b2230c..d100598d 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -1,21 +1,21 @@ Mansion3Object: - db $1 ; border block + db 1 ; border block - db $3 ; warps - warp $7, $a, $1, MANSION_2 - warp $6, $1, $3, MANSION_2 - warp $19, $e, $2, MANSION_2 + db 3 ; warps + warp 7, 10, 1, MANSION_2 + warp 6, 1, 3, MANSION_2 + warp 25, 14, 2, MANSION_2 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, OPP_BURGLAR, $8 - object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, OPP_SCIENTIST, $c - object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION - object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON - object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person + db 5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 + object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 + object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION + object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON + object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person ; warp-to - warp_to $7, $a, MANSION_3_WIDTH ; MANSION_2 - warp_to $6, $1, MANSION_3_WIDTH ; MANSION_2 - warp_to $19, $e, MANSION_3_WIDTH ; MANSION_2 + warp_to 7, 10, MANSION_3_WIDTH ; MANSION_2 + warp_to 6, 1, MANSION_3_WIDTH ; MANSION_2 + warp_to 25, 14, MANSION_3_WIDTH ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 9a333258..ec1c19fb 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -1,20 +1,20 @@ Mansion4Object: - db $1 ; border block + db 1 ; border block - db $1 ; warps - warp $17, $16, $5, MANSION_1 + db 1 ; warps + warp 23, 22, 5, MANSION_1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9 - object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d - object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY - object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE - object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 - object SPRITE_BALL, $5, $4, STAY, NONE, $6, TM_22 - object SPRITE_BOOK_MAP_DEX, $10, $14, STAY, NONE, $7 ; person - object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY + db 8 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 + object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 + object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY + object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE + object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 + object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 + object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person + object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY ; warp-to - warp_to $17, $16, MANSION_4_WIDTH ; MANSION_1 + warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 87697a2e..d8d5ca8b 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -1,34 +1,34 @@ MtMoon1Object: - db $3 ; border block + db 3 ; border block - db $5 ; warps - warp $e, $23, $1, $ff - warp $f, $23, $1, $ff - warp $5, $5, $0, MT_MOON_2 - warp $11, $b, $2, MT_MOON_2 - warp $19, $f, $3, MT_MOON_2 + db 5 ; warps + warp 14, 35, 1, -1 + warp 15, 35, 1, -1 + warp 5, 5, 0, MT_MOON_2 + warp 17, 11, 2, MT_MOON_2 + warp 25, 15, 3, MT_MOON_2 - db $1 ; signs - sign $f, $17, $e ; MtMoon1Text14 + db 1 ; signs + sign 15, 23, 14 ; MtMoon1Text14 - db $d ; objects - object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1 - object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, OPP_YOUNGSTER, $3 - object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, OPP_LASS, $5 - object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, OPP_SUPER_NERD, $1 - object SPRITE_LASS, $10, $17, STAY, DOWN, $5, OPP_LASS, $6 - object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, OPP_BUG_CATCHER, $7 - object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, OPP_BUG_CATCHER, $8 - object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION - object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE - object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY - object SPRITE_BALL, $24, $17, STAY, NONE, $b, ESCAPE_ROPE - object SPRITE_BALL, $14, $21, STAY, NONE, $c, POTION - object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12 + db 13 ; objects + object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 + object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 + object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 + object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 + object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 + object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 + object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 + object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION + object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE + object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY + object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE + object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION + object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 ; warp-to - warp_to $e, $23, MT_MOON_1_WIDTH - warp_to $f, $23, MT_MOON_1_WIDTH - warp_to $5, $5, MT_MOON_1_WIDTH ; MT_MOON_2 - warp_to $11, $b, MT_MOON_1_WIDTH ; MT_MOON_2 - warp_to $19, $f, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to 14, 35, MT_MOON_1_WIDTH + warp_to 15, 35, MT_MOON_1_WIDTH + warp_to 5, 5, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 5346d838..2ac19fdf 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -1,26 +1,26 @@ MtMoon2Object: - db $3 ; border block + db 3 ; border block - db $8 ; warps - warp $5, $5, $2, MT_MOON_1 - warp $11, $b, $0, MT_MOON_3 - warp $19, $9, $3, MT_MOON_1 - warp $19, $f, $4, MT_MOON_1 - warp $15, $11, $1, MT_MOON_3 - warp $d, $1b, $2, MT_MOON_3 - warp $17, $3, $3, MT_MOON_3 - warp $1b, $3, $2, $ff + db 8 ; warps + warp 5, 5, 2, MT_MOON_1 + warp 17, 11, 0, MT_MOON_3 + warp 25, 9, 3, MT_MOON_1 + warp 25, 15, 4, MT_MOON_1 + warp 21, 17, 1, MT_MOON_3 + warp 13, 27, 2, MT_MOON_3 + warp 23, 3, 3, MT_MOON_3 + warp 27, 3, 2, -1 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $5, $5, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to $11, $b, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to $19, $9, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to $19, $f, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to $15, $11, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to $d, $1b, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to $17, $3, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to $1b, $3, MT_MOON_2_WIDTH + warp_to 5, 5, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to 17, 11, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 25, 9, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to 25, 15, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to 21, 17, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 13, 27, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 23, 3, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 27, 3, MT_MOON_2_WIDTH diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index f9472e74..d5aeadc9 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -1,27 +1,27 @@ MtMoon3Object: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $19, $9, $1, MT_MOON_2 - warp $15, $11, $4, MT_MOON_2 - warp $f, $1b, $5, MT_MOON_2 - warp $5, $7, $6, MT_MOON_2 + db 4 ; warps + warp 25, 9, 1, MT_MOON_2 + warp 21, 17, 4, MT_MOON_2 + warp 15, 27, 5, MT_MOON_2 + warp 5, 7, 6, MT_MOON_2 - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2 - object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1 - object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2 - object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3 - object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4 - object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person - object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person - object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP - object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 + object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 + object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 + object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 + object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person + object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person + object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP + object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01 ; warp-to - warp_to $19, $9, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to $15, $11, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to $f, $1b, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to $5, $7, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index 27a4fbc3..a76c8835 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -1,20 +1,20 @@ MtMoonPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $0, $ff - warp $4, $7, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person - object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person - object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person - object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person + db 6 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person + object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person + object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person ; warp-to - warp_to $3, $7, MT_MOON_POKECENTER_WIDTH - warp_to $4, $7, MT_MOON_POKECENTER_WIDTH + warp_to 3, 7, MT_MOON_POKECENTER_WIDTH + warp_to 4, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index d05ff623..557eaf63 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -1,25 +1,25 @@ Museum1FObject: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $a, $7, $0, $ff - warp $b, $7, $0, $ff - warp $10, $7, $1, $ff - warp $11, $7, $1, $ff - warp $7, $7, $0, MUSEUM_2F + db 5 ; warps + warp 10, 7, 0, -1 + warp 11, 7, 0, -1 + warp 16, 7, 1, -1 + warp 17, 7, 1, -1 + warp 7, 7, 0, MUSEUM_2F - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_OAK_AIDE, $c, $4, STAY, LEFT, $1 ; person - object SPRITE_GAMBLER, $1, $4, STAY, NONE, $2 ; person - object SPRITE_OAK_AIDE, $f, $2, STAY, DOWN, $3 ; person - object SPRITE_OAK_AIDE, $11, $4, STAY, NONE, $4 ; person - object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person + db 5 ; objects + object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person + object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person + object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person + object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person ; warp-to - warp_to $a, $7, MUSEUM_1F_WIDTH - warp_to $b, $7, MUSEUM_1F_WIDTH - warp_to $10, $7, MUSEUM_1F_WIDTH - warp_to $11, $7, MUSEUM_1F_WIDTH - warp_to $7, $7, MUSEUM_1F_WIDTH ; MUSEUM_2F + warp_to 10, 7, MUSEUM_1F_WIDTH + warp_to 11, 7, MUSEUM_1F_WIDTH + warp_to 16, 7, MUSEUM_1F_WIDTH + warp_to 17, 7, MUSEUM_1F_WIDTH + warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index e93a6837..a2f62660 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -1,19 +1,19 @@ Museum2FObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $7, $4, MUSEUM_1F + db 1 ; warps + warp 7, 7, 4, MUSEUM_1F - db $2 ; signs - sign $b, $2, $6 ; Museum2FText6 - sign $2, $5, $7 ; Museum2FText7 + db 2 ; signs + sign 11, 2, 6 ; Museum2FText6 + sign 2, 5, 7 ; Museum2FText7 - db $5 ; objects - object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person - object SPRITE_OLD_PERSON, $0, $5, STAY, DOWN, $2 ; person - object SPRITE_OAK_AIDE, $7, $5, STAY, DOWN, $3 ; person - object SPRITE_BRUNETTE_GIRL, $b, $5, STAY, NONE, $4 ; person - object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person + object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person + object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person + object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person + object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person ; warp-to - warp_to $7, $7, MUSEUM_2F_WIDTH ; MUSEUM_1F + warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 9f0280f7..320d8b61 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -1,15 +1,15 @@ NameRaterObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $5, $ff - warp $3, $7, $5, $ff + db 2 ; warps + warp 2, 7, 5, -1 + warp 3, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_MR_MASTERBALL, $5, $3, STAY, LEFT, $1 ; person + db 1 ; objects + object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person ; warp-to - warp_to $2, $7, NAME_RATERS_HOUSE_WIDTH - warp_to $3, $7, NAME_RATERS_HOUSE_WIDTH + warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH + warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index c23c5afe..995dec29 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -1,25 +1,25 @@ OaksLabObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $b, $2, $ff - warp $5, $b, $2, $ff + db 2 ; warps + warp 4, 11, 2, -1 + warp 5, 11, 2, -1 - db $0 ; signs + db 0 ; signs - db $b ; objects - object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1 - object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person - object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person - object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person - object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person - object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person - object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person - object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person - object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person - object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person - object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person + db 11 ; objects + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 + object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person + object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person + object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person + object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person + object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person + object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person + object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person + object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person + object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person + object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person ; warp-to - warp_to $4, $b, OAKS_LAB_WIDTH - warp_to $5, $b, OAKS_LAB_WIDTH + warp_to 4, 11, OAKS_LAB_WIDTH + warp_to 5, 11, OAKS_LAB_WIDTH diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index c6158b68..6063176f 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -1,23 +1,23 @@ PalletTownObject: - db $b ; border block + db 11 ; border block - db $3 ; warps - warp $5, $5, $0, REDS_HOUSE_1F - warp $d, $5, $0, BLUES_HOUSE - warp $c, $b, $1, OAKS_LAB + db 3 ; warps + warp 5, 5, 0, REDS_HOUSE_1F + warp 13, 5, 0, BLUES_HOUSE + warp 12, 11, 1, OAKS_LAB - db $4 ; signs - sign $d, $d, $4 ; PalletTownText4 - sign $7, $9, $5 ; PalletTownText5 - sign $3, $5, $6 ; PalletTownText6 - sign $b, $5, $7 ; PalletTownText7 + db 4 ; signs + sign 13, 13, 4 ; PalletTownText4 + sign 7, 9, 5 ; PalletTownText5 + sign 3, 5, 6 ; PalletTownText6 + sign 11, 5, 7 ; PalletTownText7 - db $3 ; objects - object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person - object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person - object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person + db 3 ; objects + object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person + object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person + object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person ; warp-to - warp_to $5, $5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F - warp_to $d, $5, PALLET_TOWN_WIDTH ; BLUES_HOUSE - warp_to $c, $b, PALLET_TOWN_WIDTH ; OAKS_LAB + warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F + warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE + warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 08985e08..5fd1d48d 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -1,36 +1,36 @@ PewterCityObject: - db $a ; border block + db 10 ; border block - db $7 ; warps - warp $e, $7, $0, MUSEUM_1F - warp $13, $5, $2, MUSEUM_1F - warp $10, $11, $0, PEWTER_GYM - warp $1d, $d, $0, PEWTER_HOUSE_1 - warp $17, $11, $0, PEWTER_MART - warp $7, $1d, $0, PEWTER_HOUSE_2 - warp $d, $19, $0, PEWTER_POKECENTER + db 7 ; warps + warp 14, 7, 0, MUSEUM_1F + warp 19, 5, 2, MUSEUM_1F + warp 16, 17, 0, PEWTER_GYM + warp 29, 13, 0, PEWTER_HOUSE_1 + warp 23, 17, 0, PEWTER_MART + warp 7, 29, 0, PEWTER_HOUSE_2 + warp 13, 25, 0, PEWTER_POKECENTER - db $7 ; signs - sign $13, $1d, $6 ; PewterCityText6 - sign $21, $13, $7 ; PewterCityText7 - sign $18, $11, $8 ; MartSignText - sign $e, $19, $9 ; PokeCenterSignText - sign $f, $9, $a ; PewterCityText10 - sign $b, $11, $b ; PewterCityText11 - sign $19, $17, $c ; PewterCityText12 + db 7 ; signs + sign 19, 29, 6 ; PewterCityText6 + sign 33, 19, 7 ; PewterCityText7 + sign 24, 17, 8 ; MartSignText + sign 14, 25, 9 ; PokeCenterSignText + sign 15, 9, 10 ; PewterCityText10 + sign 11, 17, 11 ; PewterCityText11 + sign 25, 23, 12 ; PewterCityText12 - db $5 ; objects - object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $11, $19, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, STAY, NONE, $3 ; person - object SPRITE_BLACK_HAIR_BOY_2, $1a, $19, WALK, $2, $4 ; person - object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person + object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person + object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person ; warp-to - warp_to $e, $7, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to $13, $5, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to $10, $11, PEWTER_CITY_WIDTH ; PEWTER_GYM - warp_to $1d, $d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 - warp_to $17, $11, PEWTER_CITY_WIDTH ; PEWTER_MART - warp_to $7, $1d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 - warp_to $d, $19, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER + warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM + warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 + warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART + warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 + warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index b4098813..65fcf723 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -1,17 +1,17 @@ PewterGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $d, $2, $ff - warp $5, $d, $2, $ff + db 2 ; warps + warp 4, 13, 2, -1 + warp 5, 13, 2, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 - object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1 - object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 + object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person ; warp-to - warp_to $4, $d, PEWTER_GYM_WIDTH - warp_to $5, $d, PEWTER_GYM_WIDTH + warp_to 4, 13, PEWTER_GYM_WIDTH + warp_to 5, 13, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 4f1c2e8b..1126a73a 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -1,17 +1,17 @@ PewterHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $3, $ff - warp $3, $7, $3, $ff + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_SLOWBRO, $4, $5, STAY, LEFT, $1 ; person - object SPRITE_YOUNG_BOY, $3, $5, STAY, RIGHT, $2 ; person - object SPRITE_FAT_BALD_GUY, $1, $2, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person + object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person + object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person ; warp-to - warp_to $2, $7, PEWTER_HOUSE_1_WIDTH - warp_to $3, $7, PEWTER_HOUSE_1_WIDTH + warp_to 2, 7, PEWTER_HOUSE_1_WIDTH + warp_to 3, 7, PEWTER_HOUSE_1_WIDTH diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index f74601ed..64d8b131 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -1,16 +1,16 @@ PewterHouse2Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $5, $ff - warp $3, $7, $5, $ff + db 2 ; warps + warp 2, 7, 5, -1 + warp 3, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_GAMBLER, $2, $3, STAY, RIGHT, $1 ; person - object SPRITE_BUG_CATCHER, $4, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person ; warp-to - warp_to $2, $7, PEWTER_HOUSE_2_WIDTH - warp_to $3, $7, PEWTER_HOUSE_2_WIDTH + warp_to 2, 7, PEWTER_HOUSE_2_WIDTH + warp_to 3, 7, PEWTER_HOUSE_2_WIDTH diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 8272c7d2..2409c11c 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -1,17 +1,17 @@ PewterMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $4, $ff + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BUG_CATCHER, $3, $3, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $5, $5, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person ; warp-to - warp_to $3, $7, PEWTER_MART_WIDTH - warp_to $4, $7, PEWTER_MART_WIDTH + warp_to 3, 7, PEWTER_MART_WIDTH + warp_to 4, 7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 1b6b9969..15374fd1 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -1,18 +1,18 @@ PewterPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $6, $ff - warp $4, $7, $6, $ff + db 2 ; warps + warp 3, 7, 6, -1 + warp 4, 7, 6, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person - object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person + object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, PEWTER_POKECENTER_WIDTH - warp_to $4, $7, PEWTER_POKECENTER_WIDTH + warp_to 3, 7, PEWTER_POKECENTER_WIDTH + warp_to 4, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index fdddcd9c..036f0f13 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -1,21 +1,21 @@ PokemonTower1Object: - db $1 ; border block + db 1 ; border block - db $3 ; warps - warp $a, $11, $1, $ff - warp $b, $11, $1, $ff - warp $12, $9, $1, POKEMONTOWER_2 + db 3 ; warps + warp 10, 17, 1, -1 + warp 11, 17, 1, -1 + warp 18, 9, 1, POKEMONTOWER_2 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $f, $d, STAY, UP, $1 ; person - object SPRITE_MOM_GEISHA, $6, $8, STAY, NONE, $2 ; person - object SPRITE_BALDING_GUY, $8, $c, STAY, NONE, $3 ; person - object SPRITE_GIRL, $d, $7, STAY, NONE, $4 ; person - object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person + db 5 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person + object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person + object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person + object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person + object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person ; warp-to - warp_to $a, $11, POKEMONTOWER_1_WIDTH - warp_to $b, $11, POKEMONTOWER_1_WIDTH - warp_to $12, $9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 + warp_to 10, 17, POKEMONTOWER_1_WIDTH + warp_to 11, 17, POKEMONTOWER_1_WIDTH + warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 2d96f12c..95b8c456 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -1,16 +1,16 @@ PokemonTower2Object: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $3, $9, $0, POKEMONTOWER_3 - warp $12, $9, $2, POKEMONTOWER_1 + db 2 ; warps + warp 3, 9, 0, POKEMONTOWER_3 + warp 18, 9, 2, POKEMONTOWER_1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BLUE, $e, $5, STAY, NONE, $1 ; person - object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person + object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person ; warp-to - warp_to $3, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3 - warp_to $12, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1 + warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3 + warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 804d6008..c2a23d85 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -1,18 +1,18 @@ PokemonTower3Object: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $3, $9, $0, POKEMONTOWER_2 - warp $12, $9, $1, POKEMONTOWER_4 + db 2 ; warps + warp 3, 9, 0, POKEMONTOWER_2 + warp 18, 9, 1, POKEMONTOWER_4 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, OPP_CHANNELER, $5 - object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, OPP_CHANNELER, $6 - object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, OPP_CHANNELER, $8 - object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE + db 4 ; objects + object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 + object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 + object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 + object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE ; warp-to - warp_to $3, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2 - warp_to $12, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4 + warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2 + warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 5bd521e5..41e54571 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -1,20 +1,20 @@ PokemonTower4Object: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $3, $9, $0, POKEMONTOWER_5 - warp $12, $9, $1, POKEMONTOWER_3 + db 2 ; warps + warp 3, 9, 0, POKEMONTOWER_5 + warp 18, 9, 1, POKEMONTOWER_3 - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, OPP_CHANNELER, $9 - object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, OPP_CHANNELER, $a - object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, OPP_CHANNELER, $c - object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER - object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING - object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP + db 6 ; objects + object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 + object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 + object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 + object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER + object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING + object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP ; warp-to - warp_to $3, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 - warp_to $12, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 + warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 + warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 72401577..0b3349d8 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -1,20 +1,20 @@ PokemonTower5Object: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $3, $9, $0, POKEMONTOWER_4 - warp $12, $9, $0, POKEMONTOWER_6 + db 2 ; warps + warp 3, 9, 0, POKEMONTOWER_4 + warp 18, 9, 0, POKEMONTOWER_6 - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person - object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, OPP_CHANNELER, $e - object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, OPP_CHANNELER, $10 - object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, OPP_CHANNELER, $11 - object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, OPP_CHANNELER, $12 - object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET + db 6 ; objects + object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person + object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 + object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 + object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 + object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 + object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET ; warp-to - warp_to $3, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4 - warp_to $12, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6 + warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4 + warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 62513fb4..13cde398 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -1,19 +1,19 @@ PokemonTower6Object: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $12, $9, $1, POKEMONTOWER_5 - warp $9, $10, $0, POKEMONTOWER_7 + db 2 ; warps + warp 18, 9, 1, POKEMONTOWER_5 + warp 9, 16, 0, POKEMONTOWER_7 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, OPP_CHANNELER, $13 - object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, OPP_CHANNELER, $14 - object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, OPP_CHANNELER, $15 - object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY - object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY + db 5 ; objects + object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 + object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 + object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY + object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY ; warp-to - warp_to $12, $9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 - warp_to $9, $10, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 + warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 + warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index e78d6181..d170d21a 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,16 +1,16 @@ PokemonTower7Object: - db $1 ; border block + db 1 ; border block - db $1 ; warps - warp $9, $10, $1, POKEMONTOWER_6 + db 1 ; warps + warp 9, 16, 1, POKEMONTOWER_6 - db $0 ; signs + db 0 ; signs db 4 ; objects - object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 - object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 - object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 - object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person + object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 + object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 + object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person ; warp-to - warp_to $9, $10, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 + warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index 01fc94c7..b6e5c231 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -1,30 +1,30 @@ PowerPlantObject: - db $2e ; border block + db 46 ; border block - db $3 ; warps - warp $4, $23, $3, $ff - warp $5, $23, $3, $ff - warp $0, $b, $3, $ff + db 3 ; warps + warp 4, 35, 3, -1 + warp 5, 35, 3, -1 + warp 0, 11, 3, -1 - db $0 ; signs + db 0 ; signs - db $e ; objects - object SPRITE_BALL, $9, $14, STAY, NONE, $1, VOLTORB, 40 - object SPRITE_BALL, $20, $12, STAY, NONE, $2, VOLTORB, 40 - object SPRITE_BALL, $15, $19, STAY, NONE, $3, VOLTORB, 40 - object SPRITE_BALL, $19, $12, STAY, NONE, $4, ELECTRODE, 43 - object SPRITE_BALL, $17, $22, STAY, NONE, $5, VOLTORB, 40 - object SPRITE_BALL, $1a, $1c, STAY, NONE, $6, VOLTORB, 40 - object SPRITE_BALL, $15, $e, STAY, NONE, $7, ELECTRODE, 43 - object SPRITE_BALL, $25, $20, STAY, NONE, $8, VOLTORB, 40 - object SPRITE_BIRD, $4, $9, STAY, UP, $9, ZAPDOS, 50 - object SPRITE_BALL, $7, $19, STAY, NONE, $a, CARBOS - object SPRITE_BALL, $1c, $3, STAY, NONE, $b, HP_UP - object SPRITE_BALL, $22, $3, STAY, NONE, $c, RARE_CANDY - object SPRITE_BALL, $1a, $20, STAY, NONE, $d, TM_25 - object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33 + db 14 ; objects + object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 + object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 + object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 + object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 + object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 + object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 + object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 + object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 + object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 + object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS + object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP + object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY + object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25 + object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33 ; warp-to - warp_to $4, $23, POWER_PLANT_WIDTH - warp_to $5, $23, POWER_PLANT_WIDTH - warp_to $0, $b, POWER_PLANT_WIDTH + warp_to 4, 35, POWER_PLANT_WIDTH + warp_to 5, 35, POWER_PLANT_WIDTH + warp_to 0, 11, POWER_PLANT_WIDTH diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 8c30fb84..ed787246 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -1,18 +1,18 @@ RedsHouse1FObject: - db $0A ; border block + db 10 ; border block - db $3 ; warps - warp $2, $7, $0, $FF ; exit1 - warp $3, $7, $0, $FF ; exit2 - warp $7, $1, $0, REDS_HOUSE_2F ; staircase + db 3 ; warps + warp 2, 7, 0, -1 ; exit1 + warp 3, 7, 0, -1 ; exit2 + warp 7, 1, 0, REDS_HOUSE_2F ; staircase - db $1 ; signs - sign $3, $1, $2 ; TV + db 1 ; signs + sign 3, 1, 2 ; TV - db $1 ; objects - object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom + db 1 ; objects + object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom ; warp-to - warp_to $2, $7, REDS_HOUSE_1F_WIDTH - warp_to $3, $7, REDS_HOUSE_1F_WIDTH - warp_to $7, $1, REDS_HOUSE_1F_WIDTH + warp_to 2, 7, REDS_HOUSE_1F_WIDTH + warp_to 3, 7, REDS_HOUSE_1F_WIDTH + warp_to 7, 1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index d36f0672..8aa0f1e5 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,12 +1,12 @@ RedsHouse2FObject: - db $0A ; border block + db 10 ; border block - db $1 ; warps - warp $7, $1, $2, REDS_HOUSE_1F + db 1 ; warps + warp 7, 1, 2, REDS_HOUSE_1F - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $7, $1, REDS_HOUSE_2F_WIDTH + warp_to 7, 1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 75b3569d..264f20ab 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -1,27 +1,27 @@ RocketHideout1Object: - db $2e ; border block + db 46 ; border block - db $5 ; warps - warp $17, $2, $0, ROCKET_HIDEOUT_2 - warp $15, $2, $2, GAME_CORNER - warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR - warp $15, $18, $3, ROCKET_HIDEOUT_2 - warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR + db 5 ; warps + warp 23, 2, 0, ROCKET_HIDEOUT_2 + warp 21, 2, 2, GAME_CORNER + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 24, 3, ROCKET_HIDEOUT_2 + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - db $0 ; signs + db 0 ; signs - db $7 ; objects - object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, OPP_ROCKET, $8 - object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, OPP_ROCKET, $9 - object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, OPP_ROCKET, $a - object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, OPP_ROCKET, $b - object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, OPP_ROCKET, $c - object SPRITE_BALL, $b, $e, STAY, NONE, $6, ESCAPE_ROPE - object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION + db 7 ; objects + object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 + object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 + object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 + object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 + object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 + object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE + object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION ; warp-to - warp_to $17, $2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 - warp_to $15, $2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER - warp_to $18, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to $15, $18, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 - warp_to $19, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 23, 2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to 21, 2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER + warp_to 24, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 21, 24, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to 25, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 08e7ccf1..d5ac71b5 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -1,25 +1,25 @@ RocketHideout2Object: - db $2e ; border block + db 46 ; border block - db $5 ; warps - warp $1b, $8, $0, ROCKET_HIDEOUT_1 - warp $15, $8, $0, ROCKET_HIDEOUT_3 - warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR - warp $15, $16, $3, ROCKET_HIDEOUT_1 - warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR + db 5 ; warps + warp 27, 8, 0, ROCKET_HIDEOUT_1 + warp 21, 8, 0, ROCKET_HIDEOUT_3 + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 22, 3, ROCKET_HIDEOUT_1 + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, OPP_ROCKET, $d - object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE - object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET - object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07 - object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION + db 5 ; objects + object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 + object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE + object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET + object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 + object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION ; warp-to - warp_to $1b, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 - warp_to $15, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 - warp_to $18, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to $15, $16, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 - warp_to $19, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 27, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 21, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 + warp_to 24, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 21, 22, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 25, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 694b39ee..07ce8477 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -1,18 +1,18 @@ RocketHideout3Object: - db $2e ; border block + db 46 ; border block - db $2 ; warps - warp $19, $6, $1, ROCKET_HIDEOUT_2 - warp $13, $12, $0, ROCKET_HIDEOUT_4 + db 2 ; warps + warp 25, 6, 1, ROCKET_HIDEOUT_2 + warp 19, 18, 0, ROCKET_HIDEOUT_4 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, OPP_ROCKET, $e - object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f - object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 - object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY + db 4 ; objects + object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 + object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 + object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10 + object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY ; warp-to - warp_to $19, $6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 - warp_to $13, $12, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 + warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 + warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 2450af12..9f69ba51 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -1,25 +1,25 @@ RocketHideout4Object: - db $2e ; border block + db 46 ; border block - db $3 ; warps - warp $13, $a, $1, ROCKET_HIDEOUT_3 - warp $18, $f, $0, ROCKET_HIDEOUT_ELEVATOR - warp $19, $f, $1, ROCKET_HIDEOUT_ELEVATOR + db 3 ; warps + warp 19, 10, 1, ROCKET_HIDEOUT_3 + warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR + warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1 - object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10 - object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11 - object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12 - object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP - object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 - object SPRITE_BALL, $c, $14, STAY, NONE, $7, IRON - object SPRITE_BALL, $19, $2, STAY, NONE, $8, SILPH_SCOPE - object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY + db 9 ; objects + object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 + object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 + object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 + object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 + object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP + object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02 + object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON + object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE + object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY ; warp-to - warp_to $13, $a, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 - warp_to $18, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to $19, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 + warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index c1407769..9c3a8c7d 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -1,15 +1,15 @@ RocketHideoutElevatorObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $2, $1, $2, ROCKET_HIDEOUT_1 - warp $3, $1, $4, ROCKET_HIDEOUT_1 + db 2 ; warps + warp 2, 1, 2, ROCKET_HIDEOUT_1 + warp 3, 1, 4, ROCKET_HIDEOUT_1 - db $1 ; signs - sign $1, $1, $1 ; RocketHideoutElevatorText1 + db 1 ; signs + sign 1, 1, 1 ; RocketHideoutElevatorText1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $2, $1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 - warp_to $3, $1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 945f419d..1d3d0bb2 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -1,34 +1,34 @@ RockTunnel1Object: - db $3 ; border block + db 3 ; border block - db $8 ; warps - warp $f, $3, $1, $ff - warp $f, $0, $1, $ff - warp $f, $21, $2, $ff - warp $f, $23, $2, $ff - warp $25, $3, $0, ROCK_TUNNEL_2 - warp $5, $3, $1, ROCK_TUNNEL_2 - warp $11, $b, $2, ROCK_TUNNEL_2 - warp $25, $11, $3, ROCK_TUNNEL_2 + db 8 ; warps + warp 15, 3, 1, -1 + warp 15, 0, 1, -1 + warp 15, 33, 2, -1 + warp 15, 35, 2, -1 + warp 37, 3, 0, ROCK_TUNNEL_2 + warp 5, 3, 1, ROCK_TUNNEL_2 + warp 17, 11, 2, ROCK_TUNNEL_2 + warp 37, 17, 3, ROCK_TUNNEL_2 - db $1 ; signs - sign $b, $1d, $8 ; RockTunnel1Text8 + db 1 ; signs + sign 11, 29, 8 ; RockTunnel1Text8 - db $7 ; objects - object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c - object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d - object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e - object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 - object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR_TRAINER_F, $11 - object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR_TRAINER_F, $12 - object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13 + db 7 ; objects + object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 + object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 + object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 + object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 + object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 + object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 + object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 ; warp-to - warp_to $f, $3, ROCK_TUNNEL_1_WIDTH - warp_to $f, $0, ROCK_TUNNEL_1_WIDTH - warp_to $f, $21, ROCK_TUNNEL_1_WIDTH - warp_to $f, $23, ROCK_TUNNEL_1_WIDTH - warp_to $25, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to $5, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to $11, $b, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to $25, $11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to 15, 3, ROCK_TUNNEL_1_WIDTH + warp_to 15, 0, ROCK_TUNNEL_1_WIDTH + warp_to 15, 33, ROCK_TUNNEL_1_WIDTH + warp_to 15, 35, ROCK_TUNNEL_1_WIDTH + warp_to 37, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to 5, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to 17, 11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to 37, 17, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 7acffb9a..bc78fb55 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -1,26 +1,26 @@ RockTunnel2Object: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $21, $19, $4, ROCK_TUNNEL_1 - warp $1b, $3, $5, ROCK_TUNNEL_1 - warp $17, $b, $6, ROCK_TUNNEL_1 - warp $3, $3, $7, ROCK_TUNNEL_1 + db 4 ; warps + warp 33, 25, 4, ROCK_TUNNEL_1 + warp 27, 3, 5, ROCK_TUNNEL_1 + warp 23, 11, 6, ROCK_TUNNEL_1 + warp 3, 3, 7, ROCK_TUNNEL_1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR_TRAINER_F, $9 - object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9 - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3 - object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4 - object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a - object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR_TRAINER_F, $a - object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b - object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 + db 8 ; objects + object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 + object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 + object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 + object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 + object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 + object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 + object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 + object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 ; warp-to - warp_to $21, $19, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to $1b, $3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to $17, $b, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to $3, $3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to 33, 25, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to 27, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to 23, 11, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to 3, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 400b5998..eabddddf 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -1,18 +1,18 @@ RockTunnelPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $0, $ff - warp $4, $7, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person - object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person + object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, ROCK_TUNNEL_POKECENTER_WIDTH - warp_to $4, $7, ROCK_TUNNEL_POKECENTER_WIDTH + warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH + warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index ae4fec99..497d242d 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -1,14 +1,14 @@ Route1Object: - db $b ; border block + db 11 ; border block - db $0 ; warps + db 0 ; warps - db $1 ; signs - sign $9, $1b, $3 ; Route1Text3 + db 1 ; signs + sign 9, 27, 3 ; Route1Text3 - db $2 ; objects - object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person - object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person + object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person ; warp-to (unused) - warp_to $2, $7, $4 + warp_to 2, 7, 4 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index 3f052bf8..f94e04cf 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -1,28 +1,28 @@ Route10Object: - db $2c ; border block + db 44 ; border block - db $4 ; warps - warp $b, $13, $0, ROCK_TUNNEL_POKECENTER - warp $8, $11, $0, ROCK_TUNNEL_1 - warp $8, $35, $2, ROCK_TUNNEL_1 - warp $6, $27, $0, POWER_PLANT + db 4 ; warps + warp 11, 19, 0, ROCK_TUNNEL_POKECENTER + warp 8, 17, 0, ROCK_TUNNEL_1 + warp 8, 53, 2, ROCK_TUNNEL_1 + warp 6, 39, 0, POWER_PLANT - db $4 ; signs - sign $7, $13, $7 ; Route10Text7 - sign $c, $13, $8 ; PokeCenterSignText - sign $9, $37, $9 ; Route10Text9 - sign $5, $29, $a ; Route10Text10 + db 4 ; signs + sign 7, 19, 7 ; Route10Text7 + sign 12, 19, 8 ; PokeCenterSignText + sign 9, 55, 9 ; Route10Text9 + sign 5, 41, 10 ; Route10Text10 - db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 - object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7 - object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2 - object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7 - object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8 - object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8 + db 6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 + object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 + object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 + object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 + object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 ; warp-to - warp_to $b, $13, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER - warp_to $8, $11, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 - warp_to $8, $35, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 - warp_to $6, $27, ROUTE_10_WIDTH ; POWER_PLANT + warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER + warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 2427e20a..95e1c7f4 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -1,31 +1,31 @@ Route11Object: - db $f ; border block + db 15 ; border block - db $5 ; warps - warp $31, $8, $0, ROUTE_11_GATE_1F - warp $31, $9, $1, ROUTE_11_GATE_1F - warp $3a, $8, $2, ROUTE_11_GATE_1F - warp $3a, $9, $3, ROUTE_11_GATE_1F - warp $4, $5, $0, DIGLETTS_CAVE_ENTRANCE + db 5 ; warps + warp 49, 8, 0, ROUTE_11_GATE_1F + warp 49, 9, 1, ROUTE_11_GATE_1F + warp 58, 8, 2, ROUTE_11_GATE_1F + warp 58, 9, 3, ROUTE_11_GATE_1F + warp 4, 5, 0, DIGLETTS_CAVE_ENTRANCE - db $1 ; signs - sign $1, $5, $b ; Route11Text11 + db 1 ; signs + sign 1, 5, 11 ; Route11Text11 - db $a ; objects - object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 - object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, OPP_GAMBLER, $2 - object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, OPP_YOUNGSTER, $9 - object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, OPP_ENGINEER, $2 - object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, OPP_YOUNGSTER, $a - object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, OPP_GAMBLER, $3 - object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, OPP_GAMBLER, $4 - object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, OPP_YOUNGSTER, $b - object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, OPP_ENGINEER, $3 - object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c + db 10 ; objects + object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 + object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 + object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 + object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 + object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 + object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 + object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 + object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 ; warp-to - warp_to $31, $8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to $31, $9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to $3a, $8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to $3a, $9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to $4, $5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE + warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 98a183a0..de62250f 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -1,21 +1,21 @@ Route11GateObject: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $0, $4, $0, $ff - warp $0, $5, $1, $ff - warp $7, $4, $2, $ff - warp $7, $5, $3, $ff - warp $6, $8, $0, ROUTE_11_GATE_2F + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_11_GATE_2F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person ; warp-to - warp_to $0, $4, ROUTE_11_GATE_1F_WIDTH - warp_to $0, $5, ROUTE_11_GATE_1F_WIDTH - warp_to $7, $4, ROUTE_11_GATE_1F_WIDTH - warp_to $7, $5, ROUTE_11_GATE_1F_WIDTH - warp_to $6, $8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F + warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 3f33e1ce..ad0d073c 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -1,16 +1,16 @@ Route11GateUpstairsObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $7, $4, ROUTE_11_GATE_1F + db 1 ; warps + warp 7, 7, 4, ROUTE_11_GATE_1F - db $2 ; signs - sign $1, $2, $3 ; Route11GateUpstairsText3 - sign $6, $2, $4 ; Route11GateUpstairsText4 + db 2 ; signs + sign 1, 2, 3 ; Route11GateUpstairsText3 + sign 6, 2, 4 ; Route11GateUpstairsText4 - db $2 ; objects - object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person - object SPRITE_OAK_AIDE, $2, $6, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person + object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person ; warp-to - warp_to $7, $7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F + warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index c950cadc..8bd9e94d 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -1,30 +1,30 @@ Route12Object: - db $43 ; border block + db 67 ; border block - db $4 ; warps - warp $a, $f, $0, ROUTE_12_GATE_1F - warp $b, $f, $1, ROUTE_12_GATE_1F - warp $a, $15, $2, ROUTE_12_GATE_1F - warp $b, $4d, $0, ROUTE_12_HOUSE + db 4 ; warps + warp 10, 15, 0, ROUTE_12_GATE_1F + warp 11, 15, 1, ROUTE_12_GATE_1F + warp 10, 21, 2, ROUTE_12_GATE_1F + warp 11, 77, 0, ROUTE_12_HOUSE - db $2 ; signs - sign $d, $d, $b ; Route12Text11 - sign $b, $3f, $c ; Route12Text12 + db 2 ; signs + sign 13, 13, 11 ; Route12Text11 + sign 11, 63, 12 ; Route12Text12 - db $a ; objects - object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person - object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 - object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 - object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9 - object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 - object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 - object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 - object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, OPP_FISHER, $b - object SPRITE_BALL, $e, $23, STAY, NONE, $9, TM_16 - object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON + db 10 ; objects + object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person + object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 + object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4 + object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 + object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 + object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 + object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 + object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 + object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16 + object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON ; warp-to - warp_to $a, $f, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to $b, $f, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to $a, $15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to $b, $4d, ROUTE_12_WIDTH ; ROUTE_12_HOUSE + warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_HOUSE diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index be4e3cb8..35cab520 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -1,21 +1,21 @@ Route12GateObject: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $4, $0, $0, $ff - warp $5, $0, $1, $ff - warp $4, $7, $2, $ff - warp $5, $7, $2, $ff - warp $8, $6, $0, ROUTE_12_GATE_2F + db 5 ; warps + warp 4, 0, 0, -1 + warp 5, 0, 1, -1 + warp 4, 7, 2, -1 + warp 5, 7, 2, -1 + warp 8, 6, 0, ROUTE_12_GATE_2F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $1, $3, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person ; warp-to - warp_to $4, $0, ROUTE_12_GATE_1F_WIDTH - warp_to $5, $0, ROUTE_12_GATE_1F_WIDTH - warp_to $4, $7, ROUTE_12_GATE_1F_WIDTH - warp_to $5, $7, ROUTE_12_GATE_1F_WIDTH - warp_to $8, $6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F + warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH + warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH + warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH + warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH + warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index b1c92f95..5eea516a 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -1,15 +1,15 @@ Route12GateUpstairsObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $7, $4, ROUTE_12_GATE_1F + db 1 ; warps + warp 7, 7, 4, ROUTE_12_GATE_1F - db $2 ; signs - sign $1, $2, $2 ; Route12GateUpstairsText2 - sign $6, $2, $3 ; Route12GateUpstairsText3 + db 2 ; signs + sign 1, 2, 2 ; Route12GateUpstairsText2 + sign 6, 2, 3 ; Route12GateUpstairsText3 - db $1 ; objects - object SPRITE_BRUNETTE_GIRL, $3, $4, WALK, $1, $1 ; person + db 1 ; objects + object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person ; warp-to - warp_to $7, $7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F + warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 7c91caa2..384a6eda 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -1,15 +1,15 @@ Route12HouseObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $3, $ff - warp $3, $7, $3, $ff + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person ; warp-to - warp_to $2, $7, ROUTE_12_HOUSE_WIDTH - warp_to $3, $7, ROUTE_12_HOUSE_WIDTH + warp_to 2, 7, ROUTE_12_HOUSE_WIDTH + warp_to 3, 7, ROUTE_12_HOUSE_WIDTH diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 05fe1dd9..38e475a2 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -1,21 +1,21 @@ Route13Object: - db $43 ; border block + db 67 ; border block - db $0 ; warps + db 0 ; warps - db $3 ; signs - sign $f, $d, $b ; Route13Text11 - sign $21, $5, $c ; Route13Text12 - sign $1f, $b, $d ; Route13Text13 + db 3 ; signs + sign 15, 13, 11 ; Route13Text11 + sign 33, 5, 12 ; Route13Text12 + sign 31, 11, 13 ; Route13Text13 - db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 - object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR_TRAINER_F, $c - object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR_TRAINER_F, $d - object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR_TRAINER_F, $e - object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR_TRAINER_F, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2 - object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4 - object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5 - object SPRITE_BIKER, $a, $7, STAY, UP, $9, OPP_BIKER, $1 - object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, OPP_BIRD_KEEPER, $3 + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 + object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 + object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 + object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 + object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 + object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 + object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 + object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 + object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 + object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 81819f0d..5959041b 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -1,19 +1,19 @@ Route14Object: - db $43 ; border block + db 67 ; border block - db $0 ; warps + db 0 ; warps - db $1 ; signs - sign $11, $d, $b ; Route14Text11 + db 1 ; signs + sign 17, 13, 11 ; Route14Text11 - db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e - object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, OPP_BIRD_KEEPER, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, OPP_BIRD_KEEPER, $10 - object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, OPP_BIRD_KEEPER, $11 - object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, OPP_BIRD_KEEPER, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, OPP_BIRD_KEEPER, $5 - object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, OPP_BIKER, $d - object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, OPP_BIKER, $e - object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, OPP_BIKER, $f - object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, OPP_BIKER, $2 + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 + object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 + object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 + object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 + object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 + object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 + object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 38fbae4d..7715068d 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -1,30 +1,30 @@ Route15Object: - db $43 ; border block + db 67 ; border block - db $4 ; warps - warp $7, $8, $0, ROUTE_15_GATE_1F - warp $7, $9, $1, ROUTE_15_GATE_1F - warp $e, $8, $2, ROUTE_15_GATE_1F - warp $e, $9, $3, ROUTE_15_GATE_1F + db 4 ; warps + warp 7, 8, 0, ROUTE_15_GATE_1F + warp 7, 9, 1, ROUTE_15_GATE_1F + warp 14, 8, 2, ROUTE_15_GATE_1F + warp 14, 9, 3, ROUTE_15_GATE_1F - db $1 ; signs - sign $27, $9, $c ; Route15Text12 + db 1 ; signs + sign 39, 9, 12 ; Route15Text12 - db $b ; objects - object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 - object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 - object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 - object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 - object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a - object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 - object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 - object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16 - object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17 - object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 + db 11 ; objects + object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 + object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 + object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 + object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20 ; warp-to - warp_to $7, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to $7, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to $e, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to $e, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index a5902851..4d1b8736 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -1,21 +1,21 @@ Route15GateObject: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $0, $4, $0, $ff - warp $0, $5, $1, $ff - warp $7, $4, $2, $ff - warp $7, $5, $3, $ff - warp $6, $8, $0, ROUTE_15_GATE_2F + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_15_GATE_2F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person ; warp-to - warp_to $0, $4, ROUTE_15_GATE_1F_WIDTH - warp_to $0, $5, ROUTE_15_GATE_1F_WIDTH - warp_to $7, $4, ROUTE_15_GATE_1F_WIDTH - warp_to $7, $5, ROUTE_15_GATE_1F_WIDTH - warp_to $6, $8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F + warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index 09c3b322..23d56eea 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -1,14 +1,14 @@ Route15GateUpstairsObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $7, $4, ROUTE_15_GATE_1F + db 1 ; warps + warp 7, 7, 4, ROUTE_15_GATE_1F - db $1 ; signs - sign $6, $2, $2 ; Route15GateUpstairsText2 + db 1 ; signs + sign 6, 2, 2 ; Route15GateUpstairsText2 - db $1 ; objects - object SPRITE_OAK_AIDE, $4, $2, STAY, DOWN, $1 + db 1 ; objects + object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1 ; warp-to - warp_to $7, $7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F + warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index d65ea9c8..5acb748f 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -1,37 +1,37 @@ Route16Object: - db $f ; border block + db 15 ; border block - db $9 ; warps - warp $11, $a, $0, ROUTE_16_GATE_1F - warp $11, $b, $1, ROUTE_16_GATE_1F - warp $18, $a, $2, ROUTE_16_GATE_1F - warp $18, $b, $3, ROUTE_16_GATE_1F - warp $11, $4, $4, ROUTE_16_GATE_1F - warp $11, $5, $5, ROUTE_16_GATE_1F - warp $18, $4, $6, ROUTE_16_GATE_1F - warp $18, $5, $7, ROUTE_16_GATE_1F - warp $7, $5, $0, ROUTE_16_HOUSE + db 9 ; warps + warp 17, 10, 0, ROUTE_16_GATE_1F + warp 17, 11, 1, ROUTE_16_GATE_1F + warp 24, 10, 2, ROUTE_16_GATE_1F + warp 24, 11, 3, ROUTE_16_GATE_1F + warp 17, 4, 4, ROUTE_16_GATE_1F + warp 17, 5, 5, ROUTE_16_GATE_1F + warp 24, 4, 6, ROUTE_16_GATE_1F + warp 24, 5, 7, ROUTE_16_GATE_1F + warp 7, 5, 0, ROUTE_16_HOUSE - db $2 ; signs - sign $1b, $b, $8 ; Route16Text8 - sign $5, $11, $9 ; Route16Text9 + db 2 ; signs + sign 27, 11, 8 ; Route16Text8 + sign 5, 17, 9 ; Route16Text9 - db $7 ; objects - object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5 - object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1 - object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2 - object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6 - object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3 - object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7 - object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person + db 7 ; objects + object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 + object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 + object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 + object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 + object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 + object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 + object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person ; warp-to - warp_to $11, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $11, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $18, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $18, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $11, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $11, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $18, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $18, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to $7, $5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE + warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index a94c4e9b..94e85a4a 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -1,30 +1,30 @@ Route16GateObject: - db $a ; border block + db 10 ; border block - db $9 ; warps - warp $0, $8, $0, $ff - warp $0, $9, $1, $ff - warp $7, $8, $2, $ff - warp $7, $9, $2, $ff - warp $0, $2, $4, $ff - warp $0, $3, $5, $ff - warp $7, $2, $6, $ff - warp $7, $3, $7, $ff - warp $6, $c, $0, ROUTE_16_GATE_2F + db 9 ; warps + warp 0, 8, 0, -1 + warp 0, 9, 1, -1 + warp 7, 8, 2, -1 + warp 7, 9, 2, -1 + warp 0, 2, 4, -1 + warp 0, 3, 5, -1 + warp 7, 2, 6, -1 + warp 7, 3, 7, -1 + warp 6, 12, 0, ROUTE_16_GATE_2F - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_GUARD, $4, $5, STAY, DOWN, $1 ; person - object SPRITE_GAMBLER, $4, $3, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person + object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person ; warp-to - warp_to $0, $8, ROUTE_16_GATE_1F_WIDTH - warp_to $0, $9, ROUTE_16_GATE_1F_WIDTH - warp_to $7, $8, ROUTE_16_GATE_1F_WIDTH - warp_to $7, $9, ROUTE_16_GATE_1F_WIDTH - warp_to $0, $2, ROUTE_16_GATE_1F_WIDTH - warp_to $0, $3, ROUTE_16_GATE_1F_WIDTH - warp_to $7, $2, ROUTE_16_GATE_1F_WIDTH - warp_to $7, $3, ROUTE_16_GATE_1F_WIDTH - warp_to $6, $c, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F + warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH + warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH + warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH + warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH + warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 3d18bcb0..520c3e5a 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -1,16 +1,16 @@ Route16GateUpstairsObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $7, $8, ROUTE_16_GATE_1F + db 1 ; warps + warp 7, 7, 8, ROUTE_16_GATE_1F - db $2 ; signs - sign $1, $2, $3 ; Route16GateUpstairsText3 - sign $6, $2, $4 ; Route16GateUpstairsText4 + db 2 ; signs + sign 1, 2, 3 ; Route16GateUpstairsText3 + sign 6, 2, 4 ; Route16GateUpstairsText4 - db $2 ; objects - object SPRITE_YOUNG_BOY, $4, $2, STAY, NONE, $1 ; person - object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person ; warp-to - warp_to $7, $7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F + warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 56de89d2..8c1bab19 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -1,16 +1,16 @@ Route16HouseObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $8, $ff - warp $3, $7, $8, $ff + db 2 ; warps + warp 2, 7, 8, -1 + warp 3, 7, 8, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person - object SPRITE_BIRD, $6, $4, WALK, $0, $2 ; person + db 2 ; objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person ; warp-to - warp_to $2, $7, ROUTE_16_HOUSE_WIDTH - warp_to $3, $7, ROUTE_16_HOUSE_WIDTH + warp_to 2, 7, ROUTE_16_HOUSE_WIDTH + warp_to 3, 7, ROUTE_16_HOUSE_WIDTH diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index b13a2878..854e7d6e 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -1,24 +1,24 @@ Route17Object: - db $43 ; border block + db 67 ; border block - db $0 ; warps + db 0 ; warps - db $6 ; signs - sign $9, $33, $b ; Route17Text11 - sign $9, $3f, $c ; Route17Text12 - sign $9, $4b, $d ; Route17Text13 - sign $9, $57, $e ; Route17Text14 - sign $9, $6f, $f ; Route17Text15 - sign $9, $8d, $10 ; Route17Text16 + db 6 ; signs + sign 9, 51, 11 ; Route17Text11 + sign 9, 63, 12 ; Route17Text12 + sign 9, 75, 13 ; Route17Text13 + sign 9, 87, 14 ; Route17Text14 + sign 9, 111, 15 ; Route17Text15 + sign 9, 141, 16 ; Route17Text16 - db $a ; objects - object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4 - object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, OPP_CUE_BALL, $5 - object SPRITE_BIKER, $4, $12, STAY, UP, $3, OPP_BIKER, $8 - object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, OPP_BIKER, $9 - object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, OPP_BIKER, $a - object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, OPP_CUE_BALL, $6 - object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, OPP_CUE_BALL, $7 - object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, OPP_CUE_BALL, $8 - object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, OPP_BIKER, $b - object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, OPP_BIKER, $c + db 10 ; objects + object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 + object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 + object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 + object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 + object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 + object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 + object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 + object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 + object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 + object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 5cfb7ddb..fc9c7d84 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -1,23 +1,23 @@ Route18Object: - db $43 ; border block + db 67 ; border block - db $4 ; warps - warp $21, $8, $0, ROUTE_18_GATE_1F - warp $21, $9, $1, ROUTE_18_GATE_1F - warp $28, $8, $2, ROUTE_18_GATE_1F - warp $28, $9, $3, ROUTE_18_GATE_1F + db 4 ; warps + warp 33, 8, 0, ROUTE_18_GATE_1F + warp 33, 9, 1, ROUTE_18_GATE_1F + warp 40, 8, 2, ROUTE_18_GATE_1F + warp 40, 9, 3, ROUTE_18_GATE_1F - db $2 ; signs - sign $2b, $7, $4 ; Route18Text4 - sign $21, $5, $5 ; Route18Text5 + db 2 ; signs + sign 43, 7, 4 ; Route18Text4 + sign 33, 5, 5 ; Route18Text5 - db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 - object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, OPP_BIRD_KEEPER, $9 - object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 + object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 + object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 ; warp-to - warp_to $21, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to $21, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to $28, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to $28, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 06aa03ba..1eea9cfe 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -1,21 +1,21 @@ Route18GateObject: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $0, $4, $0, $ff - warp $0, $5, $1, $ff - warp $7, $4, $2, $ff - warp $7, $5, $3, $ff - warp $6, $8, $0, ROUTE_18_GATE_2F + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_18_GATE_2F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $4, $1, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person ; warp-to - warp_to $0, $4, ROUTE_18_GATE_1F_WIDTH - warp_to $0, $5, ROUTE_18_GATE_1F_WIDTH - warp_to $7, $4, ROUTE_18_GATE_1F_WIDTH - warp_to $7, $5, ROUTE_18_GATE_1F_WIDTH - warp_to $6, $8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F + warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index db0671b7..21604b66 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -1,15 +1,15 @@ Route18GateUpstairsObject: - db $a ; border block + db 10 ; border block - db $1 ; warps - warp $7, $7, $4, ROUTE_18_GATE_1F + db 1 ; warps + warp 7, 7, 4, ROUTE_18_GATE_1F - db $2 ; signs - sign $1, $2, $2 ; Route18GateUpstairsText2 - sign $6, $2, $3 ; Route18GateUpstairsText3 + db 2 ; signs + sign 1, 2, 2 ; Route18GateUpstairsText2 + sign 6, 2, 3 ; Route18GateUpstairsText3 - db $1 ; objects - object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person + db 1 ; objects + object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person ; warp-to - warp_to $7, $7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F + warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 48cee7a6..13c00330 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,21 +1,21 @@ Route19Object: - db $43 ; border block + db 67 ; border block - db $0 ; warps + db 0 ; warps - db $1 ; signs - sign $b, $9, $b ; Route19Text11 + db 1 ; signs + sign 11, 9, 11 ; Route19Text11 - db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 - object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 - object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 - object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7 - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 + object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 + object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 + object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 + object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 + object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 + object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 + object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 ; warp-to diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 0c14d76f..b9e921cd 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,33 +1,33 @@ Route2Object: - db $f ; border block + db 15 ; border block - db $6 ; warps - warp $c, $9, $0, DIGLETTS_CAVE_EXIT - warp $3, $b, $1, VIRIDIAN_FOREST_EXIT - warp $f, $13, $0, ROUTE_2_HOUSE - warp $10, $23, $1, ROUTE_2_GATE - warp $f, $27, $2, ROUTE_2_GATE - warp $3, $2b, $2, VIRIDIAN_FOREST_ENTRANCE + db 6 ; warps + warp 12, 9, 0, DIGLETTS_CAVE_EXIT + warp 3, 11, 1, VIRIDIAN_FOREST_EXIT + warp 15, 19, 0, ROUTE_2_HOUSE + warp 16, 35, 1, ROUTE_2_GATE + warp 15, 39, 2, ROUTE_2_GATE + warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE - db $2 ; signs - sign $5, $41, $3 ; Route2Text3 - sign $b, $b, $4 ; Route2Text4 + db 2 ; signs + sign 5, 65, 3 ; Route2Text3 + sign 11, 11, 4 ; Route2Text4 - db $2 ; objects - object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE - object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP + db 2 ; objects + object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE + object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP ; warp-to - warp_to $c, $9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to $3, $b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to $f, $13, ROUTE_2_WIDTH ; ROUTE_2_HOUSE - warp_to $10, $23, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to $f, $27, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to $3, $2b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE + warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE ; unused - warp_to $2, $7, $4 + warp_to 2, 7, 4 db $12, $c7, $9, $7 - warp_to $2, $7, $4 - warp_to $2, $7, $4 - warp_to $2, $7, $4 + warp_to 2, 7, 4 + warp_to 2, 7, 4 + warp_to 2, 7, 4 diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 0be02ca7..3d18495a 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -1,26 +1,26 @@ Route20Object: - db $43 ; border block + db 67 ; border block - db $2 ; warps - warp $30, $5, $0, SEAFOAM_ISLANDS_1 - warp $3a, $9, $2, SEAFOAM_ISLANDS_1 + db 2 ; warps + warp 48, 5, 0, SEAFOAM_ISLANDS_1 + warp 58, 9, 2, SEAFOAM_ISLANDS_1 - db $2 ; signs - sign $33, $7, $b ; Route20Text11 - sign $39, $b, $c ; Route20Text12 + db 2 ; signs + sign 51, 7, 11 ; Route20Text11 + sign 57, 11, 12 ; Route20Text12 - db $a ; objects - object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 - object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f - object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 - object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $18 - object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a - object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b - object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b - object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 - object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR_TRAINER_F, $10 - object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 + db 10 ; objects + object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 + object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 + object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 + object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 + object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 + object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 + object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 + object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 + object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 ; warp-to - warp_to $30, $5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to $3a, $9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index 1ed7b1cb..aaa87d8a 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -1,17 +1,17 @@ Route21Object: - db $43 ; border block + db 67 ; border block - db $0 ; warps + db 0 ; warps - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, OPP_FISHER, $7 - object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, OPP_FISHER, $9 - object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, OPP_SWIMMER, $c - object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, OPP_CUE_BALL, $9 - object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, OPP_SWIMMER, $d - object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, OPP_SWIMMER, $e - object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, OPP_SWIMMER, $f - object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, OPP_FISHER, $8 - object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, OPP_FISHER, $a + db 9 ; objects + object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 + object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 + object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 + object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 + object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 + object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 + object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 + object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 + object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 258c29a1..377cf6c9 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,15 +1,15 @@ Route22Object: - db $2c ; border block + db 44 ; border block - db $1 ; warps - warp $8, $5, $0, ROUTE_22_GATE + db 1 ; warps + warp 8, 5, 0, ROUTE_22_GATE - db $1 ; signs - sign $7, $b, $3 ; Route22FrontGateText + db 1 ; signs + sign 7, 11, 3 ; Route22FrontGateText - db $2 ; objects - object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person - object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person + object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person ; warp-to - warp_to $8, $5, ROUTE_22_WIDTH ; ROUTE_22_GATE + warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index e321d95d..6340b702 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -1,19 +1,19 @@ Route22GateObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $4, $7, $0, $ff - warp $5, $7, $0, $ff - warp $4, $0, $0, $ff - warp $5, $0, $1, $ff + db 4 ; warps + warp 4, 7, 0, -1 + warp 5, 7, 0, -1 + warp 4, 0, 0, -1 + warp 5, 0, 1, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person ; warp-to - warp_to $4, $7, ROUTE_22_GATE_WIDTH - warp_to $5, $7, ROUTE_22_GATE_WIDTH - warp_to $4, $0, ROUTE_22_GATE_WIDTH - warp_to $5, $0, ROUTE_22_GATE_WIDTH + warp_to 4, 7, ROUTE_22_GATE_WIDTH + warp_to 5, 7, ROUTE_22_GATE_WIDTH + warp_to 4, 0, ROUTE_22_GATE_WIDTH + warp_to 5, 0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 08358bd9..613ce6f4 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -1,26 +1,26 @@ Route23Object: - db $f ; border block + db 15 ; border block - db $4 ; warps - warp $7, $8b, $2, ROUTE_22_GATE - warp $8, $8b, $3, ROUTE_22_GATE - warp $4, $1f, $0, VICTORY_ROAD_1 - warp $e, $1f, $1, VICTORY_ROAD_2 + db 4 ; warps + warp 7, 139, 2, ROUTE_22_GATE + warp 8, 139, 3, ROUTE_22_GATE + warp 4, 31, 0, VICTORY_ROAD_1 + warp 14, 31, 1, VICTORY_ROAD_2 - db $1 ; signs - sign $3, $21, $8 ; Route23Text8 + db 1 ; signs + sign 3, 33, 8 ; Route23Text8 - db $7 ; objects - object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person - object SPRITE_GUARD, $a, $38, STAY, DOWN, $2 ; person - object SPRITE_SWIMMER, $8, $55, STAY, DOWN, $3 ; person - object SPRITE_SWIMMER, $b, $60, STAY, DOWN, $4 ; person - object SPRITE_GUARD, $c, $69, STAY, DOWN, $5 ; person - object SPRITE_GUARD, $8, $77, STAY, DOWN, $6 ; person - object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person + db 7 ; objects + object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person + object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person + object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person + object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person + object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person + object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person + object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person ; warp-to - warp_to $7, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to $8, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to $4, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_1 - warp_to $e, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_2 + warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1 + warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 5af90a4b..9ca277c8 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -1,16 +1,16 @@ Route24Object: - db $2c ; border block + db 44 ; border block - db $0 ; warps + db 0 ; warps - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 - object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2 - object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3 - object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 - object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 - object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 - object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9 - object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 + db 8 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 + object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 + object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 + object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 + object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 + object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 + object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index d0870b13..abc40804 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -1,23 +1,23 @@ Route25Object: - db $2c ; border block + db 44 ; border block - db $1 ; warps - warp $2d, $3, $0, BILLS_HOUSE + db 1 ; warps + warp 45, 3, 0, BILLS_HOUSE - db $1 ; signs - sign $2b, $3, $b ; Route25Text11 + db 1 ; signs + sign 43, 3, 11 ; Route25Text11 - db $a ; objects - object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 - object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6 - object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR_TRAINER_M, $2 - object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9 - object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7 - object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a - object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, OPP_HIKER, $2 - object SPRITE_HIKER, $17, $9, STAY, UP, $8, OPP_HIKER, $3 - object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, OPP_HIKER, $4 - object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 + db 10 ; objects + object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 + object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 + object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 + object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 + object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 + object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 + object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 + object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 + object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 + object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19 ; warp-to - warp_to $2d, $3, ROUTE_25_WIDTH ; BILLS_HOUSE + warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 4caba6e1..6d2244ec 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -1,20 +1,20 @@ Route2GateObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $4, $0, $3, $ff - warp $5, $0, $3, $ff - warp $4, $7, $4, $ff - warp $5, $7, $4, $ff + db 4 ; warps + warp 4, 0, 3, -1 + warp 5, 0, 3, -1 + warp 4, 7, 4, -1 + warp 5, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_OAK_AIDE, $1, $4, STAY, LEFT, $1 ; person - object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person + object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person ; warp-to - warp_to $4, $0, ROUTE_2_GATE_WIDTH - warp_to $5, $0, ROUTE_2_GATE_WIDTH - warp_to $4, $7, ROUTE_2_GATE_WIDTH - warp_to $5, $7, ROUTE_2_GATE_WIDTH + warp_to 4, 0, ROUTE_2_GATE_WIDTH + warp_to 5, 0, ROUTE_2_GATE_WIDTH + warp_to 4, 7, ROUTE_2_GATE_WIDTH + warp_to 5, 7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 70991e43..1a6f4b52 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -1,16 +1,16 @@ Route2HouseObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $2, $ff - warp $3, $7, $2, $ff + db 2 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_OAK_AIDE, $2, $4, STAY, RIGHT, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person + db 2 ; objects + object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person ; warp-to - warp_to $2, $7, ROUTE_2_HOUSE_WIDTH - warp_to $3, $7, ROUTE_2_HOUSE_WIDTH + warp_to 2, 7, ROUTE_2_HOUSE_WIDTH + warp_to 3, 7, ROUTE_2_HOUSE_WIDTH diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 44c80382..827dc14d 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -1,18 +1,18 @@ Route3Object: - db $2c ; border block + db 44 ; border block - db $0 ; warps + db 0 ; warps - db $1 ; signs - sign $3b, $9, $a ; Route3Text10 + db 1 ; signs + sign 59, 9, 10 ; Route3Text10 - db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person - object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, OPP_BUG_CATCHER, $4 - object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, OPP_YOUNGSTER, $1 - object SPRITE_LASS, $10, $9, STAY, LEFT, $4, OPP_LASS, $1 - object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, OPP_BUG_CATCHER, $5 - object SPRITE_LASS, $17, $4, STAY, LEFT, $6, OPP_LASS, $2 - object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, OPP_YOUNGSTER, $2 - object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, OPP_BUG_CATCHER, $6 - object SPRITE_LASS, $21, $a, STAY, UP, $9, OPP_LASS, $3 + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person + object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 + object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 + object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index c997212e..30e3ff24 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -1,22 +1,22 @@ Route4Object: - db $2c ; border block + db 44 ; border block - db $3 ; warps - warp $b, $5, $0, MT_MOON_POKECENTER - warp $12, $5, $0, MT_MOON_1 - warp $18, $5, $7, MT_MOON_2 + db 3 ; warps + warp 11, 5, 0, MT_MOON_POKECENTER + warp 18, 5, 0, MT_MOON_1 + warp 24, 5, 7, MT_MOON_2 - db $3 ; signs - sign $c, $5, $4 ; PokeCenterSignText - sign $11, $7, $5 ; Route4Text5 - sign $1b, $7, $6 ; Route4Text6 + db 3 ; signs + sign 12, 5, 4 ; PokeCenterSignText + sign 17, 7, 5 ; Route4Text5 + sign 27, 7, 6 ; Route4Text6 - db $3 ; objects - object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person - object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, OPP_LASS, $4 - object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 + db 3 ; objects + object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person + object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 + object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04 ; warp-to - warp_to $b, $5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER - warp_to $12, $5, ROUTE_4_WIDTH ; MT_MOON_1 - warp_to $18, $5, ROUTE_4_WIDTH ; MT_MOON_2 + warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER + warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1 + warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index e9048db8..445c7aab 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,21 +1,21 @@ Route5Object: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $a, $1d, $3, ROUTE_5_GATE - warp $9, $1d, $2, ROUTE_5_GATE - warp $a, $21, $0, ROUTE_5_GATE - warp $11, $1b, $0, PATH_ENTRANCE_ROUTE_5 - warp $a, $15, $0, DAYCAREM + db 5 ; warps + warp 10, 29, 3, ROUTE_5_GATE + warp 9, 29, 2, ROUTE_5_GATE + warp 10, 33, 0, ROUTE_5_GATE + warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5 + warp 10, 21, 0, DAYCAREM - db $1 ; signs - sign $11, $1d, $1 ; Route5Text1 + db 1 ; signs + sign 17, 29, 1 ; Route5Text1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $a, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to $9, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to $a, $21, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to $11, $1b, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 - warp_to $a, $15, ROUTE_5_WIDTH ; DAYCAREM + warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 17, 27, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to 10, 21, ROUTE_5_WIDTH ; DAYCAREM diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index 453412f7..0ceedb9b 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -1,19 +1,19 @@ Route5GateObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $3, $5, $2, $ff - warp $4, $5, $2, $ff - warp $3, $0, $1, $ff - warp $4, $0, $0, $ff + db 4 ; warps + warp 3, 5, 2, -1 + warp 4, 5, 2, -1 + warp 3, 0, 1, -1 + warp 4, 0, 0, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $1, $3, STAY, RIGHT, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to $3, $5, ROUTE_5_GATE_WIDTH - warp_to $4, $5, ROUTE_5_GATE_WIDTH - warp_to $3, $0, ROUTE_5_GATE_WIDTH - warp_to $4, $0, ROUTE_5_GATE_WIDTH + warp_to 3, 5, ROUTE_5_GATE_WIDTH + warp_to 4, 5, ROUTE_5_GATE_WIDTH + warp_to 3, 0, ROUTE_5_GATE_WIDTH + warp_to 4, 0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index c7b505d4..4bb5fbc4 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -1,25 +1,25 @@ Route6Object: - db $f ; border block + db 15 ; border block - db $4 ; warps - warp $9, $1, $2, ROUTE_6_GATE - warp $a, $1, $2, ROUTE_6_GATE - warp $a, $7, $0, ROUTE_6_GATE - warp $11, $d, $0, PATH_ENTRANCE_ROUTE_6 + db 4 ; warps + warp 9, 1, 2, ROUTE_6_GATE + warp 10, 1, 2, ROUTE_6_GATE + warp 10, 7, 0, ROUTE_6_GATE + warp 17, 13, 0, PATH_ENTRANCE_ROUTE_6 - db $1 ; signs - sign $13, $f, $7 ; Route6Text7 + db 1 ; signs + sign 19, 15, 7 ; Route6Text7 - db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2 - object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a - object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5 - object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3 - object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b + db 6 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 + object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 + object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 + object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 + object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 + object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 ; warp-to - warp_to $9, $1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to $a, $1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to $a, $7, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to $11, $d, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 + warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to 17, 13, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 2c52f0d6..cc5ccdc2 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -1,19 +1,19 @@ Route6GateObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $3, $5, $2, $ff - warp $4, $5, $2, $ff - warp $3, $0, $1, $ff - warp $4, $0, $1, $ff + db 4 ; warps + warp 3, 5, 2, -1 + warp 4, 5, 2, -1 + warp 3, 0, 1, -1 + warp 4, 0, 1, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person ; warp-to - warp_to $3, $5, ROUTE_6_GATE_WIDTH - warp_to $4, $5, ROUTE_6_GATE_WIDTH - warp_to $3, $0, ROUTE_6_GATE_WIDTH - warp_to $4, $0, ROUTE_6_GATE_WIDTH + warp_to 3, 5, ROUTE_6_GATE_WIDTH + warp_to 4, 5, ROUTE_6_GATE_WIDTH + warp_to 3, 0, ROUTE_6_GATE_WIDTH + warp_to 4, 0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index 44982068..cb6f2ecb 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -1,21 +1,21 @@ Route7Object: - db $f ; border block + db 15 ; border block - db $5 ; warps - warp $12, $9, $2, ROUTE_7_GATE - warp $12, $a, $3, ROUTE_7_GATE - warp $b, $9, $0, ROUTE_7_GATE - warp $b, $a, $1, ROUTE_7_GATE - warp $5, $d, $0, PATH_ENTRANCE_ROUTE_7 + db 5 ; warps + warp 18, 9, 2, ROUTE_7_GATE + warp 18, 10, 3, ROUTE_7_GATE + warp 11, 9, 0, ROUTE_7_GATE + warp 11, 10, 1, ROUTE_7_GATE + warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7 - db $1 ; signs - sign $3, $d, $1 ; Route7Text1 + db 1 ; signs + sign 3, 13, 1 ; Route7Text1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $12, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to $12, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to $b, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to $b, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to $5, $d, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 + warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 5, 13, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 293be913..28b4b1cf 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -1,19 +1,19 @@ Route7GateObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $0, $3, $3, $ff - warp $0, $4, $3, $ff - warp $5, $3, $0, $ff - warp $5, $4, $1, $ff + db 4 ; warps + warp 0, 3, 3, -1 + warp 0, 4, 3, -1 + warp 5, 3, 0, -1 + warp 5, 4, 1, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person ; warp-to - warp_to $0, $3, ROUTE_7_GATE_WIDTH - warp_to $0, $4, ROUTE_7_GATE_WIDTH - warp_to $5, $3, ROUTE_7_GATE_WIDTH - warp_to $5, $4, ROUTE_7_GATE_WIDTH + warp_to 0, 3, ROUTE_7_GATE_WIDTH + warp_to 0, 4, ROUTE_7_GATE_WIDTH + warp_to 5, 3, ROUTE_7_GATE_WIDTH + warp_to 5, 4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index c3e35f92..1dc066fb 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -1,30 +1,30 @@ Route8Object: - db $2c ; border block + db 44 ; border block - db $5 ; warps - warp $1, $9, $0, ROUTE_8_GATE - warp $1, $a, $1, ROUTE_8_GATE - warp $8, $9, $2, ROUTE_8_GATE - warp $8, $a, $3, ROUTE_8_GATE - warp $d, $3, $0, PATH_ENTRANCE_ROUTE_8 + db 5 ; warps + warp 1, 9, 0, ROUTE_8_GATE + warp 1, 10, 1, ROUTE_8_GATE + warp 8, 9, 2, ROUTE_8_GATE + warp 8, 10, 3, ROUTE_8_GATE + warp 13, 3, 0, PATH_ENTRANCE_ROUTE_8 - db $1 ; signs - sign $11, $3, $a ; Route8Text10 + db 1 ; signs + sign 17, 3, 10 ; Route8Text10 - db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 - object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, OPP_GAMBLER, $5 - object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, OPP_SUPER_NERD, $4 - object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, OPP_LASS, $d - object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, OPP_SUPER_NERD, $5 - object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, OPP_LASS, $e - object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, OPP_LASS, $f - object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, OPP_GAMBLER, $7 - object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 + object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 + object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 + object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 + object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 + object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 + object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 ; warp-to - warp_to $1, $9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to $1, $a, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to $8, $9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to $8, $a, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to $d, $3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8 + warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 13, 3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 46ed94dd..0d43bb80 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -1,19 +1,19 @@ Route8GateObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $0, $3, $0, $ff - warp $0, $4, $1, $ff - warp $5, $3, $2, $ff - warp $5, $4, $3, $ff + db 4 ; warps + warp 0, 3, 0, -1 + warp 0, 4, 1, -1 + warp 5, 3, 2, -1 + warp 5, 4, 3, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $2, $1, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person ; warp-to - warp_to $0, $3, ROUTE_8_GATE_WIDTH - warp_to $0, $4, ROUTE_8_GATE_WIDTH - warp_to $5, $3, ROUTE_8_GATE_WIDTH - warp_to $5, $4, ROUTE_8_GATE_WIDTH + warp_to 0, 3, ROUTE_8_GATE_WIDTH + warp_to 0, 4, ROUTE_8_GATE_WIDTH + warp_to 5, 3, ROUTE_8_GATE_WIDTH + warp_to 5, 4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 848c6924..5ed4fe06 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -1,19 +1,19 @@ Route9Object: - db $2c ; border block + db 44 ; border block - db $0 ; warps + db 0 ; warps - db $1 ; signs - sign $19, $7, $b ; Route9Text11 + db 1 ; signs + sign 25, 7, 11 ; Route9Text11 - db $a ; objects - object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8 - object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6 - object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b - object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 - object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d - object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, OPP_HIKER, $5 - object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, OPP_BUG_CATCHER, $e - object SPRITE_BALL, $a, $f, STAY, NONE, $a, TM_30 + db 10 ; objects + object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 + object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 + object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 + object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 + object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 + object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 + object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 + object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 + object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 681e81e1..7ce03028 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -1,31 +1,31 @@ SafariZoneCenterObject: - db $0 ; border block + db 0 ; border block - db $9 ; warps - warp $e, $19, $2, SAFARI_ZONE_ENTRANCE - warp $f, $19, $3, SAFARI_ZONE_ENTRANCE - warp $0, $a, $4, SAFARI_ZONE_WEST - warp $0, $b, $5, SAFARI_ZONE_WEST - warp $e, $0, $4, SAFARI_ZONE_NORTH - warp $f, $0, $5, SAFARI_ZONE_NORTH - warp $1d, $a, $2, SAFARI_ZONE_EAST - warp $1d, $b, $3, SAFARI_ZONE_EAST - warp $11, $13, $0, SAFARI_ZONE_REST_HOUSE_1 + db 9 ; warps + warp 14, 25, 2, SAFARI_ZONE_ENTRANCE + warp 15, 25, 3, SAFARI_ZONE_ENTRANCE + warp 0, 10, 4, SAFARI_ZONE_WEST + warp 0, 11, 5, SAFARI_ZONE_WEST + warp 14, 0, 4, SAFARI_ZONE_NORTH + warp 15, 0, 5, SAFARI_ZONE_NORTH + warp 29, 10, 2, SAFARI_ZONE_EAST + warp 29, 11, 3, SAFARI_ZONE_EAST + warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1 - db $2 ; signs - sign $12, $14, $2 ; SafariZoneCenterText2 - sign $e, $16, $3 ; SafariZoneCenterText3 + db 2 ; signs + sign 18, 20, 2 ; SafariZoneCenterText2 + sign 14, 22, 3 ; SafariZoneCenterText3 - db $1 ; objects - object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET + db 1 ; objects + object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET ; warp-to - warp_to $e, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to $f, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to $0, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to $0, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to $e, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to $f, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to $1d, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to $1d, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to $11, $13, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1 + warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1 diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 4ce97b87..e4eb6885 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -1,27 +1,27 @@ SafariZoneEastObject: - db $0 ; border block + db 0 ; border block - db $5 ; warps - warp $0, $4, $6, SAFARI_ZONE_NORTH - warp $0, $5, $7, SAFARI_ZONE_NORTH - warp $0, $16, $6, SAFARI_ZONE_CENTER - warp $0, $17, $6, SAFARI_ZONE_CENTER - warp $19, $9, $0, SAFARI_ZONE_REST_HOUSE_3 + db 5 ; warps + warp 0, 4, 6, SAFARI_ZONE_NORTH + warp 0, 5, 7, SAFARI_ZONE_NORTH + warp 0, 22, 6, SAFARI_ZONE_CENTER + warp 0, 23, 6, SAFARI_ZONE_CENTER + warp 25, 9, 0, SAFARI_ZONE_REST_HOUSE_3 - db $3 ; signs - sign $1a, $a, $5 ; SafariZoneEastText5 - sign $6, $4, $6 ; SafariZoneEastText6 - sign $5, $17, $7 ; SafariZoneEastText7 + db 3 ; signs + sign 26, 10, 5 ; SafariZoneEastText5 + sign 6, 4, 6 ; SafariZoneEastText6 + sign 5, 23, 7 ; SafariZoneEastText7 - db $4 ; objects - object SPRITE_BALL, $15, $a, STAY, NONE, $1, FULL_RESTORE - object SPRITE_BALL, $3, $7, STAY, NONE, $2, MAX_POTION - object SPRITE_BALL, $14, $d, STAY, NONE, $3, CARBOS - object SPRITE_BALL, $f, $c, STAY, NONE, $4, TM_37 + db 4 ; objects + object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE + object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION + object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS + object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37 ; warp-to - warp_to $0, $4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to $0, $5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to $0, $16, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to $0, $17, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to $19, $9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3 + warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3 diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 5154e8e0..9a54ae93 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -1,20 +1,20 @@ SafariZoneEntranceObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $3, $5, $4, $ff - warp $4, $5, $4, $ff - warp $3, $0, $0, SAFARI_ZONE_CENTER - warp $4, $0, $1, SAFARI_ZONE_CENTER + db 4 ; warps + warp 3, 5, 4, -1 + warp 4, 5, 4, -1 + warp 3, 0, 0, SAFARI_ZONE_CENTER + warp 4, 0, 1, SAFARI_ZONE_CENTER - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_WHITE_PLAYER, $6, $2, STAY, LEFT, $1 ; person - object SPRITE_WHITE_PLAYER, $1, $4, STAY, RIGHT, $2 ; person + db 2 ; objects + object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person + object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person ; warp-to - warp_to $3, $5, SAFARI_ZONE_ENTRANCE_WIDTH - warp_to $4, $5, SAFARI_ZONE_ENTRANCE_WIDTH - warp_to $3, $0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER - warp_to $4, $0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH + warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH + warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index 421cd4e2..0fb2c68f 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -1,35 +1,35 @@ SafariZoneNorthObject: - db $0 ; border block + db 0 ; border block - db $9 ; warps - warp $2, $23, $0, SAFARI_ZONE_WEST - warp $3, $23, $1, SAFARI_ZONE_WEST - warp $8, $23, $2, SAFARI_ZONE_WEST - warp $9, $23, $3, SAFARI_ZONE_WEST - warp $14, $23, $4, SAFARI_ZONE_CENTER - warp $15, $23, $5, SAFARI_ZONE_CENTER - warp $27, $1e, $0, SAFARI_ZONE_EAST - warp $27, $1f, $1, SAFARI_ZONE_EAST - warp $23, $3, $0, SAFARI_ZONE_REST_HOUSE_4 + db 9 ; warps + warp 2, 35, 0, SAFARI_ZONE_WEST + warp 3, 35, 1, SAFARI_ZONE_WEST + warp 8, 35, 2, SAFARI_ZONE_WEST + warp 9, 35, 3, SAFARI_ZONE_WEST + warp 20, 35, 4, SAFARI_ZONE_CENTER + warp 21, 35, 5, SAFARI_ZONE_CENTER + warp 39, 30, 0, SAFARI_ZONE_EAST + warp 39, 31, 1, SAFARI_ZONE_EAST + warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4 - db $5 ; signs - sign $24, $4, $3 ; SafariZoneNorthText3 - sign $4, $19, $4 ; SafariZoneNorthText4 - sign $d, $1f, $5 ; SafariZoneNorthText5 - sign $13, $21, $6 ; SafariZoneNorthText6 - sign $1a, $1c, $7 ; SafariZoneNorthText7 + db 5 ; signs + sign 36, 4, 3 ; SafariZoneNorthText3 + sign 4, 25, 4 ; SafariZoneNorthText4 + sign 13, 31, 5 ; SafariZoneNorthText5 + sign 19, 33, 6 ; SafariZoneNorthText6 + sign 26, 28, 7 ; SafariZoneNorthText7 - db $2 ; objects - object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN - object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40 + db 2 ; objects + object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN + object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40 ; warp-to - warp_to $2, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to $3, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to $8, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to $9, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to $14, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to $15, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to $27, $1e, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to $27, $1f, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to $23, $3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 + warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index ded590c8..b90e62bf 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -1,16 +1,16 @@ SafariZoneRestHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $8, SAFARI_ZONE_CENTER - warp $3, $7, $8, SAFARI_ZONE_CENTER + db 2 ; warps + warp 2, 7, 8, SAFARI_ZONE_CENTER + warp 3, 7, 8, SAFARI_ZONE_CENTER - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_GIRL, $3, $2, STAY, DOWN, $1 ; person - object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person + db 2 ; objects + object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person ; warp-to - warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER - warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER + warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 0532c505..80def1e3 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -1,17 +1,17 @@ SafariZoneRestHouse2Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $7, SAFARI_ZONE_WEST - warp $3, $7, $7, SAFARI_ZONE_WEST + db 2 ; warps + warp 2, 7, 7, SAFARI_ZONE_WEST + warp 3, 7, 7, SAFARI_ZONE_WEST - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OAK_AIDE, $4, $4, WALK, $0, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $0, $2, STAY, RIGHT, $2 ; person - object SPRITE_ERIKA, $6, $2, STAY, DOWN, $3 ; person + db 3 ; objects + object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person + object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person ; warp-to - warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST - warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST + warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index a83e451a..0b11f2bd 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -1,17 +1,17 @@ SafariZoneRestHouse3Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $4, SAFARI_ZONE_EAST - warp $3, $7, $4, SAFARI_ZONE_EAST + db 2 ; warps + warp 2, 7, 4, SAFARI_ZONE_EAST + warp 3, 7, 4, SAFARI_ZONE_EAST - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OAK_AIDE, $1, $3, WALK, $1, $1 ; person - object SPRITE_ROCKER, $4, $2, STAY, NONE, $2 ; person - object SPRITE_LAPRAS_GIVER, $5, $2, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person + object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person + object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person ; warp-to - warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST - warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST + warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST + warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 6db675ee..407b74d6 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -1,17 +1,17 @@ SafariZoneRestHouse4Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $8, SAFARI_ZONE_NORTH - warp $3, $7, $8, SAFARI_ZONE_NORTH + db 2 ; warps + warp 2, 7, 8, SAFARI_ZONE_NORTH + warp 3, 7, 8, SAFARI_ZONE_NORTH - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OAK_AIDE, $6, $3, WALK, $2, $1 ; person - object SPRITE_WHITE_PLAYER, $3, $4, STAY, NONE, $2 ; person - object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person + db 3 ; objects + object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person + object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person ; warp-to - warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH - warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH + warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH + warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index dfefa02f..edba01ef 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -1,15 +1,15 @@ SafariZoneSecretHouseObject: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $2, $7, $6, SAFARI_ZONE_WEST - warp $3, $7, $6, SAFARI_ZONE_WEST + db 2 ; warps + warp 2, 7, 6, SAFARI_ZONE_WEST + warp 3, 7, 6, SAFARI_ZONE_WEST - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $3, $3, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person ; warp-to - warp_to $2, $7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST - warp_to $3, $7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 6a667fcc..acdffb7c 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -1,34 +1,34 @@ SafariZoneWestObject: - db $0 ; border block + db 0 ; border block - db $8 ; warps - warp $14, $0, $0, SAFARI_ZONE_NORTH - warp $15, $0, $1, SAFARI_ZONE_NORTH - warp $1a, $0, $2, SAFARI_ZONE_NORTH - warp $1b, $0, $3, SAFARI_ZONE_NORTH - warp $1d, $16, $2, SAFARI_ZONE_CENTER - warp $1d, $17, $3, SAFARI_ZONE_CENTER - warp $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE - warp $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2 + db 8 ; warps + warp 20, 0, 0, SAFARI_ZONE_NORTH + warp 21, 0, 1, SAFARI_ZONE_NORTH + warp 26, 0, 2, SAFARI_ZONE_NORTH + warp 27, 0, 3, SAFARI_ZONE_NORTH + warp 29, 22, 2, SAFARI_ZONE_CENTER + warp 29, 23, 3, SAFARI_ZONE_CENTER + warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE + warp 11, 11, 0, SAFARI_ZONE_REST_HOUSE_2 - db $4 ; signs - sign $c, $c, $5 ; SafariZoneWestText5 - sign $11, $3, $6 ; SafariZoneWestText6 - sign $1a, $4, $7 ; SafariZoneWestText7 - sign $18, $16, $8 ; SafariZoneWestText8 + db 4 ; signs + sign 12, 12, 5 ; SafariZoneWestText5 + sign 17, 3, 6 ; SafariZoneWestText6 + sign 26, 4, 7 ; SafariZoneWestText7 + sign 24, 22, 8 ; SafariZoneWestText8 - db $4 ; objects - object SPRITE_BALL, $8, $14, STAY, NONE, $1, MAX_POTION - object SPRITE_BALL, $9, $7, STAY, NONE, $2, TM_32 - object SPRITE_BALL, $12, $12, STAY, NONE, $3, MAX_REVIVE - object SPRITE_BALL, $13, $7, STAY, NONE, $4, GOLD_TEETH + db 4 ; objects + object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION + object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32 + object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE + object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH ; warp-to - warp_to $14, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to $15, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to $1a, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to $1b, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to $1d, $16, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to $1d, $17, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to $3, $3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to $b, $b, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 + warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE + warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 6c1c9b14..ed0ffae0 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,51 +1,51 @@ SaffronCityObject: - db $f ; border block + db 15 ; border block - db $8 ; warps - warp $7, $5, $0, COPYCATS_HOUSE_1F - warp $1a, $3, $0, FIGHTING_DOJO - warp $22, $3, $0, SAFFRON_GYM - warp $d, $b, $0, SAFFRON_HOUSE_1 - warp $19, $b, $0, SAFFRON_MART - warp $12, $15, $0, SILPH_CO_1F - warp $9, $1d, $0, SAFFRON_POKECENTER - warp $1d, $1d, $0, SAFFRON_HOUSE_2 + db 8 ; warps + warp 7, 5, 0, COPYCATS_HOUSE_1F + warp 26, 3, 0, FIGHTING_DOJO + warp 34, 3, 0, SAFFRON_GYM + warp 13, 11, 0, SAFFRON_HOUSE_1 + warp 25, 11, 0, SAFFRON_MART + warp 18, 21, 0, SILPH_CO_1F + warp 9, 29, 0, SAFFRON_POKECENTER + warp 29, 29, 0, SAFFRON_HOUSE_2 - db $a ; signs - sign $11, $5, $10 ; SaffronCityText16 - sign $1b, $5, $11 ; SaffronCityText17 - sign $23, $5, $12 ; SaffronCityText18 - sign $1a, $b, $13 ; MartSignText - sign $27, $13, $14 ; SaffronCityText20 - sign $5, $15, $15 ; SaffronCityText21 - sign $f, $15, $16 ; SaffronCityText22 - sign $a, $1d, $17 ; PokeCenterSignText - sign $1b, $1d, $18 ; SaffronCityText24 - sign $1, $13, $19 ; SaffronCityText25 + db 10 ; signs + sign 17, 5, 16 ; SaffronCityText16 + sign 27, 5, 17 ; SaffronCityText17 + sign 35, 5, 18 ; SaffronCityText18 + sign 26, 11, 19 ; MartSignText + sign 39, 19, 20 ; SaffronCityText20 + sign 5, 21, 21 ; SaffronCityText21 + sign 15, 21, 22 ; SaffronCityText22 + sign 10, 29, 23 ; PokeCenterSignText + sign 27, 29, 24 ; SaffronCityText24 + sign 1, 19, 25 ; SaffronCityText25 - db $f ; objects - object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person - object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person - object SPRITE_ROCKET, $d, $c, STAY, NONE, $4 ; person - object SPRITE_ROCKET, $b, $19, WALK, $2, $5 ; person - object SPRITE_ROCKET, $20, $d, WALK, $2, $6 ; person - object SPRITE_ROCKET, $12, $1e, WALK, $2, $7 ; person - object SPRITE_OAK_AIDE, $8, $e, WALK, $0, $8 ; person - object SPRITE_LAPRAS_GIVER, $17, $17, STAY, NONE, $9 ; person - object SPRITE_ERIKA, $11, $1e, WALK, $2, $a ; person - object SPRITE_GENTLEMAN, $1e, $c, STAY, DOWN, $b ; person - object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person - object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person - object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person - object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person + db 15 ; objects + object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person + object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person + object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person + object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person + object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person + object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person + object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person + object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person + object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person + object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person + object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person + object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person ; warp-to - warp_to $7, $5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F - warp_to $1a, $3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO - warp_to $22, $3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM - warp_to $d, $b, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 - warp_to $19, $b, SAFFRON_CITY_WIDTH ; SAFFRON_MART - warp_to $12, $15, SAFFRON_CITY_WIDTH ; SILPH_CO_1F - warp_to $9, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER - warp_to $1d, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 + warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F + warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO + warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM + warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 + warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART + warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F + warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER + warp_to 29, 29, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 95e44aa9..027f287a 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -1,83 +1,83 @@ SaffronGymObject: - db $2e ; border block + db 46 ; border block - db $20 ; warps - warp $8, $11, $2, $ff - warp $9, $11, $2, $ff - warp $1, $3, $16, SAFFRON_GYM - warp $5, $3, $f, SAFFRON_GYM - warp $1, $5, $12, SAFFRON_GYM - warp $5, $5, $8, SAFFRON_GYM - warp $1, $9, $1b, SAFFRON_GYM - warp $5, $9, $10, SAFFRON_GYM - warp $1, $b, $5, SAFFRON_GYM - warp $5, $b, $d, SAFFRON_GYM - warp $1, $f, $17, SAFFRON_GYM - warp $5, $f, $1e, SAFFRON_GYM - warp $1, $11, $11, SAFFRON_GYM - warp $5, $11, $9, SAFFRON_GYM - warp $9, $3, $1a, SAFFRON_GYM - warp $b, $3, $3, SAFFRON_GYM - warp $9, $5, $7, SAFFRON_GYM - warp $b, $5, $c, SAFFRON_GYM - warp $b, $b, $4, SAFFRON_GYM - warp $b, $f, $1f, SAFFRON_GYM - warp $f, $3, $18, SAFFRON_GYM - warp $13, $3, $1c, SAFFRON_GYM - warp $f, $5, $2, SAFFRON_GYM - warp $13, $5, $a, SAFFRON_GYM - warp $f, $9, $14, SAFFRON_GYM - warp $13, $9, $1d, SAFFRON_GYM - warp $f, $b, $e, SAFFRON_GYM - warp $13, $b, $6, SAFFRON_GYM - warp $f, $f, $15, SAFFRON_GYM - warp $13, $f, $19, SAFFRON_GYM - warp $f, $11, $b, SAFFRON_GYM - warp $13, $11, $13, SAFFRON_GYM + db 32 ; warps + warp 8, 17, 2, -1 + warp 9, 17, 2, -1 + warp 1, 3, 22, SAFFRON_GYM + warp 5, 3, 15, SAFFRON_GYM + warp 1, 5, 18, SAFFRON_GYM + warp 5, 5, 8, SAFFRON_GYM + warp 1, 9, 27, SAFFRON_GYM + warp 5, 9, 16, SAFFRON_GYM + warp 1, 11, 5, SAFFRON_GYM + warp 5, 11, 13, SAFFRON_GYM + warp 1, 15, 23, SAFFRON_GYM + warp 5, 15, 30, SAFFRON_GYM + warp 1, 17, 17, SAFFRON_GYM + warp 5, 17, 9, SAFFRON_GYM + warp 9, 3, 26, SAFFRON_GYM + warp 11, 3, 3, SAFFRON_GYM + warp 9, 5, 7, SAFFRON_GYM + warp 11, 5, 12, SAFFRON_GYM + warp 11, 11, 4, SAFFRON_GYM + warp 11, 15, 31, SAFFRON_GYM + warp 15, 3, 24, SAFFRON_GYM + warp 19, 3, 28, SAFFRON_GYM + warp 15, 5, 2, SAFFRON_GYM + warp 19, 5, 10, SAFFRON_GYM + warp 15, 9, 20, SAFFRON_GYM + warp 19, 9, 29, SAFFRON_GYM + warp 15, 11, 14, SAFFRON_GYM + warp 19, 11, 6, SAFFRON_GYM + warp 15, 15, 21, SAFFRON_GYM + warp 19, 15, 25, SAFFRON_GYM + warp 15, 17, 11, SAFFRON_GYM + warp 19, 17, 19, SAFFRON_GYM - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1 - object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16 - object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1 - object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17 - object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, OPP_PSYCHIC_TR, $2 - object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, OPP_CHANNELER, $18 - object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, OPP_PSYCHIC_TR, $3 - object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, OPP_PSYCHIC_TR, $4 - object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person + db 9 ; objects + object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 + object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 + object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 + object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 + object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 + object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 + object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person ; warp-to - warp_to $8, $11, SAFFRON_GYM_WIDTH - warp_to $9, $11, SAFFRON_GYM_WIDTH - warp_to $1, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $9, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $9, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 8, 17, SAFFRON_GYM_WIDTH + warp_to 9, 17, SAFFRON_GYM_WIDTH + warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index f7691f78..3c800d38 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -1,18 +1,18 @@ SaffronHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $3, $ff - warp $3, $7, $3, $ff + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person - object SPRITE_BIRD, $0, $4, WALK, $1, $2 ; person - object SPRITE_BUG_CATCHER, $4, $1, STAY, DOWN, $3 ; person - object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person + db 4 ; objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person + object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person + object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person ; warp-to - warp_to $2, $7, SAFFRON_HOUSE_1_WIDTH - warp_to $3, $7, SAFFRON_HOUSE_1_WIDTH + warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH + warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index d8f7cd4d..e74b36ff 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -1,15 +1,15 @@ SaffronHouse2Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $7, $ff - warp $3, $7, $7, $ff + db 2 ; warps + warp 2, 7, 7, -1 + warp 3, 7, 7, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $5, $3, STAY, LEFT, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person ; warp-to - warp_to $2, $7, SAFFRON_HOUSE_2_WIDTH - warp_to $3, $7, SAFFRON_HOUSE_2_WIDTH + warp_to 2, 7, SAFFRON_HOUSE_2_WIDTH + warp_to 3, 7, SAFFRON_HOUSE_2_WIDTH diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 93c5aa2d..0a1551ea 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -1,17 +1,17 @@ SaffronMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $4, $ff + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, NONE, $2 ; person - object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person + object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person ; warp-to - warp_to $3, $7, SAFFRON_MART_WIDTH - warp_to $4, $7, SAFFRON_MART_WIDTH + warp_to 3, 7, SAFFRON_MART_WIDTH + warp_to 4, 7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 07230c0c..23b60a8d 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -1,18 +1,18 @@ SaffronPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $6, $ff - warp $4, $7, $6, $ff + db 2 ; warps + warp 3, 7, 6, -1 + warp 4, 7, 6, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person - object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, SAFFRON_POKECENTER_WIDTH - warp_to $4, $7, SAFFRON_POKECENTER_WIDTH + warp_to 3, 7, SAFFRON_POKECENTER_WIDTH + warp_to 4, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 4482776c..1cc90d17 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -1,16 +1,16 @@ SchoolObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $2, $ff - warp $3, $7, $2, $ff + db 2 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person - object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person + db 2 ; objects + object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person + object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person ; warp-to - warp_to $2, $7, VIRIDIAN_SCHOOL_WIDTH - warp_to $3, $7, VIRIDIAN_SCHOOL_WIDTH + warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH + warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 027c4abe..e4cf6bfe 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -1,30 +1,30 @@ SeafoamIslands1Object: - db $7d ; border block + db 125 ; border block - db $7 ; warps - warp $4, $11, $0, $ff - warp $5, $11, $0, $ff - warp $1a, $11, $1, $ff - warp $1b, $11, $1, $ff - warp $7, $5, $1, SEAFOAM_ISLANDS_2 - warp $19, $3, $6, SEAFOAM_ISLANDS_2 - warp $17, $f, $4, SEAFOAM_ISLANDS_2 + db 7 ; warps + warp 4, 17, 0, -1 + warp 5, 17, 0, -1 + warp 26, 17, 1, -1 + warp 27, 17, 1, -1 + warp 7, 5, 1, SEAFOAM_ISLANDS_2 + warp 25, 3, 6, SEAFOAM_ISLANDS_2 + warp 23, 15, 4, SEAFOAM_ISLANDS_2 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BOULDER, $12, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db 2 ; objects + object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person ; warp-to - warp_to $4, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $5, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $1a, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $1b, $11, SEAFOAM_ISLANDS_1_WIDTH - warp_to $7, $5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $19, $3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $17, $f, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH + warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 ; holes - warp_to $11, $6, SEAFOAM_ISLANDS_1_WIDTH - warp_to $18, $6, SEAFOAM_ISLANDS_1_WIDTH + warp_to 17, 6, SEAFOAM_ISLANDS_1_WIDTH + warp_to 24, 6, SEAFOAM_ISLANDS_1_WIDTH diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index e2cdc09a..adb8e921 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -1,26 +1,26 @@ SeafoamIslands2Object: - db $7d ; border block + db 125 ; border block - db $7 ; warps - warp $4, $2, $0, SEAFOAM_ISLANDS_3 - warp $7, $5, $4, SEAFOAM_ISLANDS_1 - warp $d, $7, $2, SEAFOAM_ISLANDS_3 - warp $13, $f, $3, SEAFOAM_ISLANDS_3 - warp $17, $f, $6, SEAFOAM_ISLANDS_1 - warp $19, $b, $5, SEAFOAM_ISLANDS_3 - warp $19, $3, $5, SEAFOAM_ISLANDS_1 + db 7 ; warps + warp 4, 2, 0, SEAFOAM_ISLANDS_3 + warp 7, 5, 4, SEAFOAM_ISLANDS_1 + warp 13, 7, 2, SEAFOAM_ISLANDS_3 + warp 19, 15, 3, SEAFOAM_ISLANDS_3 + warp 23, 15, 6, SEAFOAM_ISLANDS_1 + warp 25, 11, 5, SEAFOAM_ISLANDS_3 + warp 25, 3, 5, SEAFOAM_ISLANDS_1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BOULDER, $11, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $16, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db 2 ; objects + object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person ; warp-to - warp_to $4, $2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $7, $5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to $d, $7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $13, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $17, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to $19, $b, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $19, $3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 4, 2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 7, 5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 13, 7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 19, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 23, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 25, 11, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 25, 3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 087cba58..660e42c4 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -1,26 +1,26 @@ SeafoamIslands3Object: - db $7d ; border block + db 125 ; border block - db $7 ; warps - warp $5, $3, $0, SEAFOAM_ISLANDS_2 - warp $5, $d, $0, SEAFOAM_ISLANDS_4 - warp $d, $7, $2, SEAFOAM_ISLANDS_2 - warp $13, $f, $3, SEAFOAM_ISLANDS_2 - warp $19, $3, $3, SEAFOAM_ISLANDS_4 - warp $19, $b, $5, SEAFOAM_ISLANDS_2 - warp $19, $e, $4, SEAFOAM_ISLANDS_4 + db 7 ; warps + warp 5, 3, 0, SEAFOAM_ISLANDS_2 + warp 5, 13, 0, SEAFOAM_ISLANDS_4 + warp 13, 7, 2, SEAFOAM_ISLANDS_2 + warp 19, 15, 3, SEAFOAM_ISLANDS_2 + warp 25, 3, 3, SEAFOAM_ISLANDS_4 + warp 25, 11, 5, SEAFOAM_ISLANDS_2 + warp 25, 14, 4, SEAFOAM_ISLANDS_4 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BOULDER, $12, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $17, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db 2 ; objects + object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person ; warp-to - warp_to $5, $3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $5, $d, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to $d, $7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $13, $f, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $19, $3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to $19, $b, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to $19, $e, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 5, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 5, 13, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 13, 7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 19, 15, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 25, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 25, 11, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to 25, 14, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index 06b2fb78..69b3558d 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -1,30 +1,30 @@ SeafoamIslands4Object: - db $7d ; border block + db 125 ; border block - db $7 ; warps - warp $5, $c, $1, SEAFOAM_ISLANDS_3 - warp $8, $6, $2, SEAFOAM_ISLANDS_5 - warp $19, $4, $3, SEAFOAM_ISLANDS_5 - warp $19, $3, $4, SEAFOAM_ISLANDS_3 - warp $19, $e, $6, SEAFOAM_ISLANDS_3 - warp $14, $11, $0, SEAFOAM_ISLANDS_5 - warp $15, $11, $1, SEAFOAM_ISLANDS_5 + db 7 ; warps + warp 5, 12, 1, SEAFOAM_ISLANDS_3 + warp 8, 6, 2, SEAFOAM_ISLANDS_5 + warp 25, 4, 3, SEAFOAM_ISLANDS_5 + warp 25, 3, 4, SEAFOAM_ISLANDS_3 + warp 25, 14, 6, SEAFOAM_ISLANDS_3 + warp 20, 17, 0, SEAFOAM_ISLANDS_5 + warp 21, 17, 1, SEAFOAM_ISLANDS_5 - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_BOULDER, $5, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $3, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person - object SPRITE_BOULDER, $8, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person - object SPRITE_BOULDER, $9, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $4 ; person - object SPRITE_BOULDER, $12, $6, STAY, NONE, $5 ; person - object SPRITE_BOULDER, $13, $6, STAY, NONE, $6 ; person + db 6 ; objects + object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person + object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person ; warp-to - warp_to $5, $c, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $8, $6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to $19, $4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to $19, $3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $19, $e, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to $14, $11, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to $15, $11, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to 5, 12, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 8, 6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to 25, 4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to 25, 3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 25, 14, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to 20, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to 21, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index dd2d77f0..e5a5e04c 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -1,23 +1,23 @@ SeafoamIslands5Object: - db $7d ; border block + db 125 ; border block - db $4 ; warps - warp $14, $11, $5, SEAFOAM_ISLANDS_4 - warp $15, $11, $6, SEAFOAM_ISLANDS_4 - warp $b, $7, $1, SEAFOAM_ISLANDS_4 - warp $19, $4, $2, SEAFOAM_ISLANDS_4 + db 4 ; warps + warp 20, 17, 5, SEAFOAM_ISLANDS_4 + warp 21, 17, 6, SEAFOAM_ISLANDS_4 + warp 11, 7, 1, SEAFOAM_ISLANDS_4 + warp 25, 4, 2, SEAFOAM_ISLANDS_4 - db $2 ; signs - sign $9, $f, $4 ; SeafoamIslands5Text4 - sign $17, $1, $5 ; SeafoamIslands5Text5 + db 2 ; signs + sign 9, 15, 4 ; SeafoamIslands5Text4 + sign 23, 1, 5 ; SeafoamIslands5Text5 - db $3 ; objects - object SPRITE_BOULDER, $4, $f, STAY, NONE, $1 ; person - object SPRITE_BOULDER, $5, $f, STAY, NONE, $2 ; person - object SPRITE_BIRD, $6, $1, STAY, DOWN, $3, ARTICUNO, 50 + db 3 ; objects + object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person + object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person + object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 ; warp-to - warp_to $14, $11, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to $15, $11, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to $b, $7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to $19, $4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 20, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 21, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 11, 7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to 25, 4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 0ef17156..9a13055d 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -1,21 +1,21 @@ SilphCo1Object: - db $2e ; border block + db 46 ; border block - db $5 ; warps - warp $a, $11, $5, $ff - warp $b, $11, $5, $ff - warp $1a, $0, $0, SILPH_CO_2F - warp $14, $0, $0, SILPH_CO_ELEVATOR - warp $10, $a, $6, SILPH_CO_3F + db 5 ; warps + warp 10, 17, 5, -1 + warp 11, 17, 5, -1 + warp 26, 0, 0, SILPH_CO_2F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 16, 10, 6, SILPH_CO_3F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person ; warp-to - warp_to $a, $11, SILPH_CO_1F_WIDTH - warp_to $b, $11, SILPH_CO_1F_WIDTH - warp_to $1a, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F - warp_to $14, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $10, $a, SILPH_CO_1F_WIDTH ; SILPH_CO_3F + warp_to 10, 17, SILPH_CO_1F_WIDTH + warp_to 11, 17, SILPH_CO_1F_WIDTH + warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F + warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index d2ddd338..b3f2066f 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -1,28 +1,28 @@ SilphCo10Object: - db $2e ; border block + db 46 ; border block - db $6 ; warps - warp $8, $0, $0, SILPH_CO_9F - warp $a, $0, $0, SILPH_CO_11F - warp $c, $0, $0, SILPH_CO_ELEVATOR - warp $9, $b, $3, SILPH_CO_4F - warp $d, $f, $5, SILPH_CO_4F - warp $d, $7, $6, SILPH_CO_4F + db 6 ; warps + warp 8, 0, 0, SILPH_CO_9F + warp 10, 0, 0, SILPH_CO_11F + warp 12, 0, 0, SILPH_CO_ELEVATOR + warp 9, 11, 3, SILPH_CO_4F + warp 13, 15, 5, SILPH_CO_4F + warp 13, 7, 6, SILPH_CO_4F - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, OPP_ROCKET, $27 - object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, OPP_SCIENTIST, $b - object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person - object SPRITE_BALL, $2, $c, STAY, NONE, $4, TM_26 - object SPRITE_BALL, $4, $e, STAY, NONE, $5, RARE_CANDY - object SPRITE_BALL, $5, $b, STAY, NONE, $6, CARBOS + db 6 ; objects + object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 + object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 + object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person + object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26 + object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY + object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS ; warp-to - warp_to $8, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F - warp_to $a, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F - warp_to $c, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $9, $b, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to $d, $f, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to $d, $7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F + warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F + warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index da97ef89..11fb3b9f 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -1,23 +1,23 @@ SilphCo11Object: - db $d ; border block + db 13 ; border block - db $4 ; warps - warp $9, $0, $1, SILPH_CO_10F - warp $d, $0, $0, SILPH_CO_ELEVATOR - warp $5, $5, $9, $ff - warp $3, $2, $3, SILPH_CO_7F + db 4 ; warps + warp 9, 0, 1, SILPH_CO_10F + warp 13, 0, 0, SILPH_CO_ELEVATOR + warp 5, 5, 9, -1 + warp 3, 2, 3, SILPH_CO_7F - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person - object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person - object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 - object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 - object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 + db 5 ; objects + object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person + object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 + object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 + object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 ; warp-to - warp_to $9, $0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F - warp_to $d, $0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $5, $5, SILPH_CO_11F_WIDTH - warp_to $3, $2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F + warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F + warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 5, 5, SILPH_CO_11F_WIDTH + warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 98a50355..4d6a2fb5 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -1,29 +1,29 @@ SilphCo2Object: - db $2e ; border block + db 46 ; border block - db $7 ; warps - warp $18, $0, $2, SILPH_CO_1F - warp $1a, $0, $0, SILPH_CO_3F - warp $14, $0, $0, SILPH_CO_ELEVATOR - warp $3, $3, $6, SILPH_CO_3F - warp $d, $3, $4, SILPH_CO_8F - warp $1b, $f, $5, SILPH_CO_8F - warp $9, $f, $4, SILPH_CO_6F + db 7 ; warps + warp 24, 0, 2, SILPH_CO_1F + warp 26, 0, 0, SILPH_CO_3F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 6, SILPH_CO_3F + warp 13, 3, 4, SILPH_CO_8F + warp 27, 15, 5, SILPH_CO_8F + warp 9, 15, 4, SILPH_CO_6F - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person - object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2 - object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3 - object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17 - object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 + db 5 ; objects + object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person + object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 + object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 + object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 + object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 ; warp-to - warp_to $18, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F - warp_to $1a, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to $14, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $3, $3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to $d, $3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to $1b, $f, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to $9, $f, SILPH_CO_2F_WIDTH ; SILPH_CO_6F + warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F + warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index d04e74c7..65164c17 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -1,34 +1,34 @@ SilphCo3Object: - db $2e ; border block + db 46 ; border block - db $a ; warps - warp $1a, $0, $1, SILPH_CO_2F - warp $18, $0, $0, SILPH_CO_4F - warp $14, $0, $0, SILPH_CO_ELEVATOR - warp $17, $b, $9, SILPH_CO_3F - warp $3, $3, $5, SILPH_CO_5F - warp $3, $f, $6, SILPH_CO_5F - warp $1b, $3, $3, SILPH_CO_2F - warp $3, $b, $3, SILPH_CO_9F - warp $b, $b, $4, SILPH_CO_7F - warp $1b, $f, $3, SILPH_CO_3F + db 10 ; warps + warp 26, 0, 1, SILPH_CO_2F + warp 24, 0, 0, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 23, 11, 9, SILPH_CO_3F + warp 3, 3, 5, SILPH_CO_5F + warp 3, 15, 6, SILPH_CO_5F + warp 27, 3, 3, SILPH_CO_2F + warp 3, 11, 3, SILPH_CO_9F + warp 11, 11, 4, SILPH_CO_7F + warp 27, 15, 3, SILPH_CO_3F - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_LAPRAS_GIVER, $18, $8, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, OPP_ROCKET, $19 - object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, OPP_SCIENTIST, $4 - object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION + db 4 ; objects + object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 + object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 + object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION ; warp-to - warp_to $1a, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to $18, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F - warp_to $14, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $17, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_3F - warp_to $3, $3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to $3, $f, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to $1b, $3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to $3, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_9F - warp_to $b, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_7F - warp_to $1b, $f, SILPH_CO_3F_WIDTH ; SILPH_CO_3F + warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F + warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F + warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F + warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F + warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index 66443046..c91efcde 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -1,31 +1,31 @@ SilphCo4Object: - db $2e ; border block + db 46 ; border block - db $7 ; warps - warp $18, $0, $1, SILPH_CO_3F - warp $1a, $0, $1, SILPH_CO_5F - warp $14, $0, $0, SILPH_CO_ELEVATOR - warp $b, $7, $3, SILPH_CO_10F - warp $11, $3, $3, SILPH_CO_6F - warp $3, $f, $4, SILPH_CO_10F - warp $11, $b, $5, SILPH_CO_10F + db 7 ; warps + warp 24, 0, 1, SILPH_CO_3F + warp 26, 0, 1, SILPH_CO_5F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 11, 7, 3, SILPH_CO_10F + warp 17, 3, 3, SILPH_CO_6F + warp 3, 15, 4, SILPH_CO_10F + warp 17, 11, 5, SILPH_CO_10F - db $0 ; signs + db 0 ; signs - db $7 ; objects - object SPRITE_LAPRAS_GIVER, $6, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, OPP_ROCKET, $1a - object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, OPP_SCIENTIST, $5 - object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, OPP_ROCKET, $1b - object SPRITE_BALL, $3, $9, STAY, NONE, $5, FULL_HEAL - object SPRITE_BALL, $4, $7, STAY, NONE, $6, MAX_REVIVE - object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE + db 7 ; objects + object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 + object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 + object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 + object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL + object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE + object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE ; warp-to - warp_to $18, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F - warp_to $1a, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F - warp_to $14, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $b, $7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to $11, $3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F - warp_to $3, $f, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to $11, $b, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F + warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F + warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F + warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 0063b94c..f8673460 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -1,35 +1,35 @@ SilphCo5Object: - db $2e ; border block + db 46 ; border block - db $7 ; warps - warp $18, $0, $1, SILPH_CO_6F - warp $1a, $0, $1, SILPH_CO_4F - warp $14, $0, $0, SILPH_CO_ELEVATOR - warp $1b, $3, $5, SILPH_CO_7F - warp $9, $f, $4, SILPH_CO_9F - warp $b, $5, $4, SILPH_CO_3F - warp $3, $f, $5, SILPH_CO_3F + db 7 ; warps + warp 24, 0, 1, SILPH_CO_6F + warp 26, 0, 1, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 27, 3, 5, SILPH_CO_7F + warp 9, 15, 4, SILPH_CO_9F + warp 11, 5, 4, SILPH_CO_3F + warp 3, 15, 5, SILPH_CO_3F - db $0 ; signs + db 0 ; signs - db $b ; objects - object SPRITE_LAPRAS_GIVER, $d, $9, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, OPP_ROCKET, $1c - object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, OPP_SCIENTIST, $6 - object SPRITE_ROCKER, $12, $a, STAY, UP, $4, OPP_JUGGLER, $1 - object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, OPP_ROCKET, $1d - object SPRITE_BALL, $2, $d, STAY, NONE, $6, TM_09 - object SPRITE_BALL, $4, $6, STAY, NONE, $7, PROTEIN - object SPRITE_BALL, $15, $10, STAY, NONE, $8, CARD_KEY - object SPRITE_CLIPBOARD, $16, $c, STAY, NONE, $9 ; person - object SPRITE_CLIPBOARD, $19, $a, STAY, NONE, $a ; person - object SPRITE_CLIPBOARD, $18, $6, STAY, NONE, $b ; person + db 11 ; objects + object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 + object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 + object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 + object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 + object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09 + object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN + object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY + object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person + object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person + object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person ; warp-to - warp_to $18, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F - warp_to $1a, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F - warp_to $14, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $1b, $3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F - warp_to $9, $f, SILPH_CO_5F_WIDTH ; SILPH_CO_9F - warp_to $b, $5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F - warp_to $3, $f, SILPH_CO_5F_WIDTH ; SILPH_CO_3F + warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F + warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F + warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F + warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F + warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F + warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index 9409a4b5..b45700ba 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -1,30 +1,30 @@ SilphCo6Object: - db $2e ; border block + db 46 ; border block - db $5 ; warps - warp $10, $0, $1, SILPH_CO_7F - warp $e, $0, $0, SILPH_CO_5F - warp $12, $0, $0, SILPH_CO_ELEVATOR - warp $3, $3, $4, SILPH_CO_4F - warp $17, $3, $6, SILPH_CO_2F + db 5 ; warps + warp 16, 0, 1, SILPH_CO_7F + warp 14, 0, 0, SILPH_CO_5F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 4, SILPH_CO_4F + warp 23, 3, 6, SILPH_CO_2F - db $0 ; signs + db 0 ; signs - db $a ; objects - object SPRITE_LAPRAS_GIVER, $a, $6, STAY, NONE, $1 ; person - object SPRITE_LAPRAS_GIVER, $14, $6, STAY, NONE, $2 ; person - object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person - object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person - object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person - object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, OPP_ROCKET, $1e - object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, OPP_SCIENTIST, $7 - object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, OPP_ROCKET, $1f - object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP - object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY + db 10 ; objects + object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person + object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person + object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person + object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person + object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person + object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 + object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 + object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP + object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY ; warp-to - warp_to $10, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F - warp_to $e, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F - warp_to $12, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $3, $3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F - warp_to $17, $3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F + warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F + warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F + warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F + warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index 1eb12713..b23775a9 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -1,33 +1,33 @@ SilphCo7Object: - db $2e ; border block + db 46 ; border block - db $6 ; warps - warp $10, $0, $1, SILPH_CO_8F - warp $16, $0, $0, SILPH_CO_6F - warp $12, $0, $0, SILPH_CO_ELEVATOR - warp $5, $7, $3, SILPH_CO_11F - warp $5, $3, $8, SILPH_CO_3F - warp $15, $f, $3, SILPH_CO_5F + db 6 ; warps + warp 16, 0, 1, SILPH_CO_8F + warp 22, 0, 0, SILPH_CO_6F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 5, 7, 3, SILPH_CO_11F + warp 5, 3, 8, SILPH_CO_3F + warp 21, 15, 3, SILPH_CO_5F - db $0 ; signs + db 0 ; signs - db $b ; objects - object SPRITE_LAPRAS_GIVER, $1, $5, STAY, NONE, $1 ; person - object SPRITE_LAPRAS_GIVER, $d, $d, STAY, UP, $2 ; person - object SPRITE_LAPRAS_GIVER, $7, $a, STAY, NONE, $3 ; person - object SPRITE_ERIKA, $a, $8, STAY, NONE, $4 ; person - object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, OPP_ROCKET, $20 - object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, OPP_SCIENTIST, $8 - object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, OPP_ROCKET, $21 - object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, OPP_ROCKET, $22 - object SPRITE_BLUE, $3, $7, STAY, UP, $9 ; person - object SPRITE_BALL, $1, $9, STAY, NONE, $a, CALCIUM - object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 + db 11 ; objects + object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person + object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person + object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person + object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 + object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 + object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 + object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person + object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM + object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03 ; warp-to - warp_to $10, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F - warp_to $16, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F - warp_to $12, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $5, $7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F - warp_to $5, $3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F - warp_to $15, $f, SILPH_CO_7F_WIDTH ; SILPH_CO_5F + warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F + warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F + warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F + warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F + warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 5574e18e..c9f9e1ef 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -1,28 +1,28 @@ SilphCo8Object: - db $2e ; border block + db 46 ; border block - db $7 ; warps - warp $10, $0, $1, SILPH_CO_9F - warp $e, $0, $0, SILPH_CO_7F - warp $12, $0, $0, SILPH_CO_ELEVATOR - warp $3, $b, $6, SILPH_CO_8F - warp $3, $f, $4, SILPH_CO_2F - warp $b, $5, $5, SILPH_CO_2F - warp $b, $9, $3, SILPH_CO_8F + db 7 ; warps + warp 16, 0, 1, SILPH_CO_9F + warp 14, 0, 0, SILPH_CO_7F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 11, 6, SILPH_CO_8F + warp 3, 15, 4, SILPH_CO_2F + warp 11, 5, 5, SILPH_CO_2F + warp 11, 9, 3, SILPH_CO_8F - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, OPP_ROCKET, $23 - object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, OPP_SCIENTIST, $9 - object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 + db 4 ; objects + object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 + object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 + object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 ; warp-to - warp_to $10, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F - warp_to $e, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F - warp_to $12, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $3, $b, SILPH_CO_8F_WIDTH ; SILPH_CO_8F - warp_to $3, $f, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to $b, $5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to $b, $9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH + warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F + warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F + warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F + warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 1a89997f..8abf27cf 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -1,24 +1,24 @@ SilphCo9Object: - db $2e ; border block + db 46 ; border block - db $5 ; warps - warp $e, $0, $0, SILPH_CO_10F - warp $10, $0, $0, SILPH_CO_8F - warp $12, $0, $0, SILPH_CO_ELEVATOR - warp $9, $3, $7, SILPH_CO_3F - warp $11, $f, $4, SILPH_CO_5F + db 5 ; warps + warp 14, 0, 0, SILPH_CO_10F + warp 16, 0, 0, SILPH_CO_8F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 9, 3, 7, SILPH_CO_3F + warp 17, 15, 4, SILPH_CO_5F - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $2, $4, STAY, UP, $2, OPP_ROCKET, $25 - object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, OPP_SCIENTIST, $a - object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 + db 4 ; objects + object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 + object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 + object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 ; warp-to - warp_to $e, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F - warp_to $10, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F - warp_to $12, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $9, $3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F - warp_to $11, $f, SILPH_CO_9F_WIDTH ; SILPH_CO_5F + warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F + warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F + warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F + warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index 13a13739..e451a63c 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -1,15 +1,15 @@ SilphCoElevatorObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $1, $3, $0, $ed - warp $2, $3, $0, $ed + db 2 ; warps + warp 1, 3, 0, 237 + warp 2, 3, 0, 237 - db $1 ; signs - sign $3, $0, $1 ; SilphCoElevatorText1 + db 1 ; signs + sign 3, 0, 1 ; SilphCoElevatorText1 - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $1, $3, SILPH_CO_ELEVATOR_WIDTH - warp_to $2, $3, SILPH_CO_ELEVATOR_WIDTH + warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH + warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index c3f96ef4..0e44fa82 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -1,34 +1,34 @@ SSAnne1Object: - db $c ; border block + db 12 ; border block - db $b ; warps - warp $1a, $0, $1, VERMILION_DOCK - warp $1b, $0, $1, VERMILION_DOCK - warp $1f, $8, $0, SS_ANNE_8 - warp $17, $8, $1, SS_ANNE_8 - warp $13, $8, $2, SS_ANNE_8 - warp $f, $8, $3, SS_ANNE_8 - warp $b, $8, $4, SS_ANNE_8 - warp $7, $8, $5, SS_ANNE_8 - warp $2, $6, $6, SS_ANNE_2 - warp $25, $f, $5, SS_ANNE_4 - warp $3, $10, $0, SS_ANNE_6 + db 11 ; warps + warp 26, 0, 1, VERMILION_DOCK + warp 27, 0, 1, VERMILION_DOCK + warp 31, 8, 0, SS_ANNE_8 + warp 23, 8, 1, SS_ANNE_8 + warp 19, 8, 2, SS_ANNE_8 + warp 15, 8, 3, SS_ANNE_8 + warp 11, 8, 4, SS_ANNE_8 + warp 7, 8, 5, SS_ANNE_8 + warp 2, 6, 6, SS_ANNE_2 + warp 37, 15, 5, SS_ANNE_4 + warp 3, 16, 0, SS_ANNE_6 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_WAITER, $c, $6, WALK, $2, $1 ; person - object SPRITE_SAILOR, $1b, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person + object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person ; warp-to - warp_to $1a, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK - warp_to $1b, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK - warp_to $1f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to $17, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to $13, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to $f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to $b, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to $7, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to $2, $6, SS_ANNE_1_WIDTH ; SS_ANNE_2 - warp_to $25, $f, SS_ANNE_1_WIDTH ; SS_ANNE_4 - warp_to $3, $10, SS_ANNE_1_WIDTH ; SS_ANNE_6 + warp_to 26, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to 27, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to 31, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 23, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 19, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 15, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 11, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 7, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 2, 6, SS_ANNE_1_WIDTH ; SS_ANNE_2 + warp_to 37, 15, SS_ANNE_1_WIDTH ; SS_ANNE_4 + warp_to 3, 16, SS_ANNE_1_WIDTH ; SS_ANNE_6 diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index a281316c..8aac7643 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -1,41 +1,41 @@ SSAnne10Object: - db $c ; border block + db 12 ; border block - db $a ; warps - warp $2, $5, $4, SS_ANNE_4 - warp $3, $5, $4, SS_ANNE_4 - warp $c, $5, $3, SS_ANNE_4 - warp $d, $5, $3, SS_ANNE_4 - warp $16, $5, $2, SS_ANNE_4 - warp $17, $5, $2, SS_ANNE_4 - warp $2, $f, $1, SS_ANNE_4 - warp $3, $f, $1, SS_ANNE_4 - warp $c, $f, $0, SS_ANNE_4 - warp $d, $f, $0, SS_ANNE_4 + db 10 ; warps + warp 2, 5, 4, SS_ANNE_4 + warp 3, 5, 4, SS_ANNE_4 + warp 12, 5, 3, SS_ANNE_4 + warp 13, 5, 3, SS_ANNE_4 + warp 22, 5, 2, SS_ANNE_4 + warp 23, 5, 2, SS_ANNE_4 + warp 2, 15, 1, SS_ANNE_4 + warp 3, 15, 1, SS_ANNE_4 + warp 12, 15, 0, SS_ANNE_4 + warp 13, 15, 0, SS_ANNE_4 - db $0 ; signs + db 0 ; signs - db $b ; objects - object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, OPP_SAILOR, $3 - object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, OPP_SAILOR, $4 - object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, OPP_SAILOR, $5 - object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, OPP_SAILOR, $6 - object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, OPP_SAILOR, $7 - object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, OPP_FISHER, $2 - object SPRITE_BLACK_HAIR_BOY_2, $a, $d, STAY, RIGHT, $7 ; person - object SPRITE_SLOWBRO, $b, $c, STAY, NONE, $8 ; person - object SPRITE_BALL, $14, $2, STAY, NONE, $9, ETHER - object SPRITE_BALL, $a, $2, STAY, NONE, $a, TM_44 - object SPRITE_BALL, $c, $b, STAY, NONE, $b, MAX_POTION + db 11 ; objects + object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 + object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 + object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 + object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 + object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 + object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 + object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person + object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person + object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER + object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 + object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION ; warp-to - warp_to $2, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $3, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $c, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $d, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $16, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $17, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $2, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $3, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $c, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to $d, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 2, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 3, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 12, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 13, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 22, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 23, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 2, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 3, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 12, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to 13, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 208cf88c..d2a1df31 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -1,30 +1,30 @@ SSAnne2Object: - db $c ; border block + db 12 ; border block - db $9 ; warps - warp $9, $b, $0, SS_ANNE_9 - warp $d, $b, $2, SS_ANNE_9 - warp $11, $b, $4, SS_ANNE_9 - warp $15, $b, $6, SS_ANNE_9 - warp $19, $b, $8, SS_ANNE_9 - warp $1d, $b, $a, SS_ANNE_9 - warp $2, $4, $8, SS_ANNE_1 - warp $2, $c, $1, SS_ANNE_3 - warp $24, $4, $0, SS_ANNE_7 + db 9 ; warps + warp 9, 11, 0, SS_ANNE_9 + warp 13, 11, 2, SS_ANNE_9 + warp 17, 11, 4, SS_ANNE_9 + warp 21, 11, 6, SS_ANNE_9 + warp 25, 11, 8, SS_ANNE_9 + warp 29, 11, 10, SS_ANNE_9 + warp 2, 4, 8, SS_ANNE_1 + warp 2, 12, 1, SS_ANNE_3 + warp 36, 4, 0, SS_ANNE_7 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_WAITER, $3, $7, WALK, $1, $1 ; person - object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, OPP_SONY1, $1 + db 2 ; objects + object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person + object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 ; warp-to - warp_to $9, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to $d, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to $11, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to $15, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to $19, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to $1d, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to $2, $4, SS_ANNE_2_WIDTH ; SS_ANNE_1 - warp_to $2, $c, SS_ANNE_2_WIDTH ; SS_ANNE_3 - warp_to $24, $4, SS_ANNE_2_WIDTH ; SS_ANNE_7 + warp_to 9, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to 13, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to 17, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to 21, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to 25, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to 29, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to 2, 4, SS_ANNE_2_WIDTH ; SS_ANNE_1 + warp_to 2, 12, SS_ANNE_2_WIDTH ; SS_ANNE_3 + warp_to 36, 4, SS_ANNE_2_WIDTH ; SS_ANNE_7 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index f431fe46..8de4c53d 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,15 +1,15 @@ SSAnne3Object: - db $c ; border block + db 12 ; border block - db $2 ; warps - warp $0, $3, $0, SS_ANNE_5 - warp $13, $3, $7, SS_ANNE_2 + db 2 ; warps + warp 0, 3, 0, SS_ANNE_5 + warp 19, 3, 7, SS_ANNE_2 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person + db 1 ; objects + object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person ; warp-to - warp_to $0, $3, SS_ANNE_3_WIDTH ; SS_ANNE_5 - warp_to $13, $3, SS_ANNE_3_WIDTH ; SS_ANNE_2 + warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_5 + warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index d1e72162..83852a5b 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -1,22 +1,22 @@ SSAnne4Object: - db $c ; border block + db 12 ; border block - db $6 ; warps - warp $17, $3, $8, SS_ANNE_10 - warp $13, $3, $6, SS_ANNE_10 - warp $f, $3, $4, SS_ANNE_10 - warp $b, $3, $2, SS_ANNE_10 - warp $7, $3, $0, SS_ANNE_10 - warp $1b, $5, $9, SS_ANNE_1 + db 6 ; warps + warp 23, 3, 8, SS_ANNE_10 + warp 19, 3, 6, SS_ANNE_10 + warp 15, 3, 4, SS_ANNE_10 + warp 11, 3, 2, SS_ANNE_10 + warp 7, 3, 0, SS_ANNE_10 + warp 27, 5, 9, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $17, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $13, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $f, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $b, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $7, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to $1b, $5, SS_ANNE_4_WIDTH ; SS_ANNE_1 + warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 44816883..5e96d3b7 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -1,19 +1,19 @@ SSAnne5Object: - db $23 ; border block + db 35 ; border block - db $2 ; warps - warp $d, $6, $0, SS_ANNE_3 - warp $d, $7, $0, SS_ANNE_3 + db 2 ; warps + warp 13, 6, 0, SS_ANNE_3 + warp 13, 7, 0, SS_ANNE_3 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $5, $2, STAY, UP, $1 ; person - object SPRITE_SAILOR, $4, $9, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $7, $b, STAY, NONE, $3 ; person - object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, OPP_SAILOR, $1 - object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2 + db 5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person + object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person + object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 + object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 ; warp-to - warp_to $d, $6, SS_ANNE_5_WIDTH ; SS_ANNE_3 - warp_to $d, $7, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 25568e99..8a1b2326 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -1,19 +1,19 @@ SSAnne6Object: - db $c ; border block + db 12 ; border block - db $1 ; warps - warp $6, $0, $a, SS_ANNE_1 + db 1 ; warps + warp 6, 0, 10, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $7 ; objects - object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person - object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person - object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person - object SPRITE_COOK, $d, $6, STAY, NONE, $4 ; person - object SPRITE_COOK, $d, $8, STAY, NONE, $5 ; person - object SPRITE_COOK, $d, $a, STAY, NONE, $6 ; person - object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person + db 7 ; objects + object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person + object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person + object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person + object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person + object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person + object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person + object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person ; warp-to - warp_to $6, $0, SS_ANNE_6_WIDTH ; SS_ANNE_1 + warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 8e9c9194..1855967c 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -1,15 +1,15 @@ SSAnne7Object: - db $c ; border block + db 12 ; border block - db $1 ; warps - warp $0, $7, $8, SS_ANNE_2 + db 1 ; warps + warp 0, 7, 8, SS_ANNE_2 - db $2 ; signs - sign $4, $1, $2 ; SSAnne7Text2 - sign $1, $2, $3 ; SSAnne7Text3 + db 2 ; signs + sign 4, 1, 2 ; SSAnne7Text2 + sign 1, 2, 3 ; SSAnne7Text3 - db $1 ; objects - object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person + db 1 ; objects + object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person ; warp-to - warp_to $0, $7, SS_ANNE_7_WIDTH ; SS_ANNE_2 + warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index b298f179..05645d78 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -1,33 +1,33 @@ SSAnne8Object: - db $c ; border block + db 12 ; border block - db $6 ; warps - warp $0, $0, $2, SS_ANNE_1 - warp $a, $0, $3, SS_ANNE_1 - warp $14, $0, $4, SS_ANNE_1 - warp $0, $a, $5, SS_ANNE_1 - warp $a, $a, $6, SS_ANNE_1 - warp $14, $a, $7, SS_ANNE_1 + db 6 ; warps + warp 0, 0, 2, SS_ANNE_1 + warp 10, 0, 3, SS_ANNE_1 + warp 20, 0, 4, SS_ANNE_1 + warp 0, 10, 5, SS_ANNE_1 + warp 10, 10, 6, SS_ANNE_1 + warp 20, 10, 7, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $b ; objects - object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, OPP_GENTLEMAN, $1 - object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, OPP_GENTLEMAN, $2 - object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, OPP_YOUNGSTER, $8 - object SPRITE_LASS, $d, $b, STAY, LEFT, $4, OPP_LASS, $b - object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person - object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person - object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person - object SPRITE_CLEFAIRY, $3, $b, STAY, DOWN, $8 ; person - object SPRITE_GIRL, $a, $d, STAY, RIGHT, $9 ; person - object SPRITE_BALL, $c, $f, STAY, NONE, $a, TM_08 - object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person + db 11 ; objects + object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 + object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 + object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 + object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 + object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person + object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person + object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person + object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person + object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person + object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08 + object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person ; warp-to - warp_to $0, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to $a, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to $14, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to $0, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to $a, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to $14, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index c3cc9e6a..9c3aafb7 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -1,47 +1,47 @@ SSAnne9Object: - db $c ; border block + db 12 ; border block - db $c ; warps - warp $2, $5, $0, SS_ANNE_2 - warp $3, $5, $0, SS_ANNE_2 - warp $c, $5, $1, SS_ANNE_2 - warp $d, $5, $1, SS_ANNE_2 - warp $16, $5, $2, SS_ANNE_2 - warp $17, $5, $2, SS_ANNE_2 - warp $2, $f, $3, SS_ANNE_2 - warp $3, $f, $3, SS_ANNE_2 - warp $c, $f, $4, SS_ANNE_2 - warp $d, $f, $4, SS_ANNE_2 - warp $16, $f, $5, SS_ANNE_2 - warp $17, $f, $5, SS_ANNE_2 + db 12 ; warps + warp 2, 5, 0, SS_ANNE_2 + warp 3, 5, 0, SS_ANNE_2 + warp 12, 5, 1, SS_ANNE_2 + warp 13, 5, 1, SS_ANNE_2 + warp 22, 5, 2, SS_ANNE_2 + warp 23, 5, 2, SS_ANNE_2 + warp 2, 15, 3, SS_ANNE_2 + warp 3, 15, 3, SS_ANNE_2 + warp 12, 15, 4, SS_ANNE_2 + warp 13, 15, 4, SS_ANNE_2 + warp 22, 15, 5, SS_ANNE_2 + warp 23, 15, 5, SS_ANNE_2 - db $0 ; signs + db 0 ; signs - db $d ; objects - object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, OPP_GENTLEMAN, $3 - object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, OPP_FISHER, $1 - object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, OPP_GENTLEMAN, $5 - object SPRITE_LASS, $2, $b, STAY, DOWN, $4, OPP_LASS, $c - object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person - object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER - object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person - object SPRITE_OLD_PERSON, $16, $1, STAY, DOWN, $8 ; person - object SPRITE_BALL, $0, $c, STAY, NONE, $9, RARE_CANDY - object SPRITE_GENTLEMAN, $c, $c, STAY, DOWN, $a ; person - object SPRITE_YOUNG_BOY, $b, $e, STAY, NONE, $b ; person - object SPRITE_BRUNETTE_GIRL, $16, $c, STAY, LEFT, $c ; person - object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person + db 13 ; objects + object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person + object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person + object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person + object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person + object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person ; warp-to - warp_to $2, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $3, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $c, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $d, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $16, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $17, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $2, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $3, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $c, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $d, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $16, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to $17, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 2, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 3, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 12, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 13, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 22, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 23, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 2, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 3, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 12, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 13, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 22, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to 23, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index f482fc4f..851cb1ab 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -1,9 +1,9 @@ TradeCenterObject: - db $e ; border block + db 14 ; border block - db $0 ; warps + db 0 ; warps - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_RED, $2, $2, STAY, $0, $1 ; person + db 1 ; objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index 1c63b2e7..1aa26743 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -1,17 +1,17 @@ UndergroundPathEntranceRoute5Object: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $3, $7, $3, $ff - warp $4, $7, $3, $ff - warp $4, $4, $0, UNDERGROUND_PATH_NS + db 3 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + warp 4, 4, 0, UNDERGROUND_PATH_NS - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_LITTLE_GIRL, $2, $3, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person ; warp-to - warp_to $3, $7, PATH_ENTRANCE_ROUTE_5_WIDTH - warp_to $4, $7, PATH_ENTRANCE_ROUTE_5_WIDTH - warp_to $4, $4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS + warp_to 3, 7, PATH_ENTRANCE_ROUTE_5_WIDTH + warp_to 4, 7, PATH_ENTRANCE_ROUTE_5_WIDTH + warp_to 4, 4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 41e375b0..ab45c91a 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -1,17 +1,17 @@ UndergroundPathEntranceRoute6Object: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $3, $7, $3, $ff - warp $4, $7, $3, $ff - warp $4, $4, $1, UNDERGROUND_PATH_NS + db 3 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + warp 4, 4, 1, UNDERGROUND_PATH_NS - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GIRL, $2, $3, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person ; warp-to - warp_to $3, $7, PATH_ENTRANCE_ROUTE_6_WIDTH - warp_to $4, $7, PATH_ENTRANCE_ROUTE_6_WIDTH - warp_to $4, $4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS + warp_to 3, 7, PATH_ENTRANCE_ROUTE_6_WIDTH + warp_to 4, 7, PATH_ENTRANCE_ROUTE_6_WIDTH + warp_to 4, 4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 29f971d0..97c730ad 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -1,17 +1,17 @@ UndergroundPathEntranceRoute7Object: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $4, $ff - warp $4, $4, $0, UNDERGROUND_PATH_WE + db 3 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + warp 4, 4, 0, UNDERGROUND_PATH_WE - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person ; warp-to - warp_to $3, $7, PATH_ENTRANCE_ROUTE_7_WIDTH - warp_to $4, $7, PATH_ENTRANCE_ROUTE_7_WIDTH - warp_to $4, $4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE + warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_WIDTH + warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_WIDTH + warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 7d595d5f..bf42e84d 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -1,18 +1,18 @@ UndergroundPathEntranceRoute7CopyObject: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $3, $7, $5, $ff - warp $4, $7, $5, $ff - warp $4, $4, $0, UNDERGROUND_PATH_WE + db 3 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 + warp 4, 4, 0, UNDERGROUND_PATH_WE - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_GIRL, $3, $2, STAY, NONE, $1 ; person - object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person + object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person ; warp-to - warp_to $3, $7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH - warp_to $4, $7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH - warp_to $4, $4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE + warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH + warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH + warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 84548b8c..39337cb9 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -1,17 +1,17 @@ UndergroundPathEntranceRoute8Object: - db $a ; border block + db 10 ; border block - db $3 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $4, $ff - warp $4, $4, $1, UNDERGROUND_PATH_WE + db 3 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + warp 4, 4, 1, UNDERGROUND_PATH_WE - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GIRL, $3, $4, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person ; warp-to - warp_to $3, $7, PATH_ENTRANCE_ROUTE_8_WIDTH - warp_to $4, $7, PATH_ENTRANCE_ROUTE_8_WIDTH - warp_to $4, $4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE + warp_to 3, 7, PATH_ENTRANCE_ROUTE_8_WIDTH + warp_to 4, 7, PATH_ENTRANCE_ROUTE_8_WIDTH + warp_to 4, 4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index 4fcb2feb..7a805280 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -1,14 +1,14 @@ UndergroundPathNSObject: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $5, $4, $2, PATH_ENTRANCE_ROUTE_5 - warp $2, $29, $2, PATH_ENTRANCE_ROUTE_6 + db 2 ; warps + warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5 + warp 2, 41, 2, PATH_ENTRANCE_ROUTE_6 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $5, $4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5 - warp_to $2, $29, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6 + warp_to 5, 4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to 2, 41, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index 292db488..a6c04541 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -1,14 +1,14 @@ UndergroundPathWEObject: - db $1 ; border block + db 1 ; border block - db $2 ; warps - warp $2, $5, $2, PATH_ENTRANCE_ROUTE_7 - warp $2f, $2, $2, PATH_ENTRANCE_ROUTE_8 + db 2 ; warps + warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7 + warp 47, 2, 2, PATH_ENTRANCE_ROUTE_8 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $2, $5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7 - warp_to $2f, $2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8 + warp_to 2, 5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7 + warp_to 47, 2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 1f5663b9..68492e85 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -1,31 +1,31 @@ UnknownDungeon1Object: - db $7d ; border block + db 125 ; border block - db $9 ; warps - warp $18, $11, $6, $ff - warp $19, $11, $6, $ff - warp $1b, $1, $0, UNKNOWN_DUNGEON_2 - warp $17, $7, $1, UNKNOWN_DUNGEON_2 - warp $12, $9, $2, UNKNOWN_DUNGEON_2 - warp $7, $1, $3, UNKNOWN_DUNGEON_2 - warp $1, $3, $4, UNKNOWN_DUNGEON_2 - warp $3, $b, $5, UNKNOWN_DUNGEON_2 - warp $0, $6, $0, UNKNOWN_DUNGEON_3 + db 9 ; warps + warp 24, 17, 6, -1 + warp 25, 17, 6, -1 + warp 27, 1, 0, UNKNOWN_DUNGEON_2 + warp 23, 7, 1, UNKNOWN_DUNGEON_2 + warp 18, 9, 2, UNKNOWN_DUNGEON_2 + warp 7, 1, 3, UNKNOWN_DUNGEON_2 + warp 1, 3, 4, UNKNOWN_DUNGEON_2 + warp 3, 11, 5, UNKNOWN_DUNGEON_2 + warp 0, 6, 0, UNKNOWN_DUNGEON_3 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE - object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER - object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET + db 3 ; objects + object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE + object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER + object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET ; warp-to - warp_to $18, $11, UNKNOWN_DUNGEON_1_WIDTH - warp_to $19, $11, UNKNOWN_DUNGEON_1_WIDTH - warp_to $1b, $1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to $17, $7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to $12, $9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to $7, $1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to $1, $3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to $3, $b, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to $0, $6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 + warp_to 24, 17, UNKNOWN_DUNGEON_1_WIDTH + warp_to 25, 17, UNKNOWN_DUNGEON_1_WIDTH + warp_to 27, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 23, 7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 18, 9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 7, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 1, 3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 3, 11, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 0, 6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index a8fb25f9..a5b3b09e 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -1,25 +1,25 @@ UnknownDungeon2Object: - db $7d ; border block + db 125 ; border block - db $6 ; warps - warp $1d, $1, $2, UNKNOWN_DUNGEON_1 - warp $16, $6, $3, UNKNOWN_DUNGEON_1 - warp $13, $7, $4, UNKNOWN_DUNGEON_1 - warp $9, $1, $5, UNKNOWN_DUNGEON_1 - warp $1, $3, $6, UNKNOWN_DUNGEON_1 - warp $3, $b, $7, UNKNOWN_DUNGEON_1 + db 6 ; warps + warp 29, 1, 2, UNKNOWN_DUNGEON_1 + warp 22, 6, 3, UNKNOWN_DUNGEON_1 + warp 19, 7, 4, UNKNOWN_DUNGEON_1 + warp 9, 1, 5, UNKNOWN_DUNGEON_1 + warp 1, 3, 6, UNKNOWN_DUNGEON_1 + warp 3, 11, 7, UNKNOWN_DUNGEON_1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP - object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE + db 3 ; objects + object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP + object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE ; warp-to - warp_to $1d, $1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to $16, $6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to $13, $7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to $9, $1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to $1, $3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to $3, $b, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 29, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 22, 6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 19, 7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 9, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 1, 3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 3, 11, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 98abcf7c..95d80d12 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -1,15 +1,15 @@ UnknownDungeon3Object: - db $7d ; border block + db 125 ; border block - db $1 ; warps - warp $3, $6, $8, UNKNOWN_DUNGEON_1 + db 1 ; warps + warp 3, 6, 8, UNKNOWN_DUNGEON_1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70 - object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE + db 3 ; objects + object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 + object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE ; warp-to - warp_to $3, $6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 6b3d6011..839faa37 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -1,41 +1,41 @@ VermilionCityObject: - db $43 ; border block + db 67 ; border block - db $9 ; warps - warp $b, $3, $0, VERMILION_POKECENTER - warp $9, $d, $0, POKEMON_FAN_CLUB - warp $17, $d, $0, VERMILION_MART - warp $c, $13, $0, VERMILION_GYM - warp $17, $13, $0, VERMILION_HOUSE_1 - warp $12, $1f, $0, VERMILION_DOCK - warp $13, $1f, $0, VERMILION_DOCK - warp $f, $d, $0, VERMILION_HOUSE_3 - warp $7, $3, $0, VERMILION_HOUSE_2 + db 9 ; warps + warp 11, 3, 0, VERMILION_POKECENTER + warp 9, 13, 0, POKEMON_FAN_CLUB + warp 23, 13, 0, VERMILION_MART + warp 12, 19, 0, VERMILION_GYM + warp 23, 19, 0, VERMILION_HOUSE_1 + warp 18, 31, 0, VERMILION_DOCK + warp 19, 31, 0, VERMILION_DOCK + warp 15, 13, 0, VERMILION_HOUSE_3 + warp 7, 3, 0, VERMILION_HOUSE_2 - db $7 ; signs - sign $1b, $3, $7 ; VermilionCityText7 - sign $25, $d, $8 ; VermilionCityText8 - sign $18, $d, $9 ; MartSignText - sign $c, $3, $a ; PokeCenterSignText - sign $7, $d, $b ; VermilionCityText11 - sign $7, $13, $c ; VermilionCityText12 - sign $1d, $f, $d ; VermilionCityText13 + db 7 ; signs + sign 27, 3, 7 ; VermilionCityText7 + sign 37, 13, 8 ; VermilionCityText8 + sign 24, 13, 9 ; MartSignText + sign 12, 3, 10 ; PokeCenterSignText + sign 7, 13, 11 ; VermilionCityText11 + sign 7, 19, 12 ; VermilionCityText12 + sign 29, 15, 13 ; VermilionCityText13 - db $6 ; objects - object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person - object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person - object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person - object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person - object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person - object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person + db 6 ; objects + object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person + object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person + object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person + object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person ; warp-to - warp_to $b, $3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER - warp_to $9, $d, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB - warp_to $17, $d, VERMILION_CITY_WIDTH ; VERMILION_MART - warp_to $c, $13, VERMILION_CITY_WIDTH ; VERMILION_GYM - warp_to $17, $13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1 - warp_to $12, $1f, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to $13, $1f, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to $f, $d, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3 - warp_to $7, $3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2 + warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER + warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB + warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART + warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM + warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1 + warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3 + warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2 diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 1c0f2f44..8ad6cc3e 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -1,14 +1,14 @@ VermilionDockObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $e, $0, $5, $ff - warp $e, $2, $1, SS_ANNE_1 + db 2 ; warps + warp 14, 0, 5, -1 + warp 14, 2, 1, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - warp_to $e, $0, VERMILION_DOCK_WIDTH - warp_to $e, $2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 + warp_to 14, 0, VERMILION_DOCK_WIDTH + warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 16af5f5b..1c901424 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -1,19 +1,19 @@ VermilionGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $4, $11, $3, $ff - warp $5, $11, $3, $ff + db 2 ; warps + warp 4, 17, 3, -1 + warp 5, 17, 3, -1 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT_SURGE, $1 - object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1 - object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8 - object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 + object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 + object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 + object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 + object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person ; warp-to - warp_to $4, $11, VERMILION_GYM_WIDTH - warp_to $5, $11, VERMILION_GYM_WIDTH + warp_to 4, 17, VERMILION_GYM_WIDTH + warp_to 5, 17, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 6a36b043..5b1961ca 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -1,17 +1,17 @@ VermilionHouse1Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $4, $ff - warp $3, $7, $4, $ff + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BUG_CATCHER, $5, $3, STAY, LEFT, $1 ; person - object SPRITE_BIRD, $3, $5, WALK, $2, $2 ; person - object SPRITE_PAPER_SHEET, $4, $3, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person + object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person ; warp-to - warp_to $2, $7, VERMILION_HOUSE_1_WIDTH - warp_to $3, $7, VERMILION_HOUSE_1_WIDTH + warp_to 2, 7, VERMILION_HOUSE_1_WIDTH + warp_to 3, 7, VERMILION_HOUSE_1_WIDTH diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index e66744b6..fdad3571 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -1,15 +1,15 @@ VermilionHouse2Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $8, $ff - warp $3, $7, $8, $ff + db 2 ; warps + warp 2, 7, 8, -1 + warp 3, 7, 8, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person + db 1 ; objects + object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person ; warp-to - warp_to $2, $7, VERMILION_HOUSE_2_WIDTH - warp_to $3, $7, VERMILION_HOUSE_2_WIDTH + warp_to 2, 7, VERMILION_HOUSE_2_WIDTH + warp_to 3, 7, VERMILION_HOUSE_2_WIDTH diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 7bafcd88..19a60f4d 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -1,15 +1,15 @@ VermilionHouse3Object: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $7, $ff - warp $3, $7, $7, $ff + db 2 ; warps + warp 2, 7, 7, -1 + warp 3, 7, 7, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person + db 1 ; objects + object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person ; warp-to - warp_to $2, $7, VERMILION_HOUSE_3_WIDTH - warp_to $3, $7, VERMILION_HOUSE_3_WIDTH + warp_to 2, 7, VERMILION_HOUSE_3_WIDTH + warp_to 3, 7, VERMILION_HOUSE_3_WIDTH diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 2b1c578d..437478fd 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -1,17 +1,17 @@ VermilionMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $2, $ff - warp $4, $7, $2, $ff + db 2 ; warps + warp 3, 7, 2, -1 + warp 4, 7, 2, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $5, $6, STAY, NONE, $2 ; person - object SPRITE_LASS, $3, $3, WALK, $2, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person + object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person ; warp-to - warp_to $3, $7, VERMILION_MART_WIDTH - warp_to $4, $7, VERMILION_MART_WIDTH + warp_to 3, 7, VERMILION_MART_WIDTH + warp_to 4, 7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index 0934cd4f..eeef9c20 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -1,18 +1,18 @@ VermilionPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $0, $ff - warp $4, $7, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_FISHER, $a, $5, STAY, NONE, $2 ; person - object SPRITE_SAILOR, $5, $4, STAY, NONE, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person + object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, VERMILION_POKECENTER_WIDTH - warp_to $4, $7, VERMILION_POKECENTER_WIDTH + warp_to 3, 7, VERMILION_POKECENTER_WIDTH + warp_to 4, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index a354328d..1c538125 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -1,23 +1,23 @@ VictoryRoad1Object: - db $7d ; border block + db 125 ; border block - db $3 ; warps - warp $8, $11, $2, $ff - warp $9, $11, $2, $ff - warp $1, $1, $0, VICTORY_ROAD_2 + db 3 ; warps + warp 8, 17, 2, -1 + warp 9, 17, 2, -1 + warp 1, 1, 0, VICTORY_ROAD_2 - db $0 ; signs + db 0 ; signs - db $7 ; objects - object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, OPP_COOLTRAINER_F, $5 - object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, OPP_COOLTRAINER_M, $5 - object SPRITE_BALL, $b, $0, STAY, NONE, $3, TM_43 - object SPRITE_BALL, $9, $2, STAY, NONE, $4, RARE_CANDY - object SPRITE_BOULDER, $5, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $5 ; person - object SPRITE_BOULDER, $e, $2, STAY, BOULDER_MOVEMENT_BYTE_2, $6 ; person - object SPRITE_BOULDER, $2, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person + db 7 ; objects + object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 + object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 + object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43 + object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY + object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person + object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person ; warp-to - warp_to $8, $11, VICTORY_ROAD_1_WIDTH - warp_to $9, $11, VICTORY_ROAD_1_WIDTH - warp_to $1, $1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2 + warp_to 8, 17, VICTORY_ROAD_1_WIDTH + warp_to 9, 17, VICTORY_ROAD_1_WIDTH + warp_to 1, 1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 7d8c6e3c..361bef2d 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -1,37 +1,37 @@ VictoryRoad2Object: - db $7d ; border block + db 125 ; border block - db $7 ; warps - warp $0, $8, $2, VICTORY_ROAD_1 - warp $1d, $7, $3, $ff - warp $1d, $8, $3, $ff - warp $17, $7, $0, VICTORY_ROAD_3 - warp $19, $e, $2, VICTORY_ROAD_3 - warp $1b, $7, $1, VICTORY_ROAD_3 - warp $1, $1, $3, VICTORY_ROAD_3 + db 7 ; warps + warp 0, 8, 2, VICTORY_ROAD_1 + warp 29, 7, 3, -1 + warp 29, 8, 3, -1 + warp 23, 7, 0, VICTORY_ROAD_3 + warp 25, 14, 2, VICTORY_ROAD_3 + warp 27, 7, 1, VICTORY_ROAD_3 + warp 1, 1, 3, VICTORY_ROAD_3 - db $0 ; signs + db 0 ; signs - db $d ; objects - object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, OPP_BLACKBELT, $9 - object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, OPP_JUGGLER, $2 - object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, OPP_TAMER, $5 - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, OPP_POKEMANIAC, $6 - object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, OPP_JUGGLER, $5 - object SPRITE_BIRD, $b, $5, STAY, UP, $6, MOLTRES, 50 - object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 - object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL - object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 - object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC - object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person - object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person - object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person + db 13 ; objects + object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 + object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 + object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 + object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 + object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 + object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17 + object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL + object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05 + object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC + object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person ; warp-to - warp_to $0, $8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1 - warp_to $1d, $7, VICTORY_ROAD_2_WIDTH - warp_to $1d, $8, VICTORY_ROAD_2_WIDTH - warp_to $17, $7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to $19, $e, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to $1b, $7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to $1, $1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to 0, 8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1 + warp_to 29, 7, VICTORY_ROAD_2_WIDTH + warp_to 29, 8, VICTORY_ROAD_2_WIDTH + warp_to 23, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to 25, 14, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to 27, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to 1, 1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index c83026ef..1bd72e51 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -1,28 +1,28 @@ VictoryRoad3Object: - db $7d ; border block + db 125 ; border block - db $4 ; warps - warp $17, $7, $3, VICTORY_ROAD_2 - warp $1a, $8, $5, VICTORY_ROAD_2 - warp $1b, $f, $4, VICTORY_ROAD_2 - warp $2, $0, $6, VICTORY_ROAD_2 + db 4 ; warps + warp 23, 7, 3, VICTORY_ROAD_2 + warp 26, 8, 5, VICTORY_ROAD_2 + warp 27, 15, 4, VICTORY_ROAD_2 + warp 2, 0, 6, VICTORY_ROAD_2 - db $0 ; signs + db 0 ; signs - db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, OPP_COOLTRAINER_M, $2 - object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, OPP_COOLTRAINER_F, $2 - object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, OPP_COOLTRAINER_M, $3 - object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, OPP_COOLTRAINER_F, $3 - object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE - object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47 - object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person - object SPRITE_BOULDER, $d, $c, STAY, BOULDER_MOVEMENT_BYTE_2, $8 ; person - object SPRITE_BOULDER, $18, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $9 ; person - object SPRITE_BOULDER, $16, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $a ; person + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE + object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47 + object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person + object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person + object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person ; warp-to - warp_to $17, $7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to $1a, $8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to $1b, $f, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to $2, $0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 754a26fe..5208f34b 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -1,33 +1,33 @@ ViridianCityObject: - db $f ; border block + db 15 ; border block - db $5 ; warps - warp $17, $19, $0, VIRIDIAN_POKECENTER - warp $1d, $13, $0, VIRIDIAN_MART - warp $15, $f, $0, VIRIDIAN_SCHOOL - warp $15, $9, $0, VIRIDIAN_HOUSE - warp $20, $7, $0, VIRIDIAN_GYM + db 5 ; warps + warp 23, 25, 0, VIRIDIAN_POKECENTER + warp 29, 19, 0, VIRIDIAN_MART + warp 21, 15, 0, VIRIDIAN_SCHOOL + warp 21, 9, 0, VIRIDIAN_HOUSE + warp 32, 7, 0, VIRIDIAN_GYM - db $6 ; signs - sign $11, $11, $8 ; ViridianCityText8 - sign $13, $1, $9 ; ViridianCityText9 - sign $15, $1d, $a ; ViridianCityText10 - sign $1e, $13, $b ; MartSignText - sign $18, $19, $c ; PokeCenterSignText - sign $1b, $7, $d ; ViridianCityText13 + db 6 ; signs + sign 17, 17, 8 ; ViridianCityText8 + sign 19, 1, 9 ; ViridianCityText9 + sign 21, 29, 10 ; ViridianCityText10 + sign 30, 19, 11 ; MartSignText + sign 24, 25, 12 ; PokeCenterSignText + sign 27, 7, 13 ; ViridianCityText13 - db $7 ; objects - object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person - object SPRITE_GAMBLER, $1e, $8, STAY, NONE, $2 ; person - object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person - object SPRITE_GIRL, $11, $9, STAY, RIGHT, $4 ; person - object SPRITE_LYING_OLD_MAN, $12, $9, STAY, NONE, $5 ; person - object SPRITE_FISHER2, $6, $17, STAY, DOWN, $6 ; person - object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person + db 7 ; objects + object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person + object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person + object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person + object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person + object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person + object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person + object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person ; warp-to - warp_to $17, $19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER - warp_to $1d, $13, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART - warp_to $15, $f, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL - warp_to $15, $9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE - warp_to $20, $7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM + warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER + warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART + warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL + warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE + warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 31189bb4..7e399fa2 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -1,36 +1,36 @@ ViridianForestObject: - db $3 ; border block + db 3 ; border block - db $6 ; warps - warp $1, $0, $2, VIRIDIAN_FOREST_EXIT - warp $2, $0, $3, VIRIDIAN_FOREST_EXIT - warp $f, $2f, $1, VIRIDIAN_FOREST_ENTRANCE - warp $10, $2f, $1, VIRIDIAN_FOREST_ENTRANCE - warp $11, $2f, $1, VIRIDIAN_FOREST_ENTRANCE - warp $12, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + db 6 ; warps + warp 1, 0, 2, VIRIDIAN_FOREST_EXIT + warp 2, 0, 3, VIRIDIAN_FOREST_EXIT + warp 15, 47, 1, VIRIDIAN_FOREST_ENTRANCE + warp 16, 47, 1, VIRIDIAN_FOREST_ENTRANCE + warp 17, 47, 1, VIRIDIAN_FOREST_ENTRANCE + warp 18, 47, 1, VIRIDIAN_FOREST_ENTRANCE - db $6 ; signs - sign $18, $28, $9 ; ViridianForestText9 - sign $10, $20, $a ; ViridianForestText10 - sign $1a, $11, $b ; ViridianForestText11 - sign $4, $18, $c ; ViridianForestText12 - sign $12, $2d, $d ; ViridianForestText13 - sign $2, $1, $e ; ViridianForestText14 + db 6 ; signs + sign 24, 40, 9 ; ViridianForestText9 + sign 16, 32, 10 ; ViridianForestText10 + sign 26, 17, 11 ; ViridianForestText11 + sign 4, 24, 12 ; ViridianForestText12 + sign 18, 45, 13 ; ViridianForestText13 + sign 2, 1, 14 ; ViridianForestText14 - db $8 ; objects - object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person - object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1 - object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2 - object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3 - object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE - object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION - object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL - object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person + db 8 ; objects + object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person + object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 + object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 + object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE + object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION + object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL + object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person ; warp-to - warp_to $1, $0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to $2, $0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to $f, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to $10, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to $11, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to $12, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 40b1b42e..a42c7ec0 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -1,20 +1,20 @@ ViridianForestEntranceObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $4, $0, $3, VIRIDIAN_FOREST - warp $5, $0, $4, VIRIDIAN_FOREST - warp $4, $7, $5, $ff - warp $5, $7, $5, $ff + db 4 ; warps + warp 4, 0, 3, VIRIDIAN_FOREST + warp 5, 0, 4, VIRIDIAN_FOREST + warp 4, 7, 5, -1 + warp 5, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_GIRL, $8, $4, STAY, LEFT, $1 ; person - object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person + db 2 ; objects + object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person ; warp-to - warp_to $4, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to $5, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to $4, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH - warp_to $5, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to 4, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to 5, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 278f5770..2f098642 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -1,20 +1,20 @@ ViridianForestExitObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $4, $0, $1, $ff - warp $5, $0, $1, $ff - warp $4, $7, $0, VIRIDIAN_FOREST - warp $5, $7, $0, VIRIDIAN_FOREST + db 4 ; warps + warp 4, 0, 1, -1 + warp 5, 0, 1, -1 + warp 4, 7, 0, VIRIDIAN_FOREST + warp 5, 7, 0, VIRIDIAN_FOREST - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, NONE, $1 ; person - object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person + object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person ; warp-to - warp_to $4, $0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to $5, $0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to $4, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST - warp_to $5, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 5b2ce100..c136b8a2 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -1,25 +1,25 @@ ViridianGymObject: - db $3 ; border block + db 3 ; border block - db $2 ; warps - warp $10, $11, $4, $ff - warp $11, $11, $4, $ff + db 2 ; warps + warp 16, 17, 4, -1 + warp 17, 17, 4, -1 - db $0 ; signs + db 0 ; signs - db $b ; objects - object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, OPP_GIOVANNI, $3 - object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, OPP_COOLTRAINER_M, $9 - object SPRITE_HIKER, $b, $b, STAY, UP, $3, OPP_BLACKBELT, $6 - object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, OPP_TAMER, $3 - object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, OPP_BLACKBELT, $7 - object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, OPP_COOLTRAINER_M, $a - object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, OPP_BLACKBELT, $8 - object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, OPP_TAMER, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, OPP_COOLTRAINER_M, $1 - object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person - object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE + db 11 ; objects + object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 + object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 + object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 + object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 + object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 + object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 + object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 + object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 + object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 + object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person + object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE ; warp-to - warp_to $10, $11, VIRIDIAN_GYM_WIDTH - warp_to $11, $11, VIRIDIAN_GYM_WIDTH + warp_to 16, 17, VIRIDIAN_GYM_WIDTH + warp_to 17, 17, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index e6bdd88e..6fd1c609 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -1,18 +1,18 @@ ViridianHouseObject: - db $a ; border block + db 10 ; border block - db $2 ; warps - warp $2, $7, $3, $ff - warp $3, $7, $3, $ff + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BALDING_GUY, $5, $3, STAY, NONE, $1 ; person - object SPRITE_LITTLE_GIRL, $1, $4, WALK, $1, $2 ; person - object SPRITE_BIRD, $5, $5, WALK, $2, $3 ; person - object SPRITE_CLIPBOARD, $4, $0, STAY, NONE, $4 ; person + db 4 ; objects + object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person + object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person + object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person ; warp-to - warp_to $2, $7, VIRIDIAN_HOUSE_WIDTH - warp_to $3, $7, VIRIDIAN_HOUSE_WIDTH + warp_to 2, 7, VIRIDIAN_HOUSE_WIDTH + warp_to 3, 7, VIRIDIAN_HOUSE_WIDTH diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index fc47718f..184ff892 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -1,17 +1,17 @@ ViridianMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $1, $ff - warp $4, $7, $1, $ff + db 2 ; warps + warp 3, 7, 1, -1 + warp 4, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BUG_CATCHER, $5, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $3, $3, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person ; warp-to - warp_to $3, $7, VIRIDIAN_MART_WIDTH - warp_to $4, $7, VIRIDIAN_MART_WIDTH + warp_to 3, 7, VIRIDIAN_MART_WIDTH + warp_to 4, 7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 4f337e16..c369a475 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -1,18 +1,18 @@ ViridianPokecenterObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $0, $ff - warp $4, $7, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person ; warp-to - warp_to $3, $7, VIRIDIAN_POKECENTER_WIDTH - warp_to $4, $7, VIRIDIAN_POKECENTER_WIDTH + warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH + warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/macros/data_macros.asm b/macros/data_macros.asm index 9085cf76..ee5cb8f0 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -121,7 +121,7 @@ ENDM ;\1 x position ;\2 y position ;\3 destination warp id -;\4 destination map ($ff = wLastMap) +;\4 destination map (-1 = wLastMap) warp: MACRO db \2, \1, \3, \4 ENDM -- cgit v1.2.3 From 2e0183fc2745c9f450a751d82569de52e8a5e6ea Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 11:46:45 -0500 Subject: Block IDs use hex; zero connections use dec --- data/mapHeaders/agatha.asm | 2 +- data/mapHeaders/bikeshop.asm | 2 +- data/mapHeaders/billshouse.asm | 2 +- data/mapHeaders/bruno.asm | 2 +- data/mapHeaders/celadondiner.asm | 2 +- data/mapHeaders/celadongamecorner.asm | 2 +- data/mapHeaders/celadongym.asm | 2 +- data/mapHeaders/celadonhotel.asm | 2 +- data/mapHeaders/celadonhouse.asm | 2 +- data/mapHeaders/celadonmansion1.asm | 2 +- data/mapHeaders/celadonmansion2.asm | 2 +- data/mapHeaders/celadonmansion3.asm | 2 +- data/mapHeaders/celadonmansion4.asm | 2 +- data/mapHeaders/celadonmansion5.asm | 2 +- data/mapHeaders/celadonmart1.asm | 2 +- data/mapHeaders/celadonmart2.asm | 2 +- data/mapHeaders/celadonmart3.asm | 2 +- data/mapHeaders/celadonmart4.asm | 2 +- data/mapHeaders/celadonmart5.asm | 2 +- data/mapHeaders/celadonmartelevator.asm | 2 +- data/mapHeaders/celadonmartroof.asm | 2 +- data/mapHeaders/celadonpokecenter.asm | 2 +- data/mapHeaders/celadonprizeroom.asm | 2 +- data/mapHeaders/ceruleangym.asm | 2 +- data/mapHeaders/ceruleanhouse1.asm | 2 +- data/mapHeaders/ceruleanhouse2.asm | 2 +- data/mapHeaders/ceruleanhousetrashed.asm | 2 +- data/mapHeaders/ceruleanmart.asm | 2 +- data/mapHeaders/ceruleanpokecenter.asm | 2 +- data/mapHeaders/cinnabargym.asm | 2 +- data/mapHeaders/cinnabarmart.asm | 2 +- data/mapHeaders/cinnabarpokecenter.asm | 2 +- data/mapHeaders/colosseum.asm | 2 +- data/mapHeaders/copycatshouse1f.asm | 2 +- data/mapHeaders/copycatshouse2f.asm | 2 +- data/mapHeaders/daycarem.asm | 2 +- data/mapHeaders/diglettscave.asm | 2 +- data/mapHeaders/diglettscaveroute11.asm | 2 +- data/mapHeaders/diglettscaveroute2.asm | 2 +- data/mapHeaders/fanclub.asm | 2 +- data/mapHeaders/fightingdojo.asm | 2 +- data/mapHeaders/fuchsiagym.asm | 2 +- data/mapHeaders/fuchsiahouse1.asm | 2 +- data/mapHeaders/fuchsiahouse2.asm | 2 +- data/mapHeaders/fuchsiahouse3.asm | 2 +- data/mapHeaders/fuchsiamart.asm | 2 +- data/mapHeaders/fuchsiameetingroom.asm | 2 +- data/mapHeaders/fuchsiapokecenter.asm | 2 +- data/mapHeaders/halloffameroom.asm | 2 +- data/mapHeaders/indigoplateaulobby.asm | 2 +- data/mapHeaders/lab1.asm | 2 +- data/mapHeaders/lab2.asm | 2 +- data/mapHeaders/lab3.asm | 2 +- data/mapHeaders/lab4.asm | 2 +- data/mapHeaders/lance.asm | 2 +- data/mapHeaders/lavenderhouse1.asm | 2 +- data/mapHeaders/lavenderhouse2.asm | 2 +- data/mapHeaders/lavendermart.asm | 2 +- data/mapHeaders/lavenderpokecenter.asm | 2 +- data/mapHeaders/lorelei.asm | 2 +- data/mapHeaders/mansion1.asm | 2 +- data/mapHeaders/mansion2.asm | 2 +- data/mapHeaders/mansion3.asm | 2 +- data/mapHeaders/mansion4.asm | 2 +- data/mapHeaders/mtmoon1.asm | 2 +- data/mapHeaders/mtmoon2.asm | 2 +- data/mapHeaders/mtmoon3.asm | 2 +- data/mapHeaders/mtmoonpokecenter.asm | 2 +- data/mapHeaders/museum1f.asm | 2 +- data/mapHeaders/museum2f.asm | 2 +- data/mapHeaders/namerater.asm | 2 +- data/mapHeaders/oakslab.asm | 2 +- data/mapHeaders/pewtergym.asm | 2 +- data/mapHeaders/pewterhouse1.asm | 2 +- data/mapHeaders/pewterhouse2.asm | 2 +- data/mapHeaders/pewtermart.asm | 2 +- data/mapHeaders/pewterpokecenter.asm | 2 +- data/mapHeaders/pokemontower1.asm | 2 +- data/mapHeaders/pokemontower2.asm | 2 +- data/mapHeaders/pokemontower3.asm | 2 +- data/mapHeaders/pokemontower4.asm | 2 +- data/mapHeaders/pokemontower5.asm | 2 +- data/mapHeaders/pokemontower6.asm | 2 +- data/mapHeaders/pokemontower7.asm | 2 +- data/mapHeaders/powerplant.asm | 2 +- data/mapHeaders/rockethideout1.asm | 2 +- data/mapHeaders/rockethideout2.asm | 2 +- data/mapHeaders/rockethideout3.asm | 2 +- data/mapHeaders/rockethideout4.asm | 2 +- data/mapHeaders/rockethideoutelevator.asm | 2 +- data/mapHeaders/rocktunnel1.asm | 2 +- data/mapHeaders/rocktunnel2.asm | 2 +- data/mapHeaders/rocktunnelpokecenter.asm | 2 +- data/mapHeaders/route11gate.asm | 2 +- data/mapHeaders/route11gateupstairs.asm | 2 +- data/mapHeaders/route12gate.asm | 2 +- data/mapHeaders/route12gateupstairs.asm | 2 +- data/mapHeaders/route12house.asm | 2 +- data/mapHeaders/route15gate.asm | 2 +- data/mapHeaders/route15gateupstairs.asm | 2 +- data/mapHeaders/route16gate.asm | 2 +- data/mapHeaders/route16gateupstairs.asm | 2 +- data/mapHeaders/route16house.asm | 2 +- data/mapHeaders/route18gate.asm | 2 +- data/mapHeaders/route18gateupstairs.asm | 2 +- data/mapHeaders/route22gate.asm | 2 +- data/mapHeaders/route2gate.asm | 2 +- data/mapHeaders/route2house.asm | 2 +- data/mapHeaders/route5gate.asm | 2 +- data/mapHeaders/route6gate.asm | 2 +- data/mapHeaders/route7gate.asm | 2 +- data/mapHeaders/route8gate.asm | 2 +- data/mapHeaders/safarizonecenter.asm | 2 +- data/mapHeaders/safarizoneeast.asm | 2 +- data/mapHeaders/safarizoneentrance.asm | 2 +- data/mapHeaders/safarizonenorth.asm | 2 +- data/mapHeaders/safarizoneresthouse1.asm | 2 +- data/mapHeaders/safarizoneresthouse2.asm | 2 +- data/mapHeaders/safarizoneresthouse3.asm | 2 +- data/mapHeaders/safarizoneresthouse4.asm | 2 +- data/mapHeaders/safarizonesecrethouse.asm | 2 +- data/mapHeaders/safarizonewest.asm | 2 +- data/mapHeaders/saffrongym.asm | 2 +- data/mapHeaders/saffronhouse1.asm | 2 +- data/mapHeaders/saffronhouse2.asm | 2 +- data/mapHeaders/saffronmart.asm | 2 +- data/mapHeaders/saffronpokecenter.asm | 2 +- data/mapHeaders/school.asm | 2 +- data/mapHeaders/seafoamislands1.asm | 2 +- data/mapHeaders/seafoamislands2.asm | 2 +- data/mapHeaders/seafoamislands3.asm | 2 +- data/mapHeaders/seafoamislands4.asm | 2 +- data/mapHeaders/seafoamislands5.asm | 2 +- data/mapHeaders/silphco1.asm | 2 +- data/mapHeaders/silphco10.asm | 2 +- data/mapHeaders/silphco11.asm | 2 +- data/mapHeaders/silphco2.asm | 2 +- data/mapHeaders/silphco3.asm | 2 +- data/mapHeaders/silphco4.asm | 2 +- data/mapHeaders/silphco5.asm | 2 +- data/mapHeaders/silphco6.asm | 2 +- data/mapHeaders/silphco7.asm | 2 +- data/mapHeaders/silphco8.asm | 2 +- data/mapHeaders/silphco9.asm | 2 +- data/mapHeaders/silphcoelevator.asm | 2 +- data/mapHeaders/ssanne1.asm | 2 +- data/mapHeaders/ssanne10.asm | 2 +- data/mapHeaders/ssanne2.asm | 2 +- data/mapHeaders/ssanne3.asm | 2 +- data/mapHeaders/ssanne4.asm | 2 +- data/mapHeaders/ssanne5.asm | 2 +- data/mapHeaders/ssanne6.asm | 2 +- data/mapHeaders/ssanne7.asm | 2 +- data/mapHeaders/ssanne8.asm | 2 +- data/mapHeaders/ssanne9.asm | 2 +- data/mapHeaders/tradecenter.asm | 2 +- data/mapHeaders/undergroundpathentranceroute5.asm | 2 +- data/mapHeaders/undergroundpathentranceroute6.asm | 2 +- data/mapHeaders/undergroundpathentranceroute7.asm | 2 +- data/mapHeaders/undergroundpathentranceroute7copy.asm | 2 +- data/mapHeaders/undergroundpathentranceroute8.asm | 2 +- data/mapHeaders/undergroundpathns.asm | 2 +- data/mapHeaders/undergroundpathwe.asm | 2 +- data/mapHeaders/unknowndungeon1.asm | 2 +- data/mapHeaders/unknowndungeon2.asm | 2 +- data/mapHeaders/unknowndungeon3.asm | 2 +- data/mapHeaders/vermiliondock.asm | 2 +- data/mapHeaders/vermiliongym.asm | 2 +- data/mapHeaders/vermilionhouse1.asm | 2 +- data/mapHeaders/vermilionhouse2.asm | 2 +- data/mapHeaders/vermilionhouse3.asm | 2 +- data/mapHeaders/vermilionmart.asm | 2 +- data/mapHeaders/vermilionpokecenter.asm | 2 +- data/mapHeaders/victoryroad1.asm | 2 +- data/mapHeaders/victoryroad2.asm | 2 +- data/mapHeaders/victoryroad3.asm | 2 +- data/mapHeaders/viridianforest.asm | 2 +- data/mapHeaders/viridianforestentrance.asm | 2 +- data/mapHeaders/viridianforestexit.asm | 2 +- data/mapHeaders/viridiangym.asm | 2 +- data/mapHeaders/viridianhouse.asm | 2 +- data/mapHeaders/viridianmart.asm | 2 +- data/mapHeaders/viridianpokecenter.asm | 2 +- data/mapObjects/agatha.asm | 2 +- data/mapObjects/bikeshop.asm | 2 +- data/mapObjects/billshouse.asm | 2 +- data/mapObjects/blueshouse.asm | 2 +- data/mapObjects/bruno.asm | 2 +- data/mapObjects/celadoncity.asm | 2 +- data/mapObjects/celadondiner.asm | 2 +- data/mapObjects/celadongamecorner.asm | 2 +- data/mapObjects/celadongym.asm | 2 +- data/mapObjects/celadonhotel.asm | 2 +- data/mapObjects/celadonhouse.asm | 2 +- data/mapObjects/celadonmansion1.asm | 2 +- data/mapObjects/celadonmansion2.asm | 2 +- data/mapObjects/celadonmansion3.asm | 2 +- data/mapObjects/celadonmansion4.asm | 2 +- data/mapObjects/celadonmansion5.asm | 2 +- data/mapObjects/celadonmart1.asm | 2 +- data/mapObjects/celadonmart2.asm | 2 +- data/mapObjects/celadonmart3.asm | 2 +- data/mapObjects/celadonmart4.asm | 2 +- data/mapObjects/celadonmart5.asm | 2 +- data/mapObjects/celadonmartelevator.asm | 2 +- data/mapObjects/celadonmartroof.asm | 2 +- data/mapObjects/celadonpokecenter.asm | 2 +- data/mapObjects/celadonprizeroom.asm | 2 +- data/mapObjects/ceruleancity.asm | 2 +- data/mapObjects/ceruleangym.asm | 2 +- data/mapObjects/ceruleanhouse1.asm | 2 +- data/mapObjects/ceruleanhouse2.asm | 2 +- data/mapObjects/ceruleanhousetrashed.asm | 2 +- data/mapObjects/ceruleanmart.asm | 2 +- data/mapObjects/ceruleanpokecenter.asm | 2 +- data/mapObjects/cinnabargym.asm | 2 +- data/mapObjects/cinnabarisland.asm | 2 +- data/mapObjects/cinnabarmart.asm | 2 +- data/mapObjects/cinnabarpokecenter.asm | 2 +- data/mapObjects/colosseum.asm | 2 +- data/mapObjects/copycatshouse1f.asm | 2 +- data/mapObjects/copycatshouse2f.asm | 2 +- data/mapObjects/daycarem.asm | 2 +- data/mapObjects/diglettscave.asm | 2 +- data/mapObjects/diglettscaveroute11.asm | 2 +- data/mapObjects/diglettscaveroute2.asm | 2 +- data/mapObjects/fanclub.asm | 2 +- data/mapObjects/fightingdojo.asm | 2 +- data/mapObjects/fuchsiacity.asm | 2 +- data/mapObjects/fuchsiagym.asm | 2 +- data/mapObjects/fuchsiahouse1.asm | 2 +- data/mapObjects/fuchsiahouse2.asm | 2 +- data/mapObjects/fuchsiahouse3.asm | 2 +- data/mapObjects/fuchsiamart.asm | 2 +- data/mapObjects/fuchsiameetingroom.asm | 2 +- data/mapObjects/fuchsiapokecenter.asm | 2 +- data/mapObjects/gary.asm | 2 +- data/mapObjects/halloffameroom.asm | 2 +- data/mapObjects/indigoplateau.asm | 2 +- data/mapObjects/indigoplateaulobby.asm | 2 +- data/mapObjects/lab1.asm | 2 +- data/mapObjects/lab2.asm | 2 +- data/mapObjects/lab3.asm | 2 +- data/mapObjects/lab4.asm | 2 +- data/mapObjects/lance.asm | 2 +- data/mapObjects/lavenderhouse1.asm | 2 +- data/mapObjects/lavenderhouse2.asm | 2 +- data/mapObjects/lavendermart.asm | 2 +- data/mapObjects/lavenderpokecenter.asm | 2 +- data/mapObjects/lavendertown.asm | 2 +- data/mapObjects/lorelei.asm | 2 +- data/mapObjects/mansion1.asm | 2 +- data/mapObjects/mansion2.asm | 2 +- data/mapObjects/mansion3.asm | 2 +- data/mapObjects/mansion4.asm | 2 +- data/mapObjects/mtmoon1.asm | 2 +- data/mapObjects/mtmoon2.asm | 2 +- data/mapObjects/mtmoon3.asm | 2 +- data/mapObjects/mtmoonpokecenter.asm | 2 +- data/mapObjects/museum1f.asm | 2 +- data/mapObjects/museum2f.asm | 2 +- data/mapObjects/namerater.asm | 2 +- data/mapObjects/oakslab.asm | 2 +- data/mapObjects/pallettown.asm | 2 +- data/mapObjects/pewtercity.asm | 2 +- data/mapObjects/pewtergym.asm | 2 +- data/mapObjects/pewterhouse1.asm | 2 +- data/mapObjects/pewterhouse2.asm | 2 +- data/mapObjects/pewtermart.asm | 2 +- data/mapObjects/pewterpokecenter.asm | 2 +- data/mapObjects/pokemontower1.asm | 2 +- data/mapObjects/pokemontower2.asm | 2 +- data/mapObjects/pokemontower3.asm | 2 +- data/mapObjects/pokemontower4.asm | 2 +- data/mapObjects/pokemontower5.asm | 2 +- data/mapObjects/pokemontower6.asm | 2 +- data/mapObjects/pokemontower7.asm | 2 +- data/mapObjects/powerplant.asm | 2 +- data/mapObjects/redshouse1f.asm | 2 +- data/mapObjects/redshouse2f.asm | 2 +- data/mapObjects/rockethideout1.asm | 2 +- data/mapObjects/rockethideout2.asm | 2 +- data/mapObjects/rockethideout3.asm | 2 +- data/mapObjects/rockethideout4.asm | 2 +- data/mapObjects/rockethideoutelevator.asm | 2 +- data/mapObjects/rocktunnel1.asm | 2 +- data/mapObjects/rocktunnel2.asm | 2 +- data/mapObjects/rocktunnelpokecenter.asm | 2 +- data/mapObjects/route1.asm | 2 +- data/mapObjects/route10.asm | 2 +- data/mapObjects/route11.asm | 2 +- data/mapObjects/route11gate.asm | 2 +- data/mapObjects/route11gateupstairs.asm | 2 +- data/mapObjects/route12.asm | 2 +- data/mapObjects/route12gate.asm | 2 +- data/mapObjects/route12gateupstairs.asm | 2 +- data/mapObjects/route12house.asm | 2 +- data/mapObjects/route13.asm | 2 +- data/mapObjects/route14.asm | 2 +- data/mapObjects/route15.asm | 2 +- data/mapObjects/route15gate.asm | 2 +- data/mapObjects/route15gateupstairs.asm | 2 +- data/mapObjects/route16.asm | 2 +- data/mapObjects/route16gate.asm | 2 +- data/mapObjects/route16gateupstairs.asm | 2 +- data/mapObjects/route16house.asm | 2 +- data/mapObjects/route17.asm | 2 +- data/mapObjects/route18.asm | 2 +- data/mapObjects/route18gate.asm | 2 +- data/mapObjects/route18gateupstairs.asm | 2 +- data/mapObjects/route19.asm | 2 +- data/mapObjects/route2.asm | 2 +- data/mapObjects/route20.asm | 2 +- data/mapObjects/route21.asm | 2 +- data/mapObjects/route22.asm | 2 +- data/mapObjects/route22gate.asm | 2 +- data/mapObjects/route23.asm | 2 +- data/mapObjects/route24.asm | 2 +- data/mapObjects/route25.asm | 2 +- data/mapObjects/route2gate.asm | 2 +- data/mapObjects/route2house.asm | 2 +- data/mapObjects/route3.asm | 2 +- data/mapObjects/route4.asm | 2 +- data/mapObjects/route5.asm | 2 +- data/mapObjects/route5gate.asm | 2 +- data/mapObjects/route6.asm | 2 +- data/mapObjects/route6gate.asm | 2 +- data/mapObjects/route7.asm | 2 +- data/mapObjects/route7gate.asm | 2 +- data/mapObjects/route8.asm | 2 +- data/mapObjects/route8gate.asm | 2 +- data/mapObjects/route9.asm | 2 +- data/mapObjects/safarizonecenter.asm | 2 +- data/mapObjects/safarizoneeast.asm | 2 +- data/mapObjects/safarizoneentrance.asm | 2 +- data/mapObjects/safarizonenorth.asm | 2 +- data/mapObjects/safarizoneresthouse1.asm | 2 +- data/mapObjects/safarizoneresthouse2.asm | 2 +- data/mapObjects/safarizoneresthouse3.asm | 2 +- data/mapObjects/safarizoneresthouse4.asm | 2 +- data/mapObjects/safarizonesecrethouse.asm | 2 +- data/mapObjects/safarizonewest.asm | 2 +- data/mapObjects/saffroncity.asm | 2 +- data/mapObjects/saffrongym.asm | 2 +- data/mapObjects/saffronhouse1.asm | 2 +- data/mapObjects/saffronhouse2.asm | 2 +- data/mapObjects/saffronmart.asm | 2 +- data/mapObjects/saffronpokecenter.asm | 2 +- data/mapObjects/school.asm | 2 +- data/mapObjects/seafoamislands1.asm | 2 +- data/mapObjects/seafoamislands2.asm | 2 +- data/mapObjects/seafoamislands3.asm | 2 +- data/mapObjects/seafoamislands4.asm | 2 +- data/mapObjects/seafoamislands5.asm | 2 +- data/mapObjects/silphco1.asm | 2 +- data/mapObjects/silphco10.asm | 2 +- data/mapObjects/silphco11.asm | 2 +- data/mapObjects/silphco2.asm | 2 +- data/mapObjects/silphco3.asm | 2 +- data/mapObjects/silphco4.asm | 2 +- data/mapObjects/silphco5.asm | 2 +- data/mapObjects/silphco6.asm | 2 +- data/mapObjects/silphco7.asm | 2 +- data/mapObjects/silphco8.asm | 2 +- data/mapObjects/silphco9.asm | 2 +- data/mapObjects/silphcoelevator.asm | 2 +- data/mapObjects/ssanne1.asm | 2 +- data/mapObjects/ssanne10.asm | 2 +- data/mapObjects/ssanne2.asm | 2 +- data/mapObjects/ssanne3.asm | 2 +- data/mapObjects/ssanne4.asm | 2 +- data/mapObjects/ssanne5.asm | 2 +- data/mapObjects/ssanne6.asm | 2 +- data/mapObjects/ssanne7.asm | 2 +- data/mapObjects/ssanne8.asm | 2 +- data/mapObjects/ssanne9.asm | 2 +- data/mapObjects/tradecenter.asm | 2 +- data/mapObjects/undergroundpathentranceroute5.asm | 2 +- data/mapObjects/undergroundpathentranceroute6.asm | 2 +- data/mapObjects/undergroundpathentranceroute7.asm | 2 +- data/mapObjects/undergroundpathentranceroute7copy.asm | 2 +- data/mapObjects/undergroundpathentranceroute8.asm | 2 +- data/mapObjects/undergroundpathns.asm | 2 +- data/mapObjects/undergroundpathwe.asm | 2 +- data/mapObjects/unknowndungeon1.asm | 2 +- data/mapObjects/unknowndungeon2.asm | 2 +- data/mapObjects/unknowndungeon3.asm | 2 +- data/mapObjects/vermilioncity.asm | 2 +- data/mapObjects/vermiliondock.asm | 2 +- data/mapObjects/vermiliongym.asm | 2 +- data/mapObjects/vermilionhouse1.asm | 2 +- data/mapObjects/vermilionhouse2.asm | 2 +- data/mapObjects/vermilionhouse3.asm | 2 +- data/mapObjects/vermilionmart.asm | 2 +- data/mapObjects/vermilionpokecenter.asm | 2 +- data/mapObjects/victoryroad1.asm | 2 +- data/mapObjects/victoryroad2.asm | 2 +- data/mapObjects/victoryroad3.asm | 2 +- data/mapObjects/viridiancity.asm | 2 +- data/mapObjects/viridianforest.asm | 2 +- data/mapObjects/viridianforestentrance.asm | 2 +- data/mapObjects/viridianforestexit.asm | 2 +- data/mapObjects/viridiangym.asm | 2 +- data/mapObjects/viridianhouse.asm | 2 +- data/mapObjects/viridianmart.asm | 2 +- data/mapObjects/viridianpokecenter.asm | 2 +- 406 files changed, 406 insertions(+), 406 deletions(-) diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm index f3389579..155f07db 100755 --- a/data/mapHeaders/agatha.asm +++ b/data/mapHeaders/agatha.asm @@ -2,5 +2,5 @@ Agatha_h: db CEMETERY ; tileset db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw AgathaObject ; objects diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm index b63b03df..1524f59b 100755 --- a/data/mapHeaders/bikeshop.asm +++ b/data/mapHeaders/bikeshop.asm @@ -2,5 +2,5 @@ BikeShop_h: db CLUB ; tileset db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw BikeShopObject ; objects diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm index 735f8d62..832affe9 100755 --- a/data/mapHeaders/billshouse.asm +++ b/data/mapHeaders/billshouse.asm @@ -2,5 +2,5 @@ BillsHouse_h: db INTERIOR ; tileset db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw BillsHouseObject ; objects diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm index 1267ebe2..921fa80c 100755 --- a/data/mapHeaders/bruno.asm +++ b/data/mapHeaders/bruno.asm @@ -2,5 +2,5 @@ Bruno_h: db GYM ; tileset db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw BrunoObject ; objects diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm index 9520d76e..f608af16 100755 --- a/data/mapHeaders/celadondiner.asm +++ b/data/mapHeaders/celadondiner.asm @@ -2,5 +2,5 @@ CeladonDiner_h: db LOBBY ; tileset db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonDinerObject ; objects diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm index 3c5674a7..76403d92 100755 --- a/data/mapHeaders/celadongamecorner.asm +++ b/data/mapHeaders/celadongamecorner.asm @@ -2,5 +2,5 @@ CeladonGameCorner_h: db LOBBY ; tileset db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonGameCornerObject ; objects diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm index c0dcf162..78e486f3 100755 --- a/data/mapHeaders/celadongym.asm +++ b/data/mapHeaders/celadongym.asm @@ -2,5 +2,5 @@ CeladonGym_h: db GYM ; tileset db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonGymObject ; objects diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm index 019c3cc3..ddc27cd6 100755 --- a/data/mapHeaders/celadonhotel.asm +++ b/data/mapHeaders/celadonhotel.asm @@ -2,5 +2,5 @@ CeladonHotel_h: db POKECENTER ; tileset db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonHotelObject ; objects diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm index ba510282..d6d27a64 100755 --- a/data/mapHeaders/celadonhouse.asm +++ b/data/mapHeaders/celadonhouse.asm @@ -2,5 +2,5 @@ CeladonHouse_h: db MANSION ; tileset db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonHouseObject ; objects diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm index 8c94cc63..da773943 100755 --- a/data/mapHeaders/celadonmansion1.asm +++ b/data/mapHeaders/celadonmansion1.asm @@ -2,5 +2,5 @@ CeladonMansion1_h: db MANSION ; tileset db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x) dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMansion1Object ; objects diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm index 462dfdf3..92970148 100755 --- a/data/mapHeaders/celadonmansion2.asm +++ b/data/mapHeaders/celadonmansion2.asm @@ -2,5 +2,5 @@ CeladonMansion2_h: db MANSION ; tileset db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x) dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMansion2Object ; objects diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm index 81b3f2e2..95c93bd7 100755 --- a/data/mapHeaders/celadonmansion3.asm +++ b/data/mapHeaders/celadonmansion3.asm @@ -2,5 +2,5 @@ CeladonMansion3_h: db MANSION ; tileset db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x) dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMansion3Object ; objects diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm index c5cf2da9..6b4e833a 100755 --- a/data/mapHeaders/celadonmansion4.asm +++ b/data/mapHeaders/celadonmansion4.asm @@ -2,5 +2,5 @@ CeladonMansion4_h: db MANSION ; tileset db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x) dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMansion4Object ; objects diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm index d26faccf..7cc16d24 100755 --- a/data/mapHeaders/celadonmansion5.asm +++ b/data/mapHeaders/celadonmansion5.asm @@ -2,5 +2,5 @@ CeladonMansion5_h: db HOUSE ; tileset db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x) dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMansion5Object ; objects diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm index 50d171bc..12b013a4 100755 --- a/data/mapHeaders/celadonmart1.asm +++ b/data/mapHeaders/celadonmart1.asm @@ -2,5 +2,5 @@ CeladonMart1_h: db LOBBY ; tileset db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x) dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMart1Object ; objects diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm index ecd609cb..210f85af 100755 --- a/data/mapHeaders/celadonmart2.asm +++ b/data/mapHeaders/celadonmart2.asm @@ -2,5 +2,5 @@ CeladonMart2_h: db LOBBY ; tileset db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x) dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMart2Object ; objects diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm index af109528..511b1405 100755 --- a/data/mapHeaders/celadonmart3.asm +++ b/data/mapHeaders/celadonmart3.asm @@ -2,5 +2,5 @@ CeladonMart3_h: db LOBBY ; tileset db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x) dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMart3Object ; objects diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm index 4ae820d9..fd34406d 100755 --- a/data/mapHeaders/celadonmart4.asm +++ b/data/mapHeaders/celadonmart4.asm @@ -2,5 +2,5 @@ CeladonMart4_h: db LOBBY ; tileset db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x) dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMart4Object ; objects diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm index 0d28464f..66e70f28 100755 --- a/data/mapHeaders/celadonmart5.asm +++ b/data/mapHeaders/celadonmart5.asm @@ -2,5 +2,5 @@ CeladonMart5_h: db LOBBY ; tileset db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMart5Object ; objects diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm index 498587c6..149e5b0f 100755 --- a/data/mapHeaders/celadonmartelevator.asm +++ b/data/mapHeaders/celadonmartelevator.asm @@ -2,5 +2,5 @@ CeladonMartElevator_h: db LOBBY ; tileset db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMartElevatorObject ; objects diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm index 8814092b..2073afd2 100755 --- a/data/mapHeaders/celadonmartroof.asm +++ b/data/mapHeaders/celadonmartroof.asm @@ -2,5 +2,5 @@ CeladonMartRoof_h: db LOBBY ; tileset db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonMartRoofObject ; objects diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm index b9464c68..bfeb76b7 100755 --- a/data/mapHeaders/celadonpokecenter.asm +++ b/data/mapHeaders/celadonpokecenter.asm @@ -2,5 +2,5 @@ CeladonPokecenter_h: db POKECENTER ; tileset db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonPokecenterObject ; objects diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm index f7a5dc12..83161b30 100755 --- a/data/mapHeaders/celadonprizeroom.asm +++ b/data/mapHeaders/celadonprizeroom.asm @@ -2,5 +2,5 @@ CeladonPrizeRoom_h: db LOBBY ; tileset db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x) dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeladonPrizeRoomObject ; objects diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm index f95e1a79..3c4f8052 100755 --- a/data/mapHeaders/ceruleangym.asm +++ b/data/mapHeaders/ceruleangym.asm @@ -2,5 +2,5 @@ CeruleanGym_h: db GYM ; tileset db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeruleanGymObject ; objects diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm index 2a8c9197..fa12c61c 100755 --- a/data/mapHeaders/ceruleanhouse1.asm +++ b/data/mapHeaders/ceruleanhouse1.asm @@ -2,5 +2,5 @@ CeruleanHouse1_h: db HOUSE ; tileset db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x) dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeruleanHouse1Object ; objects diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm index 1e040ffd..78f6d821 100755 --- a/data/mapHeaders/ceruleanhouse2.asm +++ b/data/mapHeaders/ceruleanhouse2.asm @@ -2,5 +2,5 @@ CeruleanHouse2_h: db SHIP ; tileset db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x) dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeruleanHouse2Object ; objects diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm index 90119dc5..53eaa581 100755 --- a/data/mapHeaders/ceruleanhousetrashed.asm +++ b/data/mapHeaders/ceruleanhousetrashed.asm @@ -2,5 +2,5 @@ CeruleanHouseTrashed_h: db HOUSE ; tileset db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x) dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeruleanHouseTrashedObject ; objects diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm index 3f3231e8..12bafa98 100755 --- a/data/mapHeaders/ceruleanmart.asm +++ b/data/mapHeaders/ceruleanmart.asm @@ -2,5 +2,5 @@ CeruleanMart_h: db MART ; tileset db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeruleanMartObject ; objects diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm index 636a89ae..41fcdd90 100755 --- a/data/mapHeaders/ceruleanpokecenter.asm +++ b/data/mapHeaders/ceruleanpokecenter.asm @@ -2,5 +2,5 @@ CeruleanPokecenter_h: db POKECENTER ; tileset db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CeruleanPokecenterObject ; objects diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm index 3f05790c..2cb7dc74 100755 --- a/data/mapHeaders/cinnabargym.asm +++ b/data/mapHeaders/cinnabargym.asm @@ -2,5 +2,5 @@ CinnabarGym_h: db FACILITY ; tileset db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CinnabarGymObject ; objects diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm index b686713f..e2c8437d 100755 --- a/data/mapHeaders/cinnabarmart.asm +++ b/data/mapHeaders/cinnabarmart.asm @@ -2,5 +2,5 @@ CinnabarMart_h: db MART ; tileset db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CinnabarMartObject ; objects diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm index b1f002bd..a11a02f3 100755 --- a/data/mapHeaders/cinnabarpokecenter.asm +++ b/data/mapHeaders/cinnabarpokecenter.asm @@ -2,5 +2,5 @@ CinnabarPokecenter_h: db POKECENTER ; tileset db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CinnabarPokecenterObject ; objects diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm index 67e1188b..13d9f0c4 100755 --- a/data/mapHeaders/colosseum.asm +++ b/data/mapHeaders/colosseum.asm @@ -2,5 +2,5 @@ Colosseum_h: db CLUB ; tileset db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ColosseumObject ; objects diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm index bdca2189..7489eed7 100755 --- a/data/mapHeaders/copycatshouse1f.asm +++ b/data/mapHeaders/copycatshouse1f.asm @@ -2,5 +2,5 @@ CopycatsHouse1F_h: db REDS_HOUSE_1 ; tileset db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CopycatsHouse1FObject ; objects diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm index 3eecf718..7566143f 100755 --- a/data/mapHeaders/copycatshouse2f.asm +++ b/data/mapHeaders/copycatshouse2f.asm @@ -2,5 +2,5 @@ CopycatsHouse2F_h: db REDS_HOUSE_2 ; tileset db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw CopycatsHouse2FObject ; objects diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm index 1b8d4c1c..b61a00f2 100755 --- a/data/mapHeaders/daycarem.asm +++ b/data/mapHeaders/daycarem.asm @@ -2,5 +2,5 @@ DayCareM_h: db HOUSE ; tileset db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x) dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw DayCareMObject ; objects diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm index 0e68a55c..29c1db3e 100755 --- a/data/mapHeaders/diglettscave.asm +++ b/data/mapHeaders/diglettscave.asm @@ -2,5 +2,5 @@ DiglettsCave_h: db CAVERN ; tileset db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw DiglettsCaveObject ; objects diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm index 7670c83f..bb3817ea 100755 --- a/data/mapHeaders/diglettscaveroute11.asm +++ b/data/mapHeaders/diglettscaveroute11.asm @@ -2,5 +2,5 @@ DiglettsCaveEntranceRoute11_h: db CAVERN ; tileset db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x) dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw DiglettsCaveEntranceRoute11Object ; objects diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm index 0499b4c3..505fbbff 100755 --- a/data/mapHeaders/diglettscaveroute2.asm +++ b/data/mapHeaders/diglettscaveroute2.asm @@ -2,5 +2,5 @@ DiglettsCaveRoute2_h: db CAVERN ; tileset db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x) dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw DiglettsCaveRoute2Object ; objects diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm index 8e8205b4..6b70e935 100755 --- a/data/mapHeaders/fanclub.asm +++ b/data/mapHeaders/fanclub.asm @@ -2,5 +2,5 @@ FanClub_h: db INTERIOR ; tileset db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FanClubObject ; objects diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm index cb0a2fdb..37f9437c 100755 --- a/data/mapHeaders/fightingdojo.asm +++ b/data/mapHeaders/fightingdojo.asm @@ -2,5 +2,5 @@ FightingDojo_h: db DOJO ; tileset db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FightingDojoObject ; objects diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm index 9d16f178..9bad3a7f 100755 --- a/data/mapHeaders/fuchsiagym.asm +++ b/data/mapHeaders/fuchsiagym.asm @@ -2,5 +2,5 @@ FuchsiaGym_h: db GYM ; tileset db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaGymObject ; objects diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm index c4ab2c95..7de94ad5 100755 --- a/data/mapHeaders/fuchsiahouse1.asm +++ b/data/mapHeaders/fuchsiahouse1.asm @@ -2,5 +2,5 @@ FuchsiaHouse1_h: db HOUSE ; tileset db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x) dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaHouse1Object ; objects diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm index 530f44b6..7032f549 100755 --- a/data/mapHeaders/fuchsiahouse2.asm +++ b/data/mapHeaders/fuchsiahouse2.asm @@ -2,5 +2,5 @@ FuchsiaHouse2_h: db LAB ; tileset db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x) dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaHouse2Object ; objects diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm index e52b6b8a..01917145 100755 --- a/data/mapHeaders/fuchsiahouse3.asm +++ b/data/mapHeaders/fuchsiahouse3.asm @@ -2,5 +2,5 @@ FuchsiaHouse3_h: db SHIP ; tileset db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x) dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaHouse3Object ; objects diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm index dcdfe8c7..c1445bc8 100755 --- a/data/mapHeaders/fuchsiamart.asm +++ b/data/mapHeaders/fuchsiamart.asm @@ -2,5 +2,5 @@ FuchsiaMart_h: db MART ; tileset db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaMartObject ; objects diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm index b44acf29..e7f31770 100755 --- a/data/mapHeaders/fuchsiameetingroom.asm +++ b/data/mapHeaders/fuchsiameetingroom.asm @@ -2,5 +2,5 @@ FuchsiaMeetingRoom_h: db LAB ; tileset db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaMeetingRoomObject ; objects diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm index dc6f1e6b..4625c980 100755 --- a/data/mapHeaders/fuchsiapokecenter.asm +++ b/data/mapHeaders/fuchsiapokecenter.asm @@ -2,5 +2,5 @@ FuchsiaPokecenter_h: db POKECENTER ; tileset db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw FuchsiaPokecenterObject ; objects diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm index a90464a8..9c06c434 100755 --- a/data/mapHeaders/halloffameroom.asm +++ b/data/mapHeaders/halloffameroom.asm @@ -2,5 +2,5 @@ HallofFameRoom_h: db GYM ; tileset db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw HallofFameRoomObject ; objects diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm index 4cf92d82..67153dbc 100755 --- a/data/mapHeaders/indigoplateaulobby.asm +++ b/data/mapHeaders/indigoplateaulobby.asm @@ -2,5 +2,5 @@ IndigoPlateauLobby_h: db MART ; tileset db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw IndigoPlateauLobbyObject ; objects diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm index d0e976e7..d4d04e3d 100755 --- a/data/mapHeaders/lab1.asm +++ b/data/mapHeaders/lab1.asm @@ -2,5 +2,5 @@ Lab1_h: db LAB ; tileset db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x) dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Lab1Object ; objects diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm index 75cbcf1f..3d264741 100755 --- a/data/mapHeaders/lab2.asm +++ b/data/mapHeaders/lab2.asm @@ -2,5 +2,5 @@ Lab2_h: db LAB ; tileset db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x) dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Lab2Object ; objects diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm index 9af39022..0f401f65 100755 --- a/data/mapHeaders/lab3.asm +++ b/data/mapHeaders/lab3.asm @@ -2,5 +2,5 @@ Lab3_h: db LAB ; tileset db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x) dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Lab3Object ; objects diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm index e0b23c7d..10ded376 100755 --- a/data/mapHeaders/lab4.asm +++ b/data/mapHeaders/lab4.asm @@ -2,5 +2,5 @@ Lab4_h: db LAB ; tileset db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x) dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Lab4Object ; objects diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm index 13b2a343..d9a1ae75 100755 --- a/data/mapHeaders/lance.asm +++ b/data/mapHeaders/lance.asm @@ -2,5 +2,5 @@ Lance_h: db DOJO ; tileset db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw LanceObject ; objects diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm index f1750dc0..362e4359 100755 --- a/data/mapHeaders/lavenderhouse1.asm +++ b/data/mapHeaders/lavenderhouse1.asm @@ -2,5 +2,5 @@ LavenderHouse1_h: db HOUSE ; tileset db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x) dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw LavenderHouse1Object ; objects diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm index 449ccf07..971e1e8d 100755 --- a/data/mapHeaders/lavenderhouse2.asm +++ b/data/mapHeaders/lavenderhouse2.asm @@ -2,5 +2,5 @@ LavenderHouse2_h: db HOUSE ; tileset db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x) dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw LavenderHouse2Object ; objects diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm index e2bd0c9c..13cb06c5 100755 --- a/data/mapHeaders/lavendermart.asm +++ b/data/mapHeaders/lavendermart.asm @@ -2,5 +2,5 @@ LavenderMart_h: db MART ; tileset db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw LavenderMartObject ; objects diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm index c0d41294..ce9650f1 100755 --- a/data/mapHeaders/lavenderpokecenter.asm +++ b/data/mapHeaders/lavenderpokecenter.asm @@ -2,5 +2,5 @@ LavenderPokecenter_h: db POKECENTER ; tileset db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw LavenderPokecenterObject ; objects diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm index 634435d3..82efe164 100755 --- a/data/mapHeaders/lorelei.asm +++ b/data/mapHeaders/lorelei.asm @@ -2,5 +2,5 @@ Lorelei_h: db GYM ; tileset db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw LoreleiObject ; objects diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm index 46b0a83e..8b326941 100755 --- a/data/mapHeaders/mansion1.asm +++ b/data/mapHeaders/mansion1.asm @@ -2,5 +2,5 @@ Mansion1_h: db FACILITY ; tileset db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x) dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Mansion1Object ; objects diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm index ee4b570c..fba95ed8 100755 --- a/data/mapHeaders/mansion2.asm +++ b/data/mapHeaders/mansion2.asm @@ -2,5 +2,5 @@ Mansion2_h: db FACILITY ; tileset db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x) dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Mansion2Object ; objects diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm index 97074347..933d4c6f 100755 --- a/data/mapHeaders/mansion3.asm +++ b/data/mapHeaders/mansion3.asm @@ -2,5 +2,5 @@ Mansion3_h: db FACILITY ; tileset db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x) dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Mansion3Object ; objects diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm index 45b1636a..806b66b6 100755 --- a/data/mapHeaders/mansion4.asm +++ b/data/mapHeaders/mansion4.asm @@ -2,5 +2,5 @@ Mansion4_h: db FACILITY ; tileset db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x) dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Mansion4Object ; objects diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm index da64b667..4fbd8de0 100755 --- a/data/mapHeaders/mtmoon1.asm +++ b/data/mapHeaders/mtmoon1.asm @@ -2,5 +2,5 @@ MtMoon1_h: db CAVERN ; tileset db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x) dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw MtMoon1Object ; objects diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm index 7121c33e..81b0b365 100755 --- a/data/mapHeaders/mtmoon2.asm +++ b/data/mapHeaders/mtmoon2.asm @@ -2,5 +2,5 @@ MtMoon2_h: db CAVERN ; tileset db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x) dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw MtMoon2Object ; objects diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm index 643eb95d..f89d77cb 100755 --- a/data/mapHeaders/mtmoon3.asm +++ b/data/mapHeaders/mtmoon3.asm @@ -2,5 +2,5 @@ MtMoon3_h: db CAVERN ; tileset db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x) dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw MtMoon3Object ; objects diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm index ba82c478..0cb1791b 100755 --- a/data/mapHeaders/mtmoonpokecenter.asm +++ b/data/mapHeaders/mtmoonpokecenter.asm @@ -2,5 +2,5 @@ MtMoonPokecenter_h: db POKECENTER ; tileset db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw MtMoonPokecenterObject ; objects diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm index 10611513..eca97706 100755 --- a/data/mapHeaders/museum1f.asm +++ b/data/mapHeaders/museum1f.asm @@ -2,5 +2,5 @@ Museum1F_h: db MUSEUM ; tileset db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Museum1FObject ; objects diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm index 62f9f7ca..973f5045 100755 --- a/data/mapHeaders/museum2f.asm +++ b/data/mapHeaders/museum2f.asm @@ -2,5 +2,5 @@ Museum2F_h: db MUSEUM ; tileset db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Museum2FObject ; objects diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm index 3fdef0d7..01a488a7 100755 --- a/data/mapHeaders/namerater.asm +++ b/data/mapHeaders/namerater.asm @@ -2,5 +2,5 @@ NameRater_h: db HOUSE ; tileset db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw NameRaterObject ; objects diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm index ba2c9d22..94608ef2 100755 --- a/data/mapHeaders/oakslab.asm +++ b/data/mapHeaders/oakslab.asm @@ -2,5 +2,5 @@ OaksLab_h: db DOJO ; tileset db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw OaksLabObject ; objects diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm index 8eee73b3..a335ab50 100755 --- a/data/mapHeaders/pewtergym.asm +++ b/data/mapHeaders/pewtergym.asm @@ -2,5 +2,5 @@ PewterGym_h: db GYM ; tileset db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PewterGymObject ; objects diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm index 40209926..90b69d00 100755 --- a/data/mapHeaders/pewterhouse1.asm +++ b/data/mapHeaders/pewterhouse1.asm @@ -2,5 +2,5 @@ PewterHouse1_h: db HOUSE ; tileset db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x) dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PewterHouse1Object ; objects diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm index 25fc3e9d..9baa3d41 100755 --- a/data/mapHeaders/pewterhouse2.asm +++ b/data/mapHeaders/pewterhouse2.asm @@ -2,5 +2,5 @@ PewterHouse2_h: db HOUSE ; tileset db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x) dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PewterHouse2Object ; objects diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm index 02481bfc..00b91247 100755 --- a/data/mapHeaders/pewtermart.asm +++ b/data/mapHeaders/pewtermart.asm @@ -2,5 +2,5 @@ PewterMart_h: db MART ; tileset db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PewterMartObject ; objects diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm index f3abc838..29851a96 100755 --- a/data/mapHeaders/pewterpokecenter.asm +++ b/data/mapHeaders/pewterpokecenter.asm @@ -2,5 +2,5 @@ PewterPokecenter_h: db POKECENTER ; tileset db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PewterPokecenterObject ; objects diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm index 9a799d73..5ea76d21 100755 --- a/data/mapHeaders/pokemontower1.asm +++ b/data/mapHeaders/pokemontower1.asm @@ -2,5 +2,5 @@ PokemonTower1_h: db CEMETERY ; tileset db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x) dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower1Object ; objects diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm index a2c395c9..3da497e4 100755 --- a/data/mapHeaders/pokemontower2.asm +++ b/data/mapHeaders/pokemontower2.asm @@ -2,5 +2,5 @@ PokemonTower2_h: db CEMETERY ; tileset db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x) dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower2Object ; objects diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm index af81c9e6..bec35122 100755 --- a/data/mapHeaders/pokemontower3.asm +++ b/data/mapHeaders/pokemontower3.asm @@ -2,5 +2,5 @@ PokemonTower3_h: db CEMETERY ; tileset db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x) dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower3Object ; objects diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm index 073c34c0..4d96c709 100755 --- a/data/mapHeaders/pokemontower4.asm +++ b/data/mapHeaders/pokemontower4.asm @@ -2,5 +2,5 @@ PokemonTower4_h: db CEMETERY ; tileset db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x) dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower4Object ; objects diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm index a7636534..f91911b0 100755 --- a/data/mapHeaders/pokemontower5.asm +++ b/data/mapHeaders/pokemontower5.asm @@ -2,5 +2,5 @@ PokemonTower5_h: db CEMETERY ; tileset db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x) dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower5Object ; objects diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm index a83ae0ba..10a54cd5 100755 --- a/data/mapHeaders/pokemontower6.asm +++ b/data/mapHeaders/pokemontower6.asm @@ -2,5 +2,5 @@ PokemonTower6_h: db CEMETERY ; tileset db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x) dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower6Object ; objects diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm index 4e13bcee..b69fd01e 100755 --- a/data/mapHeaders/pokemontower7.asm +++ b/data/mapHeaders/pokemontower7.asm @@ -2,5 +2,5 @@ PokemonTower7_h: db CEMETERY ; tileset db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x) dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PokemonTower7Object ; objects diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm index 9c78311d..3b13491d 100755 --- a/data/mapHeaders/powerplant.asm +++ b/data/mapHeaders/powerplant.asm @@ -2,5 +2,5 @@ PowerPlant_h: db FACILITY ; tileset db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw PowerPlantObject ; objects diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm index a9dcf424..bbe721ab 100755 --- a/data/mapHeaders/rockethideout1.asm +++ b/data/mapHeaders/rockethideout1.asm @@ -2,5 +2,5 @@ RocketHideout1_h: db FACILITY ; tileset db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x) dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RocketHideout1Object ; objects diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm index 8f034360..cc2ed948 100755 --- a/data/mapHeaders/rockethideout2.asm +++ b/data/mapHeaders/rockethideout2.asm @@ -2,5 +2,5 @@ RocketHideout2_h: db FACILITY ; tileset db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x) dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RocketHideout2Object ; objects diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm index 5fc9fb95..12e9aa1e 100755 --- a/data/mapHeaders/rockethideout3.asm +++ b/data/mapHeaders/rockethideout3.asm @@ -2,5 +2,5 @@ RocketHideout3_h: db FACILITY ; tileset db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x) dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RocketHideout3Object ; objects diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm index 0cde5bee..0b858dc9 100755 --- a/data/mapHeaders/rockethideout4.asm +++ b/data/mapHeaders/rockethideout4.asm @@ -2,5 +2,5 @@ RocketHideout4_h: db FACILITY ; tileset db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x) dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RocketHideout4Object ; objects diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm index d4917812..b4269444 100755 --- a/data/mapHeaders/rockethideoutelevator.asm +++ b/data/mapHeaders/rockethideoutelevator.asm @@ -2,5 +2,5 @@ RocketHideoutElevator_h: db LOBBY ; tileset db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RocketHideoutElevatorObject ; objects diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm index db67517d..14fc41b1 100755 --- a/data/mapHeaders/rocktunnel1.asm +++ b/data/mapHeaders/rocktunnel1.asm @@ -2,5 +2,5 @@ RockTunnel1_h: db CAVERN ; tileset db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x) dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RockTunnel1Object ; objects diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm index 5b85701b..c4184b8d 100755 --- a/data/mapHeaders/rocktunnel2.asm +++ b/data/mapHeaders/rocktunnel2.asm @@ -2,5 +2,5 @@ RockTunnel2_h: db CAVERN ; tileset db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x) dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RockTunnel2Object ; objects diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm index e1bad3bd..977dd1cf 100755 --- a/data/mapHeaders/rocktunnelpokecenter.asm +++ b/data/mapHeaders/rocktunnelpokecenter.asm @@ -2,5 +2,5 @@ RockTunnelPokecenter_h: db POKECENTER ; tileset db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw RockTunnelPokecenterObject ; objects diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm index 26539a19..22f90adb 100755 --- a/data/mapHeaders/route11gate.asm +++ b/data/mapHeaders/route11gate.asm @@ -2,5 +2,5 @@ Route11Gate_h: db GATE ; tileset db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route11GateObject ; objects diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm index ac556804..d3f4a3e1 100755 --- a/data/mapHeaders/route11gateupstairs.asm +++ b/data/mapHeaders/route11gateupstairs.asm @@ -2,5 +2,5 @@ Route11GateUpstairs_h: db GATE ; tileset db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route11GateUpstairsObject ; objects diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm index bcd36d73..a870a191 100755 --- a/data/mapHeaders/route12gate.asm +++ b/data/mapHeaders/route12gate.asm @@ -2,5 +2,5 @@ Route12Gate_h: db GATE ; tileset db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route12GateObject ; objects diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm index 96109a38..767cb764 100755 --- a/data/mapHeaders/route12gateupstairs.asm +++ b/data/mapHeaders/route12gateupstairs.asm @@ -2,5 +2,5 @@ Route12GateUpstairs_h: db GATE ; tileset db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route12GateUpstairsObject ; objects diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm index 11f45d24..48428b10 100755 --- a/data/mapHeaders/route12house.asm +++ b/data/mapHeaders/route12house.asm @@ -2,5 +2,5 @@ Route12House_h: db HOUSE ; tileset db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x) dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route12HouseObject ; objects diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm index 072d8f72..ae71bc35 100755 --- a/data/mapHeaders/route15gate.asm +++ b/data/mapHeaders/route15gate.asm @@ -2,5 +2,5 @@ Route15Gate_h: db GATE ; tileset db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route15GateObject ; objects diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm index 96e7e2ca..02996057 100755 --- a/data/mapHeaders/route15gateupstairs.asm +++ b/data/mapHeaders/route15gateupstairs.asm @@ -2,5 +2,5 @@ Route15GateUpstairs_h: db GATE ; tileset db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route15GateUpstairsObject ; objects diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm index b3381258..32d0729b 100755 --- a/data/mapHeaders/route16gate.asm +++ b/data/mapHeaders/route16gate.asm @@ -2,5 +2,5 @@ Route16Gate_h: db GATE ; tileset db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route16GateObject ; objects diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm index e8dd7d45..32c32433 100755 --- a/data/mapHeaders/route16gateupstairs.asm +++ b/data/mapHeaders/route16gateupstairs.asm @@ -2,5 +2,5 @@ Route16GateUpstairs_h: db GATE ; tileset db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route16GateUpstairsObject ; objects diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm index 5945e11b..2b633873 100755 --- a/data/mapHeaders/route16house.asm +++ b/data/mapHeaders/route16house.asm @@ -2,5 +2,5 @@ Route16House_h: db HOUSE ; tileset db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x) dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route16HouseObject ; objects diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm index 090d43df..1b519527 100755 --- a/data/mapHeaders/route18gate.asm +++ b/data/mapHeaders/route18gate.asm @@ -2,5 +2,5 @@ Route18Gate_h: db GATE ; tileset db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route18GateObject ; objects diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm index ac9e3d0a..3f78af1b 100755 --- a/data/mapHeaders/route18gateupstairs.asm +++ b/data/mapHeaders/route18gateupstairs.asm @@ -2,5 +2,5 @@ Route18GateUpstairs_h: db GATE ; tileset db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route18GateUpstairsObject ; objects diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm index 7b8963ba..a8c20e97 100755 --- a/data/mapHeaders/route22gate.asm +++ b/data/mapHeaders/route22gate.asm @@ -2,5 +2,5 @@ Route22Gate_h: db GATE ; tileset db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route22GateObject ; objects diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm index 5cb7bcbc..7ef9f1a8 100755 --- a/data/mapHeaders/route2gate.asm +++ b/data/mapHeaders/route2gate.asm @@ -2,5 +2,5 @@ Route2Gate_h: db GATE ; tileset db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route2GateObject ; objects diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm index c7c140f6..2fc12748 100755 --- a/data/mapHeaders/route2house.asm +++ b/data/mapHeaders/route2house.asm @@ -2,5 +2,5 @@ Route2House_h: db HOUSE ; tileset db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x) dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route2HouseObject ; objects diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm index 68810da1..be3fd45c 100755 --- a/data/mapHeaders/route5gate.asm +++ b/data/mapHeaders/route5gate.asm @@ -2,5 +2,5 @@ Route5Gate_h: db GATE ; tileset db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route5GateObject ; objects diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm index f689240c..37c5032f 100755 --- a/data/mapHeaders/route6gate.asm +++ b/data/mapHeaders/route6gate.asm @@ -2,5 +2,5 @@ Route6Gate_h: db GATE ; tileset db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route6GateObject ; objects diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm index 9e01914f..9b5802b3 100755 --- a/data/mapHeaders/route7gate.asm +++ b/data/mapHeaders/route7gate.asm @@ -2,5 +2,5 @@ Route7Gate_h: db GATE ; tileset db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route7GateObject ; objects diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm index d206e978..66593058 100755 --- a/data/mapHeaders/route8gate.asm +++ b/data/mapHeaders/route8gate.asm @@ -2,5 +2,5 @@ Route8Gate_h: db GATE ; tileset db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw Route8GateObject ; objects diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm index 6da27c12..39f20b5d 100755 --- a/data/mapHeaders/safarizonecenter.asm +++ b/data/mapHeaders/safarizonecenter.asm @@ -2,5 +2,5 @@ SafariZoneCenter_h: db FOREST ; tileset db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneCenterObject ; objects diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm index 089620dc..f94a92bf 100755 --- a/data/mapHeaders/safarizoneeast.asm +++ b/data/mapHeaders/safarizoneeast.asm @@ -2,5 +2,5 @@ SafariZoneEast_h: db FOREST ; tileset db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneEastObject ; objects diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm index 1122d5a3..e2eabdcd 100755 --- a/data/mapHeaders/safarizoneentrance.asm +++ b/data/mapHeaders/safarizoneentrance.asm @@ -2,5 +2,5 @@ SafariZoneEntrance_h: db GATE ; tileset db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x) dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneEntranceObject ; objects diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm index a3a46769..5b01138d 100755 --- a/data/mapHeaders/safarizonenorth.asm +++ b/data/mapHeaders/safarizonenorth.asm @@ -2,5 +2,5 @@ SafariZoneNorth_h: db FOREST ; tileset db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneNorthObject ; objects diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm index b2988b47..0169c61f 100755 --- a/data/mapHeaders/safarizoneresthouse1.asm +++ b/data/mapHeaders/safarizoneresthouse1.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse1_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneRestHouse1Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm index 589d9850..804d619c 100755 --- a/data/mapHeaders/safarizoneresthouse2.asm +++ b/data/mapHeaders/safarizoneresthouse2.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse2_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneRestHouse2Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm index 21ffd3b6..becd3e7c 100755 --- a/data/mapHeaders/safarizoneresthouse3.asm +++ b/data/mapHeaders/safarizoneresthouse3.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse3_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneRestHouse3Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm index fa7de7ad..7cc8fd25 100755 --- a/data/mapHeaders/safarizoneresthouse4.asm +++ b/data/mapHeaders/safarizoneresthouse4.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse4_h: db GATE ; tileset db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x) dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneRestHouse4Object ; objects diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm index 6b081b1a..35575a10 100755 --- a/data/mapHeaders/safarizonesecrethouse.asm +++ b/data/mapHeaders/safarizonesecrethouse.asm @@ -2,5 +2,5 @@ SafariZoneSecretHouse_h: db LAB ; tileset db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneSecretHouseObject ; objects diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm index c1c54d13..24ac7686 100755 --- a/data/mapHeaders/safarizonewest.asm +++ b/data/mapHeaders/safarizonewest.asm @@ -2,5 +2,5 @@ SafariZoneWest_h: db FOREST ; tileset db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SafariZoneWestObject ; objects diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm index da3b4c04..4e9fe383 100755 --- a/data/mapHeaders/saffrongym.asm +++ b/data/mapHeaders/saffrongym.asm @@ -2,5 +2,5 @@ SaffronGym_h: db FACILITY ; tileset db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SaffronGymObject ; objects diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm index 9e22b03b..747b46b4 100755 --- a/data/mapHeaders/saffronhouse1.asm +++ b/data/mapHeaders/saffronhouse1.asm @@ -2,5 +2,5 @@ SaffronHouse1_h: db HOUSE ; tileset db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x) dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SaffronHouse1Object ; objects diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm index c38d0231..6a642a73 100755 --- a/data/mapHeaders/saffronhouse2.asm +++ b/data/mapHeaders/saffronhouse2.asm @@ -2,5 +2,5 @@ SaffronHouse2_h: db HOUSE ; tileset db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x) dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SaffronHouse2Object ; objects diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm index 747e4da9..72aadb56 100755 --- a/data/mapHeaders/saffronmart.asm +++ b/data/mapHeaders/saffronmart.asm @@ -2,5 +2,5 @@ SaffronMart_h: db MART ; tileset db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SaffronMartObject ; objects diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm index aa972289..85e3b5e3 100755 --- a/data/mapHeaders/saffronpokecenter.asm +++ b/data/mapHeaders/saffronpokecenter.asm @@ -2,5 +2,5 @@ SaffronPokecenter_h: db POKECENTER ; tileset db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SaffronPokecenterObject ; objects diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm index 8ace4fba..4c122f2a 100755 --- a/data/mapHeaders/school.asm +++ b/data/mapHeaders/school.asm @@ -2,5 +2,5 @@ School_h: db HOUSE ; tileset db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x) dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SchoolObject ; objects diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm index f52a65a8..32754b23 100755 --- a/data/mapHeaders/seafoamislands1.asm +++ b/data/mapHeaders/seafoamislands1.asm @@ -2,5 +2,5 @@ SeafoamIslands1_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x) dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SeafoamIslands1Object ; objects diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm index 08ec4bfa..f59d7201 100755 --- a/data/mapHeaders/seafoamislands2.asm +++ b/data/mapHeaders/seafoamislands2.asm @@ -2,5 +2,5 @@ SeafoamIslands2_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x) dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SeafoamIslands2Object ; objects diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm index 4050cd71..e75325ea 100755 --- a/data/mapHeaders/seafoamislands3.asm +++ b/data/mapHeaders/seafoamislands3.asm @@ -2,5 +2,5 @@ SeafoamIslands3_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x) dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SeafoamIslands3Object ; objects diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm index d3912ce0..297ecbbb 100755 --- a/data/mapHeaders/seafoamislands4.asm +++ b/data/mapHeaders/seafoamislands4.asm @@ -2,5 +2,5 @@ SeafoamIslands4_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x) dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SeafoamIslands4Object ; objects diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm index 2ae6d4b7..1e8af6f7 100755 --- a/data/mapHeaders/seafoamislands5.asm +++ b/data/mapHeaders/seafoamislands5.asm @@ -2,5 +2,5 @@ SeafoamIslands5_h: db CAVERN ; tileset db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x) dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SeafoamIslands5Object ; objects diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm index 203f08b7..4a2b176f 100755 --- a/data/mapHeaders/silphco1.asm +++ b/data/mapHeaders/silphco1.asm @@ -2,5 +2,5 @@ SilphCo1_h: db FACILITY ; tileset db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo1Object ; objects diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm index a16a6323..716fa025 100755 --- a/data/mapHeaders/silphco10.asm +++ b/data/mapHeaders/silphco10.asm @@ -2,5 +2,5 @@ SilphCo10_h: db FACILITY ; tileset db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo10Object ; objects diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm index a5d2f1b0..4ed282a9 100755 --- a/data/mapHeaders/silphco11.asm +++ b/data/mapHeaders/silphco11.asm @@ -2,5 +2,5 @@ SilphCo11_h: db INTERIOR ; tileset db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo11Object ; objects diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm index f0783e98..fae02d5b 100755 --- a/data/mapHeaders/silphco2.asm +++ b/data/mapHeaders/silphco2.asm @@ -2,5 +2,5 @@ SilphCo2_h: db FACILITY ; tileset db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo2Object ; objects diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm index b89a3802..98a130c0 100755 --- a/data/mapHeaders/silphco3.asm +++ b/data/mapHeaders/silphco3.asm @@ -2,5 +2,5 @@ SilphCo3_h: db FACILITY ; tileset db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo3Object ; objects diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm index 3c03a771..bc91f24b 100755 --- a/data/mapHeaders/silphco4.asm +++ b/data/mapHeaders/silphco4.asm @@ -2,5 +2,5 @@ SilphCo4_h: db FACILITY ; tileset db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo4Object ; objects diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm index 42704025..c9a4c1d2 100755 --- a/data/mapHeaders/silphco5.asm +++ b/data/mapHeaders/silphco5.asm @@ -2,5 +2,5 @@ SilphCo5_h: db FACILITY ; tileset db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo5Object ; objects diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm index c204360a..675709c2 100755 --- a/data/mapHeaders/silphco6.asm +++ b/data/mapHeaders/silphco6.asm @@ -2,5 +2,5 @@ SilphCo6_h: db FACILITY ; tileset db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo6Object ; objects diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm index bc31b335..ee46c3fb 100755 --- a/data/mapHeaders/silphco7.asm +++ b/data/mapHeaders/silphco7.asm @@ -2,5 +2,5 @@ SilphCo7_h: db FACILITY ; tileset db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo7Object ; objects diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm index aa3e0317..90c0ba0f 100755 --- a/data/mapHeaders/silphco8.asm +++ b/data/mapHeaders/silphco8.asm @@ -2,5 +2,5 @@ SilphCo8_h: db FACILITY ; tileset db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo8Object ; objects diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm index 97427fa3..182ec5b2 100755 --- a/data/mapHeaders/silphco9.asm +++ b/data/mapHeaders/silphco9.asm @@ -2,5 +2,5 @@ SilphCo9_h: db FACILITY ; tileset db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCo9Object ; objects diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm index 8a6ae1ca..3663cacd 100755 --- a/data/mapHeaders/silphcoelevator.asm +++ b/data/mapHeaders/silphcoelevator.asm @@ -2,5 +2,5 @@ SilphCoElevator_h: db LOBBY ; tileset db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SilphCoElevatorObject ; objects diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm index e6b48564..c69481d6 100755 --- a/data/mapHeaders/ssanne1.asm +++ b/data/mapHeaders/ssanne1.asm @@ -2,5 +2,5 @@ SSAnne1_h: db SHIP ; tileset db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x) dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne1Object ; objects diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm index ef07424b..79464beb 100755 --- a/data/mapHeaders/ssanne10.asm +++ b/data/mapHeaders/ssanne10.asm @@ -2,5 +2,5 @@ SSAnne10_h: db SHIP ; tileset db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x) dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne10Object ; objects diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm index cd5f3aa4..7a6294e5 100755 --- a/data/mapHeaders/ssanne2.asm +++ b/data/mapHeaders/ssanne2.asm @@ -2,5 +2,5 @@ SSAnne2_h: db SHIP ; tileset db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x) dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne2Object ; objects diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm index ffa57ddd..78f9660b 100755 --- a/data/mapHeaders/ssanne3.asm +++ b/data/mapHeaders/ssanne3.asm @@ -2,5 +2,5 @@ SSAnne3_h: db SHIP ; tileset db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x) dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne3Object ; objects diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm index 492b4b8d..9ad2c66c 100755 --- a/data/mapHeaders/ssanne4.asm +++ b/data/mapHeaders/ssanne4.asm @@ -2,5 +2,5 @@ SSAnne4_h: db SHIP ; tileset db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x) dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne4Object ; objects diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm index 29ffb6b9..a2c2b943 100755 --- a/data/mapHeaders/ssanne5.asm +++ b/data/mapHeaders/ssanne5.asm @@ -2,5 +2,5 @@ SSAnne5_h: db SHIP ; tileset db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x) dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne5Object ; objects diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm index e347528a..5a939b8f 100755 --- a/data/mapHeaders/ssanne6.asm +++ b/data/mapHeaders/ssanne6.asm @@ -2,5 +2,5 @@ SSAnne6_h: db SHIP ; tileset db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x) dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne6Object ; objects diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm index 9b437688..97666530 100755 --- a/data/mapHeaders/ssanne7.asm +++ b/data/mapHeaders/ssanne7.asm @@ -2,5 +2,5 @@ SSAnne7_h: db SHIP ; tileset db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x) dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne7Object ; objects diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm index 64b5c565..2771ad40 100755 --- a/data/mapHeaders/ssanne8.asm +++ b/data/mapHeaders/ssanne8.asm @@ -2,5 +2,5 @@ SSAnne8_h: db SHIP ; tileset db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x) dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne8Object ; objects diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm index c8e6e16f..8f944cf9 100755 --- a/data/mapHeaders/ssanne9.asm +++ b/data/mapHeaders/ssanne9.asm @@ -2,5 +2,5 @@ SSAnne9_h: db SHIP ; tileset db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x) dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw SSAnne9Object ; objects diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm index 09217ff0..5d6c7d95 100755 --- a/data/mapHeaders/tradecenter.asm +++ b/data/mapHeaders/tradecenter.asm @@ -2,5 +2,5 @@ TradeCenter_h: db CLUB ; tileset db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw TradeCenterObject ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm index 6e2c5727..9f5a2125 100755 --- a/data/mapHeaders/undergroundpathentranceroute5.asm +++ b/data/mapHeaders/undergroundpathentranceroute5.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute5_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathEntranceRoute5Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm index bb22e93e..4a5670af 100755 --- a/data/mapHeaders/undergroundpathentranceroute6.asm +++ b/data/mapHeaders/undergroundpathentranceroute6.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute6_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathEntranceRoute6Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm index 49b03415..e3fe68f0 100755 --- a/data/mapHeaders/undergroundpathentranceroute7.asm +++ b/data/mapHeaders/undergroundpathentranceroute7.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute7_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathEntranceRoute7Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm index e12ee454..a15f2f4d 100755 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute7Copy_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathEntranceRoute7CopyObject ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm index c70cb697..0698da9a 100755 --- a/data/mapHeaders/undergroundpathentranceroute8.asm +++ b/data/mapHeaders/undergroundpathentranceroute8.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute8_h: db GATE ; tileset db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x) dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathEntranceRoute8Object ; objects diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm index 4dc86647..ba021bea 100755 --- a/data/mapHeaders/undergroundpathns.asm +++ b/data/mapHeaders/undergroundpathns.asm @@ -2,5 +2,5 @@ UndergroundPathNS_h: db UNDERGROUND ; tileset db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x) dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathNSObject ; objects diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm index df2f98e1..7061a8d1 100755 --- a/data/mapHeaders/undergroundpathwe.asm +++ b/data/mapHeaders/undergroundpathwe.asm @@ -2,5 +2,5 @@ UndergroundPathWE_h: db UNDERGROUND ; tileset db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x) dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UndergroundPathWEObject ; objects diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm index e784ffac..0c6adbbd 100755 --- a/data/mapHeaders/unknowndungeon1.asm +++ b/data/mapHeaders/unknowndungeon1.asm @@ -2,5 +2,5 @@ UnknownDungeon1_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x) dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UnknownDungeon1Object ; objects diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm index 3c4c8d4e..b5147da2 100755 --- a/data/mapHeaders/unknowndungeon2.asm +++ b/data/mapHeaders/unknowndungeon2.asm @@ -2,5 +2,5 @@ UnknownDungeon2_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x) dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UnknownDungeon2Object ; objects diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm index 2e01c079..4b5372d2 100755 --- a/data/mapHeaders/unknowndungeon3.asm +++ b/data/mapHeaders/unknowndungeon3.asm @@ -2,5 +2,5 @@ UnknownDungeon3_h: db CAVERN ; tileset db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x) dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw UnknownDungeon3Object ; objects diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm index 16b1c7d8..5d93f284 100755 --- a/data/mapHeaders/vermiliondock.asm +++ b/data/mapHeaders/vermiliondock.asm @@ -2,5 +2,5 @@ VermilionDock_h: db SHIP_PORT ; tileset db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionDockObject ; objects diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm index 7624ed75..e960a70f 100755 --- a/data/mapHeaders/vermiliongym.asm +++ b/data/mapHeaders/vermiliongym.asm @@ -2,5 +2,5 @@ VermilionGym_h: db GYM ; tileset db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionGymObject ; objects diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm index 94aac1d0..47375c91 100755 --- a/data/mapHeaders/vermilionhouse1.asm +++ b/data/mapHeaders/vermilionhouse1.asm @@ -2,5 +2,5 @@ VermilionHouse1_h: db HOUSE ; tileset db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x) dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionHouse1Object ; objects diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm index b4124088..3a870db3 100755 --- a/data/mapHeaders/vermilionhouse2.asm +++ b/data/mapHeaders/vermilionhouse2.asm @@ -2,5 +2,5 @@ VermilionHouse2_h: db HOUSE ; tileset db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x) dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionHouse2Object ; objects diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm index 01683532..139f69f6 100755 --- a/data/mapHeaders/vermilionhouse3.asm +++ b/data/mapHeaders/vermilionhouse3.asm @@ -2,5 +2,5 @@ VermilionHouse3_h: db HOUSE ; tileset db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x) dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionHouse3Object ; objects diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm index 97fccc4d..e9dcd913 100755 --- a/data/mapHeaders/vermilionmart.asm +++ b/data/mapHeaders/vermilionmart.asm @@ -2,5 +2,5 @@ VermilionMart_h: db MART ; tileset db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionMartObject ; objects diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm index e1a63f9e..6a84204d 100755 --- a/data/mapHeaders/vermilionpokecenter.asm +++ b/data/mapHeaders/vermilionpokecenter.asm @@ -2,5 +2,5 @@ VermilionPokecenter_h: db POKECENTER ; tileset db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VermilionPokecenterObject ; objects diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm index 6d2f4338..cb902e37 100755 --- a/data/mapHeaders/victoryroad1.asm +++ b/data/mapHeaders/victoryroad1.asm @@ -2,5 +2,5 @@ VictoryRoad1_h: db CAVERN ; tileset db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x) dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VictoryRoad1Object ; objects diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm index fa9803b2..223652e5 100755 --- a/data/mapHeaders/victoryroad2.asm +++ b/data/mapHeaders/victoryroad2.asm @@ -2,5 +2,5 @@ VictoryRoad2_h: db CAVERN ; tileset db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x) dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VictoryRoad2Object ; objects diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm index 4202bfb6..5401fe10 100755 --- a/data/mapHeaders/victoryroad3.asm +++ b/data/mapHeaders/victoryroad3.asm @@ -2,5 +2,5 @@ VictoryRoad3_h: db CAVERN ; tileset db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x) dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw VictoryRoad3Object ; objects diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm index ef7905b0..250f3de8 100755 --- a/data/mapHeaders/viridianforest.asm +++ b/data/mapHeaders/viridianforest.asm @@ -2,5 +2,5 @@ ViridianForest_h: db FOREST ; tileset db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianForestObject ; objects diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm index 6e861c58..81534daa 100755 --- a/data/mapHeaders/viridianforestentrance.asm +++ b/data/mapHeaders/viridianforestentrance.asm @@ -2,5 +2,5 @@ ViridianForestEntrance_h: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x) dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianForestEntranceObject ; objects diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm index 8e1dd25e..9c492487 100755 --- a/data/mapHeaders/viridianforestexit.asm +++ b/data/mapHeaders/viridianforestexit.asm @@ -2,5 +2,5 @@ ViridianForestExit_h: db FOREST_GATE ; tileset db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x) dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianForestExitObject ; objects diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm index 40b0d69f..19833cf0 100755 --- a/data/mapHeaders/viridiangym.asm +++ b/data/mapHeaders/viridiangym.asm @@ -2,5 +2,5 @@ ViridianGym_h: db GYM ; tileset db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianGymObject ; objects diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm index c8724b4e..a80953f9 100755 --- a/data/mapHeaders/viridianhouse.asm +++ b/data/mapHeaders/viridianhouse.asm @@ -2,7 +2,7 @@ ViridianHouse_h: db HOUSE ; tileset db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x) dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianHouseObject ; objects db $0 diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm index 3d799a5b..39281567 100755 --- a/data/mapHeaders/viridianmart.asm +++ b/data/mapHeaders/viridianmart.asm @@ -2,5 +2,5 @@ ViridianMart_h: db MART ; tileset db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianMartObject ; objects diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm index 3218e89d..fbef5193 100755 --- a/data/mapHeaders/viridianpokecenter.asm +++ b/data/mapHeaders/viridianpokecenter.asm @@ -2,5 +2,5 @@ ViridianPokecenter_h: db POKECENTER ; tileset db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts - db $00 ; connections + db 0 ; connections dw ViridianPokecenterObject ; objects diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index b61dff29..cd8bbfe7 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -1,5 +1,5 @@ AgathaObject: - db 0 ; border block + db $0 ; border block db 4 ; warps warp 4, 11, 2, BRUNOS_ROOM diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index e5ff250c..98208a94 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -1,5 +1,5 @@ BikeShopObject: - db 14 ; border block + db $e ; border block db 2 ; warps warp 2, 7, 4, -1 diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index e152dadd..317d7c01 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -1,5 +1,5 @@ BillsHouseObject: - db 13 ; border block + db $d ; border block db 2 ; warps warp 2, 7, 0, -1 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 302c18ac..19338885 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -1,5 +1,5 @@ BluesHouseObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 1, -1 diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 85d789cc..45d21186 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,5 +1,5 @@ BrunoObject: - db 3 ; border block + db $3 ; border block db 4 ; warps warp 4, 11, 2, LORELEIS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 7471563c..f3e481f4 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -1,5 +1,5 @@ CeladonCityObject: - db 15 ; border block + db $f ; border block db 13 ; warps warp 8, 13, 0, CELADON_MART_1 diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index 63426279..b976a045 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -1,5 +1,5 @@ CeladonDinerObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 3, 7, 10, -1 diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 028a0839..a09691d6 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -1,5 +1,5 @@ CeladonGameCornerObject: - db 15 ; border block + db $f ; border block db 3 ; warps warp 15, 17, 7, -1 diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 0045bf73..b087153b 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -1,5 +1,5 @@ CeladonGymObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 17, 6, -1 diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 1f7916f7..09b4d99c 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -1,5 +1,5 @@ CeladonHotelObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 12, -1 diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 83b91723..d24354a6 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -1,5 +1,5 @@ CeladonHouseObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 2, 7, 11, -1 diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index c07ff521..423a9a2e 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -1,5 +1,5 @@ CeladonMansion1Object: - db 15 ; border block + db $f ; border block db 5 ; warps warp 4, 11, 2, -1 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index fd7e58b9..f2b96d89 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,5 +1,5 @@ CeladonMansion2Object: - db 15 ; border block + db $f ; border block db 4 ; warps warp 6, 1, 0, CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index d96c906f..e9718d9f 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -1,5 +1,5 @@ CeladonMansion3Object: - db 15 ; border block + db $f ; border block db 4 ; warps warp 6, 1, 0, CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 5bd2db06..98f538eb 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -1,5 +1,5 @@ CeladonMansion4Object: - db 9 ; border block + db $9 ; border block db 3 ; warps warp 6, 1, 1, CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index f439c5eb..0fd06d13 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -1,5 +1,5 @@ CeladonMansion5Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 2, CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index f9869322..bfd66996 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -1,5 +1,5 @@ CeladonMart1Object: - db 15 ; border block + db $f ; border block db 6 ; warps warp 2, 7, 0, -1 diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index ab69c91a..215861e6 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,5 +1,5 @@ CeladonMart2Object: - db 15 ; border block + db $f ; border block db 3 ; warps warp 12, 1, 4, CELADON_MART_1 diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index ba913e06..023e3b46 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -1,5 +1,5 @@ CeladonMart3Object: - db 15 ; border block + db $f ; border block db 3 ; warps warp 12, 1, 0, CELADON_MART_4 diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 749cc401..e3ea8955 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -1,5 +1,5 @@ CeladonMart4Object: - db 15 ; border block + db $f ; border block db 3 ; warps warp 12, 1, 0, CELADON_MART_3 diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index bf184d5f..ac2fa454 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -1,5 +1,5 @@ CeladonMart5Object: - db 15 ; border block + db $f ; border block db 3 ; warps warp 12, 1, 0, CELADON_MART_ROOF diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index f7bd1ede..49745aa9 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -1,5 +1,5 @@ CeladonMartElevatorObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 1, 3, 5, CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 7a2d1a7f..0268b1ec 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -1,5 +1,5 @@ CeladonMartRoofObject: - db 66 ; border block + db $42 ; border block db 1 ; warps warp 15, 2, 0, CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index 6393ee69..ab037ec0 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -1,5 +1,5 @@ CeladonPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 5, -1 diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index dbffa9b9..bdaafe02 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -1,5 +1,5 @@ CeladonPrizeRoomObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 4, 7, 9, -1 diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index bdff2047..66d18a29 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,5 +1,5 @@ CeruleanCityObject: - db 15 ; border block + db $f ; border block db 10 ; warps warp 27, 11, 0, TRASHED_HOUSE diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index e4ce6250..d774c5dd 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -1,5 +1,5 @@ CeruleanGymObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 13, 3, -1 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 6c47bba9..a8c636cf 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -1,5 +1,5 @@ CeruleanHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 1, -1 diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 65f457bc..cf54c719 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -1,5 +1,5 @@ CeruleanHouse2Object: - db 12 ; border block + db $c ; border block db 3 ; warps warp 2, 0, 9, -1 diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index c5a88424..7b90ff73 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -1,5 +1,5 @@ CeruleanHouseTrashedObject: - db 10 ; border block + db $a ; border block db 3 ; warps warp 2, 7, 0, -1 diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index 5c30bf03..389e0317 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -1,5 +1,5 @@ CeruleanMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 5, -1 diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 7a862ec3..a6d7a5b5 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -1,5 +1,5 @@ CeruleanPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 2, -1 diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index b9fb420e..3fc25a02 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -1,5 +1,5 @@ CinnabarGymObject: - db 46 ; border block + db $2e ; border block db 2 ; warps warp 16, 17, 1, -1 diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 0fcfed38..a66d6444 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -1,5 +1,5 @@ CinnabarIslandObject: - db 67 ; border block + db $43 ; border block db 5 ; warps warp 6, 3, 1, MANSION_1 diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 2c740a05..cf135039 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -1,5 +1,5 @@ CinnabarMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 4, -1 diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 19baee75..d1707ec7 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -1,5 +1,5 @@ CinnabarPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 3, -1 diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index f879d9e9..1c32de2f 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -1,5 +1,5 @@ ColosseumObject: - db 14 ; border block + db $e ; border block db 0 ; warps diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 02ca3859..e0e02a8d 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -1,5 +1,5 @@ CopycatsHouse1FObject: - db 10 ; border block + db $a ; border block db 3 ; warps warp 2, 7, 0, -1 diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 1f36b2e5..529f3416 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -1,5 +1,5 @@ CopycatsHouse2FObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 1, 2, COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index c435d7fe..7c10fe70 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -1,5 +1,5 @@ DayCareMObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 4, -1 diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index da2b8656..ef4de039 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -1,5 +1,5 @@ DiglettsCaveObject: - db 25 ; border block + db $19 ; border block db 2 ; warps warp 5, 5, 2, DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index 45cbfc49..af28bfbf 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -1,5 +1,5 @@ DiglettsCaveEntranceRoute11Object: - db 125 ; border block + db $7d ; border block db 3 ; warps warp 2, 7, 4, -1 diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index ef4d45ad..645cc385 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -1,5 +1,5 @@ DiglettsCaveRoute2Object: - db 125 ; border block + db $7d ; border block db 3 ; warps warp 2, 7, 0, -1 diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 3cfc6c00..8e0fd931 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -1,5 +1,5 @@ FanClubObject: - db 13 ; border block + db $d ; border block db 2 ; warps warp 2, 7, 1, -1 diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index 952da1a4..b9ff9449 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -1,5 +1,5 @@ FightingDojoObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 11, 1, -1 diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 180c051a..c89c03cd 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -1,5 +1,5 @@ FuchsiaCityObject: - db 15 ; border block + db $f ; border block db 9 ; warps warp 5, 13, 0, FUCHSIA_MART diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 7578323c..23314fb9 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -1,5 +1,5 @@ FuchsiaGymObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 17, 5, -1 diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 89745485..ca4638f9 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -1,5 +1,5 @@ FuchsiaHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 1, -1 diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index a1c3aefe..e3702594 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -1,5 +1,5 @@ FuchsiaHouse2Object: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 4, 7, 3, -1 diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index ea17c953..0bed500b 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -1,5 +1,5 @@ FuchsiaHouse3Object: - db 12 ; border block + db $c ; border block db 3 ; warps warp 2, 0, 8, -1 diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index ab06366d..bfb93979 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -1,5 +1,5 @@ FuchsiaMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 0, -1 diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 4330b59e..c6c10415 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -1,5 +1,5 @@ FuchsiaMeetingRoomObject: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 4, 7, 6, -1 diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 7db09516..12540cd3 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -1,5 +1,5 @@ FuchsiaPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 2, -1 diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index c16bdec8..10d9f0ed 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -1,5 +1,5 @@ GaryObject: - db 3 ; border block + db $3 ; border block db 4 ; warps warp 3, 7, 1, LANCES_ROOM diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index dc63d777..a815a053 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -1,5 +1,5 @@ HallofFameRoomObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 7, 2, CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index cfabb44c..d18f25e1 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -1,5 +1,5 @@ IndigoPlateauObject: - db 14 ; border block + db $e ; border block db 2 ; warps warp 9, 5, 0, INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index b7149d3f..d82256a1 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -1,5 +1,5 @@ IndigoPlateauLobbyObject: - db 0 ; border block + db $0 ; border block db 3 ; warps warp 7, 11, 0, -1 diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index cbd8e179..b9eea581 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -1,5 +1,5 @@ Lab1Object: - db 23 ; border block + db $17 ; border block db 5 ; warps warp 2, 7, 2, -1 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 81fdbc8a..3062fcae 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,5 +1,5 @@ Lab2Object: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 2, 7, 2, CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index fea6581e..73ba321d 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -1,5 +1,5 @@ Lab3Object: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 2, 7, 3, CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index cee79528..b9956f5f 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -1,5 +1,5 @@ Lab4Object: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 2, 7, 4, CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 572ae77c..77c0058c 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -1,5 +1,5 @@ LanceObject: - db 3 ; border block + db $3 ; border block db 3 ; warps warp 24, 16, 2, AGATHAS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index cd925419..d9b61302 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -1,5 +1,5 @@ LavenderHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 2, -1 diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index a70b4e66..6d900f45 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -1,5 +1,5 @@ LavenderHouse2Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 4, -1 diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 68ae3ada..6661fee9 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -1,5 +1,5 @@ LavenderMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 3, -1 diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index e7825178..b3eea8ec 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -1,5 +1,5 @@ LavenderPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 0, -1 diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 16fc183f..5788c4f3 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -1,5 +1,5 @@ LavenderTownObject: - db 44 ; border block + db $2c ; border block db 6 ; warps warp 3, 5, 0, LAVENDER_POKECENTER diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 82f0c47f..e5f0f9f2 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -1,5 +1,5 @@ LoreleiObject: - db 3 ; border block + db $3 ; border block db 4 ; warps warp 4, 11, 2, INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 6e639865..fe543f27 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -1,5 +1,5 @@ Mansion1Object: - db 46 ; border block + db $2e ; border block db 8 ; warps warp 4, 27, 0, -1 diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index b005aff5..cea8c8fc 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -1,5 +1,5 @@ Mansion2Object: - db 1 ; border block + db $1 ; border block db 4 ; warps warp 5, 10, 4, MANSION_1 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index d100598d..f6ec7aee 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -1,5 +1,5 @@ Mansion3Object: - db 1 ; border block + db $1 ; border block db 3 ; warps warp 7, 10, 1, MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index ec1c19fb..3db9d016 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -1,5 +1,5 @@ Mansion4Object: - db 1 ; border block + db $1 ; border block db 1 ; warps warp 23, 22, 5, MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index d8d5ca8b..707281aa 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -1,5 +1,5 @@ MtMoon1Object: - db 3 ; border block + db $3 ; border block db 5 ; warps warp 14, 35, 1, -1 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 2ac19fdf..abff4094 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -1,5 +1,5 @@ MtMoon2Object: - db 3 ; border block + db $3 ; border block db 8 ; warps warp 5, 5, 2, MT_MOON_1 diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index d5aeadc9..13aa5a79 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -1,5 +1,5 @@ MtMoon3Object: - db 3 ; border block + db $3 ; border block db 4 ; warps warp 25, 9, 1, MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index a76c8835..841d0194 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -1,5 +1,5 @@ MtMoonPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 0, -1 diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 557eaf63..3034dc74 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -1,5 +1,5 @@ Museum1FObject: - db 10 ; border block + db $a ; border block db 5 ; warps warp 10, 7, 0, -1 diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index a2f62660..11fad941 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -1,5 +1,5 @@ Museum2FObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 7, 4, MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 320d8b61..10487f0b 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -1,5 +1,5 @@ NameRaterObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 5, -1 diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 995dec29..d7fc8029 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -1,5 +1,5 @@ OaksLabObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 11, 2, -1 diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index 6063176f..1bd3d62b 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -1,5 +1,5 @@ PalletTownObject: - db 11 ; border block + db $b ; border block db 3 ; warps warp 5, 5, 0, REDS_HOUSE_1F diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 5fd1d48d..4e7d24d0 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -1,5 +1,5 @@ PewterCityObject: - db 10 ; border block + db $a ; border block db 7 ; warps warp 14, 7, 0, MUSEUM_1F diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 65fcf723..fc571f26 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -1,5 +1,5 @@ PewterGymObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 13, 2, -1 diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 1126a73a..63abe6b3 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -1,5 +1,5 @@ PewterHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 3, -1 diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index 64d8b131..48cb243d 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -1,5 +1,5 @@ PewterHouse2Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 5, -1 diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 2409c11c..e79952c9 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -1,5 +1,5 @@ PewterMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 4, -1 diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 15374fd1..29f02eb9 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -1,5 +1,5 @@ PewterPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 6, -1 diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 036f0f13..f15299da 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -1,5 +1,5 @@ PokemonTower1Object: - db 1 ; border block + db $1 ; border block db 3 ; warps warp 10, 17, 1, -1 diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 95b8c456..80615cd5 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -1,5 +1,5 @@ PokemonTower2Object: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 3, 9, 0, POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index c2a23d85..0e7f5e1f 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -1,5 +1,5 @@ PokemonTower3Object: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 3, 9, 0, POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 41e54571..9acea43e 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -1,5 +1,5 @@ PokemonTower4Object: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 3, 9, 0, POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 0b3349d8..ac0668b2 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -1,5 +1,5 @@ PokemonTower5Object: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 3, 9, 0, POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 13cde398..1dd66629 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -1,5 +1,5 @@ PokemonTower6Object: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 18, 9, 1, POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index d170d21a..9609253f 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,5 +1,5 @@ PokemonTower7Object: - db 1 ; border block + db $1 ; border block db 1 ; warps warp 9, 16, 1, POKEMONTOWER_6 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index b6e5c231..402f899f 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -1,5 +1,5 @@ PowerPlantObject: - db 46 ; border block + db $2e ; border block db 3 ; warps warp 4, 35, 3, -1 diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index ed787246..aabe6656 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -1,5 +1,5 @@ RedsHouse1FObject: - db 10 ; border block + db $a ; border block db 3 ; warps warp 2, 7, 0, -1 ; exit1 diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index 8aa0f1e5..af3c4b6b 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,5 +1,5 @@ RedsHouse2FObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 1, 2, REDS_HOUSE_1F diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 264f20ab..3a51808d 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -1,5 +1,5 @@ RocketHideout1Object: - db 46 ; border block + db $2e ; border block db 5 ; warps warp 23, 2, 0, ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index d5ac71b5..328a4fb5 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -1,5 +1,5 @@ RocketHideout2Object: - db 46 ; border block + db $2e ; border block db 5 ; warps warp 27, 8, 0, ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 07ce8477..a8da69d2 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -1,5 +1,5 @@ RocketHideout3Object: - db 46 ; border block + db $2e ; border block db 2 ; warps warp 25, 6, 1, ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 9f69ba51..97025c71 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -1,5 +1,5 @@ RocketHideout4Object: - db 46 ; border block + db $2e ; border block db 3 ; warps warp 19, 10, 1, ROCKET_HIDEOUT_3 diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index 9c3a8c7d..583c9f89 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -1,5 +1,5 @@ RocketHideoutElevatorObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 2, 1, 2, ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 1d3d0bb2..1cfeca65 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -1,5 +1,5 @@ RockTunnel1Object: - db 3 ; border block + db $3 ; border block db 8 ; warps warp 15, 3, 1, -1 diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index bc78fb55..d60863c1 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -1,5 +1,5 @@ RockTunnel2Object: - db 3 ; border block + db $3 ; border block db 4 ; warps warp 33, 25, 4, ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index eabddddf..c664b206 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -1,5 +1,5 @@ RockTunnelPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 0, -1 diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index 497d242d..26505ea6 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -1,5 +1,5 @@ Route1Object: - db 11 ; border block + db $b ; border block db 0 ; warps diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index f94e04cf..90abb47d 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -1,5 +1,5 @@ Route10Object: - db 44 ; border block + db $2c ; border block db 4 ; warps warp 11, 19, 0, ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 95e1c7f4..8d8e35d6 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -1,5 +1,5 @@ Route11Object: - db 15 ; border block + db $f ; border block db 5 ; warps warp 49, 8, 0, ROUTE_11_GATE_1F diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index de62250f..fa627963 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -1,5 +1,5 @@ Route11GateObject: - db 10 ; border block + db $a ; border block db 5 ; warps warp 0, 4, 0, -1 diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index ad0d073c..e112c685 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -1,5 +1,5 @@ Route11GateUpstairsObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 7, 4, ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 8bd9e94d..b72317d4 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -1,5 +1,5 @@ Route12Object: - db 67 ; border block + db $43 ; border block db 4 ; warps warp 10, 15, 0, ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 35cab520..bbfab54c 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -1,5 +1,5 @@ Route12GateObject: - db 10 ; border block + db $a ; border block db 5 ; warps warp 4, 0, 0, -1 diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 5eea516a..9351ebac 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -1,5 +1,5 @@ Route12GateUpstairsObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 7, 4, ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 384a6eda..3161ebe6 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -1,5 +1,5 @@ Route12HouseObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 3, -1 diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 38e475a2..b2a40c2c 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -1,5 +1,5 @@ Route13Object: - db 67 ; border block + db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 5959041b..9694715b 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -1,5 +1,5 @@ Route14Object: - db 67 ; border block + db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 7715068d..21fd2d97 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -1,5 +1,5 @@ Route15Object: - db 67 ; border block + db $43 ; border block db 4 ; warps warp 7, 8, 0, ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index 4d1b8736..13c39674 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -1,5 +1,5 @@ Route15GateObject: - db 10 ; border block + db $a ; border block db 5 ; warps warp 0, 4, 0, -1 diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index 23d56eea..ff180883 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -1,5 +1,5 @@ Route15GateUpstairsObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 7, 4, ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 5acb748f..35ffea17 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -1,5 +1,5 @@ Route16Object: - db 15 ; border block + db $f ; border block db 9 ; warps warp 17, 10, 0, ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index 94e85a4a..4e1863ed 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -1,5 +1,5 @@ Route16GateObject: - db 10 ; border block + db $a ; border block db 9 ; warps warp 0, 8, 0, -1 diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 520c3e5a..41487e6e 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -1,5 +1,5 @@ Route16GateUpstairsObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 7, 8, ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 8c1bab19..7a097105 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -1,5 +1,5 @@ Route16HouseObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 8, -1 diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index 854e7d6e..48750597 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -1,5 +1,5 @@ Route17Object: - db 67 ; border block + db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index fc9c7d84..d7851f88 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -1,5 +1,5 @@ Route18Object: - db 67 ; border block + db $43 ; border block db 4 ; warps warp 33, 8, 0, ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 1eea9cfe..c73d7131 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -1,5 +1,5 @@ Route18GateObject: - db 10 ; border block + db $a ; border block db 5 ; warps warp 0, 4, 0, -1 diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 21604b66..6d298055 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -1,5 +1,5 @@ Route18GateUpstairsObject: - db 10 ; border block + db $a ; border block db 1 ; warps warp 7, 7, 4, ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 13c00330..935b3d4d 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,5 +1,5 @@ Route19Object: - db 67 ; border block + db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index b9e921cd..b62f9fdb 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,5 +1,5 @@ Route2Object: - db 15 ; border block + db $f ; border block db 6 ; warps warp 12, 9, 0, DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 3d18495a..5f4d5647 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -1,5 +1,5 @@ Route20Object: - db 67 ; border block + db $43 ; border block db 2 ; warps warp 48, 5, 0, SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index aaa87d8a..bb2409ce 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -1,5 +1,5 @@ Route21Object: - db 67 ; border block + db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 377cf6c9..e91eb792 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,5 +1,5 @@ Route22Object: - db 44 ; border block + db $2c ; border block db 1 ; warps warp 8, 5, 0, ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 6340b702..aa9512c6 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -1,5 +1,5 @@ Route22GateObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 4, 7, 0, -1 diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 613ce6f4..2fd3e3d7 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -1,5 +1,5 @@ Route23Object: - db 15 ; border block + db $f ; border block db 4 ; warps warp 7, 139, 2, ROUTE_22_GATE diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 9ca277c8..0fcc1d7b 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -1,5 +1,5 @@ Route24Object: - db 44 ; border block + db $2c ; border block db 0 ; warps diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index abc40804..3ba5fbdb 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -1,5 +1,5 @@ Route25Object: - db 44 ; border block + db $2c ; border block db 1 ; warps warp 45, 3, 0, BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 6d2244ec..714b8ee6 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -1,5 +1,5 @@ Route2GateObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 4, 0, 3, -1 diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 1a6f4b52..b27b65ef 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -1,5 +1,5 @@ Route2HouseObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 2, -1 diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 827dc14d..422fa29b 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -1,5 +1,5 @@ Route3Object: - db 44 ; border block + db $2c ; border block db 0 ; warps diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 30e3ff24..7d09c28a 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -1,5 +1,5 @@ Route4Object: - db 44 ; border block + db $2c ; border block db 3 ; warps warp 11, 5, 0, MT_MOON_POKECENTER diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 445c7aab..62aa6431 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,5 +1,5 @@ Route5Object: - db 10 ; border block + db $a ; border block db 5 ; warps warp 10, 29, 3, ROUTE_5_GATE diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index 0ceedb9b..8b230942 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -1,5 +1,5 @@ Route5GateObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 3, 5, 2, -1 diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index 4bb5fbc4..e0eea85b 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -1,5 +1,5 @@ Route6Object: - db 15 ; border block + db $f ; border block db 4 ; warps warp 9, 1, 2, ROUTE_6_GATE diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index cc5ccdc2..e3b7b2b8 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -1,5 +1,5 @@ Route6GateObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 3, 5, 2, -1 diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index cb6f2ecb..d32e6019 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -1,5 +1,5 @@ Route7Object: - db 15 ; border block + db $f ; border block db 5 ; warps warp 18, 9, 2, ROUTE_7_GATE diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 28b4b1cf..0b726fd3 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -1,5 +1,5 @@ Route7GateObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 0, 3, 3, -1 diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 1dc066fb..dc7580fc 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -1,5 +1,5 @@ Route8Object: - db 44 ; border block + db $2c ; border block db 5 ; warps warp 1, 9, 0, ROUTE_8_GATE diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 0d43bb80..ac286aa0 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -1,5 +1,5 @@ Route8GateObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 0, 3, 0, -1 diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 5ed4fe06..ab3ceefe 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -1,5 +1,5 @@ Route9Object: - db 44 ; border block + db $2c ; border block db 0 ; warps diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 7ce03028..550f9aa4 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -1,5 +1,5 @@ SafariZoneCenterObject: - db 0 ; border block + db $0 ; border block db 9 ; warps warp 14, 25, 2, SAFARI_ZONE_ENTRANCE diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index e4eb6885..53553161 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -1,5 +1,5 @@ SafariZoneEastObject: - db 0 ; border block + db $0 ; border block db 5 ; warps warp 0, 4, 6, SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 9a54ae93..5a3379c7 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -1,5 +1,5 @@ SafariZoneEntranceObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 3, 5, 4, -1 diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index 0fb2c68f..6cbe51f6 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -1,5 +1,5 @@ SafariZoneNorthObject: - db 0 ; border block + db $0 ; border block db 9 ; warps warp 2, 35, 0, SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index b90e62bf..031debec 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -1,5 +1,5 @@ SafariZoneRestHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 8, SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 80def1e3..7e589731 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -1,5 +1,5 @@ SafariZoneRestHouse2Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 7, SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 0b11f2bd..00623953 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -1,5 +1,5 @@ SafariZoneRestHouse3Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 4, SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 407b74d6..d3b81b4e 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -1,5 +1,5 @@ SafariZoneRestHouse4Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 8, SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index edba01ef..4faa90c6 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -1,5 +1,5 @@ SafariZoneSecretHouseObject: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 2, 7, 6, SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index acdffb7c..5d3c6d19 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -1,5 +1,5 @@ SafariZoneWestObject: - db 0 ; border block + db $0 ; border block db 8 ; warps warp 20, 0, 0, SAFARI_ZONE_NORTH diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index ed0ffae0..d9afc7ec 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,5 +1,5 @@ SaffronCityObject: - db 15 ; border block + db $f ; border block db 8 ; warps warp 7, 5, 0, COPYCATS_HOUSE_1F diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 027f287a..b466d152 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -1,5 +1,5 @@ SaffronGymObject: - db 46 ; border block + db $2e ; border block db 32 ; warps warp 8, 17, 2, -1 diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 3c800d38..c6abb539 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -1,5 +1,5 @@ SaffronHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 3, -1 diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index e74b36ff..ac1827b9 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -1,5 +1,5 @@ SaffronHouse2Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 7, -1 diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 0a1551ea..6293b901 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -1,5 +1,5 @@ SaffronMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 4, -1 diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 23b60a8d..b367ec89 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -1,5 +1,5 @@ SaffronPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 6, -1 diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 1cc90d17..8f07144f 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -1,5 +1,5 @@ SchoolObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 2, -1 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index e4cf6bfe..a1617004 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -1,5 +1,5 @@ SeafoamIslands1Object: - db 125 ; border block + db $7d ; border block db 7 ; warps warp 4, 17, 0, -1 diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index adb8e921..76c2ce3c 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -1,5 +1,5 @@ SeafoamIslands2Object: - db 125 ; border block + db $7d ; border block db 7 ; warps warp 4, 2, 0, SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 660e42c4..a5cb848a 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -1,5 +1,5 @@ SeafoamIslands3Object: - db 125 ; border block + db $7d ; border block db 7 ; warps warp 5, 3, 0, SEAFOAM_ISLANDS_2 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index 69b3558d..0faaae28 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -1,5 +1,5 @@ SeafoamIslands4Object: - db 125 ; border block + db $7d ; border block db 7 ; warps warp 5, 12, 1, SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index e5a5e04c..9bd82887 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -1,5 +1,5 @@ SeafoamIslands5Object: - db 125 ; border block + db $7d ; border block db 4 ; warps warp 20, 17, 5, SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 9a13055d..0f98247b 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -1,5 +1,5 @@ SilphCo1Object: - db 46 ; border block + db $2e ; border block db 5 ; warps warp 10, 17, 5, -1 diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index b3f2066f..90fa2acd 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -1,5 +1,5 @@ SilphCo10Object: - db 46 ; border block + db $2e ; border block db 6 ; warps warp 8, 0, 0, SILPH_CO_9F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 11fb3b9f..a130f4f1 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -1,5 +1,5 @@ SilphCo11Object: - db 13 ; border block + db $d ; border block db 4 ; warps warp 9, 0, 1, SILPH_CO_10F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 4d6a2fb5..4b7f34f6 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -1,5 +1,5 @@ SilphCo2Object: - db 46 ; border block + db $2e ; border block db 7 ; warps warp 24, 0, 2, SILPH_CO_1F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index 65164c17..86b3b215 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -1,5 +1,5 @@ SilphCo3Object: - db 46 ; border block + db $2e ; border block db 10 ; warps warp 26, 0, 1, SILPH_CO_2F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index c91efcde..73082342 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -1,5 +1,5 @@ SilphCo4Object: - db 46 ; border block + db $2e ; border block db 7 ; warps warp 24, 0, 1, SILPH_CO_3F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index f8673460..5a7d59fc 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -1,5 +1,5 @@ SilphCo5Object: - db 46 ; border block + db $2e ; border block db 7 ; warps warp 24, 0, 1, SILPH_CO_6F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index b45700ba..c936970d 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -1,5 +1,5 @@ SilphCo6Object: - db 46 ; border block + db $2e ; border block db 5 ; warps warp 16, 0, 1, SILPH_CO_7F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index b23775a9..96dc64a5 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -1,5 +1,5 @@ SilphCo7Object: - db 46 ; border block + db $2e ; border block db 6 ; warps warp 16, 0, 1, SILPH_CO_8F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index c9f9e1ef..513e84ea 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -1,5 +1,5 @@ SilphCo8Object: - db 46 ; border block + db $2e ; border block db 7 ; warps warp 16, 0, 1, SILPH_CO_9F diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 8abf27cf..377d7ca0 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -1,5 +1,5 @@ SilphCo9Object: - db 46 ; border block + db $2e ; border block db 5 ; warps warp 14, 0, 0, SILPH_CO_10F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index e451a63c..205fc046 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -1,5 +1,5 @@ SilphCoElevatorObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 1, 3, 0, 237 diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index 0e44fa82..9d5ddd1f 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -1,5 +1,5 @@ SSAnne1Object: - db 12 ; border block + db $c ; border block db 11 ; warps warp 26, 0, 1, VERMILION_DOCK diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index 8aac7643..93fb2cde 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -1,5 +1,5 @@ SSAnne10Object: - db 12 ; border block + db $c ; border block db 10 ; warps warp 2, 5, 4, SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index d2a1df31..3a685610 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -1,5 +1,5 @@ SSAnne2Object: - db 12 ; border block + db $c ; border block db 9 ; warps warp 9, 11, 0, SS_ANNE_9 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 8de4c53d..3a45e1f9 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,5 +1,5 @@ SSAnne3Object: - db 12 ; border block + db $c ; border block db 2 ; warps warp 0, 3, 0, SS_ANNE_5 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index 83852a5b..7f0d6853 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -1,5 +1,5 @@ SSAnne4Object: - db 12 ; border block + db $c ; border block db 6 ; warps warp 23, 3, 8, SS_ANNE_10 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 5e96d3b7..106557be 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -1,5 +1,5 @@ SSAnne5Object: - db 35 ; border block + db $23 ; border block db 2 ; warps warp 13, 6, 0, SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 8a1b2326..a25fe9b3 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -1,5 +1,5 @@ SSAnne6Object: - db 12 ; border block + db $c ; border block db 1 ; warps warp 6, 0, 10, SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 1855967c..7657170e 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -1,5 +1,5 @@ SSAnne7Object: - db 12 ; border block + db $c ; border block db 1 ; warps warp 0, 7, 8, SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 05645d78..d26921bd 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -1,5 +1,5 @@ SSAnne8Object: - db 12 ; border block + db $c ; border block db 6 ; warps warp 0, 0, 2, SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 9c3aafb7..455e6983 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -1,5 +1,5 @@ SSAnne9Object: - db 12 ; border block + db $c ; border block db 12 ; warps warp 2, 5, 0, SS_ANNE_2 diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index 851cb1ab..63c3e04a 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -1,5 +1,5 @@ TradeCenterObject: - db 14 ; border block + db $e ; border block db 0 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index 1aa26743..3e3d52dd 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -1,5 +1,5 @@ UndergroundPathEntranceRoute5Object: - db 10 ; border block + db $a ; border block db 3 ; warps warp 3, 7, 3, -1 diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index ab45c91a..f9c6d224 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -1,5 +1,5 @@ UndergroundPathEntranceRoute6Object: - db 10 ; border block + db $a ; border block db 3 ; warps warp 3, 7, 3, -1 diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 97c730ad..80dde9a3 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -1,5 +1,5 @@ UndergroundPathEntranceRoute7Object: - db 10 ; border block + db $a ; border block db 3 ; warps warp 3, 7, 4, -1 diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index bf42e84d..20b74599 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -1,5 +1,5 @@ UndergroundPathEntranceRoute7CopyObject: - db 10 ; border block + db $a ; border block db 3 ; warps warp 3, 7, 5, -1 diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 39337cb9..02390322 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -1,5 +1,5 @@ UndergroundPathEntranceRoute8Object: - db 10 ; border block + db $a ; border block db 3 ; warps warp 3, 7, 4, -1 diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index 7a805280..00b096e8 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -1,5 +1,5 @@ UndergroundPathNSObject: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index a6c04541..0af2ccc3 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -1,5 +1,5 @@ UndergroundPathWEObject: - db 1 ; border block + db $1 ; border block db 2 ; warps warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 68492e85..97ff99a8 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -1,5 +1,5 @@ UnknownDungeon1Object: - db 125 ; border block + db $7d ; border block db 9 ; warps warp 24, 17, 6, -1 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index a5b3b09e..51626589 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -1,5 +1,5 @@ UnknownDungeon2Object: - db 125 ; border block + db $7d ; border block db 6 ; warps warp 29, 1, 2, UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 95d80d12..d44ba254 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -1,5 +1,5 @@ UnknownDungeon3Object: - db 125 ; border block + db $7d ; border block db 1 ; warps warp 3, 6, 8, UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 839faa37..86cc5685 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -1,5 +1,5 @@ VermilionCityObject: - db 67 ; border block + db $43 ; border block db 9 ; warps warp 11, 3, 0, VERMILION_POKECENTER diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 8ad6cc3e..289689b5 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -1,5 +1,5 @@ VermilionDockObject: - db 15 ; border block + db $f ; border block db 2 ; warps warp 14, 0, 5, -1 diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 1c901424..843454c0 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -1,5 +1,5 @@ VermilionGymObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 4, 17, 3, -1 diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 5b1961ca..bbb7491b 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -1,5 +1,5 @@ VermilionHouse1Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 4, -1 diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index fdad3571..e612b06a 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -1,5 +1,5 @@ VermilionHouse2Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 8, -1 diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 19a60f4d..a6dd42fa 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -1,5 +1,5 @@ VermilionHouse3Object: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 7, -1 diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 437478fd..f5b15c7d 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -1,5 +1,5 @@ VermilionMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 2, -1 diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index eeef9c20..da792d34 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -1,5 +1,5 @@ VermilionPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 0, -1 diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 1c538125..62309bbd 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -1,5 +1,5 @@ VictoryRoad1Object: - db 125 ; border block + db $7d ; border block db 3 ; warps warp 8, 17, 2, -1 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 361bef2d..283e74c8 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -1,5 +1,5 @@ VictoryRoad2Object: - db 125 ; border block + db $7d ; border block db 7 ; warps warp 0, 8, 2, VICTORY_ROAD_1 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 1bd72e51..ffa2a843 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -1,5 +1,5 @@ VictoryRoad3Object: - db 125 ; border block + db $7d ; border block db 4 ; warps warp 23, 7, 3, VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 5208f34b..b45ba9d5 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -1,5 +1,5 @@ ViridianCityObject: - db 15 ; border block + db $f ; border block db 5 ; warps warp 23, 25, 0, VIRIDIAN_POKECENTER diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 7e399fa2..601f73e2 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -1,5 +1,5 @@ ViridianForestObject: - db 3 ; border block + db $3 ; border block db 6 ; warps warp 1, 0, 2, VIRIDIAN_FOREST_EXIT diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index a42c7ec0..319ba272 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -1,5 +1,5 @@ ViridianForestEntranceObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 4, 0, 3, VIRIDIAN_FOREST diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 2f098642..521ad818 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -1,5 +1,5 @@ ViridianForestExitObject: - db 10 ; border block + db $a ; border block db 4 ; warps warp 4, 0, 1, -1 diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index c136b8a2..c6ddb1d4 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -1,5 +1,5 @@ ViridianGymObject: - db 3 ; border block + db $3 ; border block db 2 ; warps warp 16, 17, 4, -1 diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index 6fd1c609..932542a6 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -1,5 +1,5 @@ ViridianHouseObject: - db 10 ; border block + db $a ; border block db 2 ; warps warp 2, 7, 3, -1 diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index 184ff892..e692f810 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -1,5 +1,5 @@ ViridianMartObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 1, -1 diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index c369a475..9c8ebbfe 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -1,5 +1,5 @@ ViridianPokecenterObject: - db 0 ; border block + db $0 ; border block db 2 ; warps warp 3, 7, 0, -1 -- cgit v1.2.3 From 819b6789099947e83b7e3f0b0e2f6d39cf901807 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 12:05:06 -0500 Subject: INCBIN don't start with tabs --- main.asm | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/main.asm b/main.asm index da2d3671..041479d9 100755 --- a/main.asm +++ b/main.asm @@ -895,13 +895,12 @@ INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" TradingAnimationGraphics: - INCBIN "gfx/game_boy.norepeat.2bpp" - INCBIN "gfx/link_cable.2bpp" +INCBIN "gfx/game_boy.norepeat.2bpp" +INCBIN "gfx/link_cable.2bpp" TradingAnimationGraphicsEnd: -TradingAnimationGraphics2: ; Pokeball traveling through the link cable. - INCBIN "gfx/trade2.2bpp" +TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp" TradingAnimationGraphics2End: INCLUDE "engine/evos_moves.asm" @@ -1536,38 +1535,32 @@ INCLUDE "scripts/route18.asm" INCLUDE "data/mapHeaders/fanclub.asm" INCLUDE "scripts/fanclub.asm" INCLUDE "data/mapObjects/fanclub.asm" -FanClubBlocks: - INCBIN "maps/fanclub.blk" +FanClubBlocks: INCBIN "maps/fanclub.blk" INCLUDE "data/mapHeaders/silphco2.asm" INCLUDE "scripts/silphco2.asm" INCLUDE "data/mapObjects/silphco2.asm" -SilphCo2Blocks: - INCBIN "maps/silphco2.blk" +SilphCo2Blocks: INCBIN "maps/silphco2.blk" INCLUDE "data/mapHeaders/silphco3.asm" INCLUDE "scripts/silphco3.asm" INCLUDE "data/mapObjects/silphco3.asm" -SilphCo3Blocks: - INCBIN "maps/silphco3.blk" +SilphCo3Blocks: INCBIN "maps/silphco3.blk" INCLUDE "data/mapHeaders/silphco10.asm" INCLUDE "scripts/silphco10.asm" INCLUDE "data/mapObjects/silphco10.asm" -SilphCo10Blocks: - INCBIN "maps/silphco10.blk" +SilphCo10Blocks: INCBIN "maps/silphco10.blk" INCLUDE "data/mapHeaders/lance.asm" INCLUDE "scripts/lance.asm" INCLUDE "data/mapObjects/lance.asm" -LanceBlocks: - INCBIN "maps/lance.blk" +LanceBlocks: INCBIN "maps/lance.blk" INCLUDE "data/mapHeaders/halloffameroom.asm" INCLUDE "scripts/halloffameroom.asm" INCLUDE "data/mapObjects/halloffameroom.asm" -HallofFameRoomBlocks: - INCBIN "maps/halloffameroom.blk" +HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" INCLUDE "engine/overworld/saffron_guards.asm" -- cgit v1.2.3 From f75049feef17757cd07eb86cf34729c272cefcd5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 10 Mar 2018 18:01:54 -0500 Subject: Use rgbgfx and c tools instead of the submodule. --- Makefile | 58 ++++-- engine/HoF_room_pc.asm | 2 +- engine/intro.asm | 12 +- gfx/blue/intro_purin_1.6x6.png | Bin 366 -> 0 bytes gfx/blue/intro_purin_1.png | Bin 0 -> 366 bytes gfx/blue/intro_purin_2.6x6.png | Bin 360 -> 0 bytes gfx/blue/intro_purin_2.png | Bin 0 -> 360 bytes gfx/blue/intro_purin_3.6x6.png | Bin 416 -> 0 bytes gfx/blue/intro_purin_3.png | Bin 0 -> 416 bytes gfx/game_boy.norepeat.png | Bin 246 -> 0 bytes gfx/game_boy.png | Bin 0 -> 246 bytes gfx/red/intro_nido_1.6x6.png | Bin 462 -> 0 bytes gfx/red/intro_nido_1.png | Bin 0 -> 462 bytes gfx/red/intro_nido_2.6x6.png | Bin 449 -> 0 bytes gfx/red/intro_nido_2.png | Bin 0 -> 449 bytes gfx/red/intro_nido_3.6x6.png | Bin 495 -> 0 bytes gfx/red/intro_nido_3.png | Bin 0 -> 495 bytes gfx/theend.interleave.png | Bin 139 -> 0 bytes gfx/theend.png | Bin 0 -> 139 bytes gfx/tilesets/cavern.png | Bin 0 -> 1022 bytes gfx/tilesets/cavern.t14.png | Bin 1022 -> 0 bytes gfx/tilesets/cemetery.png | Bin 0 -> 928 bytes gfx/tilesets/cemetery.t4.png | Bin 928 -> 0 bytes gfx/tilesets/club.png | Bin 0 -> 899 bytes gfx/tilesets/club.t5.png | Bin 899 -> 0 bytes gfx/tilesets/gate.png | Bin 0 -> 1119 bytes gfx/tilesets/gate.t1.png | Bin 1119 -> 0 bytes gfx/tilesets/house.png | Bin 0 -> 1163 bytes gfx/tilesets/house.t2.png | Bin 1163 -> 0 bytes gfx/tilesets/interior.png | Bin 0 -> 1141 bytes gfx/tilesets/interior.t1.png | Bin 1141 -> 0 bytes gfx/tilesets/lab.png | Bin 0 -> 1051 bytes gfx/tilesets/lab.t4.png | Bin 1051 -> 0 bytes gfx/tilesets/lobby.png | Bin 0 -> 966 bytes gfx/tilesets/lobby.t2.png | Bin 966 -> 0 bytes gfx/tilesets/mansion.png | Bin 0 -> 960 bytes gfx/tilesets/mansion.t2.png | Bin 960 -> 0 bytes gfx/tilesets/overworld.png | Bin 0 -> 1309 bytes gfx/tilesets/overworld.t2.png | Bin 1309 -> 0 bytes gfx/tilesets/plateau.png | Bin 0 -> 1011 bytes gfx/tilesets/plateau.t10.png | Bin 1011 -> 0 bytes gfx/tilesets/reds_house.png | Bin 0 -> 845 bytes gfx/tilesets/reds_house.t7.png | Bin 845 -> 0 bytes gfx/tilesets/ship.png | Bin 0 -> 865 bytes gfx/tilesets/ship.t6.png | Bin 865 -> 0 bytes gfx/tilesets/ship_port.png | Bin 0 -> 1125 bytes gfx/tilesets/ship_port.t2.png | Bin 1125 -> 0 bytes gfx/tilesets/underground.png | Bin 0 -> 272 bytes gfx/tilesets/underground.t7.png | Bin 272 -> 0 bytes main.asm | 33 +-- tools/.gitignore | 3 + tools/Makefile | 16 ++ tools/common.h | 40 ++++ tools/gfx.c | 296 ++++++++++++++++++++++++++ tools/pkmncompress.c | 451 ++++++++++++++++++++++++++++++++++++++++ tools/scan_includes.c | 135 ++++++++++++ 56 files changed, 1006 insertions(+), 40 deletions(-) delete mode 100644 gfx/blue/intro_purin_1.6x6.png create mode 100644 gfx/blue/intro_purin_1.png delete mode 100644 gfx/blue/intro_purin_2.6x6.png create mode 100644 gfx/blue/intro_purin_2.png delete mode 100644 gfx/blue/intro_purin_3.6x6.png create mode 100644 gfx/blue/intro_purin_3.png delete mode 100644 gfx/game_boy.norepeat.png create mode 100644 gfx/game_boy.png delete mode 100644 gfx/red/intro_nido_1.6x6.png create mode 100644 gfx/red/intro_nido_1.png delete mode 100644 gfx/red/intro_nido_2.6x6.png create mode 100644 gfx/red/intro_nido_2.png delete mode 100644 gfx/red/intro_nido_3.6x6.png create mode 100644 gfx/red/intro_nido_3.png delete mode 100644 gfx/theend.interleave.png create mode 100644 gfx/theend.png create mode 100644 gfx/tilesets/cavern.png delete mode 100644 gfx/tilesets/cavern.t14.png create mode 100644 gfx/tilesets/cemetery.png delete mode 100644 gfx/tilesets/cemetery.t4.png create mode 100644 gfx/tilesets/club.png delete mode 100644 gfx/tilesets/club.t5.png create mode 100644 gfx/tilesets/gate.png delete mode 100644 gfx/tilesets/gate.t1.png create mode 100644 gfx/tilesets/house.png delete mode 100644 gfx/tilesets/house.t2.png create mode 100644 gfx/tilesets/interior.png delete mode 100644 gfx/tilesets/interior.t1.png create mode 100644 gfx/tilesets/lab.png delete mode 100644 gfx/tilesets/lab.t4.png create mode 100644 gfx/tilesets/lobby.png delete mode 100644 gfx/tilesets/lobby.t2.png create mode 100644 gfx/tilesets/mansion.png delete mode 100644 gfx/tilesets/mansion.t2.png create mode 100644 gfx/tilesets/overworld.png delete mode 100644 gfx/tilesets/overworld.t2.png create mode 100644 gfx/tilesets/plateau.png delete mode 100644 gfx/tilesets/plateau.t10.png create mode 100644 gfx/tilesets/reds_house.png delete mode 100644 gfx/tilesets/reds_house.t7.png create mode 100644 gfx/tilesets/ship.png delete mode 100644 gfx/tilesets/ship.t6.png create mode 100644 gfx/tilesets/ship_port.png delete mode 100644 gfx/tilesets/ship_port.t2.png create mode 100644 gfx/tilesets/underground.png delete mode 100644 gfx/tilesets/underground.t7.png create mode 100644 tools/.gitignore create mode 100644 tools/Makefile create mode 100644 tools/common.h create mode 100644 tools/gfx.c create mode 100644 tools/pkmncompress.c create mode 100644 tools/scan_includes.c diff --git a/Makefile b/Makefile index d0d3c011..8c1a500c 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,13 @@ -PYTHON := python -MD5 := md5sum -c --quiet - -2bpp := $(PYTHON) extras/pokemontools/gfx.py 2bpp -1bpp := $(PYTHON) extras/pokemontools/gfx.py 1bpp -pic := $(PYTHON) extras/pokemontools/pic.py compress -includes := $(PYTHON) extras/pokemontools/scan_includes.py +MD5 := md5sum -c pokered_obj := audio_red.o main_red.o text_red.o wram_red.o pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o .SUFFIXES: -.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic .SECONDEXPANSION: -# Suppress annoying intermediate file deletion messages. -.PRECIOUS: %.2bpp -.PHONY: all clean red blue compare +.PRECIOUS: +.SECONDARY: +.PHONY: all clean red blue compare tools roms := pokered.gbc pokeblue.gbc @@ -29,14 +22,26 @@ compare: red blue clean: rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + + #$(MAKE) clean -C tools/ + +tools: + $(MAKE) -C tools/ + + +# Build tools when building the rom. +# This has to happen before the rules are processed, since that's when scan_includes is run. +ifeq (,$(filter clean tools,$(MAKECMDGOALS))) +$(info $(shell $(MAKE) -C tools)) +endif + %.asm: ; -%_red.o: dep = $(shell $(includes) $(@D)/$*.asm) +%_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) $(pokered_obj): %_red.o: %.asm $$(dep) rgbasm -D _RED -h -o $@ $*.asm -%_blue.o: dep = $(shell $(includes) $(@D)/$*.asm) +%_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) $(pokeblue_obj): %_blue.o: %.asm $$(dep) rgbasm -D _BLUE -h -o $@ $*.asm @@ -48,7 +53,26 @@ pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" rgbfix $($*_opt) $@ sort $*.sym -o $*.sym -%.png: ; -%.2bpp: %.png ; @$(2bpp) $< -%.1bpp: %.png ; @$(1bpp) $< -%.pic: %.2bpp ; @$(pic) $< +gfx/blue/intro_purin_1.2bpp: rgbgfx += -h +gfx/blue/intro_purin_2.2bpp: rgbgfx += -h +gfx/blue/intro_purin_3.2bpp: rgbgfx += -h +gfx/red/intro_nido_1.2bpp: rgbgfx += -h +gfx/red/intro_nido_2.2bpp: rgbgfx += -h +gfx/red/intro_nido_3.2bpp: rgbgfx += -h + +gfx/game_boy.2bpp: tools/gfx += --remove-duplicates +gfx/theend.2bpp: tools/gfx += --interleave --png=$< +gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace + +%.png: ; + +%.2bpp: %.png + rgbgfx $(rgbgfx) -o $@ $< + $(if $(tools/gfx),\ + tools/gfx $(tools/gfx) -o $@ $@) +%.1bpp: %.png + rgbgfx -d1 $(rgbgfx) -o $@ $< + $(if $(tools/gfx),\ + tools/gfx $(tools/gfx) -d1 -o $@ $@) +%.pic: %.2bpp + tools/pkmncompress $< $@ diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index fb196486..7e08631c 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -266,5 +266,5 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" TheEndGfx: - INCBIN "gfx/theend.interleave.2bpp" + INCBIN "gfx/theend.2bpp" TheEndGfxEnd: diff --git a/engine/intro.asm b/engine/intro.asm index ed532681..422bcf7a 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -443,14 +443,14 @@ FightIntroBackMonEnd: FightIntroFrontMon: IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.6x6.2bpp" - INCBIN "gfx/red/intro_nido_2.6x6.2bpp" - INCBIN "gfx/red/intro_nido_3.6x6.2bpp" + INCBIN "gfx/red/intro_nido_1.2bpp" + INCBIN "gfx/red/intro_nido_2.2bpp" + INCBIN "gfx/red/intro_nido_3.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_2.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_3.6x6.2bpp" + INCBIN "gfx/blue/intro_purin_1.2bpp" + INCBIN "gfx/blue/intro_purin_2.2bpp" + INCBIN "gfx/blue/intro_purin_3.2bpp" ENDC FightIntroFrontMonEnd: diff --git a/gfx/blue/intro_purin_1.6x6.png b/gfx/blue/intro_purin_1.6x6.png deleted file mode 100644 index 0e53582c..00000000 Binary files a/gfx/blue/intro_purin_1.6x6.png and /dev/null differ diff --git a/gfx/blue/intro_purin_1.png b/gfx/blue/intro_purin_1.png new file mode 100644 index 00000000..0e53582c Binary files /dev/null and b/gfx/blue/intro_purin_1.png differ diff --git a/gfx/blue/intro_purin_2.6x6.png b/gfx/blue/intro_purin_2.6x6.png deleted file mode 100644 index 21107af0..00000000 Binary files a/gfx/blue/intro_purin_2.6x6.png and /dev/null differ diff --git a/gfx/blue/intro_purin_2.png b/gfx/blue/intro_purin_2.png new file mode 100644 index 00000000..21107af0 Binary files /dev/null and b/gfx/blue/intro_purin_2.png differ diff --git a/gfx/blue/intro_purin_3.6x6.png b/gfx/blue/intro_purin_3.6x6.png deleted file mode 100644 index 1c30a0e8..00000000 Binary files a/gfx/blue/intro_purin_3.6x6.png and /dev/null differ diff --git a/gfx/blue/intro_purin_3.png b/gfx/blue/intro_purin_3.png new file mode 100644 index 00000000..1c30a0e8 Binary files /dev/null and b/gfx/blue/intro_purin_3.png differ diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png deleted file mode 100644 index 62144956..00000000 Binary files a/gfx/game_boy.norepeat.png and /dev/null differ diff --git a/gfx/game_boy.png b/gfx/game_boy.png new file mode 100644 index 00000000..62144956 Binary files /dev/null and b/gfx/game_boy.png differ diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.6x6.png deleted file mode 100644 index 4c7804a1..00000000 Binary files a/gfx/red/intro_nido_1.6x6.png and /dev/null differ diff --git a/gfx/red/intro_nido_1.png b/gfx/red/intro_nido_1.png new file mode 100644 index 00000000..4c7804a1 Binary files /dev/null and b/gfx/red/intro_nido_1.png differ diff --git a/gfx/red/intro_nido_2.6x6.png b/gfx/red/intro_nido_2.6x6.png deleted file mode 100644 index a29a4814..00000000 Binary files a/gfx/red/intro_nido_2.6x6.png and /dev/null differ diff --git a/gfx/red/intro_nido_2.png b/gfx/red/intro_nido_2.png new file mode 100644 index 00000000..a29a4814 Binary files /dev/null and b/gfx/red/intro_nido_2.png differ diff --git a/gfx/red/intro_nido_3.6x6.png b/gfx/red/intro_nido_3.6x6.png deleted file mode 100644 index e920d55d..00000000 Binary files a/gfx/red/intro_nido_3.6x6.png and /dev/null differ diff --git a/gfx/red/intro_nido_3.png b/gfx/red/intro_nido_3.png new file mode 100644 index 00000000..e920d55d Binary files /dev/null and b/gfx/red/intro_nido_3.png differ diff --git a/gfx/theend.interleave.png b/gfx/theend.interleave.png deleted file mode 100644 index 025ebb61..00000000 Binary files a/gfx/theend.interleave.png and /dev/null differ diff --git a/gfx/theend.png b/gfx/theend.png new file mode 100644 index 00000000..025ebb61 Binary files /dev/null and b/gfx/theend.png differ diff --git a/gfx/tilesets/cavern.png b/gfx/tilesets/cavern.png new file mode 100644 index 00000000..5397fd65 Binary files /dev/null and b/gfx/tilesets/cavern.png differ diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.t14.png deleted file mode 100644 index 5397fd65..00000000 Binary files a/gfx/tilesets/cavern.t14.png and /dev/null differ diff --git a/gfx/tilesets/cemetery.png b/gfx/tilesets/cemetery.png new file mode 100644 index 00000000..b1df015a Binary files /dev/null and b/gfx/tilesets/cemetery.png differ diff --git a/gfx/tilesets/cemetery.t4.png b/gfx/tilesets/cemetery.t4.png deleted file mode 100644 index b1df015a..00000000 Binary files a/gfx/tilesets/cemetery.t4.png and /dev/null differ diff --git a/gfx/tilesets/club.png b/gfx/tilesets/club.png new file mode 100644 index 00000000..05a55879 Binary files /dev/null and b/gfx/tilesets/club.png differ diff --git a/gfx/tilesets/club.t5.png b/gfx/tilesets/club.t5.png deleted file mode 100644 index 05a55879..00000000 Binary files a/gfx/tilesets/club.t5.png and /dev/null differ diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png new file mode 100644 index 00000000..372e6751 Binary files /dev/null and b/gfx/tilesets/gate.png differ diff --git a/gfx/tilesets/gate.t1.png b/gfx/tilesets/gate.t1.png deleted file mode 100644 index 372e6751..00000000 Binary files a/gfx/tilesets/gate.t1.png and /dev/null differ diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png new file mode 100644 index 00000000..b5d67c95 Binary files /dev/null and b/gfx/tilesets/house.png differ diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png deleted file mode 100644 index b5d67c95..00000000 Binary files a/gfx/tilesets/house.t2.png and /dev/null differ diff --git a/gfx/tilesets/interior.png b/gfx/tilesets/interior.png new file mode 100644 index 00000000..3123d81c Binary files /dev/null and b/gfx/tilesets/interior.png differ diff --git a/gfx/tilesets/interior.t1.png b/gfx/tilesets/interior.t1.png deleted file mode 100644 index 3123d81c..00000000 Binary files a/gfx/tilesets/interior.t1.png and /dev/null differ diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png new file mode 100644 index 00000000..4a114337 Binary files /dev/null and b/gfx/tilesets/lab.png differ diff --git a/gfx/tilesets/lab.t4.png b/gfx/tilesets/lab.t4.png deleted file mode 100644 index 4a114337..00000000 Binary files a/gfx/tilesets/lab.t4.png and /dev/null differ diff --git a/gfx/tilesets/lobby.png b/gfx/tilesets/lobby.png new file mode 100644 index 00000000..f2a1c180 Binary files /dev/null and b/gfx/tilesets/lobby.png differ diff --git a/gfx/tilesets/lobby.t2.png b/gfx/tilesets/lobby.t2.png deleted file mode 100644 index f2a1c180..00000000 Binary files a/gfx/tilesets/lobby.t2.png and /dev/null differ diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png new file mode 100644 index 00000000..557c23b4 Binary files /dev/null and b/gfx/tilesets/mansion.png differ diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.t2.png deleted file mode 100644 index 557c23b4..00000000 Binary files a/gfx/tilesets/mansion.t2.png and /dev/null differ diff --git a/gfx/tilesets/overworld.png b/gfx/tilesets/overworld.png new file mode 100644 index 00000000..c7533e40 Binary files /dev/null and b/gfx/tilesets/overworld.png differ diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.t2.png deleted file mode 100644 index c7533e40..00000000 Binary files a/gfx/tilesets/overworld.t2.png and /dev/null differ diff --git a/gfx/tilesets/plateau.png b/gfx/tilesets/plateau.png new file mode 100644 index 00000000..b87162d8 Binary files /dev/null and b/gfx/tilesets/plateau.png differ diff --git a/gfx/tilesets/plateau.t10.png b/gfx/tilesets/plateau.t10.png deleted file mode 100644 index b87162d8..00000000 Binary files a/gfx/tilesets/plateau.t10.png and /dev/null differ diff --git a/gfx/tilesets/reds_house.png b/gfx/tilesets/reds_house.png new file mode 100644 index 00000000..5f210d04 Binary files /dev/null and b/gfx/tilesets/reds_house.png differ diff --git a/gfx/tilesets/reds_house.t7.png b/gfx/tilesets/reds_house.t7.png deleted file mode 100644 index 5f210d04..00000000 Binary files a/gfx/tilesets/reds_house.t7.png and /dev/null differ diff --git a/gfx/tilesets/ship.png b/gfx/tilesets/ship.png new file mode 100644 index 00000000..cf5b6b95 Binary files /dev/null and b/gfx/tilesets/ship.png differ diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.t6.png deleted file mode 100644 index cf5b6b95..00000000 Binary files a/gfx/tilesets/ship.t6.png and /dev/null differ diff --git a/gfx/tilesets/ship_port.png b/gfx/tilesets/ship_port.png new file mode 100644 index 00000000..fa5bbb27 Binary files /dev/null and b/gfx/tilesets/ship_port.png differ diff --git a/gfx/tilesets/ship_port.t2.png b/gfx/tilesets/ship_port.t2.png deleted file mode 100644 index fa5bbb27..00000000 Binary files a/gfx/tilesets/ship_port.t2.png and /dev/null differ diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png new file mode 100644 index 00000000..baa86c17 Binary files /dev/null and b/gfx/tilesets/underground.png differ diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.t7.png deleted file mode 100644 index baa86c17..00000000 Binary files a/gfx/tilesets/underground.t7.png and /dev/null differ diff --git a/main.asm b/main.asm index 041479d9..065700da 100755 --- a/main.asm +++ b/main.asm @@ -895,7 +895,7 @@ INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" TradingAnimationGraphics: -INCBIN "gfx/game_boy.norepeat.2bpp" +INCBIN "gfx/game_boy.2bpp" INCBIN "gfx/link_cable.2bpp" TradingAnimationGraphicsEnd: @@ -1846,23 +1846,24 @@ INCLUDE "engine/hidden_object_functions18.asm" SECTION "bank19",ROMX,BANK[$19] -Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp" +Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" RedsHouse1_GFX: -RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.t7.2bpp" +RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.2bpp" + ds 16 RedsHouse1_Block: RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst" -House_GFX: INCBIN "gfx/tilesets/house.t2.2bpp" +House_GFX: INCBIN "gfx/tilesets/house.2bpp" House_Block: INCBIN "gfx/blocksets/house.bst" -Mansion_GFX: INCBIN "gfx/tilesets/mansion.t2.2bpp" +Mansion_GFX: INCBIN "gfx/tilesets/mansion.2bpp" Mansion_Block: INCBIN "gfx/blocksets/mansion.bst" -ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.t2.2bpp" +ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.2bpp" ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst" -Interior_GFX: INCBIN "gfx/tilesets/interior.t1.2bpp" +Interior_GFX: INCBIN "gfx/tilesets/interior.2bpp" Interior_Block: INCBIN "gfx/blocksets/interior.bst" -Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" +Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" @@ -1891,7 +1892,7 @@ Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst" ForestGate_GFX: Museum_GFX: -Gate_GFX: INCBIN "gfx/tilesets/gate.t1.2bpp" +Gate_GFX: INCBIN "gfx/tilesets/gate.2bpp" ForestGate_Block: Museum_Block: Gate_Block: INCBIN "gfx/blocksets/gate.bst" @@ -1904,19 +1905,19 @@ Facility_Block: INCBIN "gfx/blocksets/facility.bst" SECTION "bank1B",ROMX,BANK[$1B] -Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" +Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" -Cavern_GFX: INCBIN "gfx/tilesets/cavern.t14.2bpp" +Cavern_GFX: INCBIN "gfx/tilesets/cavern.2bpp" Cavern_Block: INCBIN "gfx/blocksets/cavern.bst" -Lobby_GFX: INCBIN "gfx/tilesets/lobby.t2.2bpp" +Lobby_GFX: INCBIN "gfx/tilesets/lobby.2bpp" Lobby_Block: INCBIN "gfx/blocksets/lobby.bst" -Ship_GFX: INCBIN "gfx/tilesets/ship.t6.2bpp" +Ship_GFX: INCBIN "gfx/tilesets/ship.2bpp" Ship_Block: INCBIN "gfx/blocksets/ship.bst" -Lab_GFX: INCBIN "gfx/tilesets/lab.t4.2bpp" +Lab_GFX: INCBIN "gfx/tilesets/lab.2bpp" Lab_Block: INCBIN "gfx/blocksets/lab.bst" -Club_GFX: INCBIN "gfx/tilesets/club.t5.2bpp" +Club_GFX: INCBIN "gfx/tilesets/club.2bpp" Club_Block: INCBIN "gfx/blocksets/club.bst" -Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" +Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..967af106 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,3 @@ +scan_includes +gfx +pkmncompress diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 00000000..13bab1fb --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,16 @@ +.PHONY: all clean + +CC := gcc +CFLAGS := -O3 -std=c99 -Wall -Wextra + +tools := scan_includes gfx pkmncompress + +all: $(tools) + @: + +clean: + rm -f $(tools) + +gfx: common.h +%: %.c + $(CC) $(CFLAGS) -o $@ $< diff --git a/tools/common.h b/tools/common.h new file mode 100644 index 00000000..4da0b2ef --- /dev/null +++ b/tools/common.h @@ -0,0 +1,40 @@ +#ifndef GUARD_COMMON_H +#define GUARD_COMMON_H + +int __getopt_long_i__; +#define getopt_long(c, v, s, l) getopt_long(c, v, s, l, &__getopt_long_i__) + +FILE *fopen_verbose(char *filename, char *mode) { + FILE *f = fopen(filename, mode); + if (!f) { + fprintf(stderr, "Could not open file: \"%s\"\n", filename); + } + return f; +} + +uint8_t *read_u8(char *filename, int *size) { + FILE *f = fopen_verbose(filename, "rb"); + if (!f) { + exit(1); + } + fseek(f, 0, SEEK_END); + *size = ftell(f); + rewind(f); + uint8_t *data = malloc(*size); + if (*size != (int)fread(data, 1, *size, f)) { + fprintf(stderr, "Could not read file: \"%s\"\n", filename); + exit(1); + } + fclose(f); + return data; +} + +void write_u8(char *filename, uint8_t *data, int size) { + FILE *f = fopen_verbose(filename, "wb"); + if (f) { + fwrite(data, 1, size, f); + fclose(f); + } +} + +#endif // GUARD_COMMON_H diff --git a/tools/gfx.c b/tools/gfx.c new file mode 100644 index 00000000..8c4066ab --- /dev/null +++ b/tools/gfx.c @@ -0,0 +1,296 @@ +#include +#include +#include +#include +#include +#include + +#include "common.h" + +static void usage(void) { + fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--png filename] [-d depth] [-h] [-o outfile] infile\n"); +} + +static void error(char *message) { + fputs(message, stderr); + fputs("\n", stderr); +} + +struct Options { + int trim_whitespace; + int remove_whitespace; + int help; + char *outfile; + int depth; + int interleave; + int remove_duplicates; + int keep_whitespace; + int remove_xflip; + int remove_yflip; + char *png_file; +}; + +struct Options Options = { + .depth = 2, +}; + +void get_args(int argc, char *argv[]) { + struct option long_options[] = { + {"remove-whitespace", no_argument, &Options.remove_whitespace, 1}, + {"trim-whitespace", no_argument, &Options.trim_whitespace, 1}, + {"interleave", no_argument, &Options.interleave, 1}, + {"remove-duplicates", no_argument, &Options.remove_duplicates, 1}, + {"keep-whitespace", no_argument, &Options.keep_whitespace, 1}, + {"remove-xflip", no_argument, &Options.remove_xflip, 1}, + {"remove-yflip", no_argument, &Options.remove_yflip, 1}, + {"png", required_argument, 0, 'p'}, + {"depth", required_argument, 0, 'd'}, + {"help", no_argument, 0, 'h'}, + {0} + }; + for (int opt = 0; opt != -1;) { + switch (opt = getopt_long(argc, argv, "ho:d:p:", long_options)) { + case 'h': + Options.help = true; + break; + case 'o': + Options.outfile = optarg; + break; + case 'd': + Options.depth = strtoul(optarg, NULL, 0); + break; + case 'p': + Options.png_file = optarg; + break; + case 0: + case -1: + break; + default: + usage(); + exit(1); + break; + } + } +} + +struct Graphic { + int size; + uint8_t *data; +}; + +bool is_whitespace(uint8_t *tile, int tile_size) { + uint8_t WHITESPACE = 0; + for (int i = 0; i < tile_size; i++) { + if (tile[i] != WHITESPACE) { + return false; + } + } + return true; +} + +void trim_whitespace(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + for (int i = graphic->size - tile_size; i > 0; i -= tile_size) { + if (is_whitespace(&graphic->data[i], tile_size)) { + graphic->size = i; + } else { + break; + } + } +} + +void remove_whitespace(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int i = 0; + for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (is_whitespace(&graphic->data[j], tile_size)) { + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + } + graphic->size = i; +} + +bool tile_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) { + for (int i = 0; i < num_tiles; i++) { + bool match = true; + for (int j = 0; j < tile_size; j++) { + if (tile[j] != tiles[i * tile_size + j]) { + match = false; + } + } + if (match) { + return true; + } + } + return false; +} + +void remove_duplicates(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int num_tiles = 0; + for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { + if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + break; + } + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + num_tiles++; + } + graphic->size = num_tiles * tile_size; +} + +bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) { + uint8_t *flip = calloc(tile_size, 1); + int half_size = tile_size / 2; + for (int i = 0; i < tile_size; i++) { + int byte = i; + if (yflip) { + byte = tile_size - 1 - (i ^ 1); + if (Options.interleave && i < half_size) { + byte = half_size - 1 - (i ^ 1); + } + } + if (xflip) { + for (int bit = 0; bit < 8; bit++) { + flip[byte] |= ((tile[i] >> bit) & 1) << (7 - bit); + } + } else { + flip[byte] = tile[i]; + } + } + if (tile_exists(flip, tiles, tile_size, num_tiles)) { + return true; + } + return false; +} + +void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int num_tiles = 0; + for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { + if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + break; + } + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + num_tiles++; + } + graphic->size = num_tiles * tile_size; +} + +void interleave(struct Graphic *graphic, int width) { + int tile_size = Options.depth * 8; + int width_tiles = width / 8; + int num_tiles = graphic->size / tile_size; + uint8_t *interleaved = malloc(graphic->size); + for (int i = 0; i < num_tiles; i++) { + int tile = i * 2; + int row = i / width_tiles; + tile -= width_tiles * row; + if (row % 2) { + tile -= width_tiles; + tile += 1; + } + memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size); + } + graphic->size = num_tiles * tile_size; + memcpy(graphic->data, interleaved, graphic->size); + free(interleaved); +} + +int png_get_width(char *filename) { + FILE *f = fopen_verbose(filename, "rb"); + if (!f) { + exit(1); + } + + const int OFFSET_WIDTH = 16; + uint8_t bytes[4]; + fseek(f, OFFSET_WIDTH, SEEK_SET); + size_t size = 4; + size_t result = fread(bytes, 1, size, f); + fclose(f); + if (result != size) { + fprintf(stderr, "Could not read file at offset 0x%x: \"%s\"\n", OFFSET_WIDTH, filename); + exit(1); + } + + int width = 0; + for (int i = 0; i < 4; i++) { + width |= bytes[i] << (8 * (3 - i)); + } + return width; +} + + +int main(int argc, char *argv[]) { + get_args(argc, argv); + argc -= optind; + argv += optind; + if (Options.help) { + usage(); + return 0; + } + if (argc < 1) { + usage(); + exit(1); + } + char *infile = argv[0]; + struct Graphic graphic; + graphic.data = read_u8(infile, &graphic.size); + if (Options.trim_whitespace) { + trim_whitespace(&graphic); + } + if (Options.interleave) { + if (!Options.png_file) { + error("interleave: need --png to infer dimensions"); + usage(); + exit(1); + } + int width = png_get_width(Options.png_file); + interleave(&graphic, width); + } + if (Options.remove_duplicates) { + remove_duplicates(&graphic); + } + if (Options.remove_xflip) { + remove_flip(&graphic, true, false); + } + if (Options.remove_yflip) { + remove_flip(&graphic, false, true); + } + if (Options.remove_xflip && Options.remove_yflip) { + remove_flip(&graphic, true, true); + } + if (Options.remove_whitespace) { + remove_whitespace(&graphic); + } + if (Options.outfile) { + write_u8(Options.outfile, graphic.data, graphic.size); + } + free(graphic.data); + return 0; +} diff --git a/tools/pkmncompress.c b/tools/pkmncompress.c new file mode 100644 index 00000000..db707653 --- /dev/null +++ b/tools/pkmncompress.c @@ -0,0 +1,451 @@ +/* + * Copyright © 2013 stag019 + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include +#include + +typedef uint8_t u8; + +u8 *compressed = NULL; +int xrows = 0; +int xwidth = 0; +int curbit = 0; +int curbyte = 0; + +void writebit(int bit) +{ + if (++curbit == 8) + { + curbyte++; + curbit = 0; + } + compressed[curbyte] |= bit << (7 - curbit); +} + +void method_1(u8 *RAM) +{ + int i; + int j; + int nibble_1; + int nibble_2 = 0; + int code_1; + int code_2; + int table; + static int method_1[2][0x10] = { + {0x0, 0x1, 0x3, 0x2, 0x6, 0x7, 0x5, 0x4, 0xC, 0xD, 0xF, 0xE, 0xA, 0xB, 0x9, 0x8}, + {0x8, 0x9, 0xB, 0xA, 0xE, 0xF, 0xD, 0xC, 0x4, 0x5, 0x7, 0x6, 0x2, 0x3, 0x1, 0x0} + }; + + for (i = 0; i < xrows * xwidth * 8; i++) + { + j = i / xrows; + j += i % xrows * xwidth * 8; + if (!(i % xrows)) + { + nibble_2 = 0; + } + nibble_1 = (RAM[j] >> 4) & 0x0F; + table = 0; + if (nibble_2 & 1) + { + table = 1; + } + code_1 = method_1[table][nibble_1]; + nibble_2 = RAM[j] & 0x0F; + table = 0; + if (nibble_1 & 1) + { + table = 1; + } + code_2 = method_1[table][nibble_2]; + RAM[j] = (code_1 << 4) | code_2; + } +} + +// "Get the previous power of 2. Deriving the bitcount from that seems to be faster on average than using the lookup table." +void RLE(int nums) +{ + int v; + int j; + int bitcount; + int number; + + bitcount = -1; + v = ++nums; + v++; + v |= v >> 1; + v |= v >> 2; + v |= v >> 4; + v |= v >> 8; + v |= v >> 16; + v -= v >> 1; + v--; + + number = nums - v; + while(v) { + v >>= 1; + bitcount++; + } + for(j = 0; j < bitcount; j++) { + writebit(1); + } + writebit(0); + for(j = bitcount; j >= 0; j--) { + writebit((number >> j) & 1); + } +} + +void RLE_old(int nums) +{ + int search; + int i; + int j; + int bitcount; + int number; + static int RLE[0x10] = {0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF}; + + bitcount = -1; + search = ++nums; + while (search > 0) + { + for (i = 0; i < 0xF; i++) + { + if (RLE[i] == search) + { + bitcount = i; + break; + } + } + if (bitcount != -1) + { + break; + } + search--; + } + number = nums - RLE[bitcount]; + for (j = 0; j < bitcount; j++) + { + writebit(1); + } + writebit(0); + for (j = bitcount; j >= 0; j--) + { + writebit((number >> j) & 1); + } +} + +void data_packet(u8 *bitgroups, int bgi) +{ + int i; + for (i = 0; i < bgi; i++) + { + writebit((bitgroups[i] >> 1) & 1); + writebit(bitgroups[i] & 1); + } +} + +int interpret_compress(u8 *RAM_1, u8 *RAM_2, int interpretation, int switchram) +{ + u8 *_1_RAM; + u8 *_2_RAM; + int i; + int ram; + int type; + int nums; + u8 *bitgroups; + int x; + int y; + int byte; + int bit; + int bitgroup; + int bgi = 0; + + int ram_size = xrows * xwidth * 8; + _1_RAM = (u8 *)calloc(ram_size, 1); + _2_RAM = (u8 *)calloc(ram_size, 1); + if (switchram) + { + memcpy(_1_RAM, RAM_2, ram_size); + memcpy(_2_RAM, RAM_1, ram_size); + } + else + { + memcpy(_1_RAM, RAM_1, ram_size); + memcpy(_2_RAM, RAM_2, ram_size); + } + + switch(interpretation) + { + case 1: + method_1(_1_RAM); + method_1(_2_RAM); + break; + case 2: + case 3: + for (i = 0; i < xrows * xwidth * 8; i++) + { + _2_RAM[i] ^= _1_RAM[i]; + } + method_1(_1_RAM); + break; + } + if (interpretation == 3) + { + method_1(_2_RAM); + } + + curbit = 7; + curbyte = 0; + compressed = (u8 *)calloc(0x310, 1); + compressed[0] = (xrows << 4) | xwidth; + writebit(switchram); + + for (ram = 0; ram < 2; ram++) + { + type = 0; + nums = 0; + bitgroups = (u8 *)calloc(0x1000, 1); + + for (x = 0; x < xwidth; x++) + { + for (bit = 0; bit < 8; bit += 2) + { + byte = x * xrows * 8; + for (y=0; y < xrows * 8; y++) + { + if (ram) + { + bitgroup = (_2_RAM[byte] >> (6 - bit)) & 3; + } + else + { + bitgroup = (_1_RAM[byte] >> (6 - bit)) & 3; + } + if (!bitgroup) + { + if (!type) + { + writebit(0); + } + else if (type == 1) + { + nums++; + } + else + { + data_packet(bitgroups, bgi); + writebit(0); + writebit(0); + } + type = 1; + free(bitgroups); + bitgroups = (u8 *)calloc(0x1000, 1); + bgi = 0; + } + else + { + if (!type) + { + writebit(1); + } + else if (type == 1) + { + RLE(nums); + } + type = -1; + bitgroups[bgi++] = bitgroup; + nums = 0; + } + byte++; + } + } + } + if (type == 1) + { + RLE(nums); + } + else + { + data_packet(bitgroups, bgi); + } + if (!ram) + { + if (interpretation < 2) + { + writebit(0); + } + else + { + writebit(1); + writebit(interpretation - 2); + } + } + } + free(bitgroups); + free(_1_RAM); + free(_2_RAM); + return (curbyte + 1) * 8 + curbit; +} + +int compress(u8 *data, int width, int height) +{ + u8 *RAM_1; + u8 *RAM_2; + int i; + int mode; + int order; + int newsize; + int compressedsize; + int size = -1; + u8 *current = NULL; + int ram_size; + + xrows = height; + xwidth = width; + + ram_size = xrows * xwidth * 8; + + RAM_1 = (u8 *)calloc(ram_size, 1); + RAM_2 = (u8 *)calloc(ram_size, 1); + + for (i = 0; i < xrows * xwidth * 8; i++) + { + RAM_1[i] = data[(i << 1)]; + RAM_2[i] = data[(i << 1) | 1]; + } + + for (mode = 1; mode < 4; mode++) + { + for (order = 0; order < 2; order++) + { + if (!(mode == 1 && order == 0)) + { + newsize = interpret_compress(RAM_1, RAM_2, mode, order); + if (size == -1 || newsize < size) + { + if (current != NULL) + { + free(current); + } + current = (u8 *)calloc(0x310, 1); + memcpy(current, compressed, newsize / 8); + free(compressed); + size = newsize; + } + } + } + } + compressed = (u8 *)calloc(0x310, 1); + compressedsize = size / 8; + memcpy(compressed, current, compressedsize); + free(current); + + free(RAM_1); + free(RAM_2); + + return compressedsize; +} + +uint8_t *transpose_tiles(uint8_t *data, int width, int height) +{ + int i; + int j; + int tile_size = 0x10; + + int size = width * height * tile_size; + u8 *transposed = calloc(size, 1); + for (i = 0; i < size; i++) + { + j = (i / 0x10) * width * 0x10; + j = (j % size) + 0x10 * (j / size) + (i % 0x10); + transposed[j] = data[i]; + } + + free(data); + + return transposed; +} + +int main(int argc, char *argv[]) +{ + int width = 0; + int height = 0; + int transpose = 1; + + if (argc != 3) + { + fputs("Usage: pkmncompress infile.2bpp outfile.pic\n", stderr); + return EXIT_FAILURE; + } + + char *infile = argv[1]; + char *outfile = argv[2]; + + FILE *f = fopen(infile, "rb"); + if (!f) { + fprintf(stderr, "failed to open for reading: '%s'\n", infile); + return EXIT_FAILURE; + } + fseek(f, 0, SEEK_END); + int filesize = ftell(f); + + for (int i = 0; i < 32; i++) { + width = i; + height = i; + if (width * height * 16 >= filesize) { + break; + } + } + if (width * height * 16 < filesize) { + fprintf(stderr, "file too big: '%s' (%x)\n", infile, filesize); + return EXIT_FAILURE; + } + if (width * height * 16 > filesize) { + fprintf(stderr, "wrong filesize for '%s' (%x). must be a square image of 16-byte tiles\n", infile, filesize); + return EXIT_FAILURE; + } + + u8 *data = (u8 *)calloc(filesize, 1); + fseek(f, 0, SEEK_SET); + int size = fread(data, 1, filesize, f); + fclose(f); + if (size != filesize) { + fprintf(stderr, "failed to read: '%s'\n", infile); + return EXIT_FAILURE; + } + + if (transpose) { + data = transpose_tiles(data, width, height); + } + + int compressed_size = compress(data, width, height); + + free(data); + + f = fopen(outfile, "wb"); + if (!f) { + fprintf(stderr, "failed to open for writing: '%s'\n", outfile); + return EXIT_FAILURE; + } + fwrite(compressed, 1, compressed_size, f); + fclose(f); + + free(compressed); + + return EXIT_SUCCESS; +} diff --git a/tools/scan_includes.c b/tools/scan_includes.c new file mode 100644 index 00000000..63af3bcf --- /dev/null +++ b/tools/scan_includes.c @@ -0,0 +1,135 @@ +#include +#include +#include +#include +#include + +void usage(void) { + printf("Usage: scan_includes [-h] [-s] filename\n" + "-h, --help\n" + " Print usage and exit\n" + "-s, --strict\n" + " Fail if a file cannot be read\n"); +} + +struct Options { + bool help; + bool strict; +}; + +struct Options Options = {0}; + +void scan_file(char* filename) { + FILE *f = fopen(filename, "rb"); + if (!f) { + if (Options.strict) { + fprintf(stderr, "Could not open file: '%s'\n", filename); + exit(1); + } else { + return; + } + } + + fseek(f, 0, SEEK_END); + long size = ftell(f); + rewind(f); + + char *buffer = malloc(size + 1); + char *orig = buffer; + size = fread(buffer, 1, size, f); + buffer[size] = '\0'; + fclose(f); + + for (; buffer && (buffer - orig < size); buffer++) { + bool is_include = false; + bool is_incbin = false; + switch (*buffer) { + case ';': + buffer = strchr(buffer, '\n'); + if (!buffer) { + fprintf(stderr, "%s: no newline at end of file\n", filename); + break; + } + break; + + case '"': + buffer++; + buffer = strchr(buffer, '"'); + if (!buffer) { + fprintf(stderr, "%s: unterminated string\n", filename); + break; + } + buffer++; + break; + + case 'i': + case 'I': + if ((strncmp(buffer, "INCBIN", 6) == 0) || (strncmp(buffer, "incbin", 6) == 0)) { + is_incbin = true; + } else if ((strncmp(buffer, "INCLUDE", 7) == 0) || (strncmp(buffer, "include", 7) == 0)) { + is_include = true; + } + if (is_incbin || is_include) { + buffer = strchr(buffer, '"'); + if (!buffer) { + break; + } + buffer++; + int length = strcspn(buffer, "\""); + char *include = malloc(length + 1); + strncpy(include, buffer, length); + include[length] = '\0'; + printf("%s ", include); + if (is_include) { + scan_file(include); + } + free(include); + buffer = strchr(buffer, '"'); + } + break; + + } + if (!buffer) { + break; + } + + } + + free(orig); +} + +int main(int argc, char* argv[]) { + int i = 0; + struct option long_options[] = { + {"strict", no_argument, 0, 's'}, + {"help", no_argument, 0, 'h'}, + {0} + }; + int opt = -1; + while ((opt = getopt_long(argc, argv, "sh", long_options, &i)) != -1) { + switch (opt) { + case 's': + Options.strict = true; + break; + case 'h': + Options.help = true; + break; + default: + usage(); + exit(1); + break; + } + } + argc -= optind; + argv += optind; + if (Options.help) { + usage(); + return 0; + } + if (argc < 1) { + usage(); + exit(1); + } + scan_file(argv[0]); + return 0; +} -- cgit v1.2.3 From 1aefbfa5230fe188417e52674f79a6d5b009a51e Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 10 Mar 2018 19:03:27 -0500 Subject: Python is no longer used to build. --- INSTALL.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index f31f22ee..c708a013 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,6 @@ # Linux - sudo apt-get install make git python + sudo apt-get install make git gcc sudo apt-get install byacc flex pkg-config libpng-dev git clone https://github.com/rednex/rgbds @@ -8,7 +8,7 @@ sudo make install cd .. - git clone --recursive https://github.com/pret/pokered + git clone https://github.com/pret/pokered cd pokered To build **pokered.gbc** and **pokeblue.gbc**: @@ -30,27 +30,31 @@ Then in **Terminal**, run: xcode-select --install brew install rgbds - git clone --recursive https://github.com/pret/pokered + git clone https://github.com/pret/pokered cd pokered +To build **pokered.gbc** and **pokeblue.gbc**: + make # Windows -To build on Windows, use [**Cygwin**](http://cygwin.com/install.html) (64-bit). Use the default settings. +Download [**Cygwin**](http://cygwin.com/install.html): **setup-x86_64.exe** for 64-bit Windows, **setup-x86.exe** for 32-bit. + +Run setup and leave the default settings. At "Select Packages", choose to install the following: -In the installer, select the following packages: - `make` - `git` -- `python` +- `gcc-core` -Then download [**rgbds**](https://github.com/bentley/rgbds/releases). -Extract the archive. Inside should be `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe`, `rgbgfx.exe` and some `.dll` files. Put each file in `C:\cygwin64\usr\local\bin\`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable. +Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.tar.gz** or **win32.tar.gz** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**. -In the **Cygwin terminal**: +In the **Cygwin terminal**, enter these commands: - git clone --recursive https://github.com/pret/pokered + git clone https://github.com/pret/pokered cd pokered +To build **pokered.gbc** and **pokeblue.gbc**: + make -- cgit v1.2.3 From edf2b05ac37a2bd9a820c24400b3db417f2f8927 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 10 Mar 2018 19:14:47 -0500 Subject: faster travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bbcb7721..d3cce374 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,6 @@ before_script: fi; } script: - - make + - make -j2 - make compare - check_status -- cgit v1.2.3 From 4768fed52d7379704ecd958f171ec0dc2d36efc0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 10 Mar 2018 19:18:35 -0500 Subject: forgot to uncomment clean tools --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8c1a500c..dd266f23 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ compare: red blue clean: rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + - #$(MAKE) clean -C tools/ + $(MAKE) clean -C tools/ tools: $(MAKE) -C tools/ -- cgit v1.2.3 From 8a8cbf12abb32de067930fa0f754ee36b82aff60 Mon Sep 17 00:00:00 2001 From: Eggy0 <37382715+Eggy0@users.noreply.github.com> Date: Fri, 16 Mar 2018 19:59:06 +0100 Subject: Changing macro names Changing the following macro names: unknownsfx0x20 to SquareSound - This command, when used in an .asm file that defines an audio piece, generates a square tone modulated by 4 values. unknownnoise0x20 to NoiseSound - This command is similar to SquareSound, but it uses 3 values instead of 4 and generates noise instead of a square tone. unknownsfx0x10 to eSquarePitchEnvelope - This command is not an unknown sound effect, but a modifier for the above two commands which it precedes; it takes one decimal value which is translated into a hexadecimal value when used by the system, and depending on the second digit of this hex value the sounds generated by SquareSound and NoiseSound will have their frequency slide either up (1-7) or down (9-F) or not at all (0,8). E.g. typing 23 will have the system read $17, which will modulate the frequency to slide up because the second digit is 7. --- macros/audio_macros.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 71304bf8..e8e36e01 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -30,19 +30,19 @@ audio: MACRO ENDC ENDM -unknownsfx0x10: MACRO +eSquarePitchEnvelope: MACRO db $10 db \1 ENDM -unknownsfx0x20: MACRO +SquareSound: MACRO db $20 | \1 db \2 db \3 db \4 ENDM -unknownnoise0x20: MACRO +NoiseSound: MACRO db $20 | \1 db \2 db \3 -- cgit v1.2.3 From 7266657010c4a4dad7d48cb0b04dd7406d6d5e10 Mon Sep 17 00:00:00 2001 From: Eggy0 <37382715+Eggy0@users.noreply.github.com> Date: Fri, 16 Mar 2018 20:07:57 +0100 Subject: Update audio_macros.asm --- macros/audio_macros.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index e8e36e01..6b318952 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -30,19 +30,19 @@ audio: MACRO ENDC ENDM -eSquarePitchEnvelope: MACRO +eSquarePitchEnvelope: MACRO ; this was originally unknownsfx0x10 db $10 db \1 ENDM -SquareSound: MACRO +SquareSound: MACRO ; this was originally unknownsfx0x20 db $20 | \1 db \2 db \3 db \4 ENDM -NoiseSound: MACRO +NoiseSound: MACRO ; this was originally unknownnoise0x20 db $20 | \1 db \2 db \3 -- cgit v1.2.3 From 5826f25bef74508e4017281c6bc3badd2c57d3fa Mon Sep 17 00:00:00 2001 From: Eggy0 Date: Fri, 16 Mar 2018 22:02:14 +0100 Subject: Made some changes --- audio/sfx/59_1.asm | 6 ++-- audio/sfx/59_3.asm | 6 ++-- audio/sfx/arrow_tiles_1.asm | 6 ++-- audio/sfx/arrow_tiles_3.asm | 6 ++-- audio/sfx/ball_poof.asm | 8 +++--- audio/sfx/ball_toss.asm | 6 ++-- audio/sfx/battle_09.asm | 6 ++-- audio/sfx/battle_0b.asm | 2 +- audio/sfx/battle_0c.asm | 6 ++-- audio/sfx/battle_0d.asm | 6 ++-- audio/sfx/battle_0e.asm | 4 +-- audio/sfx/battle_0f.asm | 8 +++--- audio/sfx/battle_12.asm | 6 ++-- audio/sfx/battle_13.asm | 8 +++--- audio/sfx/battle_14.asm | 8 +++--- audio/sfx/battle_16.asm | 6 ++-- audio/sfx/battle_17.asm | 8 +++--- audio/sfx/battle_18.asm | 4 +-- audio/sfx/battle_19.asm | 6 ++-- audio/sfx/battle_1b.asm | 4 +-- audio/sfx/battle_1c.asm | 6 ++-- audio/sfx/battle_1e.asm | 18 ++++++------ audio/sfx/battle_20.asm | 4 +-- audio/sfx/battle_21.asm | 10 +++---- audio/sfx/battle_22.asm | 4 +-- audio/sfx/battle_23.asm | 10 +++---- audio/sfx/battle_24.asm | 10 +++---- audio/sfx/battle_25.asm | 10 +++---- audio/sfx/battle_26.asm | 14 +++++----- audio/sfx/battle_27.asm | 16 +++++------ audio/sfx/battle_28.asm | 12 ++++---- audio/sfx/battle_29.asm | 18 ++++++------ audio/sfx/battle_2a.asm | 26 ++++++++--------- audio/sfx/battle_2b.asm | 24 ++++++++-------- audio/sfx/battle_2c.asm | 20 +++++++------- audio/sfx/battle_2e.asm | 24 ++++++++-------- audio/sfx/battle_2f.asm | 12 ++++---- audio/sfx/battle_31.asm | 20 +++++++------- audio/sfx/battle_32.asm | 8 +++--- audio/sfx/battle_33.asm | 20 +++++++------- audio/sfx/battle_34.asm | 20 +++++++------- audio/sfx/battle_36.asm | 60 ++++++++++++++++++++-------------------- audio/sfx/collision_1.asm | 6 ++-- audio/sfx/collision_3.asm | 6 ++-- audio/sfx/cry00_1.asm | 18 ++++++------ audio/sfx/cry00_2.asm | 18 ++++++------ audio/sfx/cry00_3.asm | 18 ++++++------ audio/sfx/cry01_1.asm | 24 ++++++++-------- audio/sfx/cry01_2.asm | 24 ++++++++-------- audio/sfx/cry01_3.asm | 24 ++++++++-------- audio/sfx/cry02_1.asm | 12 ++++---- audio/sfx/cry02_2.asm | 12 ++++---- audio/sfx/cry02_3.asm | 12 ++++---- audio/sfx/cry03_1.asm | 36 ++++++++++++------------ audio/sfx/cry03_2.asm | 36 ++++++++++++------------ audio/sfx/cry03_3.asm | 36 ++++++++++++------------ audio/sfx/cry04_1.asm | 40 +++++++++++++-------------- audio/sfx/cry04_2.asm | 40 +++++++++++++-------------- audio/sfx/cry04_3.asm | 40 +++++++++++++-------------- audio/sfx/cry05_1.asm | 16 +++++------ audio/sfx/cry05_2.asm | 16 +++++------ audio/sfx/cry05_3.asm | 16 +++++------ audio/sfx/cry06_1.asm | 24 ++++++++-------- audio/sfx/cry06_2.asm | 24 ++++++++-------- audio/sfx/cry06_3.asm | 24 ++++++++-------- audio/sfx/cry07_1.asm | 18 ++++++------ audio/sfx/cry07_2.asm | 18 ++++++------ audio/sfx/cry07_3.asm | 18 ++++++------ audio/sfx/cry08_1.asm | 22 +++++++-------- audio/sfx/cry08_2.asm | 22 +++++++-------- audio/sfx/cry08_3.asm | 22 +++++++-------- audio/sfx/cry09_1.asm | 42 ++++++++++++++-------------- audio/sfx/cry09_2.asm | 42 ++++++++++++++-------------- audio/sfx/cry09_3.asm | 42 ++++++++++++++-------------- audio/sfx/cry0a_1.asm | 46 +++++++++++++++--------------- audio/sfx/cry0a_2.asm | 46 +++++++++++++++--------------- audio/sfx/cry0a_3.asm | 46 +++++++++++++++--------------- audio/sfx/cry0b_1.asm | 50 ++++++++++++++++----------------- audio/sfx/cry0b_2.asm | 50 ++++++++++++++++----------------- audio/sfx/cry0b_3.asm | 50 ++++++++++++++++----------------- audio/sfx/cry0c_1.asm | 36 ++++++++++++------------ audio/sfx/cry0c_2.asm | 36 ++++++++++++------------ audio/sfx/cry0c_3.asm | 36 ++++++++++++------------ audio/sfx/cry0d_1.asm | 54 ++++++++++++++++++------------------ audio/sfx/cry0d_2.asm | 54 ++++++++++++++++++------------------ audio/sfx/cry0d_3.asm | 54 ++++++++++++++++++------------------ audio/sfx/cry0e_1.asm | 22 +++++++-------- audio/sfx/cry0e_2.asm | 22 +++++++-------- audio/sfx/cry0e_3.asm | 22 +++++++-------- audio/sfx/cry0f_1.asm | 34 +++++++++++------------ audio/sfx/cry0f_2.asm | 34 +++++++++++------------ audio/sfx/cry0f_3.asm | 34 +++++++++++------------ audio/sfx/cry10_1.asm | 38 ++++++++++++------------- audio/sfx/cry10_2.asm | 38 ++++++++++++------------- audio/sfx/cry10_3.asm | 38 ++++++++++++------------- audio/sfx/cry11_1.asm | 44 ++++++++++++++--------------- audio/sfx/cry11_2.asm | 44 ++++++++++++++--------------- audio/sfx/cry11_3.asm | 44 ++++++++++++++--------------- audio/sfx/cry12_1.asm | 24 ++++++++-------- audio/sfx/cry12_2.asm | 24 ++++++++-------- audio/sfx/cry12_3.asm | 24 ++++++++-------- audio/sfx/cry13_1.asm | 36 ++++++++++++------------ audio/sfx/cry13_2.asm | 36 ++++++++++++------------ audio/sfx/cry13_3.asm | 36 ++++++++++++------------ audio/sfx/cry14_1.asm | 18 ++++++------ audio/sfx/cry14_2.asm | 18 ++++++------ audio/sfx/cry14_3.asm | 18 ++++++------ audio/sfx/cry15_1.asm | 36 ++++++++++++------------ audio/sfx/cry15_2.asm | 36 ++++++++++++------------ audio/sfx/cry15_3.asm | 36 ++++++++++++------------ audio/sfx/cry16_1.asm | 18 ++++++------ audio/sfx/cry16_2.asm | 18 ++++++------ audio/sfx/cry16_3.asm | 18 ++++++------ audio/sfx/cry17_1.asm | 24 ++++++++-------- audio/sfx/cry17_2.asm | 24 ++++++++-------- audio/sfx/cry17_3.asm | 24 ++++++++-------- audio/sfx/cry18_1.asm | 44 ++++++++++++++--------------- audio/sfx/cry18_2.asm | 44 ++++++++++++++--------------- audio/sfx/cry18_3.asm | 44 ++++++++++++++--------------- audio/sfx/cry19_1.asm | 14 +++++----- audio/sfx/cry19_2.asm | 14 +++++----- audio/sfx/cry19_3.asm | 14 +++++----- audio/sfx/cry1a_1.asm | 36 ++++++++++++------------ audio/sfx/cry1a_2.asm | 36 ++++++++++++------------ audio/sfx/cry1a_3.asm | 36 ++++++++++++------------ audio/sfx/cry1b_1.asm | 28 +++++++++---------- audio/sfx/cry1b_2.asm | 28 +++++++++---------- audio/sfx/cry1b_3.asm | 28 +++++++++---------- audio/sfx/cry1c_1.asm | 38 ++++++++++++------------- audio/sfx/cry1c_2.asm | 38 ++++++++++++------------- audio/sfx/cry1c_3.asm | 38 ++++++++++++------------- audio/sfx/cry1d_1.asm | 34 +++++++++++------------ audio/sfx/cry1d_2.asm | 34 +++++++++++------------ audio/sfx/cry1d_3.asm | 34 +++++++++++------------ audio/sfx/cry1e_1.asm | 52 +++++++++++++++++----------------- audio/sfx/cry1e_2.asm | 52 +++++++++++++++++----------------- audio/sfx/cry1e_3.asm | 52 +++++++++++++++++----------------- 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 | 32 ++++++++++----------- audio/sfx/cry21_2.asm | 32 ++++++++++----------- audio/sfx/cry21_3.asm | 32 ++++++++++----------- audio/sfx/cry22_1.asm | 24 ++++++++-------- audio/sfx/cry22_2.asm | 24 ++++++++-------- audio/sfx/cry22_3.asm | 24 ++++++++-------- audio/sfx/cry23_1.asm | 26 ++++++++--------- audio/sfx/cry23_2.asm | 26 ++++++++--------- audio/sfx/cry23_3.asm | 26 ++++++++--------- audio/sfx/cry24_1.asm | 42 ++++++++++++++-------------- audio/sfx/cry24_2.asm | 42 ++++++++++++++-------------- audio/sfx/cry24_3.asm | 42 ++++++++++++++-------------- audio/sfx/cry25_1.asm | 28 +++++++++---------- audio/sfx/cry25_2.asm | 28 +++++++++---------- audio/sfx/cry25_3.asm | 28 +++++++++---------- audio/sfx/cut_1.asm | 10 +++---- audio/sfx/cut_3.asm | 10 +++---- audio/sfx/cymbal1_1.asm | 2 +- audio/sfx/cymbal1_2.asm | 2 +- audio/sfx/cymbal1_3.asm | 2 +- audio/sfx/cymbal2_1.asm | 2 +- audio/sfx/cymbal2_2.asm | 2 +- audio/sfx/cymbal2_3.asm | 2 +- audio/sfx/cymbal3_1.asm | 2 +- audio/sfx/cymbal3_2.asm | 2 +- audio/sfx/cymbal3_3.asm | 2 +- audio/sfx/damage.asm | 6 ++-- audio/sfx/denied_1.asm | 20 +++++++------- audio/sfx/denied_3.asm | 20 +++++++------- audio/sfx/dex_page_added.asm | 14 +++++----- audio/sfx/doubleslap.asm | 4 +-- audio/sfx/enter_pc_1.asm | 8 +++--- audio/sfx/enter_pc_3.asm | 8 +++--- audio/sfx/faint_fall.asm | 6 ++-- audio/sfx/faint_thud.asm | 10 +++---- audio/sfx/fly_1.asm | 32 ++++++++++----------- audio/sfx/fly_3.asm | 32 ++++++++++----------- audio/sfx/go_inside_1.asm | 4 +-- audio/sfx/go_inside_3.asm | 4 +-- audio/sfx/go_outside_1.asm | 10 +++---- audio/sfx/go_outside_3.asm | 10 +++---- audio/sfx/heal_ailment_1.asm | 12 ++++---- audio/sfx/heal_ailment_2.asm | 12 ++++---- audio/sfx/heal_ailment_3.asm | 12 ++++---- audio/sfx/heal_hp_1.asm | 8 +++--- audio/sfx/heal_hp_2.asm | 8 +++--- audio/sfx/heal_hp_3.asm | 8 +++--- audio/sfx/healing_machine_1.asm | 12 ++++---- audio/sfx/healing_machine_3.asm | 12 ++++---- audio/sfx/horn_drill.asm | 8 +++--- audio/sfx/intro_crash.asm | 4 +-- audio/sfx/intro_hip.asm | 6 ++-- audio/sfx/intro_hop.asm | 6 ++-- audio/sfx/intro_lunge.asm | 16 +++++------ audio/sfx/intro_raise.asm | 6 ++-- audio/sfx/intro_whoosh.asm | 10 +++---- audio/sfx/ledge_1.asm | 6 ++-- audio/sfx/ledge_3.asm | 6 ++-- 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 | 2 +- audio/sfx/muted_snare2_2.asm | 2 +- audio/sfx/muted_snare2_3.asm | 2 +- audio/sfx/muted_snare3_1.asm | 2 +- audio/sfx/muted_snare3_2.asm | 2 +- audio/sfx/muted_snare3_3.asm | 2 +- audio/sfx/muted_snare4_1.asm | 2 +- audio/sfx/muted_snare4_2.asm | 2 +- audio/sfx/muted_snare4_3.asm | 2 +- audio/sfx/not_very_effective.asm | 8 +++--- audio/sfx/peck.asm | 2 +- audio/sfx/poisoned_1.asm | 8 +++--- audio/sfx/poisoned_3.asm | 8 +++--- audio/sfx/pound.asm | 2 +- audio/sfx/press_ab_1.asm | 8 +++--- audio/sfx/press_ab_2.asm | 8 +++--- audio/sfx/press_ab_3.asm | 8 +++--- audio/sfx/psybeam.asm | 20 +++++++------- audio/sfx/psychic_m.asm | 40 +++++++++++++-------------- audio/sfx/purchase_1.asm | 10 +++---- audio/sfx/purchase_3.asm | 10 +++---- audio/sfx/push_boulder_1.asm | 16 +++++------ audio/sfx/push_boulder_3.asm | 16 +++++------ audio/sfx/run.asm | 22 +++++++-------- audio/sfx/safari_zone_pa.asm | 12 ++++---- audio/sfx/save_1.asm | 30 ++++++++++---------- audio/sfx/save_3.asm | 44 ++++++++++++++--------------- audio/sfx/shooting_star.asm | 22 +++++++-------- audio/sfx/shrink_1.asm | 14 +++++----- audio/sfx/shrink_3.asm | 14 +++++----- audio/sfx/silph_scope.asm | 12 ++++---- audio/sfx/slots_new_spin.asm | 12 ++++---- audio/sfx/slots_reward.asm | 4 +-- audio/sfx/slots_stop_wheel.asm | 6 ++-- audio/sfx/snare1_1.asm | 2 +- audio/sfx/snare1_2.asm | 2 +- audio/sfx/snare1_3.asm | 2 +- audio/sfx/snare2_1.asm | 2 +- audio/sfx/snare2_2.asm | 2 +- audio/sfx/snare2_3.asm | 2 +- audio/sfx/snare3_1.asm | 2 +- audio/sfx/snare3_2.asm | 2 +- audio/sfx/snare3_3.asm | 2 +- audio/sfx/snare4_1.asm | 2 +- audio/sfx/snare4_2.asm | 2 +- audio/sfx/snare4_3.asm | 2 +- audio/sfx/snare5_1.asm | 12 ++++---- audio/sfx/snare5_2.asm | 12 ++++---- audio/sfx/snare5_3.asm | 12 ++++---- audio/sfx/snare6_1.asm | 2 +- audio/sfx/snare6_2.asm | 2 +- audio/sfx/snare6_3.asm | 2 +- audio/sfx/snare7_1.asm | 2 +- audio/sfx/snare7_2.asm | 2 +- audio/sfx/snare7_3.asm | 2 +- audio/sfx/snare8_1.asm | 2 +- audio/sfx/snare8_2.asm | 2 +- audio/sfx/snare8_3.asm | 2 +- audio/sfx/snare9_1.asm | 2 +- audio/sfx/snare9_2.asm | 2 +- audio/sfx/snare9_3.asm | 2 +- audio/sfx/ss_anne_horn_1.asm | 28 +++++++++---------- audio/sfx/ss_anne_horn_3.asm | 28 +++++++++---------- 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 | 6 ++-- audio/sfx/swap_3.asm | 6 ++-- audio/sfx/switch_1.asm | 10 +++---- audio/sfx/switch_3.asm | 10 +++---- audio/sfx/teleport_enter1_1.asm | 14 +++++----- audio/sfx/teleport_enter1_3.asm | 14 +++++----- audio/sfx/teleport_enter2_1.asm | 8 +++--- audio/sfx/teleport_enter2_3.asm | 8 +++--- audio/sfx/teleport_exit1_1.asm | 14 +++++----- audio/sfx/teleport_exit1_3.asm | 14 +++++----- audio/sfx/teleport_exit2_1.asm | 6 ++-- audio/sfx/teleport_exit2_3.asm | 6 ++-- audio/sfx/tink_1.asm | 10 +++---- audio/sfx/tink_2.asm | 10 +++---- audio/sfx/tink_3.asm | 10 +++---- audio/sfx/trade_machine_1.asm | 8 +++--- audio/sfx/trade_machine_3.asm | 8 +++--- audio/sfx/triangle1_1.asm | 2 +- audio/sfx/triangle1_2.asm | 2 +- audio/sfx/triangle1_3.asm | 2 +- 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 | 8 +++--- audio/sfx/turn_off_pc_3.asm | 8 +++--- audio/sfx/turn_on_pc_1.asm | 20 +++++++------- audio/sfx/turn_on_pc_3.asm | 22 +++++++-------- audio/sfx/unused_1.asm | 38 ++++++++++++------------- audio/sfx/unused_2.asm | 38 ++++++++++++------------- audio/sfx/unused_3.asm | 38 ++++++++++++------------- audio/sfx/vine_whip.asm | 16 +++++------ audio/sfx/withdraw_deposit_1.asm | 18 ++++++------ audio/sfx/withdraw_deposit_3.asm | 18 ++++++------ macros/audio_macros.asm | 6 ++-- 308 files changed, 2687 insertions(+), 2687 deletions(-) diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index f36f9e1e..ad75c503 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ SFX_59_1_Ch4: duty 2 - unknownsfx0x20 4, 241, 128, 7 + squarenote 4, 241, 128, 7 endchannel SFX_59_1_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 161, 97, 7 endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 559318ba..13a8a6e4 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,11 +1,11 @@ SFX_59_3_Ch4: duty 2 - unknownsfx0x20 4, 241, 128, 7 + squarenote 4, 241, 128, 7 endchannel SFX_59_3_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 161, 97, 7 endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index c9ef1564..90f62f8b 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_1_Ch4: duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 210, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index f88b9c83..ac1c79ff 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_3_Ch4: duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 210, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 7068c66c..3596baba 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ SFX_Ball_Poof_Ch4: duty 2 - unknownsfx0x10 22 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 + pitchenvelope 22 + squarenote 15, 242, 0, 4 + pitchenvelope 8 endchannel SFX_Ball_Poof_Ch7: - unknownnoise0x20 15, 162, 34 + noisenote 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index e9beac77..b41aaec7 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ SFX_Ball_Toss_Ch4: duty 2 - unknownsfx0x10 47 - unknownsfx0x20 15, 242, 128, 7 + pitchenvelope 47 + squarenote 15, 242, 128, 7 endchannel SFX_Ball_Toss_Ch5: duty 2 - unknownsfx0x20 15, 194, 130, 7 + squarenote 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 11f156cb..3ab973e1 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ SFX_Battle_09_Ch4: duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 5 - unknownsfx0x10 8 + pitchenvelope 151 + squarenote 15, 242, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index d6feba8e..83420396 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ SFX_Battle_0B_Ch7: - unknownnoise0x20 8, 241, 84 + noisenote 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index f193fc20..5c2b40f8 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ SFX_Battle_0C_Ch7: - unknownnoise0x20 15, 143, 17 - unknownnoise0x20 4, 255, 18 - unknownnoise0x20 10, 241, 85 + noisenote 15, 143, 17 + noisenote 4, 255, 18 + noisenote 10, 241, 85 endchannel diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index f9d423ad..7460238e 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ SFX_Battle_0D_Ch7: - unknownnoise0x20 15, 143, 52 - unknownnoise0x20 8, 242, 53 - unknownnoise0x20 10, 241, 85 + noisenote 15, 143, 52 + noisenote 8, 242, 53 + noisenote 10, 241, 85 endchannel diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 92a660b2..7c7bebf0 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ SFX_Battle_0E_Ch7: - unknownnoise0x20 15, 159, 35 - unknownnoise0x20 8, 241, 33 + noisenote 15, 159, 35 + noisenote 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 846a9053..124a9a1d 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ SFX_Battle_0F_Ch7: - unknownnoise0x20 2, 225, 75 - unknownnoise0x20 10, 241, 68 - unknownnoise0x20 2, 225, 58 - unknownnoise0x20 6, 241, 52 + noisenote 2, 225, 75 + noisenote 10, 241, 68 + noisenote 2, 225, 58 + noisenote 6, 241, 52 endchannel diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 77be75c0..680a93b8 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ SFX_Battle_12_Ch7: - unknownnoise0x20 8, 79, 35 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 + noisenote 8, 79, 35 + noisenote 4, 196, 34 + noisenote 6, 242, 35 loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 81e1a0ef..252da5f3 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ SFX_Battle_13_Ch7: - unknownnoise0x20 8, 79, 51 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - unknownnoise0x20 15, 242, 34 + noisenote 8, 79, 51 + noisenote 4, 196, 34 + noisenote 6, 242, 35 + noisenote 15, 242, 34 endchannel diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 8cecfb37..8aa099bf 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ SFX_Battle_14_Ch7: - unknownnoise0x20 8, 255, 50 - unknownnoise0x20 8, 244, 67 - unknownnoise0x20 8, 242, 84 - unknownnoise0x20 8, 241, 101 + noisenote 8, 255, 50 + noisenote 8, 244, 67 + noisenote 8, 242, 84 + noisenote 8, 241, 101 endchannel diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index dcc7014d..79c685b0 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ SFX_Battle_16_Ch7: - unknownnoise0x20 1, 148, 35 - unknownnoise0x20 1, 180, 34 - unknownnoise0x20 8, 241, 68 + noisenote 1, 148, 35 + noisenote 1, 180, 34 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 82bb2117..5164fdd6 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ SFX_Battle_17_Ch7: - unknownnoise0x20 2, 148, 51 - unknownnoise0x20 4, 180, 34 - unknownnoise0x20 4, 241, 68 - unknownnoise0x20 8, 241, 85 + noisenote 2, 148, 51 + noisenote 4, 180, 34 + noisenote 4, 241, 68 + noisenote 8, 241, 85 endchannel diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 14aac5c1..eb6ff32c 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ SFX_Battle_18_Ch7: - unknownnoise0x20 4, 255, 85 - unknownnoise0x20 8, 241, 101 + noisenote 4, 255, 85 + noisenote 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 6bc1804d..47f742e4 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ SFX_Battle_19_Ch7: - unknownnoise0x20 2, 132, 67 - unknownnoise0x20 2, 196, 34 - unknownnoise0x20 8, 242, 52 + noisenote 2, 132, 67 + noisenote 2, 196, 34 + noisenote 8, 242, 52 endchannel diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index a4d8992b..694c90a5 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ SFX_Battle_1B_Ch7: - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 15, 242, 18 + noisenote 2, 241, 34 + noisenote 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 05cdd091..cb87f3d5 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ SFX_Battle_1C_Ch7: - unknownnoise0x20 2, 194, 1 - unknownnoise0x20 15, 244, 1 - unknownnoise0x20 15, 242, 1 + noisenote 2, 194, 1 + noisenote 15, 244, 1 + noisenote 15, 242, 1 endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 8d3f4745..eaea0543 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ SFX_Battle_1E_Ch4: duty 0 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel SFX_Battle_1E_Ch7: - unknownnoise0x20 0, 209, 66 - unknownnoise0x20 4, 161, 50 - unknownnoise0x20 0, 209, 34 - unknownnoise0x20 6, 161, 50 + noisenote 0, 209, 66 + noisenote 4, 161, 50 + noisenote 0, 209, 34 + noisenote 6, 161, 50 endchannel diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index f7413e63..b80c1e03 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ SFX_Battle_20_Ch7: - unknownnoise0x20 12, 241, 84 - unknownnoise0x20 8, 241, 100 + noisenote 12, 241, 84 + noisenote 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index a6b63a6c..954a3091 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ SFX_Battle_21_Ch7: - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 193, 50 - unknownnoise0x20 2, 161, 49 - unknownnoise0x20 15, 130, 50 - unknownnoise0x20 8, 241, 52 + noisenote 2, 241, 51 + noisenote 2, 193, 50 + noisenote 2, 161, 49 + noisenote 15, 130, 50 + noisenote 8, 241, 52 endchannel diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 6a20c3ae..82022661 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ SFX_Battle_22_Ch7: - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 + noisenote 2, 210, 50 + noisenote 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index e532cf08..e8214c80 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ SFX_Battle_23_Ch7: - unknownnoise0x20 2, 242, 67 - unknownnoise0x20 4, 181, 50 - unknownnoise0x20 9, 134, 49 - unknownnoise0x20 7, 100, 0 - unknownnoise0x20 15, 242, 85 + noisenote 2, 242, 67 + noisenote 4, 181, 50 + noisenote 9, 134, 49 + noisenote 7, 100, 0 + noisenote 15, 242, 85 endchannel diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 46e9d29f..95765daf 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ SFX_Battle_24_Ch4: duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 7 - unknownsfx0x10 8 + pitchenvelope 151 + squarenote 15, 242, 0, 7 + pitchenvelope 8 endchannel SFX_Battle_24_Ch7: - unknownnoise0x20 15, 63, 34 - unknownnoise0x20 15, 242, 33 + noisenote 15, 63, 34 + noisenote 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 3a46e505..70612976 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ SFX_Battle_25_Ch7: - unknownnoise0x20 15, 79, 65 - unknownnoise0x20 8, 143, 65 - unknownnoise0x20 8, 207, 65 - unknownnoise0x20 8, 242, 66 - unknownnoise0x20 15, 242, 65 + noisenote 15, 79, 65 + noisenote 8, 143, 65 + noisenote 8, 207, 65 + noisenote 8, 242, 66 + noisenote 15, 242, 65 endchannel diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index ce1ac2f9..08837de3 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ SFX_Battle_26_Ch7: - 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 + noisenote 10, 255, 80 + noisenote 15, 255, 81 + noisenote 8, 242, 81 + noisenote 6, 255, 82 + noisenote 6, 255, 83 + noisenote 8, 255, 84 + noisenote 15, 242, 84 endchannel diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 1e662c29..f4e9f2e3 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ SFX_Battle_27_Ch4: duty 2 - unknownsfx0x20 15, 63, 192, 7 + squarenote 15, 63, 192, 7 SFX_Battle_27_branch_2062a: - unknownsfx0x20 15, 223, 192, 7 + squarenote 15, 223, 192, 7 loopchannel 4, SFX_Battle_27_branch_2062a - unknownsfx0x20 15, 209, 192, 7 + squarenote 15, 209, 192, 7 endchannel SFX_Battle_27_Ch5: dutycycle 179 - unknownsfx0x20 15, 47, 200, 7 + squarenote 15, 47, 200, 7 SFX_Battle_27_branch_2063d: - unknownsfx0x20 15, 207, 199, 7 + squarenote 15, 207, 199, 7 loopchannel 4, SFX_Battle_27_branch_2063d - unknownsfx0x20 15, 193, 200, 7 + squarenote 15, 193, 200, 7 endchannel SFX_Battle_27_Ch7: - unknownnoise0x20 3, 151, 18 - unknownnoise0x20 3, 161, 17 + noisenote 3, 151, 18 + noisenote 3, 161, 17 loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 298ddb7a..cb96b5ca 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ SFX_Battle_28_Ch4: duty 0 - unknownsfx0x20 0, 241, 192, 7 - unknownsfx0x20 0, 241, 0, 7 + squarenote 0, 241, 192, 7 + squarenote 0, 241, 0, 7 loopchannel 12, SFX_Battle_28_Ch4 endchannel SFX_Battle_28_Ch5: dutycycle 179 - unknownsfx0x20 0, 225, 193, 7 - unknownsfx0x20 0, 225, 1, 7 + squarenote 0, 225, 193, 7 + squarenote 0, 225, 1, 7 loopchannel 12, SFX_Battle_28_Ch5 endchannel SFX_Battle_28_Ch7: - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 + noisenote 1, 209, 73 + noisenote 1, 209, 41 loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index e36c18dc..a873eed8 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ SFX_Battle_29_Ch4: dutycycle 201 - unknownsfx0x20 11, 243, 32, 1 - unknownsfx0x20 9, 211, 80, 1 + squarenote 11, 243, 32, 1 + squarenote 9, 211, 80, 1 loopchannel 5, SFX_Battle_29_Ch4 - unknownsfx0x20 8, 227, 48, 1 - unknownsfx0x20 15, 194, 16, 1 + squarenote 8, 227, 48, 1 + squarenote 15, 194, 16, 1 endchannel SFX_Battle_29_Ch7: - unknownnoise0x20 10, 243, 53 - unknownnoise0x20 14, 246, 69 + noisenote 10, 243, 53 + noisenote 14, 246, 69 loopchannel 4, SFX_Battle_29_Ch7 - unknownnoise0x20 12, 244, 188 - unknownnoise0x20 12, 245, 156 - unknownnoise0x20 15, 244, 172 + noisenote 12, 244, 188 + noisenote 12, 245, 156 + noisenote 15, 244, 172 endchannel diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index 710a45f1..2168f90d 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ SFX_Battle_2A_Ch4: dutycycle 57 - unknownsfx0x20 4, 244, 0, 6 - unknownsfx0x20 3, 196, 0, 5 - unknownsfx0x20 5, 181, 0, 6 - unknownsfx0x20 13, 226, 192, 6 + squarenote 4, 244, 0, 6 + squarenote 3, 196, 0, 5 + squarenote 5, 181, 0, 6 + squarenote 13, 226, 192, 6 loopchannel 3, SFX_Battle_2A_Ch4 - unknownsfx0x20 8, 209, 0, 6 + squarenote 8, 209, 0, 6 endchannel SFX_Battle_2A_Ch5: dutycycle 141 - unknownsfx0x20 5, 228, 224, 5 - unknownsfx0x20 4, 180, 224, 4 - unknownsfx0x20 6, 165, 232, 5 - unknownsfx0x20 14, 209, 160, 6 + squarenote 5, 228, 224, 5 + squarenote 4, 180, 224, 4 + squarenote 6, 165, 232, 5 + squarenote 14, 209, 160, 6 loopchannel 3, SFX_Battle_2A_Ch5 endchannel SFX_Battle_2A_Ch7: - unknownnoise0x20 5, 195, 51 - unknownnoise0x20 3, 146, 67 - unknownnoise0x20 10, 181, 51 - unknownnoise0x20 15, 195, 50 + noisenote 5, 195, 51 + noisenote 3, 146, 67 + noisenote 10, 181, 51 + noisenote 15, 195, 50 loopchannel 2, SFX_Battle_2A_Ch7 endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index da57c7a7..94d11f3f 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ SFX_Battle_2B_Ch4: 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 + squarenote 3, 129, 0, 3 + squarenote 3, 193, 0, 4 + squarenote 3, 241, 0, 5 + squarenote 3, 177, 0, 4 + squarenote 3, 113, 0, 3 loopchannel 5, SFX_Battle_2B_Ch4 - unknownsfx0x20 8, 129, 0, 4 + squarenote 8, 129, 0, 4 endchannel SFX_Battle_2B_Ch7: - unknownnoise0x20 3, 98, 34 - unknownnoise0x20 3, 162, 50 - unknownnoise0x20 3, 210, 51 - unknownnoise0x20 3, 146, 35 - unknownnoise0x20 3, 82, 18 + noisenote 3, 98, 34 + noisenote 3, 162, 50 + noisenote 3, 210, 51 + noisenote 3, 146, 35 + noisenote 3, 82, 18 loopchannel 5, SFX_Battle_2B_Ch7 - unknownnoise0x20 8, 129, 18 + noisenote 8, 129, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 2f8bdc49..63be0d0f 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ SFX_Battle_2C_Ch4: dutycycle 57 - unknownsfx0x20 15, 244, 0, 5 - unknownsfx0x20 15, 196, 0, 4 - unknownsfx0x20 15, 226, 192, 5 + squarenote 15, 244, 0, 5 + squarenote 15, 196, 0, 4 + squarenote 15, 226, 192, 5 loopchannel 3, SFX_Battle_2C_Ch4 endchannel SFX_Battle_2C_Ch5: dutycycle 141 - unknownsfx0x20 7, 228, 48, 4 - unknownsfx0x20 15, 180, 48, 3 - unknownsfx0x20 15, 162, 56, 4 + squarenote 7, 228, 48, 4 + squarenote 15, 180, 48, 3 + squarenote 15, 162, 56, 4 loopchannel 4, SFX_Battle_2C_Ch5 endchannel SFX_Battle_2C_Ch7: - unknownnoise0x20 9, 244, 68 - unknownnoise0x20 9, 242, 67 - unknownnoise0x20 15, 244, 66 - unknownnoise0x20 15, 244, 65 + noisenote 9, 244, 68 + noisenote 9, 242, 67 + noisenote 15, 244, 66 + noisenote 15, 244, 65 loopchannel 3, SFX_Battle_2C_Ch7 endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index 20c86033..a1f8916b 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ SFX_Battle_2E_Ch4: duty 0 - unknownsfx0x20 2, 241, 0, 2 - unknownsfx0x20 3, 241, 0, 7 - unknownsfx0x20 4, 241, 0, 5 - unknownsfx0x20 5, 241, 240, 7 + squarenote 2, 241, 0, 2 + squarenote 3, 241, 0, 7 + squarenote 4, 241, 0, 5 + squarenote 5, 241, 240, 7 loopchannel 8, SFX_Battle_2E_Ch4 endchannel SFX_Battle_2E_Ch5: dutycycle 179 - unknownsfx0x20 2, 225, 2, 3 - unknownsfx0x20 3, 225, 242, 7 - unknownsfx0x20 4, 225, 2, 6 - unknownsfx0x20 5, 225, 2, 7 + squarenote 2, 225, 2, 3 + squarenote 3, 225, 242, 7 + squarenote 4, 225, 2, 6 + squarenote 5, 225, 2, 7 loopchannel 8, SFX_Battle_2E_Ch5 endchannel SFX_Battle_2E_Ch7: - unknownnoise0x20 2, 211, 16 - unknownnoise0x20 3, 211, 17 - unknownnoise0x20 2, 210, 16 - unknownnoise0x20 5, 210, 18 + noisenote 2, 211, 16 + noisenote 3, 211, 17 + noisenote 2, 210, 16 + noisenote 5, 210, 18 loopchannel 9, SFX_Battle_2E_Ch7 endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index fb4c7a14..2fde88a8 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ SFX_Battle_2F_Ch4: dutycycle 43 - unknownsfx0x20 3, 241, 240, 7 - unknownsfx0x20 4, 242, 0, 2 + squarenote 3, 241, 240, 7 + squarenote 4, 242, 0, 2 loopchannel 8, SFX_Battle_2F_Ch4 endchannel SFX_Battle_2F_Ch5: dutycycle 179 - unknownsfx0x20 4, 226, 2, 2 - unknownsfx0x20 4, 225, 226, 7 + squarenote 4, 226, 2, 2 + squarenote 4, 225, 226, 7 loopchannel 9, SFX_Battle_2F_Ch5 endchannel SFX_Battle_2F_Ch7: - unknownnoise0x20 4, 255, 67 - unknownnoise0x20 4, 242, 68 + noisenote 4, 255, 67 + noisenote 4, 242, 68 loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index cc1169eb..09b08271 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ SFX_Battle_31_Ch4: 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 + squarenote 15, 255, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 242, 224, 7 endchannel SFX_Battle_31_Ch5: 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 + squarenote 15, 255, 226, 7 + squarenote 15, 255, 225, 7 + squarenote 15, 255, 226, 7 + squarenote 15, 255, 225, 7 + squarenote 15, 242, 226, 7 endchannel diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c7bff4b2..28084fe5 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ SFX_Battle_32_Ch4: duty 2 - unknownsfx0x10 175 - unknownsfx0x20 8, 241, 0, 7 - unknownsfx0x10 8 + pitchenvelope 175 + squarenote 8, 241, 0, 7 + pitchenvelope 8 endchannel SFX_Battle_32_Ch5: duty 3 - unknownsfx0x20 8, 241, 1, 7 + squarenote 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index c92b5482..740b8b43 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ SFX_Battle_33_Ch4: 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 + squarenote 6, 241, 0, 5 + squarenote 6, 241, 128, 5 + squarenote 6, 241, 0, 6 + squarenote 6, 241, 128, 6 + squarenote 8, 241, 0, 7 endchannel SFX_Battle_33_Ch5: 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 + squarenote 6, 225, 16, 5 + squarenote 6, 225, 144, 5 + squarenote 6, 225, 16, 6 + squarenote 6, 225, 144, 6 + squarenote 8, 225, 16, 7 endchannel diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 38576ecb..329c941b 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ SFX_Battle_34_Ch4: dutycycle 237 - unknownsfx0x20 8, 255, 248, 3 - unknownsfx0x20 15, 255, 0, 4 - unknownsfx0x20 15, 243, 0, 4 + squarenote 8, 255, 248, 3 + squarenote 15, 255, 0, 4 + squarenote 15, 243, 0, 4 endchannel SFX_Battle_34_Ch5: dutycycle 180 - unknownsfx0x20 8, 239, 192, 3 - unknownsfx0x20 15, 239, 192, 3 - unknownsfx0x20 15, 227, 192, 3 + squarenote 8, 239, 192, 3 + squarenote 15, 239, 192, 3 + squarenote 15, 227, 192, 3 endchannel SFX_Battle_34_Ch7: - unknownnoise0x20 4, 255, 81 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 255, 85 - unknownnoise0x20 15, 243, 86 + noisenote 4, 255, 81 + noisenote 8, 255, 84 + noisenote 15, 255, 85 + noisenote 15, 243, 86 endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index df23fb37..983687e3 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ SFX_Battle_36_Ch4: 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 + squarenote 2, 241, 128, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 144, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 160, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 176, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 192, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 208, 7 SFX_Battle_36_branch_20930: - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 224, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 224, 7 loopchannel 12, SFX_Battle_36_branch_20930 - unknownsfx0x20 15, 241, 0, 7 + squarenote 15, 241, 0, 7 endchannel SFX_Battle_36_Ch5: 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 + squarenote 2, 241, 129, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 145, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 161, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 177, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 193, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 209, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 225, 7 loopchannel 12, SFX_Battle_36_branch_20930 - unknownsfx0x20 15, 241, 1, 7 + squarenote 15, 241, 1, 7 endchannel SFX_Battle_36_Ch7: - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 + noisenote 1, 209, 73 + noisenote 1, 209, 41 loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 241a5e68..41e99a35 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ SFX_Collision_1_Ch4: duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 + pitchenvelope 90 + squarenote 15, 241, 0, 3 + pitchenvelope 8 endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 649792eb..aa741e0e 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ SFX_Collision_3_Ch4: duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 + pitchenvelope 90 + squarenote 15, 241, 0, 3 + pitchenvelope 8 endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 98920dfc..bc4e64aa 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,21 +1,21 @@ SFX_Cry00_1_Ch4: dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 + squarenote 4, 243, 24, 7 + squarenote 15, 229, 152, 7 + squarenote 8, 145, 88, 7 endchannel SFX_Cry00_1_Ch5: dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 + squarenote 5, 179, 8, 7 + squarenote 15, 197, 136, 7 + squarenote 8, 113, 72, 7 endchannel SFX_Cry00_1_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 + noisenote 3, 161, 28 + noisenote 14, 148, 44 + noisenote 8, 129, 28 endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index 17a9207e..37e2a7b3 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,21 +1,21 @@ SFX_Cry00_2_Ch4: dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 + squarenote 4, 243, 24, 7 + squarenote 15, 229, 152, 7 + squarenote 8, 145, 88, 7 endchannel SFX_Cry00_2_Ch5: dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 + squarenote 5, 179, 8, 7 + squarenote 15, 197, 136, 7 + squarenote 8, 113, 72, 7 endchannel SFX_Cry00_2_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 + noisenote 3, 161, 28 + noisenote 14, 148, 44 + noisenote 8, 129, 28 endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 81ad7edf..3a434193 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,21 +1,21 @@ SFX_Cry00_3_Ch4: dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 + squarenote 4, 243, 24, 7 + squarenote 15, 229, 152, 7 + squarenote 8, 145, 88, 7 endchannel SFX_Cry00_3_Ch5: dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 + squarenote 5, 179, 8, 7 + squarenote 15, 197, 136, 7 + squarenote 8, 113, 72, 7 endchannel SFX_Cry00_3_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 + noisenote 3, 161, 28 + noisenote 14, 148, 44 + noisenote 8, 129, 28 endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 392adbe3..56b8d441 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,24 +1,24 @@ SFX_Cry01_1_Ch4: dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 + squarenote 4, 243, 0, 6 + squarenote 8, 213, 96, 7 + squarenote 3, 226, 32, 7 + squarenote 8, 209, 16, 7 endchannel SFX_Cry01_1_Ch5: dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 + squarenote 5, 179, 241, 6 + squarenote 7, 197, 82, 7 + squarenote 3, 162, 17, 7 + squarenote 8, 177, 1, 6 endchannel SFX_Cry01_1_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 + noisenote 3, 162, 60 + noisenote 12, 148, 44 + noisenote 3, 130, 28 + noisenote 8, 113, 44 endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index a7397fd8..43db8130 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,24 +1,24 @@ SFX_Cry01_2_Ch4: dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 + squarenote 4, 243, 0, 6 + squarenote 8, 213, 96, 7 + squarenote 3, 226, 32, 7 + squarenote 8, 209, 16, 7 endchannel SFX_Cry01_2_Ch5: dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 + squarenote 5, 179, 241, 6 + squarenote 7, 197, 82, 7 + squarenote 3, 162, 17, 7 + squarenote 8, 177, 1, 6 endchannel SFX_Cry01_2_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 + noisenote 3, 162, 60 + noisenote 12, 148, 44 + noisenote 3, 130, 28 + noisenote 8, 113, 44 endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 19235f9e..69728006 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,24 +1,24 @@ SFX_Cry01_3_Ch4: dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 + squarenote 4, 243, 0, 6 + squarenote 8, 213, 96, 7 + squarenote 3, 226, 32, 7 + squarenote 8, 209, 16, 7 endchannel SFX_Cry01_3_Ch5: dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 + squarenote 5, 179, 241, 6 + squarenote 7, 197, 82, 7 + squarenote 3, 162, 17, 7 + squarenote 8, 177, 1, 6 endchannel SFX_Cry01_3_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 + noisenote 3, 162, 60 + noisenote 12, 148, 44 + noisenote 3, 130, 28 + noisenote 8, 113, 44 endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 62834724..c210c673 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,16 +1,16 @@ SFX_Cry02_1_Ch4: duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 + squarenote 8, 245, 128, 4 + squarenote 2, 225, 224, 5 + squarenote 8, 209, 220, 5 endchannel SFX_Cry02_1_Ch5: dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 + squarenote 7, 149, 65, 4 + squarenote 2, 129, 33, 5 + squarenote 8, 97, 26, 5 SFX_Cry02_1_Ch7: diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index ae40372a..79e90a8c 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,16 +1,16 @@ SFX_Cry02_2_Ch4: duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 + squarenote 8, 245, 128, 4 + squarenote 2, 225, 224, 5 + squarenote 8, 209, 220, 5 endchannel SFX_Cry02_2_Ch5: dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 + squarenote 7, 149, 65, 4 + squarenote 2, 129, 33, 5 + squarenote 8, 97, 26, 5 SFX_Cry02_2_Ch7: diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 32be5608..8d069ce0 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,16 +1,16 @@ SFX_Cry02_3_Ch4: duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 + squarenote 8, 245, 128, 4 + squarenote 2, 225, 224, 5 + squarenote 8, 209, 220, 5 endchannel SFX_Cry02_3_Ch5: dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 + squarenote 7, 149, 65, 4 + squarenote 2, 129, 33, 5 + squarenote 8, 97, 26, 5 SFX_Cry02_3_Ch7: diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 706d2325..6a37c5c0 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,30 +1,30 @@ SFX_Cry03_1_Ch4: 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 + squarenote 4, 247, 8, 6 + squarenote 6, 230, 0, 6 + squarenote 6, 215, 240, 5 + squarenote 6, 196, 224, 5 + squarenote 5, 211, 192, 5 + squarenote 4, 211, 160, 5 + squarenote 8, 225, 128, 5 endchannel SFX_Cry03_1_Ch5: 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 + squarenote 4, 199, 4, 5 + squarenote 6, 166, 2, 5 + squarenote 6, 151, 241, 4 + squarenote 4, 180, 225, 4 + squarenote 5, 163, 194, 4 + squarenote 4, 179, 163, 4 + squarenote 8, 193, 130, 4 endchannel SFX_Cry03_1_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 + noisenote 12, 228, 76 + noisenote 10, 199, 92 + noisenote 12, 182, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 89e98ae4..0915e513 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,30 +1,30 @@ SFX_Cry03_2_Ch4: 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 + squarenote 4, 247, 8, 6 + squarenote 6, 230, 0, 6 + squarenote 6, 215, 240, 5 + squarenote 6, 196, 224, 5 + squarenote 5, 211, 192, 5 + squarenote 4, 211, 160, 5 + squarenote 8, 225, 128, 5 endchannel SFX_Cry03_2_Ch5: 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 + squarenote 4, 199, 4, 5 + squarenote 6, 166, 2, 5 + squarenote 6, 151, 241, 4 + squarenote 4, 180, 225, 4 + squarenote 5, 163, 194, 4 + squarenote 4, 179, 163, 4 + squarenote 8, 193, 130, 4 endchannel SFX_Cry03_2_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 + noisenote 12, 228, 76 + noisenote 10, 199, 92 + noisenote 12, 182, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index d472d37b..c4a959eb 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,30 +1,30 @@ SFX_Cry03_3_Ch4: 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 + squarenote 4, 247, 8, 6 + squarenote 6, 230, 0, 6 + squarenote 6, 215, 240, 5 + squarenote 6, 196, 224, 5 + squarenote 5, 211, 192, 5 + squarenote 4, 211, 160, 5 + squarenote 8, 225, 128, 5 endchannel SFX_Cry03_3_Ch5: 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 + squarenote 4, 199, 4, 5 + squarenote 6, 166, 2, 5 + squarenote 6, 151, 241, 4 + squarenote 4, 180, 225, 4 + squarenote 5, 163, 194, 4 + squarenote 4, 179, 163, 4 + squarenote 8, 193, 130, 4 endchannel SFX_Cry03_3_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 + noisenote 12, 228, 76 + noisenote 10, 199, 92 + noisenote 12, 182, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index d1bb26c6..28c068e3 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,32 +1,32 @@ SFX_Cry04_1_Ch4: 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 + squarenote 4, 247, 160, 6 + squarenote 8, 230, 164, 6 + squarenote 4, 214, 160, 6 + squarenote 12, 211, 32, 6 + squarenote 8, 195, 36, 6 + squarenote 4, 194, 32, 6 + squarenote 8, 177, 16, 6 endchannel SFX_Cry04_1_Ch5: 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 + squarenote 4, 231, 1, 6 + squarenote 8, 214, 3, 6 + squarenote 4, 198, 1, 6 + squarenote 12, 195, 129, 5 + squarenote 8, 179, 131, 5 + squarenote 4, 178, 130, 5 + squarenote 8, 161, 113, 5 endchannel SFX_Cry04_1_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 + noisenote 7, 214, 92 + noisenote 8, 230, 76 + noisenote 4, 212, 92 + noisenote 4, 212, 76 + noisenote 7, 195, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index aa5baf29..0d438c4e 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,32 +1,32 @@ SFX_Cry04_2_Ch4: 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 + squarenote 4, 247, 160, 6 + squarenote 8, 230, 164, 6 + squarenote 4, 214, 160, 6 + squarenote 12, 211, 32, 6 + squarenote 8, 195, 36, 6 + squarenote 4, 194, 32, 6 + squarenote 8, 177, 16, 6 endchannel SFX_Cry04_2_Ch5: 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 + squarenote 4, 231, 1, 6 + squarenote 8, 214, 3, 6 + squarenote 4, 198, 1, 6 + squarenote 12, 195, 129, 5 + squarenote 8, 179, 131, 5 + squarenote 4, 178, 130, 5 + squarenote 8, 161, 113, 5 endchannel SFX_Cry04_2_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 + noisenote 7, 214, 92 + noisenote 8, 230, 76 + noisenote 4, 212, 92 + noisenote 4, 212, 76 + noisenote 7, 195, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index b4d9cf2e..23011f51 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,32 +1,32 @@ SFX_Cry04_3_Ch4: 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 + squarenote 4, 247, 160, 6 + squarenote 8, 230, 164, 6 + squarenote 4, 214, 160, 6 + squarenote 12, 211, 32, 6 + squarenote 8, 195, 36, 6 + squarenote 4, 194, 32, 6 + squarenote 8, 177, 16, 6 endchannel SFX_Cry04_3_Ch5: 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 + squarenote 4, 231, 1, 6 + squarenote 8, 214, 3, 6 + squarenote 4, 198, 1, 6 + squarenote 12, 195, 129, 5 + squarenote 8, 179, 131, 5 + squarenote 4, 178, 130, 5 + squarenote 8, 161, 113, 5 endchannel SFX_Cry04_3_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 + noisenote 7, 214, 92 + noisenote 8, 230, 76 + noisenote 4, 212, 92 + noisenote 4, 212, 76 + noisenote 7, 195, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index dc68e77d..00a32ac1 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,18 +1,18 @@ SFX_Cry05_1_Ch4: dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 + squarenote 6, 226, 0, 5 + squarenote 6, 227, 128, 5 + squarenote 6, 211, 112, 5 + squarenote 8, 161, 96, 5 endchannel SFX_Cry05_1_Ch5: dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 + squarenote 6, 226, 130, 4 + squarenote 6, 211, 1, 5 + squarenote 6, 178, 226, 4 + squarenote 8, 129, 193, 4 SFX_Cry05_1_Ch7: diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index f7e09dcc..c6039d1e 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,18 +1,18 @@ SFX_Cry05_2_Ch4: dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 + squarenote 6, 226, 0, 5 + squarenote 6, 227, 128, 5 + squarenote 6, 211, 112, 5 + squarenote 8, 161, 96, 5 endchannel SFX_Cry05_2_Ch5: dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 + squarenote 6, 226, 130, 4 + squarenote 6, 211, 1, 5 + squarenote 6, 178, 226, 4 + squarenote 8, 129, 193, 4 SFX_Cry05_2_Ch7: diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 2e8839c9..dec9a99f 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,18 +1,18 @@ SFX_Cry05_3_Ch4: dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 + squarenote 6, 226, 0, 5 + squarenote 6, 227, 128, 5 + squarenote 6, 211, 112, 5 + squarenote 8, 161, 96, 5 endchannel SFX_Cry05_3_Ch5: dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 + squarenote 6, 226, 130, 4 + squarenote 6, 211, 1, 5 + squarenote 6, 178, 226, 4 + squarenote 8, 129, 193, 4 SFX_Cry05_3_Ch7: diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index d3b051c8..5adf4058 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,11 +1,11 @@ SFX_Cry06_1_Ch4: 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 + squarenote 6, 131, 71, 2 + squarenote 15, 98, 38, 2 + squarenote 4, 82, 69, 2 + squarenote 9, 99, 6, 2 + squarenote 15, 130, 37, 2 + squarenote 15, 66, 7, 2 SFX_Cry06_1_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_1_Ch5: SFX_Cry06_1_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 + noisenote 8, 212, 140 + noisenote 4, 226, 156 + noisenote 15, 198, 140 + noisenote 8, 228, 172 + noisenote 15, 215, 156 + noisenote 15, 242, 172 endchannel diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 6a46246c..e4b62370 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,11 +1,11 @@ SFX_Cry06_2_Ch4: 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 + squarenote 6, 131, 71, 2 + squarenote 15, 98, 38, 2 + squarenote 4, 82, 69, 2 + squarenote 9, 99, 6, 2 + squarenote 15, 130, 37, 2 + squarenote 15, 66, 7, 2 SFX_Cry06_2_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_2_Ch5: SFX_Cry06_2_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 + noisenote 8, 212, 140 + noisenote 4, 226, 156 + noisenote 15, 198, 140 + noisenote 8, 228, 172 + noisenote 15, 215, 156 + noisenote 15, 242, 172 endchannel diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 692cd1cf..dd2fef77 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,11 +1,11 @@ SFX_Cry06_3_Ch4: 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 + squarenote 6, 131, 71, 2 + squarenote 15, 98, 38, 2 + squarenote 4, 82, 69, 2 + squarenote 9, 99, 6, 2 + squarenote 15, 130, 37, 2 + squarenote 15, 66, 7, 2 SFX_Cry06_3_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_3_Ch5: SFX_Cry06_3_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 + noisenote 8, 212, 140 + noisenote 4, 226, 156 + noisenote 15, 198, 140 + noisenote 8, 228, 172 + noisenote 15, 215, 156 + noisenote 15, 242, 172 endchannel diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index 2eebb7f9..d3a9ef92 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,21 +1,21 @@ SFX_Cry07_1_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 4, 243, 224, 6 + squarenote 15, 228, 64, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry07_1_Ch5: dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 + squarenote 3, 195, 131, 6 + squarenote 14, 180, 2, 6 + squarenote 8, 161, 1, 6 endchannel SFX_Cry07_1_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 + noisenote 4, 211, 92 + noisenote 15, 230, 76 + noisenote 8, 177, 92 endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index e0381424..5f464588 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,21 +1,21 @@ SFX_Cry07_2_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 4, 243, 224, 6 + squarenote 15, 228, 64, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry07_2_Ch5: dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 + squarenote 3, 195, 131, 6 + squarenote 14, 180, 2, 6 + squarenote 8, 161, 1, 6 endchannel SFX_Cry07_2_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 + noisenote 4, 211, 92 + noisenote 15, 230, 76 + noisenote 8, 177, 92 endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 92a401a9..ab6c19c8 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,21 +1,21 @@ SFX_Cry07_3_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 4, 243, 224, 6 + squarenote 15, 228, 64, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry07_3_Ch5: dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 + squarenote 3, 195, 131, 6 + squarenote 14, 180, 2, 6 + squarenote 8, 161, 1, 6 endchannel SFX_Cry07_3_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 + noisenote 4, 211, 92 + noisenote 15, 230, 76 + noisenote 8, 177, 92 endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 91901faa..6ca12371 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,23 +1,23 @@ SFX_Cry08_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 + squarenote 15, 246, 101, 5 + squarenote 10, 228, 124, 5 + squarenote 3, 194, 92, 5 + squarenote 15, 178, 60, 5 endchannel SFX_Cry08_1_Ch5: dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 + squarenote 14, 214, 3, 5 + squarenote 9, 180, 27, 5 + squarenote 4, 146, 250, 4 + squarenote 15, 162, 219, 4 endchannel SFX_Cry08_1_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 + noisenote 12, 230, 76 + noisenote 11, 215, 92 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 45d12f38..f864e596 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,23 +1,23 @@ SFX_Cry08_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 + squarenote 15, 246, 101, 5 + squarenote 10, 228, 124, 5 + squarenote 3, 194, 92, 5 + squarenote 15, 178, 60, 5 endchannel SFX_Cry08_2_Ch5: dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 + squarenote 14, 214, 3, 5 + squarenote 9, 180, 27, 5 + squarenote 4, 146, 250, 4 + squarenote 15, 162, 219, 4 endchannel SFX_Cry08_2_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 + noisenote 12, 230, 76 + noisenote 11, 215, 92 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 8f1ec3fb..37b8b900 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,23 +1,23 @@ SFX_Cry08_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 + squarenote 15, 246, 101, 5 + squarenote 10, 228, 124, 5 + squarenote 3, 194, 92, 5 + squarenote 15, 178, 60, 5 endchannel SFX_Cry08_3_Ch5: dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 + squarenote 14, 214, 3, 5 + squarenote 9, 180, 27, 5 + squarenote 4, 146, 250, 4 + squarenote 15, 162, 219, 4 endchannel SFX_Cry08_3_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 + noisenote 12, 230, 76 + noisenote 11, 215, 92 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 11b4ab55..c09e6b72 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,35 +1,35 @@ SFX_Cry09_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 + squarenote 15, 247, 160, 7 + squarenote 6, 230, 163, 7 + squarenote 10, 244, 160, 7 dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 + squarenote 10, 246, 216, 7 + squarenote 4, 227, 215, 7 + squarenote 15, 242, 216, 7 endchannel SFX_Cry09_1_Ch5: dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 + squarenote 2, 8, 0, 0 + squarenote 15, 167, 161, 6 + squarenote 6, 134, 162, 6 + squarenote 10, 116, 161, 6 dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 + squarenote 10, 118, 214, 6 + squarenote 4, 131, 217, 6 + squarenote 15, 162, 215, 6 endchannel SFX_Cry09_1_Ch7: - 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 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 15, 215, 60 + noisenote 6, 197, 59 + noisenote 6, 228, 61 + noisenote 8, 182, 60 + noisenote 6, 212, 61 + noisenote 8, 193, 59 endchannel diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index ac4b1f74..93faf91e 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,35 +1,35 @@ SFX_Cry09_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 + squarenote 15, 247, 160, 7 + squarenote 6, 230, 163, 7 + squarenote 10, 244, 160, 7 dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 + squarenote 10, 246, 216, 7 + squarenote 4, 227, 215, 7 + squarenote 15, 242, 216, 7 endchannel SFX_Cry09_2_Ch5: dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 + squarenote 2, 8, 0, 0 + squarenote 15, 167, 161, 6 + squarenote 6, 134, 162, 6 + squarenote 10, 116, 161, 6 dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 + squarenote 10, 118, 214, 6 + squarenote 4, 131, 217, 6 + squarenote 15, 162, 215, 6 endchannel SFX_Cry09_2_Ch7: - 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 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 15, 215, 60 + noisenote 6, 197, 59 + noisenote 6, 228, 61 + noisenote 8, 182, 60 + noisenote 6, 212, 61 + noisenote 8, 193, 59 endchannel diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 1d3856cc..4edaf511 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,35 +1,35 @@ SFX_Cry09_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 + squarenote 15, 247, 160, 7 + squarenote 6, 230, 163, 7 + squarenote 10, 244, 160, 7 dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 + squarenote 10, 246, 216, 7 + squarenote 4, 227, 215, 7 + squarenote 15, 242, 216, 7 endchannel SFX_Cry09_3_Ch5: dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 + squarenote 2, 8, 0, 0 + squarenote 15, 167, 161, 6 + squarenote 6, 134, 162, 6 + squarenote 10, 116, 161, 6 dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 + squarenote 10, 118, 214, 6 + squarenote 4, 131, 217, 6 + squarenote 15, 162, 215, 6 endchannel SFX_Cry09_3_Ch7: - 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 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 15, 215, 60 + noisenote 6, 197, 59 + noisenote 6, 228, 61 + noisenote 8, 182, 60 + noisenote 6, 212, 61 + noisenote 8, 193, 59 endchannel diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 051a5d73..e05821c5 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,35 +1,35 @@ SFX_Cry0A_1_Ch4: 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 + squarenote 8, 247, 224, 6 + squarenote 6, 230, 229, 6 + squarenote 3, 244, 224, 6 + squarenote 3, 246, 208, 6 + squarenote 3, 227, 192, 6 + squarenote 4, 242, 176, 6 + squarenote 15, 162, 200, 6 endchannel SFX_Cry0A_1_Ch5: 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 + squarenote 3, 8, 0, 0 + squarenote 8, 167, 161, 6 + squarenote 6, 134, 163, 6 + squarenote 3, 116, 161, 6 + squarenote 3, 118, 145, 6 + squarenote 3, 131, 130, 6 + squarenote 4, 162, 113, 6 + squarenote 15, 114, 137, 6 endchannel SFX_Cry0A_1_Ch7: - 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 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 8, 215, 60 + noisenote 5, 197, 59 + noisenote 3, 212, 44 + noisenote 2, 182, 60 + noisenote 3, 164, 44 + noisenote 8, 145, 60 endchannel diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index d7fdd264..81653447 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,35 +1,35 @@ SFX_Cry0A_2_Ch4: 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 + squarenote 8, 247, 224, 6 + squarenote 6, 230, 229, 6 + squarenote 3, 244, 224, 6 + squarenote 3, 246, 208, 6 + squarenote 3, 227, 192, 6 + squarenote 4, 242, 176, 6 + squarenote 15, 162, 200, 6 endchannel SFX_Cry0A_2_Ch5: 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 + squarenote 3, 8, 0, 0 + squarenote 8, 167, 161, 6 + squarenote 6, 134, 163, 6 + squarenote 3, 116, 161, 6 + squarenote 3, 118, 145, 6 + squarenote 3, 131, 130, 6 + squarenote 4, 162, 113, 6 + squarenote 15, 114, 137, 6 endchannel SFX_Cry0A_2_Ch7: - 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 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 8, 215, 60 + noisenote 5, 197, 59 + noisenote 3, 212, 44 + noisenote 2, 182, 60 + noisenote 3, 164, 44 + noisenote 8, 145, 60 endchannel diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index e16287c4..6cc94434 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,35 +1,35 @@ SFX_Cry0A_3_Ch4: 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 + squarenote 8, 247, 224, 6 + squarenote 6, 230, 229, 6 + squarenote 3, 244, 224, 6 + squarenote 3, 246, 208, 6 + squarenote 3, 227, 192, 6 + squarenote 4, 242, 176, 6 + squarenote 15, 162, 200, 6 endchannel SFX_Cry0A_3_Ch5: 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 + squarenote 3, 8, 0, 0 + squarenote 8, 167, 161, 6 + squarenote 6, 134, 163, 6 + squarenote 3, 116, 161, 6 + squarenote 3, 118, 145, 6 + squarenote 3, 131, 130, 6 + squarenote 4, 162, 113, 6 + squarenote 15, 114, 137, 6 endchannel SFX_Cry0A_3_Ch7: - 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 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 8, 215, 60 + noisenote 5, 197, 59 + noisenote 3, 212, 44 + noisenote 2, 182, 60 + noisenote 3, 164, 44 + noisenote 8, 145, 60 endchannel diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 5ee9b81c..612be214 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,37 +1,37 @@ SFX_Cry0B_1_Ch4: 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 + squarenote 4, 241, 0, 7 + squarenote 4, 225, 128, 7 + squarenote 4, 209, 64, 7 + squarenote 4, 225, 64, 7 + squarenote 4, 241, 128, 7 + squarenote 4, 209, 0, 7 + squarenote 4, 241, 1, 7 + squarenote 4, 209, 130, 7 + squarenote 4, 193, 66, 7 + squarenote 8, 177, 65, 7 endchannel SFX_Cry0B_1_Ch5: 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 + squarenote 12, 8, 0, 0 + squarenote 4, 241, 1, 7 + squarenote 4, 225, 130, 7 + squarenote 4, 209, 65, 7 + squarenote 4, 225, 65, 7 + squarenote 4, 241, 130, 7 + squarenote 8, 209, 1, 7 endchannel SFX_Cry0B_1_Ch7: - 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 + noisenote 15, 8, 0 + noisenote 4, 8, 0 + noisenote 4, 209, 76 + noisenote 4, 177, 44 + noisenote 4, 209, 60 + noisenote 4, 177, 60 + noisenote 4, 193, 44 + noisenote 8, 161, 76 endchannel diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index f762ea02..88a7fdc8 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,37 +1,37 @@ SFX_Cry0B_2_Ch4: 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 + squarenote 4, 241, 0, 7 + squarenote 4, 225, 128, 7 + squarenote 4, 209, 64, 7 + squarenote 4, 225, 64, 7 + squarenote 4, 241, 128, 7 + squarenote 4, 209, 0, 7 + squarenote 4, 241, 1, 7 + squarenote 4, 209, 130, 7 + squarenote 4, 193, 66, 7 + squarenote 8, 177, 65, 7 endchannel SFX_Cry0B_2_Ch5: 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 + squarenote 12, 8, 0, 0 + squarenote 4, 241, 1, 7 + squarenote 4, 225, 130, 7 + squarenote 4, 209, 65, 7 + squarenote 4, 225, 65, 7 + squarenote 4, 241, 130, 7 + squarenote 8, 209, 1, 7 endchannel SFX_Cry0B_2_Ch7: - 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 + noisenote 15, 8, 0 + noisenote 4, 8, 0 + noisenote 4, 209, 76 + noisenote 4, 177, 44 + noisenote 4, 209, 60 + noisenote 4, 177, 60 + noisenote 4, 193, 44 + noisenote 8, 161, 76 endchannel diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index 22420974..ccc9728a 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,37 +1,37 @@ SFX_Cry0B_3_Ch4: 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 + squarenote 4, 241, 0, 7 + squarenote 4, 225, 128, 7 + squarenote 4, 209, 64, 7 + squarenote 4, 225, 64, 7 + squarenote 4, 241, 128, 7 + squarenote 4, 209, 0, 7 + squarenote 4, 241, 1, 7 + squarenote 4, 209, 130, 7 + squarenote 4, 193, 66, 7 + squarenote 8, 177, 65, 7 endchannel SFX_Cry0B_3_Ch5: 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 + squarenote 12, 8, 0, 0 + squarenote 4, 241, 1, 7 + squarenote 4, 225, 130, 7 + squarenote 4, 209, 65, 7 + squarenote 4, 225, 65, 7 + squarenote 4, 241, 130, 7 + squarenote 8, 209, 1, 7 endchannel SFX_Cry0B_3_Ch7: - 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 + noisenote 15, 8, 0 + noisenote 4, 8, 0 + noisenote 4, 209, 76 + noisenote 4, 177, 44 + noisenote 4, 209, 60 + noisenote 4, 177, 60 + noisenote 4, 193, 44 + noisenote 8, 161, 76 endchannel diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index dfbf0283..3b31ec94 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,28 +1,28 @@ SFX_Cry0C_1_Ch4: 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 + squarenote 8, 245, 0, 6 + squarenote 2, 210, 56, 6 + squarenote 2, 194, 48, 6 + squarenote 2, 194, 40, 6 + squarenote 2, 178, 32, 6 + squarenote 2, 178, 16, 6 + squarenote 2, 162, 24, 6 + squarenote 2, 178, 16, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry0C_1_Ch5: 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 + squarenote 12, 195, 192, 5 + squarenote 3, 177, 249, 5 + squarenote 2, 161, 241, 5 + squarenote 2, 161, 233, 5 + squarenote 2, 145, 225, 5 + squarenote 2, 145, 217, 5 + squarenote 2, 129, 209, 5 + squarenote 2, 145, 217, 5 + squarenote 8, 145, 225, 5 SFX_Cry0C_1_Ch7: diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 11e0d06a..78695578 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,28 +1,28 @@ SFX_Cry0C_2_Ch4: 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 + squarenote 8, 245, 0, 6 + squarenote 2, 210, 56, 6 + squarenote 2, 194, 48, 6 + squarenote 2, 194, 40, 6 + squarenote 2, 178, 32, 6 + squarenote 2, 178, 16, 6 + squarenote 2, 162, 24, 6 + squarenote 2, 178, 16, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry0C_2_Ch5: 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 + squarenote 12, 195, 192, 5 + squarenote 3, 177, 249, 5 + squarenote 2, 161, 241, 5 + squarenote 2, 161, 233, 5 + squarenote 2, 145, 225, 5 + squarenote 2, 145, 217, 5 + squarenote 2, 129, 209, 5 + squarenote 2, 145, 217, 5 + squarenote 8, 145, 225, 5 SFX_Cry0C_2_Ch7: diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 6fc798f2..7b8b0c41 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,28 +1,28 @@ SFX_Cry0C_3_Ch4: 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 + squarenote 8, 245, 0, 6 + squarenote 2, 210, 56, 6 + squarenote 2, 194, 48, 6 + squarenote 2, 194, 40, 6 + squarenote 2, 178, 32, 6 + squarenote 2, 178, 16, 6 + squarenote 2, 162, 24, 6 + squarenote 2, 178, 16, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry0C_3_Ch5: 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 + squarenote 12, 195, 192, 5 + squarenote 3, 177, 249, 5 + squarenote 2, 161, 241, 5 + squarenote 2, 161, 233, 5 + squarenote 2, 145, 225, 5 + squarenote 2, 145, 217, 5 + squarenote 2, 129, 209, 5 + squarenote 2, 145, 217, 5 + squarenote 8, 145, 225, 5 SFX_Cry0C_3_Ch7: diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 2864fa01..b4fd1344 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,40 +1,40 @@ SFX_Cry0D_1_Ch4: 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 + squarenote 5, 242, 80, 6 + squarenote 9, 209, 96, 6 + squarenote 5, 226, 18, 6 + squarenote 9, 193, 34, 6 + squarenote 5, 242, 16, 6 + squarenote 6, 209, 32, 6 loopchannel 2, SFX_Cry0D_1_Ch4 endchannel SFX_Cry0D_1_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 5, 242, 81, 6 + squarenote 9, 209, 97, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 12, 209, 33, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 4, 209, 33, 6 endchannel SFX_Cry0D_1_Ch7: - 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 + noisenote 6, 210, 28 + noisenote 9, 177, 44 + noisenote 8, 194, 44 + noisenote 9, 177, 60 + noisenote 6, 194, 44 + noisenote 9, 162, 60 + noisenote 7, 194, 44 + noisenote 5, 161, 60 + noisenote 9, 194, 44 + noisenote 4, 161, 60 endchannel diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index ef4a0eb6..76ca2392 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,40 +1,40 @@ SFX_Cry0D_2_Ch4: 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 + squarenote 5, 242, 80, 6 + squarenote 9, 209, 96, 6 + squarenote 5, 226, 18, 6 + squarenote 9, 193, 34, 6 + squarenote 5, 242, 16, 6 + squarenote 6, 209, 32, 6 loopchannel 2, SFX_Cry0D_2_Ch4 endchannel SFX_Cry0D_2_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 5, 242, 81, 6 + squarenote 9, 209, 97, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 12, 209, 33, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 4, 209, 33, 6 endchannel SFX_Cry0D_2_Ch7: - 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 + noisenote 6, 210, 28 + noisenote 9, 177, 44 + noisenote 8, 194, 44 + noisenote 9, 177, 60 + noisenote 6, 194, 44 + noisenote 9, 162, 60 + noisenote 7, 194, 44 + noisenote 5, 161, 60 + noisenote 9, 194, 44 + noisenote 4, 161, 60 endchannel diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 1fbc40b5..56d1a5c6 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,40 +1,40 @@ SFX_Cry0D_3_Ch4: 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 + squarenote 5, 242, 80, 6 + squarenote 9, 209, 96, 6 + squarenote 5, 226, 18, 6 + squarenote 9, 193, 34, 6 + squarenote 5, 242, 16, 6 + squarenote 6, 209, 32, 6 loopchannel 2, SFX_Cry0D_3_Ch4 endchannel SFX_Cry0D_3_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 5, 242, 81, 6 + squarenote 9, 209, 97, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 12, 209, 33, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 4, 209, 33, 6 endchannel SFX_Cry0D_3_Ch7: - 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 + noisenote 6, 210, 28 + noisenote 9, 177, 44 + noisenote 8, 194, 44 + noisenote 9, 177, 60 + noisenote 6, 194, 44 + noisenote 9, 162, 60 + noisenote 7, 194, 44 + noisenote 5, 161, 60 + noisenote 9, 194, 44 + noisenote 4, 161, 60 endchannel diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 37cabb7c..fb4a8d53 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,23 +1,23 @@ SFX_Cry0E_1_Ch4: dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 + squarenote 4, 225, 0, 7 + squarenote 4, 242, 128, 7 + squarenote 2, 146, 64, 7 + squarenote 8, 225, 0, 6 endchannel SFX_Cry0E_1_Ch5: dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 + squarenote 4, 177, 225, 6 + squarenote 3, 194, 225, 6 + squarenote 3, 98, 129, 6 + squarenote 8, 177, 225, 5 endchannel SFX_Cry0E_1_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 + noisenote 2, 97, 50 + noisenote 2, 97, 33 + noisenote 8, 97, 17 endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 5f6f481f..3a5e7f58 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,23 +1,23 @@ SFX_Cry0E_2_Ch4: dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 + squarenote 4, 225, 0, 7 + squarenote 4, 242, 128, 7 + squarenote 2, 146, 64, 7 + squarenote 8, 225, 0, 6 endchannel SFX_Cry0E_2_Ch5: dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 + squarenote 4, 177, 225, 6 + squarenote 3, 194, 225, 6 + squarenote 3, 98, 129, 6 + squarenote 8, 177, 225, 5 endchannel SFX_Cry0E_2_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 + noisenote 2, 97, 50 + noisenote 2, 97, 33 + noisenote 8, 97, 17 endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 13cf9405..15bea347 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,23 +1,23 @@ SFX_Cry0E_3_Ch4: dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 + squarenote 4, 225, 0, 7 + squarenote 4, 242, 128, 7 + squarenote 2, 146, 64, 7 + squarenote 8, 225, 0, 6 endchannel SFX_Cry0E_3_Ch5: dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 + squarenote 4, 177, 225, 6 + squarenote 3, 194, 225, 6 + squarenote 3, 98, 129, 6 + squarenote 8, 177, 225, 5 endchannel SFX_Cry0E_3_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 + noisenote 2, 97, 50 + noisenote 2, 97, 33 + noisenote 8, 97, 17 endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 81abdc09..8c260c93 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,29 +1,29 @@ SFX_Cry0F_1_Ch4: 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 + squarenote 4, 247, 192, 7 + squarenote 12, 230, 194, 7 + squarenote 6, 181, 128, 6 + squarenote 4, 196, 112, 6 + squarenote 4, 181, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry0F_1_Ch5: 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 + squarenote 3, 199, 129, 7 + squarenote 12, 182, 128, 7 + squarenote 6, 165, 65, 6 + squarenote 4, 196, 50, 6 + squarenote 6, 181, 33, 6 + squarenote 8, 161, 2, 6 endchannel SFX_Cry0F_1_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 + noisenote 3, 228, 60 + noisenote 12, 214, 44 + noisenote 4, 228, 60 + noisenote 8, 183, 92 + noisenote 15, 194, 93 endchannel diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 112b9e8b..4812e0fb 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,29 +1,29 @@ SFX_Cry0F_2_Ch4: 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 + squarenote 4, 247, 192, 7 + squarenote 12, 230, 194, 7 + squarenote 6, 181, 128, 6 + squarenote 4, 196, 112, 6 + squarenote 4, 181, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry0F_2_Ch5: 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 + squarenote 3, 199, 129, 7 + squarenote 12, 182, 128, 7 + squarenote 6, 165, 65, 6 + squarenote 4, 196, 50, 6 + squarenote 6, 181, 33, 6 + squarenote 8, 161, 2, 6 endchannel SFX_Cry0F_2_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 + noisenote 3, 228, 60 + noisenote 12, 214, 44 + noisenote 4, 228, 60 + noisenote 8, 183, 92 + noisenote 15, 194, 93 endchannel diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 08abd131..3f612b84 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,29 +1,29 @@ SFX_Cry0F_3_Ch4: 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 + squarenote 4, 247, 192, 7 + squarenote 12, 230, 194, 7 + squarenote 6, 181, 128, 6 + squarenote 4, 196, 112, 6 + squarenote 4, 181, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry0F_3_Ch5: 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 + squarenote 3, 199, 129, 7 + squarenote 12, 182, 128, 7 + squarenote 6, 165, 65, 6 + squarenote 4, 196, 50, 6 + squarenote 6, 181, 33, 6 + squarenote 8, 161, 2, 6 endchannel SFX_Cry0F_3_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 + noisenote 3, 228, 60 + noisenote 12, 214, 44 + noisenote 4, 228, 60 + noisenote 8, 183, 92 + noisenote 15, 194, 93 endchannel diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index eef13d3d..46a1498b 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,31 +1,31 @@ SFX_Cry10_1_Ch4: 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 + squarenote 8, 247, 128, 6 + squarenote 2, 247, 96, 6 + squarenote 1, 231, 64, 6 + squarenote 1, 231, 32, 6 + squarenote 15, 209, 0, 6 + squarenote 4, 199, 64, 7 + squarenote 4, 167, 48, 7 + squarenote 15, 145, 32, 7 endchannel SFX_Cry10_1_Ch5: 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 + squarenote 10, 231, 130, 6 + squarenote 2, 231, 98, 6 + squarenote 1, 215, 66, 6 + squarenote 1, 215, 34, 6 + squarenote 15, 193, 2, 6 + squarenote 4, 183, 66, 7 + squarenote 2, 151, 50, 7 + squarenote 15, 129, 34, 7 endchannel SFX_Cry10_1_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 + noisenote 4, 116, 33 + noisenote 4, 116, 16 + noisenote 4, 113, 32 endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index dd468979..047413ae 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,31 +1,31 @@ SFX_Cry10_2_Ch4: 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 + squarenote 8, 247, 128, 6 + squarenote 2, 247, 96, 6 + squarenote 1, 231, 64, 6 + squarenote 1, 231, 32, 6 + squarenote 15, 209, 0, 6 + squarenote 4, 199, 64, 7 + squarenote 4, 167, 48, 7 + squarenote 15, 145, 32, 7 endchannel SFX_Cry10_2_Ch5: 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 + squarenote 10, 231, 130, 6 + squarenote 2, 231, 98, 6 + squarenote 1, 215, 66, 6 + squarenote 1, 215, 34, 6 + squarenote 15, 193, 2, 6 + squarenote 4, 183, 66, 7 + squarenote 2, 151, 50, 7 + squarenote 15, 129, 34, 7 endchannel SFX_Cry10_2_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 + noisenote 4, 116, 33 + noisenote 4, 116, 16 + noisenote 4, 113, 32 endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index e9a5200d..ecebe7e4 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,31 +1,31 @@ SFX_Cry10_3_Ch4: 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 + squarenote 8, 247, 128, 6 + squarenote 2, 247, 96, 6 + squarenote 1, 231, 64, 6 + squarenote 1, 231, 32, 6 + squarenote 15, 209, 0, 6 + squarenote 4, 199, 64, 7 + squarenote 4, 167, 48, 7 + squarenote 15, 145, 32, 7 endchannel SFX_Cry10_3_Ch5: 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 + squarenote 10, 231, 130, 6 + squarenote 2, 231, 98, 6 + squarenote 1, 215, 66, 6 + squarenote 1, 215, 34, 6 + squarenote 15, 193, 2, 6 + squarenote 4, 183, 66, 7 + squarenote 2, 151, 50, 7 + squarenote 15, 129, 34, 7 endchannel SFX_Cry10_3_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 + noisenote 4, 116, 33 + noisenote 4, 116, 16 + noisenote 4, 113, 32 endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index f7c314ef..0b632a02 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,34 +1,34 @@ SFX_Cry11_1_Ch4: 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 + squarenote 6, 247, 160, 7 + squarenote 8, 230, 164, 7 + squarenote 4, 214, 160, 7 + squarenote 15, 211, 32, 7 + squarenote 8, 195, 35, 7 + squarenote 2, 194, 40, 7 + squarenote 8, 177, 48, 7 endchannel SFX_Cry11_1_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 6, 167, 65, 7 + squarenote 8, 134, 67, 7 + squarenote 4, 118, 65, 7 + squarenote 13, 131, 194, 6 + squarenote 7, 115, 193, 6 + squarenote 3, 130, 204, 6 + squarenote 8, 113, 216, 6 endchannel SFX_Cry11_1_Ch7: - 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 + noisenote 2, 242, 76 + noisenote 6, 230, 58 + noisenote 4, 215, 58 + noisenote 6, 214, 44 + noisenote 8, 229, 60 + noisenote 12, 210, 61 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 0009a0ec..2bf5a547 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,34 +1,34 @@ SFX_Cry11_2_Ch4: 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 + squarenote 6, 247, 160, 7 + squarenote 8, 230, 164, 7 + squarenote 4, 214, 160, 7 + squarenote 15, 211, 32, 7 + squarenote 8, 195, 35, 7 + squarenote 2, 194, 40, 7 + squarenote 8, 177, 48, 7 endchannel SFX_Cry11_2_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 6, 167, 65, 7 + squarenote 8, 134, 67, 7 + squarenote 4, 118, 65, 7 + squarenote 13, 131, 194, 6 + squarenote 7, 115, 193, 6 + squarenote 3, 130, 204, 6 + squarenote 8, 113, 216, 6 endchannel SFX_Cry11_2_Ch7: - 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 + noisenote 2, 242, 76 + noisenote 6, 230, 58 + noisenote 4, 215, 58 + noisenote 6, 214, 44 + noisenote 8, 229, 60 + noisenote 12, 210, 61 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index a8af19f6..6fe2c7d0 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,34 +1,34 @@ SFX_Cry11_3_Ch4: 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 + squarenote 6, 247, 160, 7 + squarenote 8, 230, 164, 7 + squarenote 4, 214, 160, 7 + squarenote 15, 211, 32, 7 + squarenote 8, 195, 35, 7 + squarenote 2, 194, 40, 7 + squarenote 8, 177, 48, 7 endchannel SFX_Cry11_3_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 6, 167, 65, 7 + squarenote 8, 134, 67, 7 + squarenote 4, 118, 65, 7 + squarenote 13, 131, 194, 6 + squarenote 7, 115, 193, 6 + squarenote 3, 130, 204, 6 + squarenote 8, 113, 216, 6 endchannel SFX_Cry11_3_Ch7: - 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 + noisenote 2, 242, 76 + noisenote 6, 230, 58 + noisenote 4, 215, 58 + noisenote 6, 214, 44 + noisenote 8, 229, 60 + noisenote 12, 210, 61 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index 29d93eff..c919ddd0 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,24 +1,24 @@ SFX_Cry12_1_Ch4: dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 + squarenote 12, 242, 64, 4 + squarenote 15, 227, 160, 4 + squarenote 4, 210, 144, 4 + squarenote 8, 209, 128, 4 endchannel SFX_Cry12_1_Ch5: dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 + squarenote 11, 210, 56, 4 + squarenote 14, 198, 152, 4 + squarenote 3, 178, 136, 4 + squarenote 8, 177, 120, 4 endchannel SFX_Cry12_1_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 + noisenote 10, 230, 108 + noisenote 15, 210, 92 + noisenote 3, 194, 108 + noisenote 8, 209, 92 endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 90f373c0..4715c969 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,24 +1,24 @@ SFX_Cry12_2_Ch4: dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 + squarenote 12, 242, 64, 4 + squarenote 15, 227, 160, 4 + squarenote 4, 210, 144, 4 + squarenote 8, 209, 128, 4 endchannel SFX_Cry12_2_Ch5: dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 + squarenote 11, 210, 56, 4 + squarenote 14, 198, 152, 4 + squarenote 3, 178, 136, 4 + squarenote 8, 177, 120, 4 endchannel SFX_Cry12_2_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 + noisenote 10, 230, 108 + noisenote 15, 210, 92 + noisenote 3, 194, 108 + noisenote 8, 209, 92 endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index f2c012ae..10d067ef 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,24 +1,24 @@ SFX_Cry12_3_Ch4: dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 + squarenote 12, 242, 64, 4 + squarenote 15, 227, 160, 4 + squarenote 4, 210, 144, 4 + squarenote 8, 209, 128, 4 endchannel SFX_Cry12_3_Ch5: dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 + squarenote 11, 210, 56, 4 + squarenote 14, 198, 152, 4 + squarenote 3, 178, 136, 4 + squarenote 8, 177, 120, 4 endchannel SFX_Cry12_3_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 + noisenote 10, 230, 108 + noisenote 15, 210, 92 + noisenote 3, 194, 108 + noisenote 8, 209, 92 endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 703db728..3d2b192e 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,30 +1,30 @@ SFX_Cry13_1_Ch4: 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 + squarenote 15, 246, 192, 5 + squarenote 8, 227, 188, 5 + squarenote 6, 210, 208, 5 + squarenote 6, 178, 224, 5 + squarenote 6, 194, 240, 5 + squarenote 8, 177, 0, 6 endchannel SFX_Cry13_1_Ch5: 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 + squarenote 14, 198, 177, 4 + squarenote 7, 195, 173, 4 + squarenote 5, 178, 193, 4 + squarenote 8, 146, 209, 4 + squarenote 6, 162, 225, 4 + squarenote 8, 145, 241, 4 endchannel SFX_Cry13_1_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 + noisenote 10, 230, 92 + noisenote 10, 214, 108 + noisenote 4, 194, 76 + noisenote 6, 211, 92 + noisenote 8, 179, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 7d75853c..650533ed 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,30 +1,30 @@ SFX_Cry13_2_Ch4: 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 + squarenote 15, 246, 192, 5 + squarenote 8, 227, 188, 5 + squarenote 6, 210, 208, 5 + squarenote 6, 178, 224, 5 + squarenote 6, 194, 240, 5 + squarenote 8, 177, 0, 6 endchannel SFX_Cry13_2_Ch5: 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 + squarenote 14, 198, 177, 4 + squarenote 7, 195, 173, 4 + squarenote 5, 178, 193, 4 + squarenote 8, 146, 209, 4 + squarenote 6, 162, 225, 4 + squarenote 8, 145, 241, 4 endchannel SFX_Cry13_2_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 + noisenote 10, 230, 92 + noisenote 10, 214, 108 + noisenote 4, 194, 76 + noisenote 6, 211, 92 + noisenote 8, 179, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index 53296f1a..5d84bb87 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,30 +1,30 @@ SFX_Cry13_3_Ch4: 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 + squarenote 15, 246, 192, 5 + squarenote 8, 227, 188, 5 + squarenote 6, 210, 208, 5 + squarenote 6, 178, 224, 5 + squarenote 6, 194, 240, 5 + squarenote 8, 177, 0, 6 endchannel SFX_Cry13_3_Ch5: 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 + squarenote 14, 198, 177, 4 + squarenote 7, 195, 173, 4 + squarenote 5, 178, 193, 4 + squarenote 8, 146, 209, 4 + squarenote 6, 162, 225, 4 + squarenote 8, 145, 241, 4 endchannel SFX_Cry13_3_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 + noisenote 10, 230, 92 + noisenote 10, 214, 108 + noisenote 4, 194, 76 + noisenote 6, 211, 92 + noisenote 8, 179, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index fa8964de..58d5082d 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,21 +1,21 @@ SFX_Cry14_1_Ch4: dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 + squarenote 8, 228, 144, 7 + squarenote 15, 245, 192, 7 + squarenote 8, 209, 216, 7 endchannel SFX_Cry14_1_Ch5: dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 + squarenote 10, 196, 113, 7 + squarenote 15, 182, 162, 7 + squarenote 8, 161, 183, 7 endchannel SFX_Cry14_1_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 + noisenote 8, 228, 76 + noisenote 14, 196, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 1f70dca8..7e326054 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,21 +1,21 @@ SFX_Cry14_2_Ch4: dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 + squarenote 8, 228, 144, 7 + squarenote 15, 245, 192, 7 + squarenote 8, 209, 216, 7 endchannel SFX_Cry14_2_Ch5: dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 + squarenote 10, 196, 113, 7 + squarenote 15, 182, 162, 7 + squarenote 8, 161, 183, 7 endchannel SFX_Cry14_2_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 + noisenote 8, 228, 76 + noisenote 14, 196, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index 3bab2100..42dc084d 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,21 +1,21 @@ SFX_Cry14_3_Ch4: dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 + squarenote 8, 228, 144, 7 + squarenote 15, 245, 192, 7 + squarenote 8, 209, 216, 7 endchannel SFX_Cry14_3_Ch5: dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 + squarenote 10, 196, 113, 7 + squarenote 15, 182, 162, 7 + squarenote 8, 161, 183, 7 endchannel SFX_Cry14_3_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 + noisenote 8, 228, 76 + noisenote 14, 196, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 0220ad4f..1a1e1a47 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,30 +1,30 @@ SFX_Cry15_1_Ch4: 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 + squarenote 4, 243, 128, 7 + squarenote 15, 231, 0, 7 + squarenote 8, 211, 16, 7 + squarenote 4, 194, 0, 7 + squarenote 4, 210, 240, 6 + squarenote 8, 193, 224, 6 endchannel SFX_Cry15_1_Ch5: 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 + squarenote 6, 195, 1, 7 + squarenote 14, 183, 129, 6 + squarenote 7, 179, 146, 6 + squarenote 3, 162, 129, 6 + squarenote 4, 178, 114, 6 + squarenote 8, 161, 97, 6 endchannel SFX_Cry15_1_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 + noisenote 6, 227, 92 + noisenote 14, 214, 76 + noisenote 6, 198, 60 + noisenote 3, 179, 76 + noisenote 3, 162, 92 + noisenote 8, 177, 108 endchannel diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 2ebd7ab0..29153506 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,30 +1,30 @@ SFX_Cry15_2_Ch4: 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 + squarenote 4, 243, 128, 7 + squarenote 15, 231, 0, 7 + squarenote 8, 211, 16, 7 + squarenote 4, 194, 0, 7 + squarenote 4, 210, 240, 6 + squarenote 8, 193, 224, 6 endchannel SFX_Cry15_2_Ch5: 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 + squarenote 6, 195, 1, 7 + squarenote 14, 183, 129, 6 + squarenote 7, 179, 146, 6 + squarenote 3, 162, 129, 6 + squarenote 4, 178, 114, 6 + squarenote 8, 161, 97, 6 endchannel SFX_Cry15_2_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 + noisenote 6, 227, 92 + noisenote 14, 214, 76 + noisenote 6, 198, 60 + noisenote 3, 179, 76 + noisenote 3, 162, 92 + noisenote 8, 177, 108 endchannel diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 39ba7a74..090b18b2 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,30 +1,30 @@ SFX_Cry15_3_Ch4: 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 + squarenote 4, 243, 128, 7 + squarenote 15, 231, 0, 7 + squarenote 8, 211, 16, 7 + squarenote 4, 194, 0, 7 + squarenote 4, 210, 240, 6 + squarenote 8, 193, 224, 6 endchannel SFX_Cry15_3_Ch5: 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 + squarenote 6, 195, 1, 7 + squarenote 14, 183, 129, 6 + squarenote 7, 179, 146, 6 + squarenote 3, 162, 129, 6 + squarenote 4, 178, 114, 6 + squarenote 8, 161, 97, 6 endchannel SFX_Cry15_3_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 + noisenote 6, 227, 92 + noisenote 14, 214, 76 + noisenote 6, 198, 60 + noisenote 3, 179, 76 + noisenote 3, 162, 92 + noisenote 8, 177, 108 endchannel diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 34d6f6d9..2009a8b4 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,21 +1,21 @@ SFX_Cry16_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 + squarenote 15, 215, 128, 7 + squarenote 4, 230, 160, 7 + squarenote 15, 210, 64, 7 endchannel SFX_Cry16_1_Ch5: dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 + squarenote 15, 199, 83, 7 + squarenote 5, 182, 114, 7 + squarenote 15, 194, 17, 7 endchannel SFX_Cry16_1_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 + noisenote 13, 246, 76 + noisenote 4, 230, 60 + noisenote 15, 242, 76 endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 8948cd29..7baabb45 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,21 +1,21 @@ SFX_Cry16_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 + squarenote 15, 215, 128, 7 + squarenote 4, 230, 160, 7 + squarenote 15, 210, 64, 7 endchannel SFX_Cry16_2_Ch5: dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 + squarenote 15, 199, 83, 7 + squarenote 5, 182, 114, 7 + squarenote 15, 194, 17, 7 endchannel SFX_Cry16_2_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 + noisenote 13, 246, 76 + noisenote 4, 230, 60 + noisenote 15, 242, 76 endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index 026ee67b..b86e9fb3 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,21 +1,21 @@ SFX_Cry16_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 + squarenote 15, 215, 128, 7 + squarenote 4, 230, 160, 7 + squarenote 15, 210, 64, 7 endchannel SFX_Cry16_3_Ch5: dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 + squarenote 15, 199, 83, 7 + squarenote 5, 182, 114, 7 + squarenote 15, 194, 17, 7 endchannel SFX_Cry16_3_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 + noisenote 13, 246, 76 + noisenote 4, 230, 60 + noisenote 15, 242, 76 endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 97dec764..1b754064 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,24 +1,24 @@ SFX_Cry17_1_Ch4: dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 + squarenote 15, 247, 0, 5 + squarenote 15, 231, 8, 5 + squarenote 8, 180, 128, 4 + squarenote 15, 162, 96, 4 endchannel SFX_Cry17_1_Ch5: dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 + squarenote 14, 215, 129, 4 + squarenote 14, 199, 137, 4 + squarenote 10, 180, 1, 4 + squarenote 15, 194, 225, 3 endchannel SFX_Cry17_1_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 + noisenote 14, 247, 124 + noisenote 12, 246, 108 + noisenote 9, 228, 124 + noisenote 15, 226, 108 endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index a6ab03a2..8e40e269 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,24 +1,24 @@ SFX_Cry17_2_Ch4: dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 + squarenote 15, 247, 0, 5 + squarenote 15, 231, 8, 5 + squarenote 8, 180, 128, 4 + squarenote 15, 162, 96, 4 endchannel SFX_Cry17_2_Ch5: dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 + squarenote 14, 215, 129, 4 + squarenote 14, 199, 137, 4 + squarenote 10, 180, 1, 4 + squarenote 15, 194, 225, 3 endchannel SFX_Cry17_2_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 + noisenote 14, 247, 124 + noisenote 12, 246, 108 + noisenote 9, 228, 124 + noisenote 15, 226, 108 endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 53555206..a8aa3d26 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,24 +1,24 @@ SFX_Cry17_3_Ch4: dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 + squarenote 15, 247, 0, 5 + squarenote 15, 231, 8, 5 + squarenote 8, 180, 128, 4 + squarenote 15, 162, 96, 4 endchannel SFX_Cry17_3_Ch5: dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 + squarenote 14, 215, 129, 4 + squarenote 14, 199, 137, 4 + squarenote 10, 180, 1, 4 + squarenote 15, 194, 225, 3 endchannel SFX_Cry17_3_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 + noisenote 14, 247, 124 + noisenote 12, 246, 108 + noisenote 9, 228, 124 + noisenote 15, 226, 108 endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 8cb3283f..cd6ea771 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,34 +1,34 @@ SFX_Cry18_1_Ch4: 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 + squarenote 10, 245, 128, 6 + squarenote 3, 226, 160, 6 + squarenote 3, 242, 192, 6 + squarenote 3, 226, 224, 6 + squarenote 3, 210, 0, 7 + squarenote 3, 194, 224, 6 + squarenote 3, 210, 192, 6 + squarenote 8, 193, 160, 6 endchannel SFX_Cry18_1_Ch5: 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 + squarenote 9, 213, 49, 6 + squarenote 3, 210, 82, 6 + squarenote 3, 226, 113, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 178, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 113, 6 + squarenote 8, 177, 81, 6 endchannel SFX_Cry18_1_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 + noisenote 6, 227, 76 + noisenote 4, 195, 60 + noisenote 5, 212, 60 + noisenote 4, 196, 44 + noisenote 6, 180, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 01dacd5f..5d44d5c0 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,34 +1,34 @@ SFX_Cry18_2_Ch4: 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 + squarenote 10, 245, 128, 6 + squarenote 3, 226, 160, 6 + squarenote 3, 242, 192, 6 + squarenote 3, 226, 224, 6 + squarenote 3, 210, 0, 7 + squarenote 3, 194, 224, 6 + squarenote 3, 210, 192, 6 + squarenote 8, 193, 160, 6 endchannel SFX_Cry18_2_Ch5: 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 + squarenote 9, 213, 49, 6 + squarenote 3, 210, 82, 6 + squarenote 3, 226, 113, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 178, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 113, 6 + squarenote 8, 177, 81, 6 endchannel SFX_Cry18_2_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 + noisenote 6, 227, 76 + noisenote 4, 195, 60 + noisenote 5, 212, 60 + noisenote 4, 196, 44 + noisenote 6, 180, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 23d2d6a6..edd0eda4 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,34 +1,34 @@ SFX_Cry18_3_Ch4: 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 + squarenote 10, 245, 128, 6 + squarenote 3, 226, 160, 6 + squarenote 3, 242, 192, 6 + squarenote 3, 226, 224, 6 + squarenote 3, 210, 0, 7 + squarenote 3, 194, 224, 6 + squarenote 3, 210, 192, 6 + squarenote 8, 193, 160, 6 endchannel SFX_Cry18_3_Ch5: 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 + squarenote 9, 213, 49, 6 + squarenote 3, 210, 82, 6 + squarenote 3, 226, 113, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 178, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 113, 6 + squarenote 8, 177, 81, 6 endchannel SFX_Cry18_3_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 + noisenote 6, 227, 76 + noisenote 4, 195, 60 + noisenote 5, 212, 60 + noisenote 4, 196, 44 + noisenote 6, 180, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 2e6790e5..badcd4f9 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,17 +1,17 @@ SFX_Cry19_1_Ch4: dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 + squarenote 7, 210, 64, 7 + squarenote 15, 229, 96, 7 + squarenote 15, 193, 48, 7 endchannel SFX_Cry19_1_Ch5: dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 + squarenote 2, 194, 1, 7 + squarenote 4, 194, 8, 7 + squarenote 15, 215, 65, 7 + squarenote 15, 162, 1, 7 SFX_Cry19_1_Ch7: diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index f412ec14..baba2a1f 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,17 +1,17 @@ SFX_Cry19_2_Ch4: dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 + squarenote 7, 210, 64, 7 + squarenote 15, 229, 96, 7 + squarenote 15, 193, 48, 7 endchannel SFX_Cry19_2_Ch5: dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 + squarenote 2, 194, 1, 7 + squarenote 4, 194, 8, 7 + squarenote 15, 215, 65, 7 + squarenote 15, 162, 1, 7 SFX_Cry19_2_Ch7: diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 2baff05e..c2ef3f66 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,17 +1,17 @@ SFX_Cry19_3_Ch4: dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 + squarenote 7, 210, 64, 7 + squarenote 15, 229, 96, 7 + squarenote 15, 193, 48, 7 endchannel SFX_Cry19_3_Ch5: dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 + squarenote 2, 194, 1, 7 + squarenote 4, 194, 8, 7 + squarenote 15, 215, 65, 7 + squarenote 15, 162, 1, 7 SFX_Cry19_3_Ch7: diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 5d03596e..db8dee74 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,30 +1,30 @@ SFX_Cry1A_1_Ch4: 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 + squarenote 6, 247, 64, 7 + squarenote 12, 230, 68, 7 + squarenote 6, 213, 80, 7 + squarenote 4, 195, 96, 7 + squarenote 3, 195, 128, 7 + squarenote 8, 209, 160, 7 endchannel SFX_Cry1A_1_Ch5: 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 + squarenote 6, 199, 1, 7 + squarenote 11, 182, 2, 7 + squarenote 6, 165, 17, 7 + squarenote 4, 147, 33, 7 + squarenote 3, 163, 65, 7 + squarenote 8, 145, 98, 7 endchannel SFX_Cry1A_1_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 + noisenote 3, 226, 60 + noisenote 8, 214, 76 + noisenote 5, 212, 60 + noisenote 12, 199, 76 + noisenote 2, 226, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index 4dcf2a42..6b2a3a9f 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,30 +1,30 @@ SFX_Cry1A_2_Ch4: 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 + squarenote 6, 247, 64, 7 + squarenote 12, 230, 68, 7 + squarenote 6, 213, 80, 7 + squarenote 4, 195, 96, 7 + squarenote 3, 195, 128, 7 + squarenote 8, 209, 160, 7 endchannel SFX_Cry1A_2_Ch5: 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 + squarenote 6, 199, 1, 7 + squarenote 11, 182, 2, 7 + squarenote 6, 165, 17, 7 + squarenote 4, 147, 33, 7 + squarenote 3, 163, 65, 7 + squarenote 8, 145, 98, 7 endchannel SFX_Cry1A_2_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 + noisenote 3, 226, 60 + noisenote 8, 214, 76 + noisenote 5, 212, 60 + noisenote 12, 199, 76 + noisenote 2, 226, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 274ce438..7ec2f544 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,30 +1,30 @@ SFX_Cry1A_3_Ch4: 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 + squarenote 6, 247, 64, 7 + squarenote 12, 230, 68, 7 + squarenote 6, 213, 80, 7 + squarenote 4, 195, 96, 7 + squarenote 3, 195, 128, 7 + squarenote 8, 209, 160, 7 endchannel SFX_Cry1A_3_Ch5: 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 + squarenote 6, 199, 1, 7 + squarenote 11, 182, 2, 7 + squarenote 6, 165, 17, 7 + squarenote 4, 147, 33, 7 + squarenote 3, 163, 65, 7 + squarenote 8, 145, 98, 7 endchannel SFX_Cry1A_3_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 + noisenote 3, 226, 60 + noisenote 8, 214, 76 + noisenote 5, 212, 60 + noisenote 12, 199, 76 + noisenote 2, 226, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 562239c7..7eb1a301 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,26 +1,26 @@ SFX_Cry1B_1_Ch4: 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 + squarenote 6, 247, 192, 6 + squarenote 15, 231, 0, 7 + squarenote 4, 244, 240, 6 + squarenote 4, 228, 224, 6 + squarenote 8, 209, 208, 6 endchannel SFX_Cry1B_1_Ch5: 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 + squarenote 7, 230, 129, 6 + squarenote 14, 213, 193, 6 + squarenote 4, 196, 177, 6 + squarenote 4, 212, 161, 6 + squarenote 8, 193, 145, 6 endchannel SFX_Cry1B_1_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 + noisenote 10, 166, 60 + noisenote 14, 148, 44 + noisenote 5, 163, 60 + noisenote 8, 145, 44 endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 45bb41a2..c3ff4c8e 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,26 +1,26 @@ SFX_Cry1B_2_Ch4: 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 + squarenote 6, 247, 192, 6 + squarenote 15, 231, 0, 7 + squarenote 4, 244, 240, 6 + squarenote 4, 228, 224, 6 + squarenote 8, 209, 208, 6 endchannel SFX_Cry1B_2_Ch5: 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 + squarenote 7, 230, 129, 6 + squarenote 14, 213, 193, 6 + squarenote 4, 196, 177, 6 + squarenote 4, 212, 161, 6 + squarenote 8, 193, 145, 6 endchannel SFX_Cry1B_2_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 + noisenote 10, 166, 60 + noisenote 14, 148, 44 + noisenote 5, 163, 60 + noisenote 8, 145, 44 endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index e6e31b00..eb1cc9df 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,26 +1,26 @@ SFX_Cry1B_3_Ch4: 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 + squarenote 6, 247, 192, 6 + squarenote 15, 231, 0, 7 + squarenote 4, 244, 240, 6 + squarenote 4, 228, 224, 6 + squarenote 8, 209, 208, 6 endchannel SFX_Cry1B_3_Ch5: 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 + squarenote 7, 230, 129, 6 + squarenote 14, 213, 193, 6 + squarenote 4, 196, 177, 6 + squarenote 4, 212, 161, 6 + squarenote 8, 193, 145, 6 endchannel SFX_Cry1B_3_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 + noisenote 10, 166, 60 + noisenote 14, 148, 44 + noisenote 5, 163, 60 + noisenote 8, 145, 44 endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 332b7da8..66c9e397 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,31 +1,31 @@ SFX_Cry1C_1_Ch4: 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 + squarenote 7, 214, 225, 7 + squarenote 6, 198, 226, 7 + squarenote 9, 214, 225, 7 + squarenote 7, 198, 224, 7 + squarenote 5, 182, 226, 7 + squarenote 7, 198, 225, 7 + squarenote 6, 182, 224, 7 + squarenote 8, 161, 223, 7 endchannel SFX_Cry1C_1_Ch5: 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 + squarenote 6, 195, 201, 7 + squarenote 6, 179, 199, 7 + squarenote 10, 196, 195, 7 + squarenote 8, 180, 199, 7 + squarenote 6, 195, 201, 7 + squarenote 15, 162, 197, 7 endchannel SFX_Cry1C_1_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 + noisenote 13, 25, 124 + noisenote 13, 247, 140 + noisenote 12, 214, 124 + noisenote 8, 196, 108 + noisenote 15, 179, 92 endchannel diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index aee95be5..12096df3 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,31 +1,31 @@ SFX_Cry1C_2_Ch4: 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 + squarenote 7, 214, 225, 7 + squarenote 6, 198, 226, 7 + squarenote 9, 214, 225, 7 + squarenote 7, 198, 224, 7 + squarenote 5, 182, 226, 7 + squarenote 7, 198, 225, 7 + squarenote 6, 182, 224, 7 + squarenote 8, 161, 223, 7 endchannel SFX_Cry1C_2_Ch5: 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 + squarenote 6, 195, 201, 7 + squarenote 6, 179, 199, 7 + squarenote 10, 196, 195, 7 + squarenote 8, 180, 199, 7 + squarenote 6, 195, 201, 7 + squarenote 15, 162, 197, 7 endchannel SFX_Cry1C_2_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 + noisenote 13, 25, 124 + noisenote 13, 247, 140 + noisenote 12, 214, 124 + noisenote 8, 196, 108 + noisenote 15, 179, 92 endchannel diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 13e687f6..b126abb0 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,31 +1,31 @@ SFX_Cry1C_3_Ch4: 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 + squarenote 7, 214, 225, 7 + squarenote 6, 198, 226, 7 + squarenote 9, 214, 225, 7 + squarenote 7, 198, 224, 7 + squarenote 5, 182, 226, 7 + squarenote 7, 198, 225, 7 + squarenote 6, 182, 224, 7 + squarenote 8, 161, 223, 7 endchannel SFX_Cry1C_3_Ch5: 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 + squarenote 6, 195, 201, 7 + squarenote 6, 179, 199, 7 + squarenote 10, 196, 195, 7 + squarenote 8, 180, 199, 7 + squarenote 6, 195, 201, 7 + squarenote 15, 162, 197, 7 endchannel SFX_Cry1C_3_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 + noisenote 13, 25, 124 + noisenote 13, 247, 140 + noisenote 12, 214, 124 + noisenote 8, 196, 108 + noisenote 15, 179, 92 endchannel diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 4e7b6308..056ed408 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,29 +1,29 @@ SFX_Cry1D_1_Ch4: 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 + squarenote 15, 240, 5, 7 + squarenote 10, 224, 0, 7 + squarenote 6, 180, 16, 7 + squarenote 4, 211, 0, 7 + squarenote 6, 178, 32, 6 + squarenote 8, 161, 36, 6 endchannel SFX_Cry1D_1_Ch5: 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 + squarenote 15, 176, 195, 6 + squarenote 10, 160, 193, 6 + squarenote 6, 132, 210, 6 + squarenote 4, 147, 193, 6 + squarenote 6, 130, 225, 5 + squarenote 8, 97, 232, 5 endchannel SFX_Cry1D_1_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 + noisenote 6, 230, 76 + noisenote 15, 214, 60 + noisenote 10, 197, 74 + noisenote 1, 178, 91 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 9ee56bf8..bfce7c66 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,29 +1,29 @@ SFX_Cry1D_2_Ch4: 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 + squarenote 15, 240, 5, 7 + squarenote 10, 224, 0, 7 + squarenote 6, 180, 16, 7 + squarenote 4, 211, 0, 7 + squarenote 6, 178, 32, 6 + squarenote 8, 161, 36, 6 endchannel SFX_Cry1D_2_Ch5: 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 + squarenote 15, 176, 195, 6 + squarenote 10, 160, 193, 6 + squarenote 6, 132, 210, 6 + squarenote 4, 147, 193, 6 + squarenote 6, 130, 225, 5 + squarenote 8, 97, 232, 5 endchannel SFX_Cry1D_2_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 + noisenote 6, 230, 76 + noisenote 15, 214, 60 + noisenote 10, 197, 74 + noisenote 1, 178, 91 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index e2e5fae3..8b05e3cb 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,29 +1,29 @@ SFX_Cry1D_3_Ch4: 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 + squarenote 15, 240, 5, 7 + squarenote 10, 224, 0, 7 + squarenote 6, 180, 16, 7 + squarenote 4, 211, 0, 7 + squarenote 6, 178, 32, 6 + squarenote 8, 161, 36, 6 endchannel SFX_Cry1D_3_Ch5: 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 + squarenote 15, 176, 195, 6 + squarenote 10, 160, 193, 6 + squarenote 6, 132, 210, 6 + squarenote 4, 147, 193, 6 + squarenote 6, 130, 225, 5 + squarenote 8, 97, 232, 5 endchannel SFX_Cry1D_3_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 + noisenote 6, 230, 76 + noisenote 15, 214, 60 + noisenote 10, 197, 74 + noisenote 1, 178, 91 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 56d97001..d6bf2450 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,38 +1,38 @@ SFX_Cry1E_1_Ch4: 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 + squarenote 6, 242, 0, 6 + squarenote 6, 226, 64, 6 + squarenote 6, 210, 128, 6 + squarenote 6, 226, 192, 6 + squarenote 6, 210, 0, 7 + squarenote 6, 194, 64, 7 + squarenote 6, 178, 128, 7 + squarenote 8, 161, 192, 7 endchannel SFX_Cry1E_1_Ch5: 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 + squarenote 3, 8, 1, 0 + squarenote 6, 194, 193, 5 + squarenote 6, 178, 2, 6 + squarenote 6, 162, 65, 6 + squarenote 6, 178, 130, 6 + squarenote 6, 162, 194, 6 + squarenote 6, 146, 1, 7 + squarenote 6, 162, 66, 7 + squarenote 8, 129, 129, 7 endchannel SFX_Cry1E_1_Ch7: - 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 + noisenote 6, 8, 1 + noisenote 5, 226, 92 + noisenote 5, 194, 76 + noisenote 5, 210, 60 + noisenote 5, 178, 44 + noisenote 5, 194, 28 + noisenote 5, 162, 27 + noisenote 5, 146, 26 + noisenote 8, 129, 24 endchannel diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 7ed25afe..c9f7a2ed 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,38 +1,38 @@ SFX_Cry1E_2_Ch4: 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 + squarenote 6, 242, 0, 6 + squarenote 6, 226, 64, 6 + squarenote 6, 210, 128, 6 + squarenote 6, 226, 192, 6 + squarenote 6, 210, 0, 7 + squarenote 6, 194, 64, 7 + squarenote 6, 178, 128, 7 + squarenote 8, 161, 192, 7 endchannel SFX_Cry1E_2_Ch5: 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 + squarenote 3, 8, 1, 0 + squarenote 6, 194, 193, 5 + squarenote 6, 178, 2, 6 + squarenote 6, 162, 65, 6 + squarenote 6, 178, 130, 6 + squarenote 6, 162, 194, 6 + squarenote 6, 146, 1, 7 + squarenote 6, 162, 66, 7 + squarenote 8, 129, 129, 7 endchannel SFX_Cry1E_2_Ch7: - 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 + noisenote 6, 8, 1 + noisenote 5, 226, 92 + noisenote 5, 194, 76 + noisenote 5, 210, 60 + noisenote 5, 178, 44 + noisenote 5, 194, 28 + noisenote 5, 162, 27 + noisenote 5, 146, 26 + noisenote 8, 129, 24 endchannel diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 82dbdfcc..d54c72c9 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,38 +1,38 @@ SFX_Cry1E_3_Ch4: 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 + squarenote 6, 242, 0, 6 + squarenote 6, 226, 64, 6 + squarenote 6, 210, 128, 6 + squarenote 6, 226, 192, 6 + squarenote 6, 210, 0, 7 + squarenote 6, 194, 64, 7 + squarenote 6, 178, 128, 7 + squarenote 8, 161, 192, 7 endchannel SFX_Cry1E_3_Ch5: 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 + squarenote 3, 8, 1, 0 + squarenote 6, 194, 193, 5 + squarenote 6, 178, 2, 6 + squarenote 6, 162, 65, 6 + squarenote 6, 178, 130, 6 + squarenote 6, 162, 194, 6 + squarenote 6, 146, 1, 7 + squarenote 6, 162, 66, 7 + squarenote 8, 129, 129, 7 endchannel SFX_Cry1E_3_Ch7: - 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 + noisenote 6, 8, 1 + noisenote 5, 226, 92 + noisenote 5, 194, 76 + noisenote 5, 210, 60 + noisenote 5, 178, 44 + noisenote 5, 194, 28 + noisenote 5, 162, 27 + noisenote 5, 146, 26 + noisenote 8, 129, 24 endchannel diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index a38bd975..a636c051 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,24 +1,24 @@ SFX_Cry1F_1_Ch4: dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 + squarenote 3, 244, 65, 6 + squarenote 13, 214, 33, 7 + squarenote 8, 244, 25, 7 + squarenote 8, 193, 26, 7 endchannel SFX_Cry1F_1_Ch5: dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 + squarenote 4, 244, 128, 5 + squarenote 14, 230, 224, 6 + squarenote 8, 213, 216, 6 + squarenote 8, 209, 220, 6 endchannel SFX_Cry1F_1_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 + noisenote 5, 196, 70 + noisenote 13, 165, 68 + noisenote 8, 196, 69 + noisenote 8, 177, 68 endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 3d261bb2..efda76fa 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,24 +1,24 @@ SFX_Cry1F_2_Ch4: dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 + squarenote 3, 244, 65, 6 + squarenote 13, 214, 33, 7 + squarenote 8, 244, 25, 7 + squarenote 8, 193, 26, 7 endchannel SFX_Cry1F_2_Ch5: dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 + squarenote 4, 244, 128, 5 + squarenote 14, 230, 224, 6 + squarenote 8, 213, 216, 6 + squarenote 8, 209, 220, 6 endchannel SFX_Cry1F_2_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 + noisenote 5, 196, 70 + noisenote 13, 165, 68 + noisenote 8, 196, 69 + noisenote 8, 177, 68 endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 2bdfe24b..ea2403a5 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,24 +1,24 @@ SFX_Cry1F_3_Ch4: dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 + squarenote 3, 244, 65, 6 + squarenote 13, 214, 33, 7 + squarenote 8, 244, 25, 7 + squarenote 8, 193, 26, 7 endchannel SFX_Cry1F_3_Ch5: dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 + squarenote 4, 244, 128, 5 + squarenote 14, 230, 224, 6 + squarenote 8, 213, 216, 6 + squarenote 8, 209, 220, 6 endchannel SFX_Cry1F_3_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 + noisenote 5, 196, 70 + noisenote 13, 165, 68 + noisenote 8, 196, 69 + noisenote 8, 177, 68 endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 14ec6942..2ba98882 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,24 +1,24 @@ SFX_Cry20_1_Ch4: dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 + squarenote 13, 241, 17, 5 + squarenote 13, 225, 21, 5 + squarenote 13, 225, 17, 5 + squarenote 8, 209, 17, 5 endchannel SFX_Cry20_1_Ch5: dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 + squarenote 12, 225, 12, 5 + squarenote 12, 209, 16, 5 + squarenote 14, 193, 12, 5 + squarenote 8, 193, 10, 5 endchannel SFX_Cry20_1_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 + noisenote 14, 242, 101 + noisenote 13, 226, 85 + noisenote 14, 210, 86 + noisenote 8, 209, 102 endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index bcbf27a6..ae3ae4de 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,24 +1,24 @@ SFX_Cry20_2_Ch4: dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 + squarenote 13, 241, 17, 5 + squarenote 13, 225, 21, 5 + squarenote 13, 225, 17, 5 + squarenote 8, 209, 17, 5 endchannel SFX_Cry20_2_Ch5: dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 + squarenote 12, 225, 12, 5 + squarenote 12, 209, 16, 5 + squarenote 14, 193, 12, 5 + squarenote 8, 193, 10, 5 endchannel SFX_Cry20_2_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 + noisenote 14, 242, 101 + noisenote 13, 226, 85 + noisenote 14, 210, 86 + noisenote 8, 209, 102 endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 12e42d7f..1587a0aa 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,24 +1,24 @@ SFX_Cry20_3_Ch4: dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 + squarenote 13, 241, 17, 5 + squarenote 13, 225, 21, 5 + squarenote 13, 225, 17, 5 + squarenote 8, 209, 17, 5 endchannel SFX_Cry20_3_Ch5: dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 + squarenote 12, 225, 12, 5 + squarenote 12, 209, 16, 5 + squarenote 14, 193, 12, 5 + squarenote 8, 193, 10, 5 endchannel SFX_Cry20_3_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 + noisenote 14, 242, 101 + noisenote 13, 226, 85 + noisenote 14, 210, 86 + noisenote 8, 209, 102 endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index c08704d7..0d099839 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,26 +1,26 @@ SFX_Cry21_1_Ch4: 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 + squarenote 3, 243, 100, 5 + squarenote 2, 226, 68, 5 + squarenote 5, 209, 34, 5 + squarenote 2, 178, 132, 4 + squarenote 8, 209, 162, 4 + squarenote 3, 243, 36, 5 + squarenote 4, 228, 228, 4 + squarenote 8, 209, 2, 5 endchannel SFX_Cry21_1_Ch5: 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 + squarenote 3, 211, 96, 5 + squarenote 2, 194, 64, 5 + squarenote 5, 193, 32, 5 + squarenote 2, 146, 128, 4 + squarenote 8, 193, 160, 4 + squarenote 3, 211, 32, 5 + squarenote 3, 196, 224, 4 + squarenote 8, 193, 0, 5 SFX_Cry21_1_Ch7: diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index b8f68dbd..a4ec20b2 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,26 +1,26 @@ SFX_Cry21_2_Ch4: 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 + squarenote 3, 243, 100, 5 + squarenote 2, 226, 68, 5 + squarenote 5, 209, 34, 5 + squarenote 2, 178, 132, 4 + squarenote 8, 209, 162, 4 + squarenote 3, 243, 36, 5 + squarenote 4, 228, 228, 4 + squarenote 8, 209, 2, 5 endchannel SFX_Cry21_2_Ch5: 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 + squarenote 3, 211, 96, 5 + squarenote 2, 194, 64, 5 + squarenote 5, 193, 32, 5 + squarenote 2, 146, 128, 4 + squarenote 8, 193, 160, 4 + squarenote 3, 211, 32, 5 + squarenote 3, 196, 224, 4 + squarenote 8, 193, 0, 5 SFX_Cry21_2_Ch7: diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 4a549af9..9fa85b11 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,26 +1,26 @@ SFX_Cry21_3_Ch4: 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 + squarenote 3, 243, 100, 5 + squarenote 2, 226, 68, 5 + squarenote 5, 209, 34, 5 + squarenote 2, 178, 132, 4 + squarenote 8, 209, 162, 4 + squarenote 3, 243, 36, 5 + squarenote 4, 228, 228, 4 + squarenote 8, 209, 2, 5 endchannel SFX_Cry21_3_Ch5: 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 + squarenote 3, 211, 96, 5 + squarenote 2, 194, 64, 5 + squarenote 5, 193, 32, 5 + squarenote 2, 146, 128, 4 + squarenote 8, 193, 160, 4 + squarenote 3, 211, 32, 5 + squarenote 3, 196, 224, 4 + squarenote 8, 193, 0, 5 SFX_Cry21_3_Ch7: diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 0da8dbd2..71f026b6 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,24 +1,24 @@ SFX_Cry22_1_Ch4: dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 + squarenote 2, 61, 129, 3 + squarenote 7, 245, 1, 6 + squarenote 1, 194, 129, 4 + squarenote 8, 145, 129, 3 endchannel SFX_Cry22_1_Ch5: dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 + squarenote 2, 62, 176, 5 + squarenote 7, 213, 93, 7 + squarenote 1, 178, 176, 6 + squarenote 8, 97, 176, 5 endchannel SFX_Cry22_1_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 + noisenote 2, 146, 73 + noisenote 7, 181, 41 + noisenote 1, 162, 57 + noisenote 8, 145, 73 endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index d7456dbc..e47021e4 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,24 +1,24 @@ SFX_Cry22_2_Ch4: dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 + squarenote 2, 61, 129, 3 + squarenote 7, 245, 1, 6 + squarenote 1, 194, 129, 4 + squarenote 8, 145, 129, 3 endchannel SFX_Cry22_2_Ch5: dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 + squarenote 2, 62, 176, 5 + squarenote 7, 213, 93, 7 + squarenote 1, 178, 176, 6 + squarenote 8, 97, 176, 5 endchannel SFX_Cry22_2_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 + noisenote 2, 146, 73 + noisenote 7, 181, 41 + noisenote 1, 162, 57 + noisenote 8, 145, 73 endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 927c174c..19ee38a5 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,24 +1,24 @@ SFX_Cry22_3_Ch4: dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 + squarenote 2, 61, 129, 3 + squarenote 7, 245, 1, 6 + squarenote 1, 194, 129, 4 + squarenote 8, 145, 129, 3 endchannel SFX_Cry22_3_Ch5: dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 + squarenote 2, 62, 176, 5 + squarenote 7, 213, 93, 7 + squarenote 1, 178, 176, 6 + squarenote 8, 97, 176, 5 endchannel SFX_Cry22_3_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 + noisenote 2, 146, 73 + noisenote 7, 181, 41 + noisenote 1, 162, 57 + noisenote 8, 145, 73 endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index cc0587d7..87bcf9c5 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,25 +1,25 @@ SFX_Cry23_1_Ch4: 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 + squarenote 15, 247, 192, 7 + squarenote 6, 228, 193, 7 + squarenote 10, 246, 192, 7 + squarenote 4, 211, 194, 7 + squarenote 8, 193, 192, 7 endchannel SFX_Cry23_1_Ch5: dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 + squarenote 15, 151, 129, 7 + squarenote 6, 132, 128, 7 + squarenote 10, 150, 129, 7 + squarenote 15, 131, 129, 7 endchannel SFX_Cry23_1_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 + noisenote 3, 242, 60 + noisenote 13, 230, 44 + noisenote 15, 215, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 5d130aa5..d53448ea 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,25 +1,25 @@ SFX_Cry23_2_Ch4: 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 + squarenote 15, 247, 192, 7 + squarenote 6, 228, 193, 7 + squarenote 10, 246, 192, 7 + squarenote 4, 211, 194, 7 + squarenote 8, 193, 192, 7 endchannel SFX_Cry23_2_Ch5: dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 + squarenote 15, 151, 129, 7 + squarenote 6, 132, 128, 7 + squarenote 10, 150, 129, 7 + squarenote 15, 131, 129, 7 endchannel SFX_Cry23_2_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 + noisenote 3, 242, 60 + noisenote 13, 230, 44 + noisenote 15, 215, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 8ada0c63..c8f76727 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,25 +1,25 @@ SFX_Cry23_3_Ch4: 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 + squarenote 15, 247, 192, 7 + squarenote 6, 228, 193, 7 + squarenote 10, 246, 192, 7 + squarenote 4, 211, 194, 7 + squarenote 8, 193, 192, 7 endchannel SFX_Cry23_3_Ch5: dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 + squarenote 15, 151, 129, 7 + squarenote 6, 132, 128, 7 + squarenote 10, 150, 129, 7 + squarenote 15, 131, 129, 7 endchannel SFX_Cry23_3_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 + noisenote 3, 242, 60 + noisenote 13, 230, 44 + noisenote 15, 215, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index f79dc72c..0beb9ce5 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,33 +1,33 @@ SFX_Cry24_1_Ch4: 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 + squarenote 15, 247, 128, 6 + squarenote 10, 230, 132, 6 + squarenote 15, 215, 144, 6 + squarenote 8, 213, 144, 6 + squarenote 6, 196, 136, 6 + squarenote 5, 211, 112, 6 + squarenote 4, 211, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry24_1_Ch5: 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 + squarenote 15, 183, 65, 6 + squarenote 10, 150, 66, 6 + squarenote 15, 167, 81, 6 + squarenote 8, 165, 81, 6 + squarenote 6, 148, 71, 6 + squarenote 5, 163, 49, 6 + squarenote 4, 147, 34, 6 + squarenote 8, 113, 1, 6 endchannel SFX_Cry24_1_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 + noisenote 15, 228, 60 + noisenote 10, 199, 76 + noisenote 10, 199, 60 + noisenote 12, 183, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index aede2b95..67d8c45e 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,33 +1,33 @@ SFX_Cry24_2_Ch4: 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 + squarenote 15, 247, 128, 6 + squarenote 10, 230, 132, 6 + squarenote 15, 215, 144, 6 + squarenote 8, 213, 144, 6 + squarenote 6, 196, 136, 6 + squarenote 5, 211, 112, 6 + squarenote 4, 211, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry24_2_Ch5: 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 + squarenote 15, 183, 65, 6 + squarenote 10, 150, 66, 6 + squarenote 15, 167, 81, 6 + squarenote 8, 165, 81, 6 + squarenote 6, 148, 71, 6 + squarenote 5, 163, 49, 6 + squarenote 4, 147, 34, 6 + squarenote 8, 113, 1, 6 endchannel SFX_Cry24_2_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 + noisenote 15, 228, 60 + noisenote 10, 199, 76 + noisenote 10, 199, 60 + noisenote 12, 183, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index cad3ada1..10f87daf 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,33 +1,33 @@ SFX_Cry24_3_Ch4: 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 + squarenote 15, 247, 128, 6 + squarenote 10, 230, 132, 6 + squarenote 15, 215, 144, 6 + squarenote 8, 213, 144, 6 + squarenote 6, 196, 136, 6 + squarenote 5, 211, 112, 6 + squarenote 4, 211, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry24_3_Ch5: 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 + squarenote 15, 183, 65, 6 + squarenote 10, 150, 66, 6 + squarenote 15, 167, 81, 6 + squarenote 8, 165, 81, 6 + squarenote 6, 148, 71, 6 + squarenote 5, 163, 49, 6 + squarenote 4, 147, 34, 6 + squarenote 8, 113, 1, 6 endchannel SFX_Cry24_3_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 + noisenote 15, 228, 60 + noisenote 10, 199, 76 + noisenote 10, 199, 60 + noisenote 12, 183, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index f3ae46ae..35de0e60 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,26 +1,26 @@ SFX_Cry25_1_Ch4: 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 + squarenote 6, 244, 64, 7 + squarenote 15, 227, 48, 7 + squarenote 4, 244, 64, 7 + squarenote 5, 179, 72, 7 + squarenote 8, 209, 80, 7 endchannel SFX_Cry25_1_Ch5: 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 + squarenote 6, 195, 18, 7 + squarenote 15, 179, 4, 7 + squarenote 3, 195, 18, 7 + squarenote 4, 195, 33, 7 + squarenote 8, 177, 50, 7 endchannel SFX_Cry25_1_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 + noisenote 8, 214, 44 + noisenote 12, 198, 60 + noisenote 10, 182, 44 + noisenote 8, 145, 28 endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 9b976b4e..cef33546 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,26 +1,26 @@ SFX_Cry25_2_Ch4: 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 + squarenote 6, 244, 64, 7 + squarenote 15, 227, 48, 7 + squarenote 4, 244, 64, 7 + squarenote 5, 179, 72, 7 + squarenote 8, 209, 80, 7 endchannel SFX_Cry25_2_Ch5: 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 + squarenote 6, 195, 18, 7 + squarenote 15, 179, 4, 7 + squarenote 3, 195, 18, 7 + squarenote 4, 195, 33, 7 + squarenote 8, 177, 50, 7 endchannel SFX_Cry25_2_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 + noisenote 8, 214, 44 + noisenote 12, 198, 60 + noisenote 10, 182, 44 + noisenote 8, 145, 28 endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index e76feb9e..a21fd708 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,26 +1,26 @@ SFX_Cry25_3_Ch4: 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 + squarenote 6, 244, 64, 7 + squarenote 15, 227, 48, 7 + squarenote 4, 244, 64, 7 + squarenote 5, 179, 72, 7 + squarenote 8, 209, 80, 7 endchannel SFX_Cry25_3_Ch5: 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 + squarenote 6, 195, 18, 7 + squarenote 15, 179, 4, 7 + squarenote 3, 195, 18, 7 + squarenote 4, 195, 33, 7 + squarenote 8, 177, 50, 7 endchannel SFX_Cry25_3_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 + noisenote 8, 214, 44 + noisenote 12, 198, 60 + noisenote 10, 182, 44 + noisenote 8, 145, 28 endchannel diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index 73510fd7..c7a39215 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ SFX_Cut_1_Ch7: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 6e7d8951..3e2746eb 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ SFX_Cut_3_Ch7: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 35cae4df..9d8a0841 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_1_Ch7: - unknownnoise0x20 0, 161, 16 + noisenote 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index bffe7690..cc98561c 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_2_Ch7: - unknownnoise0x20 0, 161, 16 + noisenote 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 0f03f455..300e2971 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_3_Ch7: - unknownnoise0x20 0, 161, 16 + noisenote 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index ce19bb6b..5de9ab16 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_1_Ch7: - unknownnoise0x20 0, 162, 17 + noisenote 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index f45dec5b..33b904d4 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_2_Ch7: - unknownnoise0x20 0, 162, 17 + noisenote 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 2d2ebf1c..97d60589 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_3_Ch7: - unknownnoise0x20 0, 162, 17 + noisenote 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 98f3977d..a788cca2 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_1_Ch7: - unknownnoise0x20 0, 162, 80 + noisenote 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index 2a2cb997..b67984c6 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_2_Ch7: - unknownnoise0x20 0, 162, 80 + noisenote 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 60b96278..06b7f218 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_3_Ch7: - unknownnoise0x20 0, 162, 80 + noisenote 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 452fd5ed..525f9170 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ SFX_Damage_Ch7: - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 2, 244, 20 - unknownnoise0x20 15, 241, 50 + noisenote 2, 244, 68 + noisenote 2, 244, 20 + noisenote 15, 241, 50 endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index e7d5a8ca..6c9c2336 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ SFX_Denied_1_Ch4: 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 + pitchenvelope 90 + squarenote 4, 240, 0, 5 + pitchenvelope 8 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 1, 0, 0, 0 endchannel SFX_Denied_1_Ch5: duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 1, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 1, 4 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index cf3b2a20..0e7768cc 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,18 +1,18 @@ SFX_Denied_3_Ch4: 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 + pitchenvelope 90 + squarenote 4, 240, 0, 5 + pitchenvelope 8 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 1, 0, 0, 0 endchannel SFX_Denied_3_Ch5: duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 1, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 1, 4 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 08180071..f5fa966b 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ SFX_Dex_Page_Added_Ch4: duty 2 - unknownsfx0x10 68 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 68 + squarenote 15, 240, 240, 4 + pitchenvelope 23 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel SFX_Dex_Page_Added_Ch5: duty 2 - unknownsfx0x20 15, 146, 0, 6 - unknownsfx0x20 15, 146, 130, 7 + squarenote 15, 146, 0, 6 + squarenote 15, 146, 130, 7 endchannel diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 4e71ac36..732c9ac5 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ SFX_Doubleslap_Ch7: - unknownnoise0x20 8, 241, 50 - unknownnoise0x20 8, 241, 51 + noisenote 8, 241, 50 + noisenote 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 338c32ab..3d615458 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ SFX_Enter_PC_1_Ch4: duty 2 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 + squarenote 6, 240, 0, 7 + squarenote 4, 0, 0, 0 + squarenote 6, 240, 0, 7 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index f34ed9d0..7b6dc02e 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,7 +1,7 @@ SFX_Enter_PC_3_Ch4: duty 2 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 0, 7 + squarenote 4, 0, 0, 0 + squarenote 4, 240, 0, 7 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd403485..60e997a0 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ SFX_Faint_Fall_Ch4: duty 1 - unknownsfx0x10 175 - unknownsfx0x20 15, 242, 128, 7 - unknownsfx0x10 8 + pitchenvelope 175 + squarenote 15, 242, 128, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 479efab3..1892a81f 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ SFX_Faint_Thud_Ch4: - unknownsfx0x20 15, 209, 0, 2 - unknownsfx0x10 8 + squarenote 15, 209, 0, 2 + pitchenvelope 8 endchannel SFX_Faint_Thud_Ch7: - unknownnoise0x20 4, 245, 51 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 + noisenote 4, 245, 51 + noisenote 8, 244, 34 + noisenote 15, 242, 33 endchannel diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index ededef48..76b0f2f3 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ SFX_Fly_1_Ch7: - 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 + noisenote 2, 241, 18 + noisenote 2, 0, 0 + noisenote 2, 161, 18 + noisenote 2, 0, 0 + noisenote 2, 209, 18 + noisenote 2, 0, 0 + noisenote 2, 129, 18 + noisenote 2, 0, 0 + noisenote 2, 177, 18 + noisenote 2, 0, 0 + noisenote 2, 97, 18 + noisenote 2, 0, 0 + noisenote 2, 145, 18 + noisenote 2, 0, 0 + noisenote 2, 65, 18 + noisenote 2, 0, 0 endchannel diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 084c8b4c..5337f8d3 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ SFX_Fly_3_Ch7: - 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 + noisenote 2, 241, 18 + noisenote 2, 0, 0 + noisenote 2, 161, 18 + noisenote 2, 0, 0 + noisenote 2, 209, 18 + noisenote 2, 0, 0 + noisenote 2, 129, 18 + noisenote 2, 0, 0 + noisenote 2, 177, 18 + noisenote 2, 0, 0 + noisenote 2, 97, 18 + noisenote 2, 0, 0 + noisenote 2, 145, 18 + noisenote 2, 0, 0 + noisenote 2, 65, 18 + noisenote 2, 0, 0 endchannel diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index aa523774..e3ce983e 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ SFX_Go_Inside_1_Ch7: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 + noisenote 9, 241, 68 + noisenote 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 9939ba6d..467dfe0d 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ SFX_Go_Inside_3_Ch7: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 + noisenote 9, 241, 68 + noisenote 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index c60bb592..edf384e0 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ SFX_Go_Outside_1_Ch7: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 + noisenote 2, 241, 84 + noisenote 12, 113, 35 + noisenote 2, 177, 84 + noisenote 12, 97, 35 + noisenote 6, 65, 84 endchannel diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 30b9884c..25284c5c 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,7 +1,7 @@ SFX_Go_Outside_3_Ch7: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 + noisenote 2, 241, 84 + noisenote 12, 113, 35 + noisenote 2, 177, 84 + noisenote 12, 97, 35 + noisenote 6, 65, 84 endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index ca703c09..1166676e 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_1_Ch4: duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 + pitchenvelope 20 + squarenote 4, 242, 0, 6 + squarenote 4, 242, 0, 6 + pitchenvelope 23 + squarenote 15, 242, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index b06abe62..3c768ce7 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_2_Ch4: duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 + pitchenvelope 20 + squarenote 4, 242, 0, 6 + squarenote 4, 242, 0, 6 + pitchenvelope 23 + squarenote 15, 242, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index c13d74fd..727000de 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_3_Ch4: duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 + pitchenvelope 20 + squarenote 4, 242, 0, 6 + squarenote 4, 242, 0, 6 + pitchenvelope 23 + squarenote 15, 242, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 75400957..6a0cdabf 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_1_Ch4: duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 182937cd..a9a441b2 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_2_Ch4: duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index c238013a..d1ae5279 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_3_Ch4: duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ebaee990..49c40392 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_1_Ch4: duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 + pitchenvelope 44 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 2, 241, 0, 5 + pitchenvelope 8 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index ac11fee4..91f35fa4 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_3_Ch4: duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 + pitchenvelope 44 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 2, 241, 0, 5 + pitchenvelope 8 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 12ca5da6..6eccae73 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ SFX_Horn_Drill_Ch7: - unknownnoise0x20 3, 146, 49 - unknownnoise0x20 3, 178, 50 - unknownnoise0x20 3, 194, 51 - unknownnoise0x20 8, 241, 84 + noisenote 3, 146, 49 + noisenote 3, 178, 50 + noisenote 3, 194, 51 + noisenote 8, 241, 84 endchannel diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 82c58356..79b2c019 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ SFX_Intro_Crash_Ch7: - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 + noisenote 2, 210, 50 + noisenote 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 0d450e21..6434f0a8 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ SFX_Intro_Hip_Ch4: duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 64, 7 - unknownsfx0x10 8 + pitchenvelope 38 + squarenote 12, 194, 64, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 1bd9faec..89be1bfd 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ SFX_Intro_Hop_Ch4: duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 128, 6 - unknownsfx0x10 8 + pitchenvelope 38 + squarenote 12, 194, 128, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index bb534a70..c7b4d3ee 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ SFX_Intro_Lunge_Ch7: - 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 + noisenote 6, 32, 16 + noisenote 6, 47, 64 + noisenote 6, 79, 65 + noisenote 6, 143, 65 + noisenote 6, 207, 66 + noisenote 8, 215, 66 + noisenote 15, 231, 67 + noisenote 15, 242, 67 endchannel diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index 060ef09a..f9c5b278 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ SFX_Intro_Raise_Ch7: - unknownnoise0x20 2, 111, 33 - unknownnoise0x20 2, 175, 49 - unknownnoise0x20 15, 242, 65 + noisenote 2, 111, 33 + noisenote 2, 175, 49 + noisenote 15, 242, 65 endchannel diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index e874e773..93e6b7bc 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ SFX_Intro_Whoosh_Ch7: - unknownnoise0x20 4, 44, 32 - unknownnoise0x20 3, 160, 32 - unknownnoise0x20 3, 176, 33 - unknownnoise0x20 3, 192, 34 - unknownnoise0x20 15, 210, 36 + noisenote 4, 44, 32 + noisenote 3, 160, 32 + noisenote 3, 176, 33 + noisenote 3, 192, 34 + noisenote 15, 210, 36 endchannel diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 26acaf1b..d9626b09 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ SFX_Ledge_1_Ch4: duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 + pitchenvelope 149 + squarenote 15, 242, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 623e56ce..466ada0b 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ SFX_Ledge_3_Ch4: duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 + pitchenvelope 149 + squarenote 15, 242, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index 4b205470..b6b0f7ab 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_1_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 + noisenote 0, 161, 24 + noisenote 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index d530bd89..60b6c43a 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_2_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 + noisenote 0, 161, 24 + noisenote 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 8b5c2c6d..9657aadf 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_3_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 + noisenote 0, 161, 24 + noisenote 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 4e15e386..efadfbc4 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_1_Ch7: - unknownnoise0x20 0, 145, 34 + noisenote 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 5107fb77..9483d633 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_2_Ch7: - unknownnoise0x20 0, 145, 34 + noisenote 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 043c870d..e287b461 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_3_Ch7: - unknownnoise0x20 0, 145, 34 + noisenote 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index d0c689a4..95802909 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_1_Ch7: - unknownnoise0x20 0, 113, 34 + noisenote 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 3e470ae6..7f39ca62 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_2_Ch7: - unknownnoise0x20 0, 113, 34 + noisenote 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index c8749577..7c11a20f 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_3_Ch7: - unknownnoise0x20 0, 113, 34 + noisenote 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index ebe2ee1d..31f2399b 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_1_Ch7: - unknownnoise0x20 0, 97, 34 + noisenote 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index bdbe4d11..d658dd4c 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_2_Ch7: - unknownnoise0x20 0, 97, 34 + noisenote 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 59d72218..6ba03ff5 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_3_Ch7: - unknownnoise0x20 0, 97, 34 + noisenote 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 3f74c515..1847daa6 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ SFX_Not_Very_Effective_Ch7: - unknownnoise0x20 4, 143, 85 - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 + noisenote 4, 143, 85 + noisenote 2, 244, 68 + noisenote 8, 244, 34 + noisenote 15, 242, 33 endchannel diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index cca7ecaa..23970df5 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ SFX_Peck_Ch7: - unknownnoise0x20 2, 161, 18 + noisenote 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 73068b86..3bf3cf91 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ SFX_Poisoned_1_Ch4: duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 + pitchenvelope 20 + squarenote 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_1_Ch4 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 + squarenote 15, 243, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index 7dc973bc..b651e3db 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ SFX_Poisoned_3_Ch4: duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 + pitchenvelope 20 + squarenote 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_3_Ch4 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 + squarenote 15, 243, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index fc6d292e..93f17c72 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ SFX_Pound_Ch7: - unknownnoise0x20 2, 161, 34 + noisenote 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 95edbf4a..3d40cab3 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ SFX_Press_AB_1_Ch4: duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 0, 129, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 12, 161, 208, 7 endchannel diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 0d8faa46..a3f14b74 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,7 +1,7 @@ SFX_Press_AB_2_Ch4: duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 0, 129, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 12, 161, 208, 7 endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 0f11fc34..01cf9b92 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,7 +1,7 @@ SFX_Press_AB_3_Ch4: duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 0, 129, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 12, 161, 208, 7 endchannel diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 12a1b6fc..c49ebcb5 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ SFX_Psybeam_Ch4: dutycycle 161 - unknownsfx0x20 10, 241, 64, 6 - unknownsfx0x20 10, 243, 128, 6 - unknownsfx0x20 10, 242, 32, 6 + squarenote 10, 241, 64, 6 + squarenote 10, 243, 128, 6 + squarenote 10, 242, 32, 6 loopchannel 4, SFX_Psybeam_Ch4 - unknownsfx0x20 10, 241, 64, 6 + squarenote 10, 241, 64, 6 endchannel SFX_Psybeam_Ch5: dutycycle 179 - unknownsfx0x20 10, 243, 113, 5 - unknownsfx0x20 7, 227, 49, 5 - unknownsfx0x20 10, 241, 81, 5 + squarenote 10, 243, 113, 5 + squarenote 7, 227, 49, 5 + squarenote 10, 241, 81, 5 loopchannel 4, SFX_Psybeam_Ch5 - unknownsfx0x20 10, 241, 113, 5 + squarenote 10, 241, 113, 5 endchannel SFX_Psybeam_Ch7: - unknownnoise0x20 2, 209, 74 - unknownnoise0x20 2, 210, 42 + noisenote 2, 209, 74 + noisenote 2, 210, 42 loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 2bbde2f1..6d70dc3b 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ SFX_Psychic_M_Ch4: 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 + pitchenvelope 247 + squarenote 8, 196, 189, 7 + squarenote 8, 196, 190, 7 + squarenote 8, 196, 191, 7 + squarenote 8, 196, 192, 7 + squarenote 15, 196, 193, 7 + squarenote 15, 242, 192, 7 + pitchenvelope 8 endchannel SFX_Psychic_M_Ch5: 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 + squarenote 8, 196, 112, 7 + squarenote 8, 196, 97, 7 + squarenote 8, 196, 98, 7 + squarenote 8, 196, 99, 7 + squarenote 15, 196, 100, 7 + squarenote 15, 242, 100, 7 endchannel SFX_Psychic_M_Ch7: - unknownnoise0x20 15, 63, 20 - unknownnoise0x20 15, 207, 19 - unknownnoise0x20 15, 207, 18 - unknownnoise0x20 15, 207, 17 - unknownnoise0x20 15, 207, 16 - unknownnoise0x20 15, 194, 16 + noisenote 15, 63, 20 + noisenote 15, 207, 19 + noisenote 15, 207, 18 + noisenote 15, 207, 17 + noisenote 15, 207, 16 + noisenote 15, 194, 16 endchannel diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 1c9490a2..f1b3799a 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ SFX_Purchase_1_Ch4: duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 + squarenote 4, 225, 0, 7 + squarenote 8, 242, 224, 7 endchannel SFX_Purchase_1_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 145, 193, 6 + squarenote 8, 162, 161, 7 endchannel diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 78929c27..b8a5660f 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,13 +1,13 @@ SFX_Purchase_3_Ch4: duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 + squarenote 4, 225, 0, 7 + squarenote 8, 242, 224, 7 endchannel SFX_Purchase_3_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 145, 193, 6 + squarenote 8, 162, 161, 7 endchannel diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index 86035278..c2d778fa 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ SFX_Push_Boulder_1_Ch7: - 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 + noisenote 4, 162, 35 + noisenote 8, 241, 52 + noisenote 15, 0, 0 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index ecaeb768..9a263a9e 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,10 +1,10 @@ SFX_Push_Boulder_3_Ch7: - 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 + noisenote 4, 162, 35 + noisenote 8, 241, 52 + noisenote 15, 0, 0 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 81d01467..e05fb675 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ SFX_Run_Ch7: - 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 + noisenote 2, 97, 35 + noisenote 2, 161, 51 + noisenote 2, 193, 51 + noisenote 2, 81, 17 + noisenote 2, 241, 51 + noisenote 2, 65, 17 + noisenote 2, 193, 51 + noisenote 2, 49, 17 + noisenote 2, 129, 51 + noisenote 2, 49, 17 + noisenote 8, 65, 51 endchannel diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index f898def0..6c302b11 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ SFX_Safari_Zone_PA_Ch4: 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 + squarenote 15, 243, 48, 7 + squarenote 8, 101, 48, 7 + squarenote 15, 244, 0, 7 + squarenote 15, 116, 0, 7 + squarenote 15, 68, 0, 7 + squarenote 15, 36, 0, 7 endchannel diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index afb1f13a..900c89c1 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ SFX_Save_1_Ch4: 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 + squarenote 4, 244, 0, 7 + squarenote 2, 228, 0, 6 + squarenote 2, 228, 128, 6 + squarenote 2, 228, 192, 6 + squarenote 2, 228, 0, 7 + squarenote 2, 228, 160, 7 + squarenote 15, 242, 224, 7 endchannel SFX_Save_1_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 2, 212, 1, 7 + squarenote 2, 196, 1, 6 + squarenote 2, 196, 129, 6 + squarenote 2, 196, 193, 6 + squarenote 2, 196, 1, 7 + squarenote 2, 196, 161, 7 + squarenote 15, 210, 225, 7 endchannel diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 083e77c8..0f237fd1 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,17 +1,17 @@ SFX_Save_3_Ch4: 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 + squarenote 4, 244, 0, 7 + squarenote 3, 228, 128, 6 + squarenote 3, 228, 192, 6 + squarenote 3, 228, 0, 7 + squarenote 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 + squarenote 3, 228, 0, 6 + squarenote 3, 228, 128, 6 + squarenote 3, 228, 192, 6 + squarenote 3, 228, 0, 7 + squarenote 15, 242, 224, 7 ENDC endchannel @@ -19,18 +19,18 @@ ENDC SFX_Save_3_Ch5: 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 + squarenote 4, 8, 0, 0 + squarenote 3, 212, 1, 7 + squarenote 3, 196, 129, 6 + squarenote 3, 196, 193, 6 + squarenote 3, 196, 1, 7 + squarenote 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 + squarenote 3, 8, 0, 0 + squarenote 3, 196, 1, 6 + squarenote 3, 196, 129, 6 + squarenote 3, 196, 193, 6 + squarenote 3, 196, 1, 7 + squarenote 15, 210, 225, 7 ENDC endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index f9b03feb..d33eefcb 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ SFX_Shooting_Star_Ch4: 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 + pitchenvelope 47 + squarenote 4, 64, 224, 7 + squarenote 4, 96, 224, 7 + squarenote 4, 128, 224, 7 + squarenote 8, 160, 224, 7 + squarenote 8, 160, 224, 7 + squarenote 8, 128, 224, 7 + squarenote 8, 96, 224, 7 + squarenote 8, 48, 224, 7 + squarenote 15, 18, 224, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 54731535..b3cdca5d 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ SFX_Shrink_1_Ch4: 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 + pitchenvelope 23 + squarenote 15, 215, 0, 6 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 5 + squarenote 15, 71, 128, 4 + squarenote 15, 23, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index b03cbe55..38b3f0e9 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ SFX_Shrink_3_Ch4: 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 + pitchenvelope 23 + squarenote 15, 215, 0, 6 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 5 + squarenote 15, 71, 128, 4 + squarenote 15, 23, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ee238262..b685abbe 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ SFX_Silph_Scope_Ch4: 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 + squarenote 0, 210, 0, 7 + squarenote 0, 210, 64, 7 + squarenote 0, 210, 128, 7 + squarenote 0, 210, 192, 7 + squarenote 10, 225, 224, 7 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index ae1a6d90..632003b8 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ SFX_Slots_New_Spin_Ch4: duty 3 - unknownsfx0x20 5, 225, 0, 7 - unknownsfx0x20 2, 225, 128, 7 - unknownsfx0x20 15, 241, 192, 7 + squarenote 5, 225, 0, 7 + squarenote 2, 225, 128, 7 + squarenote 15, 241, 192, 7 endchannel SFX_Slots_New_Spin_Ch5: duty 2 - unknownsfx0x20 4, 193, 193, 6 - unknownsfx0x20 2, 193, 65, 7 - unknownsfx0x20 15, 209, 129, 7 + squarenote 4, 193, 193, 6 + squarenote 2, 193, 65, 7 + squarenote 15, 209, 129, 7 endchannel diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 6923ac71..2322c34a 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ SFX_Slots_Reward_Ch4: duty 2 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 8, 129, 224, 7 + squarenote 2, 241, 0, 7 + squarenote 8, 129, 224, 7 endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 85d73daf..0548600b 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ SFX_Slots_Stop_Wheel_Ch4: duty 2 - unknownsfx0x20 1, 242, 160, 6 - unknownsfx0x20 1, 242, 224, 6 - unknownsfx0x20 8, 241, 0, 7 + squarenote 1, 242, 160, 6 + squarenote 1, 242, 224, 6 + squarenote 8, 241, 0, 7 endchannel diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index aae0ef28..ea06a573 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ SFX_Snare1_1_Ch7: - unknownnoise0x20 0, 193, 51 + noisenote 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index e5013081..3ac1095d 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ SFX_Snare1_2_Ch7: - unknownnoise0x20 0, 193, 51 + noisenote 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 4ffffa7f..66344d64 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ SFX_Snare1_3_Ch7: - unknownnoise0x20 0, 193, 51 + noisenote 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 286e397a..7852f823 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ SFX_Snare2_1_Ch7: - unknownnoise0x20 0, 177, 51 + noisenote 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index a3718612..0ddeff47 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ SFX_Snare2_2_Ch7: - unknownnoise0x20 0, 177, 51 + noisenote 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index 67f8c7fb..4e77c1dc 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ SFX_Snare2_3_Ch7: - unknownnoise0x20 0, 177, 51 + noisenote 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index 686b4561..787f5da5 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ SFX_Snare3_1_Ch7: - unknownnoise0x20 0, 161, 51 + noisenote 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index f8236d40..136e99db 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ SFX_Snare3_2_Ch7: - unknownnoise0x20 0, 161, 51 + noisenote 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index 3b52bac9..d0aaacbf 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ SFX_Snare3_3_Ch7: - unknownnoise0x20 0, 161, 51 + noisenote 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 35d58dba..31ca4d90 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ SFX_Snare4_1_Ch7: - unknownnoise0x20 0, 129, 51 + noisenote 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index 713f8996..ad0cb156 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ SFX_Snare4_2_Ch7: - unknownnoise0x20 0, 129, 51 + noisenote 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 231193e1..a8f5b7e0 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ SFX_Snare4_3_Ch7: - unknownnoise0x20 0, 129, 51 + noisenote 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index 54106d58..346c3e4b 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,8 +1,8 @@ SFX_Snare5_1_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 + noisenote 7, 132, 55 + noisenote 6, 132, 54 + noisenote 5, 131, 53 + noisenote 4, 131, 52 + noisenote 3, 130, 51 + noisenote 2, 129, 50 endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index f7f55eb5..91fd2abe 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,8 +1,8 @@ SFX_Snare5_2_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 + noisenote 7, 132, 55 + noisenote 6, 132, 54 + noisenote 5, 131, 53 + noisenote 4, 131, 52 + noisenote 3, 130, 51 + noisenote 2, 129, 50 endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 76dc3966..3e0a546d 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,8 +1,8 @@ SFX_Snare5_3_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 + noisenote 7, 132, 55 + noisenote 6, 132, 54 + noisenote 5, 131, 53 + noisenote 4, 131, 52 + noisenote 3, 130, 51 + noisenote 2, 129, 50 endchannel diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 97c0241d..982a9d73 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ SFX_Snare6_1_Ch7: - unknownnoise0x20 0, 129, 16 + noisenote 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 797d5518..0aaf6148 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ SFX_Snare6_2_Ch7: - unknownnoise0x20 0, 129, 16 + noisenote 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index 28fc695a..f021de95 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ SFX_Snare6_3_Ch7: - unknownnoise0x20 0, 129, 16 + noisenote 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index 1b54eefa..a0c5768f 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ SFX_Snare7_1_Ch7: - unknownnoise0x20 0, 130, 35 + noisenote 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index e480f87f..cdd18567 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ SFX_Snare7_2_Ch7: - unknownnoise0x20 0, 130, 35 + noisenote 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index b57dfc13..f1db9012 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ SFX_Snare7_3_Ch7: - unknownnoise0x20 0, 130, 35 + noisenote 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 1a0f74a3..3c657ab8 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ SFX_Snare8_1_Ch7: - unknownnoise0x20 0, 130, 37 + noisenote 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 87619598..b0d7a66a 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ SFX_Snare8_2_Ch7: - unknownnoise0x20 0, 130, 37 + noisenote 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 54076c8e..51ab3ecb 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ SFX_Snare8_3_Ch7: - unknownnoise0x20 0, 130, 37 + noisenote 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 6923bb09..1468fc0e 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ SFX_Snare9_1_Ch7: - unknownnoise0x20 0, 130, 38 + noisenote 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 308ae7f6..78b01295 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ SFX_Snare9_2_Ch7: - unknownnoise0x20 0, 130, 38 + noisenote 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index ffbdc454..aa56c84a 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ SFX_Snare9_3_Ch7: - unknownnoise0x20 0, 130, 38 + noisenote 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 38407f24..b84c1c83 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ SFX_SS_Anne_Horn_1_Ch4: 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 + squarenote 15, 240, 0, 5 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 242, 0, 5 endchannel SFX_SS_Anne_Horn_1_Ch5: 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 + squarenote 15, 240, 130, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 242, 130, 4 endchannel diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 3162f664..35bcff9d 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,22 +1,22 @@ SFX_SS_Anne_Horn_3_Ch4: 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 + squarenote 15, 240, 0, 5 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 242, 0, 5 endchannel SFX_SS_Anne_Horn_3_Ch5: 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 + squarenote 15, 240, 130, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 242, 130, 4 endchannel diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 3a979b44..5d71ea86 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_1_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 + noisenote 1, 226, 51 + noisenote 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 2706f555..3ab45794 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_2_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 + noisenote 1, 226, 51 + noisenote 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 4b16cea4..5bf74e70 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_3_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 + noisenote 1, 226, 51 + noisenote 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 63ba35e8..4fb99e7c 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ SFX_Super_Effective_Ch7: - unknownnoise0x20 4, 241, 52 - unknownnoise0x20 15, 242, 100 + noisenote 4, 241, 52 + noisenote 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 95a31fcd..cc7da7c4 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ SFX_Swap_1_Ch4: duty 2 - unknownsfx0x20 8, 225, 64, 7 + squarenote 8, 225, 64, 7 endchannel SFX_Swap_1_Ch5: duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 + squarenote 2, 8, 0, 0 + squarenote 8, 177, 65, 7 endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 6ed97d7d..788bbc11 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,11 +1,11 @@ SFX_Swap_3_Ch4: duty 2 - unknownsfx0x20 8, 225, 64, 7 + squarenote 8, 225, 64, 7 endchannel SFX_Swap_3_Ch5: duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 + squarenote 2, 8, 0, 0 + squarenote 8, 177, 65, 7 endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ee15dc20..eba35ca8 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ SFX_Switch_1_Ch4: 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 + squarenote 4, 0, 0, 0 + squarenote 2, 241, 128, 6 + squarenote 1, 0, 0, 0 + squarenote 4, 241, 128, 7 + squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index d98a7f29..4031c68b 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,8 +1,8 @@ SFX_Switch_3_Ch4: 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 + squarenote 4, 0, 0, 0 + squarenote 2, 241, 128, 6 + squarenote 1, 0, 0, 0 + squarenote 4, 241, 128, 7 + squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 60c87cab..c4d1a681 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_1_Ch4: 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 + pitchenvelope 23 + squarenote 15, 215, 0, 7 + squarenote 15, 183, 128, 6 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 5 + squarenote 15, 23, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index d3dab8b4..da57da67 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_3_Ch4: 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 + pitchenvelope 23 + squarenote 15, 215, 0, 7 + squarenote 15, 183, 128, 6 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 5 + squarenote 15, 23, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 53eb3335..07cb9ca6 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Enter2_1_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 + noisenote 2, 241, 50 + noisenote 2, 0, 0 + noisenote 2, 241, 34 + noisenote 1, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index 8b7c7894..cfeebf12 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Enter2_3_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 + noisenote 2, 241, 50 + noisenote 2, 0, 0 + noisenote 2, 241, 34 + noisenote 1, 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 084c116f..d8fa2cd2 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_1_Ch4: 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 + pitchenvelope 23 + squarenote 15, 215, 0, 5 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 6 + squarenote 15, 23, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index b3a26af8..43bd5255 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_3_Ch4: 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 + pitchenvelope 23 + squarenote 15, 215, 0, 5 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 6 + squarenote 15, 23, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 4b168bb9..c342630d 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_1_Ch4: duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 + pitchenvelope 22 + squarenote 15, 210, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 171e59d8..5e688d11 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_3_Ch4: duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 + pitchenvelope 22 + squarenote 15, 210, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index c1f5f00c..3967f66c 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ SFX_Tink_1_Ch4: duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index bab45323..5a654926 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ SFX_Tink_2_Ch4: duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index a9cf73ec..c4f443e2 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ SFX_Tink_3_Ch4: duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 2f67936b..623e2c92 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_1_Ch4: duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 21 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index b590455e..19dc0957 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_3_Ch4: duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 21 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 957dc63f..3817adec 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ SFX_Triangle1_1_Ch7: - unknownnoise0x20 0, 81, 42 + noisenote 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 535448cd..cac270ab 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ SFX_Triangle1_2_Ch7: - unknownnoise0x20 0, 81, 42 + noisenote 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index a13d00ea..a0cd81b2 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ SFX_Triangle1_3_Ch7: - unknownnoise0x20 0, 81, 42 + noisenote 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 09ba8a67..1a6c4ca5 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ SFX_Triangle2_1_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 + noisenote 1, 65, 43 + noisenote 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index 6512648a..48fc2086 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ SFX_Triangle2_2_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 + noisenote 1, 65, 43 + noisenote 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index b0612aba..d3c98bad 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ SFX_Triangle2_3_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 + noisenote 1, 65, 43 + noisenote 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index 9fd3952f..172c4141 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ SFX_Triangle3_1_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 + noisenote 2, 145, 40 + noisenote 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 38b3198b..f2ba1804 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ SFX_Triangle3_2_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 + noisenote 2, 145, 40 + noisenote 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 138c8fac..654d9e0d 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ SFX_Triangle3_3_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 + noisenote 2, 145, 40 + noisenote 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 6b2561fe..2203d40a 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ SFX_Turn_Off_PC_1_Ch4: duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 0, 6 + squarenote 4, 240, 0, 4 + squarenote 4, 240, 0, 2 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index cf6d95cd..ba079c05 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,7 +1,7 @@ SFX_Turn_Off_PC_3_Ch4: duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 0, 6 + squarenote 4, 240, 0, 4 + squarenote 4, 240, 0, 2 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index dede7c3e..39e992b3 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ SFX_Turn_On_PC_1_Ch4: 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 + squarenote 15, 242, 192, 7 + squarenote 15, 0, 0, 0 + squarenote 3, 161, 128, 7 + squarenote 3, 161, 0, 7 + squarenote 3, 161, 64, 7 + squarenote 3, 161, 0, 7 + squarenote 3, 161, 128, 7 + squarenote 3, 161, 0, 7 + squarenote 3, 161, 192, 7 + squarenote 8, 161, 0, 7 endchannel diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index 1ed54d3c..e7500dc9 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,14 +1,14 @@ SFX_Turn_On_PC_3_Ch4: 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 + squarenote 15, 242, 192, 7 + squarenote 15, 0, 0, 0 + squarenote 15, 0, 0, 0 + squarenote 3, 129, 128, 7 + squarenote 3, 129, 0, 7 + squarenote 3, 129, 64, 7 + squarenote 3, 129, 0, 7 + squarenote 3, 129, 128, 7 + squarenote 3, 129, 0, 7 + squarenote 3, 129, 192, 7 + squarenote 3, 129, 0, 7 endchannel diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index 21d54fb1..9d1886cf 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ SFX_02_unused_Ch4: dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 + squarenote 15, 224, 128, 7 + squarenote 15, 240, 132, 7 + squarenote 15, 195, 224, 5 + squarenote 15, 196, 0, 6 + squarenote 10, 108, 128, 7 + squarenote 8, 113, 132, 7 endchannel SFX_02_unused_Ch5: dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 + squarenote 15, 160, 65, 7 + squarenote 15, 176, 67, 7 + squarenote 15, 147, 177, 5 + squarenote 15, 148, 193, 5 + squarenote 10, 76, 65, 7 + squarenote 8, 49, 70, 7 endchannel SFX_02_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 + noisenote 2, 242, 76 + noisenote 6, 224, 58 + noisenote 15, 208, 58 + noisenote 8, 208, 44 + noisenote 6, 230, 76 + noisenote 12, 125, 76 + noisenote 15, 211, 76 endchannel diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index 20de851f..cf793ec3 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ SFX_08_unused_Ch4: dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 + squarenote 15, 224, 128, 7 + squarenote 15, 240, 132, 7 + squarenote 15, 195, 224, 5 + squarenote 15, 196, 0, 6 + squarenote 10, 108, 128, 7 + squarenote 8, 113, 132, 7 endchannel SFX_08_unused_Ch5: dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 + squarenote 15, 160, 65, 7 + squarenote 15, 176, 67, 7 + squarenote 15, 147, 177, 5 + squarenote 15, 148, 193, 5 + squarenote 10, 76, 65, 7 + squarenote 8, 49, 70, 7 endchannel SFX_08_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 + noisenote 2, 242, 76 + noisenote 6, 224, 58 + noisenote 15, 208, 58 + noisenote 8, 208, 44 + noisenote 6, 230, 76 + noisenote 12, 125, 76 + noisenote 15, 211, 76 endchannel diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index d4a30539..b849f5fd 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ SFX_1f_unused_Ch4: dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 + squarenote 15, 224, 128, 7 + squarenote 15, 240, 132, 7 + squarenote 15, 195, 224, 5 + squarenote 15, 196, 0, 6 + squarenote 10, 108, 128, 7 + squarenote 8, 113, 132, 7 endchannel SFX_1f_unused_Ch5: dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 + squarenote 15, 160, 65, 7 + squarenote 15, 176, 67, 7 + squarenote 15, 147, 177, 5 + squarenote 15, 148, 193, 5 + squarenote 10, 76, 65, 7 + squarenote 8, 49, 70, 7 endchannel SFX_1f_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 + noisenote 2, 242, 76 + noisenote 6, 224, 58 + noisenote 15, 208, 58 + noisenote 8, 208, 44 + noisenote 6, 230, 76 + noisenote 12, 125, 76 + noisenote 15, 211, 76 endchannel diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index ad0bd40b..84845db8 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ SFX_Vine_Whip_Ch7: - 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 + noisenote 1, 194, 51 + noisenote 2, 242, 33 + noisenote 1, 226, 51 + noisenote 1, 194, 50 + noisenote 1, 146, 18 + noisenote 1, 178, 49 + noisenote 12, 145, 16 + noisenote 8, 242, 65 endchannel diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index d7a2f54d..cc6c052a 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_1_Ch4: 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 + pitchenvelope 58 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 4, 226, 0, 5 + pitchenvelope 58 + squarenote 4, 242, 0, 7 + pitchenvelope 34 + squarenote 15, 226, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 1fd1fe3e..a6a902de 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_3_Ch4: 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 + pitchenvelope 58 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 4, 226, 0, 5 + pitchenvelope 58 + squarenote 4, 242, 0, 7 + pitchenvelope 34 + squarenote 15, 226, 0, 7 + pitchenvelope 8 endchannel diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 6b318952..c81e2181 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -30,19 +30,19 @@ audio: MACRO ENDC ENDM -eSquarePitchEnvelope: MACRO ; this was originally unknownsfx0x10 +pitchenvelope: MACRO ; this was originally unknownsfx0x10 db $10 db \1 ENDM -SquareSound: MACRO ; this was originally unknownsfx0x20 +squarenote: MACRO ; this was originally unknownsfx0x20 db $20 | \1 db \2 db \3 db \4 ENDM -NoiseSound: MACRO ; this was originally unknownnoise0x20 +noisenote: MACRO ; this was originally unknownnoise0x20 db $20 | \1 db \2 db \3 -- cgit v1.2.3 From b382473f7b6827020f5544c8dcc730be8fc83f6e Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Fri, 16 Mar 2018 17:56:37 -0500 Subject: Break up pitchenvelope parameters into length and pitch change --- audio/sfx/arrow_tiles_1.asm | 4 ++-- audio/sfx/arrow_tiles_3.asm | 4 ++-- audio/sfx/ball_poof.asm | 4 ++-- audio/sfx/ball_toss.asm | 2 +- audio/sfx/battle_09.asm | 4 ++-- audio/sfx/battle_1e.asm | 6 +++--- audio/sfx/battle_24.asm | 4 ++-- audio/sfx/battle_32.asm | 4 ++-- audio/sfx/collision_1.asm | 4 ++-- audio/sfx/collision_3.asm | 4 ++-- audio/sfx/denied_1.asm | 4 ++-- audio/sfx/denied_3.asm | 4 ++-- audio/sfx/dex_page_added.asm | 6 +++--- audio/sfx/faint_fall.asm | 4 ++-- audio/sfx/faint_thud.asm | 2 +- audio/sfx/heal_ailment_1.asm | 6 +++--- audio/sfx/heal_ailment_2.asm | 6 +++--- audio/sfx/heal_ailment_3.asm | 6 +++--- audio/sfx/heal_hp_1.asm | 4 ++-- audio/sfx/heal_hp_2.asm | 4 ++-- audio/sfx/heal_hp_3.asm | 4 ++-- audio/sfx/healing_machine_1.asm | 6 +++--- audio/sfx/healing_machine_3.asm | 6 +++--- audio/sfx/intro_hip.asm | 4 ++-- audio/sfx/intro_hop.asm | 4 ++-- audio/sfx/ledge_1.asm | 4 ++-- audio/sfx/ledge_3.asm | 4 ++-- audio/sfx/poisoned_1.asm | 4 ++-- audio/sfx/poisoned_3.asm | 4 ++-- audio/sfx/pokeflute_ch4_ch5.asm | 0 audio/sfx/pokeflute_ch6.asm | 0 audio/sfx/psychic_m.asm | 4 ++-- audio/sfx/shooting_star.asm | 4 ++-- audio/sfx/shrink_1.asm | 4 ++-- audio/sfx/shrink_3.asm | 4 ++-- audio/sfx/teleport_enter1_1.asm | 4 ++-- audio/sfx/teleport_enter1_3.asm | 4 ++-- audio/sfx/teleport_exit1_1.asm | 4 ++-- audio/sfx/teleport_exit1_3.asm | 4 ++-- audio/sfx/teleport_exit2_1.asm | 4 ++-- audio/sfx/teleport_exit2_3.asm | 4 ++-- audio/sfx/tink_1.asm | 6 +++--- audio/sfx/tink_2.asm | 6 +++--- audio/sfx/tink_3.asm | 6 +++--- audio/sfx/trade_machine_1.asm | 4 ++-- audio/sfx/trade_machine_3.asm | 4 ++-- audio/sfx/unused2_2.asm | 0 audio/sfx/unused_1.asm | 0 audio/sfx/unused_2.asm | 0 audio/sfx/unused_3.asm | 0 audio/sfx/withdraw_deposit_1.asm | 10 +++++----- audio/sfx/withdraw_deposit_3.asm | 10 +++++----- macros/audio_macros.asm | 13 +++++++++---- 53 files changed, 115 insertions(+), 110 deletions(-) mode change 100755 => 100644 audio/sfx/pokeflute_ch4_ch5.asm mode change 100755 => 100644 audio/sfx/pokeflute_ch6.asm mode change 100755 => 100644 audio/sfx/unused2_2.asm mode change 100755 => 100644 audio/sfx/unused_1.asm mode change 100755 => 100644 audio/sfx/unused_2.asm mode change 100755 => 100644 audio/sfx/unused_3.asm diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 90f62f8b..f29ddbc1 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_1_Ch4: duty 0 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 210, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index ac1c79ff..864e55f2 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_3_Ch4: duty 0 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 210, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 3596baba..3f0dcab0 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,8 +1,8 @@ SFX_Ball_Poof_Ch4: duty 2 - pitchenvelope 22 + pitchenvelope 1, 6 squarenote 15, 242, 0, 4 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index b41aaec7..271ceb96 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,6 +1,6 @@ SFX_Ball_Toss_Ch4: duty 2 - pitchenvelope 47 + pitchenvelope 2, -7 squarenote 15, 242, 128, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 3ab973e1..8119261e 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ SFX_Battle_09_Ch4: duty 1 - pitchenvelope 151 + pitchenvelope 9, 7 squarenote 15, 242, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index eaea0543..7bccb47c 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,10 +1,10 @@ SFX_Battle_1E_Ch4: duty 0 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 2 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 8, 226, 0, 2 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 95765daf..beefeeb9 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,8 +1,8 @@ SFX_Battle_24_Ch4: duty 1 - pitchenvelope 151 + pitchenvelope 9, 7 squarenote 15, 242, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 28084fe5..5e5b8641 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,8 +1,8 @@ SFX_Battle_32_Ch4: duty 2 - pitchenvelope 175 + pitchenvelope 10, -7 squarenote 8, 241, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 41e99a35..d0556537 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ SFX_Collision_1_Ch4: duty 2 - pitchenvelope 90 + pitchenvelope 5, -2 squarenote 15, 241, 0, 3 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index aa741e0e..623213e4 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ SFX_Collision_3_Ch4: duty 2 - pitchenvelope 90 + pitchenvelope 5, -2 squarenote 15, 241, 0, 3 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 6c9c2336..028785e9 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,8 +1,8 @@ SFX_Denied_1_Ch4: duty 3 - pitchenvelope 90 + pitchenvelope 5, -2 squarenote 4, 240, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 squarenote 4, 0, 0, 0 squarenote 15, 240, 0, 5 squarenote 1, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 0e7768cc..c22854f4 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,8 +1,8 @@ SFX_Denied_3_Ch4: duty 3 - pitchenvelope 90 + pitchenvelope 5, -2 squarenote 4, 240, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 squarenote 4, 0, 0, 0 squarenote 15, 240, 0, 5 squarenote 1, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index f5fa966b..6f1d1457 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,10 +1,10 @@ SFX_Dex_Page_Added_Ch4: duty 2 - pitchenvelope 68 + pitchenvelope 4, 4 squarenote 15, 240, 240, 4 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 242, 80, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index 60e997a0..4fc24c9c 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ SFX_Faint_Fall_Ch4: duty 1 - pitchenvelope 175 + pitchenvelope 10, -7 squarenote 15, 242, 128, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 1892a81f..6dd9b005 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,6 +1,6 @@ SFX_Faint_Thud_Ch4: squarenote 15, 209, 0, 2 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 1166676e..35a0f647 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_1_Ch4: duty 2 - pitchenvelope 20 + pitchenvelope 1, 4 squarenote 4, 242, 0, 6 squarenote 4, 242, 0, 6 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 242, 0, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 3c768ce7..e4fe0c9c 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_2_Ch4: duty 2 - pitchenvelope 20 + pitchenvelope 1, 4 squarenote 4, 242, 0, 6 squarenote 4, 242, 0, 6 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 242, 0, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index 727000de..fb17a5f1 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_3_Ch4: duty 2 - pitchenvelope 20 + pitchenvelope 1, 4 squarenote 4, 242, 0, 6 squarenote 4, 242, 0, 6 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 242, 0, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 6a0cdabf..ece6a473 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_1_Ch4: duty 2 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 240, 240, 4 squarenote 15, 242, 80, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index a9a441b2..96adff71 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_2_Ch4: duty 2 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 240, 240, 4 squarenote 15, 242, 80, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index d1ae5279..b9f5817b 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_3_Ch4: duty 2 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 240, 240, 4 squarenote 15, 242, 80, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 49c40392..3bcaf4c4 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_1_Ch4: duty 2 - pitchenvelope 44 + pitchenvelope 2, -4 squarenote 4, 242, 0, 5 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 2, 241, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index 91f35fa4..3ac6a514 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_3_Ch4: duty 2 - pitchenvelope 44 + pitchenvelope 2, -4 squarenote 4, 242, 0, 5 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 2, 241, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 6434f0a8..cc394d5c 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ SFX_Intro_Hip_Ch4: duty 2 - pitchenvelope 38 + pitchenvelope 2, 6 squarenote 12, 194, 64, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 89be1bfd..45829561 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ SFX_Intro_Hop_Ch4: duty 2 - pitchenvelope 38 + pitchenvelope 2, 6 squarenote 12, 194, 128, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index d9626b09..d70043fa 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ SFX_Ledge_1_Ch4: duty 2 - pitchenvelope 149 + pitchenvelope 9, 5 squarenote 15, 242, 0, 4 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 466ada0b..858aad9c 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ SFX_Ledge_3_Ch4: duty 2 - pitchenvelope 149 + pitchenvelope 9, 5 squarenote 15, 242, 0, 4 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 3bf3cf91..d669912d 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ SFX_Poisoned_1_Ch4: duty 0 - pitchenvelope 20 + pitchenvelope 1, 4 squarenote 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_1_Ch4 squarenote 15, 243, 0, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b651e3db..c0811adc 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ SFX_Poisoned_3_Ch4: duty 0 - pitchenvelope 20 + pitchenvelope 1, 4 squarenote 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_3_Ch4 squarenote 15, 243, 0, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 6d70dc3b..55bb3d25 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,13 +1,13 @@ SFX_Psychic_M_Ch4: duty 2 - pitchenvelope 247 + pitchenvelope 15, 7 squarenote 8, 196, 189, 7 squarenote 8, 196, 190, 7 squarenote 8, 196, 191, 7 squarenote 8, 196, 192, 7 squarenote 15, 196, 193, 7 squarenote 15, 242, 192, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index d33eefcb..36e77f45 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,6 +1,6 @@ SFX_Shooting_Star_Ch4: dutycycle 228 - pitchenvelope 47 + pitchenvelope 2, -7 squarenote 4, 64, 224, 7 squarenote 4, 96, 224, 7 squarenote 4, 128, 224, 7 @@ -10,5 +10,5 @@ SFX_Shooting_Star_Ch4: squarenote 8, 96, 224, 7 squarenote 8, 48, 224, 7 squarenote 15, 18, 224, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index b3cdca5d..8a2fb1d0 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ SFX_Shrink_1_Ch4: duty 1 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 215, 0, 6 squarenote 15, 183, 128, 5 squarenote 15, 135, 0, 5 squarenote 15, 71, 128, 4 squarenote 15, 23, 0, 4 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 38b3f0e9..0256c6c9 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ SFX_Shrink_3_Ch4: duty 1 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 215, 0, 6 squarenote 15, 183, 128, 5 squarenote 15, 135, 0, 5 squarenote 15, 71, 128, 4 squarenote 15, 23, 0, 4 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index c4d1a681..c18d5af9 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_1_Ch4: duty 1 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 215, 0, 7 squarenote 15, 183, 128, 6 squarenote 15, 135, 0, 6 squarenote 15, 71, 128, 5 squarenote 15, 23, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index da57da67..d1d26cfb 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_3_Ch4: duty 1 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 215, 0, 7 squarenote 15, 183, 128, 6 squarenote 15, 135, 0, 6 squarenote 15, 71, 128, 5 squarenote 15, 23, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index d8fa2cd2..6276139b 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_1_Ch4: duty 1 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 215, 0, 5 squarenote 15, 183, 128, 5 squarenote 15, 135, 0, 6 squarenote 15, 71, 128, 6 squarenote 15, 23, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 43bd5255..e1af7fd2 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_3_Ch4: duty 1 - pitchenvelope 23 + pitchenvelope 1, 7 squarenote 15, 215, 0, 5 squarenote 15, 183, 128, 5 squarenote 15, 135, 0, 6 squarenote 15, 71, 128, 6 squarenote 15, 23, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index c342630d..dc952152 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_1_Ch4: duty 1 - pitchenvelope 22 + pitchenvelope 1, 6 squarenote 15, 210, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 5e688d11..74c5ed99 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_3_Ch4: duty 1 - pitchenvelope 22 + pitchenvelope 1, 6 squarenote 15, 210, 0, 5 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 3967f66c..1959cc5d 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ SFX_Tink_1_Ch4: duty 2 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 2 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 8, 226, 0, 2 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index 5a654926..99fc105b 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ SFX_Tink_2_Ch4: duty 2 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 2 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 8, 226, 0, 2 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index c4f443e2..e586402f 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ SFX_Tink_3_Ch4: duty 2 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 2 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 8, 226, 0, 2 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 623e2c92..90be65db 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_1_Ch4: duty 2 - pitchenvelope 21 + pitchenvelope 1, 5 squarenote 15, 240, 240, 4 squarenote 15, 242, 80, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 19dc0957..f814056e 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_3_Ch4: duty 2 - pitchenvelope 21 + pitchenvelope 1, 5 squarenote 15, 240, 240, 4 squarenote 15, 242, 80, 6 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index cc6c052a..14b1e66f 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_1_Ch4: duty 1 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 5 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 4, 226, 0, 5 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 7 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 15, 226, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index a6a902de..b6dc4a7d 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_3_Ch4: duty 1 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 5 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 4, 226, 0, 5 - pitchenvelope 58 + pitchenvelope 3, -2 squarenote 4, 242, 0, 7 - pitchenvelope 34 + pitchenvelope 2, 2 squarenote 15, 226, 0, 7 - pitchenvelope 8 + pitchenvelope 0, 0 endchannel diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index c81e2181..8195a04d 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -30,19 +30,24 @@ audio: MACRO ENDC ENDM -pitchenvelope: MACRO ; this was originally unknownsfx0x10 +;format: length [0, 7], pitch change [-7, 7] +pitchenvelope: MACRO db $10 - db \1 + IF \2 > 0 + db (\1 << 4) | \2 + ELSE + db (\1 << 4) | (%1000 | (\2 * -1)) + ENDC ENDM -squarenote: MACRO ; this was originally unknownsfx0x20 +squarenote: MACRO db $20 | \1 db \2 db \3 db \4 ENDM -noisenote: MACRO ; this was originally unknownnoise0x20 +noisenote: MACRO db $20 | \1 db \2 db \3 -- cgit v1.2.3 From 4398dde1e483d74ae9997aba11f62b9810f9f77b Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Fri, 16 Mar 2018 20:35:40 -0500 Subject: Break up sfxnote parameters into duty, volume, volume change and pitch --- audio/engine_1.asm | 17 ++++++------ audio/engine_2.asm | 17 ++++++------ audio/engine_3.asm | 17 ++++++------ audio/sfx/59_1.asm | 6 ++-- audio/sfx/59_3.asm | 6 ++-- audio/sfx/arrow_tiles_1.asm | 2 +- audio/sfx/arrow_tiles_3.asm | 2 +- audio/sfx/ball_poof.asm | 4 +-- audio/sfx/ball_toss.asm | 4 +-- audio/sfx/battle_09.asm | 2 +- audio/sfx/battle_0b.asm | 2 +- audio/sfx/battle_0c.asm | 6 ++-- audio/sfx/battle_0d.asm | 6 ++-- audio/sfx/battle_0e.asm | 4 +-- audio/sfx/battle_0f.asm | 8 +++--- audio/sfx/battle_12.asm | 6 ++-- audio/sfx/battle_13.asm | 8 +++--- audio/sfx/battle_14.asm | 8 +++--- audio/sfx/battle_16.asm | 6 ++-- audio/sfx/battle_17.asm | 8 +++--- audio/sfx/battle_18.asm | 4 +-- audio/sfx/battle_19.asm | 6 ++-- audio/sfx/battle_1b.asm | 4 +-- audio/sfx/battle_1c.asm | 6 ++-- audio/sfx/battle_1e.asm | 12 ++++---- audio/sfx/battle_20.asm | 4 +-- audio/sfx/battle_21.asm | 10 +++---- audio/sfx/battle_22.asm | 4 +-- audio/sfx/battle_23.asm | 10 +++---- audio/sfx/battle_24.asm | 6 ++-- audio/sfx/battle_25.asm | 10 +++---- audio/sfx/battle_26.asm | 14 +++++----- audio/sfx/battle_27.asm | 16 +++++------ audio/sfx/battle_28.asm | 12 ++++---- audio/sfx/battle_29.asm | 18 ++++++------ audio/sfx/battle_2a.asm | 26 ++++++++--------- audio/sfx/battle_2b.asm | 24 ++++++++-------- audio/sfx/battle_2c.asm | 20 +++++++------- audio/sfx/battle_2e.asm | 24 ++++++++-------- audio/sfx/battle_2f.asm | 12 ++++---- audio/sfx/battle_31.asm | 20 +++++++------- audio/sfx/battle_32.asm | 4 +-- audio/sfx/battle_33.asm | 20 +++++++------- audio/sfx/battle_34.asm | 20 +++++++------- audio/sfx/battle_36.asm | 60 ++++++++++++++++++++-------------------- audio/sfx/collision_1.asm | 2 +- audio/sfx/collision_3.asm | 2 +- audio/sfx/cry00_1.asm | 18 ++++++------ audio/sfx/cry00_2.asm | 18 ++++++------ audio/sfx/cry00_3.asm | 18 ++++++------ audio/sfx/cry01_1.asm | 24 ++++++++-------- audio/sfx/cry01_2.asm | 24 ++++++++-------- audio/sfx/cry01_3.asm | 24 ++++++++-------- audio/sfx/cry02_1.asm | 12 ++++---- audio/sfx/cry02_2.asm | 12 ++++---- audio/sfx/cry02_3.asm | 12 ++++---- audio/sfx/cry03_1.asm | 36 ++++++++++++------------ audio/sfx/cry03_2.asm | 36 ++++++++++++------------ audio/sfx/cry03_3.asm | 36 ++++++++++++------------ audio/sfx/cry04_1.asm | 40 +++++++++++++-------------- audio/sfx/cry04_2.asm | 40 +++++++++++++-------------- audio/sfx/cry04_3.asm | 40 +++++++++++++-------------- audio/sfx/cry05_1.asm | 16 +++++------ audio/sfx/cry05_2.asm | 16 +++++------ audio/sfx/cry05_3.asm | 16 +++++------ audio/sfx/cry06_1.asm | 24 ++++++++-------- audio/sfx/cry06_2.asm | 24 ++++++++-------- audio/sfx/cry06_3.asm | 24 ++++++++-------- audio/sfx/cry07_1.asm | 18 ++++++------ audio/sfx/cry07_2.asm | 18 ++++++------ audio/sfx/cry07_3.asm | 18 ++++++------ audio/sfx/cry08_1.asm | 22 +++++++-------- audio/sfx/cry08_2.asm | 22 +++++++-------- audio/sfx/cry08_3.asm | 22 +++++++-------- audio/sfx/cry09_1.asm | 42 ++++++++++++++-------------- audio/sfx/cry09_2.asm | 42 ++++++++++++++-------------- audio/sfx/cry09_3.asm | 42 ++++++++++++++-------------- audio/sfx/cry0a_1.asm | 46 +++++++++++++++--------------- audio/sfx/cry0a_2.asm | 46 +++++++++++++++--------------- audio/sfx/cry0a_3.asm | 46 +++++++++++++++--------------- audio/sfx/cry0b_1.asm | 50 ++++++++++++++++----------------- audio/sfx/cry0b_2.asm | 50 ++++++++++++++++----------------- audio/sfx/cry0b_3.asm | 50 ++++++++++++++++----------------- audio/sfx/cry0c_1.asm | 36 ++++++++++++------------ audio/sfx/cry0c_2.asm | 36 ++++++++++++------------ audio/sfx/cry0c_3.asm | 36 ++++++++++++------------ audio/sfx/cry0d_1.asm | 54 ++++++++++++++++++------------------ audio/sfx/cry0d_2.asm | 54 ++++++++++++++++++------------------ audio/sfx/cry0d_3.asm | 54 ++++++++++++++++++------------------ audio/sfx/cry0e_1.asm | 22 +++++++-------- audio/sfx/cry0e_2.asm | 22 +++++++-------- audio/sfx/cry0e_3.asm | 22 +++++++-------- audio/sfx/cry0f_1.asm | 34 +++++++++++------------ audio/sfx/cry0f_2.asm | 34 +++++++++++------------ audio/sfx/cry0f_3.asm | 34 +++++++++++------------ audio/sfx/cry10_1.asm | 38 ++++++++++++------------- audio/sfx/cry10_2.asm | 38 ++++++++++++------------- audio/sfx/cry10_3.asm | 38 ++++++++++++------------- audio/sfx/cry11_1.asm | 44 ++++++++++++++--------------- audio/sfx/cry11_2.asm | 44 ++++++++++++++--------------- audio/sfx/cry11_3.asm | 44 ++++++++++++++--------------- audio/sfx/cry12_1.asm | 24 ++++++++-------- audio/sfx/cry12_2.asm | 24 ++++++++-------- audio/sfx/cry12_3.asm | 24 ++++++++-------- audio/sfx/cry13_1.asm | 36 ++++++++++++------------ audio/sfx/cry13_2.asm | 36 ++++++++++++------------ audio/sfx/cry13_3.asm | 36 ++++++++++++------------ audio/sfx/cry14_1.asm | 18 ++++++------ audio/sfx/cry14_2.asm | 18 ++++++------ audio/sfx/cry14_3.asm | 18 ++++++------ audio/sfx/cry15_1.asm | 36 ++++++++++++------------ audio/sfx/cry15_2.asm | 36 ++++++++++++------------ audio/sfx/cry15_3.asm | 36 ++++++++++++------------ audio/sfx/cry16_1.asm | 18 ++++++------ audio/sfx/cry16_2.asm | 18 ++++++------ audio/sfx/cry16_3.asm | 18 ++++++------ audio/sfx/cry17_1.asm | 24 ++++++++-------- audio/sfx/cry17_2.asm | 24 ++++++++-------- audio/sfx/cry17_3.asm | 24 ++++++++-------- audio/sfx/cry18_1.asm | 44 ++++++++++++++--------------- audio/sfx/cry18_2.asm | 44 ++++++++++++++--------------- audio/sfx/cry18_3.asm | 44 ++++++++++++++--------------- audio/sfx/cry19_1.asm | 14 +++++----- audio/sfx/cry19_2.asm | 14 +++++----- audio/sfx/cry19_3.asm | 14 +++++----- audio/sfx/cry1a_1.asm | 36 ++++++++++++------------ audio/sfx/cry1a_2.asm | 36 ++++++++++++------------ audio/sfx/cry1a_3.asm | 36 ++++++++++++------------ audio/sfx/cry1b_1.asm | 28 +++++++++---------- audio/sfx/cry1b_2.asm | 28 +++++++++---------- audio/sfx/cry1b_3.asm | 28 +++++++++---------- audio/sfx/cry1c_1.asm | 38 ++++++++++++------------- audio/sfx/cry1c_2.asm | 38 ++++++++++++------------- audio/sfx/cry1c_3.asm | 38 ++++++++++++------------- audio/sfx/cry1d_1.asm | 34 +++++++++++------------ audio/sfx/cry1d_2.asm | 34 +++++++++++------------ audio/sfx/cry1d_3.asm | 34 +++++++++++------------ audio/sfx/cry1e_1.asm | 52 +++++++++++++++++----------------- audio/sfx/cry1e_2.asm | 52 +++++++++++++++++----------------- audio/sfx/cry1e_3.asm | 52 +++++++++++++++++----------------- 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 | 32 ++++++++++----------- audio/sfx/cry21_2.asm | 32 ++++++++++----------- audio/sfx/cry21_3.asm | 32 ++++++++++----------- audio/sfx/cry22_1.asm | 24 ++++++++-------- audio/sfx/cry22_2.asm | 24 ++++++++-------- audio/sfx/cry22_3.asm | 24 ++++++++-------- audio/sfx/cry23_1.asm | 26 ++++++++--------- audio/sfx/cry23_2.asm | 26 ++++++++--------- audio/sfx/cry23_3.asm | 26 ++++++++--------- audio/sfx/cry24_1.asm | 42 ++++++++++++++-------------- audio/sfx/cry24_2.asm | 42 ++++++++++++++-------------- audio/sfx/cry24_3.asm | 42 ++++++++++++++-------------- audio/sfx/cry25_1.asm | 28 +++++++++---------- audio/sfx/cry25_2.asm | 28 +++++++++---------- audio/sfx/cry25_3.asm | 28 +++++++++---------- audio/sfx/cut_1.asm | 10 +++---- audio/sfx/cut_3.asm | 10 +++---- audio/sfx/cymbal1_1.asm | 2 +- audio/sfx/cymbal1_2.asm | 2 +- audio/sfx/cymbal1_3.asm | 2 +- audio/sfx/cymbal2_1.asm | 2 +- audio/sfx/cymbal2_2.asm | 2 +- audio/sfx/cymbal2_3.asm | 2 +- audio/sfx/cymbal3_1.asm | 2 +- audio/sfx/cymbal3_2.asm | 2 +- audio/sfx/cymbal3_3.asm | 2 +- audio/sfx/damage.asm | 6 ++-- audio/sfx/denied_1.asm | 8 +++--- audio/sfx/denied_3.asm | 8 +++--- audio/sfx/dex_page_added.asm | 8 +++--- audio/sfx/doubleslap.asm | 4 +-- audio/sfx/enter_pc_1.asm | 4 +-- audio/sfx/enter_pc_3.asm | 4 +-- audio/sfx/faint_fall.asm | 2 +- audio/sfx/faint_thud.asm | 8 +++--- audio/sfx/fly_1.asm | 32 ++++++++++----------- audio/sfx/fly_3.asm | 32 ++++++++++----------- audio/sfx/go_inside_1.asm | 4 +-- audio/sfx/go_inside_3.asm | 4 +-- audio/sfx/go_outside_1.asm | 10 +++---- audio/sfx/go_outside_3.asm | 10 +++---- audio/sfx/heal_ailment_1.asm | 6 ++-- audio/sfx/heal_ailment_2.asm | 6 ++-- audio/sfx/heal_ailment_3.asm | 6 ++-- audio/sfx/heal_hp_1.asm | 4 +-- audio/sfx/heal_hp_2.asm | 4 +-- audio/sfx/heal_hp_3.asm | 4 +-- audio/sfx/healing_machine_1.asm | 4 +-- audio/sfx/healing_machine_3.asm | 4 +-- audio/sfx/horn_drill.asm | 8 +++--- audio/sfx/intro_crash.asm | 4 +-- audio/sfx/intro_hip.asm | 2 +- audio/sfx/intro_hop.asm | 2 +- audio/sfx/intro_lunge.asm | 16 +++++------ audio/sfx/intro_raise.asm | 6 ++-- audio/sfx/intro_whoosh.asm | 10 +++---- audio/sfx/ledge_1.asm | 2 +- audio/sfx/ledge_3.asm | 2 +- 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 | 2 +- audio/sfx/muted_snare2_2.asm | 2 +- audio/sfx/muted_snare2_3.asm | 2 +- audio/sfx/muted_snare3_1.asm | 2 +- audio/sfx/muted_snare3_2.asm | 2 +- audio/sfx/muted_snare3_3.asm | 2 +- audio/sfx/muted_snare4_1.asm | 2 +- audio/sfx/muted_snare4_2.asm | 2 +- audio/sfx/muted_snare4_3.asm | 2 +- audio/sfx/not_very_effective.asm | 8 +++--- audio/sfx/peck.asm | 2 +- audio/sfx/poisoned_1.asm | 4 +-- audio/sfx/poisoned_3.asm | 4 +-- audio/sfx/pound.asm | 2 +- audio/sfx/press_ab_1.asm | 8 +++--- audio/sfx/press_ab_2.asm | 8 +++--- audio/sfx/press_ab_3.asm | 8 +++--- audio/sfx/psybeam.asm | 20 +++++++------- audio/sfx/psychic_m.asm | 36 ++++++++++++------------ audio/sfx/purchase_1.asm | 10 +++---- audio/sfx/purchase_3.asm | 10 +++---- audio/sfx/push_boulder_1.asm | 16 +++++------ audio/sfx/push_boulder_3.asm | 16 +++++------ audio/sfx/run.asm | 22 +++++++-------- audio/sfx/safari_zone_pa.asm | 12 ++++---- audio/sfx/save_1.asm | 30 ++++++++++---------- audio/sfx/save_3.asm | 44 ++++++++++++++--------------- audio/sfx/shooting_star.asm | 18 ++++++------ audio/sfx/shrink_1.asm | 10 +++---- audio/sfx/shrink_3.asm | 10 +++---- audio/sfx/silph_scope.asm | 10 +++---- audio/sfx/slots_new_spin.asm | 12 ++++---- audio/sfx/slots_reward.asm | 4 +-- audio/sfx/slots_stop_wheel.asm | 6 ++-- audio/sfx/snare1_1.asm | 2 +- audio/sfx/snare1_2.asm | 2 +- audio/sfx/snare1_3.asm | 2 +- audio/sfx/snare2_1.asm | 2 +- audio/sfx/snare2_2.asm | 2 +- audio/sfx/snare2_3.asm | 2 +- audio/sfx/snare3_1.asm | 2 +- audio/sfx/snare3_2.asm | 2 +- audio/sfx/snare3_3.asm | 2 +- audio/sfx/snare4_1.asm | 2 +- audio/sfx/snare4_2.asm | 2 +- audio/sfx/snare4_3.asm | 2 +- audio/sfx/snare5_1.asm | 12 ++++---- audio/sfx/snare5_2.asm | 12 ++++---- audio/sfx/snare5_3.asm | 12 ++++---- audio/sfx/snare6_1.asm | 2 +- audio/sfx/snare6_2.asm | 2 +- audio/sfx/snare6_3.asm | 2 +- audio/sfx/snare7_1.asm | 2 +- audio/sfx/snare7_2.asm | 2 +- audio/sfx/snare7_3.asm | 2 +- audio/sfx/snare8_1.asm | 2 +- audio/sfx/snare8_2.asm | 2 +- audio/sfx/snare8_3.asm | 2 +- audio/sfx/snare9_1.asm | 2 +- audio/sfx/snare9_2.asm | 2 +- audio/sfx/snare9_3.asm | 2 +- audio/sfx/ss_anne_horn_1.asm | 24 ++++++++-------- audio/sfx/ss_anne_horn_3.asm | 24 ++++++++-------- 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 | 6 ++-- audio/sfx/swap_3.asm | 6 ++-- audio/sfx/switch_1.asm | 4 +-- audio/sfx/switch_3.asm | 4 +-- audio/sfx/teleport_enter1_1.asm | 10 +++---- audio/sfx/teleport_enter1_3.asm | 10 +++---- audio/sfx/teleport_enter2_1.asm | 8 +++--- audio/sfx/teleport_enter2_3.asm | 8 +++--- audio/sfx/teleport_exit1_1.asm | 10 +++---- audio/sfx/teleport_exit1_3.asm | 10 +++---- audio/sfx/teleport_exit2_1.asm | 2 +- audio/sfx/teleport_exit2_3.asm | 2 +- audio/sfx/tink_1.asm | 4 +-- audio/sfx/tink_2.asm | 4 +-- audio/sfx/tink_3.asm | 4 +-- audio/sfx/trade_machine_1.asm | 4 +-- audio/sfx/trade_machine_3.asm | 4 +-- audio/sfx/triangle1_1.asm | 2 +- audio/sfx/triangle1_2.asm | 2 +- audio/sfx/triangle1_3.asm | 2 +- 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 | 6 ++-- audio/sfx/turn_off_pc_3.asm | 6 ++-- audio/sfx/turn_on_pc_1.asm | 18 ++++++------ audio/sfx/turn_on_pc_3.asm | 18 ++++++------ audio/sfx/unused_1.asm | 44 ++++++++++++++--------------- audio/sfx/unused_2.asm | 44 ++++++++++++++--------------- audio/sfx/unused_3.asm | 44 ++++++++++++++--------------- audio/sfx/vine_whip.asm | 16 +++++------ audio/sfx/withdraw_deposit_1.asm | 8 +++--- audio/sfx/withdraw_deposit_3.asm | 8 +++--- macros/audio_macros.asm | 19 +++++++++---- 311 files changed, 2598 insertions(+), 2586 deletions(-) diff --git a/audio/engine_1.asm b/audio/engine_1.asm index f762da29..bab1be55 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -563,7 +563,7 @@ Audio1_executemusic: Audio1_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio1_unknownsfx0x20 ; no + jr nz, Audio1_sfxnote ; no ld hl, wChannelOctaves ld b, 0 add hl, bc @@ -572,17 +572,18 @@ Audio1_octave: ld [hl], a ; store low nibble as octave jp Audio1_endchannel -Audio1_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio1_unknownsfx0x10 +; sfxnote is either squarenote or noisenote depending on the channel +Audio1_sfxnote: + cp $20 ; is this command a sfxnote? + jr nz, Audio1_pitchenvelope ld a, c cp Ch3 ; is this a noise or sfx channel? - jr c, Audio1_unknownsfx0x10 ; no + jr c, Audio1_pitchenvelope ; no ld b, 0 ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? - jr nz, Audio1_unknownsfx0x10 ; yes + jr nz, Audio1_pitchenvelope ; yes call Audio1_notelength ; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength @@ -624,12 +625,12 @@ Audio1_unknownsfx0x20: call Audio1_ApplyWavePatternAndFrequency ret -Audio1_unknownsfx0x10: +Audio1_pitchenvelope: ld a, c cp Ch4 jr c, Audio1_note ; if not a sfx ld a, d - cp $10 ; is this command a unknownsfx0x10? + cp $10 ; is this command a pitchenvelope? jr nz, Audio1_note ; no ld b, $0 ld hl, wChannelFlags2 diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 4eb9b96b..2ca5cbe8 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -557,7 +557,7 @@ Audio2_executemusic: Audio2_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio2_unknownsfx0x20 ; no + jr nz, Audio2_sfxnote ; no ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc @@ -566,17 +566,18 @@ Audio2_octave: ld [hl], a ; store low nibble as octave jp Audio2_endchannel -Audio2_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio2_unknownsfx0x10 ; no +; sfxnote is either squarenote or noisenote depending on the channel +Audio2_sfxnote: + cp $20 ; is this command an sfxnote? + jr nz, Audio2_pitchenvelope ; no ld a, c cp Ch3 ; is this a noise or sfx channel? - jr c, Audio2_unknownsfx0x10 ; no + jr c, Audio2_pitchenvelope ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc bit 0, [hl] - jr nz, Audio2_unknownsfx0x10 ; no + jr nz, Audio2_pitchenvelope ; no call Audio2_notelength ld d, a ld b, $0 @@ -611,12 +612,12 @@ Audio2_unknownsfx0x20: call Audio2_21dcc ret -Audio2_unknownsfx0x10: +Audio2_pitchenvelope: ld a, c cp Ch4 jr c, Audio2_note ; if not a sfx ld a, d - cp $10 ; is this command a unknownsfx0x10? + cp $10 ; is this command a pitchenvelope? jr nz, Audio2_note ; no ld b, $0 ld hl, wChannelFlags2 diff --git a/audio/engine_3.asm b/audio/engine_3.asm index bd784023..9a95f3e1 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -550,7 +550,7 @@ Audio3_executemusic: Audio3_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio3_unknownsfx0x20 ; no + jr nz, Audio3_sfxnote ; no ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc @@ -559,17 +559,18 @@ Audio3_octave: ld [hl], a ; store low nibble as octave jp Audio3_endchannel -Audio3_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio3_unknownsfx0x10 ; no +; sfxnote is either squarenote or noisenote depending on the channel +Audio3_sfxnote: + cp $20 ; is this command an sfxnote? + jr nz, Audio3_pitchenvelope ; no ld a, c cp Ch3 ; is this a noise or sfx channel? - jr c, Audio3_unknownsfx0x10 ; no + jr c, Audio3_pitchenvelope ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc bit 0, [hl] - jr nz, Audio3_unknownsfx0x10 ; no + jr nz, Audio3_pitchenvelope ; no call Audio3_notelength ; yes ld d, a ld b, $0 @@ -604,12 +605,12 @@ Audio3_unknownsfx0x20: call Audio3_7d6bf ret -Audio3_unknownsfx0x10: +Audio3_pitchenvelope: ld a, c cp Ch4 jr c, Audio3_note ; if not a sfx ld a, d - cp $10 ; is this command an unknownsfx0x10? + cp $10 ; is this command an pitchenvelope? jr nz, Audio3_note ; no ld b, $0 ld hl, wChannelFlags2 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index ad75c503..c904a18a 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ SFX_59_1_Ch4: duty 2 - squarenote 4, 241, 128, 7 + squarenote 4, 15, 1, 1920 endchannel SFX_59_1_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 161, 97, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 10, 1, 1889 endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 13a8a6e4..7331f973 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,11 +1,11 @@ SFX_59_3_Ch4: duty 2 - squarenote 4, 241, 128, 7 + squarenote 4, 15, 1, 1920 endchannel SFX_59_3_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 161, 97, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 10, 1, 1889 endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index f29ddbc1..0d45f451 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_1_Ch4: duty 0 pitchenvelope 1, 7 - squarenote 15, 210, 0, 7 + squarenote 15, 13, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 864e55f2..2ee03ec0 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_3_Ch4: duty 0 pitchenvelope 1, 7 - squarenote 15, 210, 0, 7 + squarenote 15, 13, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 3f0dcab0..c3fefdd2 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ SFX_Ball_Poof_Ch4: duty 2 pitchenvelope 1, 6 - squarenote 15, 242, 0, 4 + squarenote 15, 15, 2, 1024 pitchenvelope 0, 0 endchannel SFX_Ball_Poof_Ch7: - noisenote 15, 162, 34 + noisenote 15, 10, 2, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 271ceb96..e4518dfc 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ SFX_Ball_Toss_Ch4: duty 2 pitchenvelope 2, -7 - squarenote 15, 242, 128, 7 + squarenote 15, 15, 2, 1920 endchannel SFX_Ball_Toss_Ch5: duty 2 - squarenote 15, 194, 130, 7 + squarenote 15, 12, 2, 1922 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 8119261e..2ab97942 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ SFX_Battle_09_Ch4: duty 1 pitchenvelope 9, 7 - squarenote 15, 242, 0, 5 + squarenote 15, 15, 2, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 83420396..06e2fa14 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ SFX_Battle_0B_Ch7: - noisenote 8, 241, 84 + noisenote 8, 15, 1, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 5c2b40f8..67e910eb 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ SFX_Battle_0C_Ch7: - noisenote 15, 143, 17 - noisenote 4, 255, 18 - noisenote 10, 241, 85 + noisenote 15, 8, -7, 17 + noisenote 4, 15, -7, 18 + noisenote 10, 15, 1, 85 endchannel diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 7460238e..231d324f 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ SFX_Battle_0D_Ch7: - noisenote 15, 143, 52 - noisenote 8, 242, 53 - noisenote 10, 241, 85 + noisenote 15, 8, -7, 52 + noisenote 8, 15, 2, 53 + noisenote 10, 15, 1, 85 endchannel diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 7c7bebf0..eb67a126 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ SFX_Battle_0E_Ch7: - noisenote 15, 159, 35 - noisenote 8, 241, 33 + noisenote 15, 9, -7, 35 + noisenote 8, 15, 1, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 124a9a1d..26386131 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ SFX_Battle_0F_Ch7: - noisenote 2, 225, 75 - noisenote 10, 241, 68 - noisenote 2, 225, 58 - noisenote 6, 241, 52 + noisenote 2, 14, 1, 75 + noisenote 10, 15, 1, 68 + noisenote 2, 14, 1, 58 + noisenote 6, 15, 1, 52 endchannel diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 680a93b8..86d5a815 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ SFX_Battle_12_Ch7: - noisenote 8, 79, 35 - noisenote 4, 196, 34 - noisenote 6, 242, 35 + noisenote 8, 4, -7, 35 + noisenote 4, 12, 4, 34 + noisenote 6, 15, 2, 35 loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 252da5f3..882be8c7 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ SFX_Battle_13_Ch7: - noisenote 8, 79, 51 - noisenote 4, 196, 34 - noisenote 6, 242, 35 - noisenote 15, 242, 34 + noisenote 8, 4, -7, 51 + noisenote 4, 12, 4, 34 + noisenote 6, 15, 2, 35 + noisenote 15, 15, 2, 34 endchannel diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 8aa099bf..97a88b95 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ SFX_Battle_14_Ch7: - noisenote 8, 255, 50 - noisenote 8, 244, 67 - noisenote 8, 242, 84 - noisenote 8, 241, 101 + noisenote 8, 15, -7, 50 + noisenote 8, 15, 4, 67 + noisenote 8, 15, 2, 84 + noisenote 8, 15, 1, 101 endchannel diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index 79c685b0..daa614cd 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ SFX_Battle_16_Ch7: - noisenote 1, 148, 35 - noisenote 1, 180, 34 - noisenote 8, 241, 68 + noisenote 1, 9, 4, 35 + noisenote 1, 11, 4, 34 + noisenote 8, 15, 1, 68 endchannel diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 5164fdd6..b6cc787e 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ SFX_Battle_17_Ch7: - noisenote 2, 148, 51 - noisenote 4, 180, 34 - noisenote 4, 241, 68 - noisenote 8, 241, 85 + noisenote 2, 9, 4, 51 + noisenote 4, 11, 4, 34 + noisenote 4, 15, 1, 68 + noisenote 8, 15, 1, 85 endchannel diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index eb6ff32c..ced87cd8 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ SFX_Battle_18_Ch7: - noisenote 4, 255, 85 - noisenote 8, 241, 101 + noisenote 4, 15, -7, 85 + noisenote 8, 15, 1, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 47f742e4..53de4341 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ SFX_Battle_19_Ch7: - noisenote 2, 132, 67 - noisenote 2, 196, 34 - noisenote 8, 242, 52 + noisenote 2, 8, 4, 67 + noisenote 2, 12, 4, 34 + noisenote 8, 15, 2, 52 endchannel diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 694c90a5..06c2b6f1 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ SFX_Battle_1B_Ch7: - noisenote 2, 241, 34 - noisenote 15, 242, 18 + noisenote 2, 15, 1, 34 + noisenote 15, 15, 2, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index cb87f3d5..7518acd9 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ SFX_Battle_1C_Ch7: - noisenote 2, 194, 1 - noisenote 15, 244, 1 - noisenote 15, 242, 1 + noisenote 2, 12, 2, 1 + noisenote 15, 15, 4, 1 + noisenote 15, 15, 2, 1 endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 7bccb47c..e924414a 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ SFX_Battle_1E_Ch4: duty 0 pitchenvelope 3, -2 - squarenote 4, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel SFX_Battle_1E_Ch7: - noisenote 0, 209, 66 - noisenote 4, 161, 50 - noisenote 0, 209, 34 - noisenote 6, 161, 50 + noisenote 0, 13, 1, 66 + noisenote 4, 10, 1, 50 + noisenote 0, 13, 1, 34 + noisenote 6, 10, 1, 50 endchannel diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index b80c1e03..4e5687d8 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ SFX_Battle_20_Ch7: - noisenote 12, 241, 84 - noisenote 8, 241, 100 + noisenote 12, 15, 1, 84 + noisenote 8, 15, 1, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 954a3091..616b0c42 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ SFX_Battle_21_Ch7: - noisenote 2, 241, 51 - noisenote 2, 193, 50 - noisenote 2, 161, 49 - noisenote 15, 130, 50 - noisenote 8, 241, 52 + noisenote 2, 15, 1, 51 + noisenote 2, 12, 1, 50 + noisenote 2, 10, 1, 49 + noisenote 15, 8, 2, 50 + noisenote 8, 15, 1, 52 endchannel diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 82022661..e19417e0 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ SFX_Battle_22_Ch7: - noisenote 2, 210, 50 - noisenote 15, 242, 67 + noisenote 2, 13, 2, 50 + noisenote 15, 15, 2, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index e8214c80..febce65a 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ SFX_Battle_23_Ch7: - noisenote 2, 242, 67 - noisenote 4, 181, 50 - noisenote 9, 134, 49 - noisenote 7, 100, 0 - noisenote 15, 242, 85 + noisenote 2, 15, 2, 67 + noisenote 4, 11, 5, 50 + noisenote 9, 8, 6, 49 + noisenote 7, 6, 4, 0 + noisenote 15, 15, 2, 85 endchannel diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index beefeeb9..5a9ab9ca 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ SFX_Battle_24_Ch4: duty 1 pitchenvelope 9, 7 - squarenote 15, 242, 0, 7 + squarenote 15, 15, 2, 1792 pitchenvelope 0, 0 endchannel SFX_Battle_24_Ch7: - noisenote 15, 63, 34 - noisenote 15, 242, 33 + noisenote 15, 3, -7, 34 + noisenote 15, 15, 2, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 70612976..1d50b391 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ SFX_Battle_25_Ch7: - noisenote 15, 79, 65 - noisenote 8, 143, 65 - noisenote 8, 207, 65 - noisenote 8, 242, 66 - noisenote 15, 242, 65 + noisenote 15, 4, -7, 65 + noisenote 8, 8, -7, 65 + noisenote 8, 12, -7, 65 + noisenote 8, 15, 2, 66 + noisenote 15, 15, 2, 65 endchannel diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 08837de3..0c0e21ae 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ SFX_Battle_26_Ch7: - noisenote 10, 255, 80 - noisenote 15, 255, 81 - noisenote 8, 242, 81 - noisenote 6, 255, 82 - noisenote 6, 255, 83 - noisenote 8, 255, 84 - noisenote 15, 242, 84 + noisenote 10, 15, -7, 80 + noisenote 15, 15, -7, 81 + noisenote 8, 15, 2, 81 + noisenote 6, 15, -7, 82 + noisenote 6, 15, -7, 83 + noisenote 8, 15, -7, 84 + noisenote 15, 15, 2, 84 endchannel diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index f4e9f2e3..4e02cfe9 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ SFX_Battle_27_Ch4: duty 2 - squarenote 15, 63, 192, 7 + squarenote 15, 3, -7, 1984 SFX_Battle_27_branch_2062a: - squarenote 15, 223, 192, 7 + squarenote 15, 13, -7, 1984 loopchannel 4, SFX_Battle_27_branch_2062a - squarenote 15, 209, 192, 7 + squarenote 15, 13, 1, 1984 endchannel SFX_Battle_27_Ch5: dutycycle 179 - squarenote 15, 47, 200, 7 + squarenote 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: - squarenote 15, 207, 199, 7 + squarenote 15, 12, -7, 1991 loopchannel 4, SFX_Battle_27_branch_2063d - squarenote 15, 193, 200, 7 + squarenote 15, 12, 1, 1992 endchannel SFX_Battle_27_Ch7: - noisenote 3, 151, 18 - noisenote 3, 161, 17 + noisenote 3, 9, 7, 18 + noisenote 3, 10, 1, 17 loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index cb96b5ca..c2f0c511 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ SFX_Battle_28_Ch4: duty 0 - squarenote 0, 241, 192, 7 - squarenote 0, 241, 0, 7 + squarenote 0, 15, 1, 1984 + squarenote 0, 15, 1, 1792 loopchannel 12, SFX_Battle_28_Ch4 endchannel SFX_Battle_28_Ch5: dutycycle 179 - squarenote 0, 225, 193, 7 - squarenote 0, 225, 1, 7 + squarenote 0, 14, 1, 1985 + squarenote 0, 14, 1, 1793 loopchannel 12, SFX_Battle_28_Ch5 endchannel SFX_Battle_28_Ch7: - noisenote 1, 209, 73 - noisenote 1, 209, 41 + noisenote 1, 13, 1, 73 + noisenote 1, 13, 1, 41 loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index a873eed8..534826fe 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ SFX_Battle_29_Ch4: dutycycle 201 - squarenote 11, 243, 32, 1 - squarenote 9, 211, 80, 1 + squarenote 11, 15, 3, 288 + squarenote 9, 13, 3, 336 loopchannel 5, SFX_Battle_29_Ch4 - squarenote 8, 227, 48, 1 - squarenote 15, 194, 16, 1 + squarenote 8, 14, 3, 304 + squarenote 15, 12, 2, 272 endchannel SFX_Battle_29_Ch7: - noisenote 10, 243, 53 - noisenote 14, 246, 69 + noisenote 10, 15, 3, 53 + noisenote 14, 15, 6, 69 loopchannel 4, SFX_Battle_29_Ch7 - noisenote 12, 244, 188 - noisenote 12, 245, 156 - noisenote 15, 244, 172 + noisenote 12, 15, 4, 188 + noisenote 12, 15, 5, 156 + noisenote 15, 15, 4, 172 endchannel diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index 2168f90d..f4986805 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ SFX_Battle_2A_Ch4: dutycycle 57 - squarenote 4, 244, 0, 6 - squarenote 3, 196, 0, 5 - squarenote 5, 181, 0, 6 - squarenote 13, 226, 192, 6 + squarenote 4, 15, 4, 1536 + squarenote 3, 12, 4, 1280 + squarenote 5, 11, 5, 1536 + squarenote 13, 14, 2, 1728 loopchannel 3, SFX_Battle_2A_Ch4 - squarenote 8, 209, 0, 6 + squarenote 8, 13, 1, 1536 endchannel SFX_Battle_2A_Ch5: dutycycle 141 - squarenote 5, 228, 224, 5 - squarenote 4, 180, 224, 4 - squarenote 6, 165, 232, 5 - squarenote 14, 209, 160, 6 + squarenote 5, 14, 4, 1504 + squarenote 4, 11, 4, 1248 + squarenote 6, 10, 5, 1512 + squarenote 14, 13, 1, 1696 loopchannel 3, SFX_Battle_2A_Ch5 endchannel SFX_Battle_2A_Ch7: - noisenote 5, 195, 51 - noisenote 3, 146, 67 - noisenote 10, 181, 51 - noisenote 15, 195, 50 + noisenote 5, 12, 3, 51 + noisenote 3, 9, 2, 67 + noisenote 10, 11, 5, 51 + noisenote 15, 12, 3, 50 loopchannel 2, SFX_Battle_2A_Ch7 endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 94d11f3f..418ab5cb 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ SFX_Battle_2B_Ch4: dutycycle 210 - squarenote 3, 129, 0, 3 - squarenote 3, 193, 0, 4 - squarenote 3, 241, 0, 5 - squarenote 3, 177, 0, 4 - squarenote 3, 113, 0, 3 + squarenote 3, 8, 1, 768 + squarenote 3, 12, 1, 1024 + squarenote 3, 15, 1, 1280 + squarenote 3, 11, 1, 1024 + squarenote 3, 7, 1, 768 loopchannel 5, SFX_Battle_2B_Ch4 - squarenote 8, 129, 0, 4 + squarenote 8, 8, 1, 1024 endchannel SFX_Battle_2B_Ch7: - noisenote 3, 98, 34 - noisenote 3, 162, 50 - noisenote 3, 210, 51 - noisenote 3, 146, 35 - noisenote 3, 82, 18 + noisenote 3, 6, 2, 34 + noisenote 3, 10, 2, 50 + noisenote 3, 13, 2, 51 + noisenote 3, 9, 2, 35 + noisenote 3, 5, 2, 18 loopchannel 5, SFX_Battle_2B_Ch7 - noisenote 8, 129, 18 + noisenote 8, 8, 1, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 63be0d0f..aedb91bd 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ SFX_Battle_2C_Ch4: dutycycle 57 - squarenote 15, 244, 0, 5 - squarenote 15, 196, 0, 4 - squarenote 15, 226, 192, 5 + squarenote 15, 15, 4, 1280 + squarenote 15, 12, 4, 1024 + squarenote 15, 14, 2, 1472 loopchannel 3, SFX_Battle_2C_Ch4 endchannel SFX_Battle_2C_Ch5: dutycycle 141 - squarenote 7, 228, 48, 4 - squarenote 15, 180, 48, 3 - squarenote 15, 162, 56, 4 + squarenote 7, 14, 4, 1072 + squarenote 15, 11, 4, 816 + squarenote 15, 10, 2, 1080 loopchannel 4, SFX_Battle_2C_Ch5 endchannel SFX_Battle_2C_Ch7: - noisenote 9, 244, 68 - noisenote 9, 242, 67 - noisenote 15, 244, 66 - noisenote 15, 244, 65 + noisenote 9, 15, 4, 68 + noisenote 9, 15, 2, 67 + noisenote 15, 15, 4, 66 + noisenote 15, 15, 4, 65 loopchannel 3, SFX_Battle_2C_Ch7 endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index a1f8916b..ca1afc42 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ SFX_Battle_2E_Ch4: duty 0 - squarenote 2, 241, 0, 2 - squarenote 3, 241, 0, 7 - squarenote 4, 241, 0, 5 - squarenote 5, 241, 240, 7 + squarenote 2, 15, 1, 512 + squarenote 3, 15, 1, 1792 + squarenote 4, 15, 1, 1280 + squarenote 5, 15, 1, 2032 loopchannel 8, SFX_Battle_2E_Ch4 endchannel SFX_Battle_2E_Ch5: dutycycle 179 - squarenote 2, 225, 2, 3 - squarenote 3, 225, 242, 7 - squarenote 4, 225, 2, 6 - squarenote 5, 225, 2, 7 + squarenote 2, 14, 1, 770 + squarenote 3, 14, 1, 2034 + squarenote 4, 14, 1, 1538 + squarenote 5, 14, 1, 1794 loopchannel 8, SFX_Battle_2E_Ch5 endchannel SFX_Battle_2E_Ch7: - noisenote 2, 211, 16 - noisenote 3, 211, 17 - noisenote 2, 210, 16 - noisenote 5, 210, 18 + noisenote 2, 13, 3, 16 + noisenote 3, 13, 3, 17 + noisenote 2, 13, 2, 16 + noisenote 5, 13, 2, 18 loopchannel 9, SFX_Battle_2E_Ch7 endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index 2fde88a8..d8c2bd91 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ SFX_Battle_2F_Ch4: dutycycle 43 - squarenote 3, 241, 240, 7 - squarenote 4, 242, 0, 2 + squarenote 3, 15, 1, 2032 + squarenote 4, 15, 2, 512 loopchannel 8, SFX_Battle_2F_Ch4 endchannel SFX_Battle_2F_Ch5: dutycycle 179 - squarenote 4, 226, 2, 2 - squarenote 4, 225, 226, 7 + squarenote 4, 14, 2, 514 + squarenote 4, 14, 1, 2018 loopchannel 9, SFX_Battle_2F_Ch5 endchannel SFX_Battle_2F_Ch7: - noisenote 4, 255, 67 - noisenote 4, 242, 68 + noisenote 4, 15, -7, 67 + noisenote 4, 15, 2, 68 loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index 09b08271..ee1cc671 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ SFX_Battle_31_Ch4: duty 2 - squarenote 15, 255, 224, 7 - squarenote 15, 255, 224, 7 - squarenote 15, 255, 224, 7 - squarenote 15, 255, 224, 7 - squarenote 15, 242, 224, 7 + squarenote 15, 15, -7, 2016 + squarenote 15, 15, -7, 2016 + squarenote 15, 15, -7, 2016 + squarenote 15, 15, -7, 2016 + squarenote 15, 15, 2, 2016 endchannel SFX_Battle_31_Ch5: duty 3 - squarenote 15, 255, 226, 7 - squarenote 15, 255, 225, 7 - squarenote 15, 255, 226, 7 - squarenote 15, 255, 225, 7 - squarenote 15, 242, 226, 7 + squarenote 15, 15, -7, 2018 + squarenote 15, 15, -7, 2017 + squarenote 15, 15, -7, 2018 + squarenote 15, 15, -7, 2017 + squarenote 15, 15, 2, 2018 endchannel diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 5e5b8641..92ea4661 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ SFX_Battle_32_Ch4: duty 2 pitchenvelope 10, -7 - squarenote 8, 241, 0, 7 + squarenote 8, 15, 1, 1792 pitchenvelope 0, 0 endchannel SFX_Battle_32_Ch5: duty 3 - squarenote 8, 241, 1, 7 + squarenote 8, 15, 1, 1793 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 740b8b43..5eee7b32 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ SFX_Battle_33_Ch4: duty 2 - squarenote 6, 241, 0, 5 - squarenote 6, 241, 128, 5 - squarenote 6, 241, 0, 6 - squarenote 6, 241, 128, 6 - squarenote 8, 241, 0, 7 + squarenote 6, 15, 1, 1280 + squarenote 6, 15, 1, 1408 + squarenote 6, 15, 1, 1536 + squarenote 6, 15, 1, 1664 + squarenote 8, 15, 1, 1792 endchannel SFX_Battle_33_Ch5: duty 3 - squarenote 6, 225, 16, 5 - squarenote 6, 225, 144, 5 - squarenote 6, 225, 16, 6 - squarenote 6, 225, 144, 6 - squarenote 8, 225, 16, 7 + squarenote 6, 14, 1, 1296 + squarenote 6, 14, 1, 1424 + squarenote 6, 14, 1, 1552 + squarenote 6, 14, 1, 1680 + squarenote 8, 14, 1, 1808 endchannel diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 329c941b..af9d5b65 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ SFX_Battle_34_Ch4: dutycycle 237 - squarenote 8, 255, 248, 3 - squarenote 15, 255, 0, 4 - squarenote 15, 243, 0, 4 + squarenote 8, 15, -7, 1016 + squarenote 15, 15, -7, 1024 + squarenote 15, 15, 3, 1024 endchannel SFX_Battle_34_Ch5: dutycycle 180 - squarenote 8, 239, 192, 3 - squarenote 15, 239, 192, 3 - squarenote 15, 227, 192, 3 + squarenote 8, 14, -7, 960 + squarenote 15, 14, -7, 960 + squarenote 15, 14, 3, 960 endchannel SFX_Battle_34_Ch7: - noisenote 4, 255, 81 - noisenote 8, 255, 84 - noisenote 15, 255, 85 - noisenote 15, 243, 86 + noisenote 4, 15, -7, 81 + noisenote 8, 15, -7, 84 + noisenote 15, 15, -7, 85 + noisenote 15, 15, 3, 86 endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 983687e3..9d00fad9 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ SFX_Battle_36_Ch4: duty 0 - squarenote 2, 241, 128, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 144, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 160, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 176, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 192, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 208, 7 + squarenote 2, 15, 1, 1920 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 1936 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 1952 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 1968 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 1984 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 2000 SFX_Battle_36_branch_20930: - squarenote 2, 241, 0, 7 - squarenote 2, 241, 224, 7 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 2016 loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 241, 0, 7 + squarenote 15, 15, 1, 1792 endchannel SFX_Battle_36_Ch5: dutycycle 179 - squarenote 2, 241, 129, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 145, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 161, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 177, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 193, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 209, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 225, 7 + squarenote 2, 15, 1, 1921 + squarenote 2, 15, 1, 1793 + squarenote 2, 15, 1, 1937 + squarenote 2, 15, 1, 1793 + squarenote 2, 15, 1, 1953 + squarenote 2, 15, 1, 1793 + squarenote 2, 15, 1, 1969 + squarenote 2, 15, 1, 1793 + squarenote 2, 15, 1, 1985 + squarenote 2, 15, 1, 1793 + squarenote 2, 15, 1, 2001 + squarenote 2, 15, 1, 1793 + squarenote 2, 15, 1, 2017 loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 241, 1, 7 + squarenote 15, 15, 1, 1793 endchannel SFX_Battle_36_Ch7: - noisenote 1, 209, 73 - noisenote 1, 209, 41 + noisenote 1, 13, 1, 73 + noisenote 1, 13, 1, 41 loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index d0556537..a58adb8a 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ SFX_Collision_1_Ch4: duty 2 pitchenvelope 5, -2 - squarenote 15, 241, 0, 3 + squarenote 15, 15, 1, 768 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 623213e4..60e8cde3 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ SFX_Collision_3_Ch4: duty 2 pitchenvelope 5, -2 - squarenote 15, 241, 0, 3 + squarenote 15, 15, 1, 768 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index bc4e64aa..c0c128c0 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,21 +1,21 @@ SFX_Cry00_1_Ch4: dutycycle 245 - squarenote 4, 243, 24, 7 - squarenote 15, 229, 152, 7 - squarenote 8, 145, 88, 7 + squarenote 4, 15, 3, 1816 + squarenote 15, 14, 5, 1944 + squarenote 8, 9, 1, 1880 endchannel SFX_Cry00_1_Ch5: dutycycle 160 - squarenote 5, 179, 8, 7 - squarenote 15, 197, 136, 7 - squarenote 8, 113, 72, 7 + squarenote 5, 11, 3, 1800 + squarenote 15, 12, 5, 1928 + squarenote 8, 7, 1, 1864 endchannel SFX_Cry00_1_Ch7: - noisenote 3, 161, 28 - noisenote 14, 148, 44 - noisenote 8, 129, 28 + noisenote 3, 10, 1, 28 + noisenote 14, 9, 4, 44 + noisenote 8, 8, 1, 28 endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index 37e2a7b3..f9f104c0 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,21 +1,21 @@ SFX_Cry00_2_Ch4: dutycycle 245 - squarenote 4, 243, 24, 7 - squarenote 15, 229, 152, 7 - squarenote 8, 145, 88, 7 + squarenote 4, 15, 3, 1816 + squarenote 15, 14, 5, 1944 + squarenote 8, 9, 1, 1880 endchannel SFX_Cry00_2_Ch5: dutycycle 160 - squarenote 5, 179, 8, 7 - squarenote 15, 197, 136, 7 - squarenote 8, 113, 72, 7 + squarenote 5, 11, 3, 1800 + squarenote 15, 12, 5, 1928 + squarenote 8, 7, 1, 1864 endchannel SFX_Cry00_2_Ch7: - noisenote 3, 161, 28 - noisenote 14, 148, 44 - noisenote 8, 129, 28 + noisenote 3, 10, 1, 28 + noisenote 14, 9, 4, 44 + noisenote 8, 8, 1, 28 endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 3a434193..3956e46c 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,21 +1,21 @@ SFX_Cry00_3_Ch4: dutycycle 245 - squarenote 4, 243, 24, 7 - squarenote 15, 229, 152, 7 - squarenote 8, 145, 88, 7 + squarenote 4, 15, 3, 1816 + squarenote 15, 14, 5, 1944 + squarenote 8, 9, 1, 1880 endchannel SFX_Cry00_3_Ch5: dutycycle 160 - squarenote 5, 179, 8, 7 - squarenote 15, 197, 136, 7 - squarenote 8, 113, 72, 7 + squarenote 5, 11, 3, 1800 + squarenote 15, 12, 5, 1928 + squarenote 8, 7, 1, 1864 endchannel SFX_Cry00_3_Ch7: - noisenote 3, 161, 28 - noisenote 14, 148, 44 - noisenote 8, 129, 28 + noisenote 3, 10, 1, 28 + noisenote 14, 9, 4, 44 + noisenote 8, 8, 1, 28 endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 56b8d441..24ebcbc6 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,24 +1,24 @@ SFX_Cry01_1_Ch4: dutycycle 160 - squarenote 4, 243, 0, 6 - squarenote 8, 213, 96, 7 - squarenote 3, 226, 32, 7 - squarenote 8, 209, 16, 7 + squarenote 4, 15, 3, 1536 + squarenote 8, 13, 5, 1888 + squarenote 3, 14, 2, 1824 + squarenote 8, 13, 1, 1808 endchannel SFX_Cry01_1_Ch5: dutycycle 90 - squarenote 5, 179, 241, 6 - squarenote 7, 197, 82, 7 - squarenote 3, 162, 17, 7 - squarenote 8, 177, 1, 6 + squarenote 5, 11, 3, 1777 + squarenote 7, 12, 5, 1874 + squarenote 3, 10, 2, 1809 + squarenote 8, 11, 1, 1537 endchannel SFX_Cry01_1_Ch7: - noisenote 3, 162, 60 - noisenote 12, 148, 44 - noisenote 3, 130, 28 - noisenote 8, 113, 44 + noisenote 3, 10, 2, 60 + noisenote 12, 9, 4, 44 + noisenote 3, 8, 2, 28 + noisenote 8, 7, 1, 44 endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 43db8130..e226ed44 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,24 +1,24 @@ SFX_Cry01_2_Ch4: dutycycle 160 - squarenote 4, 243, 0, 6 - squarenote 8, 213, 96, 7 - squarenote 3, 226, 32, 7 - squarenote 8, 209, 16, 7 + squarenote 4, 15, 3, 1536 + squarenote 8, 13, 5, 1888 + squarenote 3, 14, 2, 1824 + squarenote 8, 13, 1, 1808 endchannel SFX_Cry01_2_Ch5: dutycycle 90 - squarenote 5, 179, 241, 6 - squarenote 7, 197, 82, 7 - squarenote 3, 162, 17, 7 - squarenote 8, 177, 1, 6 + squarenote 5, 11, 3, 1777 + squarenote 7, 12, 5, 1874 + squarenote 3, 10, 2, 1809 + squarenote 8, 11, 1, 1537 endchannel SFX_Cry01_2_Ch7: - noisenote 3, 162, 60 - noisenote 12, 148, 44 - noisenote 3, 130, 28 - noisenote 8, 113, 44 + noisenote 3, 10, 2, 60 + noisenote 12, 9, 4, 44 + noisenote 3, 8, 2, 28 + noisenote 8, 7, 1, 44 endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 69728006..43cf91df 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,24 +1,24 @@ SFX_Cry01_3_Ch4: dutycycle 160 - squarenote 4, 243, 0, 6 - squarenote 8, 213, 96, 7 - squarenote 3, 226, 32, 7 - squarenote 8, 209, 16, 7 + squarenote 4, 15, 3, 1536 + squarenote 8, 13, 5, 1888 + squarenote 3, 14, 2, 1824 + squarenote 8, 13, 1, 1808 endchannel SFX_Cry01_3_Ch5: dutycycle 90 - squarenote 5, 179, 241, 6 - squarenote 7, 197, 82, 7 - squarenote 3, 162, 17, 7 - squarenote 8, 177, 1, 6 + squarenote 5, 11, 3, 1777 + squarenote 7, 12, 5, 1874 + squarenote 3, 10, 2, 1809 + squarenote 8, 11, 1, 1537 endchannel SFX_Cry01_3_Ch7: - noisenote 3, 162, 60 - noisenote 12, 148, 44 - noisenote 3, 130, 28 - noisenote 8, 113, 44 + noisenote 3, 10, 2, 60 + noisenote 12, 9, 4, 44 + noisenote 3, 8, 2, 28 + noisenote 8, 7, 1, 44 endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index c210c673..1cc710d2 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,16 +1,16 @@ SFX_Cry02_1_Ch4: duty 0 - squarenote 8, 245, 128, 4 - squarenote 2, 225, 224, 5 - squarenote 8, 209, 220, 5 + squarenote 8, 15, 5, 1152 + squarenote 2, 14, 1, 1504 + squarenote 8, 13, 1, 1500 endchannel SFX_Cry02_1_Ch5: dutycycle 165 - squarenote 7, 149, 65, 4 - squarenote 2, 129, 33, 5 - squarenote 8, 97, 26, 5 + squarenote 7, 9, 5, 1089 + squarenote 2, 8, 1, 1313 + squarenote 8, 6, 1, 1306 SFX_Cry02_1_Ch7: diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 79e90a8c..6e9ff69f 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,16 +1,16 @@ SFX_Cry02_2_Ch4: duty 0 - squarenote 8, 245, 128, 4 - squarenote 2, 225, 224, 5 - squarenote 8, 209, 220, 5 + squarenote 8, 15, 5, 1152 + squarenote 2, 14, 1, 1504 + squarenote 8, 13, 1, 1500 endchannel SFX_Cry02_2_Ch5: dutycycle 165 - squarenote 7, 149, 65, 4 - squarenote 2, 129, 33, 5 - squarenote 8, 97, 26, 5 + squarenote 7, 9, 5, 1089 + squarenote 2, 8, 1, 1313 + squarenote 8, 6, 1, 1306 SFX_Cry02_2_Ch7: diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 8d069ce0..9f369ad7 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,16 +1,16 @@ SFX_Cry02_3_Ch4: duty 0 - squarenote 8, 245, 128, 4 - squarenote 2, 225, 224, 5 - squarenote 8, 209, 220, 5 + squarenote 8, 15, 5, 1152 + squarenote 2, 14, 1, 1504 + squarenote 8, 13, 1, 1500 endchannel SFX_Cry02_3_Ch5: dutycycle 165 - squarenote 7, 149, 65, 4 - squarenote 2, 129, 33, 5 - squarenote 8, 97, 26, 5 + squarenote 7, 9, 5, 1089 + squarenote 2, 8, 1, 1313 + squarenote 8, 6, 1, 1306 SFX_Cry02_3_Ch7: diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 6a37c5c0..5039203d 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,30 +1,30 @@ SFX_Cry03_1_Ch4: dutycycle 240 - squarenote 4, 247, 8, 6 - squarenote 6, 230, 0, 6 - squarenote 6, 215, 240, 5 - squarenote 6, 196, 224, 5 - squarenote 5, 211, 192, 5 - squarenote 4, 211, 160, 5 - squarenote 8, 225, 128, 5 + squarenote 4, 15, 7, 1544 + squarenote 6, 14, 6, 1536 + squarenote 6, 13, 7, 1520 + squarenote 6, 12, 4, 1504 + squarenote 5, 13, 3, 1472 + squarenote 4, 13, 3, 1440 + squarenote 8, 14, 1, 1408 endchannel SFX_Cry03_1_Ch5: dutycycle 10 - squarenote 4, 199, 4, 5 - squarenote 6, 166, 2, 5 - squarenote 6, 151, 241, 4 - squarenote 4, 180, 225, 4 - squarenote 5, 163, 194, 4 - squarenote 4, 179, 163, 4 - squarenote 8, 193, 130, 4 + squarenote 4, 12, 7, 1284 + squarenote 6, 10, 6, 1282 + squarenote 6, 9, 7, 1265 + squarenote 4, 11, 4, 1249 + squarenote 5, 10, 3, 1218 + squarenote 4, 11, 3, 1187 + squarenote 8, 12, 1, 1154 endchannel SFX_Cry03_1_Ch7: - noisenote 12, 228, 76 - noisenote 10, 199, 92 - noisenote 12, 182, 76 - noisenote 15, 162, 92 + noisenote 12, 14, 4, 76 + noisenote 10, 12, 7, 92 + noisenote 12, 11, 6, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 0915e513..54375387 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,30 +1,30 @@ SFX_Cry03_2_Ch4: dutycycle 240 - squarenote 4, 247, 8, 6 - squarenote 6, 230, 0, 6 - squarenote 6, 215, 240, 5 - squarenote 6, 196, 224, 5 - squarenote 5, 211, 192, 5 - squarenote 4, 211, 160, 5 - squarenote 8, 225, 128, 5 + squarenote 4, 15, 7, 1544 + squarenote 6, 14, 6, 1536 + squarenote 6, 13, 7, 1520 + squarenote 6, 12, 4, 1504 + squarenote 5, 13, 3, 1472 + squarenote 4, 13, 3, 1440 + squarenote 8, 14, 1, 1408 endchannel SFX_Cry03_2_Ch5: dutycycle 10 - squarenote 4, 199, 4, 5 - squarenote 6, 166, 2, 5 - squarenote 6, 151, 241, 4 - squarenote 4, 180, 225, 4 - squarenote 5, 163, 194, 4 - squarenote 4, 179, 163, 4 - squarenote 8, 193, 130, 4 + squarenote 4, 12, 7, 1284 + squarenote 6, 10, 6, 1282 + squarenote 6, 9, 7, 1265 + squarenote 4, 11, 4, 1249 + squarenote 5, 10, 3, 1218 + squarenote 4, 11, 3, 1187 + squarenote 8, 12, 1, 1154 endchannel SFX_Cry03_2_Ch7: - noisenote 12, 228, 76 - noisenote 10, 199, 92 - noisenote 12, 182, 76 - noisenote 15, 162, 92 + noisenote 12, 14, 4, 76 + noisenote 10, 12, 7, 92 + noisenote 12, 11, 6, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index c4a959eb..83e1bdd1 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,30 +1,30 @@ SFX_Cry03_3_Ch4: dutycycle 240 - squarenote 4, 247, 8, 6 - squarenote 6, 230, 0, 6 - squarenote 6, 215, 240, 5 - squarenote 6, 196, 224, 5 - squarenote 5, 211, 192, 5 - squarenote 4, 211, 160, 5 - squarenote 8, 225, 128, 5 + squarenote 4, 15, 7, 1544 + squarenote 6, 14, 6, 1536 + squarenote 6, 13, 7, 1520 + squarenote 6, 12, 4, 1504 + squarenote 5, 13, 3, 1472 + squarenote 4, 13, 3, 1440 + squarenote 8, 14, 1, 1408 endchannel SFX_Cry03_3_Ch5: dutycycle 10 - squarenote 4, 199, 4, 5 - squarenote 6, 166, 2, 5 - squarenote 6, 151, 241, 4 - squarenote 4, 180, 225, 4 - squarenote 5, 163, 194, 4 - squarenote 4, 179, 163, 4 - squarenote 8, 193, 130, 4 + squarenote 4, 12, 7, 1284 + squarenote 6, 10, 6, 1282 + squarenote 6, 9, 7, 1265 + squarenote 4, 11, 4, 1249 + squarenote 5, 10, 3, 1218 + squarenote 4, 11, 3, 1187 + squarenote 8, 12, 1, 1154 endchannel SFX_Cry03_3_Ch7: - noisenote 12, 228, 76 - noisenote 10, 199, 92 - noisenote 12, 182, 76 - noisenote 15, 162, 92 + noisenote 12, 14, 4, 76 + noisenote 10, 12, 7, 92 + noisenote 12, 11, 6, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 28c068e3..c99f9582 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,32 +1,32 @@ SFX_Cry04_1_Ch4: dutycycle 240 - squarenote 4, 247, 160, 6 - squarenote 8, 230, 164, 6 - squarenote 4, 214, 160, 6 - squarenote 12, 211, 32, 6 - squarenote 8, 195, 36, 6 - squarenote 4, 194, 32, 6 - squarenote 8, 177, 16, 6 + squarenote 4, 15, 7, 1696 + squarenote 8, 14, 6, 1700 + squarenote 4, 13, 6, 1696 + squarenote 12, 13, 3, 1568 + squarenote 8, 12, 3, 1572 + squarenote 4, 12, 2, 1568 + squarenote 8, 11, 1, 1552 endchannel SFX_Cry04_1_Ch5: dutycycle 90 - squarenote 4, 231, 1, 6 - squarenote 8, 214, 3, 6 - squarenote 4, 198, 1, 6 - squarenote 12, 195, 129, 5 - squarenote 8, 179, 131, 5 - squarenote 4, 178, 130, 5 - squarenote 8, 161, 113, 5 + squarenote 4, 14, 7, 1537 + squarenote 8, 13, 6, 1539 + squarenote 4, 12, 6, 1537 + squarenote 12, 12, 3, 1409 + squarenote 8, 11, 3, 1411 + squarenote 4, 11, 2, 1410 + squarenote 8, 10, 1, 1393 endchannel SFX_Cry04_1_Ch7: - noisenote 7, 214, 92 - noisenote 8, 230, 76 - noisenote 4, 212, 92 - noisenote 4, 212, 76 - noisenote 7, 195, 76 - noisenote 8, 161, 92 + noisenote 7, 13, 6, 92 + noisenote 8, 14, 6, 76 + noisenote 4, 13, 4, 92 + noisenote 4, 13, 4, 76 + noisenote 7, 12, 3, 76 + noisenote 8, 10, 1, 92 endchannel diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index 0d438c4e..def5b459 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,32 +1,32 @@ SFX_Cry04_2_Ch4: dutycycle 240 - squarenote 4, 247, 160, 6 - squarenote 8, 230, 164, 6 - squarenote 4, 214, 160, 6 - squarenote 12, 211, 32, 6 - squarenote 8, 195, 36, 6 - squarenote 4, 194, 32, 6 - squarenote 8, 177, 16, 6 + squarenote 4, 15, 7, 1696 + squarenote 8, 14, 6, 1700 + squarenote 4, 13, 6, 1696 + squarenote 12, 13, 3, 1568 + squarenote 8, 12, 3, 1572 + squarenote 4, 12, 2, 1568 + squarenote 8, 11, 1, 1552 endchannel SFX_Cry04_2_Ch5: dutycycle 90 - squarenote 4, 231, 1, 6 - squarenote 8, 214, 3, 6 - squarenote 4, 198, 1, 6 - squarenote 12, 195, 129, 5 - squarenote 8, 179, 131, 5 - squarenote 4, 178, 130, 5 - squarenote 8, 161, 113, 5 + squarenote 4, 14, 7, 1537 + squarenote 8, 13, 6, 1539 + squarenote 4, 12, 6, 1537 + squarenote 12, 12, 3, 1409 + squarenote 8, 11, 3, 1411 + squarenote 4, 11, 2, 1410 + squarenote 8, 10, 1, 1393 endchannel SFX_Cry04_2_Ch7: - noisenote 7, 214, 92 - noisenote 8, 230, 76 - noisenote 4, 212, 92 - noisenote 4, 212, 76 - noisenote 7, 195, 76 - noisenote 8, 161, 92 + noisenote 7, 13, 6, 92 + noisenote 8, 14, 6, 76 + noisenote 4, 13, 4, 92 + noisenote 4, 13, 4, 76 + noisenote 7, 12, 3, 76 + noisenote 8, 10, 1, 92 endchannel diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 23011f51..83e81ead 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,32 +1,32 @@ SFX_Cry04_3_Ch4: dutycycle 240 - squarenote 4, 247, 160, 6 - squarenote 8, 230, 164, 6 - squarenote 4, 214, 160, 6 - squarenote 12, 211, 32, 6 - squarenote 8, 195, 36, 6 - squarenote 4, 194, 32, 6 - squarenote 8, 177, 16, 6 + squarenote 4, 15, 7, 1696 + squarenote 8, 14, 6, 1700 + squarenote 4, 13, 6, 1696 + squarenote 12, 13, 3, 1568 + squarenote 8, 12, 3, 1572 + squarenote 4, 12, 2, 1568 + squarenote 8, 11, 1, 1552 endchannel SFX_Cry04_3_Ch5: dutycycle 90 - squarenote 4, 231, 1, 6 - squarenote 8, 214, 3, 6 - squarenote 4, 198, 1, 6 - squarenote 12, 195, 129, 5 - squarenote 8, 179, 131, 5 - squarenote 4, 178, 130, 5 - squarenote 8, 161, 113, 5 + squarenote 4, 14, 7, 1537 + squarenote 8, 13, 6, 1539 + squarenote 4, 12, 6, 1537 + squarenote 12, 12, 3, 1409 + squarenote 8, 11, 3, 1411 + squarenote 4, 11, 2, 1410 + squarenote 8, 10, 1, 1393 endchannel SFX_Cry04_3_Ch7: - noisenote 7, 214, 92 - noisenote 8, 230, 76 - noisenote 4, 212, 92 - noisenote 4, 212, 76 - noisenote 7, 195, 76 - noisenote 8, 161, 92 + noisenote 7, 13, 6, 92 + noisenote 8, 14, 6, 76 + noisenote 4, 13, 4, 92 + noisenote 4, 13, 4, 76 + noisenote 7, 12, 3, 76 + noisenote 8, 10, 1, 92 endchannel diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 00a32ac1..525fdc2d 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,18 +1,18 @@ SFX_Cry05_1_Ch4: dutycycle 10 - squarenote 6, 226, 0, 5 - squarenote 6, 227, 128, 5 - squarenote 6, 211, 112, 5 - squarenote 8, 161, 96, 5 + squarenote 6, 14, 2, 1280 + squarenote 6, 14, 3, 1408 + squarenote 6, 13, 3, 1392 + squarenote 8, 10, 1, 1376 endchannel SFX_Cry05_1_Ch5: dutycycle 245 - squarenote 6, 226, 130, 4 - squarenote 6, 211, 1, 5 - squarenote 6, 178, 226, 4 - squarenote 8, 129, 193, 4 + squarenote 6, 14, 2, 1154 + squarenote 6, 13, 3, 1281 + squarenote 6, 11, 2, 1250 + squarenote 8, 8, 1, 1217 SFX_Cry05_1_Ch7: diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index c6039d1e..44e8fb21 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,18 +1,18 @@ SFX_Cry05_2_Ch4: dutycycle 10 - squarenote 6, 226, 0, 5 - squarenote 6, 227, 128, 5 - squarenote 6, 211, 112, 5 - squarenote 8, 161, 96, 5 + squarenote 6, 14, 2, 1280 + squarenote 6, 14, 3, 1408 + squarenote 6, 13, 3, 1392 + squarenote 8, 10, 1, 1376 endchannel SFX_Cry05_2_Ch5: dutycycle 245 - squarenote 6, 226, 130, 4 - squarenote 6, 211, 1, 5 - squarenote 6, 178, 226, 4 - squarenote 8, 129, 193, 4 + squarenote 6, 14, 2, 1154 + squarenote 6, 13, 3, 1281 + squarenote 6, 11, 2, 1250 + squarenote 8, 8, 1, 1217 SFX_Cry05_2_Ch7: diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index dec9a99f..2fcb4e1f 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,18 +1,18 @@ SFX_Cry05_3_Ch4: dutycycle 10 - squarenote 6, 226, 0, 5 - squarenote 6, 227, 128, 5 - squarenote 6, 211, 112, 5 - squarenote 8, 161, 96, 5 + squarenote 6, 14, 2, 1280 + squarenote 6, 14, 3, 1408 + squarenote 6, 13, 3, 1392 + squarenote 8, 10, 1, 1376 endchannel SFX_Cry05_3_Ch5: dutycycle 245 - squarenote 6, 226, 130, 4 - squarenote 6, 211, 1, 5 - squarenote 6, 178, 226, 4 - squarenote 8, 129, 193, 4 + squarenote 6, 14, 2, 1154 + squarenote 6, 13, 3, 1281 + squarenote 6, 11, 2, 1250 + squarenote 8, 8, 1, 1217 SFX_Cry05_3_Ch7: diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index 5adf4058..09099504 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,11 +1,11 @@ SFX_Cry06_1_Ch4: dutycycle 250 - squarenote 6, 131, 71, 2 - squarenote 15, 98, 38, 2 - squarenote 4, 82, 69, 2 - squarenote 9, 99, 6, 2 - squarenote 15, 130, 37, 2 - squarenote 15, 66, 7, 2 + squarenote 6, 8, 3, 583 + squarenote 15, 6, 2, 550 + squarenote 4, 5, 2, 581 + squarenote 9, 6, 3, 518 + squarenote 15, 8, 2, 549 + squarenote 15, 4, 2, 519 SFX_Cry06_1_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_1_Ch5: SFX_Cry06_1_Ch7: - noisenote 8, 212, 140 - noisenote 4, 226, 156 - noisenote 15, 198, 140 - noisenote 8, 228, 172 - noisenote 15, 215, 156 - noisenote 15, 242, 172 + noisenote 8, 13, 4, 140 + noisenote 4, 14, 2, 156 + noisenote 15, 12, 6, 140 + noisenote 8, 14, 4, 172 + noisenote 15, 13, 7, 156 + noisenote 15, 15, 2, 172 endchannel diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index e4b62370..75ca8228 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,11 +1,11 @@ SFX_Cry06_2_Ch4: dutycycle 250 - squarenote 6, 131, 71, 2 - squarenote 15, 98, 38, 2 - squarenote 4, 82, 69, 2 - squarenote 9, 99, 6, 2 - squarenote 15, 130, 37, 2 - squarenote 15, 66, 7, 2 + squarenote 6, 8, 3, 583 + squarenote 15, 6, 2, 550 + squarenote 4, 5, 2, 581 + squarenote 9, 6, 3, 518 + squarenote 15, 8, 2, 549 + squarenote 15, 4, 2, 519 SFX_Cry06_2_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_2_Ch5: SFX_Cry06_2_Ch7: - noisenote 8, 212, 140 - noisenote 4, 226, 156 - noisenote 15, 198, 140 - noisenote 8, 228, 172 - noisenote 15, 215, 156 - noisenote 15, 242, 172 + noisenote 8, 13, 4, 140 + noisenote 4, 14, 2, 156 + noisenote 15, 12, 6, 140 + noisenote 8, 14, 4, 172 + noisenote 15, 13, 7, 156 + noisenote 15, 15, 2, 172 endchannel diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index dd2fef77..760ca4f1 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,11 +1,11 @@ SFX_Cry06_3_Ch4: dutycycle 250 - squarenote 6, 131, 71, 2 - squarenote 15, 98, 38, 2 - squarenote 4, 82, 69, 2 - squarenote 9, 99, 6, 2 - squarenote 15, 130, 37, 2 - squarenote 15, 66, 7, 2 + squarenote 6, 8, 3, 583 + squarenote 15, 6, 2, 550 + squarenote 4, 5, 2, 581 + squarenote 9, 6, 3, 518 + squarenote 15, 8, 2, 549 + squarenote 15, 4, 2, 519 SFX_Cry06_3_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_3_Ch5: SFX_Cry06_3_Ch7: - noisenote 8, 212, 140 - noisenote 4, 226, 156 - noisenote 15, 198, 140 - noisenote 8, 228, 172 - noisenote 15, 215, 156 - noisenote 15, 242, 172 + noisenote 8, 13, 4, 140 + noisenote 4, 14, 2, 156 + noisenote 15, 12, 6, 140 + noisenote 8, 14, 4, 172 + noisenote 15, 13, 7, 156 + noisenote 15, 15, 2, 172 endchannel diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index d3a9ef92..8a736136 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,21 +1,21 @@ SFX_Cry07_1_Ch4: dutycycle 240 - squarenote 4, 243, 224, 6 - squarenote 15, 228, 64, 6 - squarenote 8, 193, 32, 6 + squarenote 4, 15, 3, 1760 + squarenote 15, 14, 4, 1600 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry07_1_Ch5: dutycycle 10 - squarenote 3, 195, 131, 6 - squarenote 14, 180, 2, 6 - squarenote 8, 161, 1, 6 + squarenote 3, 12, 3, 1667 + squarenote 14, 11, 4, 1538 + squarenote 8, 10, 1, 1537 endchannel SFX_Cry07_1_Ch7: - noisenote 4, 211, 92 - noisenote 15, 230, 76 - noisenote 8, 177, 92 + noisenote 4, 13, 3, 92 + noisenote 15, 14, 6, 76 + noisenote 8, 11, 1, 92 endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 5f464588..8ccba10c 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,21 +1,21 @@ SFX_Cry07_2_Ch4: dutycycle 240 - squarenote 4, 243, 224, 6 - squarenote 15, 228, 64, 6 - squarenote 8, 193, 32, 6 + squarenote 4, 15, 3, 1760 + squarenote 15, 14, 4, 1600 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry07_2_Ch5: dutycycle 10 - squarenote 3, 195, 131, 6 - squarenote 14, 180, 2, 6 - squarenote 8, 161, 1, 6 + squarenote 3, 12, 3, 1667 + squarenote 14, 11, 4, 1538 + squarenote 8, 10, 1, 1537 endchannel SFX_Cry07_2_Ch7: - noisenote 4, 211, 92 - noisenote 15, 230, 76 - noisenote 8, 177, 92 + noisenote 4, 13, 3, 92 + noisenote 15, 14, 6, 76 + noisenote 8, 11, 1, 92 endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index ab6c19c8..bb90a016 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,21 +1,21 @@ SFX_Cry07_3_Ch4: dutycycle 240 - squarenote 4, 243, 224, 6 - squarenote 15, 228, 64, 6 - squarenote 8, 193, 32, 6 + squarenote 4, 15, 3, 1760 + squarenote 15, 14, 4, 1600 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry07_3_Ch5: dutycycle 10 - squarenote 3, 195, 131, 6 - squarenote 14, 180, 2, 6 - squarenote 8, 161, 1, 6 + squarenote 3, 12, 3, 1667 + squarenote 14, 11, 4, 1538 + squarenote 8, 10, 1, 1537 endchannel SFX_Cry07_3_Ch7: - noisenote 4, 211, 92 - noisenote 15, 230, 76 - noisenote 8, 177, 92 + noisenote 4, 13, 3, 92 + noisenote 15, 14, 6, 76 + noisenote 8, 11, 1, 92 endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 6ca12371..18d324f4 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,23 +1,23 @@ SFX_Cry08_1_Ch4: dutycycle 240 - squarenote 15, 246, 101, 5 - squarenote 10, 228, 124, 5 - squarenote 3, 194, 92, 5 - squarenote 15, 178, 60, 5 + squarenote 15, 15, 6, 1381 + squarenote 10, 14, 4, 1404 + squarenote 3, 12, 2, 1372 + squarenote 15, 11, 2, 1340 endchannel SFX_Cry08_1_Ch5: dutycycle 90 - squarenote 14, 214, 3, 5 - squarenote 9, 180, 27, 5 - squarenote 4, 146, 250, 4 - squarenote 15, 162, 219, 4 + squarenote 14, 13, 6, 1283 + squarenote 9, 11, 4, 1307 + squarenote 4, 9, 2, 1274 + squarenote 15, 10, 2, 1243 endchannel SFX_Cry08_1_Ch7: - noisenote 12, 230, 76 - noisenote 11, 215, 92 - noisenote 15, 194, 76 + noisenote 12, 14, 6, 76 + noisenote 11, 13, 7, 92 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index f864e596..809ab706 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,23 +1,23 @@ SFX_Cry08_2_Ch4: dutycycle 240 - squarenote 15, 246, 101, 5 - squarenote 10, 228, 124, 5 - squarenote 3, 194, 92, 5 - squarenote 15, 178, 60, 5 + squarenote 15, 15, 6, 1381 + squarenote 10, 14, 4, 1404 + squarenote 3, 12, 2, 1372 + squarenote 15, 11, 2, 1340 endchannel SFX_Cry08_2_Ch5: dutycycle 90 - squarenote 14, 214, 3, 5 - squarenote 9, 180, 27, 5 - squarenote 4, 146, 250, 4 - squarenote 15, 162, 219, 4 + squarenote 14, 13, 6, 1283 + squarenote 9, 11, 4, 1307 + squarenote 4, 9, 2, 1274 + squarenote 15, 10, 2, 1243 endchannel SFX_Cry08_2_Ch7: - noisenote 12, 230, 76 - noisenote 11, 215, 92 - noisenote 15, 194, 76 + noisenote 12, 14, 6, 76 + noisenote 11, 13, 7, 92 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 37b8b900..37e83796 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,23 +1,23 @@ SFX_Cry08_3_Ch4: dutycycle 240 - squarenote 15, 246, 101, 5 - squarenote 10, 228, 124, 5 - squarenote 3, 194, 92, 5 - squarenote 15, 178, 60, 5 + squarenote 15, 15, 6, 1381 + squarenote 10, 14, 4, 1404 + squarenote 3, 12, 2, 1372 + squarenote 15, 11, 2, 1340 endchannel SFX_Cry08_3_Ch5: dutycycle 90 - squarenote 14, 214, 3, 5 - squarenote 9, 180, 27, 5 - squarenote 4, 146, 250, 4 - squarenote 15, 162, 219, 4 + squarenote 14, 13, 6, 1283 + squarenote 9, 11, 4, 1307 + squarenote 4, 9, 2, 1274 + squarenote 15, 10, 2, 1243 endchannel SFX_Cry08_3_Ch7: - noisenote 12, 230, 76 - noisenote 11, 215, 92 - noisenote 15, 194, 76 + noisenote 12, 14, 6, 76 + noisenote 11, 13, 7, 92 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index c09e6b72..8b0178d6 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,35 +1,35 @@ SFX_Cry09_1_Ch4: dutycycle 240 - squarenote 15, 247, 160, 7 - squarenote 6, 230, 163, 7 - squarenote 10, 244, 160, 7 + squarenote 15, 15, 7, 1952 + squarenote 6, 14, 6, 1955 + squarenote 10, 15, 4, 1952 dutycycle 165 - squarenote 10, 246, 216, 7 - squarenote 4, 227, 215, 7 - squarenote 15, 242, 216, 7 + squarenote 10, 15, 6, 2008 + squarenote 4, 14, 3, 2007 + squarenote 15, 15, 2, 2008 endchannel SFX_Cry09_1_Ch5: dutycycle 5 - squarenote 2, 8, 0, 0 - squarenote 15, 167, 161, 6 - squarenote 6, 134, 162, 6 - squarenote 10, 116, 161, 6 + squarenote 2, 0, 8, 0 + squarenote 15, 10, 7, 1697 + squarenote 6, 8, 6, 1698 + squarenote 10, 7, 4, 1697 dutycycle 95 - squarenote 10, 118, 214, 6 - squarenote 4, 131, 217, 6 - squarenote 15, 162, 215, 6 + squarenote 10, 7, 6, 1750 + squarenote 4, 8, 3, 1753 + squarenote 15, 10, 2, 1751 endchannel SFX_Cry09_1_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 15, 215, 60 - noisenote 6, 197, 59 - noisenote 6, 228, 61 - noisenote 8, 182, 60 - noisenote 6, 212, 61 - noisenote 8, 193, 59 + noisenote 2, 15, 2, 60 + noisenote 8, 14, 4, 62 + noisenote 15, 13, 7, 60 + noisenote 6, 12, 5, 59 + noisenote 6, 14, 4, 61 + noisenote 8, 11, 6, 60 + noisenote 6, 13, 4, 61 + noisenote 8, 12, 1, 59 endchannel diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 93faf91e..378c07bd 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,35 +1,35 @@ SFX_Cry09_2_Ch4: dutycycle 240 - squarenote 15, 247, 160, 7 - squarenote 6, 230, 163, 7 - squarenote 10, 244, 160, 7 + squarenote 15, 15, 7, 1952 + squarenote 6, 14, 6, 1955 + squarenote 10, 15, 4, 1952 dutycycle 165 - squarenote 10, 246, 216, 7 - squarenote 4, 227, 215, 7 - squarenote 15, 242, 216, 7 + squarenote 10, 15, 6, 2008 + squarenote 4, 14, 3, 2007 + squarenote 15, 15, 2, 2008 endchannel SFX_Cry09_2_Ch5: dutycycle 5 - squarenote 2, 8, 0, 0 - squarenote 15, 167, 161, 6 - squarenote 6, 134, 162, 6 - squarenote 10, 116, 161, 6 + squarenote 2, 0, 8, 0 + squarenote 15, 10, 7, 1697 + squarenote 6, 8, 6, 1698 + squarenote 10, 7, 4, 1697 dutycycle 95 - squarenote 10, 118, 214, 6 - squarenote 4, 131, 217, 6 - squarenote 15, 162, 215, 6 + squarenote 10, 7, 6, 1750 + squarenote 4, 8, 3, 1753 + squarenote 15, 10, 2, 1751 endchannel SFX_Cry09_2_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 15, 215, 60 - noisenote 6, 197, 59 - noisenote 6, 228, 61 - noisenote 8, 182, 60 - noisenote 6, 212, 61 - noisenote 8, 193, 59 + noisenote 2, 15, 2, 60 + noisenote 8, 14, 4, 62 + noisenote 15, 13, 7, 60 + noisenote 6, 12, 5, 59 + noisenote 6, 14, 4, 61 + noisenote 8, 11, 6, 60 + noisenote 6, 13, 4, 61 + noisenote 8, 12, 1, 59 endchannel diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 4edaf511..7bf098b1 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,35 +1,35 @@ SFX_Cry09_3_Ch4: dutycycle 240 - squarenote 15, 247, 160, 7 - squarenote 6, 230, 163, 7 - squarenote 10, 244, 160, 7 + squarenote 15, 15, 7, 1952 + squarenote 6, 14, 6, 1955 + squarenote 10, 15, 4, 1952 dutycycle 165 - squarenote 10, 246, 216, 7 - squarenote 4, 227, 215, 7 - squarenote 15, 242, 216, 7 + squarenote 10, 15, 6, 2008 + squarenote 4, 14, 3, 2007 + squarenote 15, 15, 2, 2008 endchannel SFX_Cry09_3_Ch5: dutycycle 5 - squarenote 2, 8, 0, 0 - squarenote 15, 167, 161, 6 - squarenote 6, 134, 162, 6 - squarenote 10, 116, 161, 6 + squarenote 2, 0, 8, 0 + squarenote 15, 10, 7, 1697 + squarenote 6, 8, 6, 1698 + squarenote 10, 7, 4, 1697 dutycycle 95 - squarenote 10, 118, 214, 6 - squarenote 4, 131, 217, 6 - squarenote 15, 162, 215, 6 + squarenote 10, 7, 6, 1750 + squarenote 4, 8, 3, 1753 + squarenote 15, 10, 2, 1751 endchannel SFX_Cry09_3_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 15, 215, 60 - noisenote 6, 197, 59 - noisenote 6, 228, 61 - noisenote 8, 182, 60 - noisenote 6, 212, 61 - noisenote 8, 193, 59 + noisenote 2, 15, 2, 60 + noisenote 8, 14, 4, 62 + noisenote 15, 13, 7, 60 + noisenote 6, 12, 5, 59 + noisenote 6, 14, 4, 61 + noisenote 8, 11, 6, 60 + noisenote 6, 13, 4, 61 + noisenote 8, 12, 1, 59 endchannel diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index e05821c5..45b293ca 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,35 +1,35 @@ SFX_Cry0A_1_Ch4: dutycycle 240 - squarenote 8, 247, 224, 6 - squarenote 6, 230, 229, 6 - squarenote 3, 244, 224, 6 - squarenote 3, 246, 208, 6 - squarenote 3, 227, 192, 6 - squarenote 4, 242, 176, 6 - squarenote 15, 162, 200, 6 + squarenote 8, 15, 7, 1760 + squarenote 6, 14, 6, 1765 + squarenote 3, 15, 4, 1760 + squarenote 3, 15, 6, 1744 + squarenote 3, 14, 3, 1728 + squarenote 4, 15, 2, 1712 + squarenote 15, 10, 2, 1736 endchannel SFX_Cry0A_1_Ch5: dutycycle 5 - squarenote 3, 8, 0, 0 - squarenote 8, 167, 161, 6 - squarenote 6, 134, 163, 6 - squarenote 3, 116, 161, 6 - squarenote 3, 118, 145, 6 - squarenote 3, 131, 130, 6 - squarenote 4, 162, 113, 6 - squarenote 15, 114, 137, 6 + squarenote 3, 0, 8, 0 + squarenote 8, 10, 7, 1697 + squarenote 6, 8, 6, 1699 + squarenote 3, 7, 4, 1697 + squarenote 3, 7, 6, 1681 + squarenote 3, 8, 3, 1666 + squarenote 4, 10, 2, 1649 + squarenote 15, 7, 2, 1673 endchannel SFX_Cry0A_1_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 8, 215, 60 - noisenote 5, 197, 59 - noisenote 3, 212, 44 - noisenote 2, 182, 60 - noisenote 3, 164, 44 - noisenote 8, 145, 60 + noisenote 2, 15, 2, 60 + noisenote 8, 14, 4, 62 + noisenote 8, 13, 7, 60 + noisenote 5, 12, 5, 59 + noisenote 3, 13, 4, 44 + noisenote 2, 11, 6, 60 + noisenote 3, 10, 4, 44 + noisenote 8, 9, 1, 60 endchannel diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 81653447..a4d3b839 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,35 +1,35 @@ SFX_Cry0A_2_Ch4: dutycycle 240 - squarenote 8, 247, 224, 6 - squarenote 6, 230, 229, 6 - squarenote 3, 244, 224, 6 - squarenote 3, 246, 208, 6 - squarenote 3, 227, 192, 6 - squarenote 4, 242, 176, 6 - squarenote 15, 162, 200, 6 + squarenote 8, 15, 7, 1760 + squarenote 6, 14, 6, 1765 + squarenote 3, 15, 4, 1760 + squarenote 3, 15, 6, 1744 + squarenote 3, 14, 3, 1728 + squarenote 4, 15, 2, 1712 + squarenote 15, 10, 2, 1736 endchannel SFX_Cry0A_2_Ch5: dutycycle 5 - squarenote 3, 8, 0, 0 - squarenote 8, 167, 161, 6 - squarenote 6, 134, 163, 6 - squarenote 3, 116, 161, 6 - squarenote 3, 118, 145, 6 - squarenote 3, 131, 130, 6 - squarenote 4, 162, 113, 6 - squarenote 15, 114, 137, 6 + squarenote 3, 0, 8, 0 + squarenote 8, 10, 7, 1697 + squarenote 6, 8, 6, 1699 + squarenote 3, 7, 4, 1697 + squarenote 3, 7, 6, 1681 + squarenote 3, 8, 3, 1666 + squarenote 4, 10, 2, 1649 + squarenote 15, 7, 2, 1673 endchannel SFX_Cry0A_2_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 8, 215, 60 - noisenote 5, 197, 59 - noisenote 3, 212, 44 - noisenote 2, 182, 60 - noisenote 3, 164, 44 - noisenote 8, 145, 60 + noisenote 2, 15, 2, 60 + noisenote 8, 14, 4, 62 + noisenote 8, 13, 7, 60 + noisenote 5, 12, 5, 59 + noisenote 3, 13, 4, 44 + noisenote 2, 11, 6, 60 + noisenote 3, 10, 4, 44 + noisenote 8, 9, 1, 60 endchannel diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 6cc94434..5c6617fb 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,35 +1,35 @@ SFX_Cry0A_3_Ch4: dutycycle 240 - squarenote 8, 247, 224, 6 - squarenote 6, 230, 229, 6 - squarenote 3, 244, 224, 6 - squarenote 3, 246, 208, 6 - squarenote 3, 227, 192, 6 - squarenote 4, 242, 176, 6 - squarenote 15, 162, 200, 6 + squarenote 8, 15, 7, 1760 + squarenote 6, 14, 6, 1765 + squarenote 3, 15, 4, 1760 + squarenote 3, 15, 6, 1744 + squarenote 3, 14, 3, 1728 + squarenote 4, 15, 2, 1712 + squarenote 15, 10, 2, 1736 endchannel SFX_Cry0A_3_Ch5: dutycycle 5 - squarenote 3, 8, 0, 0 - squarenote 8, 167, 161, 6 - squarenote 6, 134, 163, 6 - squarenote 3, 116, 161, 6 - squarenote 3, 118, 145, 6 - squarenote 3, 131, 130, 6 - squarenote 4, 162, 113, 6 - squarenote 15, 114, 137, 6 + squarenote 3, 0, 8, 0 + squarenote 8, 10, 7, 1697 + squarenote 6, 8, 6, 1699 + squarenote 3, 7, 4, 1697 + squarenote 3, 7, 6, 1681 + squarenote 3, 8, 3, 1666 + squarenote 4, 10, 2, 1649 + squarenote 15, 7, 2, 1673 endchannel SFX_Cry0A_3_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 8, 215, 60 - noisenote 5, 197, 59 - noisenote 3, 212, 44 - noisenote 2, 182, 60 - noisenote 3, 164, 44 - noisenote 8, 145, 60 + noisenote 2, 15, 2, 60 + noisenote 8, 14, 4, 62 + noisenote 8, 13, 7, 60 + noisenote 5, 12, 5, 59 + noisenote 3, 13, 4, 44 + noisenote 2, 11, 6, 60 + noisenote 3, 10, 4, 44 + noisenote 8, 9, 1, 60 endchannel diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 612be214..ba8e1e1b 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,37 +1,37 @@ SFX_Cry0B_1_Ch4: dutycycle 204 - squarenote 4, 241, 0, 7 - squarenote 4, 225, 128, 7 - squarenote 4, 209, 64, 7 - squarenote 4, 225, 64, 7 - squarenote 4, 241, 128, 7 - squarenote 4, 209, 0, 7 - squarenote 4, 241, 1, 7 - squarenote 4, 209, 130, 7 - squarenote 4, 193, 66, 7 - squarenote 8, 177, 65, 7 + squarenote 4, 15, 1, 1792 + squarenote 4, 14, 1, 1920 + squarenote 4, 13, 1, 1856 + squarenote 4, 14, 1, 1856 + squarenote 4, 15, 1, 1920 + squarenote 4, 13, 1, 1792 + squarenote 4, 15, 1, 1793 + squarenote 4, 13, 1, 1922 + squarenote 4, 12, 1, 1858 + squarenote 8, 11, 1, 1857 endchannel SFX_Cry0B_1_Ch5: dutycycle 68 - squarenote 12, 8, 0, 0 - squarenote 4, 241, 1, 7 - squarenote 4, 225, 130, 7 - squarenote 4, 209, 65, 7 - squarenote 4, 225, 65, 7 - squarenote 4, 241, 130, 7 - squarenote 8, 209, 1, 7 + squarenote 12, 0, 8, 0 + squarenote 4, 15, 1, 1793 + squarenote 4, 14, 1, 1922 + squarenote 4, 13, 1, 1857 + squarenote 4, 14, 1, 1857 + squarenote 4, 15, 1, 1922 + squarenote 8, 13, 1, 1793 endchannel SFX_Cry0B_1_Ch7: - noisenote 15, 8, 0 - noisenote 4, 8, 0 - noisenote 4, 209, 76 - noisenote 4, 177, 44 - noisenote 4, 209, 60 - noisenote 4, 177, 60 - noisenote 4, 193, 44 - noisenote 8, 161, 76 + noisenote 15, 0, 8, 0 + noisenote 4, 0, 8, 0 + noisenote 4, 13, 1, 76 + noisenote 4, 11, 1, 44 + noisenote 4, 13, 1, 60 + noisenote 4, 11, 1, 60 + noisenote 4, 12, 1, 44 + noisenote 8, 10, 1, 76 endchannel diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 88a7fdc8..9cbf1ee5 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,37 +1,37 @@ SFX_Cry0B_2_Ch4: dutycycle 204 - squarenote 4, 241, 0, 7 - squarenote 4, 225, 128, 7 - squarenote 4, 209, 64, 7 - squarenote 4, 225, 64, 7 - squarenote 4, 241, 128, 7 - squarenote 4, 209, 0, 7 - squarenote 4, 241, 1, 7 - squarenote 4, 209, 130, 7 - squarenote 4, 193, 66, 7 - squarenote 8, 177, 65, 7 + squarenote 4, 15, 1, 1792 + squarenote 4, 14, 1, 1920 + squarenote 4, 13, 1, 1856 + squarenote 4, 14, 1, 1856 + squarenote 4, 15, 1, 1920 + squarenote 4, 13, 1, 1792 + squarenote 4, 15, 1, 1793 + squarenote 4, 13, 1, 1922 + squarenote 4, 12, 1, 1858 + squarenote 8, 11, 1, 1857 endchannel SFX_Cry0B_2_Ch5: dutycycle 68 - squarenote 12, 8, 0, 0 - squarenote 4, 241, 1, 7 - squarenote 4, 225, 130, 7 - squarenote 4, 209, 65, 7 - squarenote 4, 225, 65, 7 - squarenote 4, 241, 130, 7 - squarenote 8, 209, 1, 7 + squarenote 12, 0, 8, 0 + squarenote 4, 15, 1, 1793 + squarenote 4, 14, 1, 1922 + squarenote 4, 13, 1, 1857 + squarenote 4, 14, 1, 1857 + squarenote 4, 15, 1, 1922 + squarenote 8, 13, 1, 1793 endchannel SFX_Cry0B_2_Ch7: - noisenote 15, 8, 0 - noisenote 4, 8, 0 - noisenote 4, 209, 76 - noisenote 4, 177, 44 - noisenote 4, 209, 60 - noisenote 4, 177, 60 - noisenote 4, 193, 44 - noisenote 8, 161, 76 + noisenote 15, 0, 8, 0 + noisenote 4, 0, 8, 0 + noisenote 4, 13, 1, 76 + noisenote 4, 11, 1, 44 + noisenote 4, 13, 1, 60 + noisenote 4, 11, 1, 60 + noisenote 4, 12, 1, 44 + noisenote 8, 10, 1, 76 endchannel diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index ccc9728a..559fbbe0 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,37 +1,37 @@ SFX_Cry0B_3_Ch4: dutycycle 204 - squarenote 4, 241, 0, 7 - squarenote 4, 225, 128, 7 - squarenote 4, 209, 64, 7 - squarenote 4, 225, 64, 7 - squarenote 4, 241, 128, 7 - squarenote 4, 209, 0, 7 - squarenote 4, 241, 1, 7 - squarenote 4, 209, 130, 7 - squarenote 4, 193, 66, 7 - squarenote 8, 177, 65, 7 + squarenote 4, 15, 1, 1792 + squarenote 4, 14, 1, 1920 + squarenote 4, 13, 1, 1856 + squarenote 4, 14, 1, 1856 + squarenote 4, 15, 1, 1920 + squarenote 4, 13, 1, 1792 + squarenote 4, 15, 1, 1793 + squarenote 4, 13, 1, 1922 + squarenote 4, 12, 1, 1858 + squarenote 8, 11, 1, 1857 endchannel SFX_Cry0B_3_Ch5: dutycycle 68 - squarenote 12, 8, 0, 0 - squarenote 4, 241, 1, 7 - squarenote 4, 225, 130, 7 - squarenote 4, 209, 65, 7 - squarenote 4, 225, 65, 7 - squarenote 4, 241, 130, 7 - squarenote 8, 209, 1, 7 + squarenote 12, 0, 8, 0 + squarenote 4, 15, 1, 1793 + squarenote 4, 14, 1, 1922 + squarenote 4, 13, 1, 1857 + squarenote 4, 14, 1, 1857 + squarenote 4, 15, 1, 1922 + squarenote 8, 13, 1, 1793 endchannel SFX_Cry0B_3_Ch7: - noisenote 15, 8, 0 - noisenote 4, 8, 0 - noisenote 4, 209, 76 - noisenote 4, 177, 44 - noisenote 4, 209, 60 - noisenote 4, 177, 60 - noisenote 4, 193, 44 - noisenote 8, 161, 76 + noisenote 15, 0, 8, 0 + noisenote 4, 0, 8, 0 + noisenote 4, 13, 1, 76 + noisenote 4, 11, 1, 44 + noisenote 4, 13, 1, 60 + noisenote 4, 11, 1, 60 + noisenote 4, 12, 1, 44 + noisenote 8, 10, 1, 76 endchannel diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 3b31ec94..25246488 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,28 +1,28 @@ SFX_Cry0C_1_Ch4: dutycycle 204 - squarenote 8, 245, 0, 6 - squarenote 2, 210, 56, 6 - squarenote 2, 194, 48, 6 - squarenote 2, 194, 40, 6 - squarenote 2, 178, 32, 6 - squarenote 2, 178, 16, 6 - squarenote 2, 162, 24, 6 - squarenote 2, 178, 16, 6 - squarenote 8, 193, 32, 6 + squarenote 8, 15, 5, 1536 + squarenote 2, 13, 2, 1592 + squarenote 2, 12, 2, 1584 + squarenote 2, 12, 2, 1576 + squarenote 2, 11, 2, 1568 + squarenote 2, 11, 2, 1552 + squarenote 2, 10, 2, 1560 + squarenote 2, 11, 2, 1552 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry0C_1_Ch5: dutycycle 68 - squarenote 12, 195, 192, 5 - squarenote 3, 177, 249, 5 - squarenote 2, 161, 241, 5 - squarenote 2, 161, 233, 5 - squarenote 2, 145, 225, 5 - squarenote 2, 145, 217, 5 - squarenote 2, 129, 209, 5 - squarenote 2, 145, 217, 5 - squarenote 8, 145, 225, 5 + squarenote 12, 12, 3, 1472 + squarenote 3, 11, 1, 1529 + squarenote 2, 10, 1, 1521 + squarenote 2, 10, 1, 1513 + squarenote 2, 9, 1, 1505 + squarenote 2, 9, 1, 1497 + squarenote 2, 8, 1, 1489 + squarenote 2, 9, 1, 1497 + squarenote 8, 9, 1, 1505 SFX_Cry0C_1_Ch7: diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 78695578..e94609c9 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,28 +1,28 @@ SFX_Cry0C_2_Ch4: dutycycle 204 - squarenote 8, 245, 0, 6 - squarenote 2, 210, 56, 6 - squarenote 2, 194, 48, 6 - squarenote 2, 194, 40, 6 - squarenote 2, 178, 32, 6 - squarenote 2, 178, 16, 6 - squarenote 2, 162, 24, 6 - squarenote 2, 178, 16, 6 - squarenote 8, 193, 32, 6 + squarenote 8, 15, 5, 1536 + squarenote 2, 13, 2, 1592 + squarenote 2, 12, 2, 1584 + squarenote 2, 12, 2, 1576 + squarenote 2, 11, 2, 1568 + squarenote 2, 11, 2, 1552 + squarenote 2, 10, 2, 1560 + squarenote 2, 11, 2, 1552 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry0C_2_Ch5: dutycycle 68 - squarenote 12, 195, 192, 5 - squarenote 3, 177, 249, 5 - squarenote 2, 161, 241, 5 - squarenote 2, 161, 233, 5 - squarenote 2, 145, 225, 5 - squarenote 2, 145, 217, 5 - squarenote 2, 129, 209, 5 - squarenote 2, 145, 217, 5 - squarenote 8, 145, 225, 5 + squarenote 12, 12, 3, 1472 + squarenote 3, 11, 1, 1529 + squarenote 2, 10, 1, 1521 + squarenote 2, 10, 1, 1513 + squarenote 2, 9, 1, 1505 + squarenote 2, 9, 1, 1497 + squarenote 2, 8, 1, 1489 + squarenote 2, 9, 1, 1497 + squarenote 8, 9, 1, 1505 SFX_Cry0C_2_Ch7: diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 7b8b0c41..ac5296c6 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,28 +1,28 @@ SFX_Cry0C_3_Ch4: dutycycle 204 - squarenote 8, 245, 0, 6 - squarenote 2, 210, 56, 6 - squarenote 2, 194, 48, 6 - squarenote 2, 194, 40, 6 - squarenote 2, 178, 32, 6 - squarenote 2, 178, 16, 6 - squarenote 2, 162, 24, 6 - squarenote 2, 178, 16, 6 - squarenote 8, 193, 32, 6 + squarenote 8, 15, 5, 1536 + squarenote 2, 13, 2, 1592 + squarenote 2, 12, 2, 1584 + squarenote 2, 12, 2, 1576 + squarenote 2, 11, 2, 1568 + squarenote 2, 11, 2, 1552 + squarenote 2, 10, 2, 1560 + squarenote 2, 11, 2, 1552 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry0C_3_Ch5: dutycycle 68 - squarenote 12, 195, 192, 5 - squarenote 3, 177, 249, 5 - squarenote 2, 161, 241, 5 - squarenote 2, 161, 233, 5 - squarenote 2, 145, 225, 5 - squarenote 2, 145, 217, 5 - squarenote 2, 129, 209, 5 - squarenote 2, 145, 217, 5 - squarenote 8, 145, 225, 5 + squarenote 12, 12, 3, 1472 + squarenote 3, 11, 1, 1529 + squarenote 2, 10, 1, 1521 + squarenote 2, 10, 1, 1513 + squarenote 2, 9, 1, 1505 + squarenote 2, 9, 1, 1497 + squarenote 2, 8, 1, 1489 + squarenote 2, 9, 1, 1497 + squarenote 8, 9, 1, 1505 SFX_Cry0C_3_Ch7: diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index b4fd1344..9403af3a 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,40 +1,40 @@ SFX_Cry0D_1_Ch4: dutycycle 136 - squarenote 5, 242, 80, 6 - squarenote 9, 209, 96, 6 - squarenote 5, 226, 18, 6 - squarenote 9, 193, 34, 6 - squarenote 5, 242, 16, 6 - squarenote 6, 209, 32, 6 + squarenote 5, 15, 2, 1616 + squarenote 9, 13, 1, 1632 + squarenote 5, 14, 2, 1554 + squarenote 9, 12, 1, 1570 + squarenote 5, 15, 2, 1552 + squarenote 6, 13, 1, 1568 loopchannel 2, SFX_Cry0D_1_Ch4 endchannel SFX_Cry0D_1_Ch5: dutycycle 64 - squarenote 4, 8, 0, 0 - squarenote 5, 242, 81, 6 - squarenote 9, 209, 97, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 12, 209, 33, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 4, 209, 33, 6 + squarenote 4, 0, 8, 0 + squarenote 5, 15, 2, 1617 + squarenote 9, 13, 1, 1633 + squarenote 5, 14, 2, 1556 + squarenote 8, 12, 1, 1572 + squarenote 5, 15, 2, 1553 + squarenote 12, 13, 1, 1569 + squarenote 5, 14, 2, 1556 + squarenote 8, 12, 1, 1572 + squarenote 5, 15, 2, 1553 + squarenote 4, 13, 1, 1569 endchannel SFX_Cry0D_1_Ch7: - noisenote 6, 210, 28 - noisenote 9, 177, 44 - noisenote 8, 194, 44 - noisenote 9, 177, 60 - noisenote 6, 194, 44 - noisenote 9, 162, 60 - noisenote 7, 194, 44 - noisenote 5, 161, 60 - noisenote 9, 194, 44 - noisenote 4, 161, 60 + noisenote 6, 13, 2, 28 + noisenote 9, 11, 1, 44 + noisenote 8, 12, 2, 44 + noisenote 9, 11, 1, 60 + noisenote 6, 12, 2, 44 + noisenote 9, 10, 2, 60 + noisenote 7, 12, 2, 44 + noisenote 5, 10, 1, 60 + noisenote 9, 12, 2, 44 + noisenote 4, 10, 1, 60 endchannel diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 76ca2392..9d570892 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,40 +1,40 @@ SFX_Cry0D_2_Ch4: dutycycle 136 - squarenote 5, 242, 80, 6 - squarenote 9, 209, 96, 6 - squarenote 5, 226, 18, 6 - squarenote 9, 193, 34, 6 - squarenote 5, 242, 16, 6 - squarenote 6, 209, 32, 6 + squarenote 5, 15, 2, 1616 + squarenote 9, 13, 1, 1632 + squarenote 5, 14, 2, 1554 + squarenote 9, 12, 1, 1570 + squarenote 5, 15, 2, 1552 + squarenote 6, 13, 1, 1568 loopchannel 2, SFX_Cry0D_2_Ch4 endchannel SFX_Cry0D_2_Ch5: dutycycle 64 - squarenote 4, 8, 0, 0 - squarenote 5, 242, 81, 6 - squarenote 9, 209, 97, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 12, 209, 33, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 4, 209, 33, 6 + squarenote 4, 0, 8, 0 + squarenote 5, 15, 2, 1617 + squarenote 9, 13, 1, 1633 + squarenote 5, 14, 2, 1556 + squarenote 8, 12, 1, 1572 + squarenote 5, 15, 2, 1553 + squarenote 12, 13, 1, 1569 + squarenote 5, 14, 2, 1556 + squarenote 8, 12, 1, 1572 + squarenote 5, 15, 2, 1553 + squarenote 4, 13, 1, 1569 endchannel SFX_Cry0D_2_Ch7: - noisenote 6, 210, 28 - noisenote 9, 177, 44 - noisenote 8, 194, 44 - noisenote 9, 177, 60 - noisenote 6, 194, 44 - noisenote 9, 162, 60 - noisenote 7, 194, 44 - noisenote 5, 161, 60 - noisenote 9, 194, 44 - noisenote 4, 161, 60 + noisenote 6, 13, 2, 28 + noisenote 9, 11, 1, 44 + noisenote 8, 12, 2, 44 + noisenote 9, 11, 1, 60 + noisenote 6, 12, 2, 44 + noisenote 9, 10, 2, 60 + noisenote 7, 12, 2, 44 + noisenote 5, 10, 1, 60 + noisenote 9, 12, 2, 44 + noisenote 4, 10, 1, 60 endchannel diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 56d1a5c6..18125238 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,40 +1,40 @@ SFX_Cry0D_3_Ch4: dutycycle 136 - squarenote 5, 242, 80, 6 - squarenote 9, 209, 96, 6 - squarenote 5, 226, 18, 6 - squarenote 9, 193, 34, 6 - squarenote 5, 242, 16, 6 - squarenote 6, 209, 32, 6 + squarenote 5, 15, 2, 1616 + squarenote 9, 13, 1, 1632 + squarenote 5, 14, 2, 1554 + squarenote 9, 12, 1, 1570 + squarenote 5, 15, 2, 1552 + squarenote 6, 13, 1, 1568 loopchannel 2, SFX_Cry0D_3_Ch4 endchannel SFX_Cry0D_3_Ch5: dutycycle 64 - squarenote 4, 8, 0, 0 - squarenote 5, 242, 81, 6 - squarenote 9, 209, 97, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 12, 209, 33, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 4, 209, 33, 6 + squarenote 4, 0, 8, 0 + squarenote 5, 15, 2, 1617 + squarenote 9, 13, 1, 1633 + squarenote 5, 14, 2, 1556 + squarenote 8, 12, 1, 1572 + squarenote 5, 15, 2, 1553 + squarenote 12, 13, 1, 1569 + squarenote 5, 14, 2, 1556 + squarenote 8, 12, 1, 1572 + squarenote 5, 15, 2, 1553 + squarenote 4, 13, 1, 1569 endchannel SFX_Cry0D_3_Ch7: - noisenote 6, 210, 28 - noisenote 9, 177, 44 - noisenote 8, 194, 44 - noisenote 9, 177, 60 - noisenote 6, 194, 44 - noisenote 9, 162, 60 - noisenote 7, 194, 44 - noisenote 5, 161, 60 - noisenote 9, 194, 44 - noisenote 4, 161, 60 + noisenote 6, 13, 2, 28 + noisenote 9, 11, 1, 44 + noisenote 8, 12, 2, 44 + noisenote 9, 11, 1, 60 + noisenote 6, 12, 2, 44 + noisenote 9, 10, 2, 60 + noisenote 7, 12, 2, 44 + noisenote 5, 10, 1, 60 + noisenote 9, 12, 2, 44 + noisenote 4, 10, 1, 60 endchannel diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index fb4a8d53..c5a166b7 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,23 +1,23 @@ SFX_Cry0E_1_Ch4: dutycycle 165 - squarenote 4, 225, 0, 7 - squarenote 4, 242, 128, 7 - squarenote 2, 146, 64, 7 - squarenote 8, 225, 0, 6 + squarenote 4, 14, 1, 1792 + squarenote 4, 15, 2, 1920 + squarenote 2, 9, 2, 1856 + squarenote 8, 14, 1, 1536 endchannel SFX_Cry0E_1_Ch5: dutycycle 10 - squarenote 4, 177, 225, 6 - squarenote 3, 194, 225, 6 - squarenote 3, 98, 129, 6 - squarenote 8, 177, 225, 5 + squarenote 4, 11, 1, 1761 + squarenote 3, 12, 2, 1761 + squarenote 3, 6, 2, 1665 + squarenote 8, 11, 1, 1505 endchannel SFX_Cry0E_1_Ch7: - noisenote 2, 97, 50 - noisenote 2, 97, 33 - noisenote 8, 97, 17 + noisenote 2, 6, 1, 50 + noisenote 2, 6, 1, 33 + noisenote 8, 6, 1, 17 endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 3a5e7f58..943b12f4 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,23 +1,23 @@ SFX_Cry0E_2_Ch4: dutycycle 165 - squarenote 4, 225, 0, 7 - squarenote 4, 242, 128, 7 - squarenote 2, 146, 64, 7 - squarenote 8, 225, 0, 6 + squarenote 4, 14, 1, 1792 + squarenote 4, 15, 2, 1920 + squarenote 2, 9, 2, 1856 + squarenote 8, 14, 1, 1536 endchannel SFX_Cry0E_2_Ch5: dutycycle 10 - squarenote 4, 177, 225, 6 - squarenote 3, 194, 225, 6 - squarenote 3, 98, 129, 6 - squarenote 8, 177, 225, 5 + squarenote 4, 11, 1, 1761 + squarenote 3, 12, 2, 1761 + squarenote 3, 6, 2, 1665 + squarenote 8, 11, 1, 1505 endchannel SFX_Cry0E_2_Ch7: - noisenote 2, 97, 50 - noisenote 2, 97, 33 - noisenote 8, 97, 17 + noisenote 2, 6, 1, 50 + noisenote 2, 6, 1, 33 + noisenote 8, 6, 1, 17 endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 15bea347..c500b326 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,23 +1,23 @@ SFX_Cry0E_3_Ch4: dutycycle 165 - squarenote 4, 225, 0, 7 - squarenote 4, 242, 128, 7 - squarenote 2, 146, 64, 7 - squarenote 8, 225, 0, 6 + squarenote 4, 14, 1, 1792 + squarenote 4, 15, 2, 1920 + squarenote 2, 9, 2, 1856 + squarenote 8, 14, 1, 1536 endchannel SFX_Cry0E_3_Ch5: dutycycle 10 - squarenote 4, 177, 225, 6 - squarenote 3, 194, 225, 6 - squarenote 3, 98, 129, 6 - squarenote 8, 177, 225, 5 + squarenote 4, 11, 1, 1761 + squarenote 3, 12, 2, 1761 + squarenote 3, 6, 2, 1665 + squarenote 8, 11, 1, 1505 endchannel SFX_Cry0E_3_Ch7: - noisenote 2, 97, 50 - noisenote 2, 97, 33 - noisenote 8, 97, 17 + noisenote 2, 6, 1, 50 + noisenote 2, 6, 1, 33 + noisenote 8, 6, 1, 17 endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 8c260c93..e959205e 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,29 +1,29 @@ SFX_Cry0F_1_Ch4: dutycycle 241 - squarenote 4, 247, 192, 7 - squarenote 12, 230, 194, 7 - squarenote 6, 181, 128, 6 - squarenote 4, 196, 112, 6 - squarenote 4, 181, 96, 6 - squarenote 8, 193, 64, 6 + squarenote 4, 15, 7, 1984 + squarenote 12, 14, 6, 1986 + squarenote 6, 11, 5, 1664 + squarenote 4, 12, 4, 1648 + squarenote 4, 11, 5, 1632 + squarenote 8, 12, 1, 1600 endchannel SFX_Cry0F_1_Ch5: dutycycle 204 - squarenote 3, 199, 129, 7 - squarenote 12, 182, 128, 7 - squarenote 6, 165, 65, 6 - squarenote 4, 196, 50, 6 - squarenote 6, 181, 33, 6 - squarenote 8, 161, 2, 6 + squarenote 3, 12, 7, 1921 + squarenote 12, 11, 6, 1920 + squarenote 6, 10, 5, 1601 + squarenote 4, 12, 4, 1586 + squarenote 6, 11, 5, 1569 + squarenote 8, 10, 1, 1538 endchannel SFX_Cry0F_1_Ch7: - noisenote 3, 228, 60 - noisenote 12, 214, 44 - noisenote 4, 228, 60 - noisenote 8, 183, 92 - noisenote 15, 194, 93 + noisenote 3, 14, 4, 60 + noisenote 12, 13, 6, 44 + noisenote 4, 14, 4, 60 + noisenote 8, 11, 7, 92 + noisenote 15, 12, 2, 93 endchannel diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 4812e0fb..dc052645 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,29 +1,29 @@ SFX_Cry0F_2_Ch4: dutycycle 241 - squarenote 4, 247, 192, 7 - squarenote 12, 230, 194, 7 - squarenote 6, 181, 128, 6 - squarenote 4, 196, 112, 6 - squarenote 4, 181, 96, 6 - squarenote 8, 193, 64, 6 + squarenote 4, 15, 7, 1984 + squarenote 12, 14, 6, 1986 + squarenote 6, 11, 5, 1664 + squarenote 4, 12, 4, 1648 + squarenote 4, 11, 5, 1632 + squarenote 8, 12, 1, 1600 endchannel SFX_Cry0F_2_Ch5: dutycycle 204 - squarenote 3, 199, 129, 7 - squarenote 12, 182, 128, 7 - squarenote 6, 165, 65, 6 - squarenote 4, 196, 50, 6 - squarenote 6, 181, 33, 6 - squarenote 8, 161, 2, 6 + squarenote 3, 12, 7, 1921 + squarenote 12, 11, 6, 1920 + squarenote 6, 10, 5, 1601 + squarenote 4, 12, 4, 1586 + squarenote 6, 11, 5, 1569 + squarenote 8, 10, 1, 1538 endchannel SFX_Cry0F_2_Ch7: - noisenote 3, 228, 60 - noisenote 12, 214, 44 - noisenote 4, 228, 60 - noisenote 8, 183, 92 - noisenote 15, 194, 93 + noisenote 3, 14, 4, 60 + noisenote 12, 13, 6, 44 + noisenote 4, 14, 4, 60 + noisenote 8, 11, 7, 92 + noisenote 15, 12, 2, 93 endchannel diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 3f612b84..2705d73d 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,29 +1,29 @@ SFX_Cry0F_3_Ch4: dutycycle 241 - squarenote 4, 247, 192, 7 - squarenote 12, 230, 194, 7 - squarenote 6, 181, 128, 6 - squarenote 4, 196, 112, 6 - squarenote 4, 181, 96, 6 - squarenote 8, 193, 64, 6 + squarenote 4, 15, 7, 1984 + squarenote 12, 14, 6, 1986 + squarenote 6, 11, 5, 1664 + squarenote 4, 12, 4, 1648 + squarenote 4, 11, 5, 1632 + squarenote 8, 12, 1, 1600 endchannel SFX_Cry0F_3_Ch5: dutycycle 204 - squarenote 3, 199, 129, 7 - squarenote 12, 182, 128, 7 - squarenote 6, 165, 65, 6 - squarenote 4, 196, 50, 6 - squarenote 6, 181, 33, 6 - squarenote 8, 161, 2, 6 + squarenote 3, 12, 7, 1921 + squarenote 12, 11, 6, 1920 + squarenote 6, 10, 5, 1601 + squarenote 4, 12, 4, 1586 + squarenote 6, 11, 5, 1569 + squarenote 8, 10, 1, 1538 endchannel SFX_Cry0F_3_Ch7: - noisenote 3, 228, 60 - noisenote 12, 214, 44 - noisenote 4, 228, 60 - noisenote 8, 183, 92 - noisenote 15, 194, 93 + noisenote 3, 14, 4, 60 + noisenote 12, 13, 6, 44 + noisenote 4, 14, 4, 60 + noisenote 8, 11, 7, 92 + noisenote 15, 12, 2, 93 endchannel diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 46a1498b..95c72f8a 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,31 +1,31 @@ SFX_Cry10_1_Ch4: dutycycle 201 - squarenote 8, 247, 128, 6 - squarenote 2, 247, 96, 6 - squarenote 1, 231, 64, 6 - squarenote 1, 231, 32, 6 - squarenote 15, 209, 0, 6 - squarenote 4, 199, 64, 7 - squarenote 4, 167, 48, 7 - squarenote 15, 145, 32, 7 + squarenote 8, 15, 7, 1664 + squarenote 2, 15, 7, 1632 + squarenote 1, 14, 7, 1600 + squarenote 1, 14, 7, 1568 + squarenote 15, 13, 1, 1536 + squarenote 4, 12, 7, 1856 + squarenote 4, 10, 7, 1840 + squarenote 15, 9, 1, 1824 endchannel SFX_Cry10_1_Ch5: dutycycle 121 - squarenote 10, 231, 130, 6 - squarenote 2, 231, 98, 6 - squarenote 1, 215, 66, 6 - squarenote 1, 215, 34, 6 - squarenote 15, 193, 2, 6 - squarenote 4, 183, 66, 7 - squarenote 2, 151, 50, 7 - squarenote 15, 129, 34, 7 + squarenote 10, 14, 7, 1666 + squarenote 2, 14, 7, 1634 + squarenote 1, 13, 7, 1602 + squarenote 1, 13, 7, 1570 + squarenote 15, 12, 1, 1538 + squarenote 4, 11, 7, 1858 + squarenote 2, 9, 7, 1842 + squarenote 15, 8, 1, 1826 endchannel SFX_Cry10_1_Ch7: - noisenote 4, 116, 33 - noisenote 4, 116, 16 - noisenote 4, 113, 32 + noisenote 4, 7, 4, 33 + noisenote 4, 7, 4, 16 + noisenote 4, 7, 1, 32 endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 047413ae..569e50e2 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,31 +1,31 @@ SFX_Cry10_2_Ch4: dutycycle 201 - squarenote 8, 247, 128, 6 - squarenote 2, 247, 96, 6 - squarenote 1, 231, 64, 6 - squarenote 1, 231, 32, 6 - squarenote 15, 209, 0, 6 - squarenote 4, 199, 64, 7 - squarenote 4, 167, 48, 7 - squarenote 15, 145, 32, 7 + squarenote 8, 15, 7, 1664 + squarenote 2, 15, 7, 1632 + squarenote 1, 14, 7, 1600 + squarenote 1, 14, 7, 1568 + squarenote 15, 13, 1, 1536 + squarenote 4, 12, 7, 1856 + squarenote 4, 10, 7, 1840 + squarenote 15, 9, 1, 1824 endchannel SFX_Cry10_2_Ch5: dutycycle 121 - squarenote 10, 231, 130, 6 - squarenote 2, 231, 98, 6 - squarenote 1, 215, 66, 6 - squarenote 1, 215, 34, 6 - squarenote 15, 193, 2, 6 - squarenote 4, 183, 66, 7 - squarenote 2, 151, 50, 7 - squarenote 15, 129, 34, 7 + squarenote 10, 14, 7, 1666 + squarenote 2, 14, 7, 1634 + squarenote 1, 13, 7, 1602 + squarenote 1, 13, 7, 1570 + squarenote 15, 12, 1, 1538 + squarenote 4, 11, 7, 1858 + squarenote 2, 9, 7, 1842 + squarenote 15, 8, 1, 1826 endchannel SFX_Cry10_2_Ch7: - noisenote 4, 116, 33 - noisenote 4, 116, 16 - noisenote 4, 113, 32 + noisenote 4, 7, 4, 33 + noisenote 4, 7, 4, 16 + noisenote 4, 7, 1, 32 endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index ecebe7e4..1ac5776b 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,31 +1,31 @@ SFX_Cry10_3_Ch4: dutycycle 201 - squarenote 8, 247, 128, 6 - squarenote 2, 247, 96, 6 - squarenote 1, 231, 64, 6 - squarenote 1, 231, 32, 6 - squarenote 15, 209, 0, 6 - squarenote 4, 199, 64, 7 - squarenote 4, 167, 48, 7 - squarenote 15, 145, 32, 7 + squarenote 8, 15, 7, 1664 + squarenote 2, 15, 7, 1632 + squarenote 1, 14, 7, 1600 + squarenote 1, 14, 7, 1568 + squarenote 15, 13, 1, 1536 + squarenote 4, 12, 7, 1856 + squarenote 4, 10, 7, 1840 + squarenote 15, 9, 1, 1824 endchannel SFX_Cry10_3_Ch5: dutycycle 121 - squarenote 10, 231, 130, 6 - squarenote 2, 231, 98, 6 - squarenote 1, 215, 66, 6 - squarenote 1, 215, 34, 6 - squarenote 15, 193, 2, 6 - squarenote 4, 183, 66, 7 - squarenote 2, 151, 50, 7 - squarenote 15, 129, 34, 7 + squarenote 10, 14, 7, 1666 + squarenote 2, 14, 7, 1634 + squarenote 1, 13, 7, 1602 + squarenote 1, 13, 7, 1570 + squarenote 15, 12, 1, 1538 + squarenote 4, 11, 7, 1858 + squarenote 2, 9, 7, 1842 + squarenote 15, 8, 1, 1826 endchannel SFX_Cry10_3_Ch7: - noisenote 4, 116, 33 - noisenote 4, 116, 16 - noisenote 4, 113, 32 + noisenote 4, 7, 4, 33 + noisenote 4, 7, 4, 16 + noisenote 4, 7, 1, 32 endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index 0b632a02..5af0fef3 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,34 +1,34 @@ SFX_Cry11_1_Ch4: dutycycle 240 - squarenote 6, 247, 160, 7 - squarenote 8, 230, 164, 7 - squarenote 4, 214, 160, 7 - squarenote 15, 211, 32, 7 - squarenote 8, 195, 35, 7 - squarenote 2, 194, 40, 7 - squarenote 8, 177, 48, 7 + squarenote 6, 15, 7, 1952 + squarenote 8, 14, 6, 1956 + squarenote 4, 13, 6, 1952 + squarenote 15, 13, 3, 1824 + squarenote 8, 12, 3, 1827 + squarenote 2, 12, 2, 1832 + squarenote 8, 11, 1, 1840 endchannel SFX_Cry11_1_Ch5: dutycycle 10 - squarenote 4, 8, 0, 0 - squarenote 6, 167, 65, 7 - squarenote 8, 134, 67, 7 - squarenote 4, 118, 65, 7 - squarenote 13, 131, 194, 6 - squarenote 7, 115, 193, 6 - squarenote 3, 130, 204, 6 - squarenote 8, 113, 216, 6 + squarenote 4, 0, 8, 0 + squarenote 6, 10, 7, 1857 + squarenote 8, 8, 6, 1859 + squarenote 4, 7, 6, 1857 + squarenote 13, 8, 3, 1730 + squarenote 7, 7, 3, 1729 + squarenote 3, 8, 2, 1740 + squarenote 8, 7, 1, 1752 endchannel SFX_Cry11_1_Ch7: - noisenote 2, 242, 76 - noisenote 6, 230, 58 - noisenote 4, 215, 58 - noisenote 6, 214, 44 - noisenote 8, 229, 60 - noisenote 12, 210, 61 - noisenote 8, 209, 44 + noisenote 2, 15, 2, 76 + noisenote 6, 14, 6, 58 + noisenote 4, 13, 7, 58 + noisenote 6, 13, 6, 44 + noisenote 8, 14, 5, 60 + noisenote 12, 13, 2, 61 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 2bf5a547..6000549a 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,34 +1,34 @@ SFX_Cry11_2_Ch4: dutycycle 240 - squarenote 6, 247, 160, 7 - squarenote 8, 230, 164, 7 - squarenote 4, 214, 160, 7 - squarenote 15, 211, 32, 7 - squarenote 8, 195, 35, 7 - squarenote 2, 194, 40, 7 - squarenote 8, 177, 48, 7 + squarenote 6, 15, 7, 1952 + squarenote 8, 14, 6, 1956 + squarenote 4, 13, 6, 1952 + squarenote 15, 13, 3, 1824 + squarenote 8, 12, 3, 1827 + squarenote 2, 12, 2, 1832 + squarenote 8, 11, 1, 1840 endchannel SFX_Cry11_2_Ch5: dutycycle 10 - squarenote 4, 8, 0, 0 - squarenote 6, 167, 65, 7 - squarenote 8, 134, 67, 7 - squarenote 4, 118, 65, 7 - squarenote 13, 131, 194, 6 - squarenote 7, 115, 193, 6 - squarenote 3, 130, 204, 6 - squarenote 8, 113, 216, 6 + squarenote 4, 0, 8, 0 + squarenote 6, 10, 7, 1857 + squarenote 8, 8, 6, 1859 + squarenote 4, 7, 6, 1857 + squarenote 13, 8, 3, 1730 + squarenote 7, 7, 3, 1729 + squarenote 3, 8, 2, 1740 + squarenote 8, 7, 1, 1752 endchannel SFX_Cry11_2_Ch7: - noisenote 2, 242, 76 - noisenote 6, 230, 58 - noisenote 4, 215, 58 - noisenote 6, 214, 44 - noisenote 8, 229, 60 - noisenote 12, 210, 61 - noisenote 8, 209, 44 + noisenote 2, 15, 2, 76 + noisenote 6, 14, 6, 58 + noisenote 4, 13, 7, 58 + noisenote 6, 13, 6, 44 + noisenote 8, 14, 5, 60 + noisenote 12, 13, 2, 61 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 6fe2c7d0..c877f28a 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,34 +1,34 @@ SFX_Cry11_3_Ch4: dutycycle 240 - squarenote 6, 247, 160, 7 - squarenote 8, 230, 164, 7 - squarenote 4, 214, 160, 7 - squarenote 15, 211, 32, 7 - squarenote 8, 195, 35, 7 - squarenote 2, 194, 40, 7 - squarenote 8, 177, 48, 7 + squarenote 6, 15, 7, 1952 + squarenote 8, 14, 6, 1956 + squarenote 4, 13, 6, 1952 + squarenote 15, 13, 3, 1824 + squarenote 8, 12, 3, 1827 + squarenote 2, 12, 2, 1832 + squarenote 8, 11, 1, 1840 endchannel SFX_Cry11_3_Ch5: dutycycle 10 - squarenote 4, 8, 0, 0 - squarenote 6, 167, 65, 7 - squarenote 8, 134, 67, 7 - squarenote 4, 118, 65, 7 - squarenote 13, 131, 194, 6 - squarenote 7, 115, 193, 6 - squarenote 3, 130, 204, 6 - squarenote 8, 113, 216, 6 + squarenote 4, 0, 8, 0 + squarenote 6, 10, 7, 1857 + squarenote 8, 8, 6, 1859 + squarenote 4, 7, 6, 1857 + squarenote 13, 8, 3, 1730 + squarenote 7, 7, 3, 1729 + squarenote 3, 8, 2, 1740 + squarenote 8, 7, 1, 1752 endchannel SFX_Cry11_3_Ch7: - noisenote 2, 242, 76 - noisenote 6, 230, 58 - noisenote 4, 215, 58 - noisenote 6, 214, 44 - noisenote 8, 229, 60 - noisenote 12, 210, 61 - noisenote 8, 209, 44 + noisenote 2, 15, 2, 76 + noisenote 6, 14, 6, 58 + noisenote 4, 13, 7, 58 + noisenote 6, 13, 6, 44 + noisenote 8, 14, 5, 60 + noisenote 12, 13, 2, 61 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index c919ddd0..a453a110 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,24 +1,24 @@ SFX_Cry12_1_Ch4: dutycycle 165 - squarenote 12, 242, 64, 4 - squarenote 15, 227, 160, 4 - squarenote 4, 210, 144, 4 - squarenote 8, 209, 128, 4 + squarenote 12, 15, 2, 1088 + squarenote 15, 14, 3, 1184 + squarenote 4, 13, 2, 1168 + squarenote 8, 13, 1, 1152 endchannel SFX_Cry12_1_Ch5: dutycycle 238 - squarenote 11, 210, 56, 4 - squarenote 14, 198, 152, 4 - squarenote 3, 178, 136, 4 - squarenote 8, 177, 120, 4 + squarenote 11, 13, 2, 1080 + squarenote 14, 12, 6, 1176 + squarenote 3, 11, 2, 1160 + squarenote 8, 11, 1, 1144 endchannel SFX_Cry12_1_Ch7: - noisenote 10, 230, 108 - noisenote 15, 210, 92 - noisenote 3, 194, 108 - noisenote 8, 209, 92 + noisenote 10, 14, 6, 108 + noisenote 15, 13, 2, 92 + noisenote 3, 12, 2, 108 + noisenote 8, 13, 1, 92 endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4715c969..4f3d39e4 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,24 +1,24 @@ SFX_Cry12_2_Ch4: dutycycle 165 - squarenote 12, 242, 64, 4 - squarenote 15, 227, 160, 4 - squarenote 4, 210, 144, 4 - squarenote 8, 209, 128, 4 + squarenote 12, 15, 2, 1088 + squarenote 15, 14, 3, 1184 + squarenote 4, 13, 2, 1168 + squarenote 8, 13, 1, 1152 endchannel SFX_Cry12_2_Ch5: dutycycle 238 - squarenote 11, 210, 56, 4 - squarenote 14, 198, 152, 4 - squarenote 3, 178, 136, 4 - squarenote 8, 177, 120, 4 + squarenote 11, 13, 2, 1080 + squarenote 14, 12, 6, 1176 + squarenote 3, 11, 2, 1160 + squarenote 8, 11, 1, 1144 endchannel SFX_Cry12_2_Ch7: - noisenote 10, 230, 108 - noisenote 15, 210, 92 - noisenote 3, 194, 108 - noisenote 8, 209, 92 + noisenote 10, 14, 6, 108 + noisenote 15, 13, 2, 92 + noisenote 3, 12, 2, 108 + noisenote 8, 13, 1, 92 endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 10d067ef..033b02bb 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,24 +1,24 @@ SFX_Cry12_3_Ch4: dutycycle 165 - squarenote 12, 242, 64, 4 - squarenote 15, 227, 160, 4 - squarenote 4, 210, 144, 4 - squarenote 8, 209, 128, 4 + squarenote 12, 15, 2, 1088 + squarenote 15, 14, 3, 1184 + squarenote 4, 13, 2, 1168 + squarenote 8, 13, 1, 1152 endchannel SFX_Cry12_3_Ch5: dutycycle 238 - squarenote 11, 210, 56, 4 - squarenote 14, 198, 152, 4 - squarenote 3, 178, 136, 4 - squarenote 8, 177, 120, 4 + squarenote 11, 13, 2, 1080 + squarenote 14, 12, 6, 1176 + squarenote 3, 11, 2, 1160 + squarenote 8, 11, 1, 1144 endchannel SFX_Cry12_3_Ch7: - noisenote 10, 230, 108 - noisenote 15, 210, 92 - noisenote 3, 194, 108 - noisenote 8, 209, 92 + noisenote 10, 14, 6, 108 + noisenote 15, 13, 2, 92 + noisenote 3, 12, 2, 108 + noisenote 8, 13, 1, 92 endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 3d2b192e..67db31fe 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,30 +1,30 @@ SFX_Cry13_1_Ch4: dutycycle 51 - squarenote 15, 246, 192, 5 - squarenote 8, 227, 188, 5 - squarenote 6, 210, 208, 5 - squarenote 6, 178, 224, 5 - squarenote 6, 194, 240, 5 - squarenote 8, 177, 0, 6 + squarenote 15, 15, 6, 1472 + squarenote 8, 14, 3, 1468 + squarenote 6, 13, 2, 1488 + squarenote 6, 11, 2, 1504 + squarenote 6, 12, 2, 1520 + squarenote 8, 11, 1, 1536 endchannel SFX_Cry13_1_Ch5: dutycycle 153 - squarenote 14, 198, 177, 4 - squarenote 7, 195, 173, 4 - squarenote 5, 178, 193, 4 - squarenote 8, 146, 209, 4 - squarenote 6, 162, 225, 4 - squarenote 8, 145, 241, 4 + squarenote 14, 12, 6, 1201 + squarenote 7, 12, 3, 1197 + squarenote 5, 11, 2, 1217 + squarenote 8, 9, 2, 1233 + squarenote 6, 10, 2, 1249 + squarenote 8, 9, 1, 1265 endchannel SFX_Cry13_1_Ch7: - noisenote 10, 230, 92 - noisenote 10, 214, 108 - noisenote 4, 194, 76 - noisenote 6, 211, 92 - noisenote 8, 179, 76 - noisenote 8, 161, 92 + noisenote 10, 14, 6, 92 + noisenote 10, 13, 6, 108 + noisenote 4, 12, 2, 76 + noisenote 6, 13, 3, 92 + noisenote 8, 11, 3, 76 + noisenote 8, 10, 1, 92 endchannel diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 650533ed..f1262bdc 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,30 +1,30 @@ SFX_Cry13_2_Ch4: dutycycle 51 - squarenote 15, 246, 192, 5 - squarenote 8, 227, 188, 5 - squarenote 6, 210, 208, 5 - squarenote 6, 178, 224, 5 - squarenote 6, 194, 240, 5 - squarenote 8, 177, 0, 6 + squarenote 15, 15, 6, 1472 + squarenote 8, 14, 3, 1468 + squarenote 6, 13, 2, 1488 + squarenote 6, 11, 2, 1504 + squarenote 6, 12, 2, 1520 + squarenote 8, 11, 1, 1536 endchannel SFX_Cry13_2_Ch5: dutycycle 153 - squarenote 14, 198, 177, 4 - squarenote 7, 195, 173, 4 - squarenote 5, 178, 193, 4 - squarenote 8, 146, 209, 4 - squarenote 6, 162, 225, 4 - squarenote 8, 145, 241, 4 + squarenote 14, 12, 6, 1201 + squarenote 7, 12, 3, 1197 + squarenote 5, 11, 2, 1217 + squarenote 8, 9, 2, 1233 + squarenote 6, 10, 2, 1249 + squarenote 8, 9, 1, 1265 endchannel SFX_Cry13_2_Ch7: - noisenote 10, 230, 92 - noisenote 10, 214, 108 - noisenote 4, 194, 76 - noisenote 6, 211, 92 - noisenote 8, 179, 76 - noisenote 8, 161, 92 + noisenote 10, 14, 6, 92 + noisenote 10, 13, 6, 108 + noisenote 4, 12, 2, 76 + noisenote 6, 13, 3, 92 + noisenote 8, 11, 3, 76 + noisenote 8, 10, 1, 92 endchannel diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index 5d84bb87..f81dbe29 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,30 +1,30 @@ SFX_Cry13_3_Ch4: dutycycle 51 - squarenote 15, 246, 192, 5 - squarenote 8, 227, 188, 5 - squarenote 6, 210, 208, 5 - squarenote 6, 178, 224, 5 - squarenote 6, 194, 240, 5 - squarenote 8, 177, 0, 6 + squarenote 15, 15, 6, 1472 + squarenote 8, 14, 3, 1468 + squarenote 6, 13, 2, 1488 + squarenote 6, 11, 2, 1504 + squarenote 6, 12, 2, 1520 + squarenote 8, 11, 1, 1536 endchannel SFX_Cry13_3_Ch5: dutycycle 153 - squarenote 14, 198, 177, 4 - squarenote 7, 195, 173, 4 - squarenote 5, 178, 193, 4 - squarenote 8, 146, 209, 4 - squarenote 6, 162, 225, 4 - squarenote 8, 145, 241, 4 + squarenote 14, 12, 6, 1201 + squarenote 7, 12, 3, 1197 + squarenote 5, 11, 2, 1217 + squarenote 8, 9, 2, 1233 + squarenote 6, 10, 2, 1249 + squarenote 8, 9, 1, 1265 endchannel SFX_Cry13_3_Ch7: - noisenote 10, 230, 92 - noisenote 10, 214, 108 - noisenote 4, 194, 76 - noisenote 6, 211, 92 - noisenote 8, 179, 76 - noisenote 8, 161, 92 + noisenote 10, 14, 6, 92 + noisenote 10, 13, 6, 108 + noisenote 4, 12, 2, 76 + noisenote 6, 13, 3, 92 + noisenote 8, 11, 3, 76 + noisenote 8, 10, 1, 92 endchannel diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index 58d5082d..b066f5fc 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,21 +1,21 @@ SFX_Cry14_1_Ch4: dutycycle 240 - squarenote 8, 228, 144, 7 - squarenote 15, 245, 192, 7 - squarenote 8, 209, 216, 7 + squarenote 8, 14, 4, 1936 + squarenote 15, 15, 5, 1984 + squarenote 8, 13, 1, 2008 endchannel SFX_Cry14_1_Ch5: dutycycle 165 - squarenote 10, 196, 113, 7 - squarenote 15, 182, 162, 7 - squarenote 8, 161, 183, 7 + squarenote 10, 12, 4, 1905 + squarenote 15, 11, 6, 1954 + squarenote 8, 10, 1, 1975 endchannel SFX_Cry14_1_Ch7: - noisenote 8, 228, 76 - noisenote 14, 196, 60 - noisenote 8, 209, 44 + noisenote 8, 14, 4, 76 + noisenote 14, 12, 4, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 7e326054..36c8e5aa 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,21 +1,21 @@ SFX_Cry14_2_Ch4: dutycycle 240 - squarenote 8, 228, 144, 7 - squarenote 15, 245, 192, 7 - squarenote 8, 209, 216, 7 + squarenote 8, 14, 4, 1936 + squarenote 15, 15, 5, 1984 + squarenote 8, 13, 1, 2008 endchannel SFX_Cry14_2_Ch5: dutycycle 165 - squarenote 10, 196, 113, 7 - squarenote 15, 182, 162, 7 - squarenote 8, 161, 183, 7 + squarenote 10, 12, 4, 1905 + squarenote 15, 11, 6, 1954 + squarenote 8, 10, 1, 1975 endchannel SFX_Cry14_2_Ch7: - noisenote 8, 228, 76 - noisenote 14, 196, 60 - noisenote 8, 209, 44 + noisenote 8, 14, 4, 76 + noisenote 14, 12, 4, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index 42dc084d..ce4a27b9 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,21 +1,21 @@ SFX_Cry14_3_Ch4: dutycycle 240 - squarenote 8, 228, 144, 7 - squarenote 15, 245, 192, 7 - squarenote 8, 209, 216, 7 + squarenote 8, 14, 4, 1936 + squarenote 15, 15, 5, 1984 + squarenote 8, 13, 1, 2008 endchannel SFX_Cry14_3_Ch5: dutycycle 165 - squarenote 10, 196, 113, 7 - squarenote 15, 182, 162, 7 - squarenote 8, 161, 183, 7 + squarenote 10, 12, 4, 1905 + squarenote 15, 11, 6, 1954 + squarenote 8, 10, 1, 1975 endchannel SFX_Cry14_3_Ch7: - noisenote 8, 228, 76 - noisenote 14, 196, 60 - noisenote 8, 209, 44 + noisenote 8, 14, 4, 76 + noisenote 14, 12, 4, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 1a1e1a47..d9966782 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,30 +1,30 @@ SFX_Cry15_1_Ch4: dutycycle 240 - squarenote 4, 243, 128, 7 - squarenote 15, 231, 0, 7 - squarenote 8, 211, 16, 7 - squarenote 4, 194, 0, 7 - squarenote 4, 210, 240, 6 - squarenote 8, 193, 224, 6 + squarenote 4, 15, 3, 1920 + squarenote 15, 14, 7, 1792 + squarenote 8, 13, 3, 1808 + squarenote 4, 12, 2, 1792 + squarenote 4, 13, 2, 1776 + squarenote 8, 12, 1, 1760 endchannel SFX_Cry15_1_Ch5: dutycycle 90 - squarenote 6, 195, 1, 7 - squarenote 14, 183, 129, 6 - squarenote 7, 179, 146, 6 - squarenote 3, 162, 129, 6 - squarenote 4, 178, 114, 6 - squarenote 8, 161, 97, 6 + squarenote 6, 12, 3, 1793 + squarenote 14, 11, 7, 1665 + squarenote 7, 11, 3, 1682 + squarenote 3, 10, 2, 1665 + squarenote 4, 11, 2, 1650 + squarenote 8, 10, 1, 1633 endchannel SFX_Cry15_1_Ch7: - noisenote 6, 227, 92 - noisenote 14, 214, 76 - noisenote 6, 198, 60 - noisenote 3, 179, 76 - noisenote 3, 162, 92 - noisenote 8, 177, 108 + noisenote 6, 14, 3, 92 + noisenote 14, 13, 6, 76 + noisenote 6, 12, 6, 60 + noisenote 3, 11, 3, 76 + noisenote 3, 10, 2, 92 + noisenote 8, 11, 1, 108 endchannel diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 29153506..0fa8daf0 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,30 +1,30 @@ SFX_Cry15_2_Ch4: dutycycle 240 - squarenote 4, 243, 128, 7 - squarenote 15, 231, 0, 7 - squarenote 8, 211, 16, 7 - squarenote 4, 194, 0, 7 - squarenote 4, 210, 240, 6 - squarenote 8, 193, 224, 6 + squarenote 4, 15, 3, 1920 + squarenote 15, 14, 7, 1792 + squarenote 8, 13, 3, 1808 + squarenote 4, 12, 2, 1792 + squarenote 4, 13, 2, 1776 + squarenote 8, 12, 1, 1760 endchannel SFX_Cry15_2_Ch5: dutycycle 90 - squarenote 6, 195, 1, 7 - squarenote 14, 183, 129, 6 - squarenote 7, 179, 146, 6 - squarenote 3, 162, 129, 6 - squarenote 4, 178, 114, 6 - squarenote 8, 161, 97, 6 + squarenote 6, 12, 3, 1793 + squarenote 14, 11, 7, 1665 + squarenote 7, 11, 3, 1682 + squarenote 3, 10, 2, 1665 + squarenote 4, 11, 2, 1650 + squarenote 8, 10, 1, 1633 endchannel SFX_Cry15_2_Ch7: - noisenote 6, 227, 92 - noisenote 14, 214, 76 - noisenote 6, 198, 60 - noisenote 3, 179, 76 - noisenote 3, 162, 92 - noisenote 8, 177, 108 + noisenote 6, 14, 3, 92 + noisenote 14, 13, 6, 76 + noisenote 6, 12, 6, 60 + noisenote 3, 11, 3, 76 + noisenote 3, 10, 2, 92 + noisenote 8, 11, 1, 108 endchannel diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 090b18b2..5c4fe877 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,30 +1,30 @@ SFX_Cry15_3_Ch4: dutycycle 240 - squarenote 4, 243, 128, 7 - squarenote 15, 231, 0, 7 - squarenote 8, 211, 16, 7 - squarenote 4, 194, 0, 7 - squarenote 4, 210, 240, 6 - squarenote 8, 193, 224, 6 + squarenote 4, 15, 3, 1920 + squarenote 15, 14, 7, 1792 + squarenote 8, 13, 3, 1808 + squarenote 4, 12, 2, 1792 + squarenote 4, 13, 2, 1776 + squarenote 8, 12, 1, 1760 endchannel SFX_Cry15_3_Ch5: dutycycle 90 - squarenote 6, 195, 1, 7 - squarenote 14, 183, 129, 6 - squarenote 7, 179, 146, 6 - squarenote 3, 162, 129, 6 - squarenote 4, 178, 114, 6 - squarenote 8, 161, 97, 6 + squarenote 6, 12, 3, 1793 + squarenote 14, 11, 7, 1665 + squarenote 7, 11, 3, 1682 + squarenote 3, 10, 2, 1665 + squarenote 4, 11, 2, 1650 + squarenote 8, 10, 1, 1633 endchannel SFX_Cry15_3_Ch7: - noisenote 6, 227, 92 - noisenote 14, 214, 76 - noisenote 6, 198, 60 - noisenote 3, 179, 76 - noisenote 3, 162, 92 - noisenote 8, 177, 108 + noisenote 6, 14, 3, 92 + noisenote 14, 13, 6, 76 + noisenote 6, 12, 6, 60 + noisenote 3, 11, 3, 76 + noisenote 3, 10, 2, 92 + noisenote 8, 11, 1, 108 endchannel diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 2009a8b4..c6dcac1b 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,21 +1,21 @@ SFX_Cry16_1_Ch4: dutycycle 240 - squarenote 15, 215, 128, 7 - squarenote 4, 230, 160, 7 - squarenote 15, 210, 64, 7 + squarenote 15, 13, 7, 1920 + squarenote 4, 14, 6, 1952 + squarenote 15, 13, 2, 1856 endchannel SFX_Cry16_1_Ch5: dutycycle 90 - squarenote 15, 199, 83, 7 - squarenote 5, 182, 114, 7 - squarenote 15, 194, 17, 7 + squarenote 15, 12, 7, 1875 + squarenote 5, 11, 6, 1906 + squarenote 15, 12, 2, 1809 endchannel SFX_Cry16_1_Ch7: - noisenote 13, 246, 76 - noisenote 4, 230, 60 - noisenote 15, 242, 76 + noisenote 13, 15, 6, 76 + noisenote 4, 14, 6, 60 + noisenote 15, 15, 2, 76 endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 7baabb45..1946c8f1 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,21 +1,21 @@ SFX_Cry16_2_Ch4: dutycycle 240 - squarenote 15, 215, 128, 7 - squarenote 4, 230, 160, 7 - squarenote 15, 210, 64, 7 + squarenote 15, 13, 7, 1920 + squarenote 4, 14, 6, 1952 + squarenote 15, 13, 2, 1856 endchannel SFX_Cry16_2_Ch5: dutycycle 90 - squarenote 15, 199, 83, 7 - squarenote 5, 182, 114, 7 - squarenote 15, 194, 17, 7 + squarenote 15, 12, 7, 1875 + squarenote 5, 11, 6, 1906 + squarenote 15, 12, 2, 1809 endchannel SFX_Cry16_2_Ch7: - noisenote 13, 246, 76 - noisenote 4, 230, 60 - noisenote 15, 242, 76 + noisenote 13, 15, 6, 76 + noisenote 4, 14, 6, 60 + noisenote 15, 15, 2, 76 endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index b86e9fb3..bc8ff2ba 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,21 +1,21 @@ SFX_Cry16_3_Ch4: dutycycle 240 - squarenote 15, 215, 128, 7 - squarenote 4, 230, 160, 7 - squarenote 15, 210, 64, 7 + squarenote 15, 13, 7, 1920 + squarenote 4, 14, 6, 1952 + squarenote 15, 13, 2, 1856 endchannel SFX_Cry16_3_Ch5: dutycycle 90 - squarenote 15, 199, 83, 7 - squarenote 5, 182, 114, 7 - squarenote 15, 194, 17, 7 + squarenote 15, 12, 7, 1875 + squarenote 5, 11, 6, 1906 + squarenote 15, 12, 2, 1809 endchannel SFX_Cry16_3_Ch7: - noisenote 13, 246, 76 - noisenote 4, 230, 60 - noisenote 15, 242, 76 + noisenote 13, 15, 6, 76 + noisenote 4, 14, 6, 60 + noisenote 15, 15, 2, 76 endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 1b754064..29b6fff2 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,24 +1,24 @@ SFX_Cry17_1_Ch4: dutycycle 15 - squarenote 15, 247, 0, 5 - squarenote 15, 231, 8, 5 - squarenote 8, 180, 128, 4 - squarenote 15, 162, 96, 4 + squarenote 15, 15, 7, 1280 + squarenote 15, 14, 7, 1288 + squarenote 8, 11, 4, 1152 + squarenote 15, 10, 2, 1120 endchannel SFX_Cry17_1_Ch5: dutycycle 68 - squarenote 14, 215, 129, 4 - squarenote 14, 199, 137, 4 - squarenote 10, 180, 1, 4 - squarenote 15, 194, 225, 3 + squarenote 14, 13, 7, 1153 + squarenote 14, 12, 7, 1161 + squarenote 10, 11, 4, 1025 + squarenote 15, 12, 2, 993 endchannel SFX_Cry17_1_Ch7: - noisenote 14, 247, 124 - noisenote 12, 246, 108 - noisenote 9, 228, 124 - noisenote 15, 226, 108 + noisenote 14, 15, 7, 124 + noisenote 12, 15, 6, 108 + noisenote 9, 14, 4, 124 + noisenote 15, 14, 2, 108 endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index 8e40e269..4a42db48 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,24 +1,24 @@ SFX_Cry17_2_Ch4: dutycycle 15 - squarenote 15, 247, 0, 5 - squarenote 15, 231, 8, 5 - squarenote 8, 180, 128, 4 - squarenote 15, 162, 96, 4 + squarenote 15, 15, 7, 1280 + squarenote 15, 14, 7, 1288 + squarenote 8, 11, 4, 1152 + squarenote 15, 10, 2, 1120 endchannel SFX_Cry17_2_Ch5: dutycycle 68 - squarenote 14, 215, 129, 4 - squarenote 14, 199, 137, 4 - squarenote 10, 180, 1, 4 - squarenote 15, 194, 225, 3 + squarenote 14, 13, 7, 1153 + squarenote 14, 12, 7, 1161 + squarenote 10, 11, 4, 1025 + squarenote 15, 12, 2, 993 endchannel SFX_Cry17_2_Ch7: - noisenote 14, 247, 124 - noisenote 12, 246, 108 - noisenote 9, 228, 124 - noisenote 15, 226, 108 + noisenote 14, 15, 7, 124 + noisenote 12, 15, 6, 108 + noisenote 9, 14, 4, 124 + noisenote 15, 14, 2, 108 endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index a8aa3d26..4340c97f 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,24 +1,24 @@ SFX_Cry17_3_Ch4: dutycycle 15 - squarenote 15, 247, 0, 5 - squarenote 15, 231, 8, 5 - squarenote 8, 180, 128, 4 - squarenote 15, 162, 96, 4 + squarenote 15, 15, 7, 1280 + squarenote 15, 14, 7, 1288 + squarenote 8, 11, 4, 1152 + squarenote 15, 10, 2, 1120 endchannel SFX_Cry17_3_Ch5: dutycycle 68 - squarenote 14, 215, 129, 4 - squarenote 14, 199, 137, 4 - squarenote 10, 180, 1, 4 - squarenote 15, 194, 225, 3 + squarenote 14, 13, 7, 1153 + squarenote 14, 12, 7, 1161 + squarenote 10, 11, 4, 1025 + squarenote 15, 12, 2, 993 endchannel SFX_Cry17_3_Ch7: - noisenote 14, 247, 124 - noisenote 12, 246, 108 - noisenote 9, 228, 124 - noisenote 15, 226, 108 + noisenote 14, 15, 7, 124 + noisenote 12, 15, 6, 108 + noisenote 9, 14, 4, 124 + noisenote 15, 14, 2, 108 endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index cd6ea771..8249731a 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,34 +1,34 @@ SFX_Cry18_1_Ch4: dutycycle 80 - squarenote 10, 245, 128, 6 - squarenote 3, 226, 160, 6 - squarenote 3, 242, 192, 6 - squarenote 3, 226, 224, 6 - squarenote 3, 210, 0, 7 - squarenote 3, 194, 224, 6 - squarenote 3, 210, 192, 6 - squarenote 8, 193, 160, 6 + squarenote 10, 15, 5, 1664 + squarenote 3, 14, 2, 1696 + squarenote 3, 15, 2, 1728 + squarenote 3, 14, 2, 1760 + squarenote 3, 13, 2, 1792 + squarenote 3, 12, 2, 1760 + squarenote 3, 13, 2, 1728 + squarenote 8, 12, 1, 1696 endchannel SFX_Cry18_1_Ch5: dutycycle 15 - squarenote 9, 213, 49, 6 - squarenote 3, 210, 82, 6 - squarenote 3, 226, 113, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 178, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 113, 6 - squarenote 8, 177, 81, 6 + squarenote 9, 13, 5, 1585 + squarenote 3, 13, 2, 1618 + squarenote 3, 14, 2, 1649 + squarenote 3, 11, 2, 1681 + squarenote 3, 12, 2, 1714 + squarenote 3, 11, 2, 1681 + squarenote 3, 12, 2, 1649 + squarenote 8, 11, 1, 1617 endchannel SFX_Cry18_1_Ch7: - noisenote 6, 227, 76 - noisenote 4, 195, 60 - noisenote 5, 212, 60 - noisenote 4, 196, 44 - noisenote 6, 180, 60 - noisenote 8, 193, 44 + noisenote 6, 14, 3, 76 + noisenote 4, 12, 3, 60 + noisenote 5, 13, 4, 60 + noisenote 4, 12, 4, 44 + noisenote 6, 11, 4, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 5d44d5c0..39f85b8f 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,34 +1,34 @@ SFX_Cry18_2_Ch4: dutycycle 80 - squarenote 10, 245, 128, 6 - squarenote 3, 226, 160, 6 - squarenote 3, 242, 192, 6 - squarenote 3, 226, 224, 6 - squarenote 3, 210, 0, 7 - squarenote 3, 194, 224, 6 - squarenote 3, 210, 192, 6 - squarenote 8, 193, 160, 6 + squarenote 10, 15, 5, 1664 + squarenote 3, 14, 2, 1696 + squarenote 3, 15, 2, 1728 + squarenote 3, 14, 2, 1760 + squarenote 3, 13, 2, 1792 + squarenote 3, 12, 2, 1760 + squarenote 3, 13, 2, 1728 + squarenote 8, 12, 1, 1696 endchannel SFX_Cry18_2_Ch5: dutycycle 15 - squarenote 9, 213, 49, 6 - squarenote 3, 210, 82, 6 - squarenote 3, 226, 113, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 178, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 113, 6 - squarenote 8, 177, 81, 6 + squarenote 9, 13, 5, 1585 + squarenote 3, 13, 2, 1618 + squarenote 3, 14, 2, 1649 + squarenote 3, 11, 2, 1681 + squarenote 3, 12, 2, 1714 + squarenote 3, 11, 2, 1681 + squarenote 3, 12, 2, 1649 + squarenote 8, 11, 1, 1617 endchannel SFX_Cry18_2_Ch7: - noisenote 6, 227, 76 - noisenote 4, 195, 60 - noisenote 5, 212, 60 - noisenote 4, 196, 44 - noisenote 6, 180, 60 - noisenote 8, 193, 44 + noisenote 6, 14, 3, 76 + noisenote 4, 12, 3, 60 + noisenote 5, 13, 4, 60 + noisenote 4, 12, 4, 44 + noisenote 6, 11, 4, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index edd0eda4..4bcf5b6d 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,34 +1,34 @@ SFX_Cry18_3_Ch4: dutycycle 80 - squarenote 10, 245, 128, 6 - squarenote 3, 226, 160, 6 - squarenote 3, 242, 192, 6 - squarenote 3, 226, 224, 6 - squarenote 3, 210, 0, 7 - squarenote 3, 194, 224, 6 - squarenote 3, 210, 192, 6 - squarenote 8, 193, 160, 6 + squarenote 10, 15, 5, 1664 + squarenote 3, 14, 2, 1696 + squarenote 3, 15, 2, 1728 + squarenote 3, 14, 2, 1760 + squarenote 3, 13, 2, 1792 + squarenote 3, 12, 2, 1760 + squarenote 3, 13, 2, 1728 + squarenote 8, 12, 1, 1696 endchannel SFX_Cry18_3_Ch5: dutycycle 15 - squarenote 9, 213, 49, 6 - squarenote 3, 210, 82, 6 - squarenote 3, 226, 113, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 178, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 113, 6 - squarenote 8, 177, 81, 6 + squarenote 9, 13, 5, 1585 + squarenote 3, 13, 2, 1618 + squarenote 3, 14, 2, 1649 + squarenote 3, 11, 2, 1681 + squarenote 3, 12, 2, 1714 + squarenote 3, 11, 2, 1681 + squarenote 3, 12, 2, 1649 + squarenote 8, 11, 1, 1617 endchannel SFX_Cry18_3_Ch7: - noisenote 6, 227, 76 - noisenote 4, 195, 60 - noisenote 5, 212, 60 - noisenote 4, 196, 44 - noisenote 6, 180, 60 - noisenote 8, 193, 44 + noisenote 6, 14, 3, 76 + noisenote 4, 12, 3, 60 + noisenote 5, 13, 4, 60 + noisenote 4, 12, 4, 44 + noisenote 6, 11, 4, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index badcd4f9..d0435941 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,17 +1,17 @@ SFX_Cry19_1_Ch4: dutycycle 27 - squarenote 7, 210, 64, 7 - squarenote 15, 229, 96, 7 - squarenote 15, 193, 48, 7 + squarenote 7, 13, 2, 1856 + squarenote 15, 14, 5, 1888 + squarenote 15, 12, 1, 1840 endchannel SFX_Cry19_1_Ch5: dutycycle 129 - squarenote 2, 194, 1, 7 - squarenote 4, 194, 8, 7 - squarenote 15, 215, 65, 7 - squarenote 15, 162, 1, 7 + squarenote 2, 12, 2, 1793 + squarenote 4, 12, 2, 1800 + squarenote 15, 13, 7, 1857 + squarenote 15, 10, 2, 1793 SFX_Cry19_1_Ch7: diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index baba2a1f..b088c0de 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,17 +1,17 @@ SFX_Cry19_2_Ch4: dutycycle 27 - squarenote 7, 210, 64, 7 - squarenote 15, 229, 96, 7 - squarenote 15, 193, 48, 7 + squarenote 7, 13, 2, 1856 + squarenote 15, 14, 5, 1888 + squarenote 15, 12, 1, 1840 endchannel SFX_Cry19_2_Ch5: dutycycle 129 - squarenote 2, 194, 1, 7 - squarenote 4, 194, 8, 7 - squarenote 15, 215, 65, 7 - squarenote 15, 162, 1, 7 + squarenote 2, 12, 2, 1793 + squarenote 4, 12, 2, 1800 + squarenote 15, 13, 7, 1857 + squarenote 15, 10, 2, 1793 SFX_Cry19_2_Ch7: diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index c2ef3f66..e42489c4 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,17 +1,17 @@ SFX_Cry19_3_Ch4: dutycycle 27 - squarenote 7, 210, 64, 7 - squarenote 15, 229, 96, 7 - squarenote 15, 193, 48, 7 + squarenote 7, 13, 2, 1856 + squarenote 15, 14, 5, 1888 + squarenote 15, 12, 1, 1840 endchannel SFX_Cry19_3_Ch5: dutycycle 129 - squarenote 2, 194, 1, 7 - squarenote 4, 194, 8, 7 - squarenote 15, 215, 65, 7 - squarenote 15, 162, 1, 7 + squarenote 2, 12, 2, 1793 + squarenote 4, 12, 2, 1800 + squarenote 15, 13, 7, 1857 + squarenote 15, 10, 2, 1793 SFX_Cry19_3_Ch7: diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index db8dee74..8bbf8288 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,30 +1,30 @@ SFX_Cry1A_1_Ch4: dutycycle 240 - squarenote 6, 247, 64, 7 - squarenote 12, 230, 68, 7 - squarenote 6, 213, 80, 7 - squarenote 4, 195, 96, 7 - squarenote 3, 195, 128, 7 - squarenote 8, 209, 160, 7 + squarenote 6, 15, 7, 1856 + squarenote 12, 14, 6, 1860 + squarenote 6, 13, 5, 1872 + squarenote 4, 12, 3, 1888 + squarenote 3, 12, 3, 1920 + squarenote 8, 13, 1, 1952 endchannel SFX_Cry1A_1_Ch5: dutycycle 10 - squarenote 6, 199, 1, 7 - squarenote 11, 182, 2, 7 - squarenote 6, 165, 17, 7 - squarenote 4, 147, 33, 7 - squarenote 3, 163, 65, 7 - squarenote 8, 145, 98, 7 + squarenote 6, 12, 7, 1793 + squarenote 11, 11, 6, 1794 + squarenote 6, 10, 5, 1809 + squarenote 4, 9, 3, 1825 + squarenote 3, 10, 3, 1857 + squarenote 8, 9, 1, 1890 endchannel SFX_Cry1A_1_Ch7: - noisenote 3, 226, 60 - noisenote 8, 214, 76 - noisenote 5, 212, 60 - noisenote 12, 199, 76 - noisenote 2, 226, 60 - noisenote 8, 209, 44 + noisenote 3, 14, 2, 60 + noisenote 8, 13, 6, 76 + noisenote 5, 13, 4, 60 + noisenote 12, 12, 7, 76 + noisenote 2, 14, 2, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index 6b2a3a9f..b6ed820b 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,30 +1,30 @@ SFX_Cry1A_2_Ch4: dutycycle 240 - squarenote 6, 247, 64, 7 - squarenote 12, 230, 68, 7 - squarenote 6, 213, 80, 7 - squarenote 4, 195, 96, 7 - squarenote 3, 195, 128, 7 - squarenote 8, 209, 160, 7 + squarenote 6, 15, 7, 1856 + squarenote 12, 14, 6, 1860 + squarenote 6, 13, 5, 1872 + squarenote 4, 12, 3, 1888 + squarenote 3, 12, 3, 1920 + squarenote 8, 13, 1, 1952 endchannel SFX_Cry1A_2_Ch5: dutycycle 10 - squarenote 6, 199, 1, 7 - squarenote 11, 182, 2, 7 - squarenote 6, 165, 17, 7 - squarenote 4, 147, 33, 7 - squarenote 3, 163, 65, 7 - squarenote 8, 145, 98, 7 + squarenote 6, 12, 7, 1793 + squarenote 11, 11, 6, 1794 + squarenote 6, 10, 5, 1809 + squarenote 4, 9, 3, 1825 + squarenote 3, 10, 3, 1857 + squarenote 8, 9, 1, 1890 endchannel SFX_Cry1A_2_Ch7: - noisenote 3, 226, 60 - noisenote 8, 214, 76 - noisenote 5, 212, 60 - noisenote 12, 199, 76 - noisenote 2, 226, 60 - noisenote 8, 209, 44 + noisenote 3, 14, 2, 60 + noisenote 8, 13, 6, 76 + noisenote 5, 13, 4, 60 + noisenote 12, 12, 7, 76 + noisenote 2, 14, 2, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 7ec2f544..aee947cd 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,30 +1,30 @@ SFX_Cry1A_3_Ch4: dutycycle 240 - squarenote 6, 247, 64, 7 - squarenote 12, 230, 68, 7 - squarenote 6, 213, 80, 7 - squarenote 4, 195, 96, 7 - squarenote 3, 195, 128, 7 - squarenote 8, 209, 160, 7 + squarenote 6, 15, 7, 1856 + squarenote 12, 14, 6, 1860 + squarenote 6, 13, 5, 1872 + squarenote 4, 12, 3, 1888 + squarenote 3, 12, 3, 1920 + squarenote 8, 13, 1, 1952 endchannel SFX_Cry1A_3_Ch5: dutycycle 10 - squarenote 6, 199, 1, 7 - squarenote 11, 182, 2, 7 - squarenote 6, 165, 17, 7 - squarenote 4, 147, 33, 7 - squarenote 3, 163, 65, 7 - squarenote 8, 145, 98, 7 + squarenote 6, 12, 7, 1793 + squarenote 11, 11, 6, 1794 + squarenote 6, 10, 5, 1809 + squarenote 4, 9, 3, 1825 + squarenote 3, 10, 3, 1857 + squarenote 8, 9, 1, 1890 endchannel SFX_Cry1A_3_Ch7: - noisenote 3, 226, 60 - noisenote 8, 214, 76 - noisenote 5, 212, 60 - noisenote 12, 199, 76 - noisenote 2, 226, 60 - noisenote 8, 209, 44 + noisenote 3, 14, 2, 60 + noisenote 8, 13, 6, 76 + noisenote 5, 13, 4, 60 + noisenote 12, 12, 7, 76 + noisenote 2, 14, 2, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 7eb1a301..86f3d421 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,26 +1,26 @@ SFX_Cry1B_1_Ch4: dutycycle 240 - squarenote 6, 247, 192, 6 - squarenote 15, 231, 0, 7 - squarenote 4, 244, 240, 6 - squarenote 4, 228, 224, 6 - squarenote 8, 209, 208, 6 + squarenote 6, 15, 7, 1728 + squarenote 15, 14, 7, 1792 + squarenote 4, 15, 4, 1776 + squarenote 4, 14, 4, 1760 + squarenote 8, 13, 1, 1744 endchannel SFX_Cry1B_1_Ch5: dutycycle 10 - squarenote 7, 230, 129, 6 - squarenote 14, 213, 193, 6 - squarenote 4, 196, 177, 6 - squarenote 4, 212, 161, 6 - squarenote 8, 193, 145, 6 + squarenote 7, 14, 6, 1665 + squarenote 14, 13, 5, 1729 + squarenote 4, 12, 4, 1713 + squarenote 4, 13, 4, 1697 + squarenote 8, 12, 1, 1681 endchannel SFX_Cry1B_1_Ch7: - noisenote 10, 166, 60 - noisenote 14, 148, 44 - noisenote 5, 163, 60 - noisenote 8, 145, 44 + noisenote 10, 10, 6, 60 + noisenote 14, 9, 4, 44 + noisenote 5, 10, 3, 60 + noisenote 8, 9, 1, 44 endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index c3ff4c8e..1faaf5bb 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,26 +1,26 @@ SFX_Cry1B_2_Ch4: dutycycle 240 - squarenote 6, 247, 192, 6 - squarenote 15, 231, 0, 7 - squarenote 4, 244, 240, 6 - squarenote 4, 228, 224, 6 - squarenote 8, 209, 208, 6 + squarenote 6, 15, 7, 1728 + squarenote 15, 14, 7, 1792 + squarenote 4, 15, 4, 1776 + squarenote 4, 14, 4, 1760 + squarenote 8, 13, 1, 1744 endchannel SFX_Cry1B_2_Ch5: dutycycle 10 - squarenote 7, 230, 129, 6 - squarenote 14, 213, 193, 6 - squarenote 4, 196, 177, 6 - squarenote 4, 212, 161, 6 - squarenote 8, 193, 145, 6 + squarenote 7, 14, 6, 1665 + squarenote 14, 13, 5, 1729 + squarenote 4, 12, 4, 1713 + squarenote 4, 13, 4, 1697 + squarenote 8, 12, 1, 1681 endchannel SFX_Cry1B_2_Ch7: - noisenote 10, 166, 60 - noisenote 14, 148, 44 - noisenote 5, 163, 60 - noisenote 8, 145, 44 + noisenote 10, 10, 6, 60 + noisenote 14, 9, 4, 44 + noisenote 5, 10, 3, 60 + noisenote 8, 9, 1, 44 endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index eb1cc9df..09196c26 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,26 +1,26 @@ SFX_Cry1B_3_Ch4: dutycycle 240 - squarenote 6, 247, 192, 6 - squarenote 15, 231, 0, 7 - squarenote 4, 244, 240, 6 - squarenote 4, 228, 224, 6 - squarenote 8, 209, 208, 6 + squarenote 6, 15, 7, 1728 + squarenote 15, 14, 7, 1792 + squarenote 4, 15, 4, 1776 + squarenote 4, 14, 4, 1760 + squarenote 8, 13, 1, 1744 endchannel SFX_Cry1B_3_Ch5: dutycycle 10 - squarenote 7, 230, 129, 6 - squarenote 14, 213, 193, 6 - squarenote 4, 196, 177, 6 - squarenote 4, 212, 161, 6 - squarenote 8, 193, 145, 6 + squarenote 7, 14, 6, 1665 + squarenote 14, 13, 5, 1729 + squarenote 4, 12, 4, 1713 + squarenote 4, 13, 4, 1697 + squarenote 8, 12, 1, 1681 endchannel SFX_Cry1B_3_Ch7: - noisenote 10, 166, 60 - noisenote 14, 148, 44 - noisenote 5, 163, 60 - noisenote 8, 145, 44 + noisenote 10, 10, 6, 60 + noisenote 14, 9, 4, 44 + noisenote 5, 10, 3, 60 + noisenote 8, 9, 1, 44 endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 66c9e397..2fd4f7b2 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,31 +1,31 @@ SFX_Cry1C_1_Ch4: dutycycle 245 - squarenote 7, 214, 225, 7 - squarenote 6, 198, 226, 7 - squarenote 9, 214, 225, 7 - squarenote 7, 198, 224, 7 - squarenote 5, 182, 226, 7 - squarenote 7, 198, 225, 7 - squarenote 6, 182, 224, 7 - squarenote 8, 161, 223, 7 + squarenote 7, 13, 6, 2017 + squarenote 6, 12, 6, 2018 + squarenote 9, 13, 6, 2017 + squarenote 7, 12, 6, 2016 + squarenote 5, 11, 6, 2018 + squarenote 7, 12, 6, 2017 + squarenote 6, 11, 6, 2016 + squarenote 8, 10, 1, 2015 endchannel SFX_Cry1C_1_Ch5: dutycycle 68 - squarenote 6, 195, 201, 7 - squarenote 6, 179, 199, 7 - squarenote 10, 196, 195, 7 - squarenote 8, 180, 199, 7 - squarenote 6, 195, 201, 7 - squarenote 15, 162, 197, 7 + squarenote 6, 12, 3, 1993 + squarenote 6, 11, 3, 1991 + squarenote 10, 12, 4, 1987 + squarenote 8, 11, 4, 1991 + squarenote 6, 12, 3, 1993 + squarenote 15, 10, 2, 1989 endchannel SFX_Cry1C_1_Ch7: - noisenote 13, 25, 124 - noisenote 13, 247, 140 - noisenote 12, 214, 124 - noisenote 8, 196, 108 - noisenote 15, 179, 92 + noisenote 13, 1, -1, 124 + noisenote 13, 15, 7, 140 + noisenote 12, 13, 6, 124 + noisenote 8, 12, 4, 108 + noisenote 15, 11, 3, 92 endchannel diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 12096df3..69a08eef 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,31 +1,31 @@ SFX_Cry1C_2_Ch4: dutycycle 245 - squarenote 7, 214, 225, 7 - squarenote 6, 198, 226, 7 - squarenote 9, 214, 225, 7 - squarenote 7, 198, 224, 7 - squarenote 5, 182, 226, 7 - squarenote 7, 198, 225, 7 - squarenote 6, 182, 224, 7 - squarenote 8, 161, 223, 7 + squarenote 7, 13, 6, 2017 + squarenote 6, 12, 6, 2018 + squarenote 9, 13, 6, 2017 + squarenote 7, 12, 6, 2016 + squarenote 5, 11, 6, 2018 + squarenote 7, 12, 6, 2017 + squarenote 6, 11, 6, 2016 + squarenote 8, 10, 1, 2015 endchannel SFX_Cry1C_2_Ch5: dutycycle 68 - squarenote 6, 195, 201, 7 - squarenote 6, 179, 199, 7 - squarenote 10, 196, 195, 7 - squarenote 8, 180, 199, 7 - squarenote 6, 195, 201, 7 - squarenote 15, 162, 197, 7 + squarenote 6, 12, 3, 1993 + squarenote 6, 11, 3, 1991 + squarenote 10, 12, 4, 1987 + squarenote 8, 11, 4, 1991 + squarenote 6, 12, 3, 1993 + squarenote 15, 10, 2, 1989 endchannel SFX_Cry1C_2_Ch7: - noisenote 13, 25, 124 - noisenote 13, 247, 140 - noisenote 12, 214, 124 - noisenote 8, 196, 108 - noisenote 15, 179, 92 + noisenote 13, 1, -1, 124 + noisenote 13, 15, 7, 140 + noisenote 12, 13, 6, 124 + noisenote 8, 12, 4, 108 + noisenote 15, 11, 3, 92 endchannel diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index b126abb0..59f69402 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,31 +1,31 @@ SFX_Cry1C_3_Ch4: dutycycle 245 - squarenote 7, 214, 225, 7 - squarenote 6, 198, 226, 7 - squarenote 9, 214, 225, 7 - squarenote 7, 198, 224, 7 - squarenote 5, 182, 226, 7 - squarenote 7, 198, 225, 7 - squarenote 6, 182, 224, 7 - squarenote 8, 161, 223, 7 + squarenote 7, 13, 6, 2017 + squarenote 6, 12, 6, 2018 + squarenote 9, 13, 6, 2017 + squarenote 7, 12, 6, 2016 + squarenote 5, 11, 6, 2018 + squarenote 7, 12, 6, 2017 + squarenote 6, 11, 6, 2016 + squarenote 8, 10, 1, 2015 endchannel SFX_Cry1C_3_Ch5: dutycycle 68 - squarenote 6, 195, 201, 7 - squarenote 6, 179, 199, 7 - squarenote 10, 196, 195, 7 - squarenote 8, 180, 199, 7 - squarenote 6, 195, 201, 7 - squarenote 15, 162, 197, 7 + squarenote 6, 12, 3, 1993 + squarenote 6, 11, 3, 1991 + squarenote 10, 12, 4, 1987 + squarenote 8, 11, 4, 1991 + squarenote 6, 12, 3, 1993 + squarenote 15, 10, 2, 1989 endchannel SFX_Cry1C_3_Ch7: - noisenote 13, 25, 124 - noisenote 13, 247, 140 - noisenote 12, 214, 124 - noisenote 8, 196, 108 - noisenote 15, 179, 92 + noisenote 13, 1, -1, 124 + noisenote 13, 15, 7, 140 + noisenote 12, 13, 6, 124 + noisenote 8, 12, 4, 108 + noisenote 15, 11, 3, 92 endchannel diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 056ed408..4cef3bf0 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,29 +1,29 @@ SFX_Cry1D_1_Ch4: dutycycle 244 - squarenote 15, 240, 5, 7 - squarenote 10, 224, 0, 7 - squarenote 6, 180, 16, 7 - squarenote 4, 211, 0, 7 - squarenote 6, 178, 32, 6 - squarenote 8, 161, 36, 6 + squarenote 15, 15, 0, 1797 + squarenote 10, 14, 0, 1792 + squarenote 6, 11, 4, 1808 + squarenote 4, 13, 3, 1792 + squarenote 6, 11, 2, 1568 + squarenote 8, 10, 1, 1572 endchannel SFX_Cry1D_1_Ch5: dutycycle 34 - squarenote 15, 176, 195, 6 - squarenote 10, 160, 193, 6 - squarenote 6, 132, 210, 6 - squarenote 4, 147, 193, 6 - squarenote 6, 130, 225, 5 - squarenote 8, 97, 232, 5 + squarenote 15, 11, 0, 1731 + squarenote 10, 10, 0, 1729 + squarenote 6, 8, 4, 1746 + squarenote 4, 9, 3, 1729 + squarenote 6, 8, 2, 1505 + squarenote 8, 6, 1, 1512 endchannel SFX_Cry1D_1_Ch7: - noisenote 6, 230, 76 - noisenote 15, 214, 60 - noisenote 10, 197, 74 - noisenote 1, 178, 91 - noisenote 15, 194, 76 + noisenote 6, 14, 6, 76 + noisenote 15, 13, 6, 60 + noisenote 10, 12, 5, 74 + noisenote 1, 11, 2, 91 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index bfce7c66..874be61e 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,29 +1,29 @@ SFX_Cry1D_2_Ch4: dutycycle 244 - squarenote 15, 240, 5, 7 - squarenote 10, 224, 0, 7 - squarenote 6, 180, 16, 7 - squarenote 4, 211, 0, 7 - squarenote 6, 178, 32, 6 - squarenote 8, 161, 36, 6 + squarenote 15, 15, 0, 1797 + squarenote 10, 14, 0, 1792 + squarenote 6, 11, 4, 1808 + squarenote 4, 13, 3, 1792 + squarenote 6, 11, 2, 1568 + squarenote 8, 10, 1, 1572 endchannel SFX_Cry1D_2_Ch5: dutycycle 34 - squarenote 15, 176, 195, 6 - squarenote 10, 160, 193, 6 - squarenote 6, 132, 210, 6 - squarenote 4, 147, 193, 6 - squarenote 6, 130, 225, 5 - squarenote 8, 97, 232, 5 + squarenote 15, 11, 0, 1731 + squarenote 10, 10, 0, 1729 + squarenote 6, 8, 4, 1746 + squarenote 4, 9, 3, 1729 + squarenote 6, 8, 2, 1505 + squarenote 8, 6, 1, 1512 endchannel SFX_Cry1D_2_Ch7: - noisenote 6, 230, 76 - noisenote 15, 214, 60 - noisenote 10, 197, 74 - noisenote 1, 178, 91 - noisenote 15, 194, 76 + noisenote 6, 14, 6, 76 + noisenote 15, 13, 6, 60 + noisenote 10, 12, 5, 74 + noisenote 1, 11, 2, 91 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 8b05e3cb..991e44bb 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,29 +1,29 @@ SFX_Cry1D_3_Ch4: dutycycle 244 - squarenote 15, 240, 5, 7 - squarenote 10, 224, 0, 7 - squarenote 6, 180, 16, 7 - squarenote 4, 211, 0, 7 - squarenote 6, 178, 32, 6 - squarenote 8, 161, 36, 6 + squarenote 15, 15, 0, 1797 + squarenote 10, 14, 0, 1792 + squarenote 6, 11, 4, 1808 + squarenote 4, 13, 3, 1792 + squarenote 6, 11, 2, 1568 + squarenote 8, 10, 1, 1572 endchannel SFX_Cry1D_3_Ch5: dutycycle 34 - squarenote 15, 176, 195, 6 - squarenote 10, 160, 193, 6 - squarenote 6, 132, 210, 6 - squarenote 4, 147, 193, 6 - squarenote 6, 130, 225, 5 - squarenote 8, 97, 232, 5 + squarenote 15, 11, 0, 1731 + squarenote 10, 10, 0, 1729 + squarenote 6, 8, 4, 1746 + squarenote 4, 9, 3, 1729 + squarenote 6, 8, 2, 1505 + squarenote 8, 6, 1, 1512 endchannel SFX_Cry1D_3_Ch7: - noisenote 6, 230, 76 - noisenote 15, 214, 60 - noisenote 10, 197, 74 - noisenote 1, 178, 91 - noisenote 15, 194, 76 + noisenote 6, 14, 6, 76 + noisenote 15, 13, 6, 60 + noisenote 10, 12, 5, 74 + noisenote 1, 11, 2, 91 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index d6bf2450..b028e616 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,38 +1,38 @@ SFX_Cry1E_1_Ch4: dutycycle 240 - squarenote 6, 242, 0, 6 - squarenote 6, 226, 64, 6 - squarenote 6, 210, 128, 6 - squarenote 6, 226, 192, 6 - squarenote 6, 210, 0, 7 - squarenote 6, 194, 64, 7 - squarenote 6, 178, 128, 7 - squarenote 8, 161, 192, 7 + squarenote 6, 15, 2, 1536 + squarenote 6, 14, 2, 1600 + squarenote 6, 13, 2, 1664 + squarenote 6, 14, 2, 1728 + squarenote 6, 13, 2, 1792 + squarenote 6, 12, 2, 1856 + squarenote 6, 11, 2, 1920 + squarenote 8, 10, 1, 1984 endchannel SFX_Cry1E_1_Ch5: dutycycle 17 - squarenote 3, 8, 1, 0 - squarenote 6, 194, 193, 5 - squarenote 6, 178, 2, 6 - squarenote 6, 162, 65, 6 - squarenote 6, 178, 130, 6 - squarenote 6, 162, 194, 6 - squarenote 6, 146, 1, 7 - squarenote 6, 162, 66, 7 - squarenote 8, 129, 129, 7 + squarenote 3, 0, 8, 1 + squarenote 6, 12, 2, 1473 + squarenote 6, 11, 2, 1538 + squarenote 6, 10, 2, 1601 + squarenote 6, 11, 2, 1666 + squarenote 6, 10, 2, 1730 + squarenote 6, 9, 2, 1793 + squarenote 6, 10, 2, 1858 + squarenote 8, 8, 1, 1921 endchannel SFX_Cry1E_1_Ch7: - noisenote 6, 8, 1 - noisenote 5, 226, 92 - noisenote 5, 194, 76 - noisenote 5, 210, 60 - noisenote 5, 178, 44 - noisenote 5, 194, 28 - noisenote 5, 162, 27 - noisenote 5, 146, 26 - noisenote 8, 129, 24 + noisenote 6, 0, 8, 1 + noisenote 5, 14, 2, 92 + noisenote 5, 12, 2, 76 + noisenote 5, 13, 2, 60 + noisenote 5, 11, 2, 44 + noisenote 5, 12, 2, 28 + noisenote 5, 10, 2, 27 + noisenote 5, 9, 2, 26 + noisenote 8, 8, 1, 24 endchannel diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index c9f7a2ed..783ee324 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,38 +1,38 @@ SFX_Cry1E_2_Ch4: dutycycle 240 - squarenote 6, 242, 0, 6 - squarenote 6, 226, 64, 6 - squarenote 6, 210, 128, 6 - squarenote 6, 226, 192, 6 - squarenote 6, 210, 0, 7 - squarenote 6, 194, 64, 7 - squarenote 6, 178, 128, 7 - squarenote 8, 161, 192, 7 + squarenote 6, 15, 2, 1536 + squarenote 6, 14, 2, 1600 + squarenote 6, 13, 2, 1664 + squarenote 6, 14, 2, 1728 + squarenote 6, 13, 2, 1792 + squarenote 6, 12, 2, 1856 + squarenote 6, 11, 2, 1920 + squarenote 8, 10, 1, 1984 endchannel SFX_Cry1E_2_Ch5: dutycycle 17 - squarenote 3, 8, 1, 0 - squarenote 6, 194, 193, 5 - squarenote 6, 178, 2, 6 - squarenote 6, 162, 65, 6 - squarenote 6, 178, 130, 6 - squarenote 6, 162, 194, 6 - squarenote 6, 146, 1, 7 - squarenote 6, 162, 66, 7 - squarenote 8, 129, 129, 7 + squarenote 3, 0, 8, 1 + squarenote 6, 12, 2, 1473 + squarenote 6, 11, 2, 1538 + squarenote 6, 10, 2, 1601 + squarenote 6, 11, 2, 1666 + squarenote 6, 10, 2, 1730 + squarenote 6, 9, 2, 1793 + squarenote 6, 10, 2, 1858 + squarenote 8, 8, 1, 1921 endchannel SFX_Cry1E_2_Ch7: - noisenote 6, 8, 1 - noisenote 5, 226, 92 - noisenote 5, 194, 76 - noisenote 5, 210, 60 - noisenote 5, 178, 44 - noisenote 5, 194, 28 - noisenote 5, 162, 27 - noisenote 5, 146, 26 - noisenote 8, 129, 24 + noisenote 6, 0, 8, 1 + noisenote 5, 14, 2, 92 + noisenote 5, 12, 2, 76 + noisenote 5, 13, 2, 60 + noisenote 5, 11, 2, 44 + noisenote 5, 12, 2, 28 + noisenote 5, 10, 2, 27 + noisenote 5, 9, 2, 26 + noisenote 8, 8, 1, 24 endchannel diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index d54c72c9..f78e6d0a 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,38 +1,38 @@ SFX_Cry1E_3_Ch4: dutycycle 240 - squarenote 6, 242, 0, 6 - squarenote 6, 226, 64, 6 - squarenote 6, 210, 128, 6 - squarenote 6, 226, 192, 6 - squarenote 6, 210, 0, 7 - squarenote 6, 194, 64, 7 - squarenote 6, 178, 128, 7 - squarenote 8, 161, 192, 7 + squarenote 6, 15, 2, 1536 + squarenote 6, 14, 2, 1600 + squarenote 6, 13, 2, 1664 + squarenote 6, 14, 2, 1728 + squarenote 6, 13, 2, 1792 + squarenote 6, 12, 2, 1856 + squarenote 6, 11, 2, 1920 + squarenote 8, 10, 1, 1984 endchannel SFX_Cry1E_3_Ch5: dutycycle 17 - squarenote 3, 8, 1, 0 - squarenote 6, 194, 193, 5 - squarenote 6, 178, 2, 6 - squarenote 6, 162, 65, 6 - squarenote 6, 178, 130, 6 - squarenote 6, 162, 194, 6 - squarenote 6, 146, 1, 7 - squarenote 6, 162, 66, 7 - squarenote 8, 129, 129, 7 + squarenote 3, 0, 8, 1 + squarenote 6, 12, 2, 1473 + squarenote 6, 11, 2, 1538 + squarenote 6, 10, 2, 1601 + squarenote 6, 11, 2, 1666 + squarenote 6, 10, 2, 1730 + squarenote 6, 9, 2, 1793 + squarenote 6, 10, 2, 1858 + squarenote 8, 8, 1, 1921 endchannel SFX_Cry1E_3_Ch7: - noisenote 6, 8, 1 - noisenote 5, 226, 92 - noisenote 5, 194, 76 - noisenote 5, 210, 60 - noisenote 5, 178, 44 - noisenote 5, 194, 28 - noisenote 5, 162, 27 - noisenote 5, 146, 26 - noisenote 8, 129, 24 + noisenote 6, 0, 8, 1 + noisenote 5, 14, 2, 92 + noisenote 5, 12, 2, 76 + noisenote 5, 13, 2, 60 + noisenote 5, 11, 2, 44 + noisenote 5, 12, 2, 28 + noisenote 5, 10, 2, 27 + noisenote 5, 9, 2, 26 + noisenote 8, 8, 1, 24 endchannel diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index a636c051..f4596492 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,24 +1,24 @@ SFX_Cry1F_1_Ch4: dutycycle 165 - squarenote 3, 244, 65, 6 - squarenote 13, 214, 33, 7 - squarenote 8, 244, 25, 7 - squarenote 8, 193, 26, 7 + squarenote 3, 15, 4, 1601 + squarenote 13, 13, 6, 1825 + squarenote 8, 15, 4, 1817 + squarenote 8, 12, 1, 1818 endchannel SFX_Cry1F_1_Ch5: dutycycle 204 - squarenote 4, 244, 128, 5 - squarenote 14, 230, 224, 6 - squarenote 8, 213, 216, 6 - squarenote 8, 209, 220, 6 + squarenote 4, 15, 4, 1408 + squarenote 14, 14, 6, 1760 + squarenote 8, 13, 5, 1752 + squarenote 8, 13, 1, 1756 endchannel SFX_Cry1F_1_Ch7: - noisenote 5, 196, 70 - noisenote 13, 165, 68 - noisenote 8, 196, 69 - noisenote 8, 177, 68 + noisenote 5, 12, 4, 70 + noisenote 13, 10, 5, 68 + noisenote 8, 12, 4, 69 + noisenote 8, 11, 1, 68 endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index efda76fa..dc46f49a 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,24 +1,24 @@ SFX_Cry1F_2_Ch4: dutycycle 165 - squarenote 3, 244, 65, 6 - squarenote 13, 214, 33, 7 - squarenote 8, 244, 25, 7 - squarenote 8, 193, 26, 7 + squarenote 3, 15, 4, 1601 + squarenote 13, 13, 6, 1825 + squarenote 8, 15, 4, 1817 + squarenote 8, 12, 1, 1818 endchannel SFX_Cry1F_2_Ch5: dutycycle 204 - squarenote 4, 244, 128, 5 - squarenote 14, 230, 224, 6 - squarenote 8, 213, 216, 6 - squarenote 8, 209, 220, 6 + squarenote 4, 15, 4, 1408 + squarenote 14, 14, 6, 1760 + squarenote 8, 13, 5, 1752 + squarenote 8, 13, 1, 1756 endchannel SFX_Cry1F_2_Ch7: - noisenote 5, 196, 70 - noisenote 13, 165, 68 - noisenote 8, 196, 69 - noisenote 8, 177, 68 + noisenote 5, 12, 4, 70 + noisenote 13, 10, 5, 68 + noisenote 8, 12, 4, 69 + noisenote 8, 11, 1, 68 endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index ea2403a5..41c3b766 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,24 +1,24 @@ SFX_Cry1F_3_Ch4: dutycycle 165 - squarenote 3, 244, 65, 6 - squarenote 13, 214, 33, 7 - squarenote 8, 244, 25, 7 - squarenote 8, 193, 26, 7 + squarenote 3, 15, 4, 1601 + squarenote 13, 13, 6, 1825 + squarenote 8, 15, 4, 1817 + squarenote 8, 12, 1, 1818 endchannel SFX_Cry1F_3_Ch5: dutycycle 204 - squarenote 4, 244, 128, 5 - squarenote 14, 230, 224, 6 - squarenote 8, 213, 216, 6 - squarenote 8, 209, 220, 6 + squarenote 4, 15, 4, 1408 + squarenote 14, 14, 6, 1760 + squarenote 8, 13, 5, 1752 + squarenote 8, 13, 1, 1756 endchannel SFX_Cry1F_3_Ch7: - noisenote 5, 196, 70 - noisenote 13, 165, 68 - noisenote 8, 196, 69 - noisenote 8, 177, 68 + noisenote 5, 12, 4, 70 + noisenote 13, 10, 5, 68 + noisenote 8, 12, 4, 69 + noisenote 8, 11, 1, 68 endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 2ba98882..cd0b85ec 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,24 +1,24 @@ SFX_Cry20_1_Ch4: dutycycle 240 - squarenote 13, 241, 17, 5 - squarenote 13, 225, 21, 5 - squarenote 13, 225, 17, 5 - squarenote 8, 209, 17, 5 + squarenote 13, 15, 1, 1297 + squarenote 13, 14, 1, 1301 + squarenote 13, 14, 1, 1297 + squarenote 8, 13, 1, 1297 endchannel SFX_Cry20_1_Ch5: dutycycle 21 - squarenote 12, 225, 12, 5 - squarenote 12, 209, 16, 5 - squarenote 14, 193, 12, 5 - squarenote 8, 193, 10, 5 + squarenote 12, 14, 1, 1292 + squarenote 12, 13, 1, 1296 + squarenote 14, 12, 1, 1292 + squarenote 8, 12, 1, 1290 endchannel SFX_Cry20_1_Ch7: - noisenote 14, 242, 101 - noisenote 13, 226, 85 - noisenote 14, 210, 86 - noisenote 8, 209, 102 + noisenote 14, 15, 2, 101 + noisenote 13, 14, 2, 85 + noisenote 14, 13, 2, 86 + noisenote 8, 13, 1, 102 endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index ae3ae4de..7bd21c47 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,24 +1,24 @@ SFX_Cry20_2_Ch4: dutycycle 240 - squarenote 13, 241, 17, 5 - squarenote 13, 225, 21, 5 - squarenote 13, 225, 17, 5 - squarenote 8, 209, 17, 5 + squarenote 13, 15, 1, 1297 + squarenote 13, 14, 1, 1301 + squarenote 13, 14, 1, 1297 + squarenote 8, 13, 1, 1297 endchannel SFX_Cry20_2_Ch5: dutycycle 21 - squarenote 12, 225, 12, 5 - squarenote 12, 209, 16, 5 - squarenote 14, 193, 12, 5 - squarenote 8, 193, 10, 5 + squarenote 12, 14, 1, 1292 + squarenote 12, 13, 1, 1296 + squarenote 14, 12, 1, 1292 + squarenote 8, 12, 1, 1290 endchannel SFX_Cry20_2_Ch7: - noisenote 14, 242, 101 - noisenote 13, 226, 85 - noisenote 14, 210, 86 - noisenote 8, 209, 102 + noisenote 14, 15, 2, 101 + noisenote 13, 14, 2, 85 + noisenote 14, 13, 2, 86 + noisenote 8, 13, 1, 102 endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 1587a0aa..89013d69 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,24 +1,24 @@ SFX_Cry20_3_Ch4: dutycycle 240 - squarenote 13, 241, 17, 5 - squarenote 13, 225, 21, 5 - squarenote 13, 225, 17, 5 - squarenote 8, 209, 17, 5 + squarenote 13, 15, 1, 1297 + squarenote 13, 14, 1, 1301 + squarenote 13, 14, 1, 1297 + squarenote 8, 13, 1, 1297 endchannel SFX_Cry20_3_Ch5: dutycycle 21 - squarenote 12, 225, 12, 5 - squarenote 12, 209, 16, 5 - squarenote 14, 193, 12, 5 - squarenote 8, 193, 10, 5 + squarenote 12, 14, 1, 1292 + squarenote 12, 13, 1, 1296 + squarenote 14, 12, 1, 1292 + squarenote 8, 12, 1, 1290 endchannel SFX_Cry20_3_Ch7: - noisenote 14, 242, 101 - noisenote 13, 226, 85 - noisenote 14, 210, 86 - noisenote 8, 209, 102 + noisenote 14, 15, 2, 101 + noisenote 13, 14, 2, 85 + noisenote 14, 13, 2, 86 + noisenote 8, 13, 1, 102 endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 0d099839..7cfad5d5 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,26 +1,26 @@ SFX_Cry21_1_Ch4: dutycycle 27 - squarenote 3, 243, 100, 5 - squarenote 2, 226, 68, 5 - squarenote 5, 209, 34, 5 - squarenote 2, 178, 132, 4 - squarenote 8, 209, 162, 4 - squarenote 3, 243, 36, 5 - squarenote 4, 228, 228, 4 - squarenote 8, 209, 2, 5 + squarenote 3, 15, 3, 1380 + squarenote 2, 14, 2, 1348 + squarenote 5, 13, 1, 1314 + squarenote 2, 11, 2, 1156 + squarenote 8, 13, 1, 1186 + squarenote 3, 15, 3, 1316 + squarenote 4, 14, 4, 1252 + squarenote 8, 13, 1, 1282 endchannel SFX_Cry21_1_Ch5: dutycycle 204 - squarenote 3, 211, 96, 5 - squarenote 2, 194, 64, 5 - squarenote 5, 193, 32, 5 - squarenote 2, 146, 128, 4 - squarenote 8, 193, 160, 4 - squarenote 3, 211, 32, 5 - squarenote 3, 196, 224, 4 - squarenote 8, 193, 0, 5 + squarenote 3, 13, 3, 1376 + squarenote 2, 12, 2, 1344 + squarenote 5, 12, 1, 1312 + squarenote 2, 9, 2, 1152 + squarenote 8, 12, 1, 1184 + squarenote 3, 13, 3, 1312 + squarenote 3, 12, 4, 1248 + squarenote 8, 12, 1, 1280 SFX_Cry21_1_Ch7: diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index a4ec20b2..cb4b80d3 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,26 +1,26 @@ SFX_Cry21_2_Ch4: dutycycle 27 - squarenote 3, 243, 100, 5 - squarenote 2, 226, 68, 5 - squarenote 5, 209, 34, 5 - squarenote 2, 178, 132, 4 - squarenote 8, 209, 162, 4 - squarenote 3, 243, 36, 5 - squarenote 4, 228, 228, 4 - squarenote 8, 209, 2, 5 + squarenote 3, 15, 3, 1380 + squarenote 2, 14, 2, 1348 + squarenote 5, 13, 1, 1314 + squarenote 2, 11, 2, 1156 + squarenote 8, 13, 1, 1186 + squarenote 3, 15, 3, 1316 + squarenote 4, 14, 4, 1252 + squarenote 8, 13, 1, 1282 endchannel SFX_Cry21_2_Ch5: dutycycle 204 - squarenote 3, 211, 96, 5 - squarenote 2, 194, 64, 5 - squarenote 5, 193, 32, 5 - squarenote 2, 146, 128, 4 - squarenote 8, 193, 160, 4 - squarenote 3, 211, 32, 5 - squarenote 3, 196, 224, 4 - squarenote 8, 193, 0, 5 + squarenote 3, 13, 3, 1376 + squarenote 2, 12, 2, 1344 + squarenote 5, 12, 1, 1312 + squarenote 2, 9, 2, 1152 + squarenote 8, 12, 1, 1184 + squarenote 3, 13, 3, 1312 + squarenote 3, 12, 4, 1248 + squarenote 8, 12, 1, 1280 SFX_Cry21_2_Ch7: diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 9fa85b11..971a85dc 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,26 +1,26 @@ SFX_Cry21_3_Ch4: dutycycle 27 - squarenote 3, 243, 100, 5 - squarenote 2, 226, 68, 5 - squarenote 5, 209, 34, 5 - squarenote 2, 178, 132, 4 - squarenote 8, 209, 162, 4 - squarenote 3, 243, 36, 5 - squarenote 4, 228, 228, 4 - squarenote 8, 209, 2, 5 + squarenote 3, 15, 3, 1380 + squarenote 2, 14, 2, 1348 + squarenote 5, 13, 1, 1314 + squarenote 2, 11, 2, 1156 + squarenote 8, 13, 1, 1186 + squarenote 3, 15, 3, 1316 + squarenote 4, 14, 4, 1252 + squarenote 8, 13, 1, 1282 endchannel SFX_Cry21_3_Ch5: dutycycle 204 - squarenote 3, 211, 96, 5 - squarenote 2, 194, 64, 5 - squarenote 5, 193, 32, 5 - squarenote 2, 146, 128, 4 - squarenote 8, 193, 160, 4 - squarenote 3, 211, 32, 5 - squarenote 3, 196, 224, 4 - squarenote 8, 193, 0, 5 + squarenote 3, 13, 3, 1376 + squarenote 2, 12, 2, 1344 + squarenote 5, 12, 1, 1312 + squarenote 2, 9, 2, 1152 + squarenote 8, 12, 1, 1184 + squarenote 3, 13, 3, 1312 + squarenote 3, 12, 4, 1248 + squarenote 8, 12, 1, 1280 SFX_Cry21_3_Ch7: diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 71f026b6..77ba4679 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,24 +1,24 @@ SFX_Cry22_1_Ch4: dutycycle 17 - squarenote 2, 61, 129, 3 - squarenote 7, 245, 1, 6 - squarenote 1, 194, 129, 4 - squarenote 8, 145, 129, 3 + squarenote 2, 3, -5, 897 + squarenote 7, 15, 5, 1537 + squarenote 1, 12, 2, 1153 + squarenote 8, 9, 1, 897 endchannel SFX_Cry22_1_Ch5: dutycycle 238 - squarenote 2, 62, 176, 5 - squarenote 7, 213, 93, 7 - squarenote 1, 178, 176, 6 - squarenote 8, 97, 176, 5 + squarenote 2, 3, -6, 1456 + squarenote 7, 13, 5, 1885 + squarenote 1, 11, 2, 1712 + squarenote 8, 6, 1, 1456 endchannel SFX_Cry22_1_Ch7: - noisenote 2, 146, 73 - noisenote 7, 181, 41 - noisenote 1, 162, 57 - noisenote 8, 145, 73 + noisenote 2, 9, 2, 73 + noisenote 7, 11, 5, 41 + noisenote 1, 10, 2, 57 + noisenote 8, 9, 1, 73 endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index e47021e4..05eb17a1 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,24 +1,24 @@ SFX_Cry22_2_Ch4: dutycycle 17 - squarenote 2, 61, 129, 3 - squarenote 7, 245, 1, 6 - squarenote 1, 194, 129, 4 - squarenote 8, 145, 129, 3 + squarenote 2, 3, -5, 897 + squarenote 7, 15, 5, 1537 + squarenote 1, 12, 2, 1153 + squarenote 8, 9, 1, 897 endchannel SFX_Cry22_2_Ch5: dutycycle 238 - squarenote 2, 62, 176, 5 - squarenote 7, 213, 93, 7 - squarenote 1, 178, 176, 6 - squarenote 8, 97, 176, 5 + squarenote 2, 3, -6, 1456 + squarenote 7, 13, 5, 1885 + squarenote 1, 11, 2, 1712 + squarenote 8, 6, 1, 1456 endchannel SFX_Cry22_2_Ch7: - noisenote 2, 146, 73 - noisenote 7, 181, 41 - noisenote 1, 162, 57 - noisenote 8, 145, 73 + noisenote 2, 9, 2, 73 + noisenote 7, 11, 5, 41 + noisenote 1, 10, 2, 57 + noisenote 8, 9, 1, 73 endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 19ee38a5..01cc5b28 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,24 +1,24 @@ SFX_Cry22_3_Ch4: dutycycle 17 - squarenote 2, 61, 129, 3 - squarenote 7, 245, 1, 6 - squarenote 1, 194, 129, 4 - squarenote 8, 145, 129, 3 + squarenote 2, 3, -5, 897 + squarenote 7, 15, 5, 1537 + squarenote 1, 12, 2, 1153 + squarenote 8, 9, 1, 897 endchannel SFX_Cry22_3_Ch5: dutycycle 238 - squarenote 2, 62, 176, 5 - squarenote 7, 213, 93, 7 - squarenote 1, 178, 176, 6 - squarenote 8, 97, 176, 5 + squarenote 2, 3, -6, 1456 + squarenote 7, 13, 5, 1885 + squarenote 1, 11, 2, 1712 + squarenote 8, 6, 1, 1456 endchannel SFX_Cry22_3_Ch7: - noisenote 2, 146, 73 - noisenote 7, 181, 41 - noisenote 1, 162, 57 - noisenote 8, 145, 73 + noisenote 2, 9, 2, 73 + noisenote 7, 11, 5, 41 + noisenote 1, 10, 2, 57 + noisenote 8, 9, 1, 73 endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 87bcf9c5..e87e2b41 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,25 +1,25 @@ SFX_Cry23_1_Ch4: dutycycle 240 - squarenote 15, 247, 192, 7 - squarenote 6, 228, 193, 7 - squarenote 10, 246, 192, 7 - squarenote 4, 211, 194, 7 - squarenote 8, 193, 192, 7 + squarenote 15, 15, 7, 1984 + squarenote 6, 14, 4, 1985 + squarenote 10, 15, 6, 1984 + squarenote 4, 13, 3, 1986 + squarenote 8, 12, 1, 1984 endchannel SFX_Cry23_1_Ch5: dutycycle 95 - squarenote 15, 151, 129, 7 - squarenote 6, 132, 128, 7 - squarenote 10, 150, 129, 7 - squarenote 15, 131, 129, 7 + squarenote 15, 9, 7, 1921 + squarenote 6, 8, 4, 1920 + squarenote 10, 9, 6, 1921 + squarenote 15, 8, 3, 1921 endchannel SFX_Cry23_1_Ch7: - noisenote 3, 242, 60 - noisenote 13, 230, 44 - noisenote 15, 215, 60 - noisenote 8, 193, 44 + noisenote 3, 15, 2, 60 + noisenote 13, 14, 6, 44 + noisenote 15, 13, 7, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index d53448ea..24dba11c 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,25 +1,25 @@ SFX_Cry23_2_Ch4: dutycycle 240 - squarenote 15, 247, 192, 7 - squarenote 6, 228, 193, 7 - squarenote 10, 246, 192, 7 - squarenote 4, 211, 194, 7 - squarenote 8, 193, 192, 7 + squarenote 15, 15, 7, 1984 + squarenote 6, 14, 4, 1985 + squarenote 10, 15, 6, 1984 + squarenote 4, 13, 3, 1986 + squarenote 8, 12, 1, 1984 endchannel SFX_Cry23_2_Ch5: dutycycle 95 - squarenote 15, 151, 129, 7 - squarenote 6, 132, 128, 7 - squarenote 10, 150, 129, 7 - squarenote 15, 131, 129, 7 + squarenote 15, 9, 7, 1921 + squarenote 6, 8, 4, 1920 + squarenote 10, 9, 6, 1921 + squarenote 15, 8, 3, 1921 endchannel SFX_Cry23_2_Ch7: - noisenote 3, 242, 60 - noisenote 13, 230, 44 - noisenote 15, 215, 60 - noisenote 8, 193, 44 + noisenote 3, 15, 2, 60 + noisenote 13, 14, 6, 44 + noisenote 15, 13, 7, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index c8f76727..e3c62be5 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,25 +1,25 @@ SFX_Cry23_3_Ch4: dutycycle 240 - squarenote 15, 247, 192, 7 - squarenote 6, 228, 193, 7 - squarenote 10, 246, 192, 7 - squarenote 4, 211, 194, 7 - squarenote 8, 193, 192, 7 + squarenote 15, 15, 7, 1984 + squarenote 6, 14, 4, 1985 + squarenote 10, 15, 6, 1984 + squarenote 4, 13, 3, 1986 + squarenote 8, 12, 1, 1984 endchannel SFX_Cry23_3_Ch5: dutycycle 95 - squarenote 15, 151, 129, 7 - squarenote 6, 132, 128, 7 - squarenote 10, 150, 129, 7 - squarenote 15, 131, 129, 7 + squarenote 15, 9, 7, 1921 + squarenote 6, 8, 4, 1920 + squarenote 10, 9, 6, 1921 + squarenote 15, 8, 3, 1921 endchannel SFX_Cry23_3_Ch7: - noisenote 3, 242, 60 - noisenote 13, 230, 44 - noisenote 15, 215, 60 - noisenote 8, 193, 44 + noisenote 3, 15, 2, 60 + noisenote 13, 14, 6, 44 + noisenote 15, 13, 7, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 0beb9ce5..99218856 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,33 +1,33 @@ SFX_Cry24_1_Ch4: dutycycle 240 - squarenote 15, 247, 128, 6 - squarenote 10, 230, 132, 6 - squarenote 15, 215, 144, 6 - squarenote 8, 213, 144, 6 - squarenote 6, 196, 136, 6 - squarenote 5, 211, 112, 6 - squarenote 4, 211, 96, 6 - squarenote 8, 193, 64, 6 + squarenote 15, 15, 7, 1664 + squarenote 10, 14, 6, 1668 + squarenote 15, 13, 7, 1680 + squarenote 8, 13, 5, 1680 + squarenote 6, 12, 4, 1672 + squarenote 5, 13, 3, 1648 + squarenote 4, 13, 3, 1632 + squarenote 8, 12, 1, 1600 endchannel SFX_Cry24_1_Ch5: dutycycle 5 - squarenote 15, 183, 65, 6 - squarenote 10, 150, 66, 6 - squarenote 15, 167, 81, 6 - squarenote 8, 165, 81, 6 - squarenote 6, 148, 71, 6 - squarenote 5, 163, 49, 6 - squarenote 4, 147, 34, 6 - squarenote 8, 113, 1, 6 + squarenote 15, 11, 7, 1601 + squarenote 10, 9, 6, 1602 + squarenote 15, 10, 7, 1617 + squarenote 8, 10, 5, 1617 + squarenote 6, 9, 4, 1607 + squarenote 5, 10, 3, 1585 + squarenote 4, 9, 3, 1570 + squarenote 8, 7, 1, 1537 endchannel SFX_Cry24_1_Ch7: - noisenote 15, 228, 60 - noisenote 10, 199, 76 - noisenote 10, 199, 60 - noisenote 12, 183, 76 - noisenote 15, 162, 92 + noisenote 15, 14, 4, 60 + noisenote 10, 12, 7, 76 + noisenote 10, 12, 7, 60 + noisenote 12, 11, 7, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 67d8c45e..9773793c 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,33 +1,33 @@ SFX_Cry24_2_Ch4: dutycycle 240 - squarenote 15, 247, 128, 6 - squarenote 10, 230, 132, 6 - squarenote 15, 215, 144, 6 - squarenote 8, 213, 144, 6 - squarenote 6, 196, 136, 6 - squarenote 5, 211, 112, 6 - squarenote 4, 211, 96, 6 - squarenote 8, 193, 64, 6 + squarenote 15, 15, 7, 1664 + squarenote 10, 14, 6, 1668 + squarenote 15, 13, 7, 1680 + squarenote 8, 13, 5, 1680 + squarenote 6, 12, 4, 1672 + squarenote 5, 13, 3, 1648 + squarenote 4, 13, 3, 1632 + squarenote 8, 12, 1, 1600 endchannel SFX_Cry24_2_Ch5: dutycycle 5 - squarenote 15, 183, 65, 6 - squarenote 10, 150, 66, 6 - squarenote 15, 167, 81, 6 - squarenote 8, 165, 81, 6 - squarenote 6, 148, 71, 6 - squarenote 5, 163, 49, 6 - squarenote 4, 147, 34, 6 - squarenote 8, 113, 1, 6 + squarenote 15, 11, 7, 1601 + squarenote 10, 9, 6, 1602 + squarenote 15, 10, 7, 1617 + squarenote 8, 10, 5, 1617 + squarenote 6, 9, 4, 1607 + squarenote 5, 10, 3, 1585 + squarenote 4, 9, 3, 1570 + squarenote 8, 7, 1, 1537 endchannel SFX_Cry24_2_Ch7: - noisenote 15, 228, 60 - noisenote 10, 199, 76 - noisenote 10, 199, 60 - noisenote 12, 183, 76 - noisenote 15, 162, 92 + noisenote 15, 14, 4, 60 + noisenote 10, 12, 7, 76 + noisenote 10, 12, 7, 60 + noisenote 12, 11, 7, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 10f87daf..785f6e9b 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,33 +1,33 @@ SFX_Cry24_3_Ch4: dutycycle 240 - squarenote 15, 247, 128, 6 - squarenote 10, 230, 132, 6 - squarenote 15, 215, 144, 6 - squarenote 8, 213, 144, 6 - squarenote 6, 196, 136, 6 - squarenote 5, 211, 112, 6 - squarenote 4, 211, 96, 6 - squarenote 8, 193, 64, 6 + squarenote 15, 15, 7, 1664 + squarenote 10, 14, 6, 1668 + squarenote 15, 13, 7, 1680 + squarenote 8, 13, 5, 1680 + squarenote 6, 12, 4, 1672 + squarenote 5, 13, 3, 1648 + squarenote 4, 13, 3, 1632 + squarenote 8, 12, 1, 1600 endchannel SFX_Cry24_3_Ch5: dutycycle 5 - squarenote 15, 183, 65, 6 - squarenote 10, 150, 66, 6 - squarenote 15, 167, 81, 6 - squarenote 8, 165, 81, 6 - squarenote 6, 148, 71, 6 - squarenote 5, 163, 49, 6 - squarenote 4, 147, 34, 6 - squarenote 8, 113, 1, 6 + squarenote 15, 11, 7, 1601 + squarenote 10, 9, 6, 1602 + squarenote 15, 10, 7, 1617 + squarenote 8, 10, 5, 1617 + squarenote 6, 9, 4, 1607 + squarenote 5, 10, 3, 1585 + squarenote 4, 9, 3, 1570 + squarenote 8, 7, 1, 1537 endchannel SFX_Cry24_3_Ch7: - noisenote 15, 228, 60 - noisenote 10, 199, 76 - noisenote 10, 199, 60 - noisenote 12, 183, 76 - noisenote 15, 162, 92 + noisenote 15, 14, 4, 60 + noisenote 10, 12, 7, 76 + noisenote 10, 12, 7, 60 + noisenote 12, 11, 7, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index 35de0e60..9733b0f5 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,26 +1,26 @@ SFX_Cry25_1_Ch4: dutycycle 165 - squarenote 6, 244, 64, 7 - squarenote 15, 227, 48, 7 - squarenote 4, 244, 64, 7 - squarenote 5, 179, 72, 7 - squarenote 8, 209, 80, 7 + squarenote 6, 15, 4, 1856 + squarenote 15, 14, 3, 1840 + squarenote 4, 15, 4, 1856 + squarenote 5, 11, 3, 1864 + squarenote 8, 13, 1, 1872 endchannel SFX_Cry25_1_Ch5: dutycycle 119 - squarenote 6, 195, 18, 7 - squarenote 15, 179, 4, 7 - squarenote 3, 195, 18, 7 - squarenote 4, 195, 33, 7 - squarenote 8, 177, 50, 7 + squarenote 6, 12, 3, 1810 + squarenote 15, 11, 3, 1796 + squarenote 3, 12, 3, 1810 + squarenote 4, 12, 3, 1825 + squarenote 8, 11, 1, 1842 endchannel SFX_Cry25_1_Ch7: - noisenote 8, 214, 44 - noisenote 12, 198, 60 - noisenote 10, 182, 44 - noisenote 8, 145, 28 + noisenote 8, 13, 6, 44 + noisenote 12, 12, 6, 60 + noisenote 10, 11, 6, 44 + noisenote 8, 9, 1, 28 endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index cef33546..c38fa988 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,26 +1,26 @@ SFX_Cry25_2_Ch4: dutycycle 165 - squarenote 6, 244, 64, 7 - squarenote 15, 227, 48, 7 - squarenote 4, 244, 64, 7 - squarenote 5, 179, 72, 7 - squarenote 8, 209, 80, 7 + squarenote 6, 15, 4, 1856 + squarenote 15, 14, 3, 1840 + squarenote 4, 15, 4, 1856 + squarenote 5, 11, 3, 1864 + squarenote 8, 13, 1, 1872 endchannel SFX_Cry25_2_Ch5: dutycycle 119 - squarenote 6, 195, 18, 7 - squarenote 15, 179, 4, 7 - squarenote 3, 195, 18, 7 - squarenote 4, 195, 33, 7 - squarenote 8, 177, 50, 7 + squarenote 6, 12, 3, 1810 + squarenote 15, 11, 3, 1796 + squarenote 3, 12, 3, 1810 + squarenote 4, 12, 3, 1825 + squarenote 8, 11, 1, 1842 endchannel SFX_Cry25_2_Ch7: - noisenote 8, 214, 44 - noisenote 12, 198, 60 - noisenote 10, 182, 44 - noisenote 8, 145, 28 + noisenote 8, 13, 6, 44 + noisenote 12, 12, 6, 60 + noisenote 10, 11, 6, 44 + noisenote 8, 9, 1, 28 endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index a21fd708..610fa04b 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,26 +1,26 @@ SFX_Cry25_3_Ch4: dutycycle 165 - squarenote 6, 244, 64, 7 - squarenote 15, 227, 48, 7 - squarenote 4, 244, 64, 7 - squarenote 5, 179, 72, 7 - squarenote 8, 209, 80, 7 + squarenote 6, 15, 4, 1856 + squarenote 15, 14, 3, 1840 + squarenote 4, 15, 4, 1856 + squarenote 5, 11, 3, 1864 + squarenote 8, 13, 1, 1872 endchannel SFX_Cry25_3_Ch5: dutycycle 119 - squarenote 6, 195, 18, 7 - squarenote 15, 179, 4, 7 - squarenote 3, 195, 18, 7 - squarenote 4, 195, 33, 7 - squarenote 8, 177, 50, 7 + squarenote 6, 12, 3, 1810 + squarenote 15, 11, 3, 1796 + squarenote 3, 12, 3, 1810 + squarenote 4, 12, 3, 1825 + squarenote 8, 11, 1, 1842 endchannel SFX_Cry25_3_Ch7: - noisenote 8, 214, 44 - noisenote 12, 198, 60 - noisenote 10, 182, 44 - noisenote 8, 145, 28 + noisenote 8, 13, 6, 44 + noisenote 12, 12, 6, 60 + noisenote 10, 11, 6, 44 + noisenote 8, 9, 1, 28 endchannel diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index c7a39215..b4466ca7 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ SFX_Cut_1_Ch7: - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + noisenote 2, 15, 7, 36 + noisenote 2, 15, 7, 52 + noisenote 4, 15, 7, 68 + noisenote 8, 15, 4, 85 + noisenote 8, 15, 1, 68 endchannel diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 3e2746eb..ff7a0c4d 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ SFX_Cut_3_Ch7: - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + noisenote 2, 15, 7, 36 + noisenote 2, 15, 7, 52 + noisenote 4, 15, 7, 68 + noisenote 8, 15, 4, 85 + noisenote 8, 15, 1, 68 endchannel diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 9d8a0841..81351836 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_1_Ch7: - noisenote 0, 161, 16 + noisenote 0, 10, 1, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index cc98561c..abae0e01 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_2_Ch7: - noisenote 0, 161, 16 + noisenote 0, 10, 1, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 300e2971..f76df305 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_3_Ch7: - noisenote 0, 161, 16 + noisenote 0, 10, 1, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 5de9ab16..da3ba376 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_1_Ch7: - noisenote 0, 162, 17 + noisenote 0, 10, 2, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 33b904d4..c8fb1241 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_2_Ch7: - noisenote 0, 162, 17 + noisenote 0, 10, 2, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 97d60589..b34236d0 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_3_Ch7: - noisenote 0, 162, 17 + noisenote 0, 10, 2, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index a788cca2..f9b8733e 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_1_Ch7: - noisenote 0, 162, 80 + noisenote 0, 10, 2, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index b67984c6..d80395a4 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_2_Ch7: - noisenote 0, 162, 80 + noisenote 0, 10, 2, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 06b7f218..1a9a07e2 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_3_Ch7: - noisenote 0, 162, 80 + noisenote 0, 10, 2, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 525f9170..c96300fe 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ SFX_Damage_Ch7: - noisenote 2, 244, 68 - noisenote 2, 244, 20 - noisenote 15, 241, 50 + noisenote 2, 15, 4, 68 + noisenote 2, 15, 4, 20 + noisenote 15, 15, 1, 50 endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 028785e9..b8dabd64 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ SFX_Denied_1_Ch4: duty 3 pitchenvelope 5, -2 - squarenote 4, 240, 0, 5 + squarenote 4, 15, 0, 1280 pitchenvelope 0, 0 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 1, 0, 0, 0 endchannel SFX_Denied_1_Ch5: duty 3 - squarenote 4, 240, 1, 4 + squarenote 4, 15, 0, 1025 squarenote 4, 0, 0, 0 - squarenote 15, 240, 1, 4 + squarenote 15, 15, 0, 1025 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index c22854f4..0deb99eb 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,18 +1,18 @@ SFX_Denied_3_Ch4: duty 3 pitchenvelope 5, -2 - squarenote 4, 240, 0, 5 + squarenote 4, 15, 0, 1280 pitchenvelope 0, 0 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 1, 0, 0, 0 endchannel SFX_Denied_3_Ch5: duty 3 - squarenote 4, 240, 1, 4 + squarenote 4, 15, 0, 1025 squarenote 4, 0, 0, 0 - squarenote 15, 240, 1, 4 + squarenote 15, 15, 0, 1025 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 6f1d1457..46039163 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ SFX_Dex_Page_Added_Ch4: duty 2 pitchenvelope 4, 4 - squarenote 15, 240, 240, 4 + squarenote 15, 15, 0, 1264 pitchenvelope 1, 7 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel SFX_Dex_Page_Added_Ch5: duty 2 - squarenote 15, 146, 0, 6 - squarenote 15, 146, 130, 7 + squarenote 15, 9, 2, 1536 + squarenote 15, 9, 2, 1922 endchannel diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 732c9ac5..82262b2e 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ SFX_Doubleslap_Ch7: - noisenote 8, 241, 50 - noisenote 8, 241, 51 + noisenote 8, 15, 1, 50 + noisenote 8, 15, 1, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 3d615458..dfae7edd 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ SFX_Enter_PC_1_Ch4: duty 2 - squarenote 6, 240, 0, 7 + squarenote 6, 15, 0, 1792 squarenote 4, 0, 0, 0 - squarenote 6, 240, 0, 7 + squarenote 6, 15, 0, 1792 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 7b6dc02e..e4372af9 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,7 +1,7 @@ SFX_Enter_PC_3_Ch4: duty 2 - squarenote 4, 240, 0, 7 + squarenote 4, 15, 0, 1792 squarenote 4, 0, 0, 0 - squarenote 4, 240, 0, 7 + squarenote 4, 15, 0, 1792 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index 4fc24c9c..00e9c255 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ SFX_Faint_Fall_Ch4: duty 1 pitchenvelope 10, -7 - squarenote 15, 242, 128, 7 + squarenote 15, 15, 2, 1920 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 6dd9b005..d866b588 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ SFX_Faint_Thud_Ch4: - squarenote 15, 209, 0, 2 + squarenote 15, 13, 1, 512 pitchenvelope 0, 0 endchannel SFX_Faint_Thud_Ch7: - noisenote 4, 245, 51 - noisenote 8, 244, 34 - noisenote 15, 242, 33 + noisenote 4, 15, 5, 51 + noisenote 8, 15, 4, 34 + noisenote 15, 15, 2, 33 endchannel diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 76b0f2f3..567485a5 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ SFX_Fly_1_Ch7: - noisenote 2, 241, 18 - noisenote 2, 0, 0 - noisenote 2, 161, 18 - noisenote 2, 0, 0 - noisenote 2, 209, 18 - noisenote 2, 0, 0 - noisenote 2, 129, 18 - noisenote 2, 0, 0 - noisenote 2, 177, 18 - noisenote 2, 0, 0 - noisenote 2, 97, 18 - noisenote 2, 0, 0 - noisenote 2, 145, 18 - noisenote 2, 0, 0 - noisenote 2, 65, 18 - noisenote 2, 0, 0 + noisenote 2, 15, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 10, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 13, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 8, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 11, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 6, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 9, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 4, 1, 18 + noisenote 2, 0, 0, 0 endchannel diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 5337f8d3..30076475 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ SFX_Fly_3_Ch7: - noisenote 2, 241, 18 - noisenote 2, 0, 0 - noisenote 2, 161, 18 - noisenote 2, 0, 0 - noisenote 2, 209, 18 - noisenote 2, 0, 0 - noisenote 2, 129, 18 - noisenote 2, 0, 0 - noisenote 2, 177, 18 - noisenote 2, 0, 0 - noisenote 2, 97, 18 - noisenote 2, 0, 0 - noisenote 2, 145, 18 - noisenote 2, 0, 0 - noisenote 2, 65, 18 - noisenote 2, 0, 0 + noisenote 2, 15, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 10, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 13, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 8, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 11, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 6, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 9, 1, 18 + noisenote 2, 0, 0, 0 + noisenote 2, 4, 1, 18 + noisenote 2, 0, 0, 0 endchannel diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index e3ce983e..f45c8399 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ SFX_Go_Inside_1_Ch7: - noisenote 9, 241, 68 - noisenote 8, 209, 67 + noisenote 9, 15, 1, 68 + noisenote 8, 13, 1, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 467dfe0d..cf69e4b7 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ SFX_Go_Inside_3_Ch7: - noisenote 9, 241, 68 - noisenote 8, 209, 67 + noisenote 9, 15, 1, 68 + noisenote 8, 13, 1, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index edf384e0..3156eba7 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ SFX_Go_Outside_1_Ch7: - noisenote 2, 241, 84 - noisenote 12, 113, 35 - noisenote 2, 177, 84 - noisenote 12, 97, 35 - noisenote 6, 65, 84 + noisenote 2, 15, 1, 84 + noisenote 12, 7, 1, 35 + noisenote 2, 11, 1, 84 + noisenote 12, 6, 1, 35 + noisenote 6, 4, 1, 84 endchannel diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 25284c5c..37952248 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,7 +1,7 @@ SFX_Go_Outside_3_Ch7: - noisenote 2, 241, 84 - noisenote 12, 113, 35 - noisenote 2, 177, 84 - noisenote 12, 97, 35 - noisenote 6, 65, 84 + noisenote 2, 15, 1, 84 + noisenote 12, 7, 1, 35 + noisenote 2, 11, 1, 84 + noisenote 12, 6, 1, 35 + noisenote 6, 4, 1, 84 endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 35a0f647..656babad 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_1_Ch4: duty 2 pitchenvelope 1, 4 - squarenote 4, 242, 0, 6 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 + squarenote 4, 15, 2, 1536 pitchenvelope 1, 7 - squarenote 15, 242, 0, 6 + squarenote 15, 15, 2, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index e4fe0c9c..bb06b360 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_2_Ch4: duty 2 pitchenvelope 1, 4 - squarenote 4, 242, 0, 6 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 + squarenote 4, 15, 2, 1536 pitchenvelope 1, 7 - squarenote 15, 242, 0, 6 + squarenote 15, 15, 2, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index fb17a5f1..ff1b1304 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_3_Ch4: duty 2 pitchenvelope 1, 4 - squarenote 4, 242, 0, 6 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 + squarenote 4, 15, 2, 1536 pitchenvelope 1, 7 - squarenote 15, 242, 0, 6 + squarenote 15, 15, 2, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index ece6a473..1fdbdfea 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_1_Ch4: duty 2 pitchenvelope 1, 7 - squarenote 15, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 96adff71..befb3f01 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_2_Ch4: duty 2 pitchenvelope 1, 7 - squarenote 15, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index b9f5817b..ba4d6739 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_3_Ch4: duty 2 pitchenvelope 1, 7 - squarenote 15, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 3bcaf4c4..095f7b7a 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_1_Ch4: duty 2 pitchenvelope 2, -4 - squarenote 4, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 2, 241, 0, 5 + squarenote 2, 15, 1, 1280 pitchenvelope 0, 0 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index 3ac6a514..a0501d8f 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_3_Ch4: duty 2 pitchenvelope 2, -4 - squarenote 4, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 2, 241, 0, 5 + squarenote 2, 15, 1, 1280 pitchenvelope 0, 0 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 6eccae73..6f126626 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ SFX_Horn_Drill_Ch7: - noisenote 3, 146, 49 - noisenote 3, 178, 50 - noisenote 3, 194, 51 - noisenote 8, 241, 84 + noisenote 3, 9, 2, 49 + noisenote 3, 11, 2, 50 + noisenote 3, 12, 2, 51 + noisenote 8, 15, 1, 84 endchannel diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 79b2c019..41a4db84 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ SFX_Intro_Crash_Ch7: - noisenote 2, 210, 50 - noisenote 15, 242, 67 + noisenote 2, 13, 2, 50 + noisenote 15, 15, 2, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index cc394d5c..09af056f 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ SFX_Intro_Hip_Ch4: duty 2 pitchenvelope 2, 6 - squarenote 12, 194, 64, 7 + squarenote 12, 12, 2, 1856 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 45829561..7dec29ae 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ SFX_Intro_Hop_Ch4: duty 2 pitchenvelope 2, 6 - squarenote 12, 194, 128, 6 + squarenote 12, 12, 2, 1664 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index c7b4d3ee..ecdd9428 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ SFX_Intro_Lunge_Ch7: - noisenote 6, 32, 16 - noisenote 6, 47, 64 - noisenote 6, 79, 65 - noisenote 6, 143, 65 - noisenote 6, 207, 66 - noisenote 8, 215, 66 - noisenote 15, 231, 67 - noisenote 15, 242, 67 + noisenote 6, 2, 0, 16 + noisenote 6, 2, -7, 64 + noisenote 6, 4, -7, 65 + noisenote 6, 8, -7, 65 + noisenote 6, 12, -7, 66 + noisenote 8, 13, 7, 66 + noisenote 15, 14, 7, 67 + noisenote 15, 15, 2, 67 endchannel diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index f9c5b278..c972283d 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ SFX_Intro_Raise_Ch7: - noisenote 2, 111, 33 - noisenote 2, 175, 49 - noisenote 15, 242, 65 + noisenote 2, 6, -7, 33 + noisenote 2, 10, -7, 49 + noisenote 15, 15, 2, 65 endchannel diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 93e6b7bc..647fcbd2 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ SFX_Intro_Whoosh_Ch7: - noisenote 4, 44, 32 - noisenote 3, 160, 32 - noisenote 3, 176, 33 - noisenote 3, 192, 34 - noisenote 15, 210, 36 + noisenote 4, 2, -4, 32 + noisenote 3, 10, 0, 32 + noisenote 3, 11, 0, 33 + noisenote 3, 12, 0, 34 + noisenote 15, 13, 2, 36 endchannel diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index d70043fa..0b2b478f 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ SFX_Ledge_1_Ch4: duty 2 pitchenvelope 9, 5 - squarenote 15, 242, 0, 4 + squarenote 15, 15, 2, 1024 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 858aad9c..29b055a9 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ SFX_Ledge_3_Ch4: duty 2 pitchenvelope 9, 5 - squarenote 15, 242, 0, 4 + squarenote 15, 15, 2, 1024 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index b6b0f7ab..aa7787ff 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_1_Ch7: - noisenote 0, 161, 24 - noisenote 0, 49, 51 + noisenote 0, 10, 1, 24 + noisenote 0, 3, 1, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index 60b6c43a..8b0cbde3 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_2_Ch7: - noisenote 0, 161, 24 - noisenote 0, 49, 51 + noisenote 0, 10, 1, 24 + noisenote 0, 3, 1, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 9657aadf..7487c98f 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_3_Ch7: - noisenote 0, 161, 24 - noisenote 0, 49, 51 + noisenote 0, 10, 1, 24 + noisenote 0, 3, 1, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index efadfbc4..cca5a93e 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_1_Ch7: - noisenote 0, 145, 34 + noisenote 0, 9, 1, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 9483d633..e33c7837 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_2_Ch7: - noisenote 0, 145, 34 + noisenote 0, 9, 1, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index e287b461..d53965e4 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_3_Ch7: - noisenote 0, 145, 34 + noisenote 0, 9, 1, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 95802909..1140a92b 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_1_Ch7: - noisenote 0, 113, 34 + noisenote 0, 7, 1, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 7f39ca62..4e5eff53 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_2_Ch7: - noisenote 0, 113, 34 + noisenote 0, 7, 1, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index 7c11a20f..d11099b5 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_3_Ch7: - noisenote 0, 113, 34 + noisenote 0, 7, 1, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index 31f2399b..aac775e4 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_1_Ch7: - noisenote 0, 97, 34 + noisenote 0, 6, 1, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index d658dd4c..8cc7e02e 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_2_Ch7: - noisenote 0, 97, 34 + noisenote 0, 6, 1, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 6ba03ff5..fcc7455b 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_3_Ch7: - noisenote 0, 97, 34 + noisenote 0, 6, 1, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 1847daa6..2220bf03 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ SFX_Not_Very_Effective_Ch7: - noisenote 4, 143, 85 - noisenote 2, 244, 68 - noisenote 8, 244, 34 - noisenote 15, 242, 33 + noisenote 4, 8, -7, 85 + noisenote 2, 15, 4, 68 + noisenote 8, 15, 4, 34 + noisenote 15, 15, 2, 33 endchannel diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index 23970df5..c52ce4d0 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ SFX_Peck_Ch7: - noisenote 2, 161, 18 + noisenote 2, 10, 1, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index d669912d..8deaafe5 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ SFX_Poisoned_1_Ch4: duty 0 pitchenvelope 1, 4 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 loopchannel 4, SFX_Poisoned_1_Ch4 - squarenote 15, 243, 0, 6 + squarenote 15, 15, 3, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index c0811adc..a66aaf7a 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ SFX_Poisoned_3_Ch4: duty 0 pitchenvelope 1, 4 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 loopchannel 4, SFX_Poisoned_3_Ch4 - squarenote 15, 243, 0, 6 + squarenote 15, 15, 3, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 93f17c72..3aee5836 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ SFX_Pound_Ch7: - noisenote 2, 161, 34 + noisenote 2, 10, 1, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 3d40cab3..bfc9635b 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ SFX_Press_AB_1_Ch4: duty 2 - squarenote 0, 145, 192, 7 - squarenote 0, 129, 208, 7 - squarenote 0, 145, 192, 7 - squarenote 12, 161, 208, 7 + squarenote 0, 9, 1, 1984 + squarenote 0, 8, 1, 2000 + squarenote 0, 9, 1, 1984 + squarenote 12, 10, 1, 2000 endchannel diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index a3f14b74..9ad03c67 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,7 +1,7 @@ SFX_Press_AB_2_Ch4: duty 2 - squarenote 0, 145, 192, 7 - squarenote 0, 129, 208, 7 - squarenote 0, 145, 192, 7 - squarenote 12, 161, 208, 7 + squarenote 0, 9, 1, 1984 + squarenote 0, 8, 1, 2000 + squarenote 0, 9, 1, 1984 + squarenote 12, 10, 1, 2000 endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 01cf9b92..67306cbe 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,7 +1,7 @@ SFX_Press_AB_3_Ch4: duty 2 - squarenote 0, 145, 192, 7 - squarenote 0, 129, 208, 7 - squarenote 0, 145, 192, 7 - squarenote 12, 161, 208, 7 + squarenote 0, 9, 1, 1984 + squarenote 0, 8, 1, 2000 + squarenote 0, 9, 1, 1984 + squarenote 12, 10, 1, 2000 endchannel diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index c49ebcb5..71c7119b 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ SFX_Psybeam_Ch4: dutycycle 161 - squarenote 10, 241, 64, 6 - squarenote 10, 243, 128, 6 - squarenote 10, 242, 32, 6 + squarenote 10, 15, 1, 1600 + squarenote 10, 15, 3, 1664 + squarenote 10, 15, 2, 1568 loopchannel 4, SFX_Psybeam_Ch4 - squarenote 10, 241, 64, 6 + squarenote 10, 15, 1, 1600 endchannel SFX_Psybeam_Ch5: dutycycle 179 - squarenote 10, 243, 113, 5 - squarenote 7, 227, 49, 5 - squarenote 10, 241, 81, 5 + squarenote 10, 15, 3, 1393 + squarenote 7, 14, 3, 1329 + squarenote 10, 15, 1, 1361 loopchannel 4, SFX_Psybeam_Ch5 - squarenote 10, 241, 113, 5 + squarenote 10, 15, 1, 1393 endchannel SFX_Psybeam_Ch7: - noisenote 2, 209, 74 - noisenote 2, 210, 42 + noisenote 2, 13, 1, 74 + noisenote 2, 13, 2, 42 loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 55bb3d25..a9cd5ec3 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ SFX_Psychic_M_Ch4: duty 2 pitchenvelope 15, 7 - squarenote 8, 196, 189, 7 - squarenote 8, 196, 190, 7 - squarenote 8, 196, 191, 7 - squarenote 8, 196, 192, 7 - squarenote 15, 196, 193, 7 - squarenote 15, 242, 192, 7 + squarenote 8, 12, 4, 1981 + squarenote 8, 12, 4, 1982 + squarenote 8, 12, 4, 1983 + squarenote 8, 12, 4, 1984 + squarenote 15, 12, 4, 1985 + squarenote 15, 15, 2, 1984 pitchenvelope 0, 0 endchannel SFX_Psychic_M_Ch5: duty 2 - squarenote 8, 196, 112, 7 - squarenote 8, 196, 97, 7 - squarenote 8, 196, 98, 7 - squarenote 8, 196, 99, 7 - squarenote 15, 196, 100, 7 - squarenote 15, 242, 100, 7 + squarenote 8, 12, 4, 1904 + squarenote 8, 12, 4, 1889 + squarenote 8, 12, 4, 1890 + squarenote 8, 12, 4, 1891 + squarenote 15, 12, 4, 1892 + squarenote 15, 15, 2, 1892 endchannel SFX_Psychic_M_Ch7: - noisenote 15, 63, 20 - noisenote 15, 207, 19 - noisenote 15, 207, 18 - noisenote 15, 207, 17 - noisenote 15, 207, 16 - noisenote 15, 194, 16 + noisenote 15, 3, -7, 20 + noisenote 15, 12, -7, 19 + noisenote 15, 12, -7, 18 + noisenote 15, 12, -7, 17 + noisenote 15, 12, -7, 16 + noisenote 15, 12, 2, 16 endchannel diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index f1b3799a..bb8c3cce 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ SFX_Purchase_1_Ch4: duty 2 - squarenote 4, 225, 0, 7 - squarenote 8, 242, 224, 7 + squarenote 4, 14, 1, 1792 + squarenote 8, 15, 2, 2016 endchannel SFX_Purchase_1_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 145, 193, 6 - squarenote 8, 162, 161, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 9, 1, 1729 + squarenote 8, 10, 2, 1953 endchannel diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index b8a5660f..454e6f83 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,13 +1,13 @@ SFX_Purchase_3_Ch4: duty 2 - squarenote 4, 225, 0, 7 - squarenote 8, 242, 224, 7 + squarenote 4, 14, 1, 1792 + squarenote 8, 15, 2, 2016 endchannel SFX_Purchase_3_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 145, 193, 6 - squarenote 8, 162, 161, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 9, 1, 1729 + squarenote 8, 10, 2, 1953 endchannel diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index c2d778fa..bf7bf116 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ SFX_Push_Boulder_1_Ch7: - noisenote 4, 162, 35 - noisenote 8, 241, 52 - noisenote 15, 0, 0 - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + noisenote 4, 10, 2, 35 + noisenote 8, 15, 1, 52 + noisenote 15, 0, 0, 0 + noisenote 2, 15, 7, 36 + noisenote 2, 15, 7, 52 + noisenote 4, 15, 7, 68 + noisenote 8, 15, 4, 85 + noisenote 8, 15, 1, 68 endchannel diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index 9a263a9e..f554da55 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,10 +1,10 @@ SFX_Push_Boulder_3_Ch7: - noisenote 4, 162, 35 - noisenote 8, 241, 52 - noisenote 15, 0, 0 - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + noisenote 4, 10, 2, 35 + noisenote 8, 15, 1, 52 + noisenote 15, 0, 0, 0 + noisenote 2, 15, 7, 36 + noisenote 2, 15, 7, 52 + noisenote 4, 15, 7, 68 + noisenote 8, 15, 4, 85 + noisenote 8, 15, 1, 68 endchannel diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index e05fb675..b59ceefa 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ SFX_Run_Ch7: - noisenote 2, 97, 35 - noisenote 2, 161, 51 - noisenote 2, 193, 51 - noisenote 2, 81, 17 - noisenote 2, 241, 51 - noisenote 2, 65, 17 - noisenote 2, 193, 51 - noisenote 2, 49, 17 - noisenote 2, 129, 51 - noisenote 2, 49, 17 - noisenote 8, 65, 51 + noisenote 2, 6, 1, 35 + noisenote 2, 10, 1, 51 + noisenote 2, 12, 1, 51 + noisenote 2, 5, 1, 17 + noisenote 2, 15, 1, 51 + noisenote 2, 4, 1, 17 + noisenote 2, 12, 1, 51 + noisenote 2, 3, 1, 17 + noisenote 2, 8, 1, 51 + noisenote 2, 3, 1, 17 + noisenote 8, 4, 1, 51 endchannel diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index 6c302b11..5692b0d6 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ SFX_Safari_Zone_PA_Ch4: duty 2 - squarenote 15, 243, 48, 7 - squarenote 8, 101, 48, 7 - squarenote 15, 244, 0, 7 - squarenote 15, 116, 0, 7 - squarenote 15, 68, 0, 7 - squarenote 15, 36, 0, 7 + squarenote 15, 15, 3, 1840 + squarenote 8, 6, 5, 1840 + squarenote 15, 15, 4, 1792 + squarenote 15, 7, 4, 1792 + squarenote 15, 4, 4, 1792 + squarenote 15, 2, 4, 1792 endchannel diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 900c89c1..07702b4d 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ SFX_Save_1_Ch4: duty 2 - squarenote 4, 244, 0, 7 - squarenote 2, 228, 0, 6 - squarenote 2, 228, 128, 6 - squarenote 2, 228, 192, 6 - squarenote 2, 228, 0, 7 - squarenote 2, 228, 160, 7 - squarenote 15, 242, 224, 7 + squarenote 4, 15, 4, 1792 + squarenote 2, 14, 4, 1536 + squarenote 2, 14, 4, 1664 + squarenote 2, 14, 4, 1728 + squarenote 2, 14, 4, 1792 + squarenote 2, 14, 4, 1952 + squarenote 15, 15, 2, 2016 endchannel SFX_Save_1_Ch5: duty 2 - squarenote 4, 8, 0, 0 - squarenote 2, 212, 1, 7 - squarenote 2, 196, 1, 6 - squarenote 2, 196, 129, 6 - squarenote 2, 196, 193, 6 - squarenote 2, 196, 1, 7 - squarenote 2, 196, 161, 7 - squarenote 15, 210, 225, 7 + squarenote 4, 0, 8, 0 + squarenote 2, 13, 4, 1793 + squarenote 2, 12, 4, 1537 + squarenote 2, 12, 4, 1665 + squarenote 2, 12, 4, 1729 + squarenote 2, 12, 4, 1793 + squarenote 2, 12, 4, 1953 + squarenote 15, 13, 2, 2017 endchannel diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 0f237fd1..eda54e9e 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,17 +1,17 @@ SFX_Save_3_Ch4: duty 2 IF DEF(_RED) - squarenote 4, 244, 0, 7 - squarenote 3, 228, 128, 6 - squarenote 3, 228, 192, 6 - squarenote 3, 228, 0, 7 - squarenote 2, 228, 160, 7 + squarenote 4, 15, 4, 1792 + squarenote 3, 14, 4, 1664 + squarenote 3, 14, 4, 1728 + squarenote 3, 14, 4, 1792 + squarenote 2, 14, 4, 1952 ELSE - squarenote 3, 228, 0, 6 - squarenote 3, 228, 128, 6 - squarenote 3, 228, 192, 6 - squarenote 3, 228, 0, 7 - squarenote 15, 242, 224, 7 + squarenote 3, 14, 4, 1536 + squarenote 3, 14, 4, 1664 + squarenote 3, 14, 4, 1728 + squarenote 3, 14, 4, 1792 + squarenote 15, 15, 2, 2016 ENDC endchannel @@ -19,18 +19,18 @@ ENDC SFX_Save_3_Ch5: duty 2 IF DEF(_RED) - squarenote 4, 8, 0, 0 - squarenote 3, 212, 1, 7 - squarenote 3, 196, 129, 6 - squarenote 3, 196, 193, 6 - squarenote 3, 196, 1, 7 - squarenote 2, 196, 161, 7 + squarenote 4, 0, 8, 0 + squarenote 3, 13, 4, 1793 + squarenote 3, 12, 4, 1665 + squarenote 3, 12, 4, 1729 + squarenote 3, 12, 4, 1793 + squarenote 2, 12, 4, 1953 ELSE - squarenote 3, 8, 0, 0 - squarenote 3, 196, 1, 6 - squarenote 3, 196, 129, 6 - squarenote 3, 196, 193, 6 - squarenote 3, 196, 1, 7 - squarenote 15, 210, 225, 7 + squarenote 3, 0, 8, 0 + squarenote 3, 12, 4, 1537 + squarenote 3, 12, 4, 1665 + squarenote 3, 12, 4, 1729 + squarenote 3, 12, 4, 1793 + squarenote 15, 13, 2, 2017 ENDC endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 36e77f45..fbd158fd 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ SFX_Shooting_Star_Ch4: dutycycle 228 pitchenvelope 2, -7 - squarenote 4, 64, 224, 7 - squarenote 4, 96, 224, 7 - squarenote 4, 128, 224, 7 - squarenote 8, 160, 224, 7 - squarenote 8, 160, 224, 7 - squarenote 8, 128, 224, 7 - squarenote 8, 96, 224, 7 - squarenote 8, 48, 224, 7 - squarenote 15, 18, 224, 7 + squarenote 4, 4, 0, 2016 + squarenote 4, 6, 0, 2016 + squarenote 4, 8, 0, 2016 + squarenote 8, 10, 0, 2016 + squarenote 8, 10, 0, 2016 + squarenote 8, 8, 0, 2016 + squarenote 8, 6, 0, 2016 + squarenote 8, 3, 0, 2016 + squarenote 15, 1, 2, 2016 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 8a2fb1d0..df1fb338 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ SFX_Shrink_1_Ch4: duty 1 pitchenvelope 1, 7 - squarenote 15, 215, 0, 6 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 5 - squarenote 15, 71, 128, 4 - squarenote 15, 23, 0, 4 + squarenote 15, 13, 7, 1536 + squarenote 15, 11, 7, 1408 + squarenote 15, 8, 7, 1280 + squarenote 15, 4, 7, 1152 + squarenote 15, 1, 7, 1024 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 0256c6c9..37a8b572 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ SFX_Shrink_3_Ch4: duty 1 pitchenvelope 1, 7 - squarenote 15, 215, 0, 6 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 5 - squarenote 15, 71, 128, 4 - squarenote 15, 23, 0, 4 + squarenote 15, 13, 7, 1536 + squarenote 15, 11, 7, 1408 + squarenote 15, 8, 7, 1280 + squarenote 15, 4, 7, 1152 + squarenote 15, 1, 7, 1024 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index b685abbe..94914320 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ SFX_Silph_Scope_Ch4: duty 0 - squarenote 0, 210, 0, 7 - squarenote 0, 210, 64, 7 - squarenote 0, 210, 128, 7 - squarenote 0, 210, 192, 7 - squarenote 10, 225, 224, 7 + squarenote 0, 13, 2, 1792 + squarenote 0, 13, 2, 1856 + squarenote 0, 13, 2, 1920 + squarenote 0, 13, 2, 1984 + squarenote 10, 14, 1, 2016 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index 632003b8..df897225 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ SFX_Slots_New_Spin_Ch4: duty 3 - squarenote 5, 225, 0, 7 - squarenote 2, 225, 128, 7 - squarenote 15, 241, 192, 7 + squarenote 5, 14, 1, 1792 + squarenote 2, 14, 1, 1920 + squarenote 15, 15, 1, 1984 endchannel SFX_Slots_New_Spin_Ch5: duty 2 - squarenote 4, 193, 193, 6 - squarenote 2, 193, 65, 7 - squarenote 15, 209, 129, 7 + squarenote 4, 12, 1, 1729 + squarenote 2, 12, 1, 1857 + squarenote 15, 13, 1, 1921 endchannel diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 2322c34a..b82db160 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ SFX_Slots_Reward_Ch4: duty 2 - squarenote 2, 241, 0, 7 - squarenote 8, 129, 224, 7 + squarenote 2, 15, 1, 1792 + squarenote 8, 8, 1, 2016 endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 0548600b..6c462c16 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ SFX_Slots_Stop_Wheel_Ch4: duty 2 - squarenote 1, 242, 160, 6 - squarenote 1, 242, 224, 6 - squarenote 8, 241, 0, 7 + squarenote 1, 15, 2, 1696 + squarenote 1, 15, 2, 1760 + squarenote 8, 15, 1, 1792 endchannel diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index ea06a573..999b91dc 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ SFX_Snare1_1_Ch7: - noisenote 0, 193, 51 + noisenote 0, 12, 1, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 3ac1095d..994ff3de 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ SFX_Snare1_2_Ch7: - noisenote 0, 193, 51 + noisenote 0, 12, 1, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 66344d64..87f4e817 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ SFX_Snare1_3_Ch7: - noisenote 0, 193, 51 + noisenote 0, 12, 1, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 7852f823..6a9e5cd9 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ SFX_Snare2_1_Ch7: - noisenote 0, 177, 51 + noisenote 0, 11, 1, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 0ddeff47..e8f7c5f9 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ SFX_Snare2_2_Ch7: - noisenote 0, 177, 51 + noisenote 0, 11, 1, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index 4e77c1dc..9775a6e9 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ SFX_Snare2_3_Ch7: - noisenote 0, 177, 51 + noisenote 0, 11, 1, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index 787f5da5..215eaec4 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ SFX_Snare3_1_Ch7: - noisenote 0, 161, 51 + noisenote 0, 10, 1, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 136e99db..18a301b5 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ SFX_Snare3_2_Ch7: - noisenote 0, 161, 51 + noisenote 0, 10, 1, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index d0aaacbf..decd3ab6 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ SFX_Snare3_3_Ch7: - noisenote 0, 161, 51 + noisenote 0, 10, 1, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 31ca4d90..3cf12af2 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ SFX_Snare4_1_Ch7: - noisenote 0, 129, 51 + noisenote 0, 8, 1, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index ad0cb156..f97fab11 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ SFX_Snare4_2_Ch7: - noisenote 0, 129, 51 + noisenote 0, 8, 1, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index a8f5b7e0..57b70600 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ SFX_Snare4_3_Ch7: - noisenote 0, 129, 51 + noisenote 0, 8, 1, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index 346c3e4b..deb1bc43 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,8 +1,8 @@ SFX_Snare5_1_Ch7: - noisenote 7, 132, 55 - noisenote 6, 132, 54 - noisenote 5, 131, 53 - noisenote 4, 131, 52 - noisenote 3, 130, 51 - noisenote 2, 129, 50 + noisenote 7, 8, 4, 55 + noisenote 6, 8, 4, 54 + noisenote 5, 8, 3, 53 + noisenote 4, 8, 3, 52 + noisenote 3, 8, 2, 51 + noisenote 2, 8, 1, 50 endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 91fd2abe..5c45259b 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,8 +1,8 @@ SFX_Snare5_2_Ch7: - noisenote 7, 132, 55 - noisenote 6, 132, 54 - noisenote 5, 131, 53 - noisenote 4, 131, 52 - noisenote 3, 130, 51 - noisenote 2, 129, 50 + noisenote 7, 8, 4, 55 + noisenote 6, 8, 4, 54 + noisenote 5, 8, 3, 53 + noisenote 4, 8, 3, 52 + noisenote 3, 8, 2, 51 + noisenote 2, 8, 1, 50 endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 3e0a546d..22836d10 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,8 +1,8 @@ SFX_Snare5_3_Ch7: - noisenote 7, 132, 55 - noisenote 6, 132, 54 - noisenote 5, 131, 53 - noisenote 4, 131, 52 - noisenote 3, 130, 51 - noisenote 2, 129, 50 + noisenote 7, 8, 4, 55 + noisenote 6, 8, 4, 54 + noisenote 5, 8, 3, 53 + noisenote 4, 8, 3, 52 + noisenote 3, 8, 2, 51 + noisenote 2, 8, 1, 50 endchannel diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 982a9d73..5ed7338f 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ SFX_Snare6_1_Ch7: - noisenote 0, 129, 16 + noisenote 0, 8, 1, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 0aaf6148..dc7b6f34 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ SFX_Snare6_2_Ch7: - noisenote 0, 129, 16 + noisenote 0, 8, 1, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index f021de95..4d061316 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ SFX_Snare6_3_Ch7: - noisenote 0, 129, 16 + noisenote 0, 8, 1, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index a0c5768f..993a35de 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ SFX_Snare7_1_Ch7: - noisenote 0, 130, 35 + noisenote 0, 8, 2, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index cdd18567..46ed89a5 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ SFX_Snare7_2_Ch7: - noisenote 0, 130, 35 + noisenote 0, 8, 2, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index f1db9012..663fdf0c 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ SFX_Snare7_3_Ch7: - noisenote 0, 130, 35 + noisenote 0, 8, 2, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 3c657ab8..0c64b371 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ SFX_Snare8_1_Ch7: - noisenote 0, 130, 37 + noisenote 0, 8, 2, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index b0d7a66a..88ece7c2 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ SFX_Snare8_2_Ch7: - noisenote 0, 130, 37 + noisenote 0, 8, 2, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 51ab3ecb..9abaa56e 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ SFX_Snare8_3_Ch7: - noisenote 0, 130, 37 + noisenote 0, 8, 2, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 1468fc0e..58bfca9a 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ SFX_Snare9_1_Ch7: - noisenote 0, 130, 38 + noisenote 0, 8, 2, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 78b01295..b8f43254 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ SFX_Snare9_2_Ch7: - noisenote 0, 130, 38 + noisenote 0, 8, 2, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index aa56c84a..001ed29f 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ SFX_Snare9_3_Ch7: - noisenote 0, 130, 38 + noisenote 0, 8, 2, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index b84c1c83..d2c57bc3 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ SFX_SS_Anne_Horn_1_Ch4: duty 2 - squarenote 15, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 242, 0, 5 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 2, 1280 endchannel SFX_SS_Anne_Horn_1_Ch5: duty 3 - squarenote 15, 240, 130, 4 + squarenote 15, 15, 0, 1154 squarenote 4, 0, 0, 0 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 242, 130, 4 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 2, 1154 endchannel diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 35bcff9d..3672d3d5 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,22 +1,22 @@ SFX_SS_Anne_Horn_3_Ch4: duty 2 - squarenote 15, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 242, 0, 5 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 0, 1280 + squarenote 15, 15, 2, 1280 endchannel SFX_SS_Anne_Horn_3_Ch5: duty 3 - squarenote 15, 240, 130, 4 + squarenote 15, 15, 0, 1154 squarenote 4, 0, 0, 0 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 242, 130, 4 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 0, 1154 + squarenote 15, 15, 2, 1154 endchannel diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 5d71ea86..84c28d8a 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_1_Ch7: - noisenote 1, 226, 51 - noisenote 8, 225, 34 + noisenote 1, 14, 2, 51 + noisenote 8, 14, 1, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 3ab45794..a9689acf 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_2_Ch7: - noisenote 1, 226, 51 - noisenote 8, 225, 34 + noisenote 1, 14, 2, 51 + noisenote 8, 14, 1, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 5bf74e70..f437a4c3 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_3_Ch7: - noisenote 1, 226, 51 - noisenote 8, 225, 34 + noisenote 1, 14, 2, 51 + noisenote 8, 14, 1, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 4fb99e7c..ebc1e0b7 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ SFX_Super_Effective_Ch7: - noisenote 4, 241, 52 - noisenote 15, 242, 100 + noisenote 4, 15, 1, 52 + noisenote 15, 15, 2, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index cc7da7c4..d200f3b8 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ SFX_Swap_1_Ch4: duty 2 - squarenote 8, 225, 64, 7 + squarenote 8, 14, 1, 1856 endchannel SFX_Swap_1_Ch5: duty 2 - squarenote 2, 8, 0, 0 - squarenote 8, 177, 65, 7 + squarenote 2, 0, 8, 0 + squarenote 8, 11, 1, 1857 endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 788bbc11..04d795b6 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,11 +1,11 @@ SFX_Swap_3_Ch4: duty 2 - squarenote 8, 225, 64, 7 + squarenote 8, 14, 1, 1856 endchannel SFX_Swap_3_Ch5: duty 2 - squarenote 2, 8, 0, 0 - squarenote 8, 177, 65, 7 + squarenote 2, 0, 8, 0 + squarenote 8, 11, 1, 1857 endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index eba35ca8..76f64e04 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ SFX_Switch_1_Ch4: duty 2 squarenote 4, 0, 0, 0 - squarenote 2, 241, 128, 6 + squarenote 2, 15, 1, 1664 squarenote 1, 0, 0, 0 - squarenote 4, 241, 128, 7 + squarenote 4, 15, 1, 1920 squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 4031c68b..0663b2ed 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,8 +1,8 @@ SFX_Switch_3_Ch4: duty 2 squarenote 4, 0, 0, 0 - squarenote 2, 241, 128, 6 + squarenote 2, 15, 1, 1664 squarenote 1, 0, 0, 0 - squarenote 4, 241, 128, 7 + squarenote 4, 15, 1, 1920 squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index c18d5af9..fd94c086 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_1_Ch4: duty 1 pitchenvelope 1, 7 - squarenote 15, 215, 0, 7 - squarenote 15, 183, 128, 6 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 5 - squarenote 15, 23, 0, 5 + squarenote 15, 13, 7, 1792 + squarenote 15, 11, 7, 1664 + squarenote 15, 8, 7, 1536 + squarenote 15, 4, 7, 1408 + squarenote 15, 1, 7, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index d1d26cfb..d7f8f076 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_3_Ch4: duty 1 pitchenvelope 1, 7 - squarenote 15, 215, 0, 7 - squarenote 15, 183, 128, 6 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 5 - squarenote 15, 23, 0, 5 + squarenote 15, 13, 7, 1792 + squarenote 15, 11, 7, 1664 + squarenote 15, 8, 7, 1536 + squarenote 15, 4, 7, 1408 + squarenote 15, 1, 7, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 07cb9ca6..b0d61646 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Enter2_1_Ch7: - noisenote 2, 241, 50 - noisenote 2, 0, 0 - noisenote 2, 241, 34 - noisenote 1, 0, 0 + noisenote 2, 15, 1, 50 + noisenote 2, 0, 0, 0 + noisenote 2, 15, 1, 34 + noisenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index cfeebf12..cc883000 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Enter2_3_Ch7: - noisenote 2, 241, 50 - noisenote 2, 0, 0 - noisenote 2, 241, 34 - noisenote 1, 0, 0 + noisenote 2, 15, 1, 50 + noisenote 2, 0, 0, 0 + noisenote 2, 15, 1, 34 + noisenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 6276139b..dd986dca 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_1_Ch4: duty 1 pitchenvelope 1, 7 - squarenote 15, 215, 0, 5 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 6 - squarenote 15, 23, 0, 7 + squarenote 15, 13, 7, 1280 + squarenote 15, 11, 7, 1408 + squarenote 15, 8, 7, 1536 + squarenote 15, 4, 7, 1664 + squarenote 15, 1, 7, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index e1af7fd2..e3460ad2 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_3_Ch4: duty 1 pitchenvelope 1, 7 - squarenote 15, 215, 0, 5 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 6 - squarenote 15, 23, 0, 7 + squarenote 15, 13, 7, 1280 + squarenote 15, 11, 7, 1408 + squarenote 15, 8, 7, 1536 + squarenote 15, 4, 7, 1664 + squarenote 15, 1, 7, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index dc952152..47d7c88b 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_1_Ch4: duty 1 pitchenvelope 1, 6 - squarenote 15, 210, 0, 5 + squarenote 15, 13, 2, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 74c5ed99..dccc1d3c 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_3_Ch4: duty 1 pitchenvelope 1, 6 - squarenote 15, 210, 0, 5 + squarenote 15, 13, 2, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 1959cc5d..8884a204 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ SFX_Tink_1_Ch4: duty 2 pitchenvelope 3, -2 - squarenote 4, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index 99fc105b..f1cc705d 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ SFX_Tink_2_Ch4: duty 2 pitchenvelope 3, -2 - squarenote 4, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index e586402f..43d32f5b 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ SFX_Tink_3_Ch4: duty 2 pitchenvelope 3, -2 - squarenote 4, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 90be65db..97c6d007 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_1_Ch4: duty 2 pitchenvelope 1, 5 - squarenote 15, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index f814056e..26e58263 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_3_Ch4: duty 2 pitchenvelope 1, 5 - squarenote 15, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 3817adec..f4d08545 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ SFX_Triangle1_1_Ch7: - noisenote 0, 81, 42 + noisenote 0, 5, 1, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index cac270ab..0517ba84 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ SFX_Triangle1_2_Ch7: - noisenote 0, 81, 42 + noisenote 0, 5, 1, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index a0cd81b2..1979b3f9 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ SFX_Triangle1_3_Ch7: - noisenote 0, 81, 42 + noisenote 0, 5, 1, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 1a6c4ca5..aa6b472e 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ SFX_Triangle2_1_Ch7: - noisenote 1, 65, 43 - noisenote 0, 97, 42 + noisenote 1, 4, 1, 43 + noisenote 0, 6, 1, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index 48fc2086..b9f31022 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ SFX_Triangle2_2_Ch7: - noisenote 1, 65, 43 - noisenote 0, 97, 42 + noisenote 1, 4, 1, 43 + noisenote 0, 6, 1, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index d3c98bad..61dcb880 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ SFX_Triangle2_3_Ch7: - noisenote 1, 65, 43 - noisenote 0, 97, 42 + noisenote 1, 4, 1, 43 + noisenote 0, 6, 1, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index 172c4141..13700a11 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ SFX_Triangle3_1_Ch7: - noisenote 2, 145, 40 - noisenote 0, 113, 24 + noisenote 2, 9, 1, 40 + noisenote 0, 7, 1, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index f2ba1804..5555fc40 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ SFX_Triangle3_2_Ch7: - noisenote 2, 145, 40 - noisenote 0, 113, 24 + noisenote 2, 9, 1, 40 + noisenote 0, 7, 1, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 654d9e0d..1237c952 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ SFX_Triangle3_3_Ch7: - noisenote 2, 145, 40 - noisenote 0, 113, 24 + noisenote 2, 9, 1, 40 + noisenote 0, 7, 1, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 2203d40a..ad4ad076 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ SFX_Turn_Off_PC_1_Ch4: duty 2 - squarenote 4, 240, 0, 6 - squarenote 4, 240, 0, 4 - squarenote 4, 240, 0, 2 + squarenote 4, 15, 0, 1536 + squarenote 4, 15, 0, 1024 + squarenote 4, 15, 0, 512 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index ba079c05..842d6b9e 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,7 +1,7 @@ SFX_Turn_Off_PC_3_Ch4: duty 2 - squarenote 4, 240, 0, 6 - squarenote 4, 240, 0, 4 - squarenote 4, 240, 0, 2 + squarenote 4, 15, 0, 1536 + squarenote 4, 15, 0, 1024 + squarenote 4, 15, 0, 512 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 39e992b3..6b84b7f3 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ SFX_Turn_On_PC_1_Ch4: duty 2 - squarenote 15, 242, 192, 7 + squarenote 15, 15, 2, 1984 squarenote 15, 0, 0, 0 - squarenote 3, 161, 128, 7 - squarenote 3, 161, 0, 7 - squarenote 3, 161, 64, 7 - squarenote 3, 161, 0, 7 - squarenote 3, 161, 128, 7 - squarenote 3, 161, 0, 7 - squarenote 3, 161, 192, 7 - squarenote 8, 161, 0, 7 + squarenote 3, 10, 1, 1920 + squarenote 3, 10, 1, 1792 + squarenote 3, 10, 1, 1856 + squarenote 3, 10, 1, 1792 + squarenote 3, 10, 1, 1920 + squarenote 3, 10, 1, 1792 + squarenote 3, 10, 1, 1984 + squarenote 8, 10, 1, 1792 endchannel diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index e7500dc9..281f4567 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,14 +1,14 @@ SFX_Turn_On_PC_3_Ch4: duty 2 - squarenote 15, 242, 192, 7 + squarenote 15, 15, 2, 1984 squarenote 15, 0, 0, 0 squarenote 15, 0, 0, 0 - squarenote 3, 129, 128, 7 - squarenote 3, 129, 0, 7 - squarenote 3, 129, 64, 7 - squarenote 3, 129, 0, 7 - squarenote 3, 129, 128, 7 - squarenote 3, 129, 0, 7 - squarenote 3, 129, 192, 7 - squarenote 3, 129, 0, 7 + squarenote 3, 8, 1, 1920 + squarenote 3, 8, 1, 1792 + squarenote 3, 8, 1, 1856 + squarenote 3, 8, 1, 1792 + squarenote 3, 8, 1, 1920 + squarenote 3, 8, 1, 1792 + squarenote 3, 8, 1, 1984 + squarenote 3, 8, 1, 1792 endchannel diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index 9d1886cf..e805a333 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ -SFX_02_unused_Ch4: +SFX_Unused_1_Ch4: dutycycle 240 - squarenote 15, 224, 128, 7 - squarenote 15, 240, 132, 7 - squarenote 15, 195, 224, 5 - squarenote 15, 196, 0, 6 - squarenote 10, 108, 128, 7 - squarenote 8, 113, 132, 7 + squarenote 15, 14, 0, 1920 + squarenote 15, 15, 0, 1924 + squarenote 15, 12, 3, 1504 + squarenote 15, 12, 4, 1536 + squarenote 10, 6, -4, 1920 + squarenote 8, 7, 1, 1924 endchannel -SFX_02_unused_Ch5: +SFX_Unused_1_Ch5: dutycycle 5 - squarenote 15, 160, 65, 7 - squarenote 15, 176, 67, 7 - squarenote 15, 147, 177, 5 - squarenote 15, 148, 193, 5 - squarenote 10, 76, 65, 7 - squarenote 8, 49, 70, 7 + squarenote 15, 10, 0, 1857 + squarenote 15, 11, 0, 1859 + squarenote 15, 9, 3, 1457 + squarenote 15, 9, 4, 1473 + squarenote 10, 4, -4, 1857 + squarenote 8, 3, 1, 1862 endchannel -SFX_02_unused_Ch7: - noisenote 2, 242, 76 - noisenote 6, 224, 58 - noisenote 15, 208, 58 - noisenote 8, 208, 44 - noisenote 6, 230, 76 - noisenote 12, 125, 76 - noisenote 15, 211, 76 +SFX_Unused_1_Ch7: + noisenote 2, 15, 2, 76 + noisenote 6, 14, 0, 58 + noisenote 15, 13, 0, 58 + noisenote 8, 13, 0, 44 + noisenote 6, 14, 6, 76 + noisenote 12, 7, -5, 76 + noisenote 15, 13, 3, 76 endchannel diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index cf793ec3..fb86989c 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ -SFX_08_unused_Ch4: +SFX_Unused_2_Ch4: dutycycle 240 - squarenote 15, 224, 128, 7 - squarenote 15, 240, 132, 7 - squarenote 15, 195, 224, 5 - squarenote 15, 196, 0, 6 - squarenote 10, 108, 128, 7 - squarenote 8, 113, 132, 7 + squarenote 15, 14, 0, 1920 + squarenote 15, 15, 0, 1924 + squarenote 15, 12, 3, 1504 + squarenote 15, 12, 4, 1536 + squarenote 10, 6, -4, 1920 + squarenote 8, 7, 1, 1924 endchannel -SFX_08_unused_Ch5: +SFX_Unused_2_Ch5: dutycycle 5 - squarenote 15, 160, 65, 7 - squarenote 15, 176, 67, 7 - squarenote 15, 147, 177, 5 - squarenote 15, 148, 193, 5 - squarenote 10, 76, 65, 7 - squarenote 8, 49, 70, 7 + squarenote 15, 10, 0, 1857 + squarenote 15, 11, 0, 1859 + squarenote 15, 9, 3, 1457 + squarenote 15, 9, 4, 1473 + squarenote 10, 4, -4, 1857 + squarenote 8, 3, 1, 1862 endchannel -SFX_08_unused_Ch7: - noisenote 2, 242, 76 - noisenote 6, 224, 58 - noisenote 15, 208, 58 - noisenote 8, 208, 44 - noisenote 6, 230, 76 - noisenote 12, 125, 76 - noisenote 15, 211, 76 +SFX_Unused_2_Ch7: + noisenote 2, 15, 2, 76 + noisenote 6, 14, 0, 58 + noisenote 15, 13, 0, 58 + noisenote 8, 13, 0, 44 + noisenote 6, 14, 6, 76 + noisenote 12, 7, -5, 76 + noisenote 15, 13, 3, 76 endchannel diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index b849f5fd..30d8e534 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ -SFX_1f_unused_Ch4: +SFX_Unused_3_Ch4: dutycycle 240 - squarenote 15, 224, 128, 7 - squarenote 15, 240, 132, 7 - squarenote 15, 195, 224, 5 - squarenote 15, 196, 0, 6 - squarenote 10, 108, 128, 7 - squarenote 8, 113, 132, 7 + squarenote 15, 14, 0, 1920 + squarenote 15, 15, 0, 1924 + squarenote 15, 12, 3, 1504 + squarenote 15, 12, 4, 1536 + squarenote 10, 6, -4, 1920 + squarenote 8, 7, 1, 1924 endchannel -SFX_1f_unused_Ch5: +SFX_Unused_3_Ch5: dutycycle 5 - squarenote 15, 160, 65, 7 - squarenote 15, 176, 67, 7 - squarenote 15, 147, 177, 5 - squarenote 15, 148, 193, 5 - squarenote 10, 76, 65, 7 - squarenote 8, 49, 70, 7 + squarenote 15, 10, 0, 1857 + squarenote 15, 11, 0, 1859 + squarenote 15, 9, 3, 1457 + squarenote 15, 9, 4, 1473 + squarenote 10, 4, -4, 1857 + squarenote 8, 3, 1, 1862 endchannel -SFX_1f_unused_Ch7: - noisenote 2, 242, 76 - noisenote 6, 224, 58 - noisenote 15, 208, 58 - noisenote 8, 208, 44 - noisenote 6, 230, 76 - noisenote 12, 125, 76 - noisenote 15, 211, 76 +SFX_Unused_3_Ch7: + noisenote 2, 15, 2, 76 + noisenote 6, 14, 0, 58 + noisenote 15, 13, 0, 58 + noisenote 8, 13, 0, 44 + noisenote 6, 14, 6, 76 + noisenote 12, 7, -5, 76 + noisenote 15, 13, 3, 76 endchannel diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index 84845db8..7699d841 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ SFX_Vine_Whip_Ch7: - noisenote 1, 194, 51 - noisenote 2, 242, 33 - noisenote 1, 226, 51 - noisenote 1, 194, 50 - noisenote 1, 146, 18 - noisenote 1, 178, 49 - noisenote 12, 145, 16 - noisenote 8, 242, 65 + noisenote 1, 12, 2, 51 + noisenote 2, 15, 2, 33 + noisenote 1, 14, 2, 51 + noisenote 1, 12, 2, 50 + noisenote 1, 9, 2, 18 + noisenote 1, 11, 2, 49 + noisenote 12, 9, 1, 16 + noisenote 8, 15, 2, 65 endchannel diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 14b1e66f..fe1daefb 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_1_Ch4: duty 1 pitchenvelope 3, -2 - squarenote 4, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 4, 226, 0, 5 + squarenote 4, 14, 2, 1280 pitchenvelope 3, -2 - squarenote 4, 242, 0, 7 + squarenote 4, 15, 2, 1792 pitchenvelope 2, 2 - squarenote 15, 226, 0, 7 + squarenote 15, 14, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index b6dc4a7d..3ed89f24 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_3_Ch4: duty 1 pitchenvelope 3, -2 - squarenote 4, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 4, 226, 0, 5 + squarenote 4, 14, 2, 1280 pitchenvelope 3, -2 - squarenote 4, 242, 0, 7 + squarenote 4, 15, 2, 1792 pitchenvelope 2, 2 - squarenote 15, 226, 0, 7 + squarenote 15, 14, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 8195a04d..6d7b45c8 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -40,17 +40,26 @@ pitchenvelope: MACRO ENDC ENDM +;format: duty, volume, volume change, pitch squarenote: MACRO db $20 | \1 - db \2 - db \3 - db \4 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC + dw \4 ENDM +;format: duty, volume, volume change, pitch noisenote: MACRO db $20 | \1 - db \2 - db \3 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC + db \4 ENDM ;format: pitch length (in 16ths) -- cgit v1.2.3 From 32c371b1d3bf5650fa77ada4bc15be6bcce9ea59 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Mon, 19 Mar 2018 00:18:50 -0500 Subject: sfxnote parameter 1 is length, not duty also bumb submodule --- extras | 2 +- macros/audio_macros.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extras b/extras index 0e179893..be6d6c9c 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 0e1798937a4bf723813574281d0dc12c471c9199 +Subproject commit be6d6c9ce9a86231482eafacd4be867285809366 diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 6d7b45c8..d4914002 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -40,7 +40,7 @@ pitchenvelope: MACRO ENDC ENDM -;format: duty, volume, volume change, pitch +;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch squarenote: MACRO db $20 | \1 IF \3 < 0 @@ -51,7 +51,7 @@ squarenote: MACRO dw \4 ENDM -;format: duty, volume, volume change, pitch +;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch noisenote: MACRO db $20 | \1 IF \3 < 0 -- cgit v1.2.3 From 8251c6138efdbe30a4af015bb9ee693c9c214f82 Mon Sep 17 00:00:00 2001 From: bitman44 Date: Tue, 20 Mar 2018 20:27:28 -0500 Subject: Replaced instances of Mon### with the Pokemon's name --- data/evos_moves.asm | 955 ++++++++++++++++++--------------------------- engine/menu/party_menu.asm | 2 +- 2 files changed, 383 insertions(+), 574 deletions(-) diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 2371fb83..f6281b3d 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,197 +1,196 @@ EvosMovesPointerTable: - dw Mon112_EvosMoves - dw Mon115_EvosMoves - dw Mon032_EvosMoves - dw Mon035_EvosMoves - dw Mon021_EvosMoves - dw Mon100_EvosMoves - dw Mon034_EvosMoves - dw Mon080_EvosMoves - dw Mon002_EvosMoves - dw Mon103_EvosMoves - dw Mon108_EvosMoves - dw Mon102_EvosMoves - dw Mon088_EvosMoves - dw Mon094_EvosMoves - dw Mon029_EvosMoves - dw Mon031_EvosMoves - dw Mon104_EvosMoves - dw Mon111_EvosMoves - dw Mon131_EvosMoves - dw Mon059_EvosMoves - dw Mon151_EvosMoves - dw Mon130_EvosMoves - dw Mon090_EvosMoves - dw Mon072_EvosMoves - dw Mon092_EvosMoves - dw Mon123_EvosMoves - dw Mon120_EvosMoves - dw Mon009_EvosMoves - dw Mon127_EvosMoves - dw Mon114_EvosMoves - dw Mon152_EvosMoves ;MissingNo - dw Mon153_EvosMoves ;MissingNo - dw Mon058_EvosMoves - dw Mon095_EvosMoves - dw Mon022_EvosMoves - dw Mon016_EvosMoves - dw Mon079_EvosMoves - dw Mon064_EvosMoves - dw Mon075_EvosMoves - dw Mon113_EvosMoves - dw Mon067_EvosMoves - dw Mon122_EvosMoves - dw Mon106_EvosMoves - dw Mon107_EvosMoves - dw Mon024_EvosMoves - dw Mon047_EvosMoves - dw Mon054_EvosMoves - dw Mon096_EvosMoves - dw Mon076_EvosMoves - dw Mon154_EvosMoves ;MissingNo - dw Mon126_EvosMoves - dw Mon155_EvosMoves ;MissingNo - dw Mon125_EvosMoves - dw Mon082_EvosMoves - dw Mon109_EvosMoves - dw Mon156_EvosMoves ;MissingNo - dw Mon056_EvosMoves - dw Mon086_EvosMoves - dw Mon050_EvosMoves - dw Mon128_EvosMoves - dw Mon157_EvosMoves ;MissingNo - dw Mon158_EvosMoves ;MissingNo - dw Mon159_EvosMoves ;MissingNo - dw Mon083_EvosMoves - dw Mon048_EvosMoves - dw Mon149_EvosMoves - dw Mon160_EvosMoves ;MissingNo - dw Mon161_EvosMoves ;MissingNo - dw Mon162_EvosMoves ;MissingNo - dw Mon084_EvosMoves - dw Mon060_EvosMoves - dw Mon124_EvosMoves - dw Mon146_EvosMoves - dw Mon144_EvosMoves - dw Mon145_EvosMoves - dw Mon132_EvosMoves - dw Mon052_EvosMoves - dw Mon098_EvosMoves - dw Mon163_EvosMoves ;MissingNo - dw Mon164_EvosMoves ;MissingNo - dw Mon165_EvosMoves ;MissingNo - dw Mon037_EvosMoves - dw Mon038_EvosMoves - dw Mon025_EvosMoves - dw Mon026_EvosMoves - dw Mon166_EvosMoves ;MissingNo - dw Mon167_EvosMoves ;MissingNo - dw Mon147_EvosMoves - dw Mon148_EvosMoves - dw Mon140_EvosMoves - dw Mon141_EvosMoves - dw Mon116_EvosMoves - dw Mon117_EvosMoves - dw Mon168_EvosMoves ;MissingNo - dw Mon169_EvosMoves ;MissingNo - dw Mon027_EvosMoves - dw Mon028_EvosMoves - dw Mon138_EvosMoves - dw Mon139_EvosMoves - dw Mon039_EvosMoves - dw Mon040_EvosMoves - dw Mon133_EvosMoves - dw Mon136_EvosMoves - dw Mon135_EvosMoves - dw Mon134_EvosMoves - dw Mon066_EvosMoves - dw Mon041_EvosMoves - dw Mon023_EvosMoves - dw Mon046_EvosMoves - dw Mon061_EvosMoves - dw Mon062_EvosMoves - dw Mon013_EvosMoves - dw Mon014_EvosMoves - dw Mon015_EvosMoves - dw Mon170_EvosMoves ;MissingNo - dw Mon085_EvosMoves - dw Mon057_EvosMoves - dw Mon051_EvosMoves - dw Mon049_EvosMoves - dw Mon087_EvosMoves - dw Mon171_EvosMoves ;MissingNo - dw Mon172_EvosMoves ;MissingNo - dw Mon010_EvosMoves - dw Mon011_EvosMoves - dw Mon012_EvosMoves - dw Mon068_EvosMoves - dw Mon173_EvosMoves ;MissingNo - dw Mon055_EvosMoves - dw Mon097_EvosMoves - dw Mon042_EvosMoves - dw Mon150_EvosMoves - dw Mon143_EvosMoves - dw Mon129_EvosMoves - dw Mon174_EvosMoves ;MissingNo - dw Mon175_EvosMoves ;MissingNo - dw Mon089_EvosMoves - dw Mon176_EvosMoves ;MissingNo - dw Mon099_EvosMoves - dw Mon091_EvosMoves - dw Mon177_EvosMoves ;MissingNo - dw Mon101_EvosMoves - dw Mon036_EvosMoves - dw Mon110_EvosMoves - dw Mon053_EvosMoves - dw Mon105_EvosMoves - dw Mon178_EvosMoves ;MissingNo - dw Mon093_EvosMoves - dw Mon063_EvosMoves - dw Mon065_EvosMoves - dw Mon017_EvosMoves - dw Mon018_EvosMoves - dw Mon121_EvosMoves - dw Mon001_EvosMoves - dw Mon003_EvosMoves - dw Mon073_EvosMoves - dw Mon179_EvosMoves ;MissingNo - dw Mon118_EvosMoves - dw Mon119_EvosMoves - dw Mon180_EvosMoves ;MissingNo - dw Mon181_EvosMoves ;MissingNo - dw Mon182_EvosMoves ;MissingNo - dw Mon183_EvosMoves ;MissingNo - dw Mon077_EvosMoves - dw Mon078_EvosMoves - dw Mon019_EvosMoves - dw Mon020_EvosMoves - dw Mon033_EvosMoves - dw Mon030_EvosMoves - dw Mon074_EvosMoves - dw Mon137_EvosMoves - dw Mon142_EvosMoves - dw Mon184_EvosMoves ;MissingNo - dw Mon081_EvosMoves - dw Mon185_EvosMoves ;MissingNo - dw Mon186_EvosMoves ;MissingNo - dw Mon004_EvosMoves - dw Mon007_EvosMoves - dw Mon005_EvosMoves - dw Mon008_EvosMoves - dw Mon006_EvosMoves - dw Mon187_EvosMoves ;MissingNo - dw Mon188_EvosMoves ;MissingNo - dw Mon189_EvosMoves ;MissingNo - dw Mon190_EvosMoves ;MissingNo - dw Mon043_EvosMoves - dw Mon044_EvosMoves - dw Mon045_EvosMoves - dw Mon069_EvosMoves - dw Mon070_EvosMoves - dw Mon071_EvosMoves - -Mon112_EvosMoves: -;RHYDON + dw RHYDON_EvosMoves + dw KANGASKHAN_EvosMoves + dw NIDORAN_M_EvosMoves + dw CLEFAIRY_EvosMoves + dw SPEAROW_EvosMoves + dw VOLTORB_EvosMoves + dw NIDOKING_EvosMoves + dw SLOWBRO_EvosMoves + dw IVYSAUR_EvosMoves + dw EXEGGUTOR_EvosMoves + dw LICKITUNG_EvosMoves + dw EXEGGCUTE_EvosMoves + dw GRIMER_EvosMoves + dw GENGAR_EvosMoves + dw NIDORAN_F_EvosMoves + dw NIDOQUEEN_EvosMoves + dw CUBONE_EvosMoves + dw RHYHORN_EvosMoves + dw LAPRAS_EvosMoves + dw ARCANINE_EvosMoves + dw MEW_EvosMoves + dw GYARADOS_EvosMoves + dw SHELLDER_EvosMoves + dw TENTACOOL_EvosMoves + dw GASTLY_EvosMoves + dw SCYTHER_EvosMoves + dw STARYU_EvosMoves + dw BLASTOISE_EvosMoves + dw PINSIR_EvosMoves + dw TANGELA_EvosMoves + dw MISSINGNO_1F_EvosMoves + dw MISSINGNO_20_EvosMoves + dw GROWLITHE_EvosMoves + dw ONIX_EvosMoves + dw FEAROW_EvosMoves + dw PIDGEY_EvosMoves + dw SLOWPOKE_EvosMoves + dw KADABRA_EvosMoves + dw GRAVELER_EvosMoves + dw CHANSEY_EvosMoves + dw MACHOKE_EvosMoves + dw MR_MIME_EvosMoves + dw HITMONLEE_EvosMoves + dw HITMONCHAN_EvosMoves + dw ARBOK_EvosMoves + dw PARASECT_EvosMoves + dw PSYDUCK_EvosMoves + dw DROWZEE_EvosMoves + dw GOLEM_EvosMoves + dw MISSINGNO_32_EvosMoves + dw MAGMAR_EvosMoves + dw MISSINGNO_34_EvosMoves + dw ELECTABUZZ_EvosMoves + dw MAGNETON_EvosMoves + dw KOFFING_EvosMoves + dw MISSINGNO_38_EvosMoves + dw MANKEY_EvosMoves + dw SEEL_EvosMoves + dw DIGLETT_EvosMoves + dw TAUROS_EvosMoves + dw MISSINGNO_3D_EvosMoves + dw MISSINGNO_3E_EvosMoves + dw MISSINGNO_3F_EvosMoves + dw FARFETCHD_EvosMoves + dw VENONAT_EvosMoves + dw DRAGONITE_EvosMoves + dw MISSINGNO_43_EvosMoves + dw MISSINGNO_44_EvosMoves + dw MISSINGNO_45_EvosMoves + dw DODUO_EvosMoves + dw POLIWAG_EvosMoves + dw JYNX_EvosMoves + dw MOLTRES_EvosMoves + dw ARTICUNO_EvosMoves + dw ZAPDOS_EvosMoves + dw DITTO_EvosMoves + dw MEOWTH_EvosMoves + dw KRABBY_EvosMoves + dw MISSINGNO_4F_EvosMoves + dw MISSINGNO_50_EvosMoves + dw MISSINGNO_51_EvosMoves + dw VULPIX_EvosMoves + dw NINETALES_EvosMoves + dw PIKACHU_EvosMoves + dw RAICHU_EvosMoves + dw MISSINGNO_56_EvosMoves + dw MISSINGNO_57_EvosMoves + dw DRATINI_EvosMoves + dw DRAGONAIR_EvosMoves + dw KABUTO_EvosMoves + dw KABUTOPS_EvosMoves + dw HORSEA_EvosMoves + dw SEADRA_EvosMoves + dw MISSINGNO_5E_EvosMoves + dw MISSINGNO_5F_EvosMoves + dw SANDSHREW_EvosMoves + dw SANDSLASH_EvosMoves + dw OMANYTE_EvosMoves + dw OMASTAR_EvosMoves + dw JIGGLYPUFF_EvosMoves + dw WIGGLYTUFF_EvosMoves + dw EEVEE_EvosMoves + dw FLAREON_EvosMoves + dw JOLTEON_EvosMoves + dw VAPOREON_EvosMoves + dw MACHOP_EvosMoves + dw ZUBAT_EvosMoves + dw EKANS_EvosMoves + dw PARAS_EvosMoves + dw POLIWHIRL_EvosMoves + dw POLIWRATH_EvosMoves + dw WEEDLE_EvosMoves + dw KAKUNA_EvosMoves + dw BEEDRILL_EvosMoves + dw MISSINGNO_73_EvosMoves + dw DODRIO_EvosMoves + dw PRIMEAPE_EvosMoves + dw DUGTRIO_EvosMoves + dw VENOMOTH_EvosMoves + dw DEWGONG_EvosMoves + dw MISSINGNO_79_EvosMoves + dw MISSINGNO_7A_EvosMoves + dw CATERPIE_EvosMoves + dw METAPOD_EvosMoves + dw BUTTERFREE_EvosMoves + dw MACHAMP_EvosMoves + dw MISSINGNO_7F_EvosMoves + dw GOLDUCK_EvosMoves + dw HYPNO_EvosMoves + dw GOLBAT_EvosMoves + dw MEWTWO_EvosMoves + dw SNORLAX_EvosMoves + dw MAGIKARP_EvosMoves + dw MISSINGNO_86_EvosMoves + dw MISSINGNO_87_EvosMoves + dw MUK_EvosMoves + dw MISSINGNO_8A_EvosMoves + dw KINGLER_EvosMoves + dw CLOYSTER_EvosMoves + dw MISSINGNO_8C_EvosMoves + dw ELECTRODE_EvosMoves + dw CLEFABLE_EvosMoves + dw WEEZING_EvosMoves + dw PERSIAN_EvosMoves + dw MAROWAK_EvosMoves + dw MISSINGNO_92_EvosMoves + dw HAUNTER_EvosMoves + dw ABRA_EvosMoves + dw ALAKAZAM_EvosMoves + dw PIDGEOTTO_EvosMoves + dw PIDGEOT_EvosMoves + dw STARMIE_EvosMoves + dw BULBASAUR_EvosMoves + dw VENUSAUR_EvosMoves + dw TENTACRUEL_EvosMoves + dw MISSINGNO_9C_EvosMoves + dw GOLDEEN_EvosMoves + dw SEAKING_EvosMoves + dw MISSINGNO_9F_EvosMoves + dw MISSINGNO_A0_EvosMoves + dw MISSINGNO_A1_EvosMoves + dw MISSINGNO_A2_EvosMoves + dw PONYTA_EvosMoves + dw RAPIDASH_EvosMoves + dw RATTATA_EvosMoves + dw RATICATE_EvosMoves + dw NIDORINO_EvosMoves + dw NIDORINA_EvosMoves + dw GEODUDE_EvosMoves + dw PORYGON_EvosMoves + dw AERODACTYL_EvosMoves + dw MISSINGNO_AC_EvosMoves + dw MAGNEMITE_EvosMoves + dw MISSINGNO_AE_EvosMoves + dw MISSINGNO_AF_EvosMoves + dw CHARMANDER_EvosMoves + dw SQUIRTLE_EvosMoves + dw CHARMELEON_EvosMoves + dw WARTORTLE_EvosMoves + dw CHARIZARD_EvosMoves + dw MISSINGNO_B5_EvosMoves + dw FOSSIL_KABUTOPS_EvosMoves + dw FOSSIL_AERODACTYL_EvosMoves + dw MON_GHOST_EvosMoves + dw ODDISH_EvosMoves + dw GLOOM_EvosMoves + dw VILEPLUME_EvosMoves + dw BELLSPROUT_EvosMoves + dw WEEPINBELL_EvosMoves + dw VICTREEBEL_EvosMoves + +RHYDON_EvosMoves ;Evolutions db 0 ;Learnset @@ -203,8 +202,7 @@ Mon112_EvosMoves: db 64,TAKE_DOWN db 0 -Mon115_EvosMoves: -;KANGASKHAN +KANGASKHAN_EvosMoves ;Evolutions db 0 ;Learnset @@ -215,8 +213,7 @@ Mon115_EvosMoves: db 46,DIZZY_PUNCH db 0 -Mon032_EvosMoves: -;NIDORAN_M +NIDORAN_M_EvosMoves ;Evolutions db EV_LEVEL,16,NIDORINO db 0 @@ -229,8 +226,7 @@ Mon032_EvosMoves: db 43,DOUBLE_KICK db 0 -Mon035_EvosMoves: -;CLEFAIRY +CLEFAIRY_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE db 0 @@ -243,8 +239,7 @@ Mon035_EvosMoves: db 48,LIGHT_SCREEN db 0 -Mon021_EvosMoves: -;SPEAROW +SPEAROW_EvosMoves ;Evolutions db EV_LEVEL,20,FEAROW db 0 @@ -256,8 +251,7 @@ Mon021_EvosMoves: db 36,AGILITY db 0 -Mon100_EvosMoves: -;VOLTORB +VOLTORB_EvosMoves ;Evolutions db EV_LEVEL,30,ELECTRODE db 0 @@ -269,8 +263,7 @@ Mon100_EvosMoves: db 43,EXPLOSION db 0 -Mon034_EvosMoves: -;NIDOKING +NIDOKING_EvosMoves ;Evolutions db 0 ;Learnset @@ -279,8 +272,7 @@ Mon034_EvosMoves: db 23,THRASH db 0 -Mon080_EvosMoves: -;SLOWBRO +SLOWBRO_EvosMoves ;Evolutions db 0 ;Learnset @@ -293,8 +285,7 @@ Mon080_EvosMoves: db 55,PSYCHIC_M db 0 -Mon002_EvosMoves: -;IVYSAUR +IVYSAUR_EvosMoves ;Evolutions db EV_LEVEL,32,VENUSAUR db 0 @@ -308,16 +299,14 @@ Mon002_EvosMoves: db 54,SOLARBEAM db 0 -Mon103_EvosMoves: -;EXEGGUTOR +EXEGGUTOR_EvosMoves ;Evolutions db 0 ;Learnset db 28,STOMP db 0 -Mon108_EvosMoves: -;LICKITUNG +LICKITUNG_EvosMoves ;Evolutions db 0 ;Learnset @@ -328,8 +317,7 @@ Mon108_EvosMoves: db 39,SCREECH db 0 -Mon102_EvosMoves: -;EXEGGCUTE +EXEGGCUTE_EvosMoves ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR db 0 @@ -342,8 +330,7 @@ Mon102_EvosMoves: db 48,SLEEP_POWDER db 0 -Mon088_EvosMoves: -;GRIMER +GRIMER_EvosMoves ;Evolutions db EV_LEVEL,38,MUK db 0 @@ -356,8 +343,7 @@ Mon088_EvosMoves: db 55,ACID_ARMOR db 0 -Mon094_EvosMoves: -;GENGAR +GENGAR_EvosMoves ;Evolutions db 0 ;Learnset @@ -365,8 +351,7 @@ Mon094_EvosMoves: db 38,DREAM_EATER db 0 -Mon029_EvosMoves: -;NIDORAN_F +NIDORAN_F_EvosMoves ;Evolutions db EV_LEVEL,16,NIDORINA db 0 @@ -379,8 +364,7 @@ Mon029_EvosMoves: db 43,DOUBLE_KICK db 0 -Mon031_EvosMoves: -;NIDOQUEEN +NIDOQUEEN_EvosMoves ;Evolutions db 0 ;Learnset @@ -389,8 +373,7 @@ Mon031_EvosMoves: db 23,BODY_SLAM db 0 -Mon104_EvosMoves: -;CUBONE +CUBONE_EvosMoves ;Evolutions db EV_LEVEL,28,MAROWAK db 0 @@ -402,8 +385,7 @@ Mon104_EvosMoves: db 46,RAGE db 0 -Mon111_EvosMoves: -;RHYHORN +RHYHORN_EvosMoves ;Evolutions db EV_LEVEL,42,RHYDON db 0 @@ -416,8 +398,7 @@ Mon111_EvosMoves: db 55,TAKE_DOWN db 0 -Mon131_EvosMoves: -;LAPRAS +LAPRAS_EvosMoves ;Evolutions db 0 ;Learnset @@ -429,15 +410,13 @@ Mon131_EvosMoves: db 46,HYDRO_PUMP db 0 -Mon059_EvosMoves: -;ARCANINE +ARCANINE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon151_EvosMoves: -;MEW +MEW_EvosMoves ;Evolutions db 0 ;Learnset @@ -447,8 +426,7 @@ Mon151_EvosMoves: db 40,PSYCHIC_M db 0 -Mon130_EvosMoves: -;GYARADOS +GYARADOS_EvosMoves ;Evolutions db 0 ;Learnset @@ -459,8 +437,7 @@ Mon130_EvosMoves: db 52,HYPER_BEAM db 0 -Mon090_EvosMoves: -;SHELLDER +SHELLDER_EvosMoves ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER db 0 @@ -472,8 +449,7 @@ Mon090_EvosMoves: db 50,ICE_BEAM db 0 -Mon072_EvosMoves: -;TENTACOOL +TENTACOOL_EvosMoves ;Evolutions db EV_LEVEL,30,TENTACRUEL db 0 @@ -488,8 +464,7 @@ Mon072_EvosMoves: db 48,HYDRO_PUMP db 0 -Mon092_EvosMoves: -;GASTLY +GASTLY_EvosMoves ;Evolutions db EV_LEVEL,25,HAUNTER db 0 @@ -498,8 +473,7 @@ Mon092_EvosMoves: db 35,DREAM_EATER db 0 -Mon123_EvosMoves: -;SCYTHER +SCYTHER_EvosMoves ;Evolutions db 0 ;Learnset @@ -511,8 +485,7 @@ Mon123_EvosMoves: db 42,AGILITY db 0 -Mon120_EvosMoves: -;STARYU +STARYU_EvosMoves ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE db 0 @@ -526,8 +499,7 @@ Mon120_EvosMoves: db 47,HYDRO_PUMP db 0 -Mon009_EvosMoves: -;BLASTOISE +BLASTOISE_EvosMoves ;Evolutions db 0 ;Learnset @@ -539,8 +511,7 @@ Mon009_EvosMoves: db 52,HYDRO_PUMP db 0 -Mon127_EvosMoves: -;PINSIR +PINSIR_EvosMoves ;Evolutions db 0 ;Learnset @@ -552,8 +523,7 @@ Mon127_EvosMoves: db 54,SWORDS_DANCE db 0 -Mon114_EvosMoves: -;TANGELA +TANGELA_EvosMoves ;Evolutions db 0 ;Learnset @@ -565,22 +535,19 @@ Mon114_EvosMoves: db 49,GROWTH db 0 -Mon152_EvosMoves: -;MISSINGNO +MISSINGNO_1F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon153_EvosMoves: -;MISSINGNO +MISSINGNO_20_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon058_EvosMoves: -;GROWLITHE +GROWLITHE_EvosMoves ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE db 0 @@ -592,8 +559,7 @@ Mon058_EvosMoves: db 50,FLAMETHROWER db 0 -Mon095_EvosMoves: -;ONIX +ONIX_EvosMoves ;Evolutions db 0 ;Learnset @@ -604,8 +570,7 @@ Mon095_EvosMoves: db 43,HARDEN db 0 -Mon022_EvosMoves: -;FEAROW +FEAROW_EvosMoves ;Evolutions db 0 ;Learnset @@ -616,8 +581,7 @@ Mon022_EvosMoves: db 43,AGILITY db 0 -Mon016_EvosMoves: -;PIDGEY +PIDGEY_EvosMoves ;Evolutions db EV_LEVEL,18,PIDGEOTTO db 0 @@ -630,8 +594,7 @@ Mon016_EvosMoves: db 44,MIRROR_MOVE db 0 -Mon079_EvosMoves: -;SLOWPOKE +SLOWPOKE_EvosMoves ;Evolutions db EV_LEVEL,37,SLOWBRO db 0 @@ -644,8 +607,7 @@ Mon079_EvosMoves: db 48,PSYCHIC_M db 0 -Mon064_EvosMoves: -;KADABRA +KADABRA_EvosMoves ;Evolutions db EV_TRADE,1,ALAKAZAM db 0 @@ -658,8 +620,7 @@ Mon064_EvosMoves: db 42,REFLECT db 0 -Mon075_EvosMoves: -;GRAVELER +GRAVELER_EvosMoves ;Evolutions db EV_TRADE,1,GOLEM db 0 @@ -672,8 +633,7 @@ Mon075_EvosMoves: db 43,EXPLOSION db 0 -Mon113_EvosMoves: -;CHANSEY +CHANSEY_EvosMoves ;Evolutions db 0 ;Learnset @@ -685,8 +645,7 @@ Mon113_EvosMoves: db 54,DOUBLE_EDGE db 0 -Mon067_EvosMoves: -;MACHOKE +MACHOKE_EvosMoves ;Evolutions db EV_TRADE,1,MACHAMP db 0 @@ -698,8 +657,7 @@ Mon067_EvosMoves: db 52,SUBMISSION db 0 -Mon122_EvosMoves: -;MR_MIME +MR_MIME_EvosMoves ;Evolutions db 0 ;Learnset @@ -710,8 +668,7 @@ Mon122_EvosMoves: db 47,SUBSTITUTE db 0 -Mon106_EvosMoves: -;HITMONLEE +HITMONLEE_EvosMoves ;Evolutions db 0 ;Learnset @@ -722,8 +679,7 @@ Mon106_EvosMoves: db 53,MEGA_KICK db 0 -Mon107_EvosMoves: -;HITMONCHAN +HITMONCHAN_EvosMoves ;Evolutions db 0 ;Learnset @@ -734,8 +690,7 @@ Mon107_EvosMoves: db 53,COUNTER db 0 -Mon024_EvosMoves: -;ARBOK +ARBOK_EvosMoves ;Evolutions db 0 ;Learnset @@ -746,8 +701,7 @@ Mon024_EvosMoves: db 47,ACID db 0 -Mon047_EvosMoves: -;PARASECT +PARASECT_EvosMoves ;Evolutions db 0 ;Learnset @@ -758,8 +712,7 @@ Mon047_EvosMoves: db 48,GROWTH db 0 -Mon054_EvosMoves: -;PSYDUCK +PSYDUCK_EvosMoves ;Evolutions db EV_LEVEL,33,GOLDUCK db 0 @@ -771,8 +724,7 @@ Mon054_EvosMoves: db 52,HYDRO_PUMP db 0 -Mon096_EvosMoves: -;DROWZEE +DROWZEE_EvosMoves ;Evolutions db EV_LEVEL,26,HYPNO db 0 @@ -785,8 +737,7 @@ Mon096_EvosMoves: db 37,MEDITATE db 0 -Mon076_EvosMoves: -;GOLEM +GOLEM_EvosMoves ;Evolutions db 0 ;Learnset @@ -798,15 +749,13 @@ Mon076_EvosMoves: db 43,EXPLOSION db 0 -Mon154_EvosMoves: -;MISSINGNO +MISSINGNO_32_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon126_EvosMoves: -;MAGMAR +MAGMAR_EvosMoves ;Evolutions db 0 ;Learnset @@ -818,15 +767,13 @@ Mon126_EvosMoves: db 55,FLAMETHROWER db 0 -Mon155_EvosMoves: -;MISSINGNO +MISSINGNO_34_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon125_EvosMoves: -;ELECTABUZZ +ELECTABUZZ_EvosMoves ;Evolutions db 0 ;Learnset @@ -837,8 +784,7 @@ Mon125_EvosMoves: db 54,THUNDER db 0 -Mon082_EvosMoves: -;MAGNETON +MAGNETON_EvosMoves ;Evolutions db 0 ;Learnset @@ -850,8 +796,7 @@ Mon082_EvosMoves: db 54,SCREECH db 0 -Mon109_EvosMoves: -;KOFFING +KOFFING_EvosMoves ;Evolutions db EV_LEVEL,35,WEEZING db 0 @@ -863,15 +808,13 @@ Mon109_EvosMoves: db 48,EXPLOSION db 0 -Mon156_EvosMoves: -;MISSINGNO +MISSINGNO_38_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon056_EvosMoves: -;MANKEY +MANKEY_EvosMoves ;Evolutions db EV_LEVEL,28,PRIMEAPE db 0 @@ -883,8 +826,7 @@ Mon056_EvosMoves: db 39,THRASH db 0 -Mon086_EvosMoves: -;SEEL +SEEL_EvosMoves ;Evolutions db EV_LEVEL,34,DEWGONG db 0 @@ -896,8 +838,7 @@ Mon086_EvosMoves: db 50,ICE_BEAM db 0 -Mon050_EvosMoves: -;DIGLETT +DIGLETT_EvosMoves ;Evolutions db EV_LEVEL,26,DUGTRIO db 0 @@ -909,8 +850,7 @@ Mon050_EvosMoves: db 40,EARTHQUAKE db 0 -Mon128_EvosMoves: -;TAUROS +TAUROS_EvosMoves ;Evolutions db 0 ;Learnset @@ -921,29 +861,25 @@ Mon128_EvosMoves: db 51,TAKE_DOWN db 0 -Mon157_EvosMoves: -;MISSINGNO +MISSINGNO_3D_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon158_EvosMoves: -;MISSINGNO +MISSINGNO_3E_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon159_EvosMoves: -;MISSINGNO +MISSINGNO_3F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon083_EvosMoves: -;FARFETCHD +FARFETCHD_EvosMoves ;Evolutions db 0 ;Learnset @@ -954,8 +890,7 @@ Mon083_EvosMoves: db 39,SLASH db 0 -Mon048_EvosMoves: -;VENONAT +VENONAT_EvosMoves ;Evolutions db EV_LEVEL,31,VENOMOTH db 0 @@ -968,8 +903,7 @@ Mon048_EvosMoves: db 43,PSYCHIC_M db 0 -Mon149_EvosMoves: -;DRAGONITE +DRAGONITE_EvosMoves ;Evolutions db 0 ;Learnset @@ -980,29 +914,25 @@ Mon149_EvosMoves: db 60,HYPER_BEAM db 0 -Mon160_EvosMoves: -;MISSINGNO +MISSINGNO_43_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon161_EvosMoves: -;MISSINGNO +MISSINGNO_44_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon162_EvosMoves: -;MISSINGNO +MISSINGNO_45_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon084_EvosMoves: -;DODUO +DODUO_EvosMoves ;Evolutions db EV_LEVEL,31,DODRIO db 0 @@ -1015,8 +945,7 @@ Mon084_EvosMoves: db 44,AGILITY db 0 -Mon060_EvosMoves: -;POLIWAG +POLIWAG_EvosMoves ;Evolutions db EV_LEVEL,25,POLIWHIRL db 0 @@ -1029,8 +958,7 @@ Mon060_EvosMoves: db 45,HYDRO_PUMP db 0 -Mon124_EvosMoves: -;JYNX +JYNX_EvosMoves ;Evolutions db 0 ;Learnset @@ -1042,8 +970,7 @@ Mon124_EvosMoves: db 58,BLIZZARD db 0 -Mon146_EvosMoves: -;MOLTRES +MOLTRES_EvosMoves ;Evolutions db 0 ;Learnset @@ -1052,8 +979,7 @@ Mon146_EvosMoves: db 60,SKY_ATTACK db 0 -Mon144_EvosMoves: -;ARTICUNO +ARTICUNO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1062,8 +988,7 @@ Mon144_EvosMoves: db 60,MIST db 0 -Mon145_EvosMoves: -;ZAPDOS +ZAPDOS_EvosMoves ;Evolutions db 0 ;Learnset @@ -1072,15 +997,13 @@ Mon145_EvosMoves: db 60,LIGHT_SCREEN db 0 -Mon132_EvosMoves: -;DITTO +DITTO_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon052_EvosMoves: -;MEOWTH +MEOWTH_EvosMoves ;Evolutions db EV_LEVEL,28,PERSIAN db 0 @@ -1092,8 +1015,7 @@ Mon052_EvosMoves: db 44,SLASH db 0 -Mon098_EvosMoves: -;KRABBY +KRABBY_EvosMoves ;Evolutions db EV_LEVEL,28,KINGLER db 0 @@ -1105,29 +1027,25 @@ Mon098_EvosMoves: db 40,HARDEN db 0 -Mon163_EvosMoves: -;MISSINGNO +MISSINGNO_4F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon164_EvosMoves: -;MISSINGNO +MISSINGNO_50_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon165_EvosMoves: -;MISSINGNO +MISSINGNO_51_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon037_EvosMoves: -;VULPIX +VULPIX_EvosMoves ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES db 0 @@ -1139,15 +1057,13 @@ Mon037_EvosMoves: db 42,FIRE_SPIN db 0 -Mon038_EvosMoves: -;NINETALES +NINETALES_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon025_EvosMoves: -;PIKACHU +PIKACHU_EvosMoves ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU db 0 @@ -1159,29 +1075,25 @@ Mon025_EvosMoves: db 43,THUNDER db 0 -Mon026_EvosMoves: -;RAICHU +RAICHU_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon166_EvosMoves: -;MISSINGNO +MISSINGNO_56_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon167_EvosMoves: -;MISSINGNO +MISSINGNO_57_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon147_EvosMoves: -;DRATINI +DRATINI_EvosMoves ;Evolutions db EV_LEVEL,30,DRAGONAIR db 0 @@ -1193,8 +1105,7 @@ Mon147_EvosMoves: db 50,HYPER_BEAM db 0 -Mon148_EvosMoves: -;DRAGONAIR +DRAGONAIR_EvosMoves ;Evolutions db EV_LEVEL,55,DRAGONITE db 0 @@ -1206,8 +1117,7 @@ Mon148_EvosMoves: db 55,HYPER_BEAM db 0 -Mon140_EvosMoves: -;KABUTO +KABUTO_EvosMoves ;Evolutions db EV_LEVEL,40,KABUTOPS db 0 @@ -1218,8 +1128,7 @@ Mon140_EvosMoves: db 49,HYDRO_PUMP db 0 -Mon141_EvosMoves: -;KABUTOPS +KABUTOPS_EvosMoves ;Evolutions db 0 ;Learnset @@ -1229,8 +1138,7 @@ Mon141_EvosMoves: db 53,HYDRO_PUMP db 0 -Mon116_EvosMoves: -;HORSEA +HORSEA_EvosMoves ;Evolutions db EV_LEVEL,32,SEADRA db 0 @@ -1242,8 +1150,7 @@ Mon116_EvosMoves: db 45,HYDRO_PUMP db 0 -Mon117_EvosMoves: -;SEADRA +SEADRA_EvosMoves ;Evolutions db 0 ;Learnset @@ -1254,22 +1161,19 @@ Mon117_EvosMoves: db 52,HYDRO_PUMP db 0 -Mon168_EvosMoves: -;MISSINGNO +MISSINGNO_5E_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon169_EvosMoves: -;MISSINGNO +MISSINGNO_5F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon027_EvosMoves: -;SANDSHREW +SANDSHREW_EvosMoves ;Evolutions db EV_LEVEL,22,SANDSLASH db 0 @@ -1281,8 +1185,7 @@ Mon027_EvosMoves: db 38,FURY_SWIPES db 0 -Mon028_EvosMoves: -;SANDSLASH +SANDSLASH_EvosMoves ;Evolutions db 0 ;Learnset @@ -1293,8 +1196,7 @@ Mon028_EvosMoves: db 47,FURY_SWIPES db 0 -Mon138_EvosMoves: -;OMANYTE +OMANYTE_EvosMoves ;Evolutions db EV_LEVEL,40,OMASTAR db 0 @@ -1305,8 +1207,7 @@ Mon138_EvosMoves: db 53,HYDRO_PUMP db 0 -Mon139_EvosMoves: -;OMASTAR +OMASTAR_EvosMoves ;Evolutions db 0 ;Learnset @@ -1316,8 +1217,7 @@ Mon139_EvosMoves: db 49,HYDRO_PUMP db 0 -Mon039_EvosMoves: -;JIGGLYPUFF +JIGGLYPUFF_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF db 0 @@ -1331,30 +1231,26 @@ Mon039_EvosMoves: db 39,DOUBLE_EDGE db 0 -Mon040_EvosMoves: -;WIGGLYTUFF +WIGGLYTUFF_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon133_EvosMoves: -;EEVEE +EEVEE_EvosMoves ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON db 0 -Mon133_EvosEnd: -;Learnset +EEVEE_EvosEnd db 27,QUICK_ATTACK db 31,TAIL_WHIP db 37,BITE db 45,TAKE_DOWN db 0 -Mon136_EvosMoves: -;FLAREON +FLAREON_EvosMoves ;Evolutions db 0 ;Learnset @@ -1368,8 +1264,7 @@ Mon136_EvosMoves: db 54,FLAMETHROWER db 0 -Mon135_EvosMoves: -;JOLTEON +JOLTEON_EvosMoves ;Evolutions db 0 ;Learnset @@ -1383,8 +1278,7 @@ Mon135_EvosMoves: db 54,THUNDER db 0 -Mon134_EvosMoves: -;VAPOREON +VAPOREON_EvosMoves ;Evolutions db 0 ;Learnset @@ -1398,8 +1292,7 @@ Mon134_EvosMoves: db 54,HYDRO_PUMP db 0 -Mon066_EvosMoves: -;MACHOP +MACHOP_EvosMoves ;Evolutions db EV_LEVEL,28,MACHOKE db 0 @@ -1411,8 +1304,7 @@ Mon066_EvosMoves: db 46,SUBMISSION db 0 -Mon041_EvosMoves: -;ZUBAT +ZUBAT_EvosMoves ;Evolutions db EV_LEVEL,22,GOLBAT db 0 @@ -1424,8 +1316,7 @@ Mon041_EvosMoves: db 36,HAZE db 0 -Mon023_EvosMoves: -;EKANS +EKANS_EvosMoves ;Evolutions db EV_LEVEL,22,ARBOK db 0 @@ -1437,8 +1328,7 @@ Mon023_EvosMoves: db 38,ACID db 0 -Mon046_EvosMoves: -;PARAS +PARAS_EvosMoves ;Evolutions db EV_LEVEL,24,PARASECT db 0 @@ -1450,8 +1340,7 @@ Mon046_EvosMoves: db 41,GROWTH db 0 -Mon061_EvosMoves: -;POLIWHIRL +POLIWHIRL_EvosMoves ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH db 0 @@ -1464,8 +1353,7 @@ Mon061_EvosMoves: db 49,HYDRO_PUMP db 0 -Mon062_EvosMoves: -;POLIWRATH +POLIWRATH_EvosMoves ;Evolutions db 0 ;Learnset @@ -1473,24 +1361,21 @@ Mon062_EvosMoves: db 19,WATER_GUN db 0 -Mon013_EvosMoves: -;WEEDLE +WEEDLE_EvosMoves ;Evolutions db EV_LEVEL,7,KAKUNA db 0 ;Learnset db 0 -Mon014_EvosMoves: -;KAKUNA +KAKUNA_EvosMoves ;Evolutions db EV_LEVEL,10,BEEDRILL db 0 ;Learnset db 0 -Mon015_EvosMoves: -;BEEDRILL +BEEDRILL_EvosMoves ;Evolutions db 0 ;Learnset @@ -1502,15 +1387,13 @@ Mon015_EvosMoves: db 35,AGILITY db 0 -Mon170_EvosMoves: -;MISSINGNO +MISSINGNO_73_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon085_EvosMoves: -;DODRIO +DODRIO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1522,8 +1405,7 @@ Mon085_EvosMoves: db 51,AGILITY db 0 -Mon057_EvosMoves: -;PRIMEAPE +PRIMEAPE_EvosMoves ;Evolutions db 0 ;Learnset @@ -1534,8 +1416,7 @@ Mon057_EvosMoves: db 46,THRASH db 0 -Mon051_EvosMoves: -;DUGTRIO +DUGTRIO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1546,8 +1427,7 @@ Mon051_EvosMoves: db 47,EARTHQUAKE db 0 -Mon049_EvosMoves: -;VENOMOTH +VENOMOTH_EvosMoves ;Evolutions db 0 ;Learnset @@ -1559,8 +1439,7 @@ Mon049_EvosMoves: db 50,PSYCHIC_M db 0 -Mon087_EvosMoves: -;DEWGONG +DEWGONG_EvosMoves ;Evolutions db 0 ;Learnset @@ -1571,38 +1450,33 @@ Mon087_EvosMoves: db 56,ICE_BEAM db 0 -Mon171_EvosMoves: -;MISSINGNO +MISSINGNO_79_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon172_EvosMoves: -;MISSINGNO +MISSINGNO_7A_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon010_EvosMoves: -;CATERPIE +CATERPIE_EvosMoves ;Evolutions db EV_LEVEL,7,METAPOD db 0 ;Learnset db 0 -Mon011_EvosMoves: -;METAPOD +METAPOD_EvosMoves ;Evolutions db EV_LEVEL,10,BUTTERFREE db 0 ;Learnset db 0 -Mon012_EvosMoves: -;BUTTERFREE +BUTTERFREE_EvosMoves ;Evolutions db 0 ;Learnset @@ -1615,8 +1489,7 @@ Mon012_EvosMoves: db 32,PSYBEAM db 0 -Mon068_EvosMoves: -;MACHAMP +MACHAMP_EvosMoves ;Evolutions db 0 ;Learnset @@ -1627,15 +1500,13 @@ Mon068_EvosMoves: db 52,SUBMISSION db 0 -Mon173_EvosMoves: -;MISSINGNO +MISSINGNO_7F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon055_EvosMoves: -;GOLDUCK +GOLDUCK_EvosMoves ;Evolutions db 0 ;Learnset @@ -1646,8 +1517,7 @@ Mon055_EvosMoves: db 59,HYDRO_PUMP db 0 -Mon097_EvosMoves: -;HYPNO +HYPNO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1659,8 +1529,7 @@ Mon097_EvosMoves: db 43,MEDITATE db 0 -Mon042_EvosMoves: -;GOLBAT +GOLBAT_EvosMoves ;Evolutions db 0 ;Learnset @@ -1671,8 +1540,7 @@ Mon042_EvosMoves: db 43,HAZE db 0 -Mon150_EvosMoves: -;MEWTWO +MEWTWO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1683,8 +1551,7 @@ Mon150_EvosMoves: db 81,AMNESIA db 0 -Mon143_EvosMoves: -;SNORLAX +SNORLAX_EvosMoves ;Evolutions db 0 ;Learnset @@ -1694,8 +1561,7 @@ Mon143_EvosMoves: db 56,HYPER_BEAM db 0 -Mon129_EvosMoves: -;MAGIKARP +MAGIKARP_EvosMoves ;Evolutions db EV_LEVEL,20,GYARADOS db 0 @@ -1703,22 +1569,19 @@ Mon129_EvosMoves: db 15,TACKLE db 0 -Mon174_EvosMoves: -;MISSINGNO +MISSINGNO_86_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon175_EvosMoves: -;MISSINGNO +MISSINGNO_87_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon089_EvosMoves: -;MUK +MUK_EvosMoves ;Evolutions db 0 ;Learnset @@ -1730,15 +1593,13 @@ Mon089_EvosMoves: db 60,ACID_ARMOR db 0 -Mon176_EvosMoves: -;MISSINGNO +MISSINGNO_8A_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon099_EvosMoves: -;KINGLER +KINGLER_EvosMoves ;Evolutions db 0 ;Learnset @@ -1749,23 +1610,20 @@ Mon099_EvosMoves: db 49,HARDEN db 0 -Mon091_EvosMoves: -;CLOYSTER +CLOYSTER_EvosMoves ;Evolutions db 0 ;Learnset db 50,SPIKE_CANNON db 0 -Mon177_EvosMoves: -;MISSINGNO +MISSINGNO_8C_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon101_EvosMoves: -;ELECTRODE +ELECTRODE_EvosMoves ;Evolutions db 0 ;Learnset @@ -1776,15 +1634,13 @@ Mon101_EvosMoves: db 50,EXPLOSION db 0 -Mon036_EvosMoves: -;CLEFABLE +CLEFABLE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon110_EvosMoves: -;WEEZING +WEEZING_EvosMoves ;Evolutions db 0 ;Learnset @@ -1795,8 +1651,7 @@ Mon110_EvosMoves: db 53,EXPLOSION db 0 -Mon053_EvosMoves: -;PERSIAN +PERSIAN_EvosMoves ;Evolutions db 0 ;Learnset @@ -1807,8 +1662,7 @@ Mon053_EvosMoves: db 51,SLASH db 0 -Mon105_EvosMoves: -;MAROWAK +MAROWAK_EvosMoves ;Evolutions db 0 ;Learnset @@ -1819,15 +1673,13 @@ Mon105_EvosMoves: db 55,RAGE db 0 -Mon178_EvosMoves: -;MISSINGNO +MISSINGNO_92_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon093_EvosMoves: -;HAUNTER +HAUNTER_EvosMoves ;Evolutions db EV_TRADE,1,GENGAR db 0 @@ -1836,16 +1688,14 @@ Mon093_EvosMoves: db 38,DREAM_EATER db 0 -Mon063_EvosMoves: -;ABRA +ABRA_EvosMoves ;Evolutions db EV_LEVEL,16,KADABRA db 0 ;Learnset db 0 -Mon065_EvosMoves: -;ALAKAZAM +ALAKAZAM_EvosMoves ;Evolutions db 0 ;Learnset @@ -1857,8 +1707,7 @@ Mon065_EvosMoves: db 42,REFLECT db 0 -Mon017_EvosMoves: -;PIDGEOTTO +PIDGEOTTO_EvosMoves ;Evolutions db EV_LEVEL,36,PIDGEOT db 0 @@ -1871,8 +1720,7 @@ Mon017_EvosMoves: db 49,MIRROR_MOVE db 0 -Mon018_EvosMoves: -;PIDGEOT +PIDGEOT_EvosMoves ;Evolutions db 0 ;Learnset @@ -1884,15 +1732,13 @@ Mon018_EvosMoves: db 54,MIRROR_MOVE db 0 -Mon121_EvosMoves: -;STARMIE +STARMIE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon001_EvosMoves: -;BULBASAUR +BULBASAUR_EvosMoves ;Evolutions db EV_LEVEL,16,IVYSAUR db 0 @@ -1906,8 +1752,7 @@ Mon001_EvosMoves: db 48,SOLARBEAM db 0 -Mon003_EvosMoves: -;VENUSAUR +VENUSAUR_EvosMoves ;Evolutions db 0 ;Learnset @@ -1920,8 +1765,7 @@ Mon003_EvosMoves: db 65,SOLARBEAM db 0 -Mon073_EvosMoves: -;TENTACRUEL +TENTACRUEL_EvosMoves ;Evolutions db 0 ;Learnset @@ -1935,15 +1779,13 @@ Mon073_EvosMoves: db 50,HYDRO_PUMP db 0 -Mon179_EvosMoves: -;MISSINGNO +MISSINGNO_9C_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon118_EvosMoves: -;GOLDEEN +GOLDEEN_EvosMoves ;Evolutions db EV_LEVEL,33,SEAKING db 0 @@ -1956,8 +1798,7 @@ Mon118_EvosMoves: db 54,AGILITY db 0 -Mon119_EvosMoves: -;SEAKING +SEAKING_EvosMoves ;Evolutions db 0 ;Learnset @@ -1969,36 +1810,31 @@ Mon119_EvosMoves: db 54,AGILITY db 0 -Mon180_EvosMoves: -;MISSINGNO +MISSINGNO_9F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon181_EvosMoves: -;MISSINGNO +MISSINGNO_A0_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon182_EvosMoves: -;MISSINGNO +MISSINGNO_A1_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon183_EvosMoves: -;MISSINGNO +MISSINGNO_A2_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon077_EvosMoves: -;PONYTA +PONYTA_EvosMoves ;Evolutions db EV_LEVEL,40,RAPIDASH db 0 @@ -2011,8 +1847,7 @@ Mon077_EvosMoves: db 48,AGILITY db 0 -Mon078_EvosMoves: -;RAPIDASH +RAPIDASH_EvosMoves ;Evolutions db 0 ;Learnset @@ -2024,8 +1859,7 @@ Mon078_EvosMoves: db 55,AGILITY db 0 -Mon019_EvosMoves: -;RATTATA +RATTATA_EvosMoves ;Evolutions db EV_LEVEL,20,RATICATE db 0 @@ -2036,8 +1870,7 @@ Mon019_EvosMoves: db 34,SUPER_FANG db 0 -Mon020_EvosMoves: -;RATICATE +RATICATE_EvosMoves ;Evolutions db 0 ;Learnset @@ -2047,8 +1880,7 @@ Mon020_EvosMoves: db 41,SUPER_FANG db 0 -Mon033_EvosMoves: -;NIDORINO +NIDORINO_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING db 0 @@ -2061,8 +1893,7 @@ Mon033_EvosMoves: db 50,DOUBLE_KICK db 0 -Mon030_EvosMoves: -;NIDORINA +NIDORINA_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN db 0 @@ -2075,8 +1906,7 @@ Mon030_EvosMoves: db 50,DOUBLE_KICK db 0 -Mon074_EvosMoves: -;GEODUDE +GEODUDE_EvosMoves ;Evolutions db EV_LEVEL,25,GRAVELER db 0 @@ -2089,8 +1919,7 @@ Mon074_EvosMoves: db 36,EXPLOSION db 0 -Mon137_EvosMoves: -;PORYGON +PORYGON_EvosMoves ;Evolutions db 0 ;Learnset @@ -2100,8 +1929,7 @@ Mon137_EvosMoves: db 42,TRI_ATTACK db 0 -Mon142_EvosMoves: -;AERODACTYL +AERODACTYL_EvosMoves ;Evolutions db 0 ;Learnset @@ -2111,15 +1939,13 @@ Mon142_EvosMoves: db 54,HYPER_BEAM db 0 -Mon184_EvosMoves: -;MISSINGNO +MISSINGNO_AC_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon081_EvosMoves: -;MAGNEMITE +MAGNEMITE_EvosMoves ;Evolutions db EV_LEVEL,30,MAGNETON db 0 @@ -2132,22 +1958,19 @@ Mon081_EvosMoves: db 47,SCREECH db 0 -Mon185_EvosMoves: -;MISSINGNO +MISSINGNO_AE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon186_EvosMoves: -;MISSINGNO +MISSINGNO_AF_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon004_EvosMoves: -;CHARMANDER +CHARMANDER_EvosMoves ;Evolutions db EV_LEVEL,16,CHARMELEON db 0 @@ -2160,8 +1983,7 @@ Mon004_EvosMoves: db 46,FIRE_SPIN db 0 -Mon007_EvosMoves: -;SQUIRTLE +SQUIRTLE_EvosMoves ;Evolutions db EV_LEVEL,16,WARTORTLE db 0 @@ -2174,8 +1996,7 @@ Mon007_EvosMoves: db 42,HYDRO_PUMP db 0 -Mon005_EvosMoves: -;CHARMELEON +CHARMELEON_EvosMoves ;Evolutions db EV_LEVEL,36,CHARIZARD db 0 @@ -2188,8 +2009,7 @@ Mon005_EvosMoves: db 56,FIRE_SPIN db 0 -Mon008_EvosMoves: -;WARTORTLE +WARTORTLE_EvosMoves ;Evolutions db EV_LEVEL,36,BLASTOISE db 0 @@ -2202,8 +2022,7 @@ Mon008_EvosMoves: db 47,HYDRO_PUMP db 0 -Mon006_EvosMoves: -;CHARIZARD +CHARIZARD_EvosMoves ;Evolutions db 0 ;Learnset @@ -2215,36 +2034,31 @@ Mon006_EvosMoves: db 55,FIRE_SPIN db 0 -Mon187_EvosMoves: -;MISSINGNO +MISSINGNO_B5_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon188_EvosMoves: -;MISSINGNO +FOSSIL_KABUTOPS_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon189_EvosMoves: -;MISSINGNO +FOSSIL_AERODACTYL_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon190_EvosMoves: -;MISSINGNO +MON_GHOST_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon043_EvosMoves: -;ODDISH +ODDISH_EvosMoves ;Evolutions db EV_LEVEL,21,GLOOM db 0 @@ -2257,8 +2071,7 @@ Mon043_EvosMoves: db 46,SOLARBEAM db 0 -Mon044_EvosMoves: -;GLOOM +GLOOM_EvosMoves ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME db 0 @@ -2271,8 +2084,7 @@ Mon044_EvosMoves: db 52,SOLARBEAM db 0 -Mon045_EvosMoves: -;VILEPLUME +VILEPLUME_EvosMoves ;Evolutions db 0 ;Learnset @@ -2281,8 +2093,7 @@ Mon045_EvosMoves: db 19,SLEEP_POWDER db 0 -Mon069_EvosMoves: -;BELLSPROUT +BELLSPROUT_EvosMoves ;Evolutions db EV_LEVEL,21,WEEPINBELL db 0 @@ -2296,8 +2107,7 @@ Mon069_EvosMoves: db 42,SLAM db 0 -Mon070_EvosMoves: -;WEEPINBELL +WEEPINBELL_EvosMoves ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL db 0 @@ -2311,8 +2121,7 @@ Mon070_EvosMoves: db 49,SLAM db 0 -Mon071_EvosMoves: -;VICTREEBEL +VICTREEBEL_EvosMoves ;Evolutions db 0 ;Learnset diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 5149e5ab..cf185fa8 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -150,7 +150,7 @@ RedrawPartyMenu_: ld l, a ld de, wcd6d ld a, BANK(EvosMovesPointerTable) - ld bc, Mon133_EvosEnd - Mon133_EvosMoves + ld bc, EEVEE_EvosEnd - EEVEE_EvosMoves call FarCopyData ld hl, wcd6d ld de, .notAbleToEvolveText -- cgit v1.2.3 From 2056bdda525b9f5d340cc1c13fa38fb6d6d42a96 Mon Sep 17 00:00:00 2001 From: bitman44 Date: Wed, 21 Mar 2018 06:51:03 -0500 Subject: Cleaned up name formatting --- data/evos_moves.asm | 765 +++++++++++++++++++++++---------------------- engine/menu/party_menu.asm | 2 +- 2 files changed, 384 insertions(+), 383 deletions(-) diff --git a/data/evos_moves.asm b/data/evos_moves.asm index f6281b3d..4c14e4bb 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,196 +1,196 @@ EvosMovesPointerTable: - dw RHYDON_EvosMoves - dw KANGASKHAN_EvosMoves - dw NIDORAN_M_EvosMoves - dw CLEFAIRY_EvosMoves - dw SPEAROW_EvosMoves - dw VOLTORB_EvosMoves - dw NIDOKING_EvosMoves - dw SLOWBRO_EvosMoves - dw IVYSAUR_EvosMoves - dw EXEGGUTOR_EvosMoves - dw LICKITUNG_EvosMoves - dw EXEGGCUTE_EvosMoves - dw GRIMER_EvosMoves - dw GENGAR_EvosMoves - dw NIDORAN_F_EvosMoves - dw NIDOQUEEN_EvosMoves - dw CUBONE_EvosMoves - dw RHYHORN_EvosMoves - dw LAPRAS_EvosMoves - dw ARCANINE_EvosMoves - dw MEW_EvosMoves - dw GYARADOS_EvosMoves - dw SHELLDER_EvosMoves - dw TENTACOOL_EvosMoves - dw GASTLY_EvosMoves - dw SCYTHER_EvosMoves - dw STARYU_EvosMoves - dw BLASTOISE_EvosMoves - dw PINSIR_EvosMoves - dw TANGELA_EvosMoves - dw MISSINGNO_1F_EvosMoves - dw MISSINGNO_20_EvosMoves - dw GROWLITHE_EvosMoves - dw ONIX_EvosMoves - dw FEAROW_EvosMoves - dw PIDGEY_EvosMoves - dw SLOWPOKE_EvosMoves - dw KADABRA_EvosMoves - dw GRAVELER_EvosMoves - dw CHANSEY_EvosMoves - dw MACHOKE_EvosMoves - dw MR_MIME_EvosMoves - dw HITMONLEE_EvosMoves - dw HITMONCHAN_EvosMoves - dw ARBOK_EvosMoves - dw PARASECT_EvosMoves - dw PSYDUCK_EvosMoves - dw DROWZEE_EvosMoves - dw GOLEM_EvosMoves - dw MISSINGNO_32_EvosMoves - dw MAGMAR_EvosMoves - dw MISSINGNO_34_EvosMoves - dw ELECTABUZZ_EvosMoves - dw MAGNETON_EvosMoves - dw KOFFING_EvosMoves - dw MISSINGNO_38_EvosMoves - dw MANKEY_EvosMoves - dw SEEL_EvosMoves - dw DIGLETT_EvosMoves - dw TAUROS_EvosMoves - dw MISSINGNO_3D_EvosMoves - dw MISSINGNO_3E_EvosMoves - dw MISSINGNO_3F_EvosMoves - dw FARFETCHD_EvosMoves - dw VENONAT_EvosMoves - dw DRAGONITE_EvosMoves - dw MISSINGNO_43_EvosMoves - dw MISSINGNO_44_EvosMoves - dw MISSINGNO_45_EvosMoves - dw DODUO_EvosMoves - dw POLIWAG_EvosMoves - dw JYNX_EvosMoves - dw MOLTRES_EvosMoves - dw ARTICUNO_EvosMoves - dw ZAPDOS_EvosMoves - dw DITTO_EvosMoves - dw MEOWTH_EvosMoves - dw KRABBY_EvosMoves - dw MISSINGNO_4F_EvosMoves - dw MISSINGNO_50_EvosMoves - dw MISSINGNO_51_EvosMoves - dw VULPIX_EvosMoves - dw NINETALES_EvosMoves - dw PIKACHU_EvosMoves - dw RAICHU_EvosMoves - dw MISSINGNO_56_EvosMoves - dw MISSINGNO_57_EvosMoves - dw DRATINI_EvosMoves - dw DRAGONAIR_EvosMoves - dw KABUTO_EvosMoves - dw KABUTOPS_EvosMoves - dw HORSEA_EvosMoves - dw SEADRA_EvosMoves - dw MISSINGNO_5E_EvosMoves - dw MISSINGNO_5F_EvosMoves - dw SANDSHREW_EvosMoves - dw SANDSLASH_EvosMoves - dw OMANYTE_EvosMoves - dw OMASTAR_EvosMoves - dw JIGGLYPUFF_EvosMoves - dw WIGGLYTUFF_EvosMoves - dw EEVEE_EvosMoves - dw FLAREON_EvosMoves - dw JOLTEON_EvosMoves - dw VAPOREON_EvosMoves - dw MACHOP_EvosMoves - dw ZUBAT_EvosMoves - dw EKANS_EvosMoves - dw PARAS_EvosMoves - dw POLIWHIRL_EvosMoves - dw POLIWRATH_EvosMoves - dw WEEDLE_EvosMoves - dw KAKUNA_EvosMoves - dw BEEDRILL_EvosMoves - dw MISSINGNO_73_EvosMoves - dw DODRIO_EvosMoves - dw PRIMEAPE_EvosMoves - dw DUGTRIO_EvosMoves - dw VENOMOTH_EvosMoves - dw DEWGONG_EvosMoves - dw MISSINGNO_79_EvosMoves - dw MISSINGNO_7A_EvosMoves - dw CATERPIE_EvosMoves - dw METAPOD_EvosMoves - dw BUTTERFREE_EvosMoves - dw MACHAMP_EvosMoves - dw MISSINGNO_7F_EvosMoves - dw GOLDUCK_EvosMoves - dw HYPNO_EvosMoves - dw GOLBAT_EvosMoves - dw MEWTWO_EvosMoves - dw SNORLAX_EvosMoves - dw MAGIKARP_EvosMoves - dw MISSINGNO_86_EvosMoves - dw MISSINGNO_87_EvosMoves - dw MUK_EvosMoves - dw MISSINGNO_8A_EvosMoves - dw KINGLER_EvosMoves - dw CLOYSTER_EvosMoves - dw MISSINGNO_8C_EvosMoves - dw ELECTRODE_EvosMoves - dw CLEFABLE_EvosMoves - dw WEEZING_EvosMoves - dw PERSIAN_EvosMoves - dw MAROWAK_EvosMoves - dw MISSINGNO_92_EvosMoves - dw HAUNTER_EvosMoves - dw ABRA_EvosMoves - dw ALAKAZAM_EvosMoves - dw PIDGEOTTO_EvosMoves - dw PIDGEOT_EvosMoves - dw STARMIE_EvosMoves - dw BULBASAUR_EvosMoves - dw VENUSAUR_EvosMoves - dw TENTACRUEL_EvosMoves - dw MISSINGNO_9C_EvosMoves - dw GOLDEEN_EvosMoves - dw SEAKING_EvosMoves - dw MISSINGNO_9F_EvosMoves - dw MISSINGNO_A0_EvosMoves - dw MISSINGNO_A1_EvosMoves - dw MISSINGNO_A2_EvosMoves - dw PONYTA_EvosMoves - dw RAPIDASH_EvosMoves - dw RATTATA_EvosMoves - dw RATICATE_EvosMoves - dw NIDORINO_EvosMoves - dw NIDORINA_EvosMoves - dw GEODUDE_EvosMoves - dw PORYGON_EvosMoves - dw AERODACTYL_EvosMoves - dw MISSINGNO_AC_EvosMoves - dw MAGNEMITE_EvosMoves - dw MISSINGNO_AE_EvosMoves - dw MISSINGNO_AF_EvosMoves - dw CHARMANDER_EvosMoves - dw SQUIRTLE_EvosMoves - dw CHARMELEON_EvosMoves - dw WARTORTLE_EvosMoves - dw CHARIZARD_EvosMoves - dw MISSINGNO_B5_EvosMoves - dw FOSSIL_KABUTOPS_EvosMoves - dw FOSSIL_AERODACTYL_EvosMoves - dw MON_GHOST_EvosMoves - dw ODDISH_EvosMoves - dw GLOOM_EvosMoves - dw VILEPLUME_EvosMoves - dw BELLSPROUT_EvosMoves - dw WEEPINBELL_EvosMoves - dw VICTREEBEL_EvosMoves - -RHYDON_EvosMoves + dw RhydonEvosMoves + dw KangaskhanEvosMoves + dw NidoranMEvosMoves + dw ClefairyEvosMoves + dw SpearowEvosMoves + dw VoltorbEvosMoves + dw NidokingEvosMoves + dw SlowbroEvosMoves + dw IvysaurEvosMoves + dw ExeggutorEvosMoves + dw LickitungEvosMoves + dw ExeggcuteEvosMoves + dw GrimerEvosMoves + dw GengarEvosMoves + dw NidoranFEvosMoves + dw NidoqueenEvosMoves + dw CuboneEvosMoves + dw RhyhornEvosMoves + dw LaprasEvosMoves + dw ArcanineEvosMoves + dw MewEvosMoves + dw GyaradosEvosMoves + dw ShellderEvosMoves + dw TentacoolEvosMoves + dw GastlyEvosMoves + dw ScytherEvosMoves + dw StaryuEvosMoves + dw BlastoiseEvosMoves + dw PinsirEvosMoves + dw TangelaEvosMoves + dw MissingNo1FEvosMoves + dw MissingNo20EvosMoves + dw GrowlitheEvosMoves + dw OnixEvosMoves + dw FearowEvosMoves + dw PidgeyEvosMoves + dw SlowpokeEvosMoves + dw KadabraEvosMoves + dw GravelerEvosMoves + dw ChanseyEvosMoves + dw MachokeEvosMoves + dw MrMimeEvosMoves + dw HitmonleeEvosMoves + dw HitmonchanEvosMoves + dw ArbokEvosMoves + dw ParasectEvosMoves + dw PsyduckEvosMoves + dw DrowzeeEvosMoves + dw GolemEvosMoves + dw MissingNo32EvosMoves + dw MagmarEvosMoves + dw MissingNo34EvosMoves + dw ElectabuzzEvosMoves + dw MagnetonEvosMoves + dw KoffingEvosMoves + dw MissingNo38EvosMoves + dw MankeyEvosMoves + dw SeelEvosMoves + dw DiglettEvosMoves + dw TaurosEvosMoves + dw MissingNo3DEvosMoves + dw MissingNo3EEvosMoves + dw MissingNo3FEvosMoves + dw FarfetchdEvosMoves + dw VenonatEvosMoves + dw DragoniteEvosMoves + dw MissingNo43EvosMoves + dw MissingNo44EvosMoves + dw MissingNo45EvosMoves + dw DoduoEvosMoves + dw PoliwagEvosMoves + dw JynxEvosMoves + dw MoltresEvosMoves + dw ArticunoEvosMoves + dw ZapdosEvosMoves + dw DittoEvosMoves + dw MeowthEvosMoves + dw KrabbyEvosMoves + dw MissingNo4FEvosMoves + dw MissingNo50EvosMoves + dw MissingNo51EvosMoves + dw VulpixEvosMoves + dw NinetalesEvosMoves + dw PikachuEvosMoves + dw RaichuEvosMoves + dw MissingNo56EvosMoves + dw MissingNo57EvosMoves + dw DratiniEvosMoves + dw DragonairEvosMoves + dw KabutoEvosMoves + dw KabutopsEvosMoves + dw HorseaEvosMoves + dw SeadraEvosMoves + dw MissingNo5EEvosMoves + dw MissingNo5FEvosMoves + dw SandshrewEvosMoves + dw SandslashEvosMoves + dw OmanyteEvosMoves + dw OmastarEvosMoves + dw JigglypuffEvosMoves + dw WigglytuffEvosMoves + dw EeveeEvosMoves + dw FlareonEvosMoves + dw JolteonEvosMoves + dw VaporeonEvosMoves + dw MachopEvosMoves + dw ZubatEvosMoves + dw EkansEvosMoves + dw ParasEvosMoves + dw PoliwhirlEvosMoves + dw PoliwrathEvosMoves + dw WeedleEvosMoves + dw KakunaEvosMoves + dw BeedrillEvosMoves + dw MissingNo73EvosMoves + dw DodrioEvosMoves + dw PrimeapeEvosMoves + dw DugtrioEvosMoves + dw VenomothEvosMoves + dw DewgongEvosMoves + dw MissingNo79EvosMoves + dw MissingNo7AEvosMoves + dw CaterpieEvosMoves + dw MetapodEvosMoves + dw ButterfreeEvosMoves + dw MachampEvosMoves + dw MissingNo7FEvosMoves + dw GolduckEvosMoves + dw HypnoEvosMoves + dw GolbatEvosMoves + dw MewtwoEvosMoves + dw SnorlaxEvosMoves + dw MagikarpEvosMoves + dw MissingNo86EvosMoves + dw MissingNo87EvosMoves + dw MukEvosMoves + dw MissingNo8AEvosMoves + dw KinglerEvosMoves + dw CloysterEvosMoves + dw MissingNo8CEvosMoves + dw ElectrodeEvosMoves + dw ClefableEvosMoves + dw WeezingEvosMoves + dw PersianEvosMoves + dw MarowakEvosMoves + dw MissingNo92EvosMoves + dw HaunterEvosMoves + dw AbraEvosMoves + dw AlakazamEvosMoves + dw PidgeottoEvosMoves + dw PidgeotEvosMoves + dw StarmieEvosMoves + dw BulbasaurEvosMoves + dw VenusaurEvosMoves + dw TentacruelEvosMoves + dw MissingNo9CEvosMoves + dw GoldeenEvosMoves + dw SeakingEvosMoves + dw MissingNo9FEvosMoves + dw MissingNoA0EvosMoves + dw MissingNoA1EvosMoves + dw MissingNoA2EvosMoves + dw PonytaEvosMoves + dw RapidashEvosMoves + dw RattataEvosMoves + dw RaticateEvosMoves + dw NidorinoEvosMoves + dw NidorinaEvosMoves + dw GeodudeEvosMoves + dw PorygonEvosMoves + dw AerodactylEvosMoves + dw MissingNoACEvosMoves + dw MagnemiteEvosMoves + dw MissingNoAEEvosMoves + dw MissingNoAFEvosMoves + dw CharmanderEvosMoves + dw SquirtleEvosMoves + dw CharmeleonEvosMoves + dw WartortleEvosMoves + dw CharizardEvosMoves + dw MissingNoB5EvosMoves + dw FossilKabutopsEvosMoves + dw FossilAerodactylEvosMoves + dw MonGhostEvosMoves + dw OddishEvosMoves + dw GloomEvosMoves + dw VileplumeEvosMoves + dw BellsproutEvosMoves + dw WeepinbellEvosMoves + dw VictreebelEvosMoves + +RhydonEvosMoves: ;Evolutions db 0 ;Learnset @@ -202,7 +202,7 @@ RHYDON_EvosMoves db 64,TAKE_DOWN db 0 -KANGASKHAN_EvosMoves +KangaskhanEvosMoves: ;Evolutions db 0 ;Learnset @@ -213,7 +213,7 @@ KANGASKHAN_EvosMoves db 46,DIZZY_PUNCH db 0 -NIDORAN_M_EvosMoves +NidoranMEvosMoves: ;Evolutions db EV_LEVEL,16,NIDORINO db 0 @@ -226,7 +226,7 @@ NIDORAN_M_EvosMoves db 43,DOUBLE_KICK db 0 -CLEFAIRY_EvosMoves +ClefairyEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE db 0 @@ -239,7 +239,7 @@ CLEFAIRY_EvosMoves db 48,LIGHT_SCREEN db 0 -SPEAROW_EvosMoves +SpearowEvosMoves: ;Evolutions db EV_LEVEL,20,FEAROW db 0 @@ -251,7 +251,7 @@ SPEAROW_EvosMoves db 36,AGILITY db 0 -VOLTORB_EvosMoves +VoltorbEvosMoves: ;Evolutions db EV_LEVEL,30,ELECTRODE db 0 @@ -263,7 +263,7 @@ VOLTORB_EvosMoves db 43,EXPLOSION db 0 -NIDOKING_EvosMoves +NidokingEvosMoves: ;Evolutions db 0 ;Learnset @@ -272,7 +272,7 @@ NIDOKING_EvosMoves db 23,THRASH db 0 -SLOWBRO_EvosMoves +SlowbroEvosMoves: ;Evolutions db 0 ;Learnset @@ -285,7 +285,7 @@ SLOWBRO_EvosMoves db 55,PSYCHIC_M db 0 -IVYSAUR_EvosMoves +IvysaurEvosMoves: ;Evolutions db EV_LEVEL,32,VENUSAUR db 0 @@ -299,14 +299,14 @@ IVYSAUR_EvosMoves db 54,SOLARBEAM db 0 -EXEGGUTOR_EvosMoves +ExeggutorEvosMoves: ;Evolutions db 0 ;Learnset db 28,STOMP db 0 -LICKITUNG_EvosMoves +LickitungEvosMoves: ;Evolutions db 0 ;Learnset @@ -317,7 +317,7 @@ LICKITUNG_EvosMoves db 39,SCREECH db 0 -EXEGGCUTE_EvosMoves +ExeggcuteEvosMoves: ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR db 0 @@ -330,7 +330,7 @@ EXEGGCUTE_EvosMoves db 48,SLEEP_POWDER db 0 -GRIMER_EvosMoves +GrimerEvosMoves: ;Evolutions db EV_LEVEL,38,MUK db 0 @@ -343,7 +343,7 @@ GRIMER_EvosMoves db 55,ACID_ARMOR db 0 -GENGAR_EvosMoves +GengarEvosMoves: ;Evolutions db 0 ;Learnset @@ -351,7 +351,7 @@ GENGAR_EvosMoves db 38,DREAM_EATER db 0 -NIDORAN_F_EvosMoves +NidoranFEvosMoves: ;Evolutions db EV_LEVEL,16,NIDORINA db 0 @@ -364,7 +364,7 @@ NIDORAN_F_EvosMoves db 43,DOUBLE_KICK db 0 -NIDOQUEEN_EvosMoves +NidoqueenEvosMoves: ;Evolutions db 0 ;Learnset @@ -373,7 +373,7 @@ NIDOQUEEN_EvosMoves db 23,BODY_SLAM db 0 -CUBONE_EvosMoves +CuboneEvosMoves: ;Evolutions db EV_LEVEL,28,MAROWAK db 0 @@ -385,7 +385,7 @@ CUBONE_EvosMoves db 46,RAGE db 0 -RHYHORN_EvosMoves +RhyhornEvosMoves: ;Evolutions db EV_LEVEL,42,RHYDON db 0 @@ -398,7 +398,7 @@ RHYHORN_EvosMoves db 55,TAKE_DOWN db 0 -LAPRAS_EvosMoves +LaprasEvosMoves: ;Evolutions db 0 ;Learnset @@ -410,13 +410,13 @@ LAPRAS_EvosMoves db 46,HYDRO_PUMP db 0 -ARCANINE_EvosMoves +ArcanineEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MEW_EvosMoves +MewEvosMoves: ;Evolutions db 0 ;Learnset @@ -426,7 +426,7 @@ MEW_EvosMoves db 40,PSYCHIC_M db 0 -GYARADOS_EvosMoves +GyaradosEvosMoves: ;Evolutions db 0 ;Learnset @@ -437,7 +437,7 @@ GYARADOS_EvosMoves db 52,HYPER_BEAM db 0 -SHELLDER_EvosMoves +ShellderEvosMoves: ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER db 0 @@ -449,7 +449,7 @@ SHELLDER_EvosMoves db 50,ICE_BEAM db 0 -TENTACOOL_EvosMoves +TentacoolEvosMoves: ;Evolutions db EV_LEVEL,30,TENTACRUEL db 0 @@ -464,7 +464,7 @@ TENTACOOL_EvosMoves db 48,HYDRO_PUMP db 0 -GASTLY_EvosMoves +GastlyEvosMoves: ;Evolutions db EV_LEVEL,25,HAUNTER db 0 @@ -473,7 +473,7 @@ GASTLY_EvosMoves db 35,DREAM_EATER db 0 -SCYTHER_EvosMoves +ScytherEvosMoves: ;Evolutions db 0 ;Learnset @@ -485,7 +485,7 @@ SCYTHER_EvosMoves db 42,AGILITY db 0 -STARYU_EvosMoves +StaryuEvosMoves: ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE db 0 @@ -499,7 +499,7 @@ STARYU_EvosMoves db 47,HYDRO_PUMP db 0 -BLASTOISE_EvosMoves +BlastoiseEvosMoves: ;Evolutions db 0 ;Learnset @@ -511,7 +511,7 @@ BLASTOISE_EvosMoves db 52,HYDRO_PUMP db 0 -PINSIR_EvosMoves +PinsirEvosMoves: ;Evolutions db 0 ;Learnset @@ -523,7 +523,7 @@ PINSIR_EvosMoves db 54,SWORDS_DANCE db 0 -TANGELA_EvosMoves +TangelaEvosMoves: ;Evolutions db 0 ;Learnset @@ -535,19 +535,19 @@ TANGELA_EvosMoves db 49,GROWTH db 0 -MISSINGNO_1F_EvosMoves +MissingNo1FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_20_EvosMoves +MissingNo20EvosMoves: ;Evolutions db 0 ;Learnset db 0 -GROWLITHE_EvosMoves +GrowlitheEvosMoves: ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE db 0 @@ -559,7 +559,7 @@ GROWLITHE_EvosMoves db 50,FLAMETHROWER db 0 -ONIX_EvosMoves +OnixEvosMoves: ;Evolutions db 0 ;Learnset @@ -570,7 +570,7 @@ ONIX_EvosMoves db 43,HARDEN db 0 -FEAROW_EvosMoves +FearowEvosMoves: ;Evolutions db 0 ;Learnset @@ -581,7 +581,7 @@ FEAROW_EvosMoves db 43,AGILITY db 0 -PIDGEY_EvosMoves +PidgeyEvosMoves: ;Evolutions db EV_LEVEL,18,PIDGEOTTO db 0 @@ -594,7 +594,7 @@ PIDGEY_EvosMoves db 44,MIRROR_MOVE db 0 -SLOWPOKE_EvosMoves +SlowpokeEvosMoves: ;Evolutions db EV_LEVEL,37,SLOWBRO db 0 @@ -607,7 +607,7 @@ SLOWPOKE_EvosMoves db 48,PSYCHIC_M db 0 -KADABRA_EvosMoves +KadabraEvosMoves: ;Evolutions db EV_TRADE,1,ALAKAZAM db 0 @@ -620,7 +620,7 @@ KADABRA_EvosMoves db 42,REFLECT db 0 -GRAVELER_EvosMoves +GravelerEvosMoves: ;Evolutions db EV_TRADE,1,GOLEM db 0 @@ -633,7 +633,7 @@ GRAVELER_EvosMoves db 43,EXPLOSION db 0 -CHANSEY_EvosMoves +ChanseyEvosMoves: ;Evolutions db 0 ;Learnset @@ -645,7 +645,7 @@ CHANSEY_EvosMoves db 54,DOUBLE_EDGE db 0 -MACHOKE_EvosMoves +MachokeEvosMoves: ;Evolutions db EV_TRADE,1,MACHAMP db 0 @@ -657,7 +657,7 @@ MACHOKE_EvosMoves db 52,SUBMISSION db 0 -MR_MIME_EvosMoves +MrMimeEvosMoves: ;Evolutions db 0 ;Learnset @@ -668,7 +668,7 @@ MR_MIME_EvosMoves db 47,SUBSTITUTE db 0 -HITMONLEE_EvosMoves +HitmonleeEvosMoves: ;Evolutions db 0 ;Learnset @@ -679,7 +679,7 @@ HITMONLEE_EvosMoves db 53,MEGA_KICK db 0 -HITMONCHAN_EvosMoves +HitmonchanEvosMoves: ;Evolutions db 0 ;Learnset @@ -690,7 +690,7 @@ HITMONCHAN_EvosMoves db 53,COUNTER db 0 -ARBOK_EvosMoves +ArbokEvosMoves: ;Evolutions db 0 ;Learnset @@ -701,7 +701,7 @@ ARBOK_EvosMoves db 47,ACID db 0 -PARASECT_EvosMoves +ParasectEvosMoves: ;Evolutions db 0 ;Learnset @@ -712,7 +712,7 @@ PARASECT_EvosMoves db 48,GROWTH db 0 -PSYDUCK_EvosMoves +PsyduckEvosMoves: ;Evolutions db EV_LEVEL,33,GOLDUCK db 0 @@ -724,7 +724,7 @@ PSYDUCK_EvosMoves db 52,HYDRO_PUMP db 0 -DROWZEE_EvosMoves +DrowzeeEvosMoves: ;Evolutions db EV_LEVEL,26,HYPNO db 0 @@ -737,7 +737,7 @@ DROWZEE_EvosMoves db 37,MEDITATE db 0 -GOLEM_EvosMoves +GolemEvosMoves: ;Evolutions db 0 ;Learnset @@ -749,13 +749,13 @@ GOLEM_EvosMoves db 43,EXPLOSION db 0 -MISSINGNO_32_EvosMoves +MissingNo32EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MAGMAR_EvosMoves +MagmarEvosMoves: ;Evolutions db 0 ;Learnset @@ -767,13 +767,13 @@ MAGMAR_EvosMoves db 55,FLAMETHROWER db 0 -MISSINGNO_34_EvosMoves +MissingNo34EvosMoves: ;Evolutions db 0 ;Learnset db 0 -ELECTABUZZ_EvosMoves +ElectabuzzEvosMoves: ;Evolutions db 0 ;Learnset @@ -784,7 +784,7 @@ ELECTABUZZ_EvosMoves db 54,THUNDER db 0 -MAGNETON_EvosMoves +MagnetonEvosMoves: ;Evolutions db 0 ;Learnset @@ -796,7 +796,7 @@ MAGNETON_EvosMoves db 54,SCREECH db 0 -KOFFING_EvosMoves +KoffingEvosMoves: ;Evolutions db EV_LEVEL,35,WEEZING db 0 @@ -808,13 +808,13 @@ KOFFING_EvosMoves db 48,EXPLOSION db 0 -MISSINGNO_38_EvosMoves +MissingNo38EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MANKEY_EvosMoves +MankeyEvosMoves: ;Evolutions db EV_LEVEL,28,PRIMEAPE db 0 @@ -826,7 +826,7 @@ MANKEY_EvosMoves db 39,THRASH db 0 -SEEL_EvosMoves +SeelEvosMoves: ;Evolutions db EV_LEVEL,34,DEWGONG db 0 @@ -838,7 +838,7 @@ SEEL_EvosMoves db 50,ICE_BEAM db 0 -DIGLETT_EvosMoves +DiglettEvosMoves: ;Evolutions db EV_LEVEL,26,DUGTRIO db 0 @@ -850,7 +850,7 @@ DIGLETT_EvosMoves db 40,EARTHQUAKE db 0 -TAUROS_EvosMoves +TaurosEvosMoves: ;Evolutions db 0 ;Learnset @@ -861,25 +861,25 @@ TAUROS_EvosMoves db 51,TAKE_DOWN db 0 -MISSINGNO_3D_EvosMoves +MissingNo3DEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_3E_EvosMoves +MissingNo3EEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_3F_EvosMoves +MissingNo3FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -FARFETCHD_EvosMoves +FarfetchdEvosMoves: ;Evolutions db 0 ;Learnset @@ -890,7 +890,7 @@ FARFETCHD_EvosMoves db 39,SLASH db 0 -VENONAT_EvosMoves +VenonatEvosMoves: ;Evolutions db EV_LEVEL,31,VENOMOTH db 0 @@ -903,7 +903,7 @@ VENONAT_EvosMoves db 43,PSYCHIC_M db 0 -DRAGONITE_EvosMoves +DragoniteEvosMoves: ;Evolutions db 0 ;Learnset @@ -914,25 +914,25 @@ DRAGONITE_EvosMoves db 60,HYPER_BEAM db 0 -MISSINGNO_43_EvosMoves +MissingNo43EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_44_EvosMoves +MissingNo44EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_45_EvosMoves +MissingNo45EvosMoves: ;Evolutions db 0 ;Learnset db 0 -DODUO_EvosMoves +DoduoEvosMoves: ;Evolutions db EV_LEVEL,31,DODRIO db 0 @@ -945,7 +945,7 @@ DODUO_EvosMoves db 44,AGILITY db 0 -POLIWAG_EvosMoves +PoliwagEvosMoves: ;Evolutions db EV_LEVEL,25,POLIWHIRL db 0 @@ -958,7 +958,7 @@ POLIWAG_EvosMoves db 45,HYDRO_PUMP db 0 -JYNX_EvosMoves +JynxEvosMoves: ;Evolutions db 0 ;Learnset @@ -970,7 +970,7 @@ JYNX_EvosMoves db 58,BLIZZARD db 0 -MOLTRES_EvosMoves +MoltresEvosMoves: ;Evolutions db 0 ;Learnset @@ -979,7 +979,7 @@ MOLTRES_EvosMoves db 60,SKY_ATTACK db 0 -ARTICUNO_EvosMoves +ArticunoEvosMoves: ;Evolutions db 0 ;Learnset @@ -988,7 +988,7 @@ ARTICUNO_EvosMoves db 60,MIST db 0 -ZAPDOS_EvosMoves +ZapdosEvosMoves: ;Evolutions db 0 ;Learnset @@ -997,13 +997,13 @@ ZAPDOS_EvosMoves db 60,LIGHT_SCREEN db 0 -DITTO_EvosMoves +DittoEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MEOWTH_EvosMoves +MeowthEvosMoves: ;Evolutions db EV_LEVEL,28,PERSIAN db 0 @@ -1015,7 +1015,7 @@ MEOWTH_EvosMoves db 44,SLASH db 0 -KRABBY_EvosMoves +KrabbyEvosMoves: ;Evolutions db EV_LEVEL,28,KINGLER db 0 @@ -1027,25 +1027,25 @@ KRABBY_EvosMoves db 40,HARDEN db 0 -MISSINGNO_4F_EvosMoves +MissingNo4FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_50_EvosMoves +MissingNo50EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_51_EvosMoves +MissingNo51EvosMoves: ;Evolutions db 0 ;Learnset db 0 -VULPIX_EvosMoves +VulpixEvosMoves: ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES db 0 @@ -1057,13 +1057,13 @@ VULPIX_EvosMoves db 42,FIRE_SPIN db 0 -NINETALES_EvosMoves +NinetalesEvosMoves: ;Evolutions db 0 ;Learnset db 0 -PIKACHU_EvosMoves +PikachuEvosMoves: ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU db 0 @@ -1075,25 +1075,25 @@ PIKACHU_EvosMoves db 43,THUNDER db 0 -RAICHU_EvosMoves +RaichuEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_56_EvosMoves +MissingNo56EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_57_EvosMoves +MissingNo57EvosMoves: ;Evolutions db 0 ;Learnset db 0 -DRATINI_EvosMoves +DratiniEvosMoves: ;Evolutions db EV_LEVEL,30,DRAGONAIR db 0 @@ -1105,7 +1105,7 @@ DRATINI_EvosMoves db 50,HYPER_BEAM db 0 -DRAGONAIR_EvosMoves +DragonairEvosMoves: ;Evolutions db EV_LEVEL,55,DRAGONITE db 0 @@ -1117,7 +1117,7 @@ DRAGONAIR_EvosMoves db 55,HYPER_BEAM db 0 -KABUTO_EvosMoves +KabutoEvosMoves: ;Evolutions db EV_LEVEL,40,KABUTOPS db 0 @@ -1128,7 +1128,7 @@ KABUTO_EvosMoves db 49,HYDRO_PUMP db 0 -KABUTOPS_EvosMoves +KabutopsEvosMoves: ;Evolutions db 0 ;Learnset @@ -1138,7 +1138,7 @@ KABUTOPS_EvosMoves db 53,HYDRO_PUMP db 0 -HORSEA_EvosMoves +HorseaEvosMoves: ;Evolutions db EV_LEVEL,32,SEADRA db 0 @@ -1150,7 +1150,7 @@ HORSEA_EvosMoves db 45,HYDRO_PUMP db 0 -SEADRA_EvosMoves +SeadraEvosMoves: ;Evolutions db 0 ;Learnset @@ -1161,19 +1161,19 @@ SEADRA_EvosMoves db 52,HYDRO_PUMP db 0 -MISSINGNO_5E_EvosMoves +MissingNo5EEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_5F_EvosMoves +MissingNo5FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -SANDSHREW_EvosMoves +SandshrewEvosMoves: ;Evolutions db EV_LEVEL,22,SANDSLASH db 0 @@ -1185,7 +1185,7 @@ SANDSHREW_EvosMoves db 38,FURY_SWIPES db 0 -SANDSLASH_EvosMoves +SandslashEvosMoves: ;Evolutions db 0 ;Learnset @@ -1196,7 +1196,7 @@ SANDSLASH_EvosMoves db 47,FURY_SWIPES db 0 -OMANYTE_EvosMoves +OmanyteEvosMoves: ;Evolutions db EV_LEVEL,40,OMASTAR db 0 @@ -1207,7 +1207,7 @@ OMANYTE_EvosMoves db 53,HYDRO_PUMP db 0 -OMASTAR_EvosMoves +OmastarEvosMoves: ;Evolutions db 0 ;Learnset @@ -1217,7 +1217,7 @@ OMASTAR_EvosMoves db 49,HYDRO_PUMP db 0 -JIGGLYPUFF_EvosMoves +JigglypuffEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF db 0 @@ -1231,26 +1231,27 @@ JIGGLYPUFF_EvosMoves db 39,DOUBLE_EDGE db 0 -WIGGLYTUFF_EvosMoves +WigglytuffEvosMoves: ;Evolutions db 0 ;Learnset db 0 -EEVEE_EvosMoves +EeveeEvosMoves: ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON db 0 -EEVEE_EvosEnd +EeveeEvosEnd: +;Learnset db 27,QUICK_ATTACK db 31,TAIL_WHIP db 37,BITE db 45,TAKE_DOWN db 0 -FLAREON_EvosMoves +FlareonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1264,7 +1265,7 @@ FLAREON_EvosMoves db 54,FLAMETHROWER db 0 -JOLTEON_EvosMoves +JolteonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1278,7 +1279,7 @@ JOLTEON_EvosMoves db 54,THUNDER db 0 -VAPOREON_EvosMoves +VaporeonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1292,7 +1293,7 @@ VAPOREON_EvosMoves db 54,HYDRO_PUMP db 0 -MACHOP_EvosMoves +MachopEvosMoves: ;Evolutions db EV_LEVEL,28,MACHOKE db 0 @@ -1304,7 +1305,7 @@ MACHOP_EvosMoves db 46,SUBMISSION db 0 -ZUBAT_EvosMoves +ZubatEvosMoves: ;Evolutions db EV_LEVEL,22,GOLBAT db 0 @@ -1316,7 +1317,7 @@ ZUBAT_EvosMoves db 36,HAZE db 0 -EKANS_EvosMoves +EkansEvosMoves: ;Evolutions db EV_LEVEL,22,ARBOK db 0 @@ -1328,7 +1329,7 @@ EKANS_EvosMoves db 38,ACID db 0 -PARAS_EvosMoves +ParasEvosMoves: ;Evolutions db EV_LEVEL,24,PARASECT db 0 @@ -1340,7 +1341,7 @@ PARAS_EvosMoves db 41,GROWTH db 0 -POLIWHIRL_EvosMoves +PoliwhirlEvosMoves: ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH db 0 @@ -1353,7 +1354,7 @@ POLIWHIRL_EvosMoves db 49,HYDRO_PUMP db 0 -POLIWRATH_EvosMoves +PoliwrathEvosMoves: ;Evolutions db 0 ;Learnset @@ -1361,21 +1362,21 @@ POLIWRATH_EvosMoves db 19,WATER_GUN db 0 -WEEDLE_EvosMoves +WeedleEvosMoves: ;Evolutions db EV_LEVEL,7,KAKUNA db 0 ;Learnset db 0 -KAKUNA_EvosMoves +KakunaEvosMoves: ;Evolutions db EV_LEVEL,10,BEEDRILL db 0 ;Learnset db 0 -BEEDRILL_EvosMoves +BeedrillEvosMoves: ;Evolutions db 0 ;Learnset @@ -1387,13 +1388,13 @@ BEEDRILL_EvosMoves db 35,AGILITY db 0 -MISSINGNO_73_EvosMoves +MissingNo73EvosMoves: ;Evolutions db 0 ;Learnset db 0 -DODRIO_EvosMoves +DodrioEvosMoves: ;Evolutions db 0 ;Learnset @@ -1405,7 +1406,7 @@ DODRIO_EvosMoves db 51,AGILITY db 0 -PRIMEAPE_EvosMoves +PrimeapeEvosMoves: ;Evolutions db 0 ;Learnset @@ -1416,7 +1417,7 @@ PRIMEAPE_EvosMoves db 46,THRASH db 0 -DUGTRIO_EvosMoves +DugtrioEvosMoves: ;Evolutions db 0 ;Learnset @@ -1427,7 +1428,7 @@ DUGTRIO_EvosMoves db 47,EARTHQUAKE db 0 -VENOMOTH_EvosMoves +VenomothEvosMoves: ;Evolutions db 0 ;Learnset @@ -1439,7 +1440,7 @@ VENOMOTH_EvosMoves db 50,PSYCHIC_M db 0 -DEWGONG_EvosMoves +DewgongEvosMoves: ;Evolutions db 0 ;Learnset @@ -1450,33 +1451,33 @@ DEWGONG_EvosMoves db 56,ICE_BEAM db 0 -MISSINGNO_79_EvosMoves +MissingNo79EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_7A_EvosMoves +MissingNo7AEvosMoves: ;Evolutions db 0 ;Learnset db 0 -CATERPIE_EvosMoves +CaterpieEvosMoves: ;Evolutions db EV_LEVEL,7,METAPOD db 0 ;Learnset db 0 -METAPOD_EvosMoves +MetapodEvosMoves: ;Evolutions db EV_LEVEL,10,BUTTERFREE db 0 ;Learnset db 0 -BUTTERFREE_EvosMoves +ButterfreeEvosMoves: ;Evolutions db 0 ;Learnset @@ -1489,7 +1490,7 @@ BUTTERFREE_EvosMoves db 32,PSYBEAM db 0 -MACHAMP_EvosMoves +MachampEvosMoves: ;Evolutions db 0 ;Learnset @@ -1500,13 +1501,13 @@ MACHAMP_EvosMoves db 52,SUBMISSION db 0 -MISSINGNO_7F_EvosMoves +MissingNo7FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -GOLDUCK_EvosMoves +GolduckEvosMoves: ;Evolutions db 0 ;Learnset @@ -1517,7 +1518,7 @@ GOLDUCK_EvosMoves db 59,HYDRO_PUMP db 0 -HYPNO_EvosMoves +HypnoEvosMoves: ;Evolutions db 0 ;Learnset @@ -1529,7 +1530,7 @@ HYPNO_EvosMoves db 43,MEDITATE db 0 -GOLBAT_EvosMoves +GolbatEvosMoves: ;Evolutions db 0 ;Learnset @@ -1540,7 +1541,7 @@ GOLBAT_EvosMoves db 43,HAZE db 0 -MEWTWO_EvosMoves +MewtwoEvosMoves: ;Evolutions db 0 ;Learnset @@ -1551,7 +1552,7 @@ MEWTWO_EvosMoves db 81,AMNESIA db 0 -SNORLAX_EvosMoves +SnorlaxEvosMoves: ;Evolutions db 0 ;Learnset @@ -1561,7 +1562,7 @@ SNORLAX_EvosMoves db 56,HYPER_BEAM db 0 -MAGIKARP_EvosMoves +MagikarpEvosMoves: ;Evolutions db EV_LEVEL,20,GYARADOS db 0 @@ -1569,19 +1570,19 @@ MAGIKARP_EvosMoves db 15,TACKLE db 0 -MISSINGNO_86_EvosMoves +MissingNo86EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_87_EvosMoves +MissingNo87EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MUK_EvosMoves +MukEvosMoves: ;Evolutions db 0 ;Learnset @@ -1593,13 +1594,13 @@ MUK_EvosMoves db 60,ACID_ARMOR db 0 -MISSINGNO_8A_EvosMoves +MissingNo8AEvosMoves: ;Evolutions db 0 ;Learnset db 0 -KINGLER_EvosMoves +KinglerEvosMoves: ;Evolutions db 0 ;Learnset @@ -1610,20 +1611,20 @@ KINGLER_EvosMoves db 49,HARDEN db 0 -CLOYSTER_EvosMoves +CloysterEvosMoves: ;Evolutions db 0 ;Learnset db 50,SPIKE_CANNON db 0 -MISSINGNO_8C_EvosMoves +MissingNo8CEvosMoves: ;Evolutions db 0 ;Learnset db 0 -ELECTRODE_EvosMoves +ElectrodeEvosMoves: ;Evolutions db 0 ;Learnset @@ -1634,13 +1635,13 @@ ELECTRODE_EvosMoves db 50,EXPLOSION db 0 -CLEFABLE_EvosMoves +ClefableEvosMoves: ;Evolutions db 0 ;Learnset db 0 -WEEZING_EvosMoves +WeezingEvosMoves: ;Evolutions db 0 ;Learnset @@ -1651,7 +1652,7 @@ WEEZING_EvosMoves db 53,EXPLOSION db 0 -PERSIAN_EvosMoves +PersianEvosMoves: ;Evolutions db 0 ;Learnset @@ -1662,7 +1663,7 @@ PERSIAN_EvosMoves db 51,SLASH db 0 -MAROWAK_EvosMoves +MarowakEvosMoves: ;Evolutions db 0 ;Learnset @@ -1673,13 +1674,13 @@ MAROWAK_EvosMoves db 55,RAGE db 0 -MISSINGNO_92_EvosMoves +MissingNo92EvosMoves: ;Evolutions db 0 ;Learnset db 0 -HAUNTER_EvosMoves +HaunterEvosMoves: ;Evolutions db EV_TRADE,1,GENGAR db 0 @@ -1688,14 +1689,14 @@ HAUNTER_EvosMoves db 38,DREAM_EATER db 0 -ABRA_EvosMoves +AbraEvosMoves: ;Evolutions db EV_LEVEL,16,KADABRA db 0 ;Learnset db 0 -ALAKAZAM_EvosMoves +AlakazamEvosMoves: ;Evolutions db 0 ;Learnset @@ -1707,7 +1708,7 @@ ALAKAZAM_EvosMoves db 42,REFLECT db 0 -PIDGEOTTO_EvosMoves +PidgeottoEvosMoves: ;Evolutions db EV_LEVEL,36,PIDGEOT db 0 @@ -1720,7 +1721,7 @@ PIDGEOTTO_EvosMoves db 49,MIRROR_MOVE db 0 -PIDGEOT_EvosMoves +PidgeotEvosMoves: ;Evolutions db 0 ;Learnset @@ -1732,13 +1733,13 @@ PIDGEOT_EvosMoves db 54,MIRROR_MOVE db 0 -STARMIE_EvosMoves +StarmieEvosMoves: ;Evolutions db 0 ;Learnset db 0 -BULBASAUR_EvosMoves +BulbasaurEvosMoves: ;Evolutions db EV_LEVEL,16,IVYSAUR db 0 @@ -1752,7 +1753,7 @@ BULBASAUR_EvosMoves db 48,SOLARBEAM db 0 -VENUSAUR_EvosMoves +VenusaurEvosMoves: ;Evolutions db 0 ;Learnset @@ -1765,7 +1766,7 @@ VENUSAUR_EvosMoves db 65,SOLARBEAM db 0 -TENTACRUEL_EvosMoves +TentacruelEvosMoves: ;Evolutions db 0 ;Learnset @@ -1779,13 +1780,13 @@ TENTACRUEL_EvosMoves db 50,HYDRO_PUMP db 0 -MISSINGNO_9C_EvosMoves +MissingNo9CEvosMoves: ;Evolutions db 0 ;Learnset db 0 -GOLDEEN_EvosMoves +GoldeenEvosMoves: ;Evolutions db EV_LEVEL,33,SEAKING db 0 @@ -1798,7 +1799,7 @@ GOLDEEN_EvosMoves db 54,AGILITY db 0 -SEAKING_EvosMoves +SeakingEvosMoves: ;Evolutions db 0 ;Learnset @@ -1810,31 +1811,31 @@ SEAKING_EvosMoves db 54,AGILITY db 0 -MISSINGNO_9F_EvosMoves +MissingNo9FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_A0_EvosMoves +MissingNoA0EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_A1_EvosMoves +MissingNoA1EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_A2_EvosMoves +MissingNoA2EvosMoves: ;Evolutions db 0 ;Learnset db 0 -PONYTA_EvosMoves +PonytaEvosMoves: ;Evolutions db EV_LEVEL,40,RAPIDASH db 0 @@ -1847,7 +1848,7 @@ PONYTA_EvosMoves db 48,AGILITY db 0 -RAPIDASH_EvosMoves +RapidashEvosMoves: ;Evolutions db 0 ;Learnset @@ -1859,7 +1860,7 @@ RAPIDASH_EvosMoves db 55,AGILITY db 0 -RATTATA_EvosMoves +RattataEvosMoves: ;Evolutions db EV_LEVEL,20,RATICATE db 0 @@ -1870,7 +1871,7 @@ RATTATA_EvosMoves db 34,SUPER_FANG db 0 -RATICATE_EvosMoves +RaticateEvosMoves: ;Evolutions db 0 ;Learnset @@ -1880,7 +1881,7 @@ RATICATE_EvosMoves db 41,SUPER_FANG db 0 -NIDORINO_EvosMoves +NidorinoEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING db 0 @@ -1893,7 +1894,7 @@ NIDORINO_EvosMoves db 50,DOUBLE_KICK db 0 -NIDORINA_EvosMoves +NidorinaEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN db 0 @@ -1906,7 +1907,7 @@ NIDORINA_EvosMoves db 50,DOUBLE_KICK db 0 -GEODUDE_EvosMoves +GeodudeEvosMoves: ;Evolutions db EV_LEVEL,25,GRAVELER db 0 @@ -1919,7 +1920,7 @@ GEODUDE_EvosMoves db 36,EXPLOSION db 0 -PORYGON_EvosMoves +PorygonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1929,7 +1930,7 @@ PORYGON_EvosMoves db 42,TRI_ATTACK db 0 -AERODACTYL_EvosMoves +AerodactylEvosMoves: ;Evolutions db 0 ;Learnset @@ -1939,13 +1940,13 @@ AERODACTYL_EvosMoves db 54,HYPER_BEAM db 0 -MISSINGNO_AC_EvosMoves +MissingNoACEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MAGNEMITE_EvosMoves +MagnemiteEvosMoves: ;Evolutions db EV_LEVEL,30,MAGNETON db 0 @@ -1958,19 +1959,19 @@ MAGNEMITE_EvosMoves db 47,SCREECH db 0 -MISSINGNO_AE_EvosMoves +MissingNoAEEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_AF_EvosMoves +MissingNoAFEvosMoves: ;Evolutions db 0 ;Learnset db 0 -CHARMANDER_EvosMoves +CharmanderEvosMoves: ;Evolutions db EV_LEVEL,16,CHARMELEON db 0 @@ -1983,7 +1984,7 @@ CHARMANDER_EvosMoves db 46,FIRE_SPIN db 0 -SQUIRTLE_EvosMoves +SquirtleEvosMoves: ;Evolutions db EV_LEVEL,16,WARTORTLE db 0 @@ -1996,7 +1997,7 @@ SQUIRTLE_EvosMoves db 42,HYDRO_PUMP db 0 -CHARMELEON_EvosMoves +CharmeleonEvosMoves: ;Evolutions db EV_LEVEL,36,CHARIZARD db 0 @@ -2009,7 +2010,7 @@ CHARMELEON_EvosMoves db 56,FIRE_SPIN db 0 -WARTORTLE_EvosMoves +WartortleEvosMoves: ;Evolutions db EV_LEVEL,36,BLASTOISE db 0 @@ -2022,7 +2023,7 @@ WARTORTLE_EvosMoves db 47,HYDRO_PUMP db 0 -CHARIZARD_EvosMoves +CharizardEvosMoves: ;Evolutions db 0 ;Learnset @@ -2034,31 +2035,31 @@ CHARIZARD_EvosMoves db 55,FIRE_SPIN db 0 -MISSINGNO_B5_EvosMoves +MissingNoB5EvosMoves: ;Evolutions db 0 ;Learnset db 0 -FOSSIL_KABUTOPS_EvosMoves +FossilKabutopsEvosMoves: ;Evolutions db 0 ;Learnset db 0 -FOSSIL_AERODACTYL_EvosMoves +FossilAerodactylEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MON_GHOST_EvosMoves +MonGhostEvosMoves: ;Evolutions db 0 ;Learnset db 0 -ODDISH_EvosMoves +OddishEvosMoves: ;Evolutions db EV_LEVEL,21,GLOOM db 0 @@ -2071,7 +2072,7 @@ ODDISH_EvosMoves db 46,SOLARBEAM db 0 -GLOOM_EvosMoves +GloomEvosMoves: ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME db 0 @@ -2084,7 +2085,7 @@ GLOOM_EvosMoves db 52,SOLARBEAM db 0 -VILEPLUME_EvosMoves +VileplumeEvosMoves: ;Evolutions db 0 ;Learnset @@ -2093,7 +2094,7 @@ VILEPLUME_EvosMoves db 19,SLEEP_POWDER db 0 -BELLSPROUT_EvosMoves +BellsproutEvosMoves: ;Evolutions db EV_LEVEL,21,WEEPINBELL db 0 @@ -2107,7 +2108,7 @@ BELLSPROUT_EvosMoves db 42,SLAM db 0 -WEEPINBELL_EvosMoves +WeepinbellEvosMoves: ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL db 0 @@ -2121,7 +2122,7 @@ WEEPINBELL_EvosMoves db 49,SLAM db 0 -VICTREEBEL_EvosMoves +VictreebelEvosMoves: ;Evolutions db 0 ;Learnset diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index cf185fa8..9b07ebb7 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -150,7 +150,7 @@ RedrawPartyMenu_: ld l, a ld de, wcd6d ld a, BANK(EvosMovesPointerTable) - ld bc, EEVEE_EvosEnd - EEVEE_EvosMoves + ld bc, EeveeEvosEnd - EeveeEvosMoves call FarCopyData ld hl, wcd6d ld de, .notAbleToEvolveText -- cgit v1.2.3 From c80eddf988523b81c2e26b57a648ee6069c8955c Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Mar 2018 18:55:09 -0400 Subject: add wEvosMoves instead of using eevee --- engine/menu/party_menu.asm | 10 +++++----- wram.asm | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 9b07ebb7..8323d0eb 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -140,19 +140,19 @@ RedrawPartyMenu_: rl b ld c, a add hl, bc - ld de, wcd6d + ld de, wEvosMoves ld a, BANK(EvosMovesPointerTable) ld bc, 2 call FarCopyData - ld hl, wcd6d + ld hl, wEvosMoves ld a, [hli] ld h, [hl] ld l, a - ld de, wcd6d + ld de, wEvosMoves ld a, BANK(EvosMovesPointerTable) - ld bc, EeveeEvosEnd - EeveeEvosMoves + ld bc, wEvosMoves.end - wEvosMoves call FarCopyData - ld hl, wcd6d + ld hl, wEvosMoves ld de, .notAbleToEvolveText ; loop through the pokemon's evolution entries .checkEvolutionsLoop diff --git a/wram.asm b/wram.asm index ccd6f06e..824b13d4 100755 --- a/wram.asm +++ b/wram.asm @@ -1237,6 +1237,8 @@ wNumMovesMinusOne:: ; cd6c ; FormatMovesString stores the number of moves minus one here ds 1 +UNION + wcd6d:: ds 4 ; buffer for various data wStatusScreenCurrentPP:: ; cd71 @@ -1249,6 +1251,13 @@ wNormalMaxPPList:: ; cd78 ; list of normal max PP (without PP up) values ds 9 +NEXTU + +wEvosMoves:: ds 13 +.end:: + +ENDU + wSerialOtherGameboyRandomNumberListBlock:: ; cd81 ; buffer for transferring the random number list generated by the other gameboy -- cgit v1.2.3 From bd35b37262fd80b355f6b1d942e5e936871be1ec Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 22 Mar 2018 23:09:49 -0400 Subject: use constants for wEvosMoves size --- constants/evolution_constants.asm | 5 +++++ data/evos_moves.asm | 4 +++- wram.asm | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm index 2e3f3613..86c466d8 100755 --- a/constants/evolution_constants.asm +++ b/constants/evolution_constants.asm @@ -1,4 +1,9 @@ +; See data/evos_moves.asm + ; Evolution types EV_LEVEL EQU 1 EV_ITEM EQU 2 EV_TRADE EQU 3 + +MAX_EVOLUTIONS EQU 3 +EVOLUTION_SIZE EQU 4 diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 4c14e4bb..c8e4b6f4 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,3 +1,6 @@ +; See constants/evolution_constants.asm +; The max number of evolutions per monster is MAX_EVOLUTIONS + EvosMovesPointerTable: dw RhydonEvosMoves dw KangaskhanEvosMoves @@ -1243,7 +1246,6 @@ EeveeEvosMoves: db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON db 0 -EeveeEvosEnd: ;Learnset db 27,QUICK_ATTACK db 31,TAIL_WHIP diff --git a/wram.asm b/wram.asm index 824b13d4..baab1cf7 100755 --- a/wram.asm +++ b/wram.asm @@ -1253,7 +1253,7 @@ wNormalMaxPPList:: ; cd78 NEXTU -wEvosMoves:: ds 13 +wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1 .end:: ENDU -- cgit v1.2.3 From 5c4397c899f5b80d5b142ec68603bef31cf92c75 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 22 Mar 2018 23:20:55 -0400 Subject: spaces in EvosMoves --- data/evos_moves.asm | 2360 +++++++++++++++++++++++++-------------------------- 1 file changed, 1180 insertions(+), 1180 deletions(-) diff --git a/data/evos_moves.asm b/data/evos_moves.asm index c8e4b6f4..26f09b87 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -194,1941 +194,1941 @@ EvosMovesPointerTable: dw VictreebelEvosMoves RhydonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,STOMP - db 35,TAIL_WHIP - db 40,FURY_ATTACK - db 48,HORN_DRILL - db 55,LEER - db 64,TAKE_DOWN +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 48, HORN_DRILL + db 55, LEER + db 64, TAKE_DOWN db 0 KangaskhanEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 26,BITE - db 31,TAIL_WHIP - db 36,MEGA_PUNCH - db 41,LEER - db 46,DIZZY_PUNCH +; Learnset + db 26, BITE + db 31, TAIL_WHIP + db 36, MEGA_PUNCH + db 41, LEER + db 46, DIZZY_PUNCH db 0 NidoranMEvosMoves: -;Evolutions - db EV_LEVEL,16,NIDORINO +; Evolutions + db EV_LEVEL, 16, NIDORINO db 0 -;Learnset - db 8,HORN_ATTACK - db 14,POISON_STING - db 21,FOCUS_ENERGY - db 29,FURY_ATTACK - db 36,HORN_DRILL - db 43,DOUBLE_KICK +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 21, FOCUS_ENERGY + db 29, FURY_ATTACK + db 36, HORN_DRILL + db 43, DOUBLE_KICK db 0 ClefairyEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,CLEFABLE +; Evolutions + db EV_ITEM, MOON_STONE, 1, CLEFABLE db 0 -;Learnset - db 13,SING - db 18,DOUBLESLAP - db 24,MINIMIZE - db 31,METRONOME - db 39,DEFENSE_CURL - db 48,LIGHT_SCREEN +; Learnset + db 13, SING + db 18, DOUBLESLAP + db 24, MINIMIZE + db 31, METRONOME + db 39, DEFENSE_CURL + db 48, LIGHT_SCREEN db 0 SpearowEvosMoves: -;Evolutions - db EV_LEVEL,20,FEAROW +; Evolutions + db EV_LEVEL, 20, FEAROW db 0 -;Learnset - db 9,LEER - db 15,FURY_ATTACK - db 22,MIRROR_MOVE - db 29,DRILL_PECK - db 36,AGILITY +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 22, MIRROR_MOVE + db 29, DRILL_PECK + db 36, AGILITY db 0 VoltorbEvosMoves: -;Evolutions - db EV_LEVEL,30,ELECTRODE +; Evolutions + db EV_LEVEL, 30, ELECTRODE db 0 -;Learnset - db 17,SONICBOOM - db 22,SELFDESTRUCT - db 29,LIGHT_SCREEN - db 36,SWIFT - db 43,EXPLOSION +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 36, SWIFT + db 43, EXPLOSION db 0 NidokingEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 8,HORN_ATTACK - db 14,POISON_STING - db 23,THRASH +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 23, THRASH db 0 SlowbroEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 18,DISABLE - db 22,HEADBUTT - db 27,GROWL - db 33,WATER_GUN - db 37,WITHDRAW - db 44,AMNESIA - db 55,PSYCHIC_M +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 37, WITHDRAW + db 44, AMNESIA + db 55, PSYCHIC_M db 0 IvysaurEvosMoves: -;Evolutions - db EV_LEVEL,32,VENUSAUR +; Evolutions + db EV_LEVEL, 32, VENUSAUR db 0 -;Learnset - db 7,LEECH_SEED - db 13,VINE_WHIP - db 22,POISONPOWDER - db 30,RAZOR_LEAF - db 38,GROWTH - db 46,SLEEP_POWDER - db 54,SOLARBEAM +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 38, GROWTH + db 46, SLEEP_POWDER + db 54, SOLARBEAM db 0 ExeggutorEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 28,STOMP +; Learnset + db 28, STOMP db 0 LickitungEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,STOMP - db 15,DISABLE - db 23,DEFENSE_CURL - db 31,SLAM - db 39,SCREECH +; Learnset + db 7, STOMP + db 15, DISABLE + db 23, DEFENSE_CURL + db 31, SLAM + db 39, SCREECH db 0 ExeggcuteEvosMoves: -;Evolutions - db EV_ITEM,LEAF_STONE,1,EXEGGUTOR +; Evolutions + db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR db 0 -;Learnset - db 25,REFLECT - db 28,LEECH_SEED - db 32,STUN_SPORE - db 37,POISONPOWDER - db 42,SOLARBEAM - db 48,SLEEP_POWDER +; Learnset + db 25, REFLECT + db 28, LEECH_SEED + db 32, STUN_SPORE + db 37, POISONPOWDER + db 42, SOLARBEAM + db 48, SLEEP_POWDER db 0 GrimerEvosMoves: -;Evolutions - db EV_LEVEL,38,MUK +; Evolutions + db EV_LEVEL, 38, MUK db 0 -;Learnset - db 30,POISON_GAS - db 33,MINIMIZE - db 37,SLUDGE - db 42,HARDEN - db 48,SCREECH - db 55,ACID_ARMOR +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 42, HARDEN + db 48, SCREECH + db 55, ACID_ARMOR db 0 GengarEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 29,HYPNOSIS - db 38,DREAM_EATER +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER db 0 NidoranFEvosMoves: -;Evolutions - db EV_LEVEL,16,NIDORINA +; Evolutions + db EV_LEVEL, 16, NIDORINA db 0 -;Learnset - db 8,SCRATCH - db 14,POISON_STING - db 21,TAIL_WHIP - db 29,BITE - db 36,FURY_SWIPES - db 43,DOUBLE_KICK +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 21, TAIL_WHIP + db 29, BITE + db 36, FURY_SWIPES + db 43, DOUBLE_KICK db 0 NidoqueenEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 8,SCRATCH - db 14,POISON_STING - db 23,BODY_SLAM +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 23, BODY_SLAM db 0 CuboneEvosMoves: -;Evolutions - db EV_LEVEL,28,MAROWAK +; Evolutions + db EV_LEVEL, 28, MAROWAK db 0 -;Learnset - db 25,LEER - db 31,FOCUS_ENERGY - db 38,THRASH - db 43,BONEMERANG - db 46,RAGE +; Learnset + db 25, LEER + db 31, FOCUS_ENERGY + db 38, THRASH + db 43, BONEMERANG + db 46, RAGE db 0 RhyhornEvosMoves: -;Evolutions - db EV_LEVEL,42,RHYDON +; Evolutions + db EV_LEVEL, 42, RHYDON db 0 -;Learnset - db 30,STOMP - db 35,TAIL_WHIP - db 40,FURY_ATTACK - db 45,HORN_DRILL - db 50,LEER - db 55,TAKE_DOWN +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 45, HORN_DRILL + db 50, LEER + db 55, TAKE_DOWN db 0 LaprasEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 16,SING - db 20,MIST - db 25,BODY_SLAM - db 31,CONFUSE_RAY - db 38,ICE_BEAM - db 46,HYDRO_PUMP +; Learnset + db 16, SING + db 20, MIST + db 25, BODY_SLAM + db 31, CONFUSE_RAY + db 38, ICE_BEAM + db 46, HYDRO_PUMP db 0 ArcanineEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MewEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,TRANSFORM - db 20,MEGA_PUNCH - db 30,METRONOME - db 40,PSYCHIC_M +; Learnset + db 10, TRANSFORM + db 20, MEGA_PUNCH + db 30, METRONOME + db 40, PSYCHIC_M db 0 GyaradosEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,BITE - db 25,DRAGON_RAGE - db 32,LEER - db 41,HYDRO_PUMP - db 52,HYPER_BEAM +; Learnset + db 20, BITE + db 25, DRAGON_RAGE + db 32, LEER + db 41, HYDRO_PUMP + db 52, HYPER_BEAM db 0 ShellderEvosMoves: -;Evolutions - db EV_ITEM,WATER_STONE,1,CLOYSTER +; Evolutions + db EV_ITEM, WATER_STONE, 1, CLOYSTER db 0 -;Learnset - db 18,SUPERSONIC - db 23,CLAMP - db 30,AURORA_BEAM - db 39,LEER - db 50,ICE_BEAM +; Learnset + db 18, SUPERSONIC + db 23, CLAMP + db 30, AURORA_BEAM + db 39, LEER + db 50, ICE_BEAM db 0 TentacoolEvosMoves: -;Evolutions - db EV_LEVEL,30,TENTACRUEL +; Evolutions + db EV_LEVEL, 30, TENTACRUEL db 0 -;Learnset - db 7,SUPERSONIC - db 13,WRAP - db 18,POISON_STING - db 22,WATER_GUN - db 27,CONSTRICT - db 33,BARRIER - db 40,SCREECH - db 48,HYDRO_PUMP +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 33, BARRIER + db 40, SCREECH + db 48, HYDRO_PUMP db 0 GastlyEvosMoves: -;Evolutions - db EV_LEVEL,25,HAUNTER +; Evolutions + db EV_LEVEL, 25, HAUNTER db 0 -;Learnset - db 27,HYPNOSIS - db 35,DREAM_EATER +; Learnset + db 27, HYPNOSIS + db 35, DREAM_EATER db 0 ScytherEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 17,LEER - db 20,FOCUS_ENERGY - db 24,DOUBLE_TEAM - db 29,SLASH - db 35,SWORDS_DANCE - db 42,AGILITY +; Learnset + db 17, LEER + db 20, FOCUS_ENERGY + db 24, DOUBLE_TEAM + db 29, SLASH + db 35, SWORDS_DANCE + db 42, AGILITY db 0 StaryuEvosMoves: -;Evolutions - db EV_ITEM,WATER_STONE,1,STARMIE +; Evolutions + db EV_ITEM, WATER_STONE, 1, STARMIE db 0 -;Learnset - db 17,WATER_GUN - db 22,HARDEN - db 27,RECOVER - db 32,SWIFT - db 37,MINIMIZE - db 42,LIGHT_SCREEN - db 47,HYDRO_PUMP +; Learnset + db 17, WATER_GUN + db 22, HARDEN + db 27, RECOVER + db 32, SWIFT + db 37, MINIMIZE + db 42, LIGHT_SCREEN + db 47, HYDRO_PUMP db 0 BlastoiseEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 8,BUBBLE - db 15,WATER_GUN - db 24,BITE - db 31,WITHDRAW - db 42,SKULL_BASH - db 52,HYDRO_PUMP +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 42, SKULL_BASH + db 52, HYDRO_PUMP db 0 PinsirEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 25,SEISMIC_TOSS - db 30,GUILLOTINE - db 36,FOCUS_ENERGY - db 43,HARDEN - db 49,SLASH - db 54,SWORDS_DANCE +; Learnset + db 25, SEISMIC_TOSS + db 30, GUILLOTINE + db 36, FOCUS_ENERGY + db 43, HARDEN + db 49, SLASH + db 54, SWORDS_DANCE db 0 TangelaEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 29,ABSORB - db 32,POISONPOWDER - db 36,STUN_SPORE - db 39,SLEEP_POWDER - db 45,SLAM - db 49,GROWTH +; Learnset + db 29, ABSORB + db 32, POISONPOWDER + db 36, STUN_SPORE + db 39, SLEEP_POWDER + db 45, SLAM + db 49, GROWTH db 0 MissingNo1FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo20EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 GrowlitheEvosMoves: -;Evolutions - db EV_ITEM,FIRE_STONE,1,ARCANINE +; Evolutions + db EV_ITEM, FIRE_STONE, 1, ARCANINE db 0 -;Learnset - db 18,EMBER - db 23,LEER - db 30,TAKE_DOWN - db 39,AGILITY - db 50,FLAMETHROWER +; Learnset + db 18, EMBER + db 23, LEER + db 30, TAKE_DOWN + db 39, AGILITY + db 50, FLAMETHROWER db 0 OnixEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,BIND - db 19,ROCK_THROW - db 25,RAGE - db 33,SLAM - db 43,HARDEN +; Learnset + db 15, BIND + db 19, ROCK_THROW + db 25, RAGE + db 33, SLAM + db 43, HARDEN db 0 FearowEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 9,LEER - db 15,FURY_ATTACK - db 25,MIRROR_MOVE - db 34,DRILL_PECK - db 43,AGILITY +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 25, MIRROR_MOVE + db 34, DRILL_PECK + db 43, AGILITY db 0 PidgeyEvosMoves: -;Evolutions - db EV_LEVEL,18,PIDGEOTTO +; Evolutions + db EV_LEVEL, 18, PIDGEOTTO db 0 -;Learnset - db 5,SAND_ATTACK - db 12,QUICK_ATTACK - db 19,WHIRLWIND - db 28,WING_ATTACK - db 36,AGILITY - db 44,MIRROR_MOVE +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 19, WHIRLWIND + db 28, WING_ATTACK + db 36, AGILITY + db 44, MIRROR_MOVE db 0 SlowpokeEvosMoves: -;Evolutions - db EV_LEVEL,37,SLOWBRO +; Evolutions + db EV_LEVEL, 37, SLOWBRO db 0 -;Learnset - db 18,DISABLE - db 22,HEADBUTT - db 27,GROWL - db 33,WATER_GUN - db 40,AMNESIA - db 48,PSYCHIC_M +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 40, AMNESIA + db 48, PSYCHIC_M db 0 KadabraEvosMoves: -;Evolutions - db EV_TRADE,1,ALAKAZAM +; Evolutions + db EV_TRADE, 1, ALAKAZAM db 0 -;Learnset - db 16,CONFUSION - db 20,DISABLE - db 27,PSYBEAM - db 31,RECOVER - db 38,PSYCHIC_M - db 42,REFLECT +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT db 0 GravelerEvosMoves: -;Evolutions - db EV_TRADE,1,GOLEM +; Evolutions + db EV_TRADE, 1, GOLEM db 0 -;Learnset - db 11,DEFENSE_CURL - db 16,ROCK_THROW - db 21,SELFDESTRUCT - db 29,HARDEN - db 36,EARTHQUAKE - db 43,EXPLOSION +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION db 0 ChanseyEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 24,SING - db 30,GROWL - db 38,MINIMIZE - db 44,DEFENSE_CURL - db 48,LIGHT_SCREEN - db 54,DOUBLE_EDGE +; Learnset + db 24, SING + db 30, GROWL + db 38, MINIMIZE + db 44, DEFENSE_CURL + db 48, LIGHT_SCREEN + db 54, DOUBLE_EDGE db 0 MachokeEvosMoves: -;Evolutions - db EV_TRADE,1,MACHAMP +; Evolutions + db EV_TRADE, 1, MACHAMP db 0 -;Learnset - db 20,LOW_KICK - db 25,LEER - db 36,FOCUS_ENERGY - db 44,SEISMIC_TOSS - db 52,SUBMISSION +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION db 0 MrMimeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,CONFUSION - db 23,LIGHT_SCREEN - db 31,DOUBLESLAP - db 39,MEDITATE - db 47,SUBSTITUTE +; Learnset + db 15, CONFUSION + db 23, LIGHT_SCREEN + db 31, DOUBLESLAP + db 39, MEDITATE + db 47, SUBSTITUTE db 0 HitmonleeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 33,ROLLING_KICK - db 38,JUMP_KICK - db 43,FOCUS_ENERGY - db 48,HI_JUMP_KICK - db 53,MEGA_KICK +; Learnset + db 33, ROLLING_KICK + db 38, JUMP_KICK + db 43, FOCUS_ENERGY + db 48, HI_JUMP_KICK + db 53, MEGA_KICK db 0 HitmonchanEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 33,FIRE_PUNCH - db 38,ICE_PUNCH - db 43,THUNDERPUNCH - db 48,MEGA_PUNCH - db 53,COUNTER +; Learnset + db 33, FIRE_PUNCH + db 38, ICE_PUNCH + db 43, THUNDERPUNCH + db 48, MEGA_PUNCH + db 53, COUNTER db 0 ArbokEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,POISON_STING - db 17,BITE - db 27,GLARE - db 36,SCREECH - db 47,ACID +; Learnset + db 10, POISON_STING + db 17, BITE + db 27, GLARE + db 36, SCREECH + db 47, ACID db 0 ParasectEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 13,STUN_SPORE - db 20,LEECH_LIFE - db 30,SPORE - db 39,SLASH - db 48,GROWTH +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 30, SPORE + db 39, SLASH + db 48, GROWTH db 0 PsyduckEvosMoves: -;Evolutions - db EV_LEVEL,33,GOLDUCK +; Evolutions + db EV_LEVEL, 33, GOLDUCK db 0 -;Learnset - db 28,TAIL_WHIP - db 31,DISABLE - db 36,CONFUSION - db 43,FURY_SWIPES - db 52,HYDRO_PUMP +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 36, CONFUSION + db 43, FURY_SWIPES + db 52, HYDRO_PUMP db 0 DrowzeeEvosMoves: -;Evolutions - db EV_LEVEL,26,HYPNO +; Evolutions + db EV_LEVEL, 26, HYPNO db 0 -;Learnset - db 12,DISABLE - db 17,CONFUSION - db 24,HEADBUTT - db 29,POISON_GAS - db 32,PSYCHIC_M - db 37,MEDITATE +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 29, POISON_GAS + db 32, PSYCHIC_M + db 37, MEDITATE db 0 GolemEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 11,DEFENSE_CURL - db 16,ROCK_THROW - db 21,SELFDESTRUCT - db 29,HARDEN - db 36,EARTHQUAKE - db 43,EXPLOSION +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION db 0 MissingNo32EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MagmarEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 36,LEER - db 39,CONFUSE_RAY - db 43,FIRE_PUNCH - db 48,SMOKESCREEN - db 52,SMOG - db 55,FLAMETHROWER +; Learnset + db 36, LEER + db 39, CONFUSE_RAY + db 43, FIRE_PUNCH + db 48, SMOKESCREEN + db 52, SMOG + db 55, FLAMETHROWER db 0 MissingNo34EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 ElectabuzzEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 34,THUNDERSHOCK - db 37,SCREECH - db 42,THUNDERPUNCH - db 49,LIGHT_SCREEN - db 54,THUNDER +; Learnset + db 34, THUNDERSHOCK + db 37, SCREECH + db 42, THUNDERPUNCH + db 49, LIGHT_SCREEN + db 54, THUNDER db 0 MagnetonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 21,SONICBOOM - db 25,THUNDERSHOCK - db 29,SUPERSONIC - db 38,THUNDER_WAVE - db 46,SWIFT - db 54,SCREECH +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 38, THUNDER_WAVE + db 46, SWIFT + db 54, SCREECH db 0 KoffingEvosMoves: -;Evolutions - db EV_LEVEL,35,WEEZING +; Evolutions + db EV_LEVEL, 35, WEEZING db 0 -;Learnset - db 32,SLUDGE - db 37,SMOKESCREEN - db 40,SELFDESTRUCT - db 45,HAZE - db 48,EXPLOSION +; Learnset + db 32, SLUDGE + db 37, SMOKESCREEN + db 40, SELFDESTRUCT + db 45, HAZE + db 48, EXPLOSION db 0 MissingNo38EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MankeyEvosMoves: -;Evolutions - db EV_LEVEL,28,PRIMEAPE +; Evolutions + db EV_LEVEL, 28, PRIMEAPE db 0 -;Learnset - db 15,KARATE_CHOP - db 21,FURY_SWIPES - db 27,FOCUS_ENERGY - db 33,SEISMIC_TOSS - db 39,THRASH +; Learnset + db 15, KARATE_CHOP + db 21, FURY_SWIPES + db 27, FOCUS_ENERGY + db 33, SEISMIC_TOSS + db 39, THRASH db 0 SeelEvosMoves: -;Evolutions - db EV_LEVEL,34,DEWGONG +; Evolutions + db EV_LEVEL, 34, DEWGONG db 0 -;Learnset - db 30,GROWL - db 35,AURORA_BEAM - db 40,REST - db 45,TAKE_DOWN - db 50,ICE_BEAM +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 40, REST + db 45, TAKE_DOWN + db 50, ICE_BEAM db 0 DiglettEvosMoves: -;Evolutions - db EV_LEVEL,26,DUGTRIO +; Evolutions + db EV_LEVEL, 26, DUGTRIO db 0 -;Learnset - db 15,GROWL - db 19,DIG - db 24,SAND_ATTACK - db 31,SLASH - db 40,EARTHQUAKE +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 31, SLASH + db 40, EARTHQUAKE db 0 TaurosEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 21,STOMP - db 28,TAIL_WHIP - db 35,LEER - db 44,RAGE - db 51,TAKE_DOWN +; Learnset + db 21, STOMP + db 28, TAIL_WHIP + db 35, LEER + db 44, RAGE + db 51, TAKE_DOWN db 0 MissingNo3DEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo3EEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo3FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 FarfetchdEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,LEER - db 15,FURY_ATTACK - db 23,SWORDS_DANCE - db 31,AGILITY - db 39,SLASH +; Learnset + db 7, LEER + db 15, FURY_ATTACK + db 23, SWORDS_DANCE + db 31, AGILITY + db 39, SLASH db 0 VenonatEvosMoves: -;Evolutions - db EV_LEVEL,31,VENOMOTH +; Evolutions + db EV_LEVEL, 31, VENOMOTH db 0 -;Learnset - db 24,POISONPOWDER - db 27,LEECH_LIFE - db 30,STUN_SPORE - db 35,PSYBEAM - db 38,SLEEP_POWDER - db 43,PSYCHIC_M +; Learnset + db 24, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 35, PSYBEAM + db 38, SLEEP_POWDER + db 43, PSYCHIC_M db 0 DragoniteEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,THUNDER_WAVE - db 20,AGILITY - db 35,SLAM - db 45,DRAGON_RAGE - db 60,HYPER_BEAM +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 60, HYPER_BEAM db 0 MissingNo43EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo44EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo45EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 DoduoEvosMoves: -;Evolutions - db EV_LEVEL,31,DODRIO +; Evolutions + db EV_LEVEL, 31, DODRIO db 0 -;Learnset - db 20,GROWL - db 24,FURY_ATTACK - db 30,DRILL_PECK - db 36,RAGE - db 40,TRI_ATTACK - db 44,AGILITY +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 36, RAGE + db 40, TRI_ATTACK + db 44, AGILITY db 0 PoliwagEvosMoves: -;Evolutions - db EV_LEVEL,25,POLIWHIRL +; Evolutions + db EV_LEVEL, 25, POLIWHIRL db 0 -;Learnset - db 16,HYPNOSIS - db 19,WATER_GUN - db 25,DOUBLESLAP - db 31,BODY_SLAM - db 38,AMNESIA - db 45,HYDRO_PUMP +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 25, DOUBLESLAP + db 31, BODY_SLAM + db 38, AMNESIA + db 45, HYDRO_PUMP db 0 JynxEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 18,LICK - db 23,DOUBLESLAP - db 31,ICE_PUNCH - db 39,BODY_SLAM - db 47,THRASH - db 58,BLIZZARD +; Learnset + db 18, LICK + db 23, DOUBLESLAP + db 31, ICE_PUNCH + db 39, BODY_SLAM + db 47, THRASH + db 58, BLIZZARD db 0 MoltresEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 51,LEER - db 55,AGILITY - db 60,SKY_ATTACK +; Learnset + db 51, LEER + db 55, AGILITY + db 60, SKY_ATTACK db 0 ArticunoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 51,BLIZZARD - db 55,AGILITY - db 60,MIST +; Learnset + db 51, BLIZZARD + db 55, AGILITY + db 60, MIST db 0 ZapdosEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 51,THUNDER - db 55,AGILITY - db 60,LIGHT_SCREEN +; Learnset + db 51, THUNDER + db 55, AGILITY + db 60, LIGHT_SCREEN db 0 DittoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MeowthEvosMoves: -;Evolutions - db EV_LEVEL,28,PERSIAN +; Evolutions + db EV_LEVEL, 28, PERSIAN db 0 -;Learnset - db 12,BITE - db 17,PAY_DAY - db 24,SCREECH - db 33,FURY_SWIPES - db 44,SLASH +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 33, FURY_SWIPES + db 44, SLASH db 0 KrabbyEvosMoves: -;Evolutions - db EV_LEVEL,28,KINGLER +; Evolutions + db EV_LEVEL, 28, KINGLER db 0 -;Learnset - db 20,VICEGRIP - db 25,GUILLOTINE - db 30,STOMP - db 35,CRABHAMMER - db 40,HARDEN +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 30, STOMP + db 35, CRABHAMMER + db 40, HARDEN db 0 MissingNo4FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo50EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo51EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 VulpixEvosMoves: -;Evolutions - db EV_ITEM,FIRE_STONE,1,NINETALES +; Evolutions + db EV_ITEM, FIRE_STONE, 1, NINETALES db 0 -;Learnset - db 16,QUICK_ATTACK - db 21,ROAR - db 28,CONFUSE_RAY - db 35,FLAMETHROWER - db 42,FIRE_SPIN +; Learnset + db 16, QUICK_ATTACK + db 21, ROAR + db 28, CONFUSE_RAY + db 35, FLAMETHROWER + db 42, FIRE_SPIN db 0 NinetalesEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 PikachuEvosMoves: -;Evolutions - db EV_ITEM,THUNDER_STONE,1,RAICHU +; Evolutions + db EV_ITEM, THUNDER_STONE, 1, RAICHU db 0 -;Learnset - db 9,THUNDER_WAVE - db 16,QUICK_ATTACK - db 26,SWIFT - db 33,AGILITY - db 43,THUNDER +; Learnset + db 9, THUNDER_WAVE + db 16, QUICK_ATTACK + db 26, SWIFT + db 33, AGILITY + db 43, THUNDER db 0 RaichuEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo56EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo57EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 DratiniEvosMoves: -;Evolutions - db EV_LEVEL,30,DRAGONAIR +; Evolutions + db EV_LEVEL, 30, DRAGONAIR db 0 -;Learnset - db 10,THUNDER_WAVE - db 20,AGILITY - db 30,SLAM - db 40,DRAGON_RAGE - db 50,HYPER_BEAM +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 30, SLAM + db 40, DRAGON_RAGE + db 50, HYPER_BEAM db 0 DragonairEvosMoves: -;Evolutions - db EV_LEVEL,55,DRAGONITE +; Evolutions + db EV_LEVEL, 55, DRAGONITE db 0 -;Learnset - db 10,THUNDER_WAVE - db 20,AGILITY - db 35,SLAM - db 45,DRAGON_RAGE - db 55,HYPER_BEAM +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 55, HYPER_BEAM db 0 KabutoEvosMoves: -;Evolutions - db EV_LEVEL,40,KABUTOPS +; Evolutions + db EV_LEVEL, 40, KABUTOPS db 0 -;Learnset - db 34,ABSORB - db 39,SLASH - db 44,LEER - db 49,HYDRO_PUMP +; Learnset + db 34, ABSORB + db 39, SLASH + db 44, LEER + db 49, HYDRO_PUMP db 0 KabutopsEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 34,ABSORB - db 39,SLASH - db 46,LEER - db 53,HYDRO_PUMP +; Learnset + db 34, ABSORB + db 39, SLASH + db 46, LEER + db 53, HYDRO_PUMP db 0 HorseaEvosMoves: -;Evolutions - db EV_LEVEL,32,SEADRA +; Evolutions + db EV_LEVEL, 32, SEADRA db 0 -;Learnset - db 19,SMOKESCREEN - db 24,LEER - db 30,WATER_GUN - db 37,AGILITY - db 45,HYDRO_PUMP +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 37, AGILITY + db 45, HYDRO_PUMP db 0 SeadraEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 19,SMOKESCREEN - db 24,LEER - db 30,WATER_GUN - db 41,AGILITY - db 52,HYDRO_PUMP +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 41, AGILITY + db 52, HYDRO_PUMP db 0 MissingNo5EEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo5FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 SandshrewEvosMoves: -;Evolutions - db EV_LEVEL,22,SANDSLASH +; Evolutions + db EV_LEVEL, 22, SANDSLASH db 0 -;Learnset - db 10,SAND_ATTACK - db 17,SLASH - db 24,POISON_STING - db 31,SWIFT - db 38,FURY_SWIPES +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 24, POISON_STING + db 31, SWIFT + db 38, FURY_SWIPES db 0 SandslashEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,SAND_ATTACK - db 17,SLASH - db 27,POISON_STING - db 36,SWIFT - db 47,FURY_SWIPES +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 27, POISON_STING + db 36, SWIFT + db 47, FURY_SWIPES db 0 OmanyteEvosMoves: -;Evolutions - db EV_LEVEL,40,OMASTAR +; Evolutions + db EV_LEVEL, 40, OMASTAR db 0 -;Learnset - db 34,HORN_ATTACK - db 39,LEER - db 46,SPIKE_CANNON - db 53,HYDRO_PUMP +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 46, SPIKE_CANNON + db 53, HYDRO_PUMP db 0 OmastarEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 34,HORN_ATTACK - db 39,LEER - db 44,SPIKE_CANNON - db 49,HYDRO_PUMP +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 44, SPIKE_CANNON + db 49, HYDRO_PUMP db 0 JigglypuffEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,WIGGLYTUFF +; Evolutions + db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF db 0 -;Learnset - db 9,POUND - db 14,DISABLE - db 19,DEFENSE_CURL - db 24,DOUBLESLAP - db 29,REST - db 34,BODY_SLAM - db 39,DOUBLE_EDGE +; Learnset + db 9, POUND + db 14, DISABLE + db 19, DEFENSE_CURL + db 24, DOUBLESLAP + db 29, REST + db 34, BODY_SLAM + db 39, DOUBLE_EDGE db 0 WigglytuffEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 EeveeEvosMoves: -;Evolutions - db EV_ITEM,FIRE_STONE,1,FLAREON - db EV_ITEM,THUNDER_STONE,1,JOLTEON - db EV_ITEM,WATER_STONE,1,VAPOREON +; Evolutions + db EV_ITEM, FIRE_STONE, 1, FLAREON + db EV_ITEM, THUNDER_STONE, 1, JOLTEON + db EV_ITEM, WATER_STONE, 1, VAPOREON db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,TAIL_WHIP - db 37,BITE - db 45,TAKE_DOWN +; Learnset + db 27, QUICK_ATTACK + db 31, TAIL_WHIP + db 37, BITE + db 45, TAKE_DOWN db 0 FlareonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,EMBER - db 37,TAIL_WHIP - db 40,BITE - db 42,LEER - db 44,FIRE_SPIN - db 48,RAGE - db 54,FLAMETHROWER +; Learnset + db 27, QUICK_ATTACK + db 31, EMBER + db 37, TAIL_WHIP + db 40, BITE + db 42, LEER + db 44, FIRE_SPIN + db 48, RAGE + db 54, FLAMETHROWER db 0 JolteonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,THUNDERSHOCK - db 37,TAIL_WHIP - db 40,THUNDER_WAVE - db 42,DOUBLE_KICK - db 44,AGILITY - db 48,PIN_MISSILE - db 54,THUNDER +; Learnset + db 27, QUICK_ATTACK + db 31, THUNDERSHOCK + db 37, TAIL_WHIP + db 40, THUNDER_WAVE + db 42, DOUBLE_KICK + db 44, AGILITY + db 48, PIN_MISSILE + db 54, THUNDER db 0 VaporeonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,WATER_GUN - db 37,TAIL_WHIP - db 40,BITE - db 42,ACID_ARMOR - db 44,HAZE - db 48,MIST - db 54,HYDRO_PUMP +; Learnset + db 27, QUICK_ATTACK + db 31, WATER_GUN + db 37, TAIL_WHIP + db 40, BITE + db 42, ACID_ARMOR + db 44, HAZE + db 48, MIST + db 54, HYDRO_PUMP db 0 MachopEvosMoves: -;Evolutions - db EV_LEVEL,28,MACHOKE +; Evolutions + db EV_LEVEL, 28, MACHOKE db 0 -;Learnset - db 20,LOW_KICK - db 25,LEER - db 32,FOCUS_ENERGY - db 39,SEISMIC_TOSS - db 46,SUBMISSION +; Learnset + db 20, LOW_KICK + db 25, LEER + db 32, FOCUS_ENERGY + db 39, SEISMIC_TOSS + db 46, SUBMISSION db 0 ZubatEvosMoves: -;Evolutions - db EV_LEVEL,22,GOLBAT +; Evolutions + db EV_LEVEL, 22, GOLBAT db 0 -;Learnset - db 10,SUPERSONIC - db 15,BITE - db 21,CONFUSE_RAY - db 28,WING_ATTACK - db 36,HAZE +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 28, WING_ATTACK + db 36, HAZE db 0 EkansEvosMoves: -;Evolutions - db EV_LEVEL,22,ARBOK +; Evolutions + db EV_LEVEL, 22, ARBOK db 0 -;Learnset - db 10,POISON_STING - db 17,BITE - db 24,GLARE - db 31,SCREECH - db 38,ACID +; Learnset + db 10, POISON_STING + db 17, BITE + db 24, GLARE + db 31, SCREECH + db 38, ACID db 0 ParasEvosMoves: -;Evolutions - db EV_LEVEL,24,PARASECT +; Evolutions + db EV_LEVEL, 24, PARASECT db 0 -;Learnset - db 13,STUN_SPORE - db 20,LEECH_LIFE - db 27,SPORE - db 34,SLASH - db 41,GROWTH +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 27, SPORE + db 34, SLASH + db 41, GROWTH db 0 PoliwhirlEvosMoves: -;Evolutions - db EV_ITEM,WATER_STONE,1,POLIWRATH +; Evolutions + db EV_ITEM, WATER_STONE, 1, POLIWRATH db 0 -;Learnset - db 16,HYPNOSIS - db 19,WATER_GUN - db 26,DOUBLESLAP - db 33,BODY_SLAM - db 41,AMNESIA - db 49,HYDRO_PUMP +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 26, DOUBLESLAP + db 33, BODY_SLAM + db 41, AMNESIA + db 49, HYDRO_PUMP db 0 PoliwrathEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 16,HYPNOSIS - db 19,WATER_GUN +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN db 0 WeedleEvosMoves: -;Evolutions - db EV_LEVEL,7,KAKUNA +; Evolutions + db EV_LEVEL, 7, KAKUNA db 0 -;Learnset +; Learnset db 0 KakunaEvosMoves: -;Evolutions - db EV_LEVEL,10,BEEDRILL +; Evolutions + db EV_LEVEL, 10, BEEDRILL db 0 -;Learnset +; Learnset db 0 BeedrillEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,FURY_ATTACK - db 16,FOCUS_ENERGY - db 20,TWINEEDLE - db 25,RAGE - db 30,PIN_MISSILE - db 35,AGILITY +; Learnset + db 12, FURY_ATTACK + db 16, FOCUS_ENERGY + db 20, TWINEEDLE + db 25, RAGE + db 30, PIN_MISSILE + db 35, AGILITY db 0 MissingNo73EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 DodrioEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,GROWL - db 24,FURY_ATTACK - db 30,DRILL_PECK - db 39,RAGE - db 45,TRI_ATTACK - db 51,AGILITY +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 39, RAGE + db 45, TRI_ATTACK + db 51, AGILITY db 0 PrimeapeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,KARATE_CHOP - db 21,FURY_SWIPES - db 27,FOCUS_ENERGY - db 37,SEISMIC_TOSS - db 46,THRASH +; Learnset + db 15, KARATE_CHOP + db 21, FURY_SWIPES + db 27, FOCUS_ENERGY + db 37, SEISMIC_TOSS + db 46, THRASH db 0 DugtrioEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,GROWL - db 19,DIG - db 24,SAND_ATTACK - db 35,SLASH - db 47,EARTHQUAKE +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 35, SLASH + db 47, EARTHQUAKE db 0 VenomothEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 24,POISONPOWDER - db 27,LEECH_LIFE - db 30,STUN_SPORE - db 38,PSYBEAM - db 43,SLEEP_POWDER - db 50,PSYCHIC_M +; Learnset + db 24, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 38, PSYBEAM + db 43, SLEEP_POWDER + db 50, PSYCHIC_M db 0 DewgongEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,GROWL - db 35,AURORA_BEAM - db 44,REST - db 50,TAKE_DOWN - db 56,ICE_BEAM +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 44, REST + db 50, TAKE_DOWN + db 56, ICE_BEAM db 0 MissingNo79EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo7AEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 CaterpieEvosMoves: -;Evolutions - db EV_LEVEL,7,METAPOD +; Evolutions + db EV_LEVEL, 7, METAPOD db 0 -;Learnset +; Learnset db 0 MetapodEvosMoves: -;Evolutions - db EV_LEVEL,10,BUTTERFREE +; Evolutions + db EV_LEVEL, 10, BUTTERFREE db 0 -;Learnset +; Learnset db 0 ButterfreeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,CONFUSION - db 15,POISONPOWDER - db 16,STUN_SPORE - db 17,SLEEP_POWDER - db 21,SUPERSONIC - db 26,WHIRLWIND - db 32,PSYBEAM +; Learnset + db 12, CONFUSION + db 15, POISONPOWDER + db 16, STUN_SPORE + db 17, SLEEP_POWDER + db 21, SUPERSONIC + db 26, WHIRLWIND + db 32, PSYBEAM db 0 MachampEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,LOW_KICK - db 25,LEER - db 36,FOCUS_ENERGY - db 44,SEISMIC_TOSS - db 52,SUBMISSION +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION db 0 MissingNo7FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 GolduckEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 28,TAIL_WHIP - db 31,DISABLE - db 39,CONFUSION - db 48,FURY_SWIPES - db 59,HYDRO_PUMP +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 39, CONFUSION + db 48, FURY_SWIPES + db 59, HYDRO_PUMP db 0 HypnoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,DISABLE - db 17,CONFUSION - db 24,HEADBUTT - db 33,POISON_GAS - db 37,PSYCHIC_M - db 43,MEDITATE +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 33, POISON_GAS + db 37, PSYCHIC_M + db 43, MEDITATE db 0 GolbatEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,SUPERSONIC - db 15,BITE - db 21,CONFUSE_RAY - db 32,WING_ATTACK - db 43,HAZE +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 32, WING_ATTACK + db 43, HAZE db 0 MewtwoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 63,BARRIER - db 66,PSYCHIC_M - db 70,RECOVER - db 75,MIST - db 81,AMNESIA +; Learnset + db 63, BARRIER + db 66, PSYCHIC_M + db 70, RECOVER + db 75, MIST + db 81, AMNESIA db 0 SnorlaxEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 35,BODY_SLAM - db 41,HARDEN - db 48,DOUBLE_EDGE - db 56,HYPER_BEAM +; Learnset + db 35, BODY_SLAM + db 41, HARDEN + db 48, DOUBLE_EDGE + db 56, HYPER_BEAM db 0 MagikarpEvosMoves: -;Evolutions - db EV_LEVEL,20,GYARADOS +; Evolutions + db EV_LEVEL, 20, GYARADOS db 0 -;Learnset - db 15,TACKLE +; Learnset + db 15, TACKLE db 0 MissingNo86EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo87EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MukEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,POISON_GAS - db 33,MINIMIZE - db 37,SLUDGE - db 45,HARDEN - db 53,SCREECH - db 60,ACID_ARMOR +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 45, HARDEN + db 53, SCREECH + db 60, ACID_ARMOR db 0 MissingNo8AEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 KinglerEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,VICEGRIP - db 25,GUILLOTINE - db 34,STOMP - db 42,CRABHAMMER - db 49,HARDEN +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 34, STOMP + db 42, CRABHAMMER + db 49, HARDEN db 0 CloysterEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 50,SPIKE_CANNON +; Learnset + db 50, SPIKE_CANNON db 0 MissingNo8CEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 ElectrodeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 17,SONICBOOM - db 22,SELFDESTRUCT - db 29,LIGHT_SCREEN - db 40,SWIFT - db 50,EXPLOSION +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 40, SWIFT + db 50, EXPLOSION db 0 ClefableEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 WeezingEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 32,SLUDGE - db 39,SMOKESCREEN - db 43,SELFDESTRUCT - db 49,HAZE - db 53,EXPLOSION +; Learnset + db 32, SLUDGE + db 39, SMOKESCREEN + db 43, SELFDESTRUCT + db 49, HAZE + db 53, EXPLOSION db 0 PersianEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,BITE - db 17,PAY_DAY - db 24,SCREECH - db 37,FURY_SWIPES - db 51,SLASH +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 37, FURY_SWIPES + db 51, SLASH db 0 MarowakEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 25,LEER - db 33,FOCUS_ENERGY - db 41,THRASH - db 48,BONEMERANG - db 55,RAGE +; Learnset + db 25, LEER + db 33, FOCUS_ENERGY + db 41, THRASH + db 48, BONEMERANG + db 55, RAGE db 0 MissingNo92EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 HaunterEvosMoves: -;Evolutions - db EV_TRADE,1,GENGAR +; Evolutions + db EV_TRADE, 1, GENGAR db 0 -;Learnset - db 29,HYPNOSIS - db 38,DREAM_EATER +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER db 0 AbraEvosMoves: -;Evolutions - db EV_LEVEL,16,KADABRA +; Evolutions + db EV_LEVEL, 16, KADABRA db 0 -;Learnset +; Learnset db 0 AlakazamEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 16,CONFUSION - db 20,DISABLE - db 27,PSYBEAM - db 31,RECOVER - db 38,PSYCHIC_M - db 42,REFLECT +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT db 0 PidgeottoEvosMoves: -;Evolutions - db EV_LEVEL,36,PIDGEOT +; Evolutions + db EV_LEVEL, 36, PIDGEOT db 0 -;Learnset - db 5,SAND_ATTACK - db 12,QUICK_ATTACK - db 21,WHIRLWIND - db 31,WING_ATTACK - db 40,AGILITY - db 49,MIRROR_MOVE +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 40, AGILITY + db 49, MIRROR_MOVE db 0 PidgeotEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 5,SAND_ATTACK - db 12,QUICK_ATTACK - db 21,WHIRLWIND - db 31,WING_ATTACK - db 44,AGILITY - db 54,MIRROR_MOVE +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 44, AGILITY + db 54, MIRROR_MOVE db 0 StarmieEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 BulbasaurEvosMoves: -;Evolutions - db EV_LEVEL,16,IVYSAUR +; Evolutions + db EV_LEVEL, 16, IVYSAUR db 0 -;Learnset - db 7,LEECH_SEED - db 13,VINE_WHIP - db 20,POISONPOWDER - db 27,RAZOR_LEAF - db 34,GROWTH - db 41,SLEEP_POWDER - db 48,SOLARBEAM +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 20, POISONPOWDER + db 27, RAZOR_LEAF + db 34, GROWTH + db 41, SLEEP_POWDER + db 48, SOLARBEAM db 0 VenusaurEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,LEECH_SEED - db 13,VINE_WHIP - db 22,POISONPOWDER - db 30,RAZOR_LEAF - db 43,GROWTH - db 55,SLEEP_POWDER - db 65,SOLARBEAM +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 43, GROWTH + db 55, SLEEP_POWDER + db 65, SOLARBEAM db 0 TentacruelEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,SUPERSONIC - db 13,WRAP - db 18,POISON_STING - db 22,WATER_GUN - db 27,CONSTRICT - db 35,BARRIER - db 43,SCREECH - db 50,HYDRO_PUMP +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 35, BARRIER + db 43, SCREECH + db 50, HYDRO_PUMP db 0 MissingNo9CEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 GoldeenEvosMoves: -;Evolutions - db EV_LEVEL,33,SEAKING +; Evolutions + db EV_LEVEL, 33, SEAKING db 0 -;Learnset - db 19,SUPERSONIC - db 24,HORN_ATTACK - db 30,FURY_ATTACK - db 37,WATERFALL - db 45,HORN_DRILL - db 54,AGILITY +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 37, WATERFALL + db 45, HORN_DRILL + db 54, AGILITY db 0 SeakingEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 19,SUPERSONIC - db 24,HORN_ATTACK - db 30,FURY_ATTACK - db 39,WATERFALL - db 48,HORN_DRILL - db 54,AGILITY +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 39, WATERFALL + db 48, HORN_DRILL + db 54, AGILITY db 0 MissingNo9FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoA0EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoA1EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoA2EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 PonytaEvosMoves: -;Evolutions - db EV_LEVEL,40,RAPIDASH +; Evolutions + db EV_LEVEL, 40, RAPIDASH db 0 -;Learnset - db 30,TAIL_WHIP - db 32,STOMP - db 35,GROWL - db 39,FIRE_SPIN - db 43,TAKE_DOWN - db 48,AGILITY +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 43, TAKE_DOWN + db 48, AGILITY db 0 RapidashEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,TAIL_WHIP - db 32,STOMP - db 35,GROWL - db 39,FIRE_SPIN - db 47,TAKE_DOWN - db 55,AGILITY +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 47, TAKE_DOWN + db 55, AGILITY db 0 RattataEvosMoves: -;Evolutions - db EV_LEVEL,20,RATICATE +; Evolutions + db EV_LEVEL, 20, RATICATE db 0 -;Learnset - db 7,QUICK_ATTACK - db 14,HYPER_FANG - db 23,FOCUS_ENERGY - db 34,SUPER_FANG +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 23, FOCUS_ENERGY + db 34, SUPER_FANG db 0 RaticateEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,QUICK_ATTACK - db 14,HYPER_FANG - db 27,FOCUS_ENERGY - db 41,SUPER_FANG +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 27, FOCUS_ENERGY + db 41, SUPER_FANG db 0 NidorinoEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,NIDOKING +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOKING db 0 -;Learnset - db 8,HORN_ATTACK - db 14,POISON_STING - db 23,FOCUS_ENERGY - db 32,FURY_ATTACK - db 41,HORN_DRILL - db 50,DOUBLE_KICK +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 23, FOCUS_ENERGY + db 32, FURY_ATTACK + db 41, HORN_DRILL + db 50, DOUBLE_KICK db 0 NidorinaEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,NIDOQUEEN +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOQUEEN db 0 -;Learnset - db 8,SCRATCH - db 14,POISON_STING - db 23,TAIL_WHIP - db 32,BITE - db 41,FURY_SWIPES - db 50,DOUBLE_KICK +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 23, TAIL_WHIP + db 32, BITE + db 41, FURY_SWIPES + db 50, DOUBLE_KICK db 0 GeodudeEvosMoves: -;Evolutions - db EV_LEVEL,25,GRAVELER +; Evolutions + db EV_LEVEL, 25, GRAVELER db 0 -;Learnset - db 11,DEFENSE_CURL - db 16,ROCK_THROW - db 21,SELFDESTRUCT - db 26,HARDEN - db 31,EARTHQUAKE - db 36,EXPLOSION +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 26, HARDEN + db 31, EARTHQUAKE + db 36, EXPLOSION db 0 PorygonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 23,PSYBEAM - db 28,RECOVER - db 35,AGILITY - db 42,TRI_ATTACK +; Learnset + db 23, PSYBEAM + db 28, RECOVER + db 35, AGILITY + db 42, TRI_ATTACK db 0 AerodactylEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 33,SUPERSONIC - db 38,BITE - db 45,TAKE_DOWN - db 54,HYPER_BEAM +; Learnset + db 33, SUPERSONIC + db 38, BITE + db 45, TAKE_DOWN + db 54, HYPER_BEAM db 0 MissingNoACEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MagnemiteEvosMoves: -;Evolutions - db EV_LEVEL,30,MAGNETON +; Evolutions + db EV_LEVEL, 30, MAGNETON db 0 -;Learnset - db 21,SONICBOOM - db 25,THUNDERSHOCK - db 29,SUPERSONIC - db 35,THUNDER_WAVE - db 41,SWIFT - db 47,SCREECH +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 35, THUNDER_WAVE + db 41, SWIFT + db 47, SCREECH db 0 MissingNoAEEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoAFEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 CharmanderEvosMoves: -;Evolutions - db EV_LEVEL,16,CHARMELEON +; Evolutions + db EV_LEVEL, 16, CHARMELEON db 0 -;Learnset - db 9,EMBER - db 15,LEER - db 22,RAGE - db 30,SLASH - db 38,FLAMETHROWER - db 46,FIRE_SPIN +; Learnset + db 9, EMBER + db 15, LEER + db 22, RAGE + db 30, SLASH + db 38, FLAMETHROWER + db 46, FIRE_SPIN db 0 SquirtleEvosMoves: -;Evolutions - db EV_LEVEL,16,WARTORTLE +; Evolutions + db EV_LEVEL, 16, WARTORTLE db 0 -;Learnset - db 8,BUBBLE - db 15,WATER_GUN - db 22,BITE - db 28,WITHDRAW - db 35,SKULL_BASH - db 42,HYDRO_PUMP +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 22, BITE + db 28, WITHDRAW + db 35, SKULL_BASH + db 42, HYDRO_PUMP db 0 CharmeleonEvosMoves: -;Evolutions - db EV_LEVEL,36,CHARIZARD +; Evolutions + db EV_LEVEL, 36, CHARIZARD db 0 -;Learnset - db 9,EMBER - db 15,LEER - db 24,RAGE - db 33,SLASH - db 42,FLAMETHROWER - db 56,FIRE_SPIN +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 33, SLASH + db 42, FLAMETHROWER + db 56, FIRE_SPIN db 0 WartortleEvosMoves: -;Evolutions - db EV_LEVEL,36,BLASTOISE +; Evolutions + db EV_LEVEL, 36, BLASTOISE db 0 -;Learnset - db 8,BUBBLE - db 15,WATER_GUN - db 24,BITE - db 31,WITHDRAW - db 39,SKULL_BASH - db 47,HYDRO_PUMP +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 39, SKULL_BASH + db 47, HYDRO_PUMP db 0 CharizardEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 9,EMBER - db 15,LEER - db 24,RAGE - db 36,SLASH - db 46,FLAMETHROWER - db 55,FIRE_SPIN +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 36, SLASH + db 46, FLAMETHROWER + db 55, FIRE_SPIN db 0 MissingNoB5EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 FossilKabutopsEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 FossilAerodactylEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MonGhostEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 OddishEvosMoves: -;Evolutions - db EV_LEVEL,21,GLOOM +; Evolutions + db EV_LEVEL, 21, GLOOM db 0 -;Learnset - db 15,POISONPOWDER - db 17,STUN_SPORE - db 19,SLEEP_POWDER - db 24,ACID - db 33,PETAL_DANCE - db 46,SOLARBEAM +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 24, ACID + db 33, PETAL_DANCE + db 46, SOLARBEAM db 0 GloomEvosMoves: -;Evolutions - db EV_ITEM,LEAF_STONE,1,VILEPLUME +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VILEPLUME db 0 -;Learnset - db 15,POISONPOWDER - db 17,STUN_SPORE - db 19,SLEEP_POWDER - db 28,ACID - db 38,PETAL_DANCE - db 52,SOLARBEAM +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 28, ACID + db 38, PETAL_DANCE + db 52, SOLARBEAM db 0 VileplumeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,POISONPOWDER - db 17,STUN_SPORE - db 19,SLEEP_POWDER +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER db 0 BellsproutEvosMoves: -;Evolutions - db EV_LEVEL,21,WEEPINBELL +; Evolutions + db EV_LEVEL, 21, WEEPINBELL db 0 -;Learnset - db 13,WRAP - db 15,POISONPOWDER - db 18,SLEEP_POWDER - db 21,STUN_SPORE - db 26,ACID - db 33,RAZOR_LEAF - db 42,SLAM +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 21, STUN_SPORE + db 26, ACID + db 33, RAZOR_LEAF + db 42, SLAM db 0 WeepinbellEvosMoves: -;Evolutions - db EV_ITEM,LEAF_STONE,1,VICTREEBEL +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VICTREEBEL db 0 -;Learnset - db 13,WRAP - db 15,POISONPOWDER - db 18,SLEEP_POWDER - db 23,STUN_SPORE - db 29,ACID - db 38,RAZOR_LEAF - db 49,SLAM +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 23, STUN_SPORE + db 29, ACID + db 38, RAZOR_LEAF + db 49, SLAM db 0 VictreebelEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 13,WRAP - db 15,POISONPOWDER - db 18,SLEEP_POWDER +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER db 0 -- cgit v1.2.3 From 98f09b6d26b1f83bdf1779cfe63a73b8a4265aef Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 24 Mar 2018 13:41:54 -0500 Subject: Use rgblink dmg mode --- Makefile | 2 +- engine/battle/safari_zone.asm | 2 +- engine/items/items.asm | 8 ++++---- pokered.link | 3 --- wram.asm | 37 ++++--------------------------------- 5 files changed, 10 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index dd266f23..32d37f16 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) - rgblink -n $*.sym -l pokered.link -o $@ $^ + rgblink -d -n $*.sym -l pokered.link -o $@ $^ rgbfix $($*_opt) $@ sort $*.sym -o $*.sym diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 1eb1a615..4672892d 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -19,7 +19,7 @@ PrintSafariZoneBattleText: ld [wd0b5], a call GetMonHeader ld a, [wMonHCatchRate] - ld [wEnemyMonCatchRate], a + ld [wEnemyMonActualCatchRate], a pop hl .asm_429f push hl diff --git a/engine/items/items.asm b/engine/items/items.asm index ada4d7db..3bb2ec9e 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -297,7 +297,7 @@ ItemUseBall: pop bc ; b = Rand1 - Status ; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. - ld a, [wEnemyMonCatchRate] + ld a, [wEnemyMonActualCatchRate] cp b jr c, .failedToCapture @@ -325,7 +325,7 @@ ItemUseBall: xor a ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND + 1], a - ld a, [wEnemyMonCatchRate] + ld a, [wEnemyMonActualCatchRate] ld [H_MULTIPLICAND + 2], a ld a, 100 ld [H_MULTIPLIER], a @@ -1434,7 +1434,7 @@ VitaminText: ItemUseBait: ld hl, ThrewBaitText call PrintText - ld hl, wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ; catch rate srl [hl] ; halve catch rate ld a, BAIT_ANIM ld hl, wSafariBaitFactor ; bait factor @@ -1444,7 +1444,7 @@ ItemUseBait: ItemUseRock: ld hl, ThrewRockText call PrintText - ld hl, wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ; catch rate ld a, [hl] add a ; double catch rate jr nc, .noCarry diff --git a/pokered.link b/pokered.link index ad5ac793..e070684d 100644 --- a/pokered.link +++ b/pokered.link @@ -159,9 +159,6 @@ ROMX $2C WRAM0 "WRAM Bank 0" -WRAMX 1 - "WRAM Bank 1" - SRAM 0 "Sprite Buffers" diff --git a/wram.asm b/wram.asm index baab1cf7..0091ce43 100755 --- a/wram.asm +++ b/wram.asm @@ -41,6 +41,7 @@ ENDM battle_struct: MACRO \1Species:: db \1HP:: dw +\1PartyPos:: \1BoxLevel:: db \1Status:: db \1Type:: @@ -1590,40 +1591,10 @@ wBattleMonSpecies2:: ; cfd9 wEnemyMonNick:: ds NAME_LENGTH ; cfda -wEnemyMon:: ; cfe5 -; The wEnemyMon struct reaches past 0xcfff, -; the end of wram bank 0 on cgb. -; This has no significance on dmg, where wram -; isn't banked (c000-dfff is contiguous). -; However, recent versions of rgbds have replaced -; dmg-style wram with cgb wram banks. - -; Until this is fixed, this struct will have -; to be declared manually. - -wEnemyMonSpecies:: db -wEnemyMonHP:: dw -wEnemyMonPartyPos:: -wEnemyMonBoxLevel:: db -wEnemyMonStatus:: db -wEnemyMonType:: -wEnemyMonType1:: db -wEnemyMonType2:: db -wEnemyMonCatchRate_NotReferenced:: db -wEnemyMonMoves:: ds NUM_MOVES -wEnemyMonDVs:: ds 2 -wEnemyMonLevel:: db -wEnemyMonMaxHP:: dw -wEnemyMonAttack:: dw -wEnemyMonDefense:: dw -wEnemyMonSpeed:: dw -wEnemyMonSpecial:: dw -wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX, BANK[1] - ds 2 ; NUM_MOVES - 2 +wEnemyMon:: battle_struct wEnemyMon ; cfe5 wEnemyMonBaseStats:: ds 5 -wEnemyMonCatchRate:: ds 1 +wEnemyMonActualCatchRate:: ds 1 wEnemyMonBaseExp:: ds 1 wBattleMonNick:: ds NAME_LENGTH ; d009 @@ -3233,7 +3204,7 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: -SECTION "Stack", WRAMX[$df00], BANK[1] +SECTION "Stack", WRAM0[$df00] ds $ff wStack:: ; dfff -- cgit v1.2.3 From 01fe449837bef1c289d37477745774555d22786e Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Fri, 22 Jun 2018 23:06:05 -0400 Subject: Updated the intro --- constants/hardware_constants.asm | 8 ---- constants/misc_constants.asm | 2 + constants/oam_constants.asm | 13 +++++- constants/palette_constants.asm | 7 ++++ engine/battle/animations.asm | 28 ++++++------- engine/intro.asm | 89 ++++++++++++++++++++++------------------ macros/asm_macros.asm | 4 ++ 7 files changed, 88 insertions(+), 63 deletions(-) diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index d6af3584..9f2aa1b7 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -22,14 +22,6 @@ JOYPAD EQU 4 LY_VBLANK EQU 145 -; OAM attribute flags -OAM_PALETTE EQU %111 -OAM_TILE_BANK EQU 3 -OAM_OBP_NUM EQU 4 ; Non CGB Mode Only -OAM_X_FLIP EQU 5 -OAM_Y_FLIP EQU 6 -OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) - ; serial START_TRANSFER_EXTERNAL_CLOCK EQU $80 START_TRANSFER_INTERNAL_CLOCK EQU $81 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index d4f231b5..d6a935f8 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -45,6 +45,8 @@ SCREEN_HEIGHT EQU 18 SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * 8 SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8 +BYTES_PER_TILE EQU 16 + BG_MAP_WIDTH EQU 32 BG_MAP_HEIGHT EQU 32 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index ddf95648..2d34048d 100755 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -5,5 +5,14 @@ OAMFLAG_VFLIPPED EQU %00100000 ; OAM flag flips the sprite vertically. ; Used for making left facing sprites face right and to alternate between left and right foot animation when walking up or down ; OAM attribute flags -OAM_HFLIP EQU %00100000 ; horizontal flip -OAM_VFLIP EQU %01000000 ; vertical flip +OAM_PALETTE EQU %111 +OAM_TILE_BANK EQU 3 +OAM_OBP_NUM EQU 4 ; Non CGB Mode Only +OAM_X_FLIP EQU 5 +OAM_Y_FLIP EQU 6 +OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) + +; OAM attribute masks +OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip +OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip +OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0) diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index ca2e103a..1413ad98 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,3 +1,10 @@ +; monochrome palette color ids + const_def + const WHITE + const LIGHT_GRAY + const DARK_GRAY + const BLACK + SET_PAL_BATTLE_BLACK EQU $00 SET_PAL_BATTLE EQU $01 SET_PAL_TOWN_MAP EQU $02 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 76d4f464..74e48535 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2588,21 +2588,21 @@ CopyTileIDs: TileIDListPointerTable: dw Unknown_79b24 - db $77 + dn 7, 7 dw Unknown_79b55 - db $57 + dn 5, 7 dw Unknown_79b78 - db $37 - dw Unknown_79b8d - db $77 - dw Unknown_79bbe - db $77 - dw Unknown_79bef - db $77 + dn 3, 7 + dw GengarIntroTiles1 + dn 7, 7 + dw GengarIntroTiles2 + dn 7, 7 + dw GengarIntroTiles3 + dn 7, 7 dw Unknown_79c20 - db $86 + dn 8, 6 dw Unknown_79c50 - db $3C + dn 3, 12 DownscaledMonTiles_5x5: db $31,$38,$46,$54,$5B @@ -2637,7 +2637,7 @@ Unknown_79b78: db $02,$09,$10,$17,$1E,$25,$2C db $04,$0B,$12,$19,$20,$27,$2E -Unknown_79b8d: +GengarIntroTiles1: db $00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$19,$00 db $02,$06,$0B,$10,$14,$1A,$00 @@ -2646,7 +2646,7 @@ Unknown_79b8d: db $04,$09,$0E,$13,$17,$1D,$1F db $05,$0A,$0F,$01,$18,$1E,$20 -Unknown_79bbe: +GengarIntroTiles2: db $00,$00,$00,$30,$00,$37,$00 db $00,$00,$2B,$31,$34,$38,$3D db $21,$26,$2C,$01,$35,$39,$3E @@ -2655,7 +2655,7 @@ Unknown_79bbe: db $24,$29,$2F,$01,$01,$3B,$00 db $25,$2A,$01,$01,$01,$3C,$00 -Unknown_79bef: +GengarIntroTiles3: db $00,$00,$00,$00,$00,$00,$00 db $00,$00,$47,$4D,$00,$00,$00 db $00,$00,$48,$4E,$52,$56,$5B diff --git a/engine/intro.asm b/engine/intro.asm index 422bcf7a..f69a0020 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -1,6 +1,12 @@ -MOVE_GENGAR_RIGHT EQU $00 -MOVE_GENGAR_LEFT EQU $01 -MOVE_NIDORINO_RIGHT EQU $ff +MOVE_GENGAR_RIGHT EQU 0 +MOVE_GENGAR_LEFT EQU 1 +MOVE_NIDORINO_RIGHT EQU -1 + +ANIMATION_END EQU 80 + +GENGAR_INTRO_TILES1 EQU 3 +GENGAR_INTRO_TILES2 EQU 4 +GENGAR_INTRO_TILES3 EQU 5 PlayIntro: xor a @@ -20,13 +26,13 @@ PlayIntro: PlayIntroScene: ld b, SET_PAL_NIDORINO_INTRO call RunPaletteCommand - ld a, %11100100 + ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE ld [rBGP], a ld [rOBP0], a ld [rOBP1], a xor a ld [hSCX], a - ld b, $3 ; Gengar tiles + ld b, GENGAR_INTRO_TILES1 call IntroCopyTiles ld a, 0 ld [wBaseCoordX], a @@ -50,7 +56,7 @@ PlayIntroScene: call PlaySound ld de, IntroNidorinoAnimation2 call AnimateIntroNidorino - ld c, $a + ld c, 10 call CheckForUserInterruption ret c @@ -64,23 +70,23 @@ PlayIntroScene: call PlaySound ld de, IntroNidorinoAnimation2 call AnimateIntroNidorino - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c ; raise - ld b, $4 + ld b, GENGAR_INTRO_TILES2 call IntroCopyTiles ld a, SFX_INTRO_RAISE call PlaySound lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c ; slash - ld b, $5 + ld b, GENGAR_INTRO_TILES3 call IntroCopyTiles ld a, SFX_INTRO_CRASH call PlaySound @@ -89,19 +95,19 @@ PlayIntroScene: ; hip ld a, SFX_INTRO_HIP call PlaySound - ld a, $24 + ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation3 call AnimateIntroNidorino - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon - ld b, $3 + ld b, GENGAR_INTRO_TILES1 call IntroCopyTiles - ld c, $3c + ld c, 60 call CheckForUserInterruption ret c @@ -117,29 +123,29 @@ PlayIntroScene: call PlaySound ld de, IntroNidorinoAnimation5 call AnimateIntroNidorino - ld c, $14 + ld c, 20 call CheckForUserInterruption ret c - ld a, $24 + ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation6 call AnimateIntroNidorino - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c ; lunge ld a, SFX_INTRO_LUNGE call PlaySound - ld a, $48 + ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / BYTES_PER_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation7 jp AnimateIntroNidorino AnimateIntroNidorino: ld a, [de] - cp $50 + cp ANIMATION_END ret z ld [wBaseCoordY], a inc de @@ -189,7 +195,7 @@ InitIntroNidorinoOAM: ld [hli], a ; X ld a, d ld [hli], a ; tile - ld a, $80 + ld a, OAM_BEHIND_BG ld [hli], a ; attributes inc d dec c @@ -204,7 +210,7 @@ InitIntroNidorinoOAM: IntroClearScreen: ld hl, vBGMap1 - ld bc, $240 + ld bc, BG_MAP_WIDTH * SCREEN_HEIGHT jr IntroClearCommon IntroClearMiddleOfScreen: @@ -213,7 +219,7 @@ IntroClearMiddleOfScreen: ld bc, SCREEN_WIDTH * 10 IntroClearCommon: - ld [hl], $0 + ld [hl], 0 inc hl dec bc ld a, b @@ -222,7 +228,7 @@ IntroClearCommon: ret IntroPlaceBlackTiles: - ld a, $1 + ld a, 1 .loop ld [hli], a dec c @@ -231,11 +237,11 @@ IntroPlaceBlackTiles: IntroMoveMon: ; d = number of times to move the mon (2 pixels each time) -; e: $00 = move Gengar right, $01 = move Gengar left, $ff = move Nidorino right +; e: 0 = move Gengar right, 1 = move Gengar left, -1 = move Nidorino right ld a, e - cp $ff + cp -1 jr z, .moveNidorinoRight - cp $1 + cp 1 jr z, .moveGengarLeft ; move Gengar right ld a, [hSCX] @@ -286,7 +292,7 @@ LoadIntroGraphics: ld a, BANK(FightIntroBackMon) call FarCopyData2 ld hl, GameFreakIntro - ld de, vChars2 + $600 + ld de, vChars2 + (FightIntroBackMonEnd - FightIntroBackMon) ld bc, GameFreakIntroEnd - GameFreakIntro ld a, BANK(GameFreakIntro) call FarCopyData2 @@ -305,7 +311,7 @@ PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles - ld a, %11100100 + ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE ld [rBGP], a ld c, 180 call DelayFrames @@ -348,10 +354,10 @@ IntroDrawBlackBars: ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles ld hl, vBGMap1 - ld c, $80 + ld c, BG_MAP_WIDTH * 4 call IntroPlaceBlackTiles - ld hl, vBGMap1 + $1c0 - ld c, $80 + ld hl, vBGMap1 + BG_MAP_WIDTH * 14 + ld c, BG_MAP_WIDTH * 4 jp IntroPlaceBlackTiles EmptyFunc4: @@ -359,7 +365,7 @@ EmptyFunc4: IntroNidorinoAnimation0: db 0, 0 - db $50 + db ANIMATION_END IntroNidorinoAnimation1: ; This is a sequence of pixel movements for part of the Nidorino animation. This @@ -370,7 +376,7 @@ IntroNidorinoAnimation1: db -1, 2 db 1, 2 db 2, 2 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation2: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -380,7 +386,7 @@ IntroNidorinoAnimation2: db -1, -2 db 1, -2 db 2, -2 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation3: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -390,7 +396,7 @@ IntroNidorinoAnimation3: db -8, 6 db 8, 6 db 12, 6 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation4: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -400,7 +406,7 @@ IntroNidorinoAnimation4: db -4, -4 db 4, -4 db 8, -4 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation5: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -410,7 +416,7 @@ IntroNidorinoAnimation5: db -4, 4 db 4, 4 db 8, 4 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation6: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -419,7 +425,7 @@ IntroNidorinoAnimation6: db 2, 0 db 2, 0 db 0, 0 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation7: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -428,7 +434,7 @@ IntroNidorinoAnimation7: db -7, -14 db -6, -12 db -4, -10 - db $50 ; list terminator + db ANIMATION_END GameFreakIntro: INCBIN "gfx/gamefreak_intro.2bpp" @@ -444,12 +450,17 @@ FightIntroFrontMon: IF DEF(_RED) INCBIN "gfx/red/intro_nido_1.2bpp" +FightIntroFrontMon2: INCBIN "gfx/red/intro_nido_2.2bpp" +FightIntroFrontMon3: INCBIN "gfx/red/intro_nido_3.2bpp" ENDC + IF DEF(_BLUE) INCBIN "gfx/blue/intro_purin_1.2bpp" +FightIntroFrontMon2: INCBIN "gfx/blue/intro_purin_2.2bpp" +FightIntroFrontMon3: INCBIN "gfx/blue/intro_purin_3.2bpp" ENDC diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index 5cf5a809..28d2d95e 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -186,3 +186,7 @@ tx_pre_jump: MACRO tx_pre_id \1 jp PrintPredefTextID ENDM + +ldPal: MACRO + ld \1, \2 << 6 | \3 << 4 | \4 << 2 | \5 +ENDM -- cgit v1.2.3 From 808c2509b00903478dfdad1830bef6358d93b7dd Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sat, 23 Jun 2018 11:37:58 -0400 Subject: Updated constants for intro --- engine/intro.asm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/engine/intro.asm b/engine/intro.asm index f69a0020..4acab5a6 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -1,12 +1,14 @@ -MOVE_GENGAR_RIGHT EQU 0 -MOVE_GENGAR_LEFT EQU 1 -MOVE_NIDORINO_RIGHT EQU -1 +const_value = -1 + const MOVE_NIDORINO_RIGHT + const MOVE_GENGAR_RIGHT + const MOVE_GENGAR_LEFT -ANIMATION_END EQU 80 +ANIMATION_END EQU 80 -GENGAR_INTRO_TILES1 EQU 3 -GENGAR_INTRO_TILES2 EQU 4 -GENGAR_INTRO_TILES3 EQU 5 +const_value = 3 + const GENGAR_INTRO_TILES1 + const GENGAR_INTRO_TILES2 + const GENGAR_INTRO_TILES3 PlayIntro: xor a @@ -237,11 +239,10 @@ IntroPlaceBlackTiles: IntroMoveMon: ; d = number of times to move the mon (2 pixels each time) -; e: 0 = move Gengar right, 1 = move Gengar left, -1 = move Nidorino right ld a, e - cp -1 + cp MOVE_NIDORINO_RIGHT jr z, .moveNidorinoRight - cp 1 + cp MOVE_GENGAR_LEFT jr z, .moveGengarLeft ; move Gengar right ld a, [hSCX] -- cgit v1.2.3 From b4ab6dc7016063ecdff0a33d6a34d16070834d48 Mon Sep 17 00:00:00 2001 From: Urs-Bjoern Schmidt Date: Mon, 2 Jul 2018 11:34:11 +0200 Subject: Fixed some inconsistencies in the usage of the if-def directive. --- data/wildPokemon/route2.asm | 8 ++++---- data/wildPokemon/route23.asm | 4 ++-- data/wildPokemon/unknowndungeon1.asm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index fb3a5e82..ad958ea5 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -5,19 +5,19 @@ Route2Mons: db 4,PIDGEY db 4,RATTATA db 5,PIDGEY - if DEF(_RED) + IF DEF(_RED) db 3,WEEDLE ENDC - if DEF(_BLUE) + IF DEF(_BLUE) db 3,CATERPIE ENDC db 2,RATTATA db 5,RATTATA - if DEF(_RED) + IF DEF(_RED) db 4,WEEDLE db 5,WEEDLE ENDC - if DEF(_BLUE) + IF DEF(_BLUE) db 4,CATERPIE db 5,CATERPIE ENDC diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index a96a0d3c..a057d24d 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -3,7 +3,7 @@ Route23Mons: IF DEF(_RED) db 26,EKANS ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 26,SANDSHREW ENDC db 33,DITTO @@ -14,7 +14,7 @@ Route23Mons: IF DEF(_RED) db 41,ARBOK ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 41,SANDSLASH ENDC db 43,DITTO diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 70f680b7..20e8643a 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -8,7 +8,7 @@ DungeonMons1: IF DEF(_RED) db 52,ARBOK ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 52,SANDSLASH ENDC db 49,KADABRA -- cgit v1.2.3 From 462088a25c971fc8989e5bf56260c2365e258053 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 8 Jul 2018 16:25:39 -0400 Subject: Document the origin of MissingNo's base stats. --- constants/pokemon_constants.asm | 2 +- data/pokedex_entries.asm | 2 +- data/trainer_parties.asm | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 96d44ef5..c4189911 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -136,7 +136,7 @@ const_value = 1 const MISSINGNO_86 ; $86 const MISSINGNO_87 ; $87 const MUK ; $88 - const MISSINGNO_8A ; $8A + const MISSINGNO_89 ; $89 const KINGLER ; $8A const CLOYSTER ; $8B const MISSINGNO_8C ; $8C diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 3fb2d3c6..495a8e33 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1256,4 +1256,4 @@ MissingNoDexEntry: db "???@" db 10 ; 1.0 m db 100 ; 10.0 kg - db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) + text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index da4f80c9..e448d431 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -258,6 +258,14 @@ BikerData: db 33,WEEZING,0 db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 ; Route 17 + ; From https://www.smogon.com/smog/issue27/glitch: + ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. + ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; + ; that's the formula from GetMonHeader for the base stats of mon #000. + ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) + ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. + ; The result is that this data gets interpreted as the base stats + ; for MissingNo: 0,33,MUK,0,29,VOLTORB,VOLTORB,0,...,28,GRIMER,GRIMER. db 28,WEEZING,KOFFING,WEEZING,0 db 33,MUK,0 db 29,VOLTORB,VOLTORB,0 -- cgit v1.2.3 From eddcbba82fa07705b35f3958a4f729878f22ecc2 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 8 Jul 2018 16:30:25 -0400 Subject: Avoid "Warning: Left shift of negative value" from rgbds --- macros/asm_macros.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index 28d2d95e..d3f00b0c 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -1,6 +1,6 @@ lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + ((\3) & $ff) + ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) ENDM homecall: MACRO -- cgit v1.2.3 From ee723161025844bf3606cd7e5c3b867db7a94160 Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Sun, 15 Jul 2018 10:50:44 -0700 Subject: make comments consistent throughout all mapHeader files --- data/mapHeaders/blueshouse.asm | 8 ++++---- data/mapHeaders/gary.asm | 10 +++++----- data/mapHeaders/pallettown.asm | 6 +++--- data/mapHeaders/redshouse1f.asm | 8 ++++---- data/mapHeaders/redshouse2f.asm | 8 ++++---- data/mapHeaders/route2.asm | 10 +++++----- data/mapHeaders/route4.asm | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm index 47e5c5b4..4b5c45e7 100755 --- a/data/mapHeaders/blueshouse.asm +++ b/data/mapHeaders/blueshouse.asm @@ -1,6 +1,6 @@ BluesHouse_h: db HOUSE ; tileset - db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions - dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript - db 0 - dw BluesHouseObject + db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) + dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript ; blocks, texts, scripts + db 0 ; connections + dw BluesHouseObject ; objects diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm index 792c4b32..a9cf381b 100755 --- a/data/mapHeaders/gary.asm +++ b/data/mapHeaders/gary.asm @@ -1,6 +1,6 @@ Gary_h: - db GYM ;tileset - db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width - dw GaryBlocks, GaryTextPointers, GaryScript - db $0 ;No Connections - dw GaryObject + db GYM ; tileset + db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) + dw GaryBlocks, GaryTextPointers, GaryScript ; blocks, texts, scripts + db $0 ; connections + dw GaryObject ; objects diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index a957314c..8b8137ce 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -1,8 +1,8 @@ PalletTown_h: db OVERWORLD ; tileset - db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions - dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript + db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) + dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript ; blocks, texts, scripts db NORTH | SOUTH ; connections NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1 - dw PalletTownObject + dw PalletTownObject ; objects diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm index 82d83042..a6f5783f 100755 --- a/data/mapHeaders/redshouse1f.asm +++ b/data/mapHeaders/redshouse1f.asm @@ -1,6 +1,6 @@ RedsHouse1F_h: db REDS_HOUSE_1 ; tileset - db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions - dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript - db 0 ; no connections - dw RedsHouse1FObject + db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) + dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript ; blocks, texts, scripts + db 0 ; connections + dw RedsHouse1FObject ; objects diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm index c4b0969c..89193e9e 100755 --- a/data/mapHeaders/redshouse2f.asm +++ b/data/mapHeaders/redshouse2f.asm @@ -1,6 +1,6 @@ RedsHouse2F_h: db REDS_HOUSE_2 ; tileset - db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions - dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript - db $00 ; no connections - dw RedsHouse2FObject + db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) + dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript ; blocks, texts, scripts + db $00 ; connections + dw RedsHouse2FObject ; objects diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 38e80842..2476d0a5 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,8 +1,8 @@ Route2_h: - db 00 ; Tileset - db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) - dw Route2Blocks, Route2TextPointers, Route2Script - db NORTH | SOUTH ;Connection Byte + db 00 ; tileset + db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) + dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts + db NORTH | SOUTH ; connections NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 - dw Route2Object ;Object Data Pointer + dw Route2Object ; objects diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm index a322f23c..26670e6d 100755 --- a/data/mapHeaders/route4.asm +++ b/data/mapHeaders/route4.asm @@ -1,7 +1,7 @@ Route4_h: db OVERWORLD ; tileset db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) - dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts + dw Route4Blocks, Route4TextPointers, Route4Script ; blocks, texts, scripts db SOUTH | EAST ; connections SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1 -- cgit v1.2.3 From ae2c1036ea1fa42d437f6291da673367b1f0ea4c Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sat, 28 Jul 2018 15:51:17 -0400 Subject: Fixed some map header files --- data/mapHeaders/pewtercity.asm | 2 -- data/mapHeaders/route2.asm | 2 +- main.asm | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm index ff5bd7b9..88faaacc 100755 --- a/data/mapHeaders/pewtercity.asm +++ b/data/mapHeaders/pewtercity.asm @@ -6,5 +6,3 @@ PewterCity_h: SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks dw PewterCityObject ; objects - - db $0 diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 2476d0a5..550cd702 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,5 +1,5 @@ Route2_h: - db 00 ; tileset + db OVERWORLD ; tileset db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts db NORTH | SOUTH ; connections diff --git a/main.asm b/main.asm index 065700da..3309bef0 100755 --- a/main.asm +++ b/main.asm @@ -275,6 +275,7 @@ INCLUDE "data/mapObjects/viridiancity.asm" ViridianCityBlocks: INCBIN "maps/viridiancity.blk" INCLUDE "data/mapHeaders/pewtercity.asm" + db $0 INCLUDE "data/mapObjects/pewtercity.asm" PewterCityBlocks: INCBIN "maps/pewtercity.blk" -- cgit v1.2.3 From 9b6f57832eac84e602d38179651027bae450b54f Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sat, 28 Jul 2018 15:56:50 -0400 Subject: Another map header fix --- data/mapHeaders/viridianhouse.asm | 2 -- main.asm | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm index a80953f9..9b2c73de 100755 --- a/data/mapHeaders/viridianhouse.asm +++ b/data/mapHeaders/viridianhouse.asm @@ -4,5 +4,3 @@ ViridianHouse_h: dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts db 0 ; connections dw ViridianHouseObject ; objects - - db $0 diff --git a/main.asm b/main.asm index 3309bef0..72cd7210 100755 --- a/main.asm +++ b/main.asm @@ -395,6 +395,7 @@ INCLUDE "scripts/school.asm" INCLUDE "data/mapObjects/school.asm" INCLUDE "data/mapHeaders/viridianhouse.asm" + db $0 INCLUDE "scripts/viridianhouse.asm" INCLUDE "data/mapObjects/viridianhouse.asm" -- cgit v1.2.3 From b250e788bd343d40014100bcca32299093745e98 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Mon, 22 Oct 2018 22:17:13 -0400 Subject: Change Discord link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a12514a0..af6868d1 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,5 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). [pokeruby]: https://github.com/pret/pokeruby [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald -[Discord]: https://discord.gg/cJxDDVP +[Discord]: https://discord.gg/6EuWgX9 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret -- cgit v1.2.3 From c085aa4a2a5529f9c82e97ebe7912dfa509787f3 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 18 Nov 2018 17:54:46 -0500 Subject: Fix spritestatedata macros to be prefixed with w. --- scripts/pewterpokecenter.asm | 4 +-- wram.asm | 78 ++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 5de1e6b7..4dd63559 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -29,7 +29,7 @@ PewterJigglypuffText: ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections call CopyData - ld a, [Sprite03SpriteImageIdx] + ld a, [wSprite03StateData1ImageIndex] ld hl, wJigglypuffFacingDirections .findMatchingFacingDirectionLoop cp [hl] @@ -43,7 +43,7 @@ PewterJigglypuffText: pop hl .loop ld a, [hl] - ld [Sprite03SpriteImageIdx], a + ld [wSprite03StateData1ImageIndex], a ; rotate the array push hl diff --git a/wram.asm b/wram.asm index 0091ce43..83dfdee9 100755 --- a/wram.asm +++ b/wram.asm @@ -230,10 +230,9 @@ wSpriteStateData1:: ; c100 ; C1xE ; C1xF spritestatedata1: MACRO -\1SpriteStateData1:: \1PictureID:: db \1MovementStatus:: db -\1SpriteImageIdx:: db +\1ImageIndex:: db \1YStepVector:: db \1YPixels:: db \1XStepVector:: db @@ -242,29 +241,25 @@ spritestatedata1: MACRO \1AnimFrameCounter:: db \1FacingDirection:: db ds 6 -\1SpriteStateData1End:: +\1End:: endm - spritestatedata1 Player - spritestatedata1 Sprite01 - spritestatedata1 Sprite02 - spritestatedata1 Sprite03 - spritestatedata1 Sprite04 - spritestatedata1 Sprite05 - spritestatedata1 Sprite06 - spritestatedata1 Sprite07 - spritestatedata1 Sprite08 - spritestatedata1 Sprite09 - spritestatedata1 Sprite10 - spritestatedata1 Sprite11 - spritestatedata1 Sprite12 - spritestatedata1 Sprite13 - spritestatedata1 Sprite14 - spritestatedata1 Sprite15 - ; ds $10 * $10 - - -;SECTION "Sprite State Data 2", WRAM0[$c200] +wSpritePlayerStateData1:: spritestatedata1 wSpritePlayerStateData1 +wSprite01StateData1:: spritestatedata1 wSprite01StateData1 +wSprite02StateData1:: spritestatedata1 wSprite02StateData1 +wSprite03StateData1:: spritestatedata1 wSprite03StateData1 +wSprite04StateData1:: spritestatedata1 wSprite04StateData1 +wSprite05StateData1:: spritestatedata1 wSprite05StateData1 +wSprite06StateData1:: spritestatedata1 wSprite06StateData1 +wSprite07StateData1:: spritestatedata1 wSprite07StateData1 +wSprite08StateData1:: spritestatedata1 wSprite08StateData1 +wSprite09StateData1:: spritestatedata1 wSprite09StateData1 +wSprite10StateData1:: spritestatedata1 wSprite10StateData1 +wSprite11StateData1:: spritestatedata1 wSprite11StateData1 +wSprite12StateData1:: spritestatedata1 wSprite12StateData1 +wSprite13StateData1:: spritestatedata1 wSprite13StateData1 +wSprite14StateData1:: spritestatedata1 wSprite14StateData1 +wSprite15StateData1:: spritestatedata1 wSprite15StateData1 wSpriteStateData2:: ; c200 ; more data for all sprites on the current map @@ -287,7 +282,6 @@ wSpriteStateData2:: ; c200 ; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2) ; C2xF spritestatedata2: MACRO -\1SpriteStateData2:: \1WalkAnimationCounter:: db ds 1 \1YDisplacement:: db @@ -300,26 +294,26 @@ spritestatedata2: MACRO ds 5 \1SpriteImageBaseOffset:: db ds 1 -\1SpriteStateData2End:: +\1End:: endm - spritestatedata2 Player - spritestatedata2 Sprite01 - spritestatedata2 Sprite02 - spritestatedata2 Sprite03 - spritestatedata2 Sprite04 - spritestatedata2 Sprite05 - spritestatedata2 Sprite06 - spritestatedata2 Sprite07 - spritestatedata2 Sprite08 - spritestatedata2 Sprite09 - spritestatedata2 Sprite10 - spritestatedata2 Sprite11 - spritestatedata2 Sprite12 - spritestatedata2 Sprite13 - spritestatedata2 Sprite14 - spritestatedata2 Sprite15 - ; ds $10 * $10 +wSpritePlayerStateData2:: spritestatedata2 wSpritePlayerStateData2 +wSprite01StateData2:: spritestatedata2 wSprite01StateData2 +wSprite02StateData2:: spritestatedata2 wSprite02StateData2 +wSprite03StateData2:: spritestatedata2 wSprite03StateData2 +wSprite04StateData2:: spritestatedata2 wSprite04StateData2 +wSprite05StateData2:: spritestatedata2 wSprite05StateData2 +wSprite06StateData2:: spritestatedata2 wSprite06StateData2 +wSprite07StateData2:: spritestatedata2 wSprite07StateData2 +wSprite08StateData2:: spritestatedata2 wSprite08StateData2 +wSprite09StateData2:: spritestatedata2 wSprite09StateData2 +wSprite10StateData2:: spritestatedata2 wSprite10StateData2 +wSprite11StateData2:: spritestatedata2 wSprite11StateData2 +wSprite12StateData2:: spritestatedata2 wSprite12StateData2 +wSprite13StateData2:: spritestatedata2 wSprite13StateData2 +wSprite14StateData2:: spritestatedata2 wSprite14StateData2 +wSprite15StateData2:: spritestatedata2 wSprite15StateData2 + wSpriteDataEnd:: -- cgit v1.2.3 From dcaca64f5e4ab1e39a9004585c9223173611eaf2 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 18 Nov 2018 18:29:24 -0500 Subject: Clean up pre-linkerscript remnants. --- audio.asm | 34 ++++---- engine/intro.asm | 4 +- home.asm | 30 +++---- main.asm | 72 ++++++++-------- pokered.link | 246 ++++++++++++++++++++++++++++++++++++++----------------- sram.asm | 8 +- text.asm | 26 +++--- wram.asm | 8 +- 8 files changed, 263 insertions(+), 165 deletions(-) diff --git a/audio.asm b/audio.asm index 8bc175fa..be1e4bb9 100644 --- a/audio.asm +++ b/audio.asm @@ -1,34 +1,30 @@ -AUDIO_1 EQU $2 -AUDIO_2 EQU $8 -AUDIO_3 EQU $1f - INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX ; BANK $02 INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -127,7 +123,7 @@ INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effects 2", ROMX ; BANK $08 INCLUDE "audio/sfx/snare1_2.asm" INCLUDE "audio/sfx/snare2_2.asm" @@ -252,7 +248,7 @@ INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effects 3", ROMX ; BANK $1f INCLUDE "audio/sfx/snare1_3.asm" INCLUDE "audio/sfx/snare2_3.asm" @@ -360,7 +356,7 @@ INCLUDE "audio/sfx/cry22_3.asm" -SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] +SECTION "Audio Engine 1", ROMX ; BANK $02 PlayBattleMusic:: xor a @@ -453,7 +449,7 @@ Music_Cities1AlternateTempo:: jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] +SECTION "Audio Engine 2", ROMX ; BANK $08 Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] @@ -557,7 +553,7 @@ Audio2_OverwriteChannelPointer: ret -SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] +SECTION "Audio Engine 3", ROMX ; BANK $1f PlayPokedexRatingSfx:: ld a, [$ffdc] @@ -601,7 +597,7 @@ INCLUDE "audio/engine_3.asm" -SECTION "Music 1", ROMX, BANK[AUDIO_1] +SECTION "Music 1", ROMX ; BANK $02 INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" @@ -630,7 +626,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX, BANK[AUDIO_2] +SECTION "Music 2", ROMX ; BANK $08 INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +642,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX, BANK[AUDIO_3] +SECTION "Music 3", ROMX ; BANK $1f INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" diff --git a/engine/intro.asm b/engine/intro.asm index 4acab5a6..a016b365 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -440,7 +440,9 @@ IntroNidorinoAnimation7: GameFreakIntro: INCBIN "gfx/gamefreak_intro.2bpp" INCBIN "gfx/gamefreak_logo.2bpp" - ds $10 ; blank tile + rept 16 + db $00 ; blank tile + endr GameFreakIntroEnd: FightIntroBackMon: diff --git a/home.asm b/home.asm index 18580a93..5b8aaf6c 100644 --- a/home.asm +++ b/home.asm @@ -1,32 +1,32 @@ ; The rst vectors are unused. -SECTION "rst 00", ROM0 [$00] +SECTION "rst 00", ROM0 rst $38 -SECTION "rst 08", ROM0 [$08] +SECTION "rst 08", ROM0 rst $38 -SECTION "rst 10", ROM0 [$10] +SECTION "rst 10", ROM0 rst $38 -SECTION "rst 18", ROM0 [$18] +SECTION "rst 18", ROM0 rst $38 -SECTION "rst 20", ROM0 [$20] +SECTION "rst 20", ROM0 rst $38 -SECTION "rst 28", ROM0 [$28] +SECTION "rst 28", ROM0 rst $38 -SECTION "rst 30", ROM0 [$30] +SECTION "rst 30", ROM0 rst $38 -SECTION "rst 38", ROM0 [$38] +SECTION "rst 38", ROM0 rst $38 ; Hardware interrupts -SECTION "vblank", ROM0 [$40] +SECTION "vblank", ROM0 jp VBlank -SECTION "hblank", ROM0 [$48] +SECTION "hblank", ROM0 rst $38 -SECTION "timer", ROM0 [$50] +SECTION "timer", ROM0 jp Timer -SECTION "serial", ROM0 [$58] +SECTION "serial", ROM0 jp Serial -SECTION "joypad", ROM0 [$60] +SECTION "joypad", ROM0 reti @@ -84,13 +84,13 @@ INCLUDE "home/copy.asm" -SECTION "Entry", ROM0 [$100] +SECTION "Entry", ROM0 nop jp Start -SECTION "Header", ROM0 [$104] +SECTION "Header", ROM0 ; The header is generated by rgbfix. ; The space here is allocated to prevent code from being overwritten. diff --git a/main.asm b/main.asm index 72cd7210..73ab724f 100755 --- a/main.asm +++ b/main.asm @@ -14,7 +14,7 @@ PICS_5 EQU $D INCLUDE "home.asm" -SECTION "bank1",ROMX,BANK[$1] +SECTION "bank1", ROMX INCLUDE "data/facing.asm" @@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" -SECTION "bank3",ROMX,BANK[$3] +SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" @@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX ; BANK $04 OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" -SECTION "Graphics", ROMX, BANK[GFX] +SECTION "Graphics (BANK 4)", ROMX PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -184,7 +184,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" PlayerCharacterTitleGraphicsEnd: -SECTION "Battle (bank 4)", ROMX, BANK[$4] +SECTION "Battle (BANK 4)", ROMX INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" @@ -206,7 +206,7 @@ INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX ; BANK $05 RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -250,7 +250,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -SECTION "Battle (bank 5)", ROMX, BANK[$5] +SECTION "Battle (BANK 5)", ROMX INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -260,7 +260,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank6",ROMX,BANK[$6] +SECTION "bank6", ROMX INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -336,7 +336,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7",ROMX,BANK[$7] +SECTION "bank7", ROMX INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -518,7 +518,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX, BANK[PICS_1] +SECTION "Pics 1", ROMX ; BANK $09 RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" @@ -580,13 +580,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -SECTION "Battle (bank 9)", ROMX, BANK[$9] +SECTION "Battle (BANK 9)", ROMX INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" -SECTION "Pics 2", ROMX, BANK[PICS_2] +SECTION "Pics 2", ROMX ; BANK $0A GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" @@ -654,11 +654,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -SECTION "Battle (bank A)", ROMX, BANK[$A] +SECTION "Battle (BANK A)", ROMX INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX, BANK[PICS_3] +SECTION "Pics 3", ROMX ; BANK $0B ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" @@ -732,7 +732,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -SECTION "Battle (bank B)", ROMX, BANK[$B] +SECTION "Battle (BANK B)", ROMX INCLUDE "engine/battle/display_effectiveness.asm" @@ -748,7 +748,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX, BANK[PICS_4] +SECTION "Pics 4", ROMX ; BANK $0C DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" @@ -813,12 +813,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" -SECTION "Battle (bank C)", ROMX, BANK[$C] +SECTION "Battle (BANK C)", ROMX INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" -SECTION "Pics 5", ROMX, BANK[PICS_5] +SECTION "Pics 5", ROMX ; BANK $0D BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" @@ -876,7 +876,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -SECTION "Battle (bank D)", ROMX, BANK[$D] +SECTION "Battle (BANK D)", ROMX INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" @@ -886,7 +886,7 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bankE",ROMX,BANK[$E] +SECTION "bankE", ROMX INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -911,12 +911,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm" INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" -SECTION "bankF",ROMX,BANK[$F] +SECTION "bankF", ROMX INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX,BANK[$10] +SECTION "bank10", ROMX INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/trade.asm" @@ -924,7 +924,7 @@ INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" -SECTION "bank11",ROMX,BANK[$11] +SECTION "bank11", ROMX INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1069,7 +1069,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12",ROMX,BANK[$12] +SECTION "bank12", ROMX INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1248,7 +1248,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX,BANK[$13] +SECTION "bank13", ROMX TrainerPics:: YoungsterPic:: INCBIN "pic/trainer/youngster.pic" @@ -1313,7 +1313,7 @@ INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14",ROMX,BANK[$14] +SECTION "bank14", ROMX INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1391,7 +1391,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX,BANK[$15] +SECTION "bank15", ROMX INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1483,7 +1483,7 @@ INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX,BANK[$16] +SECTION "bank16", ROMX INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1567,7 +1567,7 @@ HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX,BANK[$17] +SECTION "bank17", ROMX SaffronMartBlocks: LavenderMartBlocks: @@ -1723,7 +1723,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX,BANK[$18] +SECTION "bank18", ROMX ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1846,7 +1846,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX,BANK[$19] +SECTION "bank19", ROMX Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1869,7 +1869,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX,BANK[$1A] +SECTION "bank1A", ROMX INCLUDE "engine/battle/decrement_pp.asm" @@ -1905,7 +1905,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX,BANK[$1B] +SECTION "bank1B", ROMX Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1923,7 +1923,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX,BANK[$1C] +SECTION "bank1C", ROMX INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1938,7 +1938,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX,BANK[$1D] +SECTION "bank1D", ROMX CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" @@ -2070,7 +2070,7 @@ INCLUDE "engine/menu/league_pc.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX,BANK[$1E] +SECTION "bank1E", ROMX INCLUDE "engine/battle/animations.asm" diff --git a/pokered.link b/pokered.link index e070684d..2c110d4c 100644 --- a/pokered.link +++ b/pokered.link @@ -1,173 +1,273 @@ ROM0 - ORG $61 - "Home" - ORG $150 - "Main" + org $0000 + "rst 00" + + org $0008 + "rst 08" + + org $0010 + "rst 10" + + org $0018 + "rst 18" + + org $0020 + "rst 20" + + org $0028 + "rst 28" + + org $0030 + "rst 30" + + org $0038 + "rst 38" + + org $0040 + "vblank" + + org $0048 + "hblank" + + org $0050 + "timer" + + org $0058 + "serial" + + org $0060 + "joypad" + ; $0061 + "Home" + + org $100 + "Entry" + ; $0104 + "Header" + + org $150 + "Main" ROMX $1 - "bank1" + org $4000 + "bank1" ROMX $2 - "Sound Effect Headers 1" ; AUDIO_1 - "Music Headers 1" - "Sound Effects 1" - "Audio Engine 1" - "Music 1" + org $4000 + "Sound Effect Headers 1" ; AUDIO_1 + "Music Headers 1" + "Sound Effects 1" + "Audio Engine 1" + "Music 1" ROMX $3 - "bank3" + org $4000 + "bank3" ROMX $4 - "NPC Sprites 1" ; NPC_SPRITES_1 - "Graphics" ; GFX - "Battle (bank 4)" + org $4000 + "NPC Sprites 1" ; NPC_SPRITES_1 + "Graphics (BANK 4)" ; GFX + "Battle (BANK 4)" ROMX $5 - "NPC Sprites 2" ; NPC_SPRITES_2 - "Battle (bank 5)" + org $4000 + "NPC Sprites 2" ; NPC_SPRITES_2 + "Battle (BANK 5)" ROMX $6 - "bank6" + org $4000 + "bank6" ROMX $7 - "bank7" + org $4000 + "bank7" ROMX $8 - "Sound Effect Headers 2" ; AUDIO_2 - "Music Headers 2" - "Sound Effects 2" - "Audio Engine 2" - "Music 2" + org $4000 + "Sound Effect Headers 2" ; AUDIO_2 + "Music Headers 2" + "Sound Effects 2" + "Audio Engine 2" + "Music 2" ROMX $9 - "Pics 1" ; PICS_1 - "Battle (bank 9)" + org $4000 + "Pics 1" ; PICS_1 + "Battle (BANK 9)" ROMX $A - "Pics 2" ; PICS_2 - "Battle (bank A)" + org $4000 + "Pics 2" ; PICS_2 + "Battle (BANK A)" ROMX $B - "Pics 3" ; PICS_3 - "Battle (bank B)" + org $4000 + "Pics 3" ; PICS_3 + "Battle (BANK B)" ROMX $C - "Pics 4" ; PICS_4 - "Battle (bank C)" + org $4000 + "Pics 4" ; PICS_4 + "Battle (BANK C)" ROMX $D - "Pics 5" ; PICS_5 - "Battle (bank D)" + org $4000 + "Pics 5" ; PICS_5 + "Battle (BANK D)" ROMX $E - "bankE" + org $4000 + "bankE" ROMX $F - "bankF" + org $4000 + "bankF" ROMX $10 - "bank10" + org $4000 + "bank10" ROMX $11 - "bank11" + org $4000 + "bank11" ROMX $12 - "bank12" + org $4000 + "bank12" ROMX $13 - "bank13" + org $4000 + "bank13" ROMX $14 - "bank14" + org $4000 + "bank14" ROMX $15 - "bank15" + org $4000 + "bank15" ROMX $16 - "bank16" + org $4000 + "bank16" ROMX $17 - "bank17" + org $4000 + "bank17" ROMX $18 - "bank18" + org $4000 + "bank18" ROMX $19 - "bank19" + org $4000 + "bank19" ROMX $1A - "bank1A" + org $4000 + "bank1A" ROMX $1B - "bank1B" + org $4000 + "bank1B" ROMX $1C - "bank1C" + org $4000 + "bank1C" ROMX $1D - "bank1D" + org $4000 + "bank1D" ROMX $1E - "bank1E" + org $4000 + "bank1E" ROMX $1F - "Sound Effect Headers 3" ; AUDIO_3 - "Music Headers 3" - "Sound Effects 3" - "Audio Engine 3" - "Music 3" + org $4000 + "Sound Effect Headers 3" ; AUDIO_3 + "Music Headers 3" + "Sound Effects 3" + "Audio Engine 3" + "Music 3" ROMX $20 - "Text 1" ; TEXT_1 + org $4000 + "Text 1" ; TEXT_1 ROMX $21 - "Text 2" ; TEXT_2 + org $4000 + "Text 2" ; TEXT_2 ROMX $22 - "Text 3" ; TEXT_3 + org $4000 + "Text 3" ; TEXT_3 ROMX $23 - "Text 4" ; TEXT_4 + org $4000 + "Text 4" ; TEXT_4 ROMX $24 - "Text 5" ; TEXT_5 + org $4000 + "Text 5" ; TEXT_5 ROMX $25 - "Text 6" ; TEXT_6 + org $4000 + "Text 6" ; TEXT_6 ROMX $26 - "Text 7" ; TEXT_7 + org $4000 + "Text 7" ; TEXT_7 ROMX $27 - "Text 8" ; TEXT_8 + org $4000 + "Text 8" ; TEXT_8 ROMX $28 - "Text 9" ; TEXT_9 + org $4000 + "Text 9" ; TEXT_9 ROMX $29 - "Text 10" ; TEXT_10 + org $4000 + "Text 10" ; TEXT_10 ROMX $2A - "Text 11" ; TEXT_11 + org $4000 + "Text 11" ; TEXT_11 ROMX $2B - "Pokedex Text" ; POKEDEX_TEXT + org $4000 + "Pokedex Text" ; POKEDEX_TEXT ROMX $2C - "Move Names" ; MOVE_NAMES + org $4000 + "Move Names" ; MOVE_NAMES WRAM0 - "WRAM Bank 0" + org $c000 + "WRAM Bank 0" + + org $c100 + "Sprite State Data" + "OAM Buffer" + + org $dfff + "Stack" SRAM 0 - "Sprite Buffers" + org $a000 + "Sprite Buffers" SRAM 1 - "Save Data" + org $a000 + "Save Data" SRAM 2 - "Saved Boxes 1" + org $a000 + "Saved Boxes 1" SRAM 3 - "Saved Boxes 2" + org $a000 + "Saved Boxes 2" diff --git a/sram.asm b/sram.asm index 3e7b3e16..966ccba3 100644 --- a/sram.asm +++ b/sram.asm @@ -1,4 +1,4 @@ -SECTION "Sprite Buffers", SRAM, BANK[0] +SECTION "Sprite Buffers", SRAM ; BANK 0 sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 @@ -9,7 +9,7 @@ sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 -SECTION "Save Data", SRAM, BANK[1] +SECTION "Save Data", SRAM ; BANK 1 ds $598 sPlayerName:: ds NAME_LENGTH ; a598 @@ -21,7 +21,7 @@ sTilesetType:: ds 1 ; b522 sMainDataCheckSum:: ds 1 ; b523 -SECTION "Saved Boxes 1", SRAM, BANK[2] +SECTION "Saved Boxes 1", SRAM ; BANK 2 sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -33,7 +33,7 @@ sBank2AllBoxesChecksum:: ds 1 ; ba4c sBank2IndividualBoxChecksums:: ds 6 ; ba4d -SECTION "Saved Boxes 2", SRAM, BANK[3] +SECTION "Saved Boxes 2", SRAM ; BANK 3 sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 diff --git a/text.asm b/text.asm index fc075e19..51355e33 100644 --- a/text.asm +++ b/text.asm @@ -19,7 +19,7 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" -SECTION "Text 1", ROMX, BANK[TEXT_1] +SECTION "Text 1", ROMX ; BANK $20 _CardKeySuccessText1:: text "Bingo!@@" @@ -192,7 +192,7 @@ INCLUDE "text/maps/silph_co_4f.asm" INCLUDE "text/maps/silph_co_5f_1.asm" -SECTION "Text 2", ROMX, BANK[TEXT_2] +SECTION "Text 2", ROMX ; BANK $21 INCLUDE "text/maps/silph_co_5f_2.asm" INCLUDE "text/maps/silph_co_6f.asm" @@ -224,7 +224,7 @@ INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f_1.asm" -SECTION "Text 3", ROMX, BANK[TEXT_3] +SECTION "Text 3", ROMX ; BANK $22 INCLUDE "text/maps/rock_tunnel_b2f_2.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" @@ -1939,7 +1939,7 @@ INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare_1.asm" -SECTION "Text 4", ROMX, BANK[TEXT_4] +SECTION "Text 4", ROMX ; BANK $23 INCLUDE "text/maps/daycare_2.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" @@ -1978,7 +1978,7 @@ INCLUDE "text/maps/route_10.asm" INCLUDE "text/maps/route_11_1.asm" -SECTION "Text 5", ROMX, BANK[TEXT_5] +SECTION "Text 5", ROMX ; BANK $24 INCLUDE "text/maps/route_11_2.asm" INCLUDE "text/maps/route_12.asm" @@ -1996,7 +1996,7 @@ INCLUDE "text/maps/route_23.asm" INCLUDE "text/maps/route_24_1.asm" -SECTION "Text 6", ROMX, BANK[TEXT_6] +SECTION "Text 6", ROMX ; BANK $25 INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" @@ -2339,7 +2339,7 @@ INCLUDE "text/maps/museum_2f.asm" INCLUDE "text/maps/pewter_gym_1.asm" -SECTION "Text 7", ROMX, BANK[TEXT_7] +SECTION "Text 7", ROMX ; BANK $26 INCLUDE "text/maps/pewter_gym_2.asm" INCLUDE "text/maps/pewter_house_1.asm" @@ -2371,7 +2371,7 @@ INCLUDE "text/maps/vermilion_mart.asm" INCLUDE "text/maps/vermilion_gym_1.asm" -SECTION "Text 8", ROMX, BANK[TEXT_8] +SECTION "Text 8", ROMX ; BANK $27 INCLUDE "text/maps/vermilion_gym_2.asm" INCLUDE "text/maps/vermilion_house.asm" @@ -2403,7 +2403,7 @@ INCLUDE "text/maps/safari_zone_entrance.asm" INCLUDE "text/maps/fuchsia_gym_1.asm" -SECTION "Text 9", ROMX, BANK[TEXT_9] +SECTION "Text 9", ROMX ; BANK $28 INCLUDE "text/maps/fuchsia_gym_2.asm" INCLUDE "text/maps/fuchsia_meeting_room.asm" @@ -2646,7 +2646,7 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: done -SECTION "Text 10", ROMX, BANK[TEXT_10] +SECTION "Text 10", ROMX ; BANK $29 _CableClubNPCPleaseComeAgainText:: text "Please come again!" @@ -2992,7 +2992,7 @@ _BoxFullCannotThrowBallText:: prompt -SECTION "Text 11", ROMX, BANK[TEXT_11] +SECTION "Text 11", ROMX ; BANK $2a _ItemUseText001:: text " used@@" @@ -3192,11 +3192,11 @@ _UsedCutText:: prompt -SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT] +SECTION "Pokedex Text", ROMX ; BANK $2b INCLUDE "text/pokedex.asm" -SECTION "Move Names", ROMX, BANK[MOVE_NAMES] +SECTION "Move Names", ROMX ; BANK $2c INCLUDE "text/move_names.asm" diff --git a/wram.asm b/wram.asm index 83dfdee9..e37b36a3 100755 --- a/wram.asm +++ b/wram.asm @@ -205,7 +205,7 @@ wTempoModifier:: ; c0f2 ds 13 -SECTION "Sprite State Data", WRAM0[$c100] +SECTION "Sprite State Data", WRAM0 wSpriteDataStart:: @@ -318,7 +318,7 @@ wSprite15StateData2:: spritestatedata2 wSprite15StateData2 wSpriteDataEnd:: -SECTION "OAM Buffer", WRAM0[$c300] +SECTION "OAM Buffer", WRAM0 wOAMBuffer:: ; c300 ; buffer for OAM data. Copied to OAM by DMA @@ -3197,9 +3197,9 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: +; dee2 -SECTION "Stack", WRAM0[$df00] - ds $ff +SECTION "Stack", WRAM0 wStack:: ; dfff -- cgit v1.2.3 From c43bd68f01b794f61025ac2e63c9e043634ffdc8 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 18 Nov 2018 19:23:56 -0500 Subject: SpriteImageBaseOffset -> ImageBaseOffset --- wram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wram.asm b/wram.asm index e37b36a3..b59cfaad 100755 --- a/wram.asm +++ b/wram.asm @@ -292,7 +292,7 @@ spritestatedata2: MACRO \1GrassPriority:: db \1MovementDelay:: db ds 5 -\1SpriteImageBaseOffset:: db +\1ImageBaseOffset:: db ds 1 \1End:: endm -- cgit v1.2.3 From 729608124fa5f479a82dcc3b13fdcedc473fdafa Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 17:37:58 -0500 Subject: Remove the 'extras' submodule and include a local gfx.py tool instead --- .gitmodules | 3 - extras | 1 - tools/gfx.py | 264 ++++ tools/pokemontools/__init__.py | 1 + tools/pokemontools/gfx.py | 938 ++++++++++++++ tools/pokemontools/lz.py | 580 +++++++++ tools/pokemontools/png.py | 2650 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 4433 insertions(+), 4 deletions(-) delete mode 160000 extras create mode 100644 tools/gfx.py create mode 100644 tools/pokemontools/__init__.py create mode 100644 tools/pokemontools/gfx.py create mode 100644 tools/pokemontools/lz.py create mode 100644 tools/pokemontools/png.py diff --git a/.gitmodules b/.gitmodules index 1f76b537..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "extras"] - path = extras - url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git diff --git a/extras b/extras deleted file mode 160000 index be6d6c9c..00000000 --- a/extras +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be6d6c9ce9a86231482eafacd4be867285809366 diff --git a/tools/gfx.py b/tools/gfx.py new file mode 100644 index 00000000..fae7bbdc --- /dev/null +++ b/tools/gfx.py @@ -0,0 +1,264 @@ +"""Supplementary scripts for graphics conversion.""" + +import os +import argparse + +from pokemontools import gfx, lz + + +# Graphics with inverted tilemaps that aren't covered by filepath_rules. +pics = [ + 'gfx/shrink1', + 'gfx/shrink2', +] + +def recursive_read(filename): + def recurse(filename_): + lines = [] + for line in open(filename_): + if 'include "' in line.lower(): + lines += recurse(line.split('"')[1]) + else: + lines += [line] + return lines + lines = recurse(filename) + return ''.join(lines) + +base_stats = None +def get_base_stats(): + global base_stats + if not base_stats: + base_stats = recursive_read('data/base_stats.asm') + return base_stats + +def get_pokemon_dimensions(path): + try: + byte = bytearray(open(path, 'rb').read())[0] + width = byte & 0xf + height = (byte >> 8) & 0xf + return width, height + except: + return None + + +def get_animation_frames(path=None, w=7, h=7, bitmask_path=None, frame_path=None): + """Retrieve animation frame tilemaps from generated frame/bitmask data.""" + if not path: + path = bitmask_path + if not path: + path = frame_path + if not path: + raise Exception("need at least one of path, bitmask_path or frame_path") + + if not bitmask_path: + bitmask_path = os.path.join(os.path.split(path)[0], 'bitmask.asm') + if not frame_path: + frame_path = os.path.join(os.path.split(path)[0], 'frames.asm') + bitmask_lines = open(bitmask_path).readlines() + frame_lines = open(frame_path).readlines() + + bitmask_length = w * h + + bitmasks = [] + bitmask = [] + for line in bitmask_lines: + if '\tdb ' in line: + value = line.split('\tdb ')[1].strip().replace('%', '0b') + value = int(value, 0) + #print line.strip(), value, len(bitmasks), len(bitmask) + for bit in xrange(8): + bitmask += [(value >> bit) & 1] + if len(bitmask) >= bitmask_length: + bitmasks += [bitmask] + bitmask = [] + break + if bitmask: + bitmasks += [bitmask] + + frames = [] + frame_labels = [] + i = 0 + for line in frame_lines: + if '\tdw ' in line: + frame_labels += [line.split('\tdw ')[1].strip()] + else: + for part in line.split(): + part = part.strip() + if part in frame_labels: + frames += [(part, i)] + i += 1 + + results = [] + + for label, i in frames: + result = [] + + # get the bitmask and tile ids for each frame + # don't care if we read past bounds, so just read the rest of the file + values = [] + for line in frame_lines[i:]: + if '\tdb ' in line: + values += line.split('\tdb ')[1].split(';')[0].split(',') + + #print bitmasks + #print values[0] + #print int(values[0].replace('$', '0x'), 0) + bitmask = bitmasks[int(values[0].replace('$', '0x'), 0)] + tiles = values[1:] + k = 0 + j = 0 + for bit in bitmask: + if bit: + result += [int(tiles[k].replace('$', '0x'), 0)] + k += 1 + else: + result += [j] + j += 1 + + results += [result] + + return results + +def get_animated_graphics(path, w=7, h=7, bitmask_path=None, frame_path=None): + frames = get_animation_frames(path, w, h, bitmask_path, frame_path) + new_path = path.replace('.animated.2bpp', '.2bpp') + tiles = gfx.get_tiles(bytearray(open(path, 'rb').read())) + new_tiles = tiles[:w * h] + for frame in frames: + for tile in frame: + new_tiles += [tiles[tile]] + new_graphic = gfx.connect(new_tiles) + print new_path, list(new_graphic) + open(new_path, 'wb').write(bytearray(new_graphic)) + return new_path + +def filepath_rules(filepath): + """Infer attributes of certain graphics by their location in the filesystem.""" + args = {} + + filedir, filename = os.path.split(filepath) + if filedir.startswith('./'): + filedir = filedir[2:] + + name, ext = os.path.splitext(filename) + if ext == '.lz': + name, ext = os.path.splitext(name) + + pokemon_name = '' + + if 'gfx/pokemon/' in filedir: + pokemon_name = filedir.split('/')[-1] + if pokemon_name.startswith('unown_'): + index = filedir.find(pokemon_name) + if index != -1: + filedir = filedir[:index + len('unown')] + filedir[index + len('unown_a'):] + if name == 'front' or name == 'front.animated': + args['pal_file'] = os.path.join(filedir, 'normal.pal') + args['pic'] = True + args['animate'] = True + elif name == 'back': + args['pal_file'] = os.path.join(filedir, 'normal.pal') + args['pic'] = True + + elif 'gfx/trainers' in filedir: + args['pic'] = True + + elif os.path.join(filedir, name) in pics: + args['pic'] = True + + elif filedir == 'gfx/tilesets': + args['tileset'] = True + + if args.get('pal_file'): + if os.path.exists(args['pal_file']): + args['palout'] = args['pal_file'] + else: + del args['pal_file'] + + if args.get('pic'): + if ext == '.png': + w, h = gfx.png.Reader(filepath).asRGBA8()[:2] + w = min(w/8, h/8) + args['pic_dimensions'] = w, w + elif ext == '.2bpp': + if pokemon_name and name == 'front' or name == 'front.animated': + w, h = get_pokemon_dimensions(filepath.replace(ext, '.dimensions')) or (7, 7) + args['pic_dimensions'] = w, w + elif pokemon_name and name == 'back': + args['pic_dimensions'] = 6, 6 + else: + args['pic_dimensions'] = 7, 7 + + if args.get('tileset'): + args['width'] = 128 + return args + + +def to_1bpp(filename, **kwargs): + name, ext = os.path.splitext(filename) + if ext == '.1bpp': pass + elif ext == '.2bpp': gfx.export_2bpp_to_1bpp(filename, **kwargs) + elif ext == '.png': gfx.export_png_to_1bpp(filename, **kwargs) + elif ext == '.lz': + decompress(filename, **kwargs) + to_1bpp(name, **kwargs) + +def to_2bpp(filename, **kwargs): + name, ext = os.path.splitext(filename) + if ext == '.1bpp': gfx.export_1bpp_to_2bpp(filename, **kwargs) + elif ext == '.2bpp': pass + elif ext == '.png': gfx.export_png_to_2bpp(filename, **kwargs) + elif ext == '.lz': + decompress(filename, **kwargs) + to_2bpp(name, **kwargs) + +def to_png(filename, **kwargs): + name, ext = os.path.splitext(filename) + if ext == '.1bpp': gfx.export_1bpp_to_png(filename, **kwargs) + elif ext == '.2bpp' and name.endswith('.animated'): + w, h = kwargs.get('pic_dimensions') or (7, 7) + new_path = get_animated_graphics(filename, w=w, h=h) + return to_png(new_path, **kwargs) + elif ext == '.2bpp': gfx.export_2bpp_to_png(filename, **kwargs) + elif ext == '.png': pass + elif ext == '.lz': + decompress(filename, **kwargs) + to_png(name, **kwargs) + +def compress(filename, **kwargs): + data = open(filename, 'rb').read() + lz_data = lz.Compressed(data).output + open(filename + '.lz', 'wb').write(bytearray(lz_data)) + +def decompress(filename, **kwargs): + lz_data = open(filename, 'rb').read() + data = lz.Decompressed(lz_data).output + name, ext = os.path.splitext(filename) + open(name, 'wb').write(bytearray(data)) + + +methods = { + '2bpp': to_2bpp, + '1bpp': to_1bpp, + 'png': to_png, + 'lz': compress, + 'unlz': decompress, +} + +def main(method_name, filenames=None): + if filenames is None: filenames = [] + for filename in filenames: + args = filepath_rules(filename) + method = methods.get(method_name) + if method: + method(filename, **args) + +def get_args(): + ap = argparse.ArgumentParser() + ap.add_argument('method_name') + ap.add_argument('filenames', nargs='*') + args = ap.parse_args() + return args + +if __name__ == '__main__': + main(**get_args().__dict__) diff --git a/tools/pokemontools/__init__.py b/tools/pokemontools/__init__.py new file mode 100644 index 00000000..a3e75900 --- /dev/null +++ b/tools/pokemontools/__init__.py @@ -0,0 +1 @@ +# A subset of https://github.com/pret/pokemon-reverse-engineering-tools diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py new file mode 100644 index 00000000..2979b5a7 --- /dev/null +++ b/tools/pokemontools/gfx.py @@ -0,0 +1,938 @@ +# -*- coding: utf-8 -*- + +import os +import sys +import png +from math import sqrt, floor, ceil +import argparse +import operator + +from lz import Compressed, Decompressed + + +def split(list_, interval): + """ + Split a list by length. + """ + for i in xrange(0, len(list_), interval): + j = min(i + interval, len(list_)) + yield list_[i:j] + + +def hex_dump(data, length=0x10): + """ + just use hexdump -C + """ + margin = len('%x' % len(data)) + output = [] + address = 0 + for line in split(data, length): + output += [ + hex(address)[2:].zfill(margin) + + ' | ' + + ' '.join('%.2x' % byte for byte in line) + ] + address += length + return '\n'.join(output) + + +def get_tiles(image): + """ + Split a 2bpp image into 8x8 tiles. + """ + return list(split(image, 0x10)) + +def connect(tiles): + """ + Combine 8x8 tiles into a 2bpp image. + """ + return [byte for tile in tiles for byte in tile] + +def transpose(tiles, width=None): + """ + Transpose a tile arrangement along line y=-x. + + 00 01 02 03 04 05 00 06 0c 12 18 1e + 06 07 08 09 0a 0b 01 07 0d 13 19 1f + 0c 0d 0e 0f 10 11 <-> 02 08 0e 14 1a 20 + 12 13 14 15 16 17 03 09 0f 15 1b 21 + 18 19 1a 1b 1c 1d 04 0a 10 16 1c 22 + 1e 1f 20 21 22 23 05 0b 11 17 1d 23 + + 00 01 02 03 00 04 08 + 04 05 06 07 <-> 01 05 09 + 08 09 0a 0b 02 06 0a + 03 07 0b + """ + if width == None: + width = int(sqrt(len(tiles))) # assume square image + tiles = sorted(enumerate(tiles), key= lambda (i, tile): i % width) + return [tile for i, tile in tiles] + +def transpose_tiles(image, width=None): + return connect(transpose(get_tiles(image), width)) + +def interleave(tiles, width): + """ + 00 01 02 03 04 05 00 02 04 06 08 0a + 06 07 08 09 0a 0b 01 03 05 07 09 0b + 0c 0d 0e 0f 10 11 --> 0c 0e 10 12 14 16 + 12 13 14 15 16 17 0d 0f 11 13 15 17 + 18 19 1a 1b 1c 1d 18 1a 1c 1e 20 22 + 1e 1f 20 21 22 23 19 1b 1d 1f 21 23 + """ + interleaved = [] + left, right = split(tiles[::2], width), split(tiles[1::2], width) + for l, r in zip(left, right): + interleaved += l + r + return interleaved + +def deinterleave(tiles, width): + """ + 00 02 04 06 08 0a 00 01 02 03 04 05 + 01 03 05 07 09 0b 06 07 08 09 0a 0b + 0c 0e 10 12 14 16 --> 0c 0d 0e 0f 10 11 + 0d 0f 11 13 15 17 12 13 14 15 16 17 + 18 1a 1c 1e 20 22 18 19 1a 1b 1c 1d + 19 1b 1d 1f 21 23 1e 1f 20 21 22 23 + """ + deinterleaved = [] + rows = list(split(tiles, width)) + for left, right in zip(rows[::2], rows[1::2]): + for l, r in zip(left, right): + deinterleaved += [l, r] + return deinterleaved + +def interleave_tiles(image, width): + return connect(interleave(get_tiles(image), width)) + +def deinterleave_tiles(image, width): + return connect(deinterleave(get_tiles(image), width)) + + +def condense_image_to_map(image, pic=0): + """ + Reduce an image of adjacent frames to an image containing a base frame and any unrepeated tiles. + Returns the new image and the corresponding tilemap used to reconstruct the input image. + + If is 0, ignore the concept of frames. This behavior might be better off as another function. + """ + tiles = get_tiles(image) + new_tiles, tilemap = condense_tiles_to_map(tiles, pic) + new_image = connect(new_tiles) + return new_image, tilemap + +def condense_tiles_to_map(tiles, pic=0): + """ + Reduce a sequence of tiles representing adjacent frames to a base frame and any unrepeated tiles. + Returns the new tiles and the corresponding tilemap used to reconstruct the input tile sequence. + + If is 0, ignore the concept of frames. This behavior might be better off as another function. + """ + + # Leave the first frame intact for pics. + new_tiles = tiles[:pic] + tilemap = range(pic) + + for i, tile in enumerate(tiles[pic:]): + if tile not in new_tiles: + new_tiles.append(tile) + + if pic: + # Match the first frame exactly where possible. + # This reduces the space needed to replace tiles in pic animations. + # For example, if a tile is repeated twice in the first frame, + # but at the same relative index as the second tile, use the second index. + # When creating a bitmask later, the second index would not require a replacement, but the first index would have. + pic_i = i % pic + if tile == new_tiles[pic_i]: + tilemap.append(pic_i) + else: + tilemap.append(new_tiles.index(tile)) + else: + tilemap.append(new_tiles.index(tile)) + return new_tiles, tilemap + +def test_condense_tiles_to_map(): + test = condense_tiles_to_map(list('abcadbae')) + if test != (list('abcde'), [0, 1, 2, 0, 3, 1, 0, 4]): + raise Exception(test) + test = condense_tiles_to_map(list('abcadbae'), 2) + if test != (list('abcde'), [0, 1, 2, 0, 3, 1, 0, 4]): + raise Exception(test) + test = condense_tiles_to_map(list('abcadbae'), 4) + if test != (list('abcade'), [0, 1, 2, 3, 4, 1, 0, 5]): + raise Exception(test) + test = condense_tiles_to_map(list('abcadbea'), 4) + if test != (list('abcade'), [0, 1, 2, 3, 4, 1, 5, 3]): + raise Exception(test) + + +def to_file(filename, data): + """ + Apparently open(filename, 'wb').write(bytearray(data)) won't work. + """ + file = open(filename, 'wb') + for byte in data: + file.write('%c' % byte) + file.close() + + +def decompress_file(filein, fileout=None): + image = bytearray(open(filein).read()) + de = Decompressed(image) + + if fileout == None: + fileout = os.path.splitext(filein)[0] + to_file(fileout, de.output) + + +def compress_file(filein, fileout=None): + image = bytearray(open(filein).read()) + lz = Compressed(image) + + if fileout == None: + fileout = filein + '.lz' + to_file(fileout, lz.output) + + +def bin_to_rgb(word): + red = word & 0b11111 + word >>= 5 + green = word & 0b11111 + word >>= 5 + blue = word & 0b11111 + return (red, green, blue) + +def convert_binary_pal_to_text_by_filename(filename): + pal = bytearray(open(filename).read()) + return convert_binary_pal_to_text(pal) + +def convert_binary_pal_to_text(pal): + output = '' + words = [hi * 0x100 + lo for lo, hi in zip(pal[::2], pal[1::2])] + for word in words: + red, green, blue = ['%.2d' % c for c in bin_to_rgb(word)] + output += '\tRGB ' + ', '.join((red, green, blue)) + output += '\n' + return output + +def read_rgb_macros(lines): + colors = [] + for line in lines: + macro = line.split(" ")[0].strip() + if macro == 'RGB': + params = ' '.join(line.split(" ")[1:]).split(',') + red, green, blue = [int(v) for v in params] + colors += [[red, green, blue]] + return colors + + +def rewrite_binary_pals_to_text(filenames): + for filename in filenames: + pal_text = convert_binary_pal_to_text_by_filename(filename) + with open(filename, 'w') as out: + out.write(pal_text) + + +def flatten(planar): + """ + Flatten planar 2bpp image data into a quaternary pixel map. + """ + strips = [] + for bottom, top in split(planar, 2): + bottom = bottom + top = top + strip = [] + for i in xrange(7,-1,-1): + color = ( + (bottom >> i & 1) + + (top *2 >> i & 2) + ) + strip += [color] + strips += strip + return strips + +def to_lines(image, width): + """ + Convert a tiled quaternary pixel map to lines of quaternary pixels. + """ + tile_width = 8 + tile_height = 8 + num_columns = width / tile_width + height = len(image) / width + + lines = [] + for cur_line in xrange(height): + tile_row = cur_line / tile_height + line = [] + for column in xrange(num_columns): + anchor = ( + num_columns * tile_row * tile_width * tile_height + + column * tile_width * tile_height + + cur_line % tile_height * tile_width + ) + line += image[anchor : anchor + tile_width] + lines += [line] + return lines + + +def dmg2rgb(word): + """ + For PNGs. + """ + def shift(value): + while True: + yield value & (2**5 - 1) + value >>= 5 + word = shift(word) + # distribution is less even w/ << 3 + red, green, blue = [int(color * 8.25) for color in [word.next() for _ in xrange(3)]] + alpha = 255 + return (red, green, blue, alpha) + + +def rgb_to_dmg(color): + """ + For PNGs. + """ + word = (color['r'] / 8) + word += (color['g'] / 8) << 5 + word += (color['b'] / 8) << 10 + return word + + +def pal_to_png(filename): + """ + Interpret a .pal file as a png palette. + """ + with open(filename) as rgbs: + colors = read_rgb_macros(rgbs.readlines()) + a = 255 + palette = [] + for color in colors: + # even distribution over 000-255 + r, g, b = [int(hue * 8.25) for hue in color] + palette += [(r, g, b, a)] + white = (255,255,255,255) + black = (000,000,000,255) + if white not in palette and len(palette) < 4: + palette = [white] + palette + if black not in palette and len(palette) < 4: + palette = palette + [black] + return palette + + +def png_to_rgb(palette): + """ + Convert a png palette to rgb macros. + """ + output = '' + for color in palette: + r, g, b = [color[c] / 8 for c in 'rgb'] + output += '\tRGB ' + ', '.join(['%.2d' % hue for hue in (r, g, b)]) + output += '\n' + return output + + +def read_filename_arguments(filename): + """ + Infer graphics conversion arguments given a filename. + + Arguments are separated with '.'. + """ + parsed_arguments = {} + + int_arguments = { + 'w': 'width', + 'h': 'height', + 't': 'tile_padding', + } + arguments = os.path.splitext(filename)[0].lstrip('.').split('.')[1:] + for argument in arguments: + + # Check for integer arguments first (i.e. "w128"). + arg = argument[0] + param = argument[1:] + if param.isdigit(): + arg = int_arguments.get(arg, False) + if arg: + parsed_arguments[arg] = int(param) + + elif argument == 'arrange': + parsed_arguments['norepeat'] = True + parsed_arguments['tilemap'] = True + + # Pic dimensions (i.e. "6x6"). + elif 'x' in argument and any(map(str.isdigit, argument)): + w, h = argument.split('x') + if w.isdigit() and h.isdigit(): + parsed_arguments['pic_dimensions'] = (int(w), int(h)) + + else: + parsed_arguments[argument] = True + + return parsed_arguments + + +def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, tile_padding=0, pic_dimensions=None, **kwargs): + + if fileout == None: + fileout = os.path.splitext(filein)[0] + '.png' + + image = open(filein, 'rb').read() + + arguments = { + 'width': width, + 'height': height, + 'pal_file': pal_file, + 'tile_padding': tile_padding, + 'pic_dimensions': pic_dimensions, + } + arguments.update(read_filename_arguments(filein)) + + if pal_file == None: + if os.path.exists(os.path.splitext(fileout)[0]+'.pal'): + arguments['pal_file'] = os.path.splitext(fileout)[0]+'.pal' + + result = convert_2bpp_to_png(image, **arguments) + width, height, palette, greyscale, bitdepth, px_map = result + + w = png.Writer( + width, + height, + palette=palette, + compression=9, + greyscale=greyscale, + bitdepth=bitdepth + ) + with open(fileout, 'wb') as f: + w.write(f, px_map) + + +def convert_2bpp_to_png(image, **kwargs): + """ + Convert a planar 2bpp graphic to png. + """ + + image = bytearray(image) + + pad_color = bytearray([0]) + + width = kwargs.get('width', 0) + height = kwargs.get('height', 0) + tile_padding = kwargs.get('tile_padding', 0) + pic_dimensions = kwargs.get('pic_dimensions', None) + pal_file = kwargs.get('pal_file', None) + interleave = kwargs.get('interleave', False) + + # Width must be specified to interleave. + if interleave and width: + image = interleave_tiles(image, width / 8) + + # Pad the image by a given number of tiles if asked. + image += pad_color * 0x10 * tile_padding + + # Some images are transposed in blocks. + if pic_dimensions: + w, h = pic_dimensions + if not width: width = w * 8 + + pic_length = w * h * 0x10 + + trailing = len(image) % pic_length + + pic = [] + for i in xrange(0, len(image) - trailing, pic_length): + pic += transpose_tiles(image[i:i+pic_length], h) + image = bytearray(pic) + image[len(image) - trailing:] + + # Pad out trailing lines. + image += pad_color * 0x10 * ((w - (len(image) / 0x10) % h) % w) + + def px_length(img): + return len(img) * 4 + def tile_length(img): + return len(img) * 4 / (8*8) + + if width and height: + tile_width = width / 8 + more_tile_padding = (tile_width - (tile_length(image) % tile_width or tile_width)) + image += pad_color * 0x10 * more_tile_padding + + elif width and not height: + tile_width = width / 8 + more_tile_padding = (tile_width - (tile_length(image) % tile_width or tile_width)) + image += pad_color * 0x10 * more_tile_padding + height = px_length(image) / width + + elif height and not width: + tile_height = height / 8 + more_tile_padding = (tile_height - (tile_length(image) % tile_height or tile_height)) + image += pad_color * 0x10 * more_tile_padding + width = px_length(image) / height + + # at least one dimension should be given + if width * height != px_length(image): + # look for possible combos of width/height that would form a rectangle + matches = [] + # Height need not be divisible by 8, but width must. + # See pokered gfx/minimize_pic.1bpp. + for w in range(8, px_length(image) / 2 + 1, 8): + h = px_length(image) / w + if w * h == px_length(image): + matches += [(w, h)] + # go for the most square image + if len(matches): + width, height = sorted(matches, key= lambda (w, h): (h % 8 != 0, w + h))[0] # favor height + else: + raise Exception, 'Image can\'t be divided into tiles (%d px)!' % (px_length(image)) + + # convert tiles to lines + lines = to_lines(flatten(image), width) + + if pal_file == None: + palette = None + greyscale = True + bitdepth = 2 + px_map = [[3 - pixel for pixel in line] for line in lines] + + else: # gbc color + palette = pal_to_png(pal_file) + greyscale = False + bitdepth = 8 + px_map = [[pixel for pixel in line] for line in lines] + + return width, height, palette, greyscale, bitdepth, px_map + + +def get_pic_animation(tmap, w, h): + """ + Generate pic animation data from a combined tilemap of each frame. + """ + frame_text = '' + bitmask_text = '' + + frames = list(split(tmap, w * h)) + base = frames.pop(0) + bitmasks = [] + + for i in xrange(len(frames)): + frame_text += '\tdw .frame{}\n'.format(i + 1) + + for i, frame in enumerate(frames): + bitmask = map(operator.ne, frame, base) + if bitmask not in bitmasks: + bitmasks.append(bitmask) + which_bitmask = bitmasks.index(bitmask) + + mask = iter(bitmask) + masked_frame = filter(lambda _: mask.next(), frame) + + frame_text += '.frame{}\n'.format(i + 1) + frame_text += '\tdb ${:02x} ; bitmask\n'.format(which_bitmask) + if masked_frame: + frame_text += '\tdb {}\n'.format(', '.join( + map('${:02x}'.format, masked_frame) + )) + + for i, bitmask in enumerate(bitmasks): + bitmask_text += '; {}\n'.format(i) + for byte in split(bitmask, 8): + byte = int(''.join(map(int.__repr__, reversed(byte))), 2) + bitmask_text += '\tdb %{:08b}\n'.format(byte) + + return frame_text, bitmask_text + + +def export_png_to_2bpp(filein, fileout=None, palout=None, **kwargs): + + arguments = { + 'tile_padding': 0, + 'pic_dimensions': None, + 'animate': False, + 'stupid_bitmask_hack': [], + } + arguments.update(kwargs) + arguments.update(read_filename_arguments(filein)) + + image, arguments = png_to_2bpp(filein, **arguments) + + if fileout == None: + fileout = os.path.splitext(filein)[0] + '.2bpp' + to_file(fileout, image) + + tmap = arguments.get('tmap') + + if tmap != None and arguments['animate'] and arguments['pic_dimensions']: + # Generate pic animation data. + frame_text, bitmask_text = get_pic_animation(tmap, *arguments['pic_dimensions']) + + frames_path = os.path.join(os.path.split(fileout)[0], 'frames.asm') + with open(frames_path, 'w') as out: + out.write(frame_text) + + bitmask_path = os.path.join(os.path.split(fileout)[0], 'bitmask.asm') + + # The following Pokemon have a bitmask dummied out. + for exception in arguments['stupid_bitmask_hack']: + if exception in bitmask_path: + bitmasks = bitmask_text.split(';') + bitmasks[-1] = bitmasks[-1].replace('1', '0') + bitmask_text = ';'.join(bitmasks) + + with open(bitmask_path, 'w') as out: + out.write(bitmask_text) + + elif tmap != None and arguments.get('tilemap', False): + tilemap_path = os.path.splitext(fileout)[0] + '.tilemap' + to_file(tilemap_path, tmap) + + palette = arguments.get('palette') + if palout == None: + palout = os.path.splitext(fileout)[0] + '.pal' + export_palette(palette, palout) + + +def get_image_padding(width, height, wstep=8, hstep=8): + + padding = { + 'left': 0, + 'right': 0, + 'top': 0, + 'bottom': 0, + } + + if width % wstep and width >= wstep: + pad = float(width % wstep) / 2 + padding['left'] = int(ceil(pad)) + padding['right'] = int(floor(pad)) + + if height % hstep and height >= hstep: + pad = float(height % hstep) / 2 + padding['top'] = int(ceil(pad)) + padding['bottom'] = int(floor(pad)) + + return padding + + +def png_to_2bpp(filein, **kwargs): + """ + Convert a png image to planar 2bpp. + """ + + arguments = { + 'tile_padding': 0, + 'pic_dimensions': False, + 'interleave': False, + 'norepeat': False, + 'tilemap': False, + } + arguments.update(kwargs) + + if type(filein) is str: + filein = open(filein) + + assert type(filein) is file + + width, height, rgba, info = png.Reader(filein).asRGBA8() + + # png.Reader returns flat pixel data. Nested is easier to work with + len_px = len('rgba') + image = [] + palette = [] + for line in rgba: + newline = [] + for px in xrange(0, len(line), len_px): + color = dict(zip('rgba', line[px:px+len_px])) + if color not in palette: + if len(palette) < 4: + palette += [color] + else: + # TODO Find the nearest match + print 'WARNING: %s: Color %s truncated to' % (filein, color), + color = sorted(palette, key=lambda x: sum(x.values()))[0] + print color + newline += [color] + image += [newline] + + assert len(palette) <= 4, '%s: palette should be 4 colors, is really %d (%s)' % (filein, len(palette), palette) + + # Pad out smaller palettes with greyscale colors + greyscale = { + 'black': { 'r': 0x00, 'g': 0x00, 'b': 0x00, 'a': 0xff }, + 'grey': { 'r': 0x55, 'g': 0x55, 'b': 0x55, 'a': 0xff }, + 'gray': { 'r': 0xaa, 'g': 0xaa, 'b': 0xaa, 'a': 0xff }, + 'white': { 'r': 0xff, 'g': 0xff, 'b': 0xff, 'a': 0xff }, + } + preference = 'white', 'black', 'grey', 'gray' + for hue in map(greyscale.get, preference): + if len(palette) >= 4: + break + if hue not in palette: + palette += [hue] + + palette.sort(key=lambda x: sum(x.values())) + + # Game Boy palette order + palette.reverse() + + # Map pixels to quaternary color ids + padding = get_image_padding(width, height) + width += padding['left'] + padding['right'] + height += padding['top'] + padding['bottom'] + pad = bytearray([0]) + + qmap = [] + qmap += pad * width * padding['top'] + for line in image: + qmap += pad * padding['left'] + for color in line: + qmap += [palette.index(color)] + qmap += pad * padding['right'] + qmap += pad * width * padding['bottom'] + + # Graphics are stored in tiles instead of lines + tile_width = 8 + tile_height = 8 + num_columns = max(width, tile_width) / tile_width + num_rows = max(height, tile_height) / tile_height + image = [] + + for row in xrange(num_rows): + for column in xrange(num_columns): + + # Split it up into strips to convert to planar data + for strip in xrange(min(tile_height, height)): + anchor = ( + row * num_columns * tile_width * tile_height + + column * tile_width + + strip * width + ) + line = qmap[anchor : anchor + tile_width] + bottom, top = 0, 0 + for bit, quad in enumerate(line): + bottom += (quad & 1) << (7 - bit) + top += (quad /2 & 1) << (7 - bit) + image += [bottom, top] + + dim = arguments['pic_dimensions'] + if dim: + if type(dim) in (tuple, list): + w, h = dim + else: + # infer dimensions based on width. + w = width / tile_width + h = height / tile_height + if h % w == 0: + h = w + + tiles = get_tiles(image) + pic_length = w * h + tile_width = width / 8 + trailing = len(tiles) % pic_length + new_image = [] + for block in xrange(len(tiles) / pic_length): + offset = (h * tile_width) * ((block * w) / tile_width) + ((block * w) % tile_width) + pic = [] + for row in xrange(h): + index = offset + (row * tile_width) + pic += tiles[index:index + w] + new_image += transpose(pic, w) + new_image += tiles[len(tiles) - trailing:] + image = connect(new_image) + + # Remove any tile padding used to make the png rectangular. + image = image[:len(image) - arguments['tile_padding'] * 0x10] + + tmap = None + + if arguments['interleave']: + image = deinterleave_tiles(image, num_columns) + + if arguments['pic_dimensions']: + image, tmap = condense_image_to_map(image, w * h) + elif arguments['norepeat']: + image, tmap = condense_image_to_map(image) + if not arguments['tilemap']: + tmap = None + + arguments.update({ 'palette': palette, 'tmap': tmap, }) + + return image, arguments + + +def export_palette(palette, filename): + """ + Export a palette from png to rgb macros in a .pal file. + """ + + if os.path.exists(filename): + + # Pic palettes are 2 colors (black/white are added later). + with open(filename) as rgbs: + colors = read_rgb_macros(rgbs.readlines()) + + if len(colors) == 2: + palette = palette[1:3] + + text = png_to_rgb(palette) + with open(filename, 'w') as out: + out.write(text) + + +def png_to_lz(filein): + + name = os.path.splitext(filein)[0] + + export_png_to_2bpp(filein) + image = open(name+'.2bpp', 'rb').read() + to_file(name+'.2bpp'+'.lz', Compressed(image).output) + + +def convert_2bpp_to_1bpp(data): + """ + Convert planar 2bpp image data to 1bpp. Assume images are two colors. + """ + return data[::2] + +def convert_1bpp_to_2bpp(data): + """ + Convert 1bpp image data to planar 2bpp (black/white). + """ + output = [] + for i in data: + output += [i, i] + return output + + +def export_2bpp_to_1bpp(filename): + name, extension = os.path.splitext(filename) + image = open(filename, 'rb').read() + image = convert_2bpp_to_1bpp(image) + to_file(name + '.1bpp', image) + +def export_1bpp_to_2bpp(filename): + name, extension = os.path.splitext(filename) + image = open(filename, 'rb').read() + image = convert_1bpp_to_2bpp(image) + to_file(name + '.2bpp', image) + + +def export_1bpp_to_png(filename, fileout=None): + + if fileout == None: + fileout = os.path.splitext(filename)[0] + '.png' + + arguments = read_filename_arguments(filename) + + image = open(filename, 'rb').read() + image = convert_1bpp_to_2bpp(image) + + result = convert_2bpp_to_png(image, **arguments) + width, height, palette, greyscale, bitdepth, px_map = result + + w = png.Writer(width, height, palette=palette, compression=9, greyscale=greyscale, bitdepth=bitdepth) + with open(fileout, 'wb') as f: + w.write(f, px_map) + + +def export_png_to_1bpp(filename, fileout=None): + + if fileout == None: + fileout = os.path.splitext(filename)[0] + '.1bpp' + + arguments = read_filename_arguments(filename) + image = png_to_1bpp(filename, **arguments) + + to_file(fileout, image) + +def png_to_1bpp(filename, **kwargs): + image, kwargs = png_to_2bpp(filename, **kwargs) + return convert_2bpp_to_1bpp(image) + + +def convert_to_2bpp(filenames=[]): + for filename in filenames: + filename, name, extension = try_decompress(filename) + if extension == '.1bpp': + export_1bpp_to_2bpp(filename) + elif extension == '.2bpp': + pass + elif extension == '.png': + export_png_to_2bpp(filename) + else: + raise Exception, "Don't know how to convert {} to 2bpp!".format(filename) + +def convert_to_1bpp(filenames=[]): + for filename in filenames: + filename, name, extension = try_decompress(filename) + if extension == '.1bpp': + pass + elif extension == '.2bpp': + export_2bpp_to_1bpp(filename) + elif extension == '.png': + export_png_to_1bpp(filename) + else: + raise Exception, "Don't know how to convert {} to 1bpp!".format(filename) + +def convert_to_png(filenames=[]): + for filename in filenames: + filename, name, extension = try_decompress(filename) + if extension == '.1bpp': + export_1bpp_to_png(filename) + elif extension == '.2bpp': + export_2bpp_to_png(filename) + elif extension == '.png': + pass + else: + raise Exception, "Don't know how to convert {} to png!".format(filename) + +def compress(filenames=[]): + for filename in filenames: + data = open(filename, 'rb').read() + lz_data = Compressed(data).output + to_file(filename + '.lz', lz_data) + +def decompress(filenames=[]): + for filename in filenames: + name, extension = os.path.splitext(filename) + lz_data = open(filename, 'rb').read() + data = Decompressed(lz_data).output + to_file(name, data) + +def try_decompress(filename): + """ + Try to decompress a graphic when determining the filetype. + This skips the manual unlz step when attempting + to convert lz-compressed graphics to png. + """ + name, extension = os.path.splitext(filename) + if extension == '.lz': + decompress([filename]) + filename = name + name, extension = os.path.splitext(filename) + return filename, name, extension + + +def main(): + ap = argparse.ArgumentParser() + ap.add_argument('mode') + ap.add_argument('filenames', nargs='*') + args = ap.parse_args() + + method = { + '2bpp': convert_to_2bpp, + '1bpp': convert_to_1bpp, + 'png': convert_to_png, + 'lz': compress, + 'unlz': decompress, + }.get(args.mode, None) + + if method == None: + raise Exception, "Unknown conversion method!" + + method(args.filenames) + +if __name__ == "__main__": + main() diff --git a/tools/pokemontools/lz.py b/tools/pokemontools/lz.py new file mode 100644 index 00000000..aef5c641 --- /dev/null +++ b/tools/pokemontools/lz.py @@ -0,0 +1,580 @@ +# -*- coding: utf-8 -*- +""" +Pokemon Crystal data de/compression. +""" + +""" +A rundown of Pokemon Crystal's compression scheme: + +Control commands occupy bits 5-7. +Bits 0-4 serve as the first parameter for each command. +""" +lz_commands = { + 'literal': 0, # n values for n bytes + 'iterate': 1, # one value for n bytes + 'alternate': 2, # alternate two values for n bytes + 'blank': 3, # zero for n bytes +} + +""" +Repeater commands repeat any data that was just decompressed. +They take an additional signed parameter to mark a relative starting point. +These wrap around (positive from the start, negative from the current position). +""" +lz_commands.update({ + 'repeat': 4, # n bytes starting from s + 'flip': 5, # n bytes in reverse bit order starting from s + 'reverse': 6, # n bytes backwards starting from s +}) + +""" +The long command is used when 5 bits aren't enough. Bits 2-4 contain a new control code. +Bits 0-1 are appended to a new byte as 8-9, allowing a 10-bit parameter. +""" +lz_commands.update({ + 'long': 7, # n is now 10 bits for a new control code +}) +max_length = 1 << 10 # can't go higher than 10 bits +lowmax = 1 << 5 # standard 5-bit param + +""" +If 0xff is encountered instead of a command, decompression ends. +""" +lz_end = 0xff + + +bit_flipped = [ + sum(((byte >> i) & 1) << (7 - i) for i in xrange(8)) + for byte in xrange(0x100) +] + + +class Compressed: + + """ + Usage: + lz = Compressed(data).output + or + lz = Compressed().compress(data) + or + c = Compressed() + c.data = data + lz = c.compress() + + There are some issues with reproducing the target compressor. + Some notes are listed here: + - the criteria for detecting a lookback is inconsistent + - sometimes lookbacks that are mostly 0s are pruned, sometimes not + - target appears to skip ahead if it can use a lookback soon, stopping the current command short or in some cases truncating it with literals. + - this has been implemented, but the specifics are unknown + - self.min_scores: It's unknown if blank's minimum score should be 1 or 2. Most likely it's 1, with some other hack to account for edge cases. + - may be related to the above + - target does not appear to compress backwards + """ + + def __init__(self, *args, **kwargs): + + self.min_scores = { + 'blank': 1, + 'iterate': 2, + 'alternate': 3, + 'repeat': 3, + 'reverse': 3, + 'flip': 3, + } + + self.preference = [ + 'repeat', + 'blank', + 'flip', + 'reverse', + 'iterate', + 'alternate', + #'literal', + ] + + self.lookback_methods = 'repeat', 'reverse', 'flip' + + self.__dict__.update({ + 'data': None, + 'commands': lz_commands, + 'debug': False, + 'literal_only': False, + }) + + self.arg_names = 'data', 'commands', 'debug', 'literal_only' + + self.__dict__.update(kwargs) + self.__dict__.update(dict(zip(self.arg_names, args))) + + if self.data is not None: + self.compress() + + def compress(self, data=None): + if data is not None: + self.data = data + + self.data = list(bytearray(self.data)) + + self.indexes = {} + self.lookbacks = {} + for method in self.lookback_methods: + self.lookbacks[method] = {} + + self.address = 0 + self.end = len(self.data) + self.output = [] + self.literal = None + + while self.address < self.end: + + if self.score(): + self.do_literal() + self.do_winner() + + else: + if self.literal == None: + self.literal = self.address + self.address += 1 + + self.do_literal() + + self.output += [lz_end] + return self.output + + def reset_scores(self): + self.scores = {} + self.offsets = {} + self.helpers = {} + for method in self.min_scores.iterkeys(): + self.scores[method] = 0 + + def bit_flip(self, byte): + return bit_flipped[byte] + + def do_literal(self): + if self.literal != None: + length = abs(self.address - self.literal) + start = min(self.literal, self.address + 1) + self.helpers['literal'] = self.data[start:start+length] + self.do_cmd('literal', length) + self.literal = None + + def score(self): + self.reset_scores() + + map(self.score_literal, ['iterate', 'alternate', 'blank']) + + for method in self.lookback_methods: + self.scores[method], self.offsets[method] = self.find_lookback(method, self.address) + + self.stop_short() + + return any( + score + > self.min_scores[method] + int(score > lowmax) + for method, score in self.scores.iteritems() + ) + + def stop_short(self): + """ + If a lookback is close, reduce the scores of other commands. + """ + best_method, best_score = max( + self.scores.items(), + key = lambda x: ( + x[1], + -self.preference.index(x[0]) + ) + ) + for method in self.lookback_methods: + min_score = self.min_scores[method] + for address in xrange(self.address+1, self.address+best_score): + length, index = self.find_lookback(method, address) + if length > max(min_score, best_score): + # BUG: lookbacks can reduce themselves. This appears to be a bug in the target also. + for m, score in self.scores.items(): + self.scores[m] = min(score, address - self.address) + + + def read(self, address=None): + if address is None: + address = self.address + if 0 <= address < len(self.data): + return self.data[address] + return None + + def find_all_lookbacks(self): + for method in self.lookback_methods: + for address, byte in enumerate(self.data): + self.find_lookback(method, address) + + def find_lookback(self, method, address=None): + """Temporarily stubbed, because the real function doesn't run in polynomial time.""" + return 0, None + + def broken_find_lookback(self, method, address=None): + if address is None: + address = self.address + + existing = self.lookbacks.get(method, {}).get(address) + if existing != None: + return existing + + lookback = 0, None + + # Better to not carelessly optimize at the moment. + """ + if address < 2: + return lookback + """ + + byte = self.read(address) + if byte is None: + return lookback + + direction, mutate = { + 'repeat': ( 1, int), + 'reverse': (-1, int), + 'flip': ( 1, self.bit_flip), + }[method] + + # Doesn't seem to help + """ + if mutate == self.bit_flip: + if byte == 0: + self.lookbacks[method][address] = lookback + return lookback + """ + + data_len = len(self.data) + is_two_byte_index = lambda index: int(index < address - 0x7f) + + for index in self.get_indexes(mutate(byte)): + + if index >= address: + break + + old_length, old_index = lookback + if direction == 1: + if old_length > data_len - index: break + else: + if old_length > index: continue + + if self.read(index) in [None]: continue + + length = 1 # we know there's at least one match, or we wouldn't be checking this index + while 1: + this_byte = self.read(address + length) + that_byte = self.read(index + length * direction) + if that_byte == None or this_byte != mutate(that_byte): + break + length += 1 + + score = length - is_two_byte_index(index) + old_score = old_length - is_two_byte_index(old_index) + if score >= old_score or (score == old_score and length > old_length): + # XXX maybe avoid two-byte indexes when possible + if score >= lookback[0] - is_two_byte_index(lookback[1]): + lookback = length, index + + self.lookbacks[method][address] = lookback + return lookback + + def get_indexes(self, byte): + if not self.indexes.has_key(byte): + self.indexes[byte] = [] + index = -1 + while 1: + try: + index = self.data.index(byte, index + 1) + except ValueError: + break + self.indexes[byte].append(index) + return self.indexes[byte] + + def score_literal(self, method): + address = self.address + + compare = { + 'blank': [0], + 'iterate': [self.read(address)], + 'alternate': [self.read(address), self.read(address + 1)], + }[method] + + # XXX may or may not be correct + if method == 'alternate' and compare[0] == 0: + return + + length = 0 + while self.read(address + length) == compare[length % len(compare)]: + length += 1 + + self.scores[method] = length + self.helpers[method] = compare + + def do_winner(self): + winners = filter( + lambda (method, score): + score + > self.min_scores[method] + int(score > lowmax), + self.scores.iteritems() + ) + winners.sort( + key = lambda (method, score): ( + -(score - self.min_scores[method] - int(score > lowmax)), + self.preference.index(method) + ) + ) + winner, score = winners[0] + + length = min(score, max_length) + self.do_cmd(winner, length) + self.address += length + + def do_cmd(self, cmd, length): + start_address = self.address + + cmd_length = length - 1 + + output = [] + + if length > lowmax: + output.append( + (self.commands['long'] << 5) + + (self.commands[cmd] << 2) + + (cmd_length >> 8) + ) + output.append( + cmd_length & 0xff + ) + else: + output.append( + (self.commands[cmd] << 5) + + cmd_length + ) + + self.helpers['blank'] = [] # quick hack + output += self.helpers.get(cmd, []) + + if cmd in self.lookback_methods: + offset = self.offsets[cmd] + # Negative offsets are one byte. + # Positive offsets are two. + if 0 < start_address - offset - 1 <= 0x7f: + offset = (start_address - offset - 1) | 0x80 + output += [offset] + else: + output += [offset / 0x100, offset % 0x100] # big endian + + if self.debug: + print ' '.join(map(str, [ + cmd, length, '\t', + ' '.join(map('{:02x}'.format, output)), + self.data[start_address:start_address+length] if cmd in self.lookback_methods else '', + ])) + + self.output += output + + + +class Decompressed: + """ + Interpret and decompress lz-compressed data, usually 2bpp. + """ + + """ + Usage: + data = Decompressed(lz).output + or + data = Decompressed().decompress(lz) + or + d = Decompressed() + d.lz = lz + data = d.decompress() + + To decompress from offset 0x80000 in a rom: + data = Decompressed(rom, start=0x80000).output + """ + + lz = None + start = 0 + commands = lz_commands + debug = False + + arg_names = 'lz', 'start', 'commands', 'debug' + + def __init__(self, *args, **kwargs): + self.__dict__.update(dict(zip(self.arg_names, args))) + self.__dict__.update(kwargs) + + self.command_names = dict(map(reversed, self.commands.items())) + self.address = self.start + + if self.lz is not None: + self.decompress() + + if self.debug: print self.command_list() + + + def command_list(self): + """ + Print a list of commands that were used. Useful for debugging. + """ + + text = '' + + output_address = 0 + for name, attrs in self.used_commands: + length = attrs['length'] + address = attrs['address'] + offset = attrs['offset'] + direction = attrs['direction'] + + text += '{2:03x} {0}: {1}'.format(name, length, output_address) + text += '\t' + ' '.join( + '{:02x}'.format(int(byte)) + for byte in self.lz[ address : address + attrs['cmd_length'] ] + ) + + if offset is not None: + repeated_data = self.output[ offset : offset + length * direction : direction ] + if name == 'flip': + repeated_data = map(bit_flipped.__getitem__, repeated_data) + text += ' [' + ' '.join(map('{:02x}'.format, repeated_data)) + ']' + + text += '\n' + output_address += length + + return text + + + def decompress(self, lz=None): + + if lz is not None: + self.lz = lz + + self.lz = bytearray(self.lz) + + self.used_commands = [] + self.output = [] + + while 1: + + cmd_address = self.address + self.offset = None + self.direction = None + + if (self.byte == lz_end): + self.next() + break + + self.cmd = (self.byte & 0b11100000) >> 5 + + if self.cmd_name == 'long': + # 10-bit length + self.cmd = (self.byte & 0b00011100) >> 2 + self.length = (self.next() & 0b00000011) * 0x100 + self.length += self.next() + 1 + else: + # 5-bit length + self.length = (self.next() & 0b00011111) + 1 + + self.__class__.__dict__[self.cmd_name](self) + + self.used_commands += [( + self.cmd_name, + { + 'length': self.length, + 'address': cmd_address, + 'offset': self.offset, + 'cmd_length': self.address - cmd_address, + 'direction': self.direction, + } + )] + + # Keep track of the data we just decompressed. + self.compressed_data = self.lz[self.start : self.address] + + + @property + def byte(self): + return self.lz[ self.address ] + + def next(self): + byte = self.byte + self.address += 1 + return byte + + @property + def cmd_name(self): + return self.command_names.get(self.cmd) + + + def get_offset(self): + + if self.byte >= 0x80: # negative + # negative + offset = self.next() & 0x7f + offset = len(self.output) - offset - 1 + else: + # positive + offset = self.next() * 0x100 + offset += self.next() + + self.offset = offset + + + def literal(self): + """ + Copy data directly. + """ + self.output += self.lz[ self.address : self.address + self.length ] + self.address += self.length + + def iterate(self): + """ + Write one byte repeatedly. + """ + self.output += [self.next()] * self.length + + def alternate(self): + """ + Write alternating bytes. + """ + alts = [self.next(), self.next()] + self.output += [ alts[x & 1] for x in xrange(self.length) ] + + def blank(self): + """ + Write zeros. + """ + self.output += [0] * self.length + + def flip(self): + """ + Repeat flipped bytes from output. + + Example: 11100100 -> 00100111 + """ + self._repeat(table=bit_flipped) + + def reverse(self): + """ + Repeat reversed bytes from output. + """ + self._repeat(direction=-1) + + def repeat(self): + """ + Repeat bytes from output. + """ + self._repeat() + + def _repeat(self, direction=1, table=None): + self.get_offset() + self.direction = direction + # Note: appends must be one at a time (this way, repeats can draw from themselves if required) + for i in xrange(self.length): + byte = self.output[ self.offset + i * direction ] + self.output.append( table[byte] if table else byte ) diff --git a/tools/pokemontools/png.py b/tools/pokemontools/png.py new file mode 100644 index 00000000..db6da128 --- /dev/null +++ b/tools/pokemontools/png.py @@ -0,0 +1,2650 @@ +#!/usr/bin/env python + +from __future__ import print_function + +# png.py - PNG encoder/decoder in pure Python +# +# Copyright (C) 2006 Johann C. Rocholl +# Portions Copyright (C) 2009 David Jones +# And probably portions Copyright (C) 2006 Nicko van Someren +# +# Original concept by Johann C. Rocholl. +# +# LICENCE (MIT) +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +""" +Pure Python PNG Reader/Writer + +This Python module implements support for PNG images (see PNG +specification at http://www.w3.org/TR/2003/REC-PNG-20031110/ ). It reads +and writes PNG files with all allowable bit depths +(1/2/4/8/16/24/32/48/64 bits per pixel) and colour combinations: +greyscale (1/2/4/8/16 bit); RGB, RGBA, LA (greyscale with alpha) with +8/16 bits per channel; colour mapped images (1/2/4/8 bit). +Adam7 interlacing is supported for reading and +writing. A number of optional chunks can be specified (when writing) +and understood (when reading): ``tRNS``, ``bKGD``, ``gAMA``. + +For help, type ``import png; help(png)`` in your python interpreter. + +A good place to start is the :class:`Reader` and :class:`Writer` +classes. + +Requires Python 2.3. Limited support is available for Python 2.2, but +not everything works. Best with Python 2.4 and higher. Installation is +trivial, but see the ``README.txt`` file (with the source distribution) +for details. + +This file can also be used as a command-line utility to convert +`Netpbm `_ PNM files to PNG, and the +reverse conversion from PNG to PNM. The interface is similar to that +of the ``pnmtopng`` program from Netpbm. Type ``python png.py --help`` +at the shell prompt for usage and a list of options. + +A note on spelling and terminology +---------------------------------- + +Generally British English spelling is used in the documentation. So +that's "greyscale" and "colour". This not only matches the author's +native language, it's also used by the PNG specification. + +The major colour models supported by PNG (and hence by PyPNG) are: +greyscale, RGB, greyscale--alpha, RGB--alpha. These are sometimes +referred to using the abbreviations: L, RGB, LA, RGBA. In this case +each letter abbreviates a single channel: *L* is for Luminance or Luma +or Lightness which is the channel used in greyscale images; *R*, *G*, +*B* stand for Red, Green, Blue, the components of a colour image; *A* +stands for Alpha, the opacity channel (used for transparency effects, +but higher values are more opaque, so it makes sense to call it +opacity). + +A note on formats +----------------- + +When getting pixel data out of this module (reading) and presenting +data to this module (writing) there are a number of ways the data could +be represented as a Python value. Generally this module uses one of +three formats called "flat row flat pixel", "boxed row flat pixel", and +"boxed row boxed pixel". Basically the concern is whether each pixel +and each row comes in its own little tuple (box), or not. + +Consider an image that is 3 pixels wide by 2 pixels high, and each pixel +has RGB components: + +Boxed row flat pixel:: + + list([R,G,B, R,G,B, R,G,B], + [R,G,B, R,G,B, R,G,B]) + +Each row appears as its own list, but the pixels are flattened so +that three values for one pixel simply follow the three values for +the previous pixel. This is the most common format used, because it +provides a good compromise between space and convenience. PyPNG regards +itself as at liberty to replace any sequence type with any sufficiently +compatible other sequence type; in practice each row is an array (from +the array module), and the outer list is sometimes an iterator rather +than an explicit list (so that streaming is possible). + +Flat row flat pixel:: + + [R,G,B, R,G,B, R,G,B, + R,G,B, R,G,B, R,G,B] + +The entire image is one single giant sequence of colour values. +Generally an array will be used (to save space), not a list. + +Boxed row boxed pixel:: + + list([ (R,G,B), (R,G,B), (R,G,B) ], + [ (R,G,B), (R,G,B), (R,G,B) ]) + +Each row appears in its own list, but each pixel also appears in its own +tuple. A serious memory burn in Python. + +In all cases the top row comes first, and for each row the pixels are +ordered from left-to-right. Within a pixel the values appear in the +order, R-G-B-A (or L-A for greyscale--alpha). + +There is a fourth format, mentioned because it is used internally, +is close to what lies inside a PNG file itself, and has some support +from the public API. This format is called packed. When packed, +each row is a sequence of bytes (integers from 0 to 255), just as +it is before PNG scanline filtering is applied. When the bit depth +is 8 this is essentially the same as boxed row flat pixel; when the +bit depth is less than 8, several pixels are packed into each byte; +when the bit depth is 16 (the only value more than 8 that is supported +by the PNG image format) each pixel value is decomposed into 2 bytes +(and `packed` is a misnomer). This format is used by the +:meth:`Writer.write_packed` method. It isn't usually a convenient +format, but may be just right if the source data for the PNG image +comes from something that uses a similar format (for example, 1-bit +BMPs, or another PNG file). + +And now, my famous members +-------------------------- +""" + +__version__ = "0.0.18" + +import itertools +import math +# http://www.python.org/doc/2.4.4/lib/module-operator.html +import operator +import struct +import sys +# http://www.python.org/doc/2.4.4/lib/module-warnings.html +import warnings +import zlib + +from array import array +from functools import reduce + +try: + # `cpngfilters` is a Cython module: it must be compiled by + # Cython for this import to work. + # If this import does work, then it overrides pure-python + # filtering functions defined later in this file (see `class + # pngfilters`). + import cpngfilters as pngfilters +except ImportError: + pass + + +__all__ = ['Image', 'Reader', 'Writer', 'write_chunks', 'from_array'] + + +# The PNG signature. +# http://www.w3.org/TR/PNG/#5PNG-file-signature +_signature = struct.pack('8B', 137, 80, 78, 71, 13, 10, 26, 10) + +_adam7 = ((0, 0, 8, 8), + (4, 0, 8, 8), + (0, 4, 4, 8), + (2, 0, 4, 4), + (0, 2, 2, 4), + (1, 0, 2, 2), + (0, 1, 1, 2)) + +def group(s, n): + # See http://www.python.org/doc/2.6/library/functions.html#zip + return list(zip(*[iter(s)]*n)) + +def isarray(x): + return isinstance(x, array) + +def tostring(row): + return row.tostring() + +def interleave_planes(ipixels, apixels, ipsize, apsize): + """ + Interleave (colour) planes, e.g. RGB + A = RGBA. + + Return an array of pixels consisting of the `ipsize` elements of + data from each pixel in `ipixels` followed by the `apsize` elements + of data from each pixel in `apixels`. Conventionally `ipixels` + and `apixels` are byte arrays so the sizes are bytes, but it + actually works with any arrays of the same type. The returned + array is the same type as the input arrays which should be the + same type as each other. + """ + + itotal = len(ipixels) + atotal = len(apixels) + newtotal = itotal + atotal + newpsize = ipsize + apsize + # Set up the output buffer + # See http://www.python.org/doc/2.4.4/lib/module-array.html#l2h-1356 + out = array(ipixels.typecode) + # It's annoying that there is no cheap way to set the array size :-( + out.extend(ipixels) + out.extend(apixels) + # Interleave in the pixel data + for i in range(ipsize): + out[i:newtotal:newpsize] = ipixels[i:itotal:ipsize] + for i in range(apsize): + out[i+ipsize:newtotal:newpsize] = apixels[i:atotal:apsize] + return out + +def check_palette(palette): + """Check a palette argument (to the :class:`Writer` class) + for validity. Returns the palette as a list if okay; raises an + exception otherwise. + """ + + # None is the default and is allowed. + if palette is None: + return None + + p = list(palette) + if not (0 < len(p) <= 256): + raise ValueError("a palette must have between 1 and 256 entries") + seen_triple = False + for i,t in enumerate(p): + if len(t) not in (3,4): + raise ValueError( + "palette entry %d: entries must be 3- or 4-tuples." % i) + if len(t) == 3: + seen_triple = True + if seen_triple and len(t) == 4: + raise ValueError( + "palette entry %d: all 4-tuples must precede all 3-tuples" % i) + for x in t: + if int(x) != x or not(0 <= x <= 255): + raise ValueError( + "palette entry %d: values must be integer: 0 <= x <= 255" % i) + return p + +def check_sizes(size, width, height): + """Check that these arguments, in supplied, are consistent. + Return a (width, height) pair. + """ + + if not size: + return width, height + + if len(size) != 2: + raise ValueError( + "size argument should be a pair (width, height)") + if width is not None and width != size[0]: + raise ValueError( + "size[0] (%r) and width (%r) should match when both are used." + % (size[0], width)) + if height is not None and height != size[1]: + raise ValueError( + "size[1] (%r) and height (%r) should match when both are used." + % (size[1], height)) + return size + +def check_color(c, greyscale, which): + """Checks that a colour argument for transparent or + background options is the right form. Returns the colour + (which, if it's a bar integer, is "corrected" to a 1-tuple). + """ + + if c is None: + return c + if greyscale: + try: + len(c) + except TypeError: + c = (c,) + if len(c) != 1: + raise ValueError("%s for greyscale must be 1-tuple" % + which) + if not isinteger(c[0]): + raise ValueError( + "%s colour for greyscale must be integer" % which) + else: + if not (len(c) == 3 and + isinteger(c[0]) and + isinteger(c[1]) and + isinteger(c[2])): + raise ValueError( + "%s colour must be a triple of integers" % which) + return c + +class Error(Exception): + def __str__(self): + return self.__class__.__name__ + ': ' + ' '.join(self.args) + +class FormatError(Error): + """Problem with input file format. In other words, PNG file does + not conform to the specification in some way and is invalid. + """ + +class ChunkError(FormatError): + pass + + +class Writer: + """ + PNG encoder in pure Python. + """ + + def __init__(self, width=None, height=None, + size=None, + greyscale=False, + alpha=False, + bitdepth=8, + palette=None, + transparent=None, + background=None, + gamma=None, + compression=None, + interlace=False, + bytes_per_sample=None, # deprecated + planes=None, + colormap=None, + maxval=None, + chunk_limit=2**20, + x_pixels_per_unit = None, + y_pixels_per_unit = None, + unit_is_meter = False): + """ + Create a PNG encoder object. + + Arguments: + + width, height + Image size in pixels, as two separate arguments. + size + Image size (w,h) in pixels, as single argument. + greyscale + Input data is greyscale, not RGB. + alpha + Input data has alpha channel (RGBA or LA). + bitdepth + Bit depth: from 1 to 16. + palette + Create a palette for a colour mapped image (colour type 3). + transparent + Specify a transparent colour (create a ``tRNS`` chunk). + background + Specify a default background colour (create a ``bKGD`` chunk). + gamma + Specify a gamma value (create a ``gAMA`` chunk). + compression + zlib compression level: 0 (none) to 9 (more compressed); + default: -1 or None. + interlace + Create an interlaced image. + chunk_limit + Write multiple ``IDAT`` chunks to save memory. + x_pixels_per_unit + Number of pixels a unit along the x axis (write a + `pHYs` chunk). + y_pixels_per_unit + Number of pixels a unit along the y axis (write a + `pHYs` chunk). Along with `x_pixel_unit`, this gives + the pixel size ratio. + unit_is_meter + `True` to indicate that the unit (for the `pHYs` + chunk) is metre. + + The image size (in pixels) can be specified either by using the + `width` and `height` arguments, or with the single `size` + argument. If `size` is used it should be a pair (*width*, + *height*). + + `greyscale` and `alpha` are booleans that specify whether + an image is greyscale (or colour), and whether it has an + alpha channel (or not). + + `bitdepth` specifies the bit depth of the source pixel values. + Each source pixel value must be an integer between 0 and + ``2**bitdepth-1``. For example, 8-bit images have values + between 0 and 255. PNG only stores images with bit depths of + 1,2,4,8, or 16. When `bitdepth` is not one of these values, + the next highest valid bit depth is selected, and an ``sBIT`` + (significant bits) chunk is generated that specifies the + original precision of the source image. In this case the + supplied pixel values will be rescaled to fit the range of + the selected bit depth. + + The details of which bit depth / colour model combinations the + PNG file format supports directly, are somewhat arcane + (refer to the PNG specification for full details). Briefly: + "small" bit depths (1,2,4) are only allowed with greyscale and + colour mapped images; colour mapped images cannot have bit depth + 16. + + For colour mapped images (in other words, when the `palette` + argument is specified) the `bitdepth` argument must match one of + the valid PNG bit depths: 1, 2, 4, or 8. (It is valid to have a + PNG image with a palette and an ``sBIT`` chunk, but the meaning + is slightly different; it would be awkward to press the + `bitdepth` argument into service for this.) + + The `palette` option, when specified, causes a colour + mapped image to be created: the PNG colour type is set to 3; + `greyscale` must not be set; `alpha` must not be set; + `transparent` must not be set; the bit depth must be 1,2,4, + or 8. When a colour mapped image is created, the pixel values + are palette indexes and the `bitdepth` argument specifies the + size of these indexes (not the size of the colour values in + the palette). + + The palette argument value should be a sequence of 3- or + 4-tuples. 3-tuples specify RGB palette entries; 4-tuples + specify RGBA palette entries. If both 4-tuples and 3-tuples + appear in the sequence then all the 4-tuples must come + before all the 3-tuples. A ``PLTE`` chunk is created; if there + are 4-tuples then a ``tRNS`` chunk is created as well. The + ``PLTE`` chunk will contain all the RGB triples in the same + sequence; the ``tRNS`` chunk will contain the alpha channel for + all the 4-tuples, in the same sequence. Palette entries + are always 8-bit. + + If specified, the `transparent` and `background` parameters must + be a tuple with three integer values for red, green, blue, or + a simple integer (or singleton tuple) for a greyscale image. + + If specified, the `gamma` parameter must be a positive number + (generally, a `float`). A ``gAMA`` chunk will be created. + Note that this will not change the values of the pixels as + they appear in the PNG file, they are assumed to have already + been converted appropriately for the gamma specified. + + The `compression` argument specifies the compression level to + be used by the ``zlib`` module. Values from 1 to 9 specify + compression, with 9 being "more compressed" (usually smaller + and slower, but it doesn't always work out that way). 0 means + no compression. -1 and ``None`` both mean that the default + level of compession will be picked by the ``zlib`` module + (which is generally acceptable). + + If `interlace` is true then an interlaced image is created + (using PNG's so far only interace method, *Adam7*). This does + not affect how the pixels should be presented to the encoder, + rather it changes how they are arranged into the PNG file. + On slow connexions interlaced images can be partially decoded + by the browser to give a rough view of the image that is + successively refined as more image data appears. + + .. note :: + + Enabling the `interlace` option requires the entire image + to be processed in working memory. + + `chunk_limit` is used to limit the amount of memory used whilst + compressing the image. In order to avoid using large amounts of + memory, multiple ``IDAT`` chunks may be created. + """ + + # At the moment the `planes` argument is ignored; + # its purpose is to act as a dummy so that + # ``Writer(x, y, **info)`` works, where `info` is a dictionary + # returned by Reader.read and friends. + # Ditto for `colormap`. + + width, height = check_sizes(size, width, height) + del size + + if width <= 0 or height <= 0: + raise ValueError("width and height must be greater than zero") + if not isinteger(width) or not isinteger(height): + raise ValueError("width and height must be integers") + # http://www.w3.org/TR/PNG/#7Integers-and-byte-order + if width > 2**32-1 or height > 2**32-1: + raise ValueError("width and height cannot exceed 2**32-1") + + if alpha and transparent is not None: + raise ValueError( + "transparent colour not allowed with alpha channel") + + if bytes_per_sample is not None: + warnings.warn('please use bitdepth instead of bytes_per_sample', + DeprecationWarning) + if bytes_per_sample not in (0.125, 0.25, 0.5, 1, 2): + raise ValueError( + "bytes per sample must be .125, .25, .5, 1, or 2") + bitdepth = int(8*bytes_per_sample) + del bytes_per_sample + if not isinteger(bitdepth) or bitdepth < 1 or 16 < bitdepth: + raise ValueError("bitdepth (%r) must be a positive integer <= 16" % + bitdepth) + + self.rescale = None + palette = check_palette(palette) + if palette: + if bitdepth not in (1,2,4,8): + raise ValueError("with palette, bitdepth must be 1, 2, 4, or 8") + if transparent is not None: + raise ValueError("transparent and palette not compatible") + if alpha: + raise ValueError("alpha and palette not compatible") + if greyscale: + raise ValueError("greyscale and palette not compatible") + else: + # No palette, check for sBIT chunk generation. + if alpha or not greyscale: + if bitdepth not in (8,16): + targetbitdepth = (8,16)[bitdepth > 8] + self.rescale = (bitdepth, targetbitdepth) + bitdepth = targetbitdepth + del targetbitdepth + else: + assert greyscale + assert not alpha + if bitdepth not in (1,2,4,8,16): + if bitdepth > 8: + targetbitdepth = 16 + elif bitdepth == 3: + targetbitdepth = 4 + else: + assert bitdepth in (5,6,7) + targetbitdepth = 8 + self.rescale = (bitdepth, targetbitdepth) + bitdepth = targetbitdepth + del targetbitdepth + + if bitdepth < 8 and (alpha or not greyscale and not palette): + raise ValueError( + "bitdepth < 8 only permitted with greyscale or palette") + if bitdepth > 8 and palette: + raise ValueError( + "bit depth must be 8 or less for images with palette") + + transparent = check_color(transparent, greyscale, 'transparent') + background = check_color(background, greyscale, 'background') + + # It's important that the true boolean values (greyscale, alpha, + # colormap, interlace) are converted to bool because Iverson's + # convention is relied upon later on. + self.width = width + self.height = height + self.transparent = transparent + self.background = background + self.gamma = gamma + self.greyscale = bool(greyscale) + self.alpha = bool(alpha) + self.colormap = bool(palette) + self.bitdepth = int(bitdepth) + self.compression = compression + self.chunk_limit = chunk_limit + self.interlace = bool(interlace) + self.palette = palette + self.x_pixels_per_unit = x_pixels_per_unit + self.y_pixels_per_unit = y_pixels_per_unit + self.unit_is_meter = bool(unit_is_meter) + + self.color_type = 4*self.alpha + 2*(not greyscale) + 1*self.colormap + assert self.color_type in (0,2,3,4,6) + + self.color_planes = (3,1)[self.greyscale or self.colormap] + self.planes = self.color_planes + self.alpha + # :todo: fix for bitdepth < 8 + self.psize = (self.bitdepth/8) * self.planes + + def make_palette(self): + """Create the byte sequences for a ``PLTE`` and if necessary a + ``tRNS`` chunk. Returned as a pair (*p*, *t*). *t* will be + ``None`` if no ``tRNS`` chunk is necessary. + """ + + p = array('B') + t = array('B') + + for x in self.palette: + p.extend(x[0:3]) + if len(x) > 3: + t.append(x[3]) + p = tostring(p) + t = tostring(t) + if t: + return p,t + return p,None + + def write(self, outfile, rows): + """Write a PNG image to the output file. `rows` should be + an iterable that yields each row in boxed row flat pixel + format. The rows should be the rows of the original image, + so there should be ``self.height`` rows of ``self.width * + self.planes`` values. If `interlace` is specified (when + creating the instance), then an interlaced PNG file will + be written. Supply the rows in the normal image order; + the interlacing is carried out internally. + + .. note :: + + Interlacing will require the entire image to be in working + memory. + """ + + if self.interlace: + fmt = 'BH'[self.bitdepth > 8] + a = array(fmt, itertools.chain(*rows)) + return self.write_array(outfile, a) + + nrows = self.write_passes(outfile, rows) + if nrows != self.height: + raise ValueError( + "rows supplied (%d) does not match height (%d)" % + (nrows, self.height)) + + def write_passes(self, outfile, rows, packed=False): + """ + Write a PNG image to the output file. + + Most users are expected to find the :meth:`write` or + :meth:`write_array` method more convenient. + + The rows should be given to this method in the order that + they appear in the output file. For straightlaced images, + this is the usual top to bottom ordering, but for interlaced + images the rows should have already been interlaced before + passing them to this function. + + `rows` should be an iterable that yields each row. When + `packed` is ``False`` the rows should be in boxed row flat pixel + format; when `packed` is ``True`` each row should be a packed + sequence of bytes. + """ + + # http://www.w3.org/TR/PNG/#5PNG-file-signature + outfile.write(_signature) + + # http://www.w3.org/TR/PNG/#11IHDR + write_chunk(outfile, b'IHDR', + struct.pack("!2I5B", self.width, self.height, + self.bitdepth, self.color_type, + 0, 0, self.interlace)) + + # See :chunk:order + # http://www.w3.org/TR/PNG/#11gAMA + if self.gamma is not None: + write_chunk(outfile, b'gAMA', + struct.pack("!L", int(round(self.gamma*1e5)))) + + # See :chunk:order + # http://www.w3.org/TR/PNG/#11sBIT + if self.rescale: + write_chunk(outfile, b'sBIT', + struct.pack('%dB' % self.planes, + *[self.rescale[0]]*self.planes)) + + # :chunk:order: Without a palette (PLTE chunk), ordering is + # relatively relaxed. With one, gAMA chunk must precede PLTE + # chunk which must precede tRNS and bKGD. + # See http://www.w3.org/TR/PNG/#5ChunkOrdering + if self.palette: + p,t = self.make_palette() + write_chunk(outfile, b'PLTE', p) + if t: + # tRNS chunk is optional. Only needed if palette entries + # have alpha. + write_chunk(outfile, b'tRNS', t) + + # http://www.w3.org/TR/PNG/#11tRNS + if self.transparent is not None: + if self.greyscale: + write_chunk(outfile, b'tRNS', + struct.pack("!1H", *self.transparent)) + else: + write_chunk(outfile, b'tRNS', + struct.pack("!3H", *self.transparent)) + + # http://www.w3.org/TR/PNG/#11bKGD + if self.background is not None: + if self.greyscale: + write_chunk(outfile, b'bKGD', + struct.pack("!1H", *self.background)) + else: + write_chunk(outfile, b'bKGD', + struct.pack("!3H", *self.background)) + + # http://www.w3.org/TR/PNG/#11pHYs + if self.x_pixels_per_unit is not None and self.y_pixels_per_unit is not None: + tup = (self.x_pixels_per_unit, self.y_pixels_per_unit, int(self.unit_is_meter)) + write_chunk(outfile, b'pHYs', struct.pack("!LLB",*tup)) + + # http://www.w3.org/TR/PNG/#11IDAT + if self.compression is not None: + compressor = zlib.compressobj(self.compression) + else: + compressor = zlib.compressobj() + + # Choose an extend function based on the bitdepth. The extend + # function packs/decomposes the pixel values into bytes and + # stuffs them onto the data array. + data = array('B') + if self.bitdepth == 8 or packed: + extend = data.extend + elif self.bitdepth == 16: + # Decompose into bytes + def extend(sl): + fmt = '!%dH' % len(sl) + data.extend(array('B', struct.pack(fmt, *sl))) + else: + # Pack into bytes + assert self.bitdepth < 8 + # samples per byte + spb = int(8/self.bitdepth) + def extend(sl): + a = array('B', sl) + # Adding padding bytes so we can group into a whole + # number of spb-tuples. + l = float(len(a)) + extra = math.ceil(l / float(spb))*spb - l + a.extend([0]*int(extra)) + # Pack into bytes + l = group(a, spb) + l = [reduce(lambda x,y: + (x << self.bitdepth) + y, e) for e in l] + data.extend(l) + if self.rescale: + oldextend = extend + factor = \ + float(2**self.rescale[1]-1) / float(2**self.rescale[0]-1) + def extend(sl): + oldextend([int(round(factor*x)) for x in sl]) + + # Build the first row, testing mostly to see if we need to + # changed the extend function to cope with NumPy integer types + # (they cause our ordinary definition of extend to fail, so we + # wrap it). See + # http://code.google.com/p/pypng/issues/detail?id=44 + enumrows = enumerate(rows) + del rows + + # First row's filter type. + data.append(0) + # :todo: Certain exceptions in the call to ``.next()`` or the + # following try would indicate no row data supplied. + # Should catch. + i,row = next(enumrows) + try: + # If this fails... + extend(row) + except: + # ... try a version that converts the values to int first. + # Not only does this work for the (slightly broken) NumPy + # types, there are probably lots of other, unknown, "nearly" + # int types it works for. + def wrapmapint(f): + return lambda sl: f([int(x) for x in sl]) + extend = wrapmapint(extend) + del wrapmapint + extend(row) + + for i,row in enumrows: + # Add "None" filter type. Currently, it's essential that + # this filter type be used for every scanline as we do not + # mark the first row of a reduced pass image; that means we + # could accidentally compute the wrong filtered scanline if + # we used "up", "average", or "paeth" on such a line. + data.append(0) + extend(row) + if len(data) > self.chunk_limit: + compressed = compressor.compress(tostring(data)) + if len(compressed): + write_chunk(outfile, b'IDAT', compressed) + # Because of our very witty definition of ``extend``, + # above, we must re-use the same ``data`` object. Hence + # we use ``del`` to empty this one, rather than create a + # fresh one (which would be my natural FP instinct). + del data[:] + if len(data): + compressed = compressor.compress(tostring(data)) + else: + compressed = b'' + flushed = compressor.flush() + if len(compressed) or len(flushed): + write_chunk(outfile, b'IDAT', compressed + flushed) + # http://www.w3.org/TR/PNG/#11IEND + write_chunk(outfile, b'IEND') + return i+1 + + def write_array(self, outfile, pixels): + """ + Write an array in flat row flat pixel format as a PNG file on + the output file. See also :meth:`write` method. + """ + + if self.interlace: + self.write_passes(outfile, self.array_scanlines_interlace(pixels)) + else: + self.write_passes(outfile, self.array_scanlines(pixels)) + + def write_packed(self, outfile, rows): + """ + Write PNG file to `outfile`. The pixel data comes from `rows` + which should be in boxed row packed format. Each row should be + a sequence of packed bytes. + + Technically, this method does work for interlaced images but it + is best avoided. For interlaced images, the rows should be + presented in the order that they appear in the file. + + This method should not be used when the source image bit depth + is not one naturally supported by PNG; the bit depth should be + 1, 2, 4, 8, or 16. + """ + + if self.rescale: + raise Error("write_packed method not suitable for bit depth %d" % + self.rescale[0]) + return self.write_passes(outfile, rows, packed=True) + + def convert_pnm(self, infile, outfile): + """ + Convert a PNM file containing raw pixel data into a PNG file + with the parameters set in the writer object. Works for + (binary) PGM, PPM, and PAM formats. + """ + + if self.interlace: + pixels = array('B') + pixels.fromfile(infile, + (self.bitdepth/8) * self.color_planes * + self.width * self.height) + self.write_passes(outfile, self.array_scanlines_interlace(pixels)) + else: + self.write_passes(outfile, self.file_scanlines(infile)) + + def convert_ppm_and_pgm(self, ppmfile, pgmfile, outfile): + """ + Convert a PPM and PGM file containing raw pixel data into a + PNG outfile with the parameters set in the writer object. + """ + pixels = array('B') + pixels.fromfile(ppmfile, + (self.bitdepth/8) * self.color_planes * + self.width * self.height) + apixels = array('B') + apixels.fromfile(pgmfile, + (self.bitdepth/8) * + self.width * self.height) + pixels = interleave_planes(pixels, apixels, + (self.bitdepth/8) * self.color_planes, + (self.bitdepth/8)) + if self.interlace: + self.write_passes(outfile, self.array_scanlines_interlace(pixels)) + else: + self.write_passes(outfile, self.array_scanlines(pixels)) + + def file_scanlines(self, infile): + """ + Generates boxed rows in flat pixel format, from the input file + `infile`. It assumes that the input file is in a "Netpbm-like" + binary format, and is positioned at the beginning of the first + pixel. The number of pixels to read is taken from the image + dimensions (`width`, `height`, `planes`) and the number of bytes + per value is implied by the image `bitdepth`. + """ + + # Values per row + vpr = self.width * self.planes + row_bytes = vpr + if self.bitdepth > 8: + assert self.bitdepth == 16 + row_bytes *= 2 + fmt = '>%dH' % vpr + def line(): + return array('H', struct.unpack(fmt, infile.read(row_bytes))) + else: + def line(): + scanline = array('B', infile.read(row_bytes)) + return scanline + for y in range(self.height): + yield line() + + def array_scanlines(self, pixels): + """ + Generates boxed rows (flat pixels) from flat rows (flat pixels) + in an array. + """ + + # Values per row + vpr = self.width * self.planes + stop = 0 + for y in range(self.height): + start = stop + stop = start + vpr + yield pixels[start:stop] + + def array_scanlines_interlace(self, pixels): + """ + Generator for interlaced scanlines from an array. `pixels` is + the full source image in flat row flat pixel format. The + generator yields each scanline of the reduced passes in turn, in + boxed row flat pixel format. + """ + + # http://www.w3.org/TR/PNG/#8InterlaceMethods + # Array type. + fmt = 'BH'[self.bitdepth > 8] + # Value per row + vpr = self.width * self.planes + for xstart, ystart, xstep, ystep in _adam7: + if xstart >= self.width: + continue + # Pixels per row (of reduced image) + ppr = int(math.ceil((self.width-xstart)/float(xstep))) + # number of values in reduced image row. + row_len = ppr*self.planes + for y in range(ystart, self.height, ystep): + if xstep == 1: + offset = y * vpr + yield pixels[offset:offset+vpr] + else: + row = array(fmt) + # There's no easier way to set the length of an array + row.extend(pixels[0:row_len]) + offset = y * vpr + xstart * self.planes + end_offset = (y+1) * vpr + skip = self.planes * xstep + for i in range(self.planes): + row[i::self.planes] = \ + pixels[offset+i:end_offset:skip] + yield row + +def write_chunk(outfile, tag, data=b''): + """ + Write a PNG chunk to the output file, including length and + checksum. + """ + + # http://www.w3.org/TR/PNG/#5Chunk-layout + outfile.write(struct.pack("!I", len(data))) + outfile.write(tag) + outfile.write(data) + checksum = zlib.crc32(tag) + checksum = zlib.crc32(data, checksum) + checksum &= 2**32-1 + outfile.write(struct.pack("!I", checksum)) + +def write_chunks(out, chunks): + """Create a PNG file by writing out the chunks.""" + + out.write(_signature) + for chunk in chunks: + write_chunk(out, *chunk) + +def filter_scanline(type, line, fo, prev=None): + """Apply a scanline filter to a scanline. `type` specifies the + filter type (0 to 4); `line` specifies the current (unfiltered) + scanline as a sequence of bytes; `prev` specifies the previous + (unfiltered) scanline as a sequence of bytes. `fo` specifies the + filter offset; normally this is size of a pixel in bytes (the number + of bytes per sample times the number of channels), but when this is + < 1 (for bit depths < 8) then the filter offset is 1. + """ + + assert 0 <= type < 5 + + # The output array. Which, pathetically, we extend one-byte at a + # time (fortunately this is linear). + out = array('B', [type]) + + def sub(): + ai = -fo + for x in line: + if ai >= 0: + x = (x - line[ai]) & 0xff + out.append(x) + ai += 1 + def up(): + for i,x in enumerate(line): + x = (x - prev[i]) & 0xff + out.append(x) + def average(): + ai = -fo + for i,x in enumerate(line): + if ai >= 0: + x = (x - ((line[ai] + prev[i]) >> 1)) & 0xff + else: + x = (x - (prev[i] >> 1)) & 0xff + out.append(x) + ai += 1 + def paeth(): + # http://www.w3.org/TR/PNG/#9Filter-type-4-Paeth + ai = -fo # also used for ci + for i,x in enumerate(line): + a = 0 + b = prev[i] + c = 0 + + if ai >= 0: + a = line[ai] + c = prev[ai] + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + Pr = a + elif pb <= pc: + Pr = b + else: + Pr = c + + x = (x - Pr) & 0xff + out.append(x) + ai += 1 + + if not prev: + # We're on the first line. Some of the filters can be reduced + # to simpler cases which makes handling the line "off the top" + # of the image simpler. "up" becomes "none"; "paeth" becomes + # "left" (non-trivial, but true). "average" needs to be handled + # specially. + if type == 2: # "up" + type = 0 + elif type == 3: + prev = [0]*len(line) + elif type == 4: # "paeth" + type = 1 + if type == 0: + out.extend(line) + elif type == 1: + sub() + elif type == 2: + up() + elif type == 3: + average() + else: # type == 4 + paeth() + return out + + +def from_array(a, mode=None, info={}): + """Create a PNG :class:`Image` object from a 2- or 3-dimensional + array. One application of this function is easy PIL-style saving: + ``png.from_array(pixels, 'L').save('foo.png')``. + + Unless they are specified using the *info* parameter, the PNG's + height and width are taken from the array size. For a 3 dimensional + array the first axis is the height; the second axis is the width; + and the third axis is the channel number. Thus an RGB image that is + 16 pixels high and 8 wide will use an array that is 16x8x3. For 2 + dimensional arrays the first axis is the height, but the second axis + is ``width*channels``, so an RGB image that is 16 pixels high and 8 + wide will use a 2-dimensional array that is 16x24 (each row will be + 8*3 = 24 sample values). + + *mode* is a string that specifies the image colour format in a + PIL-style mode. It can be: + + ``'L'`` + greyscale (1 channel) + ``'LA'`` + greyscale with alpha (2 channel) + ``'RGB'`` + colour image (3 channel) + ``'RGBA'`` + colour image with alpha (4 channel) + + The mode string can also specify the bit depth (overriding how this + function normally derives the bit depth, see below). Appending + ``';16'`` to the mode will cause the PNG to be 16 bits per channel; + any decimal from 1 to 16 can be used to specify the bit depth. + + When a 2-dimensional array is used *mode* determines how many + channels the image has, and so allows the width to be derived from + the second array dimension. + + The array is expected to be a ``numpy`` array, but it can be any + suitable Python sequence. For example, a list of lists can be used: + ``png.from_array([[0, 255, 0], [255, 0, 255]], 'L')``. The exact + rules are: ``len(a)`` gives the first dimension, height; + ``len(a[0])`` gives the second dimension; ``len(a[0][0])`` gives the + third dimension, unless an exception is raised in which case a + 2-dimensional array is assumed. It's slightly more complicated than + that because an iterator of rows can be used, and it all still + works. Using an iterator allows data to be streamed efficiently. + + The bit depth of the PNG is normally taken from the array element's + datatype (but if *mode* specifies a bitdepth then that is used + instead). The array element's datatype is determined in a way which + is supposed to work both for ``numpy`` arrays and for Python + ``array.array`` objects. A 1 byte datatype will give a bit depth of + 8, a 2 byte datatype will give a bit depth of 16. If the datatype + does not have an implicit size, for example it is a plain Python + list of lists, as above, then a default of 8 is used. + + The *info* parameter is a dictionary that can be used to specify + metadata (in the same style as the arguments to the + :class:`png.Writer` class). For this function the keys that are + useful are: + + height + overrides the height derived from the array dimensions and allows + *a* to be an iterable. + width + overrides the width derived from the array dimensions. + bitdepth + overrides the bit depth derived from the element datatype (but + must match *mode* if that also specifies a bit depth). + + Generally anything specified in the + *info* dictionary will override any implicit choices that this + function would otherwise make, but must match any explicit ones. + For example, if the *info* dictionary has a ``greyscale`` key then + this must be true when mode is ``'L'`` or ``'LA'`` and false when + mode is ``'RGB'`` or ``'RGBA'``. + """ + + # We abuse the *info* parameter by modifying it. Take a copy here. + # (Also typechecks *info* to some extent). + info = dict(info) + + # Syntax check mode string. + bitdepth = None + try: + # Assign the 'L' or 'RGBA' part to `gotmode`. + if mode.startswith('L'): + gotmode = 'L' + mode = mode[1:] + elif mode.startswith('RGB'): + gotmode = 'RGB' + mode = mode[3:] + else: + raise Error() + if mode.startswith('A'): + gotmode += 'A' + mode = mode[1:] + + # Skip any optional ';' + while mode.startswith(';'): + mode = mode[1:] + + # Parse optional bitdepth + if mode: + try: + bitdepth = int(mode) + except (TypeError, ValueError): + raise Error() + except Error: + raise Error("mode string should be 'RGB' or 'L;16' or similar.") + mode = gotmode + + # Get bitdepth from *mode* if possible. + if bitdepth: + if info.get('bitdepth') and bitdepth != info['bitdepth']: + raise Error("mode bitdepth (%d) should match info bitdepth (%d)." % + (bitdepth, info['bitdepth'])) + info['bitdepth'] = bitdepth + + # Fill in and/or check entries in *info*. + # Dimensions. + if 'size' in info: + # Check width, height, size all match where used. + for dimension,axis in [('width', 0), ('height', 1)]: + if dimension in info: + if info[dimension] != info['size'][axis]: + raise Error( + "info[%r] should match info['size'][%r]." % + (dimension, axis)) + info['width'],info['height'] = info['size'] + if 'height' not in info: + try: + l = len(a) + except TypeError: + raise Error( + "len(a) does not work, supply info['height'] instead.") + info['height'] = l + # Colour format. + if 'greyscale' in info: + if bool(info['greyscale']) != ('L' in mode): + raise Error("info['greyscale'] should match mode.") + info['greyscale'] = 'L' in mode + if 'alpha' in info: + if bool(info['alpha']) != ('A' in mode): + raise Error("info['alpha'] should match mode.") + info['alpha'] = 'A' in mode + + planes = len(mode) + if 'planes' in info: + if info['planes'] != planes: + raise Error("info['planes'] should match mode.") + + # In order to work out whether we the array is 2D or 3D we need its + # first row, which requires that we take a copy of its iterator. + # We may also need the first row to derive width and bitdepth. + a,t = itertools.tee(a) + row = next(t) + del t + try: + row[0][0] + threed = True + testelement = row[0] + except (IndexError, TypeError): + threed = False + testelement = row + if 'width' not in info: + if threed: + width = len(row) + else: + width = len(row) // planes + info['width'] = width + + if threed: + # Flatten the threed rows + a = (itertools.chain.from_iterable(x) for x in a) + + if 'bitdepth' not in info: + try: + dtype = testelement.dtype + # goto the "else:" clause. Sorry. + except AttributeError: + try: + # Try a Python array.array. + bitdepth = 8 * testelement.itemsize + except AttributeError: + # We can't determine it from the array element's + # datatype, use a default of 8. + bitdepth = 8 + else: + # If we got here without exception, we now assume that + # the array is a numpy array. + if dtype.kind == 'b': + bitdepth = 1 + else: + bitdepth = 8 * dtype.itemsize + info['bitdepth'] = bitdepth + + for thing in 'width height bitdepth greyscale alpha'.split(): + assert thing in info + return Image(a, info) + +# So that refugee's from PIL feel more at home. Not documented. +fromarray = from_array + +class Image: + """A PNG image. You can create an :class:`Image` object from + an array of pixels by calling :meth:`png.from_array`. It can be + saved to disk with the :meth:`save` method. + """ + + def __init__(self, rows, info): + """ + .. note :: + + The constructor is not public. Please do not call it. + """ + + self.rows = rows + self.info = info + + def save(self, file): + """Save the image to *file*. If *file* looks like an open file + descriptor then it is used, otherwise it is treated as a + filename and a fresh file is opened. + + In general, you can only call this method once; after it has + been called the first time and the PNG image has been saved, the + source data will have been streamed, and cannot be streamed + again. + """ + + w = Writer(**self.info) + + try: + file.write + def close(): pass + except AttributeError: + file = open(file, 'wb') + def close(): file.close() + + try: + w.write(file, self.rows) + finally: + close() + +class _readable: + """ + A simple file-like interface for strings and arrays. + """ + + def __init__(self, buf): + self.buf = buf + self.offset = 0 + + def read(self, n): + r = self.buf[self.offset:self.offset+n] + if isarray(r): + r = r.tostring() + self.offset += n + return r + +try: + str(b'dummy', 'ascii') +except TypeError: + as_str = str +else: + def as_str(x): + return str(x, 'ascii') + +class Reader: + """ + PNG decoder in pure Python. + """ + + def __init__(self, _guess=None, **kw): + """ + Create a PNG decoder object. + + The constructor expects exactly one keyword argument. If you + supply a positional argument instead, it will guess the input + type. You can choose among the following keyword arguments: + + filename + Name of input file (a PNG file). + file + A file-like object (object with a read() method). + bytes + ``array`` or ``string`` with PNG data. + + """ + if ((_guess is not None and len(kw) != 0) or + (_guess is None and len(kw) != 1)): + raise TypeError("Reader() takes exactly 1 argument") + + # Will be the first 8 bytes, later on. See validate_signature. + self.signature = None + self.transparent = None + # A pair of (len,type) if a chunk has been read but its data and + # checksum have not (in other words the file position is just + # past the 4 bytes that specify the chunk type). See preamble + # method for how this is used. + self.atchunk = None + + if _guess is not None: + if isarray(_guess): + kw["bytes"] = _guess + elif isinstance(_guess, str): + kw["filename"] = _guess + elif hasattr(_guess, 'read'): + kw["file"] = _guess + + if "filename" in kw: + self.file = open(kw["filename"], "rb") + elif "file" in kw: + self.file = kw["file"] + elif "bytes" in kw: + self.file = _readable(kw["bytes"]) + else: + raise TypeError("expecting filename, file or bytes array") + + + def chunk(self, seek=None, lenient=False): + """ + Read the next PNG chunk from the input file; returns a + (*type*, *data*) tuple. *type* is the chunk's type as a + byte string (all PNG chunk types are 4 bytes long). + *data* is the chunk's data content, as a byte string. + + If the optional `seek` argument is + specified then it will keep reading chunks until it either runs + out of file or finds the type specified by the argument. Note + that in general the order of chunks in PNGs is unspecified, so + using `seek` can cause you to miss chunks. + + If the optional `lenient` argument evaluates to `True`, + checksum failures will raise warnings rather than exceptions. + """ + + self.validate_signature() + + while True: + # http://www.w3.org/TR/PNG/#5Chunk-layout + if not self.atchunk: + self.atchunk = self.chunklentype() + length, type = self.atchunk + self.atchunk = None + data = self.file.read(length) + if len(data) != length: + raise ChunkError('Chunk %s too short for required %i octets.' + % (type, length)) + checksum = self.file.read(4) + if len(checksum) != 4: + raise ChunkError('Chunk %s too short for checksum.' % type) + if seek and type != seek: + continue + verify = zlib.crc32(type) + verify = zlib.crc32(data, verify) + # Whether the output from zlib.crc32 is signed or not varies + # according to hideous implementation details, see + # http://bugs.python.org/issue1202 . + # We coerce it to be positive here (in a way which works on + # Python 2.3 and older). + verify &= 2**32 - 1 + verify = struct.pack('!I', verify) + if checksum != verify: + (a, ) = struct.unpack('!I', checksum) + (b, ) = struct.unpack('!I', verify) + message = "Checksum error in %s chunk: 0x%08X != 0x%08X." % (type, a, b) + if lenient: + warnings.warn(message, RuntimeWarning) + else: + raise ChunkError(message) + return type, data + + def chunks(self): + """Return an iterator that will yield each chunk as a + (*chunktype*, *content*) pair. + """ + + while True: + t,v = self.chunk() + yield t,v + if t == b'IEND': + break + + def undo_filter(self, filter_type, scanline, previous): + """Undo the filter for a scanline. `scanline` is a sequence of + bytes that does not include the initial filter type byte. + `previous` is decoded previous scanline (for straightlaced + images this is the previous pixel row, but for interlaced + images, it is the previous scanline in the reduced image, which + in general is not the previous pixel row in the final image). + When there is no previous scanline (the first row of a + straightlaced image, or the first row in one of the passes in an + interlaced image), then this argument should be ``None``. + + The scanline will have the effects of filtering removed, and the + result will be returned as a fresh sequence of bytes. + """ + + # :todo: Would it be better to update scanline in place? + # Yes, with the Cython extension making the undo_filter fast, + # updating scanline inplace makes the code 3 times faster + # (reading 50 images of 800x800 went from 40s to 16s) + result = scanline + + if filter_type == 0: + return result + + if filter_type not in (1,2,3,4): + raise FormatError('Invalid PNG Filter Type.' + ' See http://www.w3.org/TR/2003/REC-PNG-20031110/#9Filters .') + + # Filter unit. The stride from one pixel to the corresponding + # byte from the previous pixel. Normally this is the pixel + # size in bytes, but when this is smaller than 1, the previous + # byte is used instead. + fu = max(1, self.psize) + + # For the first line of a pass, synthesize a dummy previous + # line. An alternative approach would be to observe that on the + # first line 'up' is the same as 'null', 'paeth' is the same + # as 'sub', with only 'average' requiring any special case. + if not previous: + previous = array('B', [0]*len(scanline)) + + def sub(): + """Undo sub filter.""" + + ai = 0 + # Loop starts at index fu. Observe that the initial part + # of the result is already filled in correctly with + # scanline. + for i in range(fu, len(result)): + x = scanline[i] + a = result[ai] + result[i] = (x + a) & 0xff + ai += 1 + + def up(): + """Undo up filter.""" + + for i in range(len(result)): + x = scanline[i] + b = previous[i] + result[i] = (x + b) & 0xff + + def average(): + """Undo average filter.""" + + ai = -fu + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = 0 + else: + a = result[ai] + b = previous[i] + result[i] = (x + ((a + b) >> 1)) & 0xff + ai += 1 + + def paeth(): + """Undo Paeth filter.""" + + # Also used for ci. + ai = -fu + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = c = 0 + else: + a = result[ai] + c = previous[ai] + b = previous[i] + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + pr = a + elif pb <= pc: + pr = b + else: + pr = c + result[i] = (x + pr) & 0xff + ai += 1 + + # Call appropriate filter algorithm. Note that 0 has already + # been dealt with. + (None, + pngfilters.undo_filter_sub, + pngfilters.undo_filter_up, + pngfilters.undo_filter_average, + pngfilters.undo_filter_paeth)[filter_type](fu, scanline, previous, result) + return result + + def deinterlace(self, raw): + """ + Read raw pixel data, undo filters, deinterlace, and flatten. + Return in flat row flat pixel format. + """ + + # Values per row (of the target image) + vpr = self.width * self.planes + + # Make a result array, and make it big enough. Interleaving + # writes to the output array randomly (well, not quite), so the + # entire output array must be in memory. + fmt = 'BH'[self.bitdepth > 8] + a = array(fmt, [0]*vpr*self.height) + source_offset = 0 + + for xstart, ystart, xstep, ystep in _adam7: + if xstart >= self.width: + continue + # The previous (reconstructed) scanline. None at the + # beginning of a pass to indicate that there is no previous + # line. + recon = None + # Pixels per row (reduced pass image) + ppr = int(math.ceil((self.width-xstart)/float(xstep))) + # Row size in bytes for this pass. + row_size = int(math.ceil(self.psize * ppr)) + for y in range(ystart, self.height, ystep): + filter_type = raw[source_offset] + source_offset += 1 + scanline = raw[source_offset:source_offset+row_size] + source_offset += row_size + recon = self.undo_filter(filter_type, scanline, recon) + # Convert so that there is one element per pixel value + flat = self.serialtoflat(recon, ppr) + if xstep == 1: + assert xstart == 0 + offset = y * vpr + a[offset:offset+vpr] = flat + else: + offset = y * vpr + xstart * self.planes + end_offset = (y+1) * vpr + skip = self.planes * xstep + for i in range(self.planes): + a[offset+i:end_offset:skip] = \ + flat[i::self.planes] + return a + + def iterboxed(self, rows): + """Iterator that yields each scanline in boxed row flat pixel + format. `rows` should be an iterator that yields the bytes of + each row in turn. + """ + + def asvalues(raw): + """Convert a row of raw bytes into a flat row. Result will + be a freshly allocated object, not shared with + argument. + """ + + if self.bitdepth == 8: + return array('B', raw) + if self.bitdepth == 16: + raw = tostring(raw) + return array('H', struct.unpack('!%dH' % (len(raw)//2), raw)) + assert self.bitdepth < 8 + width = self.width + # Samples per byte + spb = 8//self.bitdepth + out = array('B') + mask = 2**self.bitdepth - 1 + shifts = [self.bitdepth * i + for i in reversed(list(range(spb)))] + for o in raw: + out.extend([mask&(o>>i) for i in shifts]) + return out[:width] + + return map(asvalues, rows) + + def serialtoflat(self, bytes, width=None): + """Convert serial format (byte stream) pixel data to flat row + flat pixel. + """ + + if self.bitdepth == 8: + return bytes + if self.bitdepth == 16: + bytes = tostring(bytes) + return array('H', + struct.unpack('!%dH' % (len(bytes)//2), bytes)) + assert self.bitdepth < 8 + if width is None: + width = self.width + # Samples per byte + spb = 8//self.bitdepth + out = array('B') + mask = 2**self.bitdepth - 1 + shifts = list(map(self.bitdepth.__mul__, reversed(list(range(spb))))) + l = width + for o in bytes: + out.extend([(mask&(o>>s)) for s in shifts][:l]) + l -= spb + if l <= 0: + l = width + return out + + def iterstraight(self, raw): + """Iterator that undoes the effect of filtering, and yields + each row in serialised format (as a sequence of bytes). + Assumes input is straightlaced. `raw` should be an iterable + that yields the raw bytes in chunks of arbitrary size. + """ + + # length of row, in bytes + rb = self.row_bytes + a = array('B') + # The previous (reconstructed) scanline. None indicates first + # line of image. + recon = None + for some in raw: + a.extend(some) + while len(a) >= rb + 1: + filter_type = a[0] + scanline = a[1:rb+1] + del a[:rb+1] + recon = self.undo_filter(filter_type, scanline, recon) + yield recon + if len(a) != 0: + # :file:format We get here with a file format error: + # when the available bytes (after decompressing) do not + # pack into exact rows. + raise FormatError( + 'Wrong size for decompressed IDAT chunk.') + assert len(a) == 0 + + def validate_signature(self): + """If signature (header) has not been read then read and + validate it; otherwise do nothing. + """ + + if self.signature: + return + self.signature = self.file.read(8) + if self.signature != _signature: + raise FormatError("PNG file has invalid signature.") + + def preamble(self, lenient=False): + """ + Extract the image metadata by reading the initial part of + the PNG file up to the start of the ``IDAT`` chunk. All the + chunks that precede the ``IDAT`` chunk are read and either + processed for metadata or discarded. + + If the optional `lenient` argument evaluates to `True`, checksum + failures will raise warnings rather than exceptions. + """ + + self.validate_signature() + + while True: + if not self.atchunk: + self.atchunk = self.chunklentype() + if self.atchunk is None: + raise FormatError( + 'This PNG file has no IDAT chunks.') + if self.atchunk[1] == b'IDAT': + return + self.process_chunk(lenient=lenient) + + def chunklentype(self): + """Reads just enough of the input to determine the next + chunk's length and type, returned as a (*length*, *type*) pair + where *type* is a string. If there are no more chunks, ``None`` + is returned. + """ + + x = self.file.read(8) + if not x: + return None + if len(x) != 8: + raise FormatError( + 'End of file whilst reading chunk length and type.') + length,type = struct.unpack('!I4s', x) + if length > 2**31-1: + raise FormatError('Chunk %s is too large: %d.' % (type,length)) + return length,type + + def process_chunk(self, lenient=False): + """Process the next chunk and its data. This only processes the + following chunk types, all others are ignored: ``IHDR``, + ``PLTE``, ``bKGD``, ``tRNS``, ``gAMA``, ``sBIT``, ``pHYs``. + + If the optional `lenient` argument evaluates to `True`, + checksum failures will raise warnings rather than exceptions. + """ + + type, data = self.chunk(lenient=lenient) + method = '_process_' + as_str(type) + m = getattr(self, method, None) + if m: + m(data) + + def _process_IHDR(self, data): + # http://www.w3.org/TR/PNG/#11IHDR + if len(data) != 13: + raise FormatError('IHDR chunk has incorrect length.') + (self.width, self.height, self.bitdepth, self.color_type, + self.compression, self.filter, + self.interlace) = struct.unpack("!2I5B", data) + + check_bitdepth_colortype(self.bitdepth, self.color_type) + + if self.compression != 0: + raise Error("unknown compression method %d" % self.compression) + if self.filter != 0: + raise FormatError("Unknown filter method %d," + " see http://www.w3.org/TR/2003/REC-PNG-20031110/#9Filters ." + % self.filter) + if self.interlace not in (0,1): + raise FormatError("Unknown interlace method %d," + " see http://www.w3.org/TR/2003/REC-PNG-20031110/#8InterlaceMethods ." + % self.interlace) + + # Derived values + # http://www.w3.org/TR/PNG/#6Colour-values + colormap = bool(self.color_type & 1) + greyscale = not (self.color_type & 2) + alpha = bool(self.color_type & 4) + color_planes = (3,1)[greyscale or colormap] + planes = color_planes + alpha + + self.colormap = colormap + self.greyscale = greyscale + self.alpha = alpha + self.color_planes = color_planes + self.planes = planes + self.psize = float(self.bitdepth)/float(8) * planes + if int(self.psize) == self.psize: + self.psize = int(self.psize) + self.row_bytes = int(math.ceil(self.width * self.psize)) + # Stores PLTE chunk if present, and is used to check + # chunk ordering constraints. + self.plte = None + # Stores tRNS chunk if present, and is used to check chunk + # ordering constraints. + self.trns = None + # Stores sbit chunk if present. + self.sbit = None + + def _process_PLTE(self, data): + # http://www.w3.org/TR/PNG/#11PLTE + if self.plte: + warnings.warn("Multiple PLTE chunks present.") + self.plte = data + if len(data) % 3 != 0: + raise FormatError( + "PLTE chunk's length should be a multiple of 3.") + if len(data) > (2**self.bitdepth)*3: + raise FormatError("PLTE chunk is too long.") + if len(data) == 0: + raise FormatError("Empty PLTE is not allowed.") + + def _process_bKGD(self, data): + try: + if self.colormap: + if not self.plte: + warnings.warn( + "PLTE chunk is required before bKGD chunk.") + self.background = struct.unpack('B', data) + else: + self.background = struct.unpack("!%dH" % self.color_planes, + data) + except struct.error: + raise FormatError("bKGD chunk has incorrect length.") + + def _process_tRNS(self, data): + # http://www.w3.org/TR/PNG/#11tRNS + self.trns = data + if self.colormap: + if not self.plte: + warnings.warn("PLTE chunk is required before tRNS chunk.") + else: + if len(data) > len(self.plte)/3: + # Was warning, but promoted to Error as it + # would otherwise cause pain later on. + raise FormatError("tRNS chunk is too long.") + else: + if self.alpha: + raise FormatError( + "tRNS chunk is not valid with colour type %d." % + self.color_type) + try: + self.transparent = \ + struct.unpack("!%dH" % self.color_planes, data) + except struct.error: + raise FormatError("tRNS chunk has incorrect length.") + + def _process_gAMA(self, data): + try: + self.gamma = struct.unpack("!L", data)[0] / 100000.0 + except struct.error: + raise FormatError("gAMA chunk has incorrect length.") + + def _process_sBIT(self, data): + self.sbit = data + if (self.colormap and len(data) != 3 or + not self.colormap and len(data) != self.planes): + raise FormatError("sBIT chunk has incorrect length.") + + def _process_pHYs(self, data): + # http://www.w3.org/TR/PNG/#11pHYs + self.phys = data + fmt = "!LLB" + if len(data) != struct.calcsize(fmt): + raise FormatError("pHYs chunk has incorrect length.") + self.x_pixels_per_unit, self.y_pixels_per_unit, unit = struct.unpack(fmt,data) + self.unit_is_meter = bool(unit) + + def read(self, lenient=False): + """ + Read the PNG file and decode it. Returns (`width`, `height`, + `pixels`, `metadata`). + + May use excessive memory. + + `pixels` are returned in boxed row flat pixel format. + + If the optional `lenient` argument evaluates to True, + checksum failures will raise warnings rather than exceptions. + """ + + def iteridat(): + """Iterator that yields all the ``IDAT`` chunks as strings.""" + while True: + try: + type, data = self.chunk(lenient=lenient) + except ValueError as e: + raise ChunkError(e.args[0]) + if type == b'IEND': + # http://www.w3.org/TR/PNG/#11IEND + break + if type != b'IDAT': + continue + # type == b'IDAT' + # http://www.w3.org/TR/PNG/#11IDAT + if self.colormap and not self.plte: + warnings.warn("PLTE chunk is required before IDAT chunk") + yield data + + def iterdecomp(idat): + """Iterator that yields decompressed strings. `idat` should + be an iterator that yields the ``IDAT`` chunk data. + """ + + # Currently, with no max_length parameter to decompress, + # this routine will do one yield per IDAT chunk: Not very + # incremental. + d = zlib.decompressobj() + # Each IDAT chunk is passed to the decompressor, then any + # remaining state is decompressed out. + for data in idat: + # :todo: add a max_length argument here to limit output + # size. + yield array('B', d.decompress(data)) + yield array('B', d.flush()) + + self.preamble(lenient=lenient) + raw = iterdecomp(iteridat()) + + if self.interlace: + raw = array('B', itertools.chain(*raw)) + arraycode = 'BH'[self.bitdepth>8] + # Like :meth:`group` but producing an array.array object for + # each row. + pixels = map(lambda *row: array(arraycode, row), + *[iter(self.deinterlace(raw))]*self.width*self.planes) + else: + pixels = self.iterboxed(self.iterstraight(raw)) + meta = dict() + for attr in 'greyscale alpha planes bitdepth interlace'.split(): + meta[attr] = getattr(self, attr) + meta['size'] = (self.width, self.height) + for attr in 'gamma transparent background'.split(): + a = getattr(self, attr, None) + if a is not None: + meta[attr] = a + if self.plte: + meta['palette'] = self.palette() + return self.width, self.height, pixels, meta + + + def read_flat(self): + """ + Read a PNG file and decode it into flat row flat pixel format. + Returns (*width*, *height*, *pixels*, *metadata*). + + May use excessive memory. + + `pixels` are returned in flat row flat pixel format. + + See also the :meth:`read` method which returns pixels in the + more stream-friendly boxed row flat pixel format. + """ + + x, y, pixel, meta = self.read() + arraycode = 'BH'[meta['bitdepth']>8] + pixel = array(arraycode, itertools.chain(*pixel)) + return x, y, pixel, meta + + def palette(self, alpha='natural'): + """Returns a palette that is a sequence of 3-tuples or 4-tuples, + synthesizing it from the ``PLTE`` and ``tRNS`` chunks. These + chunks should have already been processed (for example, by + calling the :meth:`preamble` method). All the tuples are the + same size: 3-tuples if there is no ``tRNS`` chunk, 4-tuples when + there is a ``tRNS`` chunk. Assumes that the image is colour type + 3 and therefore a ``PLTE`` chunk is required. + + If the `alpha` argument is ``'force'`` then an alpha channel is + always added, forcing the result to be a sequence of 4-tuples. + """ + + if not self.plte: + raise FormatError( + "Required PLTE chunk is missing in colour type 3 image.") + plte = group(array('B', self.plte), 3) + if self.trns or alpha == 'force': + trns = array('B', self.trns or '') + trns.extend([255]*(len(plte)-len(trns))) + plte = list(map(operator.add, plte, group(trns, 1))) + return plte + + def asDirect(self): + """Returns the image data as a direct representation of an + ``x * y * planes`` array. This method is intended to remove the + need for callers to deal with palettes and transparency + themselves. Images with a palette (colour type 3) + are converted to RGB or RGBA; images with transparency (a + ``tRNS`` chunk) are converted to LA or RGBA as appropriate. + When returned in this format the pixel values represent the + colour value directly without needing to refer to palettes or + transparency information. + + Like the :meth:`read` method this method returns a 4-tuple: + + (*width*, *height*, *pixels*, *meta*) + + This method normally returns pixel values with the bit depth + they have in the source image, but when the source PNG has an + ``sBIT`` chunk it is inspected and can reduce the bit depth of + the result pixels; pixel values will be reduced according to + the bit depth specified in the ``sBIT`` chunk (PNG nerds should + note a single result bit depth is used for all channels; the + maximum of the ones specified in the ``sBIT`` chunk. An RGB565 + image will be rescaled to 6-bit RGB666). + + The *meta* dictionary that is returned reflects the `direct` + format and not the original source image. For example, an RGB + source image with a ``tRNS`` chunk to represent a transparent + colour, will have ``planes=3`` and ``alpha=False`` for the + source image, but the *meta* dictionary returned by this method + will have ``planes=4`` and ``alpha=True`` because an alpha + channel is synthesized and added. + + *pixels* is the pixel data in boxed row flat pixel format (just + like the :meth:`read` method). + + All the other aspects of the image data are not changed. + """ + + self.preamble() + + # Simple case, no conversion necessary. + if not self.colormap and not self.trns and not self.sbit: + return self.read() + + x,y,pixels,meta = self.read() + + if self.colormap: + meta['colormap'] = False + meta['alpha'] = bool(self.trns) + meta['bitdepth'] = 8 + meta['planes'] = 3 + bool(self.trns) + plte = self.palette() + def iterpal(pixels): + for row in pixels: + row = [plte[x] for x in row] + yield array('B', itertools.chain(*row)) + pixels = iterpal(pixels) + elif self.trns: + # It would be nice if there was some reasonable way + # of doing this without generating a whole load of + # intermediate tuples. But tuples does seem like the + # easiest way, with no other way clearly much simpler or + # much faster. (Actually, the L to LA conversion could + # perhaps go faster (all those 1-tuples!), but I still + # wonder whether the code proliferation is worth it) + it = self.transparent + maxval = 2**meta['bitdepth']-1 + planes = meta['planes'] + meta['alpha'] = True + meta['planes'] += 1 + typecode = 'BH'[meta['bitdepth']>8] + def itertrns(pixels): + for row in pixels: + # For each row we group it into pixels, then form a + # characterisation vector that says whether each + # pixel is opaque or not. Then we convert + # True/False to 0/maxval (by multiplication), + # and add it as the extra channel. + row = group(row, planes) + opa = map(it.__ne__, row) + opa = map(maxval.__mul__, opa) + opa = list(zip(opa)) # convert to 1-tuples + yield array(typecode, + itertools.chain(*map(operator.add, row, opa))) + pixels = itertrns(pixels) + targetbitdepth = None + if self.sbit: + sbit = struct.unpack('%dB' % len(self.sbit), self.sbit) + targetbitdepth = max(sbit) + if targetbitdepth > meta['bitdepth']: + raise Error('sBIT chunk %r exceeds bitdepth %d' % + (sbit,self.bitdepth)) + if min(sbit) <= 0: + raise Error('sBIT chunk %r has a 0-entry' % sbit) + if targetbitdepth == meta['bitdepth']: + targetbitdepth = None + if targetbitdepth: + shift = meta['bitdepth'] - targetbitdepth + meta['bitdepth'] = targetbitdepth + def itershift(pixels): + for row in pixels: + yield [p >> shift for p in row] + pixels = itershift(pixels) + return x,y,pixels,meta + + def asFloat(self, maxval=1.0): + """Return image pixels as per :meth:`asDirect` method, but scale + all pixel values to be floating point values between 0.0 and + *maxval*. + """ + + x,y,pixels,info = self.asDirect() + sourcemaxval = 2**info['bitdepth']-1 + del info['bitdepth'] + info['maxval'] = float(maxval) + factor = float(maxval)/float(sourcemaxval) + def iterfloat(): + for row in pixels: + yield [factor * p for p in row] + return x,y,iterfloat(),info + + def _as_rescale(self, get, targetbitdepth): + """Helper used by :meth:`asRGB8` and :meth:`asRGBA8`.""" + + width,height,pixels,meta = get() + maxval = 2**meta['bitdepth'] - 1 + targetmaxval = 2**targetbitdepth - 1 + factor = float(targetmaxval) / float(maxval) + meta['bitdepth'] = targetbitdepth + def iterscale(): + for row in pixels: + yield [int(round(x*factor)) for x in row] + if maxval == targetmaxval: + return width, height, pixels, meta + else: + return width, height, iterscale(), meta + + def asRGB8(self): + """Return the image data as an RGB pixels with 8-bits per + sample. This is like the :meth:`asRGB` method except that + this method additionally rescales the values so that they + are all between 0 and 255 (8-bit). In the case where the + source image has a bit depth < 8 the transformation preserves + all the information; where the source image has bit depth + > 8, then rescaling to 8-bit values loses precision. No + dithering is performed. Like :meth:`asRGB`, an alpha channel + in the source image will raise an exception. + + This function returns a 4-tuple: + (*width*, *height*, *pixels*, *metadata*). + *width*, *height*, *metadata* are as per the + :meth:`read` method. + + *pixels* is the pixel data in boxed row flat pixel format. + """ + + return self._as_rescale(self.asRGB, 8) + + def asRGBA8(self): + """Return the image data as RGBA pixels with 8-bits per + sample. This method is similar to :meth:`asRGB8` and + :meth:`asRGBA`: The result pixels have an alpha channel, *and* + values are rescaled to the range 0 to 255. The alpha channel is + synthesized if necessary (with a small speed penalty). + """ + + return self._as_rescale(self.asRGBA, 8) + + def asRGB(self): + """Return image as RGB pixels. RGB colour images are passed + through unchanged; greyscales are expanded into RGB + triplets (there is a small speed overhead for doing this). + + An alpha channel in the source image will raise an + exception. + + The return values are as for the :meth:`read` method + except that the *metadata* reflect the returned pixels, not the + source image. In particular, for this method + ``metadata['greyscale']`` will be ``False``. + """ + + width,height,pixels,meta = self.asDirect() + if meta['alpha']: + raise Error("will not convert image with alpha channel to RGB") + if not meta['greyscale']: + return width,height,pixels,meta + meta['greyscale'] = False + typecode = 'BH'[meta['bitdepth'] > 8] + def iterrgb(): + for row in pixels: + a = array(typecode, [0]) * 3 * width + for i in range(3): + a[i::3] = row + yield a + return width,height,iterrgb(),meta + + def asRGBA(self): + """Return image as RGBA pixels. Greyscales are expanded into + RGB triplets; an alpha channel is synthesized if necessary. + The return values are as for the :meth:`read` method + except that the *metadata* reflect the returned pixels, not the + source image. In particular, for this method + ``metadata['greyscale']`` will be ``False``, and + ``metadata['alpha']`` will be ``True``. + """ + + width,height,pixels,meta = self.asDirect() + if meta['alpha'] and not meta['greyscale']: + return width,height,pixels,meta + typecode = 'BH'[meta['bitdepth'] > 8] + maxval = 2**meta['bitdepth'] - 1 + maxbuffer = struct.pack('=' + typecode, maxval) * 4 * width + def newarray(): + return array(typecode, maxbuffer) + + if meta['alpha'] and meta['greyscale']: + # LA to RGBA + def convert(): + for row in pixels: + # Create a fresh target row, then copy L channel + # into first three target channels, and A channel + # into fourth channel. + a = newarray() + pngfilters.convert_la_to_rgba(row, a) + yield a + elif meta['greyscale']: + # L to RGBA + def convert(): + for row in pixels: + a = newarray() + pngfilters.convert_l_to_rgba(row, a) + yield a + else: + assert not meta['alpha'] and not meta['greyscale'] + # RGB to RGBA + def convert(): + for row in pixels: + a = newarray() + pngfilters.convert_rgb_to_rgba(row, a) + yield a + meta['alpha'] = True + meta['greyscale'] = False + return width,height,convert(),meta + +def check_bitdepth_colortype(bitdepth, colortype): + """Check that `bitdepth` and `colortype` are both valid, + and specified in a valid combination. Returns if valid, + raise an Exception if not valid. + """ + + if bitdepth not in (1,2,4,8,16): + raise FormatError("invalid bit depth %d" % bitdepth) + if colortype not in (0,2,3,4,6): + raise FormatError("invalid colour type %d" % colortype) + # Check indexed (palettized) images have 8 or fewer bits + # per pixel; check only indexed or greyscale images have + # fewer than 8 bits per pixel. + if colortype & 1 and bitdepth > 8: + raise FormatError( + "Indexed images (colour type %d) cannot" + " have bitdepth > 8 (bit depth %d)." + " See http://www.w3.org/TR/2003/REC-PNG-20031110/#table111 ." + % (bitdepth, colortype)) + if bitdepth < 8 and colortype not in (0,3): + raise FormatError("Illegal combination of bit depth (%d)" + " and colour type (%d)." + " See http://www.w3.org/TR/2003/REC-PNG-20031110/#table111 ." + % (bitdepth, colortype)) + +def isinteger(x): + try: + return int(x) == x + except (TypeError, ValueError): + return False + + +# === Support for users without Cython === + +try: + pngfilters +except NameError: + class pngfilters(object): + def undo_filter_sub(filter_unit, scanline, previous, result): + """Undo sub filter.""" + + ai = 0 + # Loops starts at index fu. Observe that the initial part + # of the result is already filled in correctly with + # scanline. + for i in range(filter_unit, len(result)): + x = scanline[i] + a = result[ai] + result[i] = (x + a) & 0xff + ai += 1 + undo_filter_sub = staticmethod(undo_filter_sub) + + def undo_filter_up(filter_unit, scanline, previous, result): + """Undo up filter.""" + + for i in range(len(result)): + x = scanline[i] + b = previous[i] + result[i] = (x + b) & 0xff + undo_filter_up = staticmethod(undo_filter_up) + + def undo_filter_average(filter_unit, scanline, previous, result): + """Undo up filter.""" + + ai = -filter_unit + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = 0 + else: + a = result[ai] + b = previous[i] + result[i] = (x + ((a + b) >> 1)) & 0xff + ai += 1 + undo_filter_average = staticmethod(undo_filter_average) + + def undo_filter_paeth(filter_unit, scanline, previous, result): + """Undo Paeth filter.""" + + # Also used for ci. + ai = -filter_unit + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = c = 0 + else: + a = result[ai] + c = previous[ai] + b = previous[i] + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + pr = a + elif pb <= pc: + pr = b + else: + pr = c + result[i] = (x + pr) & 0xff + ai += 1 + undo_filter_paeth = staticmethod(undo_filter_paeth) + + def convert_la_to_rgba(row, result): + for i in range(3): + result[i::4] = row[0::2] + result[3::4] = row[1::2] + convert_la_to_rgba = staticmethod(convert_la_to_rgba) + + def convert_l_to_rgba(row, result): + """Convert a grayscale image to RGBA. This method assumes + the alpha channel in result is already correctly + initialized. + """ + for i in range(3): + result[i::4] = row + convert_l_to_rgba = staticmethod(convert_l_to_rgba) + + def convert_rgb_to_rgba(row, result): + """Convert an RGB image to RGBA. This method assumes the + alpha channel in result is already correctly initialized. + """ + for i in range(3): + result[i::4] = row[i::3] + convert_rgb_to_rgba = staticmethod(convert_rgb_to_rgba) + + +# === Command Line Support === + +def read_pam_header(infile): + """ + Read (the rest of a) PAM header. `infile` should be positioned + immediately after the initial 'P7' line (at the beginning of the + second line). Returns are as for `read_pnm_header`. + """ + + # Unlike PBM, PGM, and PPM, we can read the header a line at a time. + header = dict() + while True: + l = infile.readline().strip() + if l == b'ENDHDR': + break + if not l: + raise EOFError('PAM ended prematurely') + if l[0] == b'#': + continue + l = l.split(None, 1) + if l[0] not in header: + header[l[0]] = l[1] + else: + header[l[0]] += b' ' + l[1] + + required = [b'WIDTH', b'HEIGHT', b'DEPTH', b'MAXVAL'] + WIDTH,HEIGHT,DEPTH,MAXVAL = required + present = [x for x in required if x in header] + if len(present) != len(required): + raise Error('PAM file must specify WIDTH, HEIGHT, DEPTH, and MAXVAL') + width = int(header[WIDTH]) + height = int(header[HEIGHT]) + depth = int(header[DEPTH]) + maxval = int(header[MAXVAL]) + if (width <= 0 or + height <= 0 or + depth <= 0 or + maxval <= 0): + raise Error( + 'WIDTH, HEIGHT, DEPTH, MAXVAL must all be positive integers') + return 'P7', width, height, depth, maxval + +def read_pnm_header(infile, supported=(b'P5', b'P6')): + """ + Read a PNM header, returning (format,width,height,depth,maxval). + `width` and `height` are in pixels. `depth` is the number of + channels in the image; for PBM and PGM it is synthesized as 1, for + PPM as 3; for PAM images it is read from the header. `maxval` is + synthesized (as 1) for PBM images. + """ + + # Generally, see http://netpbm.sourceforge.net/doc/ppm.html + # and http://netpbm.sourceforge.net/doc/pam.html + + # Technically 'P7' must be followed by a newline, so by using + # rstrip() we are being liberal in what we accept. I think this + # is acceptable. + type = infile.read(3).rstrip() + if type not in supported: + raise NotImplementedError('file format %s not supported' % type) + if type == b'P7': + # PAM header parsing is completely different. + return read_pam_header(infile) + # Expected number of tokens in header (3 for P4, 4 for P6) + expected = 4 + pbm = (b'P1', b'P4') + if type in pbm: + expected = 3 + header = [type] + + # We have to read the rest of the header byte by byte because the + # final whitespace character (immediately following the MAXVAL in + # the case of P6) may not be a newline. Of course all PNM files in + # the wild use a newline at this point, so it's tempting to use + # readline; but it would be wrong. + def getc(): + c = infile.read(1) + if not c: + raise Error('premature EOF reading PNM header') + return c + + c = getc() + while True: + # Skip whitespace that precedes a token. + while c.isspace(): + c = getc() + # Skip comments. + while c == '#': + while c not in b'\n\r': + c = getc() + if not c.isdigit(): + raise Error('unexpected character %s found in header' % c) + # According to the specification it is legal to have comments + # that appear in the middle of a token. + # This is bonkers; I've never seen it; and it's a bit awkward to + # code good lexers in Python (no goto). So we break on such + # cases. + token = b'' + while c.isdigit(): + token += c + c = getc() + # Slight hack. All "tokens" are decimal integers, so convert + # them here. + header.append(int(token)) + if len(header) == expected: + break + # Skip comments (again) + while c == '#': + while c not in '\n\r': + c = getc() + if not c.isspace(): + raise Error('expected header to end with whitespace, not %s' % c) + + if type in pbm: + # synthesize a MAXVAL + header.append(1) + depth = (1,3)[type == b'P6'] + return header[0], header[1], header[2], depth, header[3] + +def write_pnm(file, width, height, pixels, meta): + """Write a Netpbm PNM/PAM file. + """ + + bitdepth = meta['bitdepth'] + maxval = 2**bitdepth - 1 + # Rudely, the number of image planes can be used to determine + # whether we are L (PGM), LA (PAM), RGB (PPM), or RGBA (PAM). + planes = meta['planes'] + # Can be an assert as long as we assume that pixels and meta came + # from a PNG file. + assert planes in (1,2,3,4) + if planes in (1,3): + if 1 == planes: + # PGM + # Could generate PBM if maxval is 1, but we don't (for one + # thing, we'd have to convert the data, not just blat it + # out). + fmt = 'P5' + else: + # PPM + fmt = 'P6' + header = '%s %d %d %d\n' % (fmt, width, height, maxval) + if planes in (2,4): + # PAM + # See http://netpbm.sourceforge.net/doc/pam.html + if 2 == planes: + tupltype = 'GRAYSCALE_ALPHA' + else: + tupltype = 'RGB_ALPHA' + header = ('P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\n' + 'TUPLTYPE %s\nENDHDR\n' % + (width, height, planes, maxval, tupltype)) + file.write(header.encode('ascii')) + # Values per row + vpr = planes * width + # struct format + fmt = '>%d' % vpr + if maxval > 0xff: + fmt = fmt + 'H' + else: + fmt = fmt + 'B' + for row in pixels: + file.write(struct.pack(fmt, *row)) + file.flush() + +def color_triple(color): + """ + Convert a command line colour value to a RGB triple of integers. + FIXME: Somewhere we need support for greyscale backgrounds etc. + """ + if color.startswith('#') and len(color) == 4: + return (int(color[1], 16), + int(color[2], 16), + int(color[3], 16)) + if color.startswith('#') and len(color) == 7: + return (int(color[1:3], 16), + int(color[3:5], 16), + int(color[5:7], 16)) + elif color.startswith('#') and len(color) == 13: + return (int(color[1:5], 16), + int(color[5:9], 16), + int(color[9:13], 16)) + +def _add_common_options(parser): + """Call *parser.add_option* for each of the options that are + common between this PNG--PNM conversion tool and the gen + tool. + """ + parser.add_option("-i", "--interlace", + default=False, action="store_true", + help="create an interlaced PNG file (Adam7)") + parser.add_option("-t", "--transparent", + action="store", type="string", metavar="#RRGGBB", + help="mark the specified colour as transparent") + parser.add_option("-b", "--background", + action="store", type="string", metavar="#RRGGBB", + help="save the specified background colour") + parser.add_option("-g", "--gamma", + action="store", type="float", metavar="value", + help="save the specified gamma value") + parser.add_option("-c", "--compression", + action="store", type="int", metavar="level", + help="zlib compression level (0-9)") + return parser + +def _main(argv): + """ + Run the PNG encoder with options from the command line. + """ + + # Parse command line arguments + from optparse import OptionParser + version = '%prog ' + __version__ + parser = OptionParser(version=version) + parser.set_usage("%prog [options] [imagefile]") + parser.add_option('-r', '--read-png', default=False, + action='store_true', + help='Read PNG, write PNM') + parser.add_option("-a", "--alpha", + action="store", type="string", metavar="pgmfile", + help="alpha channel transparency (RGBA)") + _add_common_options(parser) + + (options, args) = parser.parse_args(args=argv[1:]) + + # Convert options + if options.transparent is not None: + options.transparent = color_triple(options.transparent) + if options.background is not None: + options.background = color_triple(options.background) + + # Prepare input and output files + if len(args) == 0: + infilename = '-' + infile = sys.stdin + elif len(args) == 1: + infilename = args[0] + infile = open(infilename, 'rb') + else: + parser.error("more than one input file") + outfile = sys.stdout + if sys.platform == "win32": + import msvcrt, os + msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) + + if options.read_png: + # Encode PNG to PPM + png = Reader(file=infile) + width,height,pixels,meta = png.asDirect() + write_pnm(outfile, width, height, pixels, meta) + else: + # Encode PNM to PNG + format, width, height, depth, maxval = \ + read_pnm_header(infile, (b'P5',b'P6',b'P7')) + # When it comes to the variety of input formats, we do something + # rather rude. Observe that L, LA, RGB, RGBA are the 4 colour + # types supported by PNG and that they correspond to 1, 2, 3, 4 + # channels respectively. So we use the number of channels in + # the source image to determine which one we have. We do not + # care about TUPLTYPE. + greyscale = depth <= 2 + pamalpha = depth in (2,4) + supported = [2**x-1 for x in range(1,17)] + try: + mi = supported.index(maxval) + except ValueError: + raise NotImplementedError( + 'your maxval (%s) not in supported list %s' % + (maxval, str(supported))) + bitdepth = mi+1 + writer = Writer(width, height, + greyscale=greyscale, + bitdepth=bitdepth, + interlace=options.interlace, + transparent=options.transparent, + background=options.background, + alpha=bool(pamalpha or options.alpha), + gamma=options.gamma, + compression=options.compression) + if options.alpha: + pgmfile = open(options.alpha, 'rb') + format, awidth, aheight, adepth, amaxval = \ + read_pnm_header(pgmfile, 'P5') + if amaxval != '255': + raise NotImplementedError( + 'maxval %s not supported for alpha channel' % amaxval) + if (awidth, aheight) != (width, height): + raise ValueError("alpha channel image size mismatch" + " (%s has %sx%s but %s has %sx%s)" + % (infilename, width, height, + options.alpha, awidth, aheight)) + writer.convert_ppm_and_pgm(infile, pgmfile, outfile) + else: + writer.convert_pnm(infile, outfile) + + +if __name__ == '__main__': + try: + _main(sys.argv) + except Error as e: + print(e, file=sys.stderr) -- cgit v1.2.3 From 118c2cf268cce89536aa7cdb7e63a754c8a126e7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 17:39:49 -0500 Subject: 'make tidy' preserved compressed graphics, like pokecrystal --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 32d37f16..21d08ae0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o .SECONDEXPANSION: .PRECIOUS: .SECONDARY: -.PHONY: all clean red blue compare tools +.PHONY: all clean red blue compare tools tidy roms := pokered.gbc pokeblue.gbc @@ -24,6 +24,10 @@ clean: find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + $(MAKE) clean -C tools/ +tidy: + rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) + $(MAKE) clean -C tools/ + tools: $(MAKE) -C tools/ -- cgit v1.2.3 From b8b5ab5e6628dec9e8c88020e39975157cb0a0a6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 18:12:25 -0500 Subject: Reorganize Makefile similarly to pokecrystal --- Makefile | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 21d08ae0..04a08e05 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,34 @@ -MD5 := md5sum -c +roms := pokered.gbc pokeblue.gbc pokered_obj := audio_red.o main_red.o text_red.o wram_red.o pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o + +### Build tools + +MD5 := md5sum -c + +RGBDS ?= +RGBASM ?= $(RGBDS)rgbasm +RGBFIX ?= $(RGBDS)rgbfix +RGBGFX ?= $(RGBDS)rgbgfx +RGBLINK ?= $(RGBDS)rgblink + + +### Build targets + .SUFFIXES: .SECONDEXPANSION: .PRECIOUS: .SECONDARY: -.PHONY: all clean red blue compare tools tidy - -roms := pokered.gbc pokeblue.gbc +.PHONY: all red blue clean tidy compare tools all: $(roms) red: pokered.gbc blue: pokeblue.gbc # For contributors to make sure a change didn't affect the contents of the rom. -compare: red blue +compare: $(roms) @$(MD5) roms.md5 clean: @@ -43,40 +55,48 @@ endif %_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) $(pokered_obj): %_red.o: %.asm $$(dep) - rgbasm -D _RED -h -o $@ $*.asm + $(RGBASM) -D _RED -h -o $@ $*.asm %_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) $(pokeblue_obj): %_blue.o: %.asm $$(dep) - rgbasm -D _BLUE -h -o $@ $*.asm + $(RGBASM) -D _BLUE -h -o $@ $*.asm pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) - rgblink -d -n $*.sym -l pokered.link -o $@ $^ - rgbfix $($*_opt) $@ + $(RGBLINK) -d -n $*.sym -l pokered.link -o $@ $^ + $(RGBFIX) $($*_opt) $@ sort $*.sym -o $*.sym -gfx/blue/intro_purin_1.2bpp: rgbgfx += -h -gfx/blue/intro_purin_2.2bpp: rgbgfx += -h -gfx/blue/intro_purin_3.2bpp: rgbgfx += -h -gfx/red/intro_nido_1.2bpp: rgbgfx += -h -gfx/red/intro_nido_2.2bpp: rgbgfx += -h -gfx/red/intro_nido_3.2bpp: rgbgfx += -h + +### Misc file-specific graphics rules + +gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h +gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h +gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h +gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h +gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h +gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h gfx/game_boy.2bpp: tools/gfx += --remove-duplicates gfx/theend.2bpp: tools/gfx += --interleave --png=$< gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace + +### Catch-all graphics rules + %.png: ; %.2bpp: %.png - rgbgfx $(rgbgfx) -o $@ $< + $(RGBGFX) $(rgbgfx) -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -o $@ $@) + %.1bpp: %.png - rgbgfx -d1 $(rgbgfx) -o $@ $< + $(RGBGFX) -d1 $(rgbgfx) -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) + %.pic: %.2bpp tools/pkmncompress $< $@ -- cgit v1.2.3 From 703224335280bf1170982113ac3d09fe198c0564 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 18:56:07 -0500 Subject: Make tools/gfx.py executable --- tools/gfx.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/gfx.py b/tools/gfx.py index fae7bbdc..a3d95562 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -1,3 +1,6 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + """Supplementary scripts for graphics conversion.""" import os -- cgit v1.2.3 From c7796024590fec48ac79756793c1a6e3b54daf8f Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 1 Jan 2019 15:06:23 -0500 Subject: Rename map files, labels, and constants to be consistent and work with Polished Map --- audio.asm | 3 - constants/hide_show_constants.asm | 456 ++--- constants/map_constants.asm | 496 ++--- data/force_bike_surf.asm | 8 +- data/hidden_item_coords.asm | 46 +- data/hidden_objects.asm | 58 +- data/hide_show_data.asm | 180 +- data/mapHeaders/AgathasRoom.asm | 8 + data/mapHeaders/BikeShop.asm | 8 + data/mapHeaders/BillsHouse.asm | 8 + data/mapHeaders/BluesHouse.asm | 8 + data/mapHeaders/BrunosRoom.asm | 8 + data/mapHeaders/CeladonChiefHouse.asm | 8 + data/mapHeaders/CeladonCity.asm | 10 + data/mapHeaders/CeladonDiner.asm | 8 + data/mapHeaders/CeladonGym.asm | 8 + data/mapHeaders/CeladonHotel.asm | 8 + data/mapHeaders/CeladonMansion1F.asm | 8 + data/mapHeaders/CeladonMansion2F.asm | 8 + data/mapHeaders/CeladonMansion3F.asm | 8 + data/mapHeaders/CeladonMansionRoof.asm | 8 + data/mapHeaders/CeladonMansionRoofHouse.asm | 8 + data/mapHeaders/CeladonMart1F.asm | 8 + data/mapHeaders/CeladonMart2F.asm | 8 + data/mapHeaders/CeladonMart3F.asm | 8 + data/mapHeaders/CeladonMart4F.asm | 8 + data/mapHeaders/CeladonMart5F.asm | 8 + data/mapHeaders/CeladonMartElevator.asm | 8 + data/mapHeaders/CeladonMartRoof.asm | 8 + data/mapHeaders/CeladonPokecenter.asm | 8 + data/mapHeaders/CeruleanBadgeHouse.asm | 8 + data/mapHeaders/CeruleanCave1F.asm | 8 + data/mapHeaders/CeruleanCave2F.asm | 8 + data/mapHeaders/CeruleanCaveB1F.asm | 8 + data/mapHeaders/CeruleanCity.asm | 12 + data/mapHeaders/CeruleanGym.asm | 8 + data/mapHeaders/CeruleanMart.asm | 8 + data/mapHeaders/CeruleanPokecenter.asm | 8 + data/mapHeaders/CeruleanTradeHouse.asm | 8 + data/mapHeaders/CeruleanTrashedHouse.asm | 8 + data/mapHeaders/ChampionsRoom.asm | 8 + data/mapHeaders/CinnabarGym.asm | 8 + data/mapHeaders/CinnabarIsland.asm | 10 + data/mapHeaders/CinnabarLab.asm | 8 + data/mapHeaders/CinnabarLabFossilRoom.asm | 8 + data/mapHeaders/CinnabarLabMetronomeRoom.asm | 8 + data/mapHeaders/CinnabarLabTradeRoom.asm | 8 + data/mapHeaders/CinnabarMart.asm | 8 + data/mapHeaders/CinnabarPokecenter.asm | 8 + data/mapHeaders/Colosseum.asm | 8 + data/mapHeaders/CopycatsHouse1F.asm | 8 + data/mapHeaders/CopycatsHouse2F.asm | 8 + data/mapHeaders/Daycare.asm | 8 + data/mapHeaders/DiglettsCave.asm | 8 + data/mapHeaders/DiglettsCaveRoute11.asm | 8 + data/mapHeaders/DiglettsCaveRoute2.asm | 8 + data/mapHeaders/FightingDojo.asm | 8 + data/mapHeaders/FuchsiaBillsGrandpasHouse.asm | 8 + data/mapHeaders/FuchsiaCity.asm | 11 + data/mapHeaders/FuchsiaGoodRodHouse.asm | 8 + data/mapHeaders/FuchsiaGym.asm | 8 + data/mapHeaders/FuchsiaMart.asm | 8 + data/mapHeaders/FuchsiaMeetingRoom.asm | 8 + data/mapHeaders/FuchsiaPokecenter.asm | 8 + data/mapHeaders/GameCorner.asm | 8 + data/mapHeaders/GameCornerPrizeRoom.asm | 8 + data/mapHeaders/HallOfFame.asm | 8 + data/mapHeaders/IndigoPlateau.asm | 9 + data/mapHeaders/IndigoPlateauLobby.asm | 8 + data/mapHeaders/LancesRoom.asm | 8 + data/mapHeaders/LavenderCuboneHouse.asm | 8 + data/mapHeaders/LavenderMart.asm | 8 + data/mapHeaders/LavenderPokecenter.asm | 8 + data/mapHeaders/LavenderTown.asm | 11 + data/mapHeaders/LoreleisRoom.asm | 8 + data/mapHeaders/MrFujisHouse.asm | 8 + data/mapHeaders/MrPsychicsHouse.asm | 8 + data/mapHeaders/MtMoon1F.asm | 8 + data/mapHeaders/MtMoonB1F.asm | 8 + data/mapHeaders/MtMoonB2F.asm | 8 + data/mapHeaders/MtMoonPokecenter.asm | 8 + data/mapHeaders/Museum1F.asm | 8 + data/mapHeaders/Museum2F.asm | 8 + data/mapHeaders/NameRatersHouse.asm | 8 + data/mapHeaders/OaksLab.asm | 8 + data/mapHeaders/PalletTown.asm | 10 + data/mapHeaders/PewterCity.asm | 10 + data/mapHeaders/PewterGym.asm | 8 + data/mapHeaders/PewterMart.asm | 8 + data/mapHeaders/PewterNidoranHouse.asm | 8 + data/mapHeaders/PewterPokecenter.asm | 8 + data/mapHeaders/PewterSpeechHouse.asm | 8 + data/mapHeaders/PokemonFanClub.asm | 8 + data/mapHeaders/PokemonMansion1F.asm | 8 + data/mapHeaders/PokemonMansion2F.asm | 8 + data/mapHeaders/PokemonMansion3F.asm | 8 + data/mapHeaders/PokemonMansionB1F.asm | 8 + data/mapHeaders/PokemonTower1F.asm | 8 + data/mapHeaders/PokemonTower2F.asm | 8 + data/mapHeaders/PokemonTower3F.asm | 8 + data/mapHeaders/PokemonTower4F.asm | 8 + data/mapHeaders/PokemonTower5F.asm | 8 + data/mapHeaders/PokemonTower6F.asm | 8 + data/mapHeaders/PokemonTower7F.asm | 8 + data/mapHeaders/PowerPlant.asm | 8 + data/mapHeaders/RedsHouse1F.asm | 8 + data/mapHeaders/RedsHouse2F.asm | 8 + data/mapHeaders/RockTunnel1F.asm | 8 + data/mapHeaders/RockTunnelB1F.asm | 8 + data/mapHeaders/RockTunnelPokecenter.asm | 8 + data/mapHeaders/RocketHideoutB1F.asm | 8 + data/mapHeaders/RocketHideoutB2F.asm | 8 + data/mapHeaders/RocketHideoutB3F.asm | 8 + data/mapHeaders/RocketHideoutB4F.asm | 8 + data/mapHeaders/RocketHideoutElevator.asm | 8 + data/mapHeaders/Route1.asm | 10 + data/mapHeaders/Route10.asm | 10 + data/mapHeaders/Route11.asm | 10 + data/mapHeaders/Route11Gate1F.asm | 8 + data/mapHeaders/Route11Gate2F.asm | 8 + data/mapHeaders/Route12.asm | 11 + data/mapHeaders/Route12Gate1F.asm | 8 + data/mapHeaders/Route12Gate2F.asm | 8 + data/mapHeaders/Route12SuperRodHouse.asm | 8 + data/mapHeaders/Route13.asm | 10 + data/mapHeaders/Route14.asm | 10 + data/mapHeaders/Route15.asm | 10 + data/mapHeaders/Route15Gate1F.asm | 8 + data/mapHeaders/Route15Gate2F.asm | 8 + data/mapHeaders/Route16.asm | 10 + data/mapHeaders/Route16FlyHouse.asm | 8 + data/mapHeaders/Route16Gate1F.asm | 8 + data/mapHeaders/Route16Gate2F.asm | 8 + data/mapHeaders/Route17.asm | 10 + data/mapHeaders/Route18.asm | 10 + data/mapHeaders/Route18Gate1F.asm | 8 + data/mapHeaders/Route18Gate2F.asm | 8 + data/mapHeaders/Route19.asm | 10 + data/mapHeaders/Route2.asm | 10 + data/mapHeaders/Route20.asm | 10 + data/mapHeaders/Route21.asm | 10 + data/mapHeaders/Route22.asm | 10 + data/mapHeaders/Route22Gate.asm | 8 + data/mapHeaders/Route23.asm | 10 + data/mapHeaders/Route24.asm | 10 + data/mapHeaders/Route25.asm | 9 + data/mapHeaders/Route2Gate.asm | 8 + data/mapHeaders/Route2TradeHouse.asm | 8 + data/mapHeaders/Route3.asm | 10 + data/mapHeaders/Route4.asm | 10 + data/mapHeaders/Route5.asm | 10 + data/mapHeaders/Route5Gate.asm | 8 + data/mapHeaders/Route6.asm | 10 + data/mapHeaders/Route6Gate.asm | 8 + data/mapHeaders/Route7.asm | 10 + data/mapHeaders/Route7Gate.asm | 8 + data/mapHeaders/Route8.asm | 10 + data/mapHeaders/Route8Gate.asm | 8 + data/mapHeaders/Route9.asm | 10 + data/mapHeaders/SSAnne1F.asm | 8 + data/mapHeaders/SSAnne1FRooms.asm | 8 + data/mapHeaders/SSAnne2F.asm | 8 + data/mapHeaders/SSAnne2FRooms.asm | 8 + data/mapHeaders/SSAnne3F.asm | 8 + data/mapHeaders/SSAnneB1F.asm | 8 + data/mapHeaders/SSAnneB1FRooms.asm | 8 + data/mapHeaders/SSAnneBow.asm | 8 + data/mapHeaders/SSAnneCaptainsRoom.asm | 8 + data/mapHeaders/SSAnneKitchen.asm | 8 + data/mapHeaders/SafariZoneCenter.asm | 8 + data/mapHeaders/SafariZoneCenterRestHouse.asm | 8 + data/mapHeaders/SafariZoneEast.asm | 8 + data/mapHeaders/SafariZoneEastRestHouse.asm | 8 + data/mapHeaders/SafariZoneGate.asm | 8 + data/mapHeaders/SafariZoneNorth.asm | 8 + data/mapHeaders/SafariZoneNorthRestHouse.asm | 8 + data/mapHeaders/SafariZoneSecretHouse.asm | 8 + data/mapHeaders/SafariZoneWest.asm | 8 + data/mapHeaders/SafariZoneWestRestHouse.asm | 8 + data/mapHeaders/SaffronCity.asm | 12 + data/mapHeaders/SaffronGym.asm | 8 + data/mapHeaders/SaffronMart.asm | 8 + data/mapHeaders/SaffronPidgeyHouse.asm | 8 + data/mapHeaders/SaffronPokecenter.asm | 8 + data/mapHeaders/SeafoamIslands1F.asm | 8 + data/mapHeaders/SeafoamIslandsB1F.asm | 8 + data/mapHeaders/SeafoamIslandsB2F.asm | 8 + data/mapHeaders/SeafoamIslandsB3F.asm | 8 + data/mapHeaders/SeafoamIslandsB4F.asm | 8 + data/mapHeaders/SilphCo10F.asm | 8 + data/mapHeaders/SilphCo11F.asm | 8 + data/mapHeaders/SilphCo1F.asm | 8 + data/mapHeaders/SilphCo2F.asm | 8 + data/mapHeaders/SilphCo3F.asm | 8 + data/mapHeaders/SilphCo4F.asm | 8 + data/mapHeaders/SilphCo5F.asm | 8 + data/mapHeaders/SilphCo6F.asm | 8 + data/mapHeaders/SilphCo7F.asm | 8 + data/mapHeaders/SilphCo8F.asm | 8 + data/mapHeaders/SilphCo9F.asm | 8 + data/mapHeaders/SilphCoElevator.asm | 8 + data/mapHeaders/TradeCenter.asm | 8 + data/mapHeaders/UndergroundPathNorthSouth.asm | 8 + data/mapHeaders/UndergroundPathRoute5.asm | 8 + data/mapHeaders/UndergroundPathRoute6.asm | 8 + data/mapHeaders/UndergroundPathRoute7.asm | 8 + data/mapHeaders/UndergroundPathRoute7Copy.asm | 8 + data/mapHeaders/UndergroundPathRoute8.asm | 8 + data/mapHeaders/UndergroundPathWestEast.asm | 8 + data/mapHeaders/VermilionCity.asm | 10 + data/mapHeaders/VermilionDock.asm | 8 + data/mapHeaders/VermilionGym.asm | 8 + data/mapHeaders/VermilionMart.asm | 8 + data/mapHeaders/VermilionOldRodHouse.asm | 8 + data/mapHeaders/VermilionPidgeyHouse.asm | 8 + data/mapHeaders/VermilionPokecenter.asm | 8 + data/mapHeaders/VermilionTradeHouse.asm | 8 + data/mapHeaders/VictoryRoad1F.asm | 8 + data/mapHeaders/VictoryRoad2F.asm | 8 + data/mapHeaders/VictoryRoad3F.asm | 8 + data/mapHeaders/ViridianCity.asm | 11 + data/mapHeaders/ViridianForest.asm | 8 + data/mapHeaders/ViridianForestNorthGate.asm | 8 + data/mapHeaders/ViridianForestSouthGate.asm | 8 + data/mapHeaders/ViridianGym.asm | 8 + data/mapHeaders/ViridianMart.asm | 8 + data/mapHeaders/ViridianNicknameHouse.asm | 8 + data/mapHeaders/ViridianPokecenter.asm | 8 + data/mapHeaders/ViridianSchoolHouse.asm | 8 + data/mapHeaders/WardensHouse.asm | 8 + data/mapHeaders/agatha.asm | 6 - data/mapHeaders/bikeshop.asm | 6 - data/mapHeaders/billshouse.asm | 6 - data/mapHeaders/blueshouse.asm | 6 - data/mapHeaders/bruno.asm | 6 - data/mapHeaders/celadoncity.asm | 8 - data/mapHeaders/celadondiner.asm | 6 - data/mapHeaders/celadongamecorner.asm | 6 - data/mapHeaders/celadongym.asm | 6 - data/mapHeaders/celadonhotel.asm | 6 - data/mapHeaders/celadonhouse.asm | 6 - data/mapHeaders/celadonmansion1.asm | 6 - data/mapHeaders/celadonmansion2.asm | 6 - data/mapHeaders/celadonmansion3.asm | 6 - data/mapHeaders/celadonmansion4.asm | 6 - data/mapHeaders/celadonmansion5.asm | 6 - data/mapHeaders/celadonmart1.asm | 6 - data/mapHeaders/celadonmart2.asm | 6 - data/mapHeaders/celadonmart3.asm | 6 - data/mapHeaders/celadonmart4.asm | 6 - data/mapHeaders/celadonmart5.asm | 6 - data/mapHeaders/celadonmartelevator.asm | 6 - data/mapHeaders/celadonmartroof.asm | 6 - data/mapHeaders/celadonpokecenter.asm | 6 - data/mapHeaders/celadonprizeroom.asm | 6 - data/mapHeaders/ceruleancity.asm | 10 - data/mapHeaders/ceruleangym.asm | 6 - data/mapHeaders/ceruleanhouse1.asm | 6 - data/mapHeaders/ceruleanhouse2.asm | 6 - data/mapHeaders/ceruleanhousetrashed.asm | 6 - data/mapHeaders/ceruleanmart.asm | 6 - data/mapHeaders/ceruleanpokecenter.asm | 6 - data/mapHeaders/cinnabargym.asm | 6 - data/mapHeaders/cinnabarisland.asm | 8 - data/mapHeaders/cinnabarmart.asm | 6 - data/mapHeaders/cinnabarpokecenter.asm | 6 - data/mapHeaders/colosseum.asm | 6 - data/mapHeaders/copycatshouse1f.asm | 6 - data/mapHeaders/copycatshouse2f.asm | 6 - data/mapHeaders/daycarem.asm | 6 - data/mapHeaders/diglettscave.asm | 6 - data/mapHeaders/diglettscaveroute11.asm | 6 - data/mapHeaders/diglettscaveroute2.asm | 6 - data/mapHeaders/fanclub.asm | 6 - data/mapHeaders/fightingdojo.asm | 6 - data/mapHeaders/fuchsiacity.asm | 9 - data/mapHeaders/fuchsiagym.asm | 6 - data/mapHeaders/fuchsiahouse1.asm | 6 - data/mapHeaders/fuchsiahouse2.asm | 6 - data/mapHeaders/fuchsiahouse3.asm | 6 - data/mapHeaders/fuchsiamart.asm | 6 - data/mapHeaders/fuchsiameetingroom.asm | 6 - data/mapHeaders/fuchsiapokecenter.asm | 6 - data/mapHeaders/gary.asm | 6 - data/mapHeaders/halloffameroom.asm | 6 - data/mapHeaders/indigoplateau.asm | 7 - data/mapHeaders/indigoplateaulobby.asm | 6 - data/mapHeaders/lab1.asm | 6 - data/mapHeaders/lab2.asm | 6 - data/mapHeaders/lab3.asm | 6 - data/mapHeaders/lab4.asm | 6 - data/mapHeaders/lance.asm | 6 - data/mapHeaders/lavenderhouse1.asm | 6 - data/mapHeaders/lavenderhouse2.asm | 6 - data/mapHeaders/lavendermart.asm | 6 - data/mapHeaders/lavenderpokecenter.asm | 6 - data/mapHeaders/lavendertown.asm | 9 - data/mapHeaders/lorelei.asm | 6 - data/mapHeaders/mansion1.asm | 6 - data/mapHeaders/mansion2.asm | 6 - data/mapHeaders/mansion3.asm | 6 - data/mapHeaders/mansion4.asm | 6 - data/mapHeaders/mtmoon1.asm | 6 - data/mapHeaders/mtmoon2.asm | 6 - data/mapHeaders/mtmoon3.asm | 6 - data/mapHeaders/mtmoonpokecenter.asm | 6 - data/mapHeaders/museum1f.asm | 6 - data/mapHeaders/museum2f.asm | 6 - data/mapHeaders/namerater.asm | 6 - data/mapHeaders/oakslab.asm | 6 - data/mapHeaders/pallettown.asm | 8 - data/mapHeaders/pewtercity.asm | 8 - data/mapHeaders/pewtergym.asm | 6 - data/mapHeaders/pewterhouse1.asm | 6 - data/mapHeaders/pewterhouse2.asm | 6 - data/mapHeaders/pewtermart.asm | 6 - data/mapHeaders/pewterpokecenter.asm | 6 - data/mapHeaders/pokemontower1.asm | 6 - data/mapHeaders/pokemontower2.asm | 6 - data/mapHeaders/pokemontower3.asm | 6 - data/mapHeaders/pokemontower4.asm | 6 - data/mapHeaders/pokemontower5.asm | 6 - data/mapHeaders/pokemontower6.asm | 6 - data/mapHeaders/pokemontower7.asm | 6 - data/mapHeaders/powerplant.asm | 6 - data/mapHeaders/redshouse1f.asm | 6 - data/mapHeaders/redshouse2f.asm | 6 - data/mapHeaders/rockethideout1.asm | 6 - data/mapHeaders/rockethideout2.asm | 6 - data/mapHeaders/rockethideout3.asm | 6 - data/mapHeaders/rockethideout4.asm | 6 - data/mapHeaders/rockethideoutelevator.asm | 6 - data/mapHeaders/rocktunnel1.asm | 6 - data/mapHeaders/rocktunnel2.asm | 6 - data/mapHeaders/rocktunnelpokecenter.asm | 6 - data/mapHeaders/route1.asm | 8 - data/mapHeaders/route10.asm | 8 - data/mapHeaders/route11.asm | 8 - data/mapHeaders/route11gate.asm | 6 - data/mapHeaders/route11gateupstairs.asm | 6 - data/mapHeaders/route12.asm | 9 - data/mapHeaders/route12gate.asm | 6 - data/mapHeaders/route12gateupstairs.asm | 6 - data/mapHeaders/route12house.asm | 6 - data/mapHeaders/route13.asm | 8 - data/mapHeaders/route14.asm | 8 - data/mapHeaders/route15.asm | 8 - data/mapHeaders/route15gate.asm | 6 - data/mapHeaders/route15gateupstairs.asm | 6 - data/mapHeaders/route16.asm | 8 - data/mapHeaders/route16gate.asm | 6 - data/mapHeaders/route16gateupstairs.asm | 6 - data/mapHeaders/route16house.asm | 6 - data/mapHeaders/route17.asm | 8 - data/mapHeaders/route18.asm | 8 - data/mapHeaders/route18gate.asm | 6 - data/mapHeaders/route18gateupstairs.asm | 6 - data/mapHeaders/route19.asm | 8 - data/mapHeaders/route2.asm | 8 - data/mapHeaders/route20.asm | 8 - data/mapHeaders/route21.asm | 8 - data/mapHeaders/route22.asm | 8 - data/mapHeaders/route22gate.asm | 6 - data/mapHeaders/route23.asm | 8 - data/mapHeaders/route24.asm | 8 - data/mapHeaders/route25.asm | 7 - data/mapHeaders/route2gate.asm | 6 - data/mapHeaders/route2house.asm | 6 - data/mapHeaders/route3.asm | 8 - data/mapHeaders/route4.asm | 8 - data/mapHeaders/route5.asm | 8 - data/mapHeaders/route5gate.asm | 6 - data/mapHeaders/route6.asm | 8 - data/mapHeaders/route6gate.asm | 6 - data/mapHeaders/route7.asm | 8 - data/mapHeaders/route7gate.asm | 6 - data/mapHeaders/route8.asm | 8 - data/mapHeaders/route8gate.asm | 6 - data/mapHeaders/route9.asm | 8 - data/mapHeaders/safarizonecenter.asm | 6 - data/mapHeaders/safarizoneeast.asm | 6 - data/mapHeaders/safarizoneentrance.asm | 6 - data/mapHeaders/safarizonenorth.asm | 6 - data/mapHeaders/safarizoneresthouse1.asm | 6 - data/mapHeaders/safarizoneresthouse2.asm | 6 - data/mapHeaders/safarizoneresthouse3.asm | 6 - data/mapHeaders/safarizoneresthouse4.asm | 6 - data/mapHeaders/safarizonesecrethouse.asm | 6 - data/mapHeaders/safarizonewest.asm | 6 - data/mapHeaders/saffroncity.asm | 10 - data/mapHeaders/saffrongym.asm | 6 - data/mapHeaders/saffronhouse1.asm | 6 - data/mapHeaders/saffronhouse2.asm | 6 - data/mapHeaders/saffronmart.asm | 6 - data/mapHeaders/saffronpokecenter.asm | 6 - data/mapHeaders/school.asm | 6 - data/mapHeaders/seafoamislands1.asm | 6 - data/mapHeaders/seafoamislands2.asm | 6 - data/mapHeaders/seafoamislands3.asm | 6 - data/mapHeaders/seafoamislands4.asm | 6 - data/mapHeaders/seafoamislands5.asm | 6 - data/mapHeaders/silphco1.asm | 6 - data/mapHeaders/silphco10.asm | 6 - data/mapHeaders/silphco11.asm | 6 - data/mapHeaders/silphco2.asm | 6 - data/mapHeaders/silphco3.asm | 6 - data/mapHeaders/silphco4.asm | 6 - data/mapHeaders/silphco5.asm | 6 - data/mapHeaders/silphco6.asm | 6 - data/mapHeaders/silphco7.asm | 6 - data/mapHeaders/silphco8.asm | 6 - data/mapHeaders/silphco9.asm | 6 - data/mapHeaders/silphcoelevator.asm | 6 - data/mapHeaders/ssanne1.asm | 6 - data/mapHeaders/ssanne10.asm | 6 - data/mapHeaders/ssanne2.asm | 6 - data/mapHeaders/ssanne3.asm | 6 - data/mapHeaders/ssanne4.asm | 6 - data/mapHeaders/ssanne5.asm | 6 - data/mapHeaders/ssanne6.asm | 6 - data/mapHeaders/ssanne7.asm | 6 - data/mapHeaders/ssanne8.asm | 6 - data/mapHeaders/ssanne9.asm | 6 - data/mapHeaders/tradecenter.asm | 6 - data/mapHeaders/undergroundpathentranceroute5.asm | 6 - data/mapHeaders/undergroundpathentranceroute6.asm | 6 - data/mapHeaders/undergroundpathentranceroute7.asm | 6 - .../undergroundpathentranceroute7copy.asm | 6 - data/mapHeaders/undergroundpathentranceroute8.asm | 6 - data/mapHeaders/undergroundpathns.asm | 6 - data/mapHeaders/undergroundpathwe.asm | 6 - data/mapHeaders/unknowndungeon1.asm | 6 - data/mapHeaders/unknowndungeon2.asm | 6 - data/mapHeaders/unknowndungeon3.asm | 6 - data/mapHeaders/vermilioncity.asm | 8 - data/mapHeaders/vermiliondock.asm | 6 - data/mapHeaders/vermiliongym.asm | 6 - data/mapHeaders/vermilionhouse1.asm | 6 - data/mapHeaders/vermilionhouse2.asm | 6 - data/mapHeaders/vermilionhouse3.asm | 6 - data/mapHeaders/vermilionmart.asm | 6 - data/mapHeaders/vermilionpokecenter.asm | 6 - data/mapHeaders/victoryroad1.asm | 6 - data/mapHeaders/victoryroad2.asm | 6 - data/mapHeaders/victoryroad3.asm | 6 - data/mapHeaders/viridiancity.asm | 9 - data/mapHeaders/viridianforest.asm | 6 - data/mapHeaders/viridianforestentrance.asm | 6 - data/mapHeaders/viridianforestexit.asm | 6 - data/mapHeaders/viridiangym.asm | 6 - data/mapHeaders/viridianhouse.asm | 6 - data/mapHeaders/viridianmart.asm | 6 - data/mapHeaders/viridianpokecenter.asm | 6 - data/mapObjects/AgathasRoom.asm | 19 + data/mapObjects/BikeShop.asm | 17 + data/mapObjects/BillsHouse.asm | 17 + data/mapObjects/BluesHouse.asm | 17 + data/mapObjects/BrunosRoom.asm | 19 + data/mapObjects/CeladonChiefHouse.asm | 17 + data/mapObjects/CeladonCity.asm | 54 + data/mapObjects/CeladonDiner.asm | 19 + data/mapObjects/CeladonGym.asm | 22 + data/mapObjects/CeladonHotel.asm | 17 + data/mapObjects/CeladonMansion1F.asm | 25 + data/mapObjects/CeladonMansion2F.asm | 19 + data/mapObjects/CeladonMansion3F.asm | 26 + data/mapObjects/CeladonMansionRoof.asm | 17 + data/mapObjects/CeladonMansionRoofHouse.asm | 16 + data/mapObjects/CeladonMart1F.asm | 25 + data/mapObjects/CeladonMart2F.asm | 21 + data/mapObjects/CeladonMart3F.asm | 33 + data/mapObjects/CeladonMart4F.asm | 20 + data/mapObjects/CeladonMart5F.asm | 21 + data/mapObjects/CeladonMartElevator.asm | 15 + data/mapObjects/CeladonMartRoof.asm | 18 + data/mapObjects/CeladonPokecenter.asm | 18 + data/mapObjects/CeruleanBadgeHouse.asm | 17 + data/mapObjects/CeruleanCave1F.asm | 31 + data/mapObjects/CeruleanCave2F.asm | 25 + data/mapObjects/CeruleanCaveB1F.asm | 15 + data/mapObjects/CeruleanCity.asm | 47 + data/mapObjects/CeruleanGym.asm | 18 + data/mapObjects/CeruleanMart.asm | 17 + data/mapObjects/CeruleanPokecenter.asm | 18 + data/mapObjects/CeruleanTradeHouse.asm | 16 + data/mapObjects/CeruleanTrashedHouse.asm | 19 + data/mapObjects/ChampionsRoom.asm | 20 + data/mapObjects/CinnabarGym.asm | 23 + data/mapObjects/CinnabarIsland.asm | 27 + data/mapObjects/CinnabarLab.asm | 25 + data/mapObjects/CinnabarLabFossilRoom.asm | 16 + data/mapObjects/CinnabarLabMetronomeRoom.asm | 19 + data/mapObjects/CinnabarLabTradeRoom.asm | 17 + data/mapObjects/CinnabarMart.asm | 17 + data/mapObjects/CinnabarPokecenter.asm | 18 + data/mapObjects/Colosseum.asm | 9 + data/mapObjects/CopycatsHouse1F.asm | 19 + data/mapObjects/CopycatsHouse2F.asm | 19 + data/mapObjects/Daycare.asm | 15 + data/mapObjects/DiglettsCave.asm | 14 + data/mapObjects/DiglettsCaveRoute11.asm | 17 + data/mapObjects/DiglettsCaveRoute2.asm | 17 + data/mapObjects/FightingDojo.asm | 21 + data/mapObjects/FuchsiaBillsGrandpasHouse.asm | 17 + data/mapObjects/FuchsiaCity.asm | 52 + data/mapObjects/FuchsiaGoodRodHouse.asm | 17 + data/mapObjects/FuchsiaGym.asm | 22 + data/mapObjects/FuchsiaMart.asm | 17 + data/mapObjects/FuchsiaMeetingRoom.asm | 17 + data/mapObjects/FuchsiaPokecenter.asm | 18 + data/mapObjects/GameCorner.asm | 28 + data/mapObjects/GameCornerPrizeRoom.asm | 19 + data/mapObjects/HallOfFame.asm | 15 + data/mapObjects/IndigoPlateau.asm | 14 + data/mapObjects/IndigoPlateauLobby.asm | 21 + data/mapObjects/LancesRoom.asm | 17 + data/mapObjects/LavenderCuboneHouse.asm | 16 + data/mapObjects/LavenderMart.asm | 17 + data/mapObjects/LavenderPokecenter.asm | 18 + data/mapObjects/LavenderTown.asm | 31 + data/mapObjects/LoreleisRoom.asm | 19 + data/mapObjects/MrFujisHouse.asm | 20 + data/mapObjects/MrPsychicsHouse.asm | 15 + data/mapObjects/MtMoon1F.asm | 34 + data/mapObjects/MtMoonB1F.asm | 26 + data/mapObjects/MtMoonB2F.asm | 27 + data/mapObjects/MtMoonPokecenter.asm | 20 + data/mapObjects/Museum1F.asm | 25 + data/mapObjects/Museum2F.asm | 19 + data/mapObjects/NameRatersHouse.asm | 15 + data/mapObjects/OaksLab.asm | 25 + data/mapObjects/PalletTown.asm | 23 + data/mapObjects/PewterCity.asm | 36 + data/mapObjects/PewterGym.asm | 17 + data/mapObjects/PewterMart.asm | 17 + data/mapObjects/PewterNidoranHouse.asm | 17 + data/mapObjects/PewterPokecenter.asm | 18 + data/mapObjects/PewterSpeechHouse.asm | 16 + data/mapObjects/PokemonFanClub.asm | 22 + data/mapObjects/PokemonMansion1F.asm | 29 + data/mapObjects/PokemonMansion2F.asm | 22 + data/mapObjects/PokemonMansion3F.asm | 21 + data/mapObjects/PokemonMansionB1F.asm | 20 + data/mapObjects/PokemonTower1F.asm | 21 + data/mapObjects/PokemonTower2F.asm | 16 + data/mapObjects/PokemonTower3F.asm | 18 + data/mapObjects/PokemonTower4F.asm | 20 + data/mapObjects/PokemonTower5F.asm | 20 + data/mapObjects/PokemonTower6F.asm | 19 + data/mapObjects/PokemonTower7F.asm | 16 + data/mapObjects/PowerPlant.asm | 30 + data/mapObjects/RedsHouse1F.asm | 18 + data/mapObjects/RedsHouse2F.asm | 12 + data/mapObjects/RockTunnel1F.asm | 34 + data/mapObjects/RockTunnelB1F.asm | 26 + data/mapObjects/RockTunnelPokecenter.asm | 18 + data/mapObjects/RocketHideoutB1F.asm | 27 + data/mapObjects/RocketHideoutB2F.asm | 25 + data/mapObjects/RocketHideoutB3F.asm | 18 + data/mapObjects/RocketHideoutB4F.asm | 25 + data/mapObjects/RocketHideoutElevator.asm | 15 + data/mapObjects/Route1.asm | 14 + data/mapObjects/Route10.asm | 28 + data/mapObjects/Route11.asm | 31 + data/mapObjects/Route11Gate1F.asm | 21 + data/mapObjects/Route11Gate2F.asm | 16 + data/mapObjects/Route12.asm | 30 + data/mapObjects/Route12Gate1F.asm | 21 + data/mapObjects/Route12Gate2F.asm | 15 + data/mapObjects/Route12SuperRodHouse.asm | 15 + data/mapObjects/Route13.asm | 21 + data/mapObjects/Route14.asm | 19 + data/mapObjects/Route15.asm | 30 + data/mapObjects/Route15Gate1F.asm | 21 + data/mapObjects/Route15Gate2F.asm | 14 + data/mapObjects/Route16.asm | 37 + data/mapObjects/Route16FlyHouse.asm | 16 + data/mapObjects/Route16Gate1F.asm | 30 + data/mapObjects/Route16Gate2F.asm | 16 + data/mapObjects/Route17.asm | 24 + data/mapObjects/Route18.asm | 23 + data/mapObjects/Route18Gate1F.asm | 21 + data/mapObjects/Route18Gate2F.asm | 15 + data/mapObjects/Route19.asm | 21 + data/mapObjects/Route2.asm | 33 + data/mapObjects/Route20.asm | 26 + data/mapObjects/Route21.asm | 17 + data/mapObjects/Route22.asm | 15 + data/mapObjects/Route22Gate.asm | 19 + data/mapObjects/Route23.asm | 26 + data/mapObjects/Route24.asm | 16 + data/mapObjects/Route25.asm | 23 + data/mapObjects/Route2Gate.asm | 20 + data/mapObjects/Route2TradeHouse.asm | 16 + data/mapObjects/Route3.asm | 18 + data/mapObjects/Route4.asm | 22 + data/mapObjects/Route5.asm | 21 + data/mapObjects/Route5Gate.asm | 19 + data/mapObjects/Route6.asm | 25 + data/mapObjects/Route6Gate.asm | 19 + data/mapObjects/Route7.asm | 21 + data/mapObjects/Route7Gate.asm | 19 + data/mapObjects/Route8.asm | 30 + data/mapObjects/Route8Gate.asm | 19 + data/mapObjects/Route9.asm | 19 + data/mapObjects/SSAnne1F.asm | 34 + data/mapObjects/SSAnne1FRooms.asm | 33 + data/mapObjects/SSAnne2F.asm | 30 + data/mapObjects/SSAnne2FRooms.asm | 47 + data/mapObjects/SSAnne3F.asm | 15 + data/mapObjects/SSAnneB1F.asm | 22 + data/mapObjects/SSAnneB1FRooms.asm | 41 + data/mapObjects/SSAnneBow.asm | 19 + data/mapObjects/SSAnneCaptainsRoom.asm | 15 + data/mapObjects/SSAnneKitchen.asm | 19 + data/mapObjects/SafariZoneCenter.asm | 31 + data/mapObjects/SafariZoneCenterRestHouse.asm | 16 + data/mapObjects/SafariZoneEast.asm | 27 + data/mapObjects/SafariZoneEastRestHouse.asm | 17 + data/mapObjects/SafariZoneGate.asm | 20 + data/mapObjects/SafariZoneNorth.asm | 35 + data/mapObjects/SafariZoneNorthRestHouse.asm | 17 + data/mapObjects/SafariZoneSecretHouse.asm | 15 + data/mapObjects/SafariZoneWest.asm | 34 + data/mapObjects/SafariZoneWestRestHouse.asm | 17 + data/mapObjects/SaffronCity.asm | 51 + data/mapObjects/SaffronGym.asm | 83 + data/mapObjects/SaffronMart.asm | 17 + data/mapObjects/SaffronPidgeyHouse.asm | 18 + data/mapObjects/SaffronPokecenter.asm | 18 + data/mapObjects/SeafoamIslands1F.asm | 30 + data/mapObjects/SeafoamIslandsB1F.asm | 26 + data/mapObjects/SeafoamIslandsB2F.asm | 26 + data/mapObjects/SeafoamIslandsB3F.asm | 30 + data/mapObjects/SeafoamIslandsB4F.asm | 23 + data/mapObjects/SilphCo10F.asm | 28 + data/mapObjects/SilphCo11F.asm | 23 + data/mapObjects/SilphCo1F.asm | 21 + data/mapObjects/SilphCo2F.asm | 29 + data/mapObjects/SilphCo3F.asm | 34 + data/mapObjects/SilphCo4F.asm | 31 + data/mapObjects/SilphCo5F.asm | 35 + data/mapObjects/SilphCo6F.asm | 30 + data/mapObjects/SilphCo7F.asm | 33 + data/mapObjects/SilphCo8F.asm | 28 + data/mapObjects/SilphCo9F.asm | 24 + data/mapObjects/SilphCoElevator.asm | 15 + data/mapObjects/TradeCenter.asm | 9 + data/mapObjects/UndergroundPathNorthSouth.asm | 14 + data/mapObjects/UndergroundPathRoute5.asm | 17 + data/mapObjects/UndergroundPathRoute6.asm | 17 + data/mapObjects/UndergroundPathRoute7.asm | 17 + data/mapObjects/UndergroundPathRoute7Copy.asm | 18 + data/mapObjects/UndergroundPathRoute8.asm | 17 + data/mapObjects/UndergroundPathWestEast.asm | 14 + data/mapObjects/VermilionCity.asm | 41 + data/mapObjects/VermilionDock.asm | 14 + data/mapObjects/VermilionGym.asm | 19 + data/mapObjects/VermilionMart.asm | 17 + data/mapObjects/VermilionOldRodHouse.asm | 15 + data/mapObjects/VermilionPidgeyHouse.asm | 17 + data/mapObjects/VermilionPokecenter.asm | 18 + data/mapObjects/VermilionTradeHouse.asm | 15 + data/mapObjects/VictoryRoad1F.asm | 23 + data/mapObjects/VictoryRoad2F.asm | 37 + data/mapObjects/VictoryRoad3F.asm | 28 + data/mapObjects/ViridianCity.asm | 33 + data/mapObjects/ViridianForest.asm | 36 + data/mapObjects/ViridianForestNorthGate.asm | 20 + data/mapObjects/ViridianForestSouthGate.asm | 20 + data/mapObjects/ViridianGym.asm | 25 + data/mapObjects/ViridianMart.asm | 17 + data/mapObjects/ViridianNicknameHouse.asm | 18 + data/mapObjects/ViridianPokecenter.asm | 18 + data/mapObjects/ViridianSchoolHouse.asm | 16 + data/mapObjects/WardensHouse.asm | 19 + data/mapObjects/agatha.asm | 19 - data/mapObjects/bikeshop.asm | 17 - data/mapObjects/billshouse.asm | 17 - data/mapObjects/blueshouse.asm | 17 - data/mapObjects/bruno.asm | 19 - data/mapObjects/celadoncity.asm | 54 - data/mapObjects/celadondiner.asm | 19 - data/mapObjects/celadongamecorner.asm | 28 - data/mapObjects/celadongym.asm | 22 - data/mapObjects/celadonhotel.asm | 17 - data/mapObjects/celadonhouse.asm | 17 - data/mapObjects/celadonmansion1.asm | 25 - data/mapObjects/celadonmansion2.asm | 19 - data/mapObjects/celadonmansion3.asm | 26 - data/mapObjects/celadonmansion4.asm | 17 - data/mapObjects/celadonmansion5.asm | 16 - data/mapObjects/celadonmart1.asm | 25 - data/mapObjects/celadonmart2.asm | 21 - data/mapObjects/celadonmart3.asm | 33 - data/mapObjects/celadonmart4.asm | 20 - data/mapObjects/celadonmart5.asm | 21 - data/mapObjects/celadonmartelevator.asm | 15 - data/mapObjects/celadonmartroof.asm | 18 - data/mapObjects/celadonpokecenter.asm | 18 - data/mapObjects/celadonprizeroom.asm | 19 - data/mapObjects/ceruleancity.asm | 47 - data/mapObjects/ceruleangym.asm | 18 - data/mapObjects/ceruleanhouse1.asm | 16 - data/mapObjects/ceruleanhouse2.asm | 17 - data/mapObjects/ceruleanhousetrashed.asm | 19 - data/mapObjects/ceruleanmart.asm | 17 - data/mapObjects/ceruleanpokecenter.asm | 18 - data/mapObjects/cinnabargym.asm | 23 - data/mapObjects/cinnabarisland.asm | 27 - data/mapObjects/cinnabarmart.asm | 17 - data/mapObjects/cinnabarpokecenter.asm | 18 - data/mapObjects/colosseum.asm | 9 - data/mapObjects/copycatshouse1f.asm | 19 - data/mapObjects/copycatshouse2f.asm | 19 - data/mapObjects/daycarem.asm | 15 - data/mapObjects/diglettscave.asm | 14 - data/mapObjects/diglettscaveroute11.asm | 17 - data/mapObjects/diglettscaveroute2.asm | 17 - data/mapObjects/fanclub.asm | 22 - data/mapObjects/fightingdojo.asm | 21 - data/mapObjects/fuchsiacity.asm | 52 - data/mapObjects/fuchsiagym.asm | 22 - data/mapObjects/fuchsiahouse1.asm | 17 - data/mapObjects/fuchsiahouse2.asm | 19 - data/mapObjects/fuchsiahouse3.asm | 17 - data/mapObjects/fuchsiamart.asm | 17 - data/mapObjects/fuchsiameetingroom.asm | 17 - data/mapObjects/fuchsiapokecenter.asm | 18 - data/mapObjects/gary.asm | 20 - data/mapObjects/halloffameroom.asm | 15 - data/mapObjects/indigoplateau.asm | 14 - data/mapObjects/indigoplateaulobby.asm | 21 - data/mapObjects/lab1.asm | 25 - data/mapObjects/lab2.asm | 17 - data/mapObjects/lab3.asm | 19 - data/mapObjects/lab4.asm | 16 - data/mapObjects/lance.asm | 17 - data/mapObjects/lavenderhouse1.asm | 20 - data/mapObjects/lavenderhouse2.asm | 16 - data/mapObjects/lavendermart.asm | 17 - data/mapObjects/lavenderpokecenter.asm | 18 - data/mapObjects/lavendertown.asm | 31 - data/mapObjects/lorelei.asm | 19 - data/mapObjects/mansion1.asm | 29 - data/mapObjects/mansion2.asm | 22 - data/mapObjects/mansion3.asm | 21 - data/mapObjects/mansion4.asm | 20 - data/mapObjects/mtmoon1.asm | 34 - data/mapObjects/mtmoon2.asm | 26 - data/mapObjects/mtmoon3.asm | 27 - data/mapObjects/mtmoonpokecenter.asm | 20 - data/mapObjects/museum1f.asm | 25 - data/mapObjects/museum2f.asm | 19 - data/mapObjects/namerater.asm | 15 - data/mapObjects/oakslab.asm | 25 - data/mapObjects/pallettown.asm | 23 - data/mapObjects/pewtercity.asm | 36 - data/mapObjects/pewtergym.asm | 17 - data/mapObjects/pewterhouse1.asm | 17 - data/mapObjects/pewterhouse2.asm | 16 - data/mapObjects/pewtermart.asm | 17 - data/mapObjects/pewterpokecenter.asm | 18 - data/mapObjects/pokemontower1.asm | 21 - data/mapObjects/pokemontower2.asm | 16 - data/mapObjects/pokemontower3.asm | 18 - data/mapObjects/pokemontower4.asm | 20 - data/mapObjects/pokemontower5.asm | 20 - data/mapObjects/pokemontower6.asm | 19 - data/mapObjects/pokemontower7.asm | 16 - data/mapObjects/powerplant.asm | 30 - data/mapObjects/redshouse1f.asm | 18 - data/mapObjects/redshouse2f.asm | 12 - data/mapObjects/rockethideout1.asm | 27 - data/mapObjects/rockethideout2.asm | 25 - data/mapObjects/rockethideout3.asm | 18 - data/mapObjects/rockethideout4.asm | 25 - data/mapObjects/rockethideoutelevator.asm | 15 - data/mapObjects/rocktunnel1.asm | 34 - data/mapObjects/rocktunnel2.asm | 26 - data/mapObjects/rocktunnelpokecenter.asm | 18 - data/mapObjects/route1.asm | 14 - data/mapObjects/route10.asm | 28 - data/mapObjects/route11.asm | 31 - data/mapObjects/route11gate.asm | 21 - data/mapObjects/route11gateupstairs.asm | 16 - data/mapObjects/route12.asm | 30 - data/mapObjects/route12gate.asm | 21 - data/mapObjects/route12gateupstairs.asm | 15 - data/mapObjects/route12house.asm | 15 - data/mapObjects/route13.asm | 21 - data/mapObjects/route14.asm | 19 - data/mapObjects/route15.asm | 30 - data/mapObjects/route15gate.asm | 21 - data/mapObjects/route15gateupstairs.asm | 14 - data/mapObjects/route16.asm | 37 - data/mapObjects/route16gate.asm | 30 - data/mapObjects/route16gateupstairs.asm | 16 - data/mapObjects/route16house.asm | 16 - data/mapObjects/route17.asm | 24 - data/mapObjects/route18.asm | 23 - data/mapObjects/route18gate.asm | 21 - data/mapObjects/route18gateupstairs.asm | 15 - data/mapObjects/route19.asm | 21 - data/mapObjects/route2.asm | 33 - data/mapObjects/route20.asm | 26 - data/mapObjects/route21.asm | 17 - data/mapObjects/route22.asm | 15 - data/mapObjects/route22gate.asm | 19 - data/mapObjects/route23.asm | 26 - data/mapObjects/route24.asm | 16 - data/mapObjects/route25.asm | 23 - data/mapObjects/route2gate.asm | 20 - data/mapObjects/route2house.asm | 16 - data/mapObjects/route3.asm | 18 - data/mapObjects/route4.asm | 22 - data/mapObjects/route5.asm | 21 - data/mapObjects/route5gate.asm | 19 - data/mapObjects/route6.asm | 25 - data/mapObjects/route6gate.asm | 19 - data/mapObjects/route7.asm | 21 - data/mapObjects/route7gate.asm | 19 - data/mapObjects/route8.asm | 30 - data/mapObjects/route8gate.asm | 19 - data/mapObjects/route9.asm | 19 - data/mapObjects/safarizonecenter.asm | 31 - data/mapObjects/safarizoneeast.asm | 27 - data/mapObjects/safarizoneentrance.asm | 20 - data/mapObjects/safarizonenorth.asm | 35 - data/mapObjects/safarizoneresthouse1.asm | 16 - data/mapObjects/safarizoneresthouse2.asm | 17 - data/mapObjects/safarizoneresthouse3.asm | 17 - data/mapObjects/safarizoneresthouse4.asm | 17 - data/mapObjects/safarizonesecrethouse.asm | 15 - data/mapObjects/safarizonewest.asm | 34 - data/mapObjects/saffroncity.asm | 51 - data/mapObjects/saffrongym.asm | 83 - data/mapObjects/saffronhouse1.asm | 18 - data/mapObjects/saffronhouse2.asm | 15 - data/mapObjects/saffronmart.asm | 17 - data/mapObjects/saffronpokecenter.asm | 18 - data/mapObjects/school.asm | 16 - data/mapObjects/seafoamislands1.asm | 30 - data/mapObjects/seafoamislands2.asm | 26 - data/mapObjects/seafoamislands3.asm | 26 - data/mapObjects/seafoamislands4.asm | 30 - data/mapObjects/seafoamislands5.asm | 23 - data/mapObjects/silphco1.asm | 21 - data/mapObjects/silphco10.asm | 28 - data/mapObjects/silphco11.asm | 23 - data/mapObjects/silphco2.asm | 29 - data/mapObjects/silphco3.asm | 34 - data/mapObjects/silphco4.asm | 31 - data/mapObjects/silphco5.asm | 35 - data/mapObjects/silphco6.asm | 30 - data/mapObjects/silphco7.asm | 33 - data/mapObjects/silphco8.asm | 28 - data/mapObjects/silphco9.asm | 24 - data/mapObjects/silphcoelevator.asm | 15 - data/mapObjects/ssanne1.asm | 34 - data/mapObjects/ssanne10.asm | 41 - data/mapObjects/ssanne2.asm | 30 - data/mapObjects/ssanne3.asm | 15 - data/mapObjects/ssanne4.asm | 22 - data/mapObjects/ssanne5.asm | 19 - data/mapObjects/ssanne6.asm | 19 - data/mapObjects/ssanne7.asm | 15 - data/mapObjects/ssanne8.asm | 33 - data/mapObjects/ssanne9.asm | 47 - data/mapObjects/tradecenter.asm | 9 - data/mapObjects/undergroundpathentranceroute5.asm | 17 - data/mapObjects/undergroundpathentranceroute6.asm | 17 - data/mapObjects/undergroundpathentranceroute7.asm | 17 - .../undergroundpathentranceroute7copy.asm | 18 - data/mapObjects/undergroundpathentranceroute8.asm | 17 - data/mapObjects/undergroundpathns.asm | 14 - data/mapObjects/undergroundpathwe.asm | 14 - data/mapObjects/unknowndungeon1.asm | 31 - data/mapObjects/unknowndungeon2.asm | 25 - data/mapObjects/unknowndungeon3.asm | 15 - data/mapObjects/vermilioncity.asm | 41 - data/mapObjects/vermiliondock.asm | 14 - data/mapObjects/vermiliongym.asm | 19 - data/mapObjects/vermilionhouse1.asm | 17 - data/mapObjects/vermilionhouse2.asm | 15 - data/mapObjects/vermilionhouse3.asm | 15 - data/mapObjects/vermilionmart.asm | 17 - data/mapObjects/vermilionpokecenter.asm | 18 - data/mapObjects/victoryroad1.asm | 23 - data/mapObjects/victoryroad2.asm | 37 - data/mapObjects/victoryroad3.asm | 28 - data/mapObjects/viridiancity.asm | 33 - data/mapObjects/viridianforest.asm | 36 - data/mapObjects/viridianforestentrance.asm | 20 - data/mapObjects/viridianforestexit.asm | 20 - data/mapObjects/viridiangym.asm | 25 - data/mapObjects/viridianhouse.asm | 18 - data/mapObjects/viridianmart.asm | 17 - data/mapObjects/viridianpokecenter.asm | 18 - data/map_header_banks.asm | 366 ++-- data/map_header_pointers.asm | 306 +-- data/map_songs.asm | 426 ++-- data/special_warps.asm | 48 +- data/super_rod.asm | 10 +- data/town_map_entries.asm | 120 +- data/town_map_order.asm | 10 +- engine/battle/battle_transitions.asm | 28 +- engine/battle/common_text.asm | 4 +- engine/battle/core.asm | 4 +- engine/battle/init_battle_variables.asm | 2 +- engine/hidden_object_functions7.asm | 4 +- engine/items/items.asm | 4 +- engine/overworld/field_move_messages.asm | 2 +- engine/overworld/npc_movement.asm | 2 +- engine/overworld/player_state.asm | 12 +- engine/overworld/set_blackout_map.asm | 6 +- engine/palettes.asm | 2 +- gfx/blocksets/facility.bst | Bin 2049 -> 2048 bytes home.asm | 3 - home/overworld.asm | 12 +- main.asm | 2144 ++++++++++---------- maps/AgathasRoom.blk | 1 + maps/BikeShop.blk | 6 + maps/BillsHouse.blk | 2 + maps/BluesHouse.blk | 1 + maps/BrunosRoom.blk | 4 + maps/CeladonChiefHouse.blk | 1 + maps/CeladonCity.blk | 28 + maps/CeladonDiner.blk | 1 + maps/CeladonGym.blk | 1 + maps/CeladonHotel.blk | 2 + maps/CeladonMansion1F.blk | 1 + maps/CeladonMansion2F.blk | 1 + maps/CeladonMansion3F.blk | 2 + maps/CeladonMansionRoof.blk | 1 + maps/CeladonMansionRoofHouse.blk | 1 + maps/CeladonMart1F.blk | 1 + maps/CeladonMart2F.blk | 4 + maps/CeladonMart3F.blk | 2 + maps/CeladonMart4F.blk | 4 + maps/CeladonMart5F.blk | 4 + maps/CeladonMartElevator.blk | 1 + maps/CeladonMartRoof.blk | 1 + maps/CeladonPokecenter.blk | 2 + maps/CeruleanBadgeHouse.blk | 1 + maps/CeruleanCave1F.blk | 2 + maps/CeruleanCave2F.blk | 3 + maps/CeruleanCaveB1F.blk | 1 + maps/CeruleanCity.blk | 25 + maps/CeruleanGym.blk | 1 + maps/CeruleanMart.blk | 1 + maps/CeruleanPokecenter.blk | 2 + maps/CeruleanTradeHouse.blk | 1 + maps/CeruleanTrashedHouse.blk | 1 + maps/ChampionsRoom.blk | 1 + maps/CinnabarGym.blk | 1 + maps/CinnabarIsland.blk | 1 + maps/CinnabarLab.blk | 2 + maps/CinnabarLabFossilRoom.blk | 1 + maps/CinnabarLabMetronomeRoom.blk | 1 + maps/CinnabarLabTradeRoom.blk | 2 + maps/CinnabarMart.blk | 1 + maps/CinnabarPokecenter.blk | 2 + maps/Colosseum.blk | 6 + maps/CopycatsHouse1F.blk | 1 + maps/CopycatsHouse2F.blk | 1 + maps/Daycare.blk | 1 + maps/DiglettsCave.blk | 1 + maps/DiglettsCaveRoute11.blk | 2 + maps/DiglettsCaveRoute2.blk | 2 + maps/FightingDojo.blk | 1 + maps/FuchsiaBillsGrandpasHouse.blk | 1 + maps/FuchsiaCity.blk | 4 + maps/FuchsiaGoodRodHouse.blk | 1 + maps/FuchsiaGym.blk | 1 + maps/FuchsiaMart.blk | 1 + maps/FuchsiaMeetingRoom.blk | 1 + maps/FuchsiaPokecenter.blk | 2 + maps/GameCorner.blk | 5 + maps/GameCornerPrizeRoom.blk | 1 + maps/HallOfFame.blk | 1 + maps/IndigoPlateau.blk | 1 + maps/IndigoPlateauLobby.blk | Bin 0 -> 48 bytes maps/LancesRoom.blk | 1 + maps/LavenderCuboneHouse.blk | 1 + maps/LavenderMart.blk | 1 + maps/LavenderPokecenter.blk | 2 + maps/LavenderTown.blk | 1 + maps/LoreleisRoom.blk | 1 + maps/MrFujisHouse.blk | 1 + maps/MrPsychicsHouse.blk | 1 + maps/MtMoon1F.blk | 1 + maps/MtMoonB1F.blk | 1 + maps/MtMoonB2F.blk | 1 + maps/MtMoonPokecenter.blk | 2 + maps/Museum1F.blk | Bin 0 -> 40 bytes maps/Museum2F.blk | Bin 0 -> 28 bytes maps/NameRatersHouse.blk | 1 + maps/OaksLab.blk | 1 + maps/PalletTown.blk | Bin 0 -> 90 bytes maps/PewterCity.blk | 57 + maps/PewterGym.blk | 4 + maps/PewterMart.blk | 1 + maps/PewterNidoranHouse.blk | 1 + maps/PewterPokecenter.blk | 2 + maps/PewterSpeechHouse.blk | 1 + maps/PokemonFanClub.blk | 1 + maps/PokemonMansion1F.blk | 9 + maps/PokemonMansion2F.blk | 1 + maps/PokemonMansion3F.blk | 1 + maps/PokemonMansionB1F.blk | 1 + maps/PokemonTower1F.blk | 3 + maps/PokemonTower2F.blk | 2 + maps/PokemonTower3F.blk | 3 + maps/PokemonTower4F.blk | 3 + maps/PokemonTower5F.blk | 2 + maps/PokemonTower6F.blk | 2 + maps/PokemonTower7F.blk | 1 + maps/PowerPlant.blk | 1 + maps/RedsHouse1F.blk | 1 + maps/RedsHouse2F.blk | 1 + maps/RockTunnel1F.blk | 1 + maps/RockTunnelB1F.blk | 1 + maps/RockTunnelPokecenter.blk | 2 + maps/RocketHideoutB1F.blk | 1 + maps/RocketHideoutB2F.blk | 3 + maps/RocketHideoutB3F.blk | 2 + maps/RocketHideoutB4F.blk | 1 + maps/RocketHideoutElevator.blk | 1 + maps/Route1.blk | 38 + maps/Route10.blk | 43 + maps/Route11.blk | 34 + maps/Route11Gate1F.blk | Bin 0 -> 20 bytes maps/Route11Gate2F.blk | Bin 0 -> 16 bytes maps/Route12.blk | 21 + maps/Route12Gate1F.blk | Bin 0 -> 20 bytes maps/Route12Gate2F.blk | Bin 0 -> 16 bytes maps/Route12SuperRodHouse.blk | 1 + maps/Route13.blk | 2 + maps/Route14.blk | 74 + maps/Route15.blk | 82 + maps/Route15Gate1F.blk | Bin 0 -> 20 bytes maps/Route15Gate2F.blk | Bin 0 -> 16 bytes maps/Route16.blk | 22 + maps/Route16FlyHouse.blk | 1 + maps/Route16Gate1F.blk | Bin 0 -> 28 bytes maps/Route16Gate2F.blk | Bin 0 -> 16 bytes maps/Route17.blk | 1 + maps/Route18.blk | 1 + maps/Route18Gate1F.blk | Bin 0 -> 20 bytes maps/Route18Gate2F.blk | Bin 0 -> 16 bytes maps/Route19.blk | 1 + maps/Route2.blk | 54 + maps/Route20.blk | 1 + maps/Route21.blk | 10 + maps/Route22.blk | 3 + maps/Route22Gate.blk | Bin 0 -> 20 bytes maps/Route23.blk | 57 + maps/Route24.blk | 13 + maps/Route25.blk | 19 + maps/Route2Gate.blk | Bin 0 -> 20 bytes maps/Route2TradeHouse.blk | 1 + maps/Route3.blk | 55 + maps/Route4.blk | 64 + maps/Route5.blk | 9 + maps/Route5Gate.blk | 1 + maps/Route6.blk | 21 + maps/Route6Gate.blk | 1 + maps/Route7.blk | 1 + maps/Route7Gate.blk | 1 + maps/Route8.blk | 45 + maps/Route8Gate.blk | 1 + maps/Route9.blk | 29 + maps/SSAnne1F.blk | 1 + maps/SSAnne1FRooms.blk | 7 + maps/SSAnne2F.blk | 1 + maps/SSAnne2FRooms.blk | 1 + maps/SSAnne3F.blk | 1 + maps/SSAnneB1F.blk | 1 + maps/SSAnneB1FRooms.blk | 1 + maps/SSAnneBow.blk | 1 + maps/SSAnneCaptainsRoom.blk | 1 + maps/SSAnneKitchen.blk | 7 + maps/SafariZoneCenter.blk | 1 + maps/SafariZoneCenterRestHouse.blk | Bin 0 -> 16 bytes maps/SafariZoneEast.blk | 1 + maps/SafariZoneEastRestHouse.blk | Bin 0 -> 16 bytes maps/SafariZoneGate.blk | 1 + maps/SafariZoneNorth.blk | 1 + maps/SafariZoneNorthRestHouse.blk | Bin 0 -> 16 bytes maps/SafariZoneSecretHouse.blk | 1 + maps/SafariZoneWest.blk | 1 + maps/SafariZoneWestRestHouse.blk | Bin 0 -> 16 bytes maps/SaffronCity.blk | Bin 0 -> 360 bytes maps/SaffronGym.blk | 1 + maps/SaffronMart.blk | 1 + maps/SaffronPidgeyHouse.blk | 1 + maps/SaffronPokecenter.blk | 2 + maps/SeafoamIslands1F.blk | 1 + maps/SeafoamIslandsB1F.blk | 1 + maps/SeafoamIslandsB2F.blk | 1 + maps/SeafoamIslandsB3F.blk | 1 + maps/SeafoamIslandsB4F.blk | 1 + maps/SilphCo10F.blk | 2 + maps/SilphCo11F.blk | 1 + maps/SilphCo1F.blk | 1 + maps/SilphCo2F.blk | 1 + maps/SilphCo3F.blk | 1 + maps/SilphCo4F.blk | 1 + maps/SilphCo5F.blk | 1 + maps/SilphCo6F.blk | 1 + maps/SilphCo7F.blk | 1 + maps/SilphCo8F.blk | 1 + maps/SilphCo9F.blk | 1 + maps/SilphCoElevator.blk | 1 + maps/TradeCenter.blk | 4 + maps/UndergroundPathNorthSouth.blk | 1 + maps/UndergroundPathRoute5.blk | Bin 0 -> 16 bytes maps/UndergroundPathRoute6.blk | Bin 0 -> 16 bytes maps/UndergroundPathRoute7.blk | Bin 0 -> 16 bytes maps/UndergroundPathRoute8.blk | Bin 0 -> 16 bytes maps/UndergroundPathWestEast.blk | 1 + maps/UnusedDiglettsCaveCopy.blk | 1 + maps/UnusedEmptyMap.blk | 1 + maps/UnusedPokecenterCopy.blk | 2 + maps/VermilionCity.blk | 1 + maps/VermilionDock.blk | 2 + maps/VermilionGym.blk | 1 + maps/VermilionMart.blk | 1 + maps/VermilionOldRodHouse.blk | 1 + maps/VermilionPidgeyHouse.blk | 1 + maps/VermilionPokecenter.blk | 2 + maps/VermilionTradeHouse.blk | 1 + maps/VictoryRoad1F.blk | 2 + maps/VictoryRoad2F.blk | 1 + maps/VictoryRoad3F.blk | 2 + maps/ViridianCity.blk | 60 + maps/ViridianForest.blk | 1 + maps/ViridianForestNorthGate.blk | Bin 0 -> 20 bytes maps/ViridianForestSouthGate.blk | Bin 0 -> 20 bytes maps/ViridianGym.blk | 1 + maps/ViridianMart.blk | 1 + maps/ViridianNicknameHouse.blk | 1 + maps/ViridianPokecenter.blk | 2 + maps/ViridianSchoolHouse.blk | 1 + maps/WardensHouse.blk | 1 + maps/agatha.blk | 1 - maps/bikeshop.blk | 6 - maps/billshouse.blk | 2 - maps/blueshouse.blk | 1 - maps/bruno.blk | 4 - maps/celadoncity.blk | 28 - maps/celadondiner.blk | 1 - maps/celadongamecorner.blk | 5 - maps/celadongym.blk | 1 - maps/celadonhotel.blk | 2 - maps/celadonhouse.blk | 1 - maps/celadonmansion1.blk | 1 - maps/celadonmansion2.blk | 1 - maps/celadonmansion3.blk | 2 - maps/celadonmansion4.blk | 1 - maps/celadonmansion5.blk | 1 - maps/celadonmart1.blk | 1 - maps/celadonmart2.blk | 4 - maps/celadonmart3.blk | 2 - maps/celadonmart4.blk | 4 - maps/celadonmart5.blk | 4 - maps/celadonmartelevator.blk | 1 - maps/celadonmartroof.blk | 1 - maps/celadonpokecenter.blk | 2 - maps/celadonprizeroom.blk | 1 - maps/ceruleancity.blk | 25 - maps/ceruleangym.blk | 1 - maps/ceruleanhouse1.blk | 1 - maps/ceruleanhouse2.blk | 1 - maps/ceruleanhousetrashed.blk | 1 - maps/ceruleanmart.blk | 1 - maps/ceruleanpokecenter.blk | 2 - maps/cinnabargym.blk | 1 - maps/cinnabarisland.blk | 1 - maps/cinnabarmart.blk | 1 - maps/cinnabarpokecenter.blk | 2 - maps/colosseum.blk | 6 - maps/copycatshouse1f.blk | 1 - maps/copycatshouse2f.blk | 1 - maps/daycarem.blk | 1 - maps/diglettscave.blk | 1 - maps/diglettscaveentranceroute11.blk | 2 - maps/diglettscaveroute2.blk | 2 - maps/fanclub.blk | 1 - maps/fightingdojo.blk | 1 - maps/fuchsiacity.blk | 4 - maps/fuchsiagym.blk | 1 - maps/fuchsiahouse1.blk | 1 - maps/fuchsiahouse2.blk | 1 - maps/fuchsiahouse3.blk | 1 - maps/fuchsiamart.blk | 1 - maps/fuchsiameetingroom.blk | 1 - maps/fuchsiapokecenter.blk | 2 - maps/gary.blk | 1 - maps/halloffameroom.blk | 1 - maps/indigoplateau.blk | 1 - maps/indigoplateaulobby.blk | Bin 48 -> 0 bytes maps/lab1.blk | 2 - maps/lab2.blk | 2 - maps/lab3.blk | 1 - maps/lab4.blk | 1 - maps/lance.blk | 1 - maps/lavenderhouse1.blk | 1 - maps/lavenderhouse2.blk | 1 - maps/lavendermart.blk | 1 - maps/lavenderpokecenter.blk | 2 - maps/lavendertown.blk | 1 - maps/lorelei.blk | 1 - maps/mansion1.blk | 9 - maps/mansion2.blk | 1 - maps/mansion3.blk | 1 - maps/mansion4.blk | 1 - maps/mtmoon1.blk | 1 - maps/mtmoon2.blk | 1 - maps/mtmoon3.blk | 1 - maps/mtmoonpokecenter.blk | 2 - maps/museum1f.blk | Bin 40 -> 0 bytes maps/museum2f.blk | Bin 28 -> 0 bytes maps/namerater.blk | 1 - maps/oakslab.blk | 1 - maps/pallettown.blk | Bin 90 -> 0 bytes maps/pewtercity.blk | 57 - maps/pewtergym.blk | 4 - maps/pewterhouse1.blk | 1 - maps/pewterhouse2.blk | 1 - maps/pewtermart.blk | 1 - maps/pewterpokecenter.blk | 2 - maps/pokemontower1.blk | 3 - maps/pokemontower2.blk | 2 - maps/pokemontower3.blk | 3 - maps/pokemontower4.blk | 3 - maps/pokemontower5.blk | 2 - maps/pokemontower6.blk | 2 - maps/pokemontower7.blk | 1 - maps/powerplant.blk | 1 - maps/redshouse1f.blk | 1 - maps/redshouse2f.blk | 1 - maps/rockethideout1.blk | 1 - maps/rockethideout2.blk | 3 - maps/rockethideout3.blk | 2 - maps/rockethideout4.blk | 1 - maps/rockethideoutelevator.blk | 1 - maps/rocktunnel1.blk | 1 - maps/rocktunnel2.blk | 1 - maps/rocktunnelpokecenter.blk | 2 - maps/route1.blk | 38 - maps/route10.blk | 43 - maps/route11.blk | 34 - maps/route11gate.blk | Bin 20 -> 0 bytes maps/route11gateupstairs.blk | Bin 16 -> 0 bytes maps/route12.blk | 21 - maps/route12gate.blk | Bin 20 -> 0 bytes maps/route12gateupstairs.blk | Bin 16 -> 0 bytes maps/route12house.blk | 1 - maps/route13.blk | 2 - maps/route14.blk | 74 - maps/route15.blk | 82 - maps/route15gate.blk | Bin 20 -> 0 bytes maps/route15gateupstairs.blk | Bin 16 -> 0 bytes maps/route16.blk | 22 - maps/route16gate.blk | Bin 28 -> 0 bytes maps/route16gateupstairs.blk | Bin 16 -> 0 bytes maps/route16house.blk | 1 - maps/route17.blk | 1 - maps/route18.blk | 1 - maps/route18gate.blk | Bin 20 -> 0 bytes maps/route18gateupstairs.blk | Bin 16 -> 0 bytes maps/route19-yellow.blk | 1 - maps/route19.blk | 1 - maps/route2.blk | 54 - maps/route20.blk | 1 - maps/route21.blk | 10 - maps/route22.blk | 3 - maps/route22gate.blk | Bin 20 -> 0 bytes maps/route23.blk | 57 - maps/route24.blk | 13 - maps/route25.blk | 19 - maps/route2gate.blk | Bin 20 -> 0 bytes maps/route2house.blk | 1 - maps/route3.blk | 55 - maps/route4.blk | 64 - maps/route5.blk | 9 - maps/route5gate.blk | 1 - maps/route6.blk | 21 - maps/route6gate.blk | 1 - maps/route7.blk | 1 - maps/route7gate.blk | 1 - maps/route8.blk | 45 - maps/route8gate.blk | 1 - maps/route9.blk | 29 - maps/safarizonecenter.blk | 1 - maps/safarizoneeast.blk | 1 - maps/safarizoneentrance.blk | 1 - maps/safarizonenorth.blk | 1 - maps/safarizoneresthouse1.blk | Bin 16 -> 0 bytes maps/safarizoneresthouse2.blk | Bin 16 -> 0 bytes maps/safarizoneresthouse3.blk | Bin 16 -> 0 bytes maps/safarizoneresthouse4.blk | Bin 16 -> 0 bytes maps/safarizonesecrethouse.blk | 1 - maps/safarizonewest.blk | 1 - maps/saffroncity.blk | Bin 360 -> 0 bytes maps/saffrongym.blk | 1 - maps/saffronhouse1.blk | 1 - maps/saffronhouse2.blk | 1 - maps/saffronmart.blk | 1 - maps/saffronpokecenter.blk | 2 - maps/school.blk | 1 - maps/seafoamislands1.blk | 1 - maps/seafoamislands2.blk | 1 - maps/seafoamislands3.blk | 1 - maps/seafoamislands4.blk | 1 - maps/seafoamislands5.blk | 1 - maps/silphco1.blk | 1 - maps/silphco10.blk | 2 - maps/silphco11.blk | 1 - maps/silphco2.blk | 1 - maps/silphco3.blk | 1 - maps/silphco4.blk | 1 - maps/silphco5.blk | 1 - maps/silphco6.blk | 1 - maps/silphco7.blk | 1 - maps/silphco8.blk | 1 - maps/silphco9.blk | 1 - maps/silphcoelevator.blk | 1 - maps/ssanne1.blk | 1 - maps/ssanne10.blk | 1 - maps/ssanne2.blk | 1 - maps/ssanne3.blk | 1 - maps/ssanne4.blk | 1 - maps/ssanne5.blk | 1 - maps/ssanne6.blk | 7 - maps/ssanne7.blk | 1 - maps/ssanne8.blk | 7 - maps/ssanne9.blk | 1 - maps/tradecenter.blk | 4 - maps/undergroundpathentranceroute5.blk | Bin 16 -> 0 bytes maps/undergroundpathentranceroute6.blk | Bin 16 -> 0 bytes maps/undergroundpathentranceroute7.blk | Bin 16 -> 0 bytes maps/undergroundpathentranceroute8.blk | Bin 16 -> 0 bytes maps/undergroundpathns.blk | 1 - maps/undergroundpathwe.blk | 1 - maps/unknowndungeon1.blk | 2 - maps/unknowndungeon2.blk | 3 - maps/unknowndungeon3.blk | 1 - maps/unusedblocks58d7d.blk | 2 - maps/unusedblocks60258.blk | 1 - maps/unusedblocks60cef.blk | 1 - maps/vermilioncity.blk | 1 - maps/vermiliondock.blk | 2 - maps/vermiliongym.blk | 1 - maps/vermilionhouse1.blk | 1 - maps/vermilionhouse2.blk | 1 - maps/vermilionhouse3.blk | 1 - maps/vermilionmart.blk | 1 - maps/vermilionpokecenter.blk | 2 - maps/victoryroad1.blk | 2 - maps/victoryroad2.blk | 1 - maps/victoryroad3.blk | 2 - maps/viridiancity.blk | 60 - maps/viridianforest.blk | 1 - maps/viridianforestentrance.blk | Bin 20 -> 0 bytes maps/viridianforestexit.blk | Bin 20 -> 0 bytes maps/viridiangym.blk | 1 - maps/viridianhouse.blk | 1 - maps/viridianmart.blk | 1 - maps/viridianpokecenter.blk | 2 - scripts/AgathasRoom.asm | 154 ++ scripts/BikeShop.asm | 147 ++ scripts/BillsHouse.asm | 214 ++ scripts/BluesHouse.asm | 89 + scripts/BrunosRoom.asm | 151 ++ scripts/CeladonChiefHouse.asm | 20 + scripts/CeladonCity.asm | 132 ++ scripts/CeladonDiner.asm | 66 + scripts/CeladonGym.asm | 335 +++ scripts/CeladonHotel.asm | 19 + scripts/CeladonMansion1F.asm | 39 + scripts/CeladonMansion2F.asm | 10 + scripts/CeladonMansion3F.asm | 71 + scripts/CeladonMansionRoof.asm | 9 + scripts/CeladonMansionRoofHouse.asm | 21 + scripts/CeladonMart1F.asm | 19 + scripts/CeladonMart2F.asm | 21 + scripts/CeladonMart3F.asm | 108 + scripts/CeladonMart4F.asm | 20 + scripts/CeladonMart5F.asm | 21 + scripts/CeladonMartElevator.asm | 73 + scripts/CeladonMartRoof.asm | 255 +++ scripts/CeladonPokecenter.asm | 23 + scripts/CeruleanBadgeHouse.asm | 109 + scripts/CeruleanCave1F.asm | 7 + scripts/CeruleanCave2F.asm | 7 + scripts/CeruleanCaveB1F.asm | 43 + scripts/CeruleanCity.asm | 453 +++++ scripts/CeruleanCity_2.asm | 16 + scripts/CeruleanGym.asm | 219 ++ scripts/CeruleanMart.asm | 15 + scripts/CeruleanPokecenter.asm | 23 + scripts/CeruleanTradeHouse.asm | 17 + scripts/CeruleanTrashedHouse.asm | 39 + scripts/ChampionsRoom.asm | 298 +++ scripts/CinnabarGym.asm | 472 +++++ scripts/CinnabarIsland.asm | 85 + scripts/CinnabarLab.asm | 30 + scripts/CinnabarLabFossilRoom.asm | 109 + scripts/CinnabarLabMetronomeRoom.asm | 62 + scripts/CinnabarLabTradeRoom.asm | 25 + scripts/CinnabarMart.asm | 15 + scripts/CinnabarPokecenter.asm | 23 + scripts/Colosseum.asm | 9 + scripts/CopycatsHouse1F.asm | 22 + scripts/CopycatsHouse2F.asm | 102 + scripts/Daycare.asm | 269 +++ scripts/DiglettsCave.asm | 5 + scripts/DiglettsCaveRoute11.asm | 12 + scripts/DiglettsCaveRoute2.asm | 11 + scripts/FightingDojo.asm | 323 +++ scripts/FuchsiaBillsGrandpasHouse.asm | 20 + scripts/FuchsiaCity.asm | 169 ++ scripts/FuchsiaGoodRodHouse.asm | 75 + scripts/FuchsiaGym.asm | 329 +++ scripts/FuchsiaMart.asm | 15 + scripts/FuchsiaMeetingRoom.asm | 20 + scripts/FuchsiaPokecenter.asm | 23 + scripts/GameCorner.asm | 527 +++++ scripts/GameCornerPrizeRoom.asm | 20 + scripts/HallOfFame.asm | 109 + scripts/IndigoPlateau.asm | 4 + scripts/IndigoPlateauLobby.asm | 36 + scripts/LancesRoom.asm | 162 ++ scripts/LavenderCuboneHouse.asm | 35 + scripts/LavenderMart.asm | 32 + scripts/LavenderPokecenter.asm | 23 + scripts/LavenderTown.asm | 63 + scripts/LoreleisRoom.asm | 153 ++ scripts/MrFujisHouse.asm | 112 + scripts/MrPsychicsHouse.asm | 45 + scripts/MtMoon1F.asm | 224 ++ scripts/MtMoonB1F.asm | 10 + scripts/MtMoonB2F.asm | 406 ++++ scripts/MtMoonPokecenter.asm | 94 + scripts/Museum1F.asm | 247 +++ scripts/Museum2F.asm | 39 + scripts/NameRatersHouse.asm | 107 + scripts/OaksLab.asm | 1233 +++++++++++ scripts/PalletTown.asm | 214 ++ scripts/PewterCity.asm | 322 +++ scripts/PewterGym.asm | 228 +++ scripts/PewterMart.asm | 28 + scripts/PewterNidoranHouse.asm | 23 + scripts/PewterPokecenter.asm | 84 + scripts/PewterSpeechHouse.asm | 14 + scripts/PokemonFanClub.asm | 173 ++ scripts/PokemonMansion1F.asm | 134 ++ scripts/PokemonMansion2F.asm | 140 ++ scripts/PokemonMansion3F.asm | 151 ++ scripts/PokemonMansionB1F.asm | 130 ++ scripts/PokemonTower1F.asm | 29 + scripts/PokemonTower2F.asm | 188 ++ scripts/PokemonTower3F.asm | 101 + scripts/PokemonTower4F.asm | 104 + scripts/PokemonTower5F.asm | 176 ++ scripts/PokemonTower6F.asm | 212 ++ scripts/PokemonTower7F.asm | 312 +++ scripts/PowerPlant.asm | 175 ++ scripts/RedsHouse1F.asm | 69 + scripts/RedsHouse2F.asm | 24 + scripts/RockTunnel1F.asm | 213 ++ scripts/RockTunnelB1F.asm | 241 +++ scripts/RockTunnelPokecenter.asm | 23 + scripts/RocketHideoutB1F.asm | 189 ++ scripts/RocketHideoutB2F.asm | 450 ++++ scripts/RocketHideoutB3F.asm | 206 ++ scripts/RocketHideoutB4F.asm | 220 ++ scripts/RocketHideoutElevator.asm | 85 + scripts/Route1.asm | 52 + scripts/Route10.asm | 198 ++ scripts/Route11.asm | 302 +++ scripts/Route11Gate1F.asm | 9 + scripts/Route11Gate2F.asm | 76 + scripts/Route12.asm | 288 +++ scripts/Route12Gate1F.asm | 9 + scripts/Route12Gate2F.asm | 78 + scripts/Route12SuperRodHouse.asm | 57 + scripts/Route13.asm | 312 +++ scripts/Route14.asm | 302 +++ scripts/Route15.asm | 295 +++ scripts/Route15Gate1F.asm | 9 + scripts/Route15Gate2F.asm | 44 + scripts/Route16.asm | 259 +++ scripts/Route16FlyHouse.asm | 55 + scripts/Route16Gate1F.asm | 121 ++ scripts/Route16Gate2F.asm | 46 + scripts/Route17.asm | 327 +++ scripts/Route18.asm | 111 + scripts/Route18Gate1F.asm | 112 + scripts/Route18Gate2F.asm | 32 + scripts/Route19.asm | 302 +++ scripts/Route2.asm | 16 + scripts/Route20.asm | 353 ++++ scripts/Route21.asm | 269 +++ scripts/Route22.asm | 445 ++++ scripts/Route22Gate.asm | 93 + scripts/Route23.asm | 236 +++ scripts/Route24.asm | 319 +++ scripts/Route25.asm | 303 +++ scripts/Route2Gate.asm | 39 + scripts/Route2TradeHouse.asm | 17 + scripts/Route3.asm | 251 +++ scripts/Route4.asm | 62 + scripts/Route5.asm | 9 + scripts/Route5Gate.asm | 117 ++ scripts/Route6.asm | 186 ++ scripts/Route6Gate.asm | 70 + scripts/Route7.asm | 9 + scripts/Route7Gate.asm | 73 + scripts/Route8.asm | 274 +++ scripts/Route8Gate.asm | 70 + scripts/Route9.asm | 268 +++ scripts/SSAnne1F.asm | 15 + scripts/SSAnne1FRooms.asm | 163 ++ scripts/SSAnne2F.asm | 216 ++ scripts/SSAnne2FRooms.asm | 215 ++ scripts/SSAnne3F.asm | 9 + scripts/SSAnneB1F.asm | 5 + scripts/SSAnneB1FRooms.asm | 201 ++ scripts/SSAnneBow.asm | 88 + scripts/SSAnneCaptainsRoom.asm | 93 + scripts/SSAnneKitchen.asm | 72 + scripts/SafariZoneCenter.asm | 15 + scripts/SafariZoneCenterRestHouse.asm | 14 + scripts/SafariZoneEast.asm | 23 + scripts/SafariZoneEastRestHouse.asm | 20 + scripts/SafariZoneGate.asm | 293 +++ scripts/SafariZoneNorth.asm | 31 + scripts/SafariZoneNorthRestHouse.asm | 20 + scripts/SafariZoneSecretHouse.asm | 45 + scripts/SafariZoneWest.asm | 28 + scripts/SafariZoneWestRestHouse.asm | 20 + scripts/SaffronCity.asm | 122 ++ scripts/SaffronGym.asm | 358 ++++ scripts/SaffronMart.asm | 15 + scripts/SaffronPidgeyHouse.asm | 27 + scripts/SaffronPokecenter.asm | 23 + scripts/SeafoamIslands1F.asm | 47 + scripts/SeafoamIslandsB1F.asm | 46 + scripts/SeafoamIslandsB2F.asm | 46 + scripts/SeafoamIslandsB3F.asm | 149 ++ scripts/SeafoamIslandsB4F.asm | 173 ++ scripts/SilphCo10F.asm | 122 ++ scripts/SilphCo11F.asm | 405 ++++ scripts/SilphCo1F.asm | 16 + scripts/SilphCo2F.asm | 245 +++ scripts/SilphCo3F.asm | 136 ++ scripts/SilphCo4F.asm | 199 ++ scripts/SilphCo5F.asm | 221 ++ scripts/SilphCo6F.asm | 220 ++ scripts/SilphCo7F.asm | 527 +++++ scripts/SilphCo8F.asm | 183 ++ scripts/SilphCo9F.asm | 244 +++ scripts/SilphCoElevator.asm | 88 + scripts/TradeCenter.asm | 38 + scripts/UndergroundPathNorthSouth.asm | 5 + scripts/UndergroundPathRoute5.asm | 18 + scripts/UndergroundPathRoute6.asm | 11 + scripts/UndergroundPathRoute7.asm | 11 + scripts/UndergroundPathRoute7Copy.asm | 24 + scripts/UndergroundPathRoute8.asm | 11 + scripts/UndergroundPathWestEast.asm | 5 + scripts/VermilionCity.asm | 257 +++ scripts/VermilionDock.asm | 215 ++ scripts/VermilionGym.asm | 267 +++ scripts/VermilionMart.asm | 15 + scripts/VermilionOldRodHouse.asm | 57 + scripts/VermilionPidgeyHouse.asm | 24 + scripts/VermilionPokecenter.asm | 23 + scripts/VermilionTradeHouse.asm | 12 + scripts/VictoryRoad1F.asm | 103 + scripts/VictoryRoad2F.asm | 244 +++ scripts/VictoryRoad3F.asm | 197 ++ scripts/ViridianCity.asm | 327 +++ scripts/ViridianForest.asm | 144 ++ scripts/ViridianForestNorthGate.asm | 14 + scripts/ViridianForestSouthGate.asm | 14 + scripts/ViridianGym.asm | 496 +++++ scripts/ViridianMart.asm | 94 + scripts/ViridianNicknameHouse.asm | 33 + scripts/ViridianPokecenter.asm | 23 + scripts/ViridianSchoolHouse.asm | 14 + scripts/WardensHouse.asm | 113 ++ scripts/agatha.asm | 154 -- scripts/bikeshop.asm | 147 -- scripts/billshouse.asm | 214 -- scripts/blueshouse.asm | 89 - scripts/bruno.asm | 151 -- scripts/celadoncity.asm | 132 -- scripts/celadondiner.asm | 66 - scripts/celadongamecorner.asm | 527 ----- scripts/celadongym.asm | 335 --- scripts/celadonhotel.asm | 19 - scripts/celadonhouse.asm | 20 - scripts/celadonmansion1.asm | 39 - scripts/celadonmansion2.asm | 10 - scripts/celadonmansion3.asm | 71 - scripts/celadonmansion4.asm | 9 - scripts/celadonmansion5.asm | 21 - scripts/celadonmart1.asm | 19 - scripts/celadonmart2.asm | 21 - scripts/celadonmart3.asm | 108 - scripts/celadonmart4.asm | 20 - scripts/celadonmart5.asm | 21 - scripts/celadonmartelevator.asm | 73 - scripts/celadonmartroof.asm | 255 --- scripts/celadonpokecenter.asm | 23 - scripts/celadonprizeroom.asm | 20 - scripts/ceruleancity.asm | 453 ----- scripts/ceruleancity2.asm | 16 - scripts/ceruleangym.asm | 219 -- scripts/ceruleanhouse1.asm | 17 - scripts/ceruleanhouse2.asm | 109 - scripts/ceruleanhousetrashed.asm | 39 - scripts/ceruleanmart.asm | 15 - scripts/ceruleanpokecenter.asm | 23 - scripts/cinnabargym.asm | 472 ----- scripts/cinnabarisland.asm | 85 - scripts/cinnabarmart.asm | 15 - scripts/cinnabarpokecenter.asm | 23 - scripts/colosseum.asm | 9 - scripts/copycatshouse1f.asm | 22 - scripts/copycatshouse2f.asm | 102 - scripts/daycarem.asm | 269 --- scripts/diglettscave.asm | 5 - scripts/diglettscaveroute11.asm | 12 - scripts/diglettscaveroute2.asm | 11 - scripts/fanclub.asm | 173 -- scripts/fightingdojo.asm | 323 --- scripts/fuchsiacity.asm | 169 -- scripts/fuchsiagym.asm | 329 --- scripts/fuchsiahouse1.asm | 20 - scripts/fuchsiahouse2.asm | 113 -- scripts/fuchsiahouse3.asm | 75 - scripts/fuchsiamart.asm | 15 - scripts/fuchsiameetingroom.asm | 20 - scripts/fuchsiapokecenter.asm | 23 - scripts/gary.asm | 298 --- scripts/halloffameroom.asm | 109 - scripts/indigoplateau.asm | 4 - scripts/indigoplateaulobby.asm | 36 - scripts/lab1.asm | 30 - scripts/lab2.asm | 25 - scripts/lab3.asm | 62 - scripts/lab4.asm | 109 - scripts/lance.asm | 162 -- scripts/lavenderhouse1.asm | 112 - scripts/lavenderhouse2.asm | 35 - scripts/lavendermart.asm | 32 - scripts/lavenderpokecenter.asm | 23 - scripts/lavendertown.asm | 63 - scripts/lorelei.asm | 153 -- scripts/mansion1.asm | 134 -- scripts/mansion2.asm | 140 -- scripts/mansion3.asm | 151 -- scripts/mansion4.asm | 130 -- scripts/mtmoon1.asm | 224 -- scripts/mtmoon2.asm | 10 - scripts/mtmoon3.asm | 406 ---- scripts/mtmoonpokecenter.asm | 94 - scripts/museum1f.asm | 247 --- scripts/museum2f.asm | 39 - scripts/namerater.asm | 107 - scripts/oakslab.asm | 1233 ----------- scripts/pallettown.asm | 214 -- scripts/pewtercity.asm | 322 --- scripts/pewtergym.asm | 228 --- scripts/pewterhouse1.asm | 23 - scripts/pewterhouse2.asm | 14 - scripts/pewtermart.asm | 28 - scripts/pewterpokecenter.asm | 84 - scripts/pokemontower1.asm | 29 - scripts/pokemontower2.asm | 188 -- scripts/pokemontower3.asm | 101 - scripts/pokemontower4.asm | 104 - scripts/pokemontower5.asm | 176 -- scripts/pokemontower6.asm | 212 -- scripts/pokemontower7.asm | 312 --- scripts/powerplant.asm | 175 -- scripts/redshouse1f.asm | 69 - scripts/redshouse2f.asm | 24 - scripts/rockethideout1.asm | 189 -- scripts/rockethideout2.asm | 450 ---- scripts/rockethideout3.asm | 206 -- scripts/rockethideout4.asm | 220 -- scripts/rockethideoutelevator.asm | 85 - scripts/rocktunnel1.asm | 213 -- scripts/rocktunnel2.asm | 241 --- scripts/rocktunnelpokecenter.asm | 23 - scripts/route1.asm | 52 - scripts/route10.asm | 198 -- scripts/route11.asm | 302 --- scripts/route11gate.asm | 9 - scripts/route11gateupstairs.asm | 76 - scripts/route12.asm | 288 --- scripts/route12gate.asm | 9 - scripts/route12gateupstairs.asm | 78 - scripts/route12house.asm | 57 - scripts/route13.asm | 312 --- scripts/route14.asm | 302 --- scripts/route15.asm | 295 --- scripts/route15gate.asm | 9 - scripts/route15gateupstairs.asm | 44 - scripts/route16.asm | 259 --- scripts/route16gate.asm | 121 -- scripts/route16gateupstairs.asm | 46 - scripts/route16house.asm | 55 - scripts/route17.asm | 327 --- scripts/route18.asm | 111 - scripts/route18gate.asm | 112 - scripts/route18gateupstairs.asm | 32 - scripts/route19.asm | 302 --- scripts/route2.asm | 16 - scripts/route20.asm | 353 ---- scripts/route21.asm | 269 --- scripts/route22.asm | 445 ---- scripts/route22gate.asm | 93 - scripts/route23.asm | 236 --- scripts/route24.asm | 319 --- scripts/route25.asm | 303 --- scripts/route2gate.asm | 39 - scripts/route2house.asm | 17 - scripts/route3.asm | 251 --- scripts/route4.asm | 62 - scripts/route5.asm | 9 - scripts/route5gate.asm | 117 -- scripts/route6.asm | 186 -- scripts/route6gate.asm | 70 - scripts/route7.asm | 9 - scripts/route7gate.asm | 73 - scripts/route8.asm | 274 --- scripts/route8gate.asm | 70 - scripts/route9.asm | 268 --- scripts/safarizonecenter.asm | 15 - scripts/safarizoneeast.asm | 23 - scripts/safarizoneentrance.asm | 293 --- scripts/safarizonenorth.asm | 31 - scripts/safarizoneresthouse1.asm | 14 - scripts/safarizoneresthouse2.asm | 20 - scripts/safarizoneresthouse3.asm | 20 - scripts/safarizoneresthouse4.asm | 20 - scripts/safarizonesecrethouse.asm | 45 - scripts/safarizonewest.asm | 28 - scripts/saffroncity.asm | 122 -- scripts/saffrongym.asm | 358 ---- scripts/saffronhouse1.asm | 27 - scripts/saffronhouse2.asm | 45 - scripts/saffronmart.asm | 15 - scripts/saffronpokecenter.asm | 23 - scripts/school.asm | 14 - scripts/seafoamislands1.asm | 47 - scripts/seafoamislands2.asm | 46 - scripts/seafoamislands3.asm | 46 - scripts/seafoamislands4.asm | 149 -- scripts/seafoamislands5.asm | 173 -- scripts/silphco1.asm | 16 - scripts/silphco10.asm | 122 -- scripts/silphco11.asm | 405 ---- scripts/silphco2.asm | 245 --- scripts/silphco3.asm | 136 -- scripts/silphco4.asm | 199 -- scripts/silphco5.asm | 221 -- scripts/silphco6.asm | 220 -- scripts/silphco7.asm | 527 ----- scripts/silphco8.asm | 183 -- scripts/silphco9.asm | 244 --- scripts/silphcoelevator.asm | 88 - scripts/ssanne1.asm | 15 - scripts/ssanne10.asm | 201 -- scripts/ssanne2.asm | 216 -- scripts/ssanne3.asm | 9 - scripts/ssanne4.asm | 5 - scripts/ssanne5.asm | 88 - scripts/ssanne6.asm | 72 - scripts/ssanne7.asm | 93 - scripts/ssanne8.asm | 163 -- scripts/ssanne9.asm | 215 -- scripts/tradecenter.asm | 38 - scripts/undergroundpathentranceroute5.asm | 18 - scripts/undergroundpathentranceroute6.asm | 11 - scripts/undergroundpathentranceroute7.asm | 11 - scripts/undergroundpathentranceroute7copy.asm | 24 - scripts/undergroundpathentranceroute8.asm | 11 - scripts/undergroundpathns.asm | 5 - scripts/undergroundpathwe.asm | 5 - scripts/unknowndungeon1.asm | 7 - scripts/unknowndungeon2.asm | 7 - scripts/unknowndungeon3.asm | 43 - scripts/vermilioncity.asm | 257 --- scripts/vermiliondock.asm | 215 -- scripts/vermiliongym.asm | 267 --- scripts/vermilionhouse1.asm | 24 - scripts/vermilionhouse2.asm | 57 - scripts/vermilionhouse3.asm | 12 - scripts/vermilionmart.asm | 15 - scripts/vermilionpokecenter.asm | 23 - scripts/victoryroad1.asm | 103 - scripts/victoryroad2.asm | 244 --- scripts/victoryroad3.asm | 197 -- scripts/viridiancity.asm | 327 --- scripts/viridianforest.asm | 144 -- scripts/viridianforestentrance.asm | 14 - scripts/viridianforestexit.asm | 14 - scripts/viridiangym.asm | 496 ----- scripts/viridianhouse.asm | 33 - scripts/viridianmart.asm | 93 - scripts/viridianpokecenter.asm | 23 - text.asm | 427 ++-- text/maps/AgathasRoom.asm | 44 + text/maps/BikeShop.asm | 70 + text/maps/BillsHouse.asm | 87 + text/maps/BluesHouse.asm | 41 + text/maps/BrunosRoom.asm | 37 + text/maps/CeladonChiefHouse.asm | 22 + text/maps/CeladonCity.asm | 152 ++ text/maps/CeladonDiner.asm | 59 + text/maps/CeladonGym.asm | 219 ++ text/maps/CeladonHotel.asm | 21 + text/maps/CeladonMansion1F.asm | 23 + text/maps/CeladonMansion2F.asm | 4 + text/maps/CeladonMansion3F.asm | 66 + text/maps/CeladonMansionRoof.asm | 3 + text/maps/CeladonMansionRoofHouse.asm | 10 + text/maps/CeladonMart1F.asm | 31 + text/maps/CeladonMart2F.asm | 22 + text/maps/CeladonMart3F.asm | 98 + text/maps/CeladonMart4F.asm | 26 + text/maps/CeladonMart5F.asm | 28 + text/maps/CeladonMartRoof.asm | 141 ++ text/maps/CeladonPokecenter.asm | 12 + text/maps/CeruleanBadgeHouse.asm | 97 + text/maps/CeruleanCaveB1F.asm | 2 + text/maps/CeruleanCity.asm | 233 +++ text/maps/CeruleanGym.asm | 131 ++ text/maps/CeruleanMart.asm | 19 + text/maps/CeruleanPokecenter.asm | 24 + text/maps/CeruleanTradeHouse.asm | 9 + text/maps/CeruleanTrashedHouse.asm | 36 + text/maps/ChampionsRoom.asm | 146 ++ text/maps/CinnabarGym.asm | 210 ++ text/maps/CinnabarIsland.asm | 37 + text/maps/CinnabarLab.asm | 29 + text/maps/CinnabarLabFossilRoom.asm | 78 + text/maps/CinnabarLabMetronomeRoom.asm | 63 + text/maps/CinnabarLabTradeRoom.asm | 9 + text/maps/CinnabarMart.asm | 10 + text/maps/CinnabarPokecenter.asm | 21 + text/maps/CopycatsHouse1F.asm | 20 + text/maps/CopycatsHouse2F.asm | 97 + text/maps/Daycare.asm | 62 + text/maps/Daycare_2.asm | 33 + text/maps/DiglettsCaveRoute11.asm | 8 + text/maps/DiglettsCaveRoute2.asm | 9 + text/maps/FightingDojo.asm | 130 ++ text/maps/FuchsiaBillsGrandpasHouse.asm | 27 + text/maps/FuchsiaCity.asm | 119 ++ text/maps/FuchsiaGoodRodHouse.asm | 43 + text/maps/FuchsiaGym.asm | 26 + text/maps/FuchsiaGym_2.asm | 193 ++ text/maps/FuchsiaMart.asm | 14 + text/maps/FuchsiaMeetingRoom.asm | 26 + text/maps/FuchsiaPokecenter.asm | 20 + text/maps/GameCorner.asm | 186 ++ text/maps/GameCornerPrizeRoom.asm | 12 + text/maps/HallOfFame.asm | 28 + text/maps/IndigoPlateauLobby.asm | 25 + text/maps/LancesRoom.asm | 63 + text/maps/LavenderCuboneHouse.asm | 24 + text/maps/LavenderMart.asm | 30 + text/maps/LavenderPokecenter.asm | 12 + text/maps/LavenderTown.asm | 64 + text/maps/LoreleisRoom.asm | 42 + text/maps/MrFujisHouse.asm | 86 + text/maps/MrPsychicsHouse.asm | 25 + text/maps/MtMoon1F.asm | 119 ++ text/maps/MtMoonB1F.asm | 3 + text/maps/MtMoonB2F.asm | 122 ++ text/maps/MtMoonPokecenter.asm | 48 + text/maps/Museum1F.asm | 107 + text/maps/Museum2F.asm | 45 + text/maps/NameRatersHouse.asm | 60 + text/maps/OaksLab.asm | 477 +++++ text/maps/PalletTown.asm | 55 + text/maps/PewterCity.asm | 117 ++ text/maps/PewterGym.asm | 18 + text/maps/PewterGym_2.asm | 144 ++ text/maps/PewterMart.asm | 17 + text/maps/PewterNidoranHouse.asm | 24 + text/maps/PewterPokecenter.asm | 14 + text/maps/PewterSpeechHouse.asm | 19 + text/maps/PokemonFanClub.asm | 143 ++ text/maps/PokemonMansion1F.asm | 29 + text/maps/PokemonMansion2F.asm | 47 + text/maps/PokemonMansion3F.asm | 37 + text/maps/PokemonMansionB1F.asm | 39 + text/maps/PokemonTower1F.asm | 31 + text/maps/PokemonTower2F.asm | 57 + text/maps/PokemonTower3F.asm | 45 + text/maps/PokemonTower4F.asm | 45 + text/maps/PokemonTower5F.asm | 71 + text/maps/PokemonTower6F.asm | 61 + text/maps/PokemonTower7F.asm | 78 + text/maps/PowerPlant.asm | 6 + text/maps/RedsHouse1F.asm | 37 + text/maps/RockTunnel1F.asm | 115 ++ text/maps/RockTunnelB1F.asm | 108 + text/maps/RockTunnelB1F_2.asm | 20 + text/maps/RockTunnelPokecenter.asm | 13 + text/maps/RocketHideoutB1F.asm | 73 + text/maps/RocketHideoutB2F.asm | 17 + text/maps/RocketHideoutB3F.asm | 35 + text/maps/RocketHideoutB4F.asm | 74 + text/maps/RocketHideoutElevator.asm | 3 + text/maps/Route1.asm | 49 + text/maps/Route10.asm | 109 + text/maps/Route11.asm | 133 ++ text/maps/Route11Gate1F.asm | 14 + text/maps/Route11Gate2F.asm | 40 + text/maps/Route11_2.asm | 28 + text/maps/Route12.asm | 139 ++ text/maps/Route12Gate1F.asm | 4 + text/maps/Route12Gate2F.asm | 42 + text/maps/Route12SuperRodHouse.asm | 61 + text/maps/Route13.asm | 179 ++ text/maps/Route14.asm | 173 ++ text/maps/Route15.asm | 171 ++ text/maps/Route15Gate1F.asm | 7 + text/maps/Route15Gate2F.asm | 24 + text/maps/Route16.asm | 120 ++ text/maps/Route16FlyHouse.asm | 31 + text/maps/Route16Gate1F.asm | 22 + text/maps/Route16Gate2F.asm | 26 + text/maps/Route17.asm | 195 ++ text/maps/Route18.asm | 58 + text/maps/Route18Gate1F.asm | 14 + text/maps/Route18Gate2F.asm | 15 + text/maps/Route19.asm | 157 ++ text/maps/Route2.asm | 9 + text/maps/Route20.asm | 156 ++ text/maps/Route21.asm | 137 ++ text/maps/Route22.asm | 104 + text/maps/Route22Gate.asm | 20 + text/maps/Route23.asm | 39 + text/maps/Route24.asm | 65 + text/maps/Route24_2.asm | 90 + text/maps/Route25.asm | 156 ++ text/maps/Route2Gate.asm | 12 + text/maps/Route2TradeHouse.asm | 6 + text/maps/Route3.asm | 145 ++ text/maps/Route4.asm | 35 + text/maps/Route5.asm | 5 + text/maps/Route6.asm | 97 + text/maps/Route7.asm | 5 + text/maps/Route8.asm | 154 ++ text/maps/Route9.asm | 157 ++ text/maps/SSAnne1F.asm | 21 + text/maps/SSAnne1FRooms.asm | 104 + text/maps/SSAnne2F.asm | 63 + text/maps/SSAnne2FRooms.asm | 113 ++ text/maps/SSAnne3F.asm | 7 + text/maps/SSAnneB1FRooms.asm | 112 + text/maps/SSAnneBow.asm | 52 + text/maps/SSAnneCaptainsRoom.asm | 62 + text/maps/SSAnneKitchen.asm | 69 + text/maps/SafariZoneCenter.asm | 11 + text/maps/SafariZoneCenterRestHouse.asm | 11 + text/maps/SafariZoneEast.asm | 16 + text/maps/SafariZoneEastRestHouse.asm | 18 + text/maps/SafariZoneGate.asm | 94 + text/maps/SafariZoneNorth.asm | 33 + text/maps/SafariZoneNorthRestHouse.asm | 27 + text/maps/SafariZoneSecretHouse.asm | 44 + text/maps/SafariZoneWest.asm | 31 + text/maps/SafariZoneWestRestHouse.asm | 19 + text/maps/SaffronCity.asm | 151 ++ text/maps/SaffronGates.asm | 37 + text/maps/SaffronGym.asm | 237 +++ text/maps/SaffronMart.asm | 13 + text/maps/SaffronPidgeyHouse.asm | 26 + text/maps/SaffronPokecenter.asm | 12 + text/maps/SeafoamIslandsB4F.asm | 13 + text/maps/SilphCo10F.asm | 42 + text/maps/SilphCo11F.asm | 134 ++ text/maps/SilphCo1F.asm | 7 + text/maps/SilphCo2F.asm | 96 + text/maps/SilphCo3F.asm | 46 + text/maps/SilphCo4F.asm | 56 + text/maps/SilphCo5F.asm | 51 + text/maps/SilphCo5F_2.asm | 55 + text/maps/SilphCo6F.asm | 107 + text/maps/SilphCo7F.asm | 209 ++ text/maps/SilphCo8F.asm | 56 + text/maps/SilphCo9F.asm | 62 + text/maps/UndergroundPathRoute6.asm | 5 + text/maps/UndergroundPathRoute7.asm | 5 + text/maps/UndergroundPathRoute7Copy.asm | 35 + text/maps/UndergroundPathRoute8.asm | 5 + text/maps/VermilionCity.asm | 126 ++ text/maps/VermilionDock.asm | 3 + text/maps/VermilionGym.asm | 21 + text/maps/VermilionGym_2.asm | 144 ++ text/maps/VermilionMart.asm | 23 + text/maps/VermilionOldRodHouse.asm | 54 + text/maps/VermilionPidgeyHouse.asm | 21 + text/maps/VermilionPokecenter.asm | 19 + text/maps/VictoryRoad1F.asm | 31 + text/maps/VictoryRoad2F.asm | 85 + text/maps/VictoryRoad3F.asm | 63 + text/maps/ViridianCity.asm | 180 ++ text/maps/ViridianForest.asm | 123 ++ text/maps/ViridianForestNorthGate.asm | 19 + text/maps/ViridianForestSouthGate.asm | 13 + text/maps/ViridianGym.asm | 237 +++ text/maps/ViridianMart.asm | 30 + text/maps/ViridianNicknameHouse.asm | 23 + text/maps/ViridianPokecenter.asm | 16 + text/maps/ViridianSchoolHouse.asm | 13 + text/maps/WardensHouse.asm | 84 + text/maps/agatha.asm | 44 - text/maps/bike_shop.asm | 70 - text/maps/bills_house.asm | 87 - text/maps/blues_house.asm | 41 - text/maps/bruno.asm | 37 - text/maps/celadon_city.asm | 152 -- text/maps/celadon_dept_store_1f.asm | 31 - text/maps/celadon_dept_store_2f.asm | 22 - text/maps/celadon_dept_store_3f.asm | 98 - text/maps/celadon_dept_store_4f.asm | 26 - text/maps/celadon_dept_store_5f.asm | 28 - text/maps/celadon_dept_store_roof.asm | 138 -- text/maps/celadon_diner.asm | 59 - text/maps/celadon_game_corner.asm | 186 -- text/maps/celadon_gym.asm | 218 -- text/maps/celadon_hotel.asm | 21 - text/maps/celadon_house.asm | 22 - text/maps/celadon_mansion_1f.asm | 23 - text/maps/celadon_mansion_2f.asm | 4 - text/maps/celadon_mansion_3f.asm | 66 - text/maps/celadon_mansion_4f_inside.asm | 10 - text/maps/celadon_mansion_4f_outside.asm | 3 - text/maps/celadon_pokecenter.asm | 12 - text/maps/celadon_prize_room.asm | 12 - text/maps/cerulean_badge_house.asm | 97 - text/maps/cerulean_city.asm | 232 --- text/maps/cerulean_gym.asm | 131 -- text/maps/cerulean_mart.asm | 19 - text/maps/cerulean_pokecenter.asm | 24 - text/maps/cerulean_trade_house.asm | 9 - text/maps/cerulean_trashed_house.asm | 36 - text/maps/champion.asm | 146 -- text/maps/cinnabar_gym.asm | 209 -- text/maps/cinnabar_island.asm | 37 - text/maps/cinnabar_lab.asm | 29 - text/maps/cinnabar_lab_fossil_room.asm | 78 - text/maps/cinnabar_lab_metronome_room.asm | 63 - text/maps/cinnabar_lab_trade_room.asm | 9 - text/maps/cinnabar_mart.asm | 10 - text/maps/cinnabar_pokecenter.asm | 21 - text/maps/copycats_house_1f.asm | 20 - text/maps/copycats_house_2f.asm | 96 - text/maps/daycare_1.asm | 62 - text/maps/daycare_2.asm | 33 - text/maps/digletts_cave_route_11_entrance.asm | 8 - text/maps/digletts_cave_route_2_entrance.asm | 9 - text/maps/fan_club.asm | 143 -- text/maps/fighting_dojo.asm | 130 -- text/maps/fuchsia_city.asm | 119 -- text/maps/fuchsia_fishing_house.asm | 43 - text/maps/fuchsia_gym_1.asm | 26 - text/maps/fuchsia_gym_2.asm | 193 -- text/maps/fuchsia_house.asm | 27 - text/maps/fuchsia_mart.asm | 14 - text/maps/fuchsia_meeting_room.asm | 26 - text/maps/fuchsia_pokecenter.asm | 20 - text/maps/fujis_house.asm | 85 - text/maps/hall_of_fame.asm | 28 - text/maps/indigo_plateau_lobby.asm | 25 - text/maps/lance.asm | 63 - text/maps/lavender_house.asm | 24 - text/maps/lavender_mart.asm | 30 - text/maps/lavender_pokecenter.asm | 12 - text/maps/lavender_town.asm | 64 - text/maps/lorelei.asm | 42 - text/maps/mansion_1f.asm | 29 - text/maps/mansion_2f.asm | 47 - text/maps/mansion_3f.asm | 37 - text/maps/mansion_b1f.asm | 39 - text/maps/mr_psychics_house.asm | 25 - text/maps/mt_moon_1f.asm | 119 -- text/maps/mt_moon_b1f.asm | 3 - text/maps/mt_moon_b2f.asm | 122 -- text/maps/mt_moon_pokecenter.asm | 48 - text/maps/museum_1f.asm | 107 - text/maps/museum_2f.asm | 45 - text/maps/name_rater.asm | 60 - text/maps/oaks_lab.asm | 477 ----- text/maps/pallet_town.asm | 55 - text/maps/pewter_city.asm | 117 -- text/maps/pewter_gym_1.asm | 18 - text/maps/pewter_gym_2.asm | 142 -- text/maps/pewter_house_1.asm | 24 - text/maps/pewter_house_2.asm | 19 - text/maps/pewter_mart.asm | 17 - text/maps/pewter_pokecenter.asm | 14 - text/maps/pokemon_league_gate.asm | 19 - text/maps/pokemon_tower_1f.asm | 31 - text/maps/pokemon_tower_2f.asm | 57 - text/maps/pokemon_tower_3f.asm | 45 - text/maps/pokemon_tower_4f.asm | 45 - text/maps/pokemon_tower_5f.asm | 71 - text/maps/pokemon_tower_6f.asm | 61 - text/maps/pokemon_tower_7f.asm | 78 - text/maps/power_plant.asm | 6 - text/maps/reds_house_1f.asm | 37 - text/maps/rock_tunnel_b1f.asm | 115 -- text/maps/rock_tunnel_b2f_1.asm | 108 - text/maps/rock_tunnel_b2f_2.asm | 20 - text/maps/rock_tunnel_pokecenter.asm | 13 - text/maps/rocket_hideout_b1f.asm | 73 - text/maps/rocket_hideout_b2f.asm | 17 - text/maps/rocket_hideout_b3f.asm | 35 - text/maps/rocket_hideout_b4f.asm | 74 - text/maps/rocket_hideout_elevator.asm | 3 - text/maps/route_1.asm | 49 - text/maps/route_10.asm | 109 - text/maps/route_11_1.asm | 133 -- text/maps/route_11_2.asm | 28 - text/maps/route_11_gate.asm | 14 - text/maps/route_11_gate_upstairs.asm | 40 - text/maps/route_12.asm | 139 -- text/maps/route_12_gate.asm | 4 - text/maps/route_12_gate_upstairs.asm | 42 - text/maps/route_12_house.asm | 60 - text/maps/route_13.asm | 179 -- text/maps/route_14.asm | 173 -- text/maps/route_15.asm | 171 -- text/maps/route_15_gate.asm | 7 - text/maps/route_15_gate_upstairs.asm | 24 - text/maps/route_16.asm | 120 -- text/maps/route_16_gate.asm | 22 - text/maps/route_16_gate_upstairs.asm | 26 - text/maps/route_16_house.asm | 31 - text/maps/route_17.asm | 195 -- text/maps/route_18.asm | 58 - text/maps/route_18_gate.asm | 14 - text/maps/route_18_gate_upstairs.asm | 15 - text/maps/route_19.asm | 157 -- text/maps/route_2.asm | 9 - text/maps/route_20.asm | 156 -- text/maps/route_21.asm | 137 -- text/maps/route_22.asm | 104 - text/maps/route_23.asm | 38 - text/maps/route_24_1.asm | 64 - text/maps/route_24_2.asm | 90 - text/maps/route_25.asm | 156 -- text/maps/route_2_gate.asm | 12 - text/maps/route_2_house.asm | 6 - text/maps/route_3.asm | 145 -- text/maps/route_4.asm | 35 - text/maps/route_5.asm | 5 - text/maps/route_6.asm | 97 - text/maps/route_7.asm | 5 - text/maps/route_8.asm | 154 -- text/maps/route_9.asm | 157 -- text/maps/safari_zone_center.asm | 11 - text/maps/safari_zone_east.asm | 16 - text/maps/safari_zone_entrance.asm | 93 - text/maps/safari_zone_north.asm | 33 - text/maps/safari_zone_rest_house_1.asm | 11 - text/maps/safari_zone_rest_house_2.asm | 19 - text/maps/safari_zone_rest_house_3.asm | 18 - text/maps/safari_zone_rest_house_4.asm | 27 - text/maps/safari_zone_secret_house.asm | 44 - text/maps/safari_zone_west.asm | 31 - text/maps/saffron_city.asm | 151 -- text/maps/saffron_gates.asm | 36 - text/maps/saffron_gym.asm | 236 --- text/maps/saffron_house.asm | 26 - text/maps/saffron_mart.asm | 13 - text/maps/saffron_pokecenter.asm | 12 - text/maps/school.asm | 13 - text/maps/seafoam_islands_b4f.asm | 13 - text/maps/silph_co_10f.asm | 42 - text/maps/silph_co_11f.asm | 134 -- text/maps/silph_co_1f.asm | 7 - text/maps/silph_co_2f.asm | 96 - text/maps/silph_co_3f.asm | 46 - text/maps/silph_co_4f.asm | 56 - text/maps/silph_co_5f_1.asm | 51 - text/maps/silph_co_5f_2.asm | 55 - text/maps/silph_co_6f.asm | 107 - text/maps/silph_co_7f.asm | 209 -- text/maps/silph_co_8f.asm | 56 - text/maps/silph_co_9f.asm | 62 - text/maps/ss_anne_1.asm | 21 - text/maps/ss_anne_10.asm | 112 - text/maps/ss_anne_2.asm | 63 - text/maps/ss_anne_3.asm | 7 - text/maps/ss_anne_5.asm | 52 - text/maps/ss_anne_6.asm | 69 - text/maps/ss_anne_7.asm | 62 - text/maps/ss_anne_8.asm | 104 - text/maps/ss_anne_9.asm | 113 -- text/maps/underground_path_route_6_entrance.asm | 5 - text/maps/underground_path_route_7_entrance.asm | 5 - .../underground_path_route_7_entrance_unused.asm | 35 - text/maps/underground_path_route_8_entrance.asm | 5 - text/maps/unknown_dungeon_b1f.asm | 2 - text/maps/vermilion_city.asm | 126 -- text/maps/vermilion_dock.asm | 3 - text/maps/vermilion_fishing_house.asm | 53 - text/maps/vermilion_gym_1.asm | 21 - text/maps/vermilion_gym_2.asm | 143 -- text/maps/vermilion_house.asm | 21 - text/maps/vermilion_mart.asm | 23 - text/maps/vermilion_pokecenter.asm | 19 - text/maps/victory_road_1f.asm | 31 - text/maps/victory_road_2f.asm | 85 - text/maps/victory_road_3f.asm | 63 - text/maps/viridian_city.asm | 180 -- text/maps/viridian_forest.asm | 123 -- text/maps/viridian_forest_entrance.asm | 13 - text/maps/viridian_forest_exit.asm | 19 - text/maps/viridian_gym.asm | 236 --- text/maps/viridian_house.asm | 23 - text/maps/viridian_mart.asm | 30 - text/maps/viridian_pokecenter.asm | 16 - text/maps/wardens_house.asm | 83 - wram.asm | 109 +- 2242 files changed, 52570 insertions(+), 52105 deletions(-) create mode 100755 data/mapHeaders/AgathasRoom.asm create mode 100755 data/mapHeaders/BikeShop.asm create mode 100755 data/mapHeaders/BillsHouse.asm create mode 100755 data/mapHeaders/BluesHouse.asm create mode 100755 data/mapHeaders/BrunosRoom.asm create mode 100755 data/mapHeaders/CeladonChiefHouse.asm create mode 100755 data/mapHeaders/CeladonCity.asm create mode 100755 data/mapHeaders/CeladonDiner.asm create mode 100755 data/mapHeaders/CeladonGym.asm create mode 100755 data/mapHeaders/CeladonHotel.asm create mode 100755 data/mapHeaders/CeladonMansion1F.asm create mode 100755 data/mapHeaders/CeladonMansion2F.asm create mode 100755 data/mapHeaders/CeladonMansion3F.asm create mode 100755 data/mapHeaders/CeladonMansionRoof.asm create mode 100755 data/mapHeaders/CeladonMansionRoofHouse.asm create mode 100755 data/mapHeaders/CeladonMart1F.asm create mode 100755 data/mapHeaders/CeladonMart2F.asm create mode 100755 data/mapHeaders/CeladonMart3F.asm create mode 100755 data/mapHeaders/CeladonMart4F.asm create mode 100755 data/mapHeaders/CeladonMart5F.asm create mode 100755 data/mapHeaders/CeladonMartElevator.asm create mode 100755 data/mapHeaders/CeladonMartRoof.asm create mode 100755 data/mapHeaders/CeladonPokecenter.asm create mode 100755 data/mapHeaders/CeruleanBadgeHouse.asm create mode 100755 data/mapHeaders/CeruleanCave1F.asm create mode 100755 data/mapHeaders/CeruleanCave2F.asm create mode 100755 data/mapHeaders/CeruleanCaveB1F.asm create mode 100755 data/mapHeaders/CeruleanCity.asm create mode 100755 data/mapHeaders/CeruleanGym.asm create mode 100755 data/mapHeaders/CeruleanMart.asm create mode 100755 data/mapHeaders/CeruleanPokecenter.asm create mode 100755 data/mapHeaders/CeruleanTradeHouse.asm create mode 100755 data/mapHeaders/CeruleanTrashedHouse.asm create mode 100755 data/mapHeaders/ChampionsRoom.asm create mode 100755 data/mapHeaders/CinnabarGym.asm create mode 100755 data/mapHeaders/CinnabarIsland.asm create mode 100755 data/mapHeaders/CinnabarLab.asm create mode 100755 data/mapHeaders/CinnabarLabFossilRoom.asm create mode 100755 data/mapHeaders/CinnabarLabMetronomeRoom.asm create mode 100755 data/mapHeaders/CinnabarLabTradeRoom.asm create mode 100755 data/mapHeaders/CinnabarMart.asm create mode 100755 data/mapHeaders/CinnabarPokecenter.asm create mode 100755 data/mapHeaders/Colosseum.asm create mode 100755 data/mapHeaders/CopycatsHouse1F.asm create mode 100755 data/mapHeaders/CopycatsHouse2F.asm create mode 100755 data/mapHeaders/Daycare.asm create mode 100755 data/mapHeaders/DiglettsCave.asm create mode 100755 data/mapHeaders/DiglettsCaveRoute11.asm create mode 100755 data/mapHeaders/DiglettsCaveRoute2.asm create mode 100755 data/mapHeaders/FightingDojo.asm create mode 100755 data/mapHeaders/FuchsiaBillsGrandpasHouse.asm create mode 100755 data/mapHeaders/FuchsiaCity.asm create mode 100755 data/mapHeaders/FuchsiaGoodRodHouse.asm create mode 100755 data/mapHeaders/FuchsiaGym.asm create mode 100755 data/mapHeaders/FuchsiaMart.asm create mode 100755 data/mapHeaders/FuchsiaMeetingRoom.asm create mode 100755 data/mapHeaders/FuchsiaPokecenter.asm create mode 100755 data/mapHeaders/GameCorner.asm create mode 100755 data/mapHeaders/GameCornerPrizeRoom.asm create mode 100755 data/mapHeaders/HallOfFame.asm create mode 100755 data/mapHeaders/IndigoPlateau.asm create mode 100755 data/mapHeaders/IndigoPlateauLobby.asm create mode 100755 data/mapHeaders/LancesRoom.asm create mode 100755 data/mapHeaders/LavenderCuboneHouse.asm create mode 100755 data/mapHeaders/LavenderMart.asm create mode 100755 data/mapHeaders/LavenderPokecenter.asm create mode 100755 data/mapHeaders/LavenderTown.asm create mode 100755 data/mapHeaders/LoreleisRoom.asm create mode 100755 data/mapHeaders/MrFujisHouse.asm create mode 100755 data/mapHeaders/MrPsychicsHouse.asm create mode 100755 data/mapHeaders/MtMoon1F.asm create mode 100755 data/mapHeaders/MtMoonB1F.asm create mode 100755 data/mapHeaders/MtMoonB2F.asm create mode 100755 data/mapHeaders/MtMoonPokecenter.asm create mode 100755 data/mapHeaders/Museum1F.asm create mode 100755 data/mapHeaders/Museum2F.asm create mode 100755 data/mapHeaders/NameRatersHouse.asm create mode 100755 data/mapHeaders/OaksLab.asm create mode 100755 data/mapHeaders/PalletTown.asm create mode 100755 data/mapHeaders/PewterCity.asm create mode 100755 data/mapHeaders/PewterGym.asm create mode 100755 data/mapHeaders/PewterMart.asm create mode 100755 data/mapHeaders/PewterNidoranHouse.asm create mode 100755 data/mapHeaders/PewterPokecenter.asm create mode 100755 data/mapHeaders/PewterSpeechHouse.asm create mode 100755 data/mapHeaders/PokemonFanClub.asm create mode 100755 data/mapHeaders/PokemonMansion1F.asm create mode 100755 data/mapHeaders/PokemonMansion2F.asm create mode 100755 data/mapHeaders/PokemonMansion3F.asm create mode 100755 data/mapHeaders/PokemonMansionB1F.asm create mode 100755 data/mapHeaders/PokemonTower1F.asm create mode 100755 data/mapHeaders/PokemonTower2F.asm create mode 100755 data/mapHeaders/PokemonTower3F.asm create mode 100755 data/mapHeaders/PokemonTower4F.asm create mode 100755 data/mapHeaders/PokemonTower5F.asm create mode 100755 data/mapHeaders/PokemonTower6F.asm create mode 100755 data/mapHeaders/PokemonTower7F.asm create mode 100755 data/mapHeaders/PowerPlant.asm create mode 100755 data/mapHeaders/RedsHouse1F.asm create mode 100755 data/mapHeaders/RedsHouse2F.asm create mode 100755 data/mapHeaders/RockTunnel1F.asm create mode 100755 data/mapHeaders/RockTunnelB1F.asm create mode 100755 data/mapHeaders/RockTunnelPokecenter.asm create mode 100755 data/mapHeaders/RocketHideoutB1F.asm create mode 100755 data/mapHeaders/RocketHideoutB2F.asm create mode 100755 data/mapHeaders/RocketHideoutB3F.asm create mode 100755 data/mapHeaders/RocketHideoutB4F.asm create mode 100755 data/mapHeaders/RocketHideoutElevator.asm create mode 100755 data/mapHeaders/Route1.asm create mode 100755 data/mapHeaders/Route10.asm create mode 100755 data/mapHeaders/Route11.asm create mode 100755 data/mapHeaders/Route11Gate1F.asm create mode 100755 data/mapHeaders/Route11Gate2F.asm create mode 100755 data/mapHeaders/Route12.asm create mode 100755 data/mapHeaders/Route12Gate1F.asm create mode 100755 data/mapHeaders/Route12Gate2F.asm create mode 100755 data/mapHeaders/Route12SuperRodHouse.asm create mode 100755 data/mapHeaders/Route13.asm create mode 100755 data/mapHeaders/Route14.asm create mode 100755 data/mapHeaders/Route15.asm create mode 100755 data/mapHeaders/Route15Gate1F.asm create mode 100755 data/mapHeaders/Route15Gate2F.asm create mode 100755 data/mapHeaders/Route16.asm create mode 100755 data/mapHeaders/Route16FlyHouse.asm create mode 100755 data/mapHeaders/Route16Gate1F.asm create mode 100755 data/mapHeaders/Route16Gate2F.asm create mode 100755 data/mapHeaders/Route17.asm create mode 100755 data/mapHeaders/Route18.asm create mode 100755 data/mapHeaders/Route18Gate1F.asm create mode 100755 data/mapHeaders/Route18Gate2F.asm create mode 100755 data/mapHeaders/Route19.asm create mode 100755 data/mapHeaders/Route2.asm create mode 100755 data/mapHeaders/Route20.asm create mode 100755 data/mapHeaders/Route21.asm create mode 100755 data/mapHeaders/Route22.asm create mode 100755 data/mapHeaders/Route22Gate.asm create mode 100755 data/mapHeaders/Route23.asm create mode 100755 data/mapHeaders/Route24.asm create mode 100755 data/mapHeaders/Route25.asm create mode 100755 data/mapHeaders/Route2Gate.asm create mode 100755 data/mapHeaders/Route2TradeHouse.asm create mode 100755 data/mapHeaders/Route3.asm create mode 100755 data/mapHeaders/Route4.asm create mode 100755 data/mapHeaders/Route5.asm create mode 100755 data/mapHeaders/Route5Gate.asm create mode 100755 data/mapHeaders/Route6.asm create mode 100755 data/mapHeaders/Route6Gate.asm create mode 100755 data/mapHeaders/Route7.asm create mode 100755 data/mapHeaders/Route7Gate.asm create mode 100755 data/mapHeaders/Route8.asm create mode 100755 data/mapHeaders/Route8Gate.asm create mode 100755 data/mapHeaders/Route9.asm create mode 100755 data/mapHeaders/SSAnne1F.asm create mode 100755 data/mapHeaders/SSAnne1FRooms.asm create mode 100755 data/mapHeaders/SSAnne2F.asm create mode 100755 data/mapHeaders/SSAnne2FRooms.asm create mode 100755 data/mapHeaders/SSAnne3F.asm create mode 100755 data/mapHeaders/SSAnneB1F.asm create mode 100755 data/mapHeaders/SSAnneB1FRooms.asm create mode 100755 data/mapHeaders/SSAnneBow.asm create mode 100755 data/mapHeaders/SSAnneCaptainsRoom.asm create mode 100755 data/mapHeaders/SSAnneKitchen.asm create mode 100755 data/mapHeaders/SafariZoneCenter.asm create mode 100755 data/mapHeaders/SafariZoneCenterRestHouse.asm create mode 100755 data/mapHeaders/SafariZoneEast.asm create mode 100755 data/mapHeaders/SafariZoneEastRestHouse.asm create mode 100755 data/mapHeaders/SafariZoneGate.asm create mode 100755 data/mapHeaders/SafariZoneNorth.asm create mode 100755 data/mapHeaders/SafariZoneNorthRestHouse.asm create mode 100755 data/mapHeaders/SafariZoneSecretHouse.asm create mode 100755 data/mapHeaders/SafariZoneWest.asm create mode 100755 data/mapHeaders/SafariZoneWestRestHouse.asm create mode 100755 data/mapHeaders/SaffronCity.asm create mode 100755 data/mapHeaders/SaffronGym.asm create mode 100755 data/mapHeaders/SaffronMart.asm create mode 100755 data/mapHeaders/SaffronPidgeyHouse.asm create mode 100755 data/mapHeaders/SaffronPokecenter.asm create mode 100755 data/mapHeaders/SeafoamIslands1F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB1F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB2F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB3F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB4F.asm create mode 100755 data/mapHeaders/SilphCo10F.asm create mode 100755 data/mapHeaders/SilphCo11F.asm create mode 100755 data/mapHeaders/SilphCo1F.asm create mode 100755 data/mapHeaders/SilphCo2F.asm create mode 100755 data/mapHeaders/SilphCo3F.asm create mode 100755 data/mapHeaders/SilphCo4F.asm create mode 100755 data/mapHeaders/SilphCo5F.asm create mode 100755 data/mapHeaders/SilphCo6F.asm create mode 100755 data/mapHeaders/SilphCo7F.asm create mode 100755 data/mapHeaders/SilphCo8F.asm create mode 100755 data/mapHeaders/SilphCo9F.asm create mode 100755 data/mapHeaders/SilphCoElevator.asm create mode 100755 data/mapHeaders/TradeCenter.asm create mode 100755 data/mapHeaders/UndergroundPathNorthSouth.asm create mode 100755 data/mapHeaders/UndergroundPathRoute5.asm create mode 100755 data/mapHeaders/UndergroundPathRoute6.asm create mode 100755 data/mapHeaders/UndergroundPathRoute7.asm create mode 100755 data/mapHeaders/UndergroundPathRoute7Copy.asm create mode 100755 data/mapHeaders/UndergroundPathRoute8.asm create mode 100755 data/mapHeaders/UndergroundPathWestEast.asm create mode 100755 data/mapHeaders/VermilionCity.asm create mode 100755 data/mapHeaders/VermilionDock.asm create mode 100755 data/mapHeaders/VermilionGym.asm create mode 100755 data/mapHeaders/VermilionMart.asm create mode 100755 data/mapHeaders/VermilionOldRodHouse.asm create mode 100755 data/mapHeaders/VermilionPidgeyHouse.asm create mode 100755 data/mapHeaders/VermilionPokecenter.asm create mode 100755 data/mapHeaders/VermilionTradeHouse.asm create mode 100755 data/mapHeaders/VictoryRoad1F.asm create mode 100755 data/mapHeaders/VictoryRoad2F.asm create mode 100755 data/mapHeaders/VictoryRoad3F.asm create mode 100755 data/mapHeaders/ViridianCity.asm create mode 100755 data/mapHeaders/ViridianForest.asm create mode 100755 data/mapHeaders/ViridianForestNorthGate.asm create mode 100755 data/mapHeaders/ViridianForestSouthGate.asm create mode 100755 data/mapHeaders/ViridianGym.asm create mode 100755 data/mapHeaders/ViridianMart.asm create mode 100755 data/mapHeaders/ViridianNicknameHouse.asm create mode 100755 data/mapHeaders/ViridianPokecenter.asm create mode 100755 data/mapHeaders/ViridianSchoolHouse.asm create mode 100755 data/mapHeaders/WardensHouse.asm delete mode 100755 data/mapHeaders/agatha.asm delete mode 100755 data/mapHeaders/bikeshop.asm delete mode 100755 data/mapHeaders/billshouse.asm delete mode 100755 data/mapHeaders/blueshouse.asm delete mode 100755 data/mapHeaders/bruno.asm delete mode 100755 data/mapHeaders/celadoncity.asm delete mode 100755 data/mapHeaders/celadondiner.asm delete mode 100755 data/mapHeaders/celadongamecorner.asm delete mode 100755 data/mapHeaders/celadongym.asm delete mode 100755 data/mapHeaders/celadonhotel.asm delete mode 100755 data/mapHeaders/celadonhouse.asm delete mode 100755 data/mapHeaders/celadonmansion1.asm delete mode 100755 data/mapHeaders/celadonmansion2.asm delete mode 100755 data/mapHeaders/celadonmansion3.asm delete mode 100755 data/mapHeaders/celadonmansion4.asm delete mode 100755 data/mapHeaders/celadonmansion5.asm delete mode 100755 data/mapHeaders/celadonmart1.asm delete mode 100755 data/mapHeaders/celadonmart2.asm delete mode 100755 data/mapHeaders/celadonmart3.asm delete mode 100755 data/mapHeaders/celadonmart4.asm delete mode 100755 data/mapHeaders/celadonmart5.asm delete mode 100755 data/mapHeaders/celadonmartelevator.asm delete mode 100755 data/mapHeaders/celadonmartroof.asm delete mode 100755 data/mapHeaders/celadonpokecenter.asm delete mode 100755 data/mapHeaders/celadonprizeroom.asm delete mode 100755 data/mapHeaders/ceruleancity.asm delete mode 100755 data/mapHeaders/ceruleangym.asm delete mode 100755 data/mapHeaders/ceruleanhouse1.asm delete mode 100755 data/mapHeaders/ceruleanhouse2.asm delete mode 100755 data/mapHeaders/ceruleanhousetrashed.asm delete mode 100755 data/mapHeaders/ceruleanmart.asm delete mode 100755 data/mapHeaders/ceruleanpokecenter.asm delete mode 100755 data/mapHeaders/cinnabargym.asm delete mode 100755 data/mapHeaders/cinnabarisland.asm delete mode 100755 data/mapHeaders/cinnabarmart.asm delete mode 100755 data/mapHeaders/cinnabarpokecenter.asm delete mode 100755 data/mapHeaders/colosseum.asm delete mode 100755 data/mapHeaders/copycatshouse1f.asm delete mode 100755 data/mapHeaders/copycatshouse2f.asm delete mode 100755 data/mapHeaders/daycarem.asm delete mode 100755 data/mapHeaders/diglettscave.asm delete mode 100755 data/mapHeaders/diglettscaveroute11.asm delete mode 100755 data/mapHeaders/diglettscaveroute2.asm delete mode 100755 data/mapHeaders/fanclub.asm delete mode 100755 data/mapHeaders/fightingdojo.asm delete mode 100755 data/mapHeaders/fuchsiacity.asm delete mode 100755 data/mapHeaders/fuchsiagym.asm delete mode 100755 data/mapHeaders/fuchsiahouse1.asm delete mode 100755 data/mapHeaders/fuchsiahouse2.asm delete mode 100755 data/mapHeaders/fuchsiahouse3.asm delete mode 100755 data/mapHeaders/fuchsiamart.asm delete mode 100755 data/mapHeaders/fuchsiameetingroom.asm delete mode 100755 data/mapHeaders/fuchsiapokecenter.asm delete mode 100755 data/mapHeaders/gary.asm delete mode 100755 data/mapHeaders/halloffameroom.asm delete mode 100755 data/mapHeaders/indigoplateau.asm delete mode 100755 data/mapHeaders/indigoplateaulobby.asm delete mode 100755 data/mapHeaders/lab1.asm delete mode 100755 data/mapHeaders/lab2.asm delete mode 100755 data/mapHeaders/lab3.asm delete mode 100755 data/mapHeaders/lab4.asm delete mode 100755 data/mapHeaders/lance.asm delete mode 100755 data/mapHeaders/lavenderhouse1.asm delete mode 100755 data/mapHeaders/lavenderhouse2.asm delete mode 100755 data/mapHeaders/lavendermart.asm delete mode 100755 data/mapHeaders/lavenderpokecenter.asm delete mode 100755 data/mapHeaders/lavendertown.asm delete mode 100755 data/mapHeaders/lorelei.asm delete mode 100755 data/mapHeaders/mansion1.asm delete mode 100755 data/mapHeaders/mansion2.asm delete mode 100755 data/mapHeaders/mansion3.asm delete mode 100755 data/mapHeaders/mansion4.asm delete mode 100755 data/mapHeaders/mtmoon1.asm delete mode 100755 data/mapHeaders/mtmoon2.asm delete mode 100755 data/mapHeaders/mtmoon3.asm delete mode 100755 data/mapHeaders/mtmoonpokecenter.asm delete mode 100755 data/mapHeaders/museum1f.asm delete mode 100755 data/mapHeaders/museum2f.asm delete mode 100755 data/mapHeaders/namerater.asm delete mode 100755 data/mapHeaders/oakslab.asm delete mode 100755 data/mapHeaders/pallettown.asm delete mode 100755 data/mapHeaders/pewtercity.asm delete mode 100755 data/mapHeaders/pewtergym.asm delete mode 100755 data/mapHeaders/pewterhouse1.asm delete mode 100755 data/mapHeaders/pewterhouse2.asm delete mode 100755 data/mapHeaders/pewtermart.asm delete mode 100755 data/mapHeaders/pewterpokecenter.asm delete mode 100755 data/mapHeaders/pokemontower1.asm delete mode 100755 data/mapHeaders/pokemontower2.asm delete mode 100755 data/mapHeaders/pokemontower3.asm delete mode 100755 data/mapHeaders/pokemontower4.asm delete mode 100755 data/mapHeaders/pokemontower5.asm delete mode 100755 data/mapHeaders/pokemontower6.asm delete mode 100755 data/mapHeaders/pokemontower7.asm delete mode 100755 data/mapHeaders/powerplant.asm delete mode 100755 data/mapHeaders/redshouse1f.asm delete mode 100755 data/mapHeaders/redshouse2f.asm delete mode 100755 data/mapHeaders/rockethideout1.asm delete mode 100755 data/mapHeaders/rockethideout2.asm delete mode 100755 data/mapHeaders/rockethideout3.asm delete mode 100755 data/mapHeaders/rockethideout4.asm delete mode 100755 data/mapHeaders/rockethideoutelevator.asm delete mode 100755 data/mapHeaders/rocktunnel1.asm delete mode 100755 data/mapHeaders/rocktunnel2.asm delete mode 100755 data/mapHeaders/rocktunnelpokecenter.asm delete mode 100755 data/mapHeaders/route1.asm delete mode 100755 data/mapHeaders/route10.asm delete mode 100755 data/mapHeaders/route11.asm delete mode 100755 data/mapHeaders/route11gate.asm delete mode 100755 data/mapHeaders/route11gateupstairs.asm delete mode 100755 data/mapHeaders/route12.asm delete mode 100755 data/mapHeaders/route12gate.asm delete mode 100755 data/mapHeaders/route12gateupstairs.asm delete mode 100755 data/mapHeaders/route12house.asm delete mode 100755 data/mapHeaders/route13.asm delete mode 100755 data/mapHeaders/route14.asm delete mode 100755 data/mapHeaders/route15.asm delete mode 100755 data/mapHeaders/route15gate.asm delete mode 100755 data/mapHeaders/route15gateupstairs.asm delete mode 100755 data/mapHeaders/route16.asm delete mode 100755 data/mapHeaders/route16gate.asm delete mode 100755 data/mapHeaders/route16gateupstairs.asm delete mode 100755 data/mapHeaders/route16house.asm delete mode 100755 data/mapHeaders/route17.asm delete mode 100755 data/mapHeaders/route18.asm delete mode 100755 data/mapHeaders/route18gate.asm delete mode 100755 data/mapHeaders/route18gateupstairs.asm delete mode 100755 data/mapHeaders/route19.asm delete mode 100755 data/mapHeaders/route2.asm delete mode 100755 data/mapHeaders/route20.asm delete mode 100755 data/mapHeaders/route21.asm delete mode 100755 data/mapHeaders/route22.asm delete mode 100755 data/mapHeaders/route22gate.asm delete mode 100755 data/mapHeaders/route23.asm delete mode 100755 data/mapHeaders/route24.asm delete mode 100755 data/mapHeaders/route25.asm delete mode 100755 data/mapHeaders/route2gate.asm delete mode 100755 data/mapHeaders/route2house.asm delete mode 100755 data/mapHeaders/route3.asm delete mode 100755 data/mapHeaders/route4.asm delete mode 100755 data/mapHeaders/route5.asm delete mode 100755 data/mapHeaders/route5gate.asm delete mode 100755 data/mapHeaders/route6.asm delete mode 100755 data/mapHeaders/route6gate.asm delete mode 100755 data/mapHeaders/route7.asm delete mode 100755 data/mapHeaders/route7gate.asm delete mode 100755 data/mapHeaders/route8.asm delete mode 100755 data/mapHeaders/route8gate.asm delete mode 100755 data/mapHeaders/route9.asm delete mode 100755 data/mapHeaders/safarizonecenter.asm delete mode 100755 data/mapHeaders/safarizoneeast.asm delete mode 100755 data/mapHeaders/safarizoneentrance.asm delete mode 100755 data/mapHeaders/safarizonenorth.asm delete mode 100755 data/mapHeaders/safarizoneresthouse1.asm delete mode 100755 data/mapHeaders/safarizoneresthouse2.asm delete mode 100755 data/mapHeaders/safarizoneresthouse3.asm delete mode 100755 data/mapHeaders/safarizoneresthouse4.asm delete mode 100755 data/mapHeaders/safarizonesecrethouse.asm delete mode 100755 data/mapHeaders/safarizonewest.asm delete mode 100755 data/mapHeaders/saffroncity.asm delete mode 100755 data/mapHeaders/saffrongym.asm delete mode 100755 data/mapHeaders/saffronhouse1.asm delete mode 100755 data/mapHeaders/saffronhouse2.asm delete mode 100755 data/mapHeaders/saffronmart.asm delete mode 100755 data/mapHeaders/saffronpokecenter.asm delete mode 100755 data/mapHeaders/school.asm delete mode 100755 data/mapHeaders/seafoamislands1.asm delete mode 100755 data/mapHeaders/seafoamislands2.asm delete mode 100755 data/mapHeaders/seafoamislands3.asm delete mode 100755 data/mapHeaders/seafoamislands4.asm delete mode 100755 data/mapHeaders/seafoamislands5.asm delete mode 100755 data/mapHeaders/silphco1.asm delete mode 100755 data/mapHeaders/silphco10.asm delete mode 100755 data/mapHeaders/silphco11.asm delete mode 100755 data/mapHeaders/silphco2.asm delete mode 100755 data/mapHeaders/silphco3.asm delete mode 100755 data/mapHeaders/silphco4.asm delete mode 100755 data/mapHeaders/silphco5.asm delete mode 100755 data/mapHeaders/silphco6.asm delete mode 100755 data/mapHeaders/silphco7.asm delete mode 100755 data/mapHeaders/silphco8.asm delete mode 100755 data/mapHeaders/silphco9.asm delete mode 100755 data/mapHeaders/silphcoelevator.asm delete mode 100755 data/mapHeaders/ssanne1.asm delete mode 100755 data/mapHeaders/ssanne10.asm delete mode 100755 data/mapHeaders/ssanne2.asm delete mode 100755 data/mapHeaders/ssanne3.asm delete mode 100755 data/mapHeaders/ssanne4.asm delete mode 100755 data/mapHeaders/ssanne5.asm delete mode 100755 data/mapHeaders/ssanne6.asm delete mode 100755 data/mapHeaders/ssanne7.asm delete mode 100755 data/mapHeaders/ssanne8.asm delete mode 100755 data/mapHeaders/ssanne9.asm delete mode 100755 data/mapHeaders/tradecenter.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute5.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute6.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute7.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute7copy.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute8.asm delete mode 100755 data/mapHeaders/undergroundpathns.asm delete mode 100755 data/mapHeaders/undergroundpathwe.asm delete mode 100755 data/mapHeaders/unknowndungeon1.asm delete mode 100755 data/mapHeaders/unknowndungeon2.asm delete mode 100755 data/mapHeaders/unknowndungeon3.asm delete mode 100755 data/mapHeaders/vermilioncity.asm delete mode 100755 data/mapHeaders/vermiliondock.asm delete mode 100755 data/mapHeaders/vermiliongym.asm delete mode 100755 data/mapHeaders/vermilionhouse1.asm delete mode 100755 data/mapHeaders/vermilionhouse2.asm delete mode 100755 data/mapHeaders/vermilionhouse3.asm delete mode 100755 data/mapHeaders/vermilionmart.asm delete mode 100755 data/mapHeaders/vermilionpokecenter.asm delete mode 100755 data/mapHeaders/victoryroad1.asm delete mode 100755 data/mapHeaders/victoryroad2.asm delete mode 100755 data/mapHeaders/victoryroad3.asm delete mode 100755 data/mapHeaders/viridiancity.asm delete mode 100755 data/mapHeaders/viridianforest.asm delete mode 100755 data/mapHeaders/viridianforestentrance.asm delete mode 100755 data/mapHeaders/viridianforestexit.asm delete mode 100755 data/mapHeaders/viridiangym.asm delete mode 100755 data/mapHeaders/viridianhouse.asm delete mode 100755 data/mapHeaders/viridianmart.asm delete mode 100755 data/mapHeaders/viridianpokecenter.asm create mode 100755 data/mapObjects/AgathasRoom.asm create mode 100755 data/mapObjects/BikeShop.asm create mode 100755 data/mapObjects/BillsHouse.asm create mode 100755 data/mapObjects/BluesHouse.asm create mode 100755 data/mapObjects/BrunosRoom.asm create mode 100755 data/mapObjects/CeladonChiefHouse.asm create mode 100755 data/mapObjects/CeladonCity.asm create mode 100755 data/mapObjects/CeladonDiner.asm create mode 100755 data/mapObjects/CeladonGym.asm create mode 100755 data/mapObjects/CeladonHotel.asm create mode 100755 data/mapObjects/CeladonMansion1F.asm create mode 100755 data/mapObjects/CeladonMansion2F.asm create mode 100755 data/mapObjects/CeladonMansion3F.asm create mode 100755 data/mapObjects/CeladonMansionRoof.asm create mode 100755 data/mapObjects/CeladonMansionRoofHouse.asm create mode 100755 data/mapObjects/CeladonMart1F.asm create mode 100755 data/mapObjects/CeladonMart2F.asm create mode 100755 data/mapObjects/CeladonMart3F.asm create mode 100755 data/mapObjects/CeladonMart4F.asm create mode 100755 data/mapObjects/CeladonMart5F.asm create mode 100755 data/mapObjects/CeladonMartElevator.asm create mode 100755 data/mapObjects/CeladonMartRoof.asm create mode 100755 data/mapObjects/CeladonPokecenter.asm create mode 100755 data/mapObjects/CeruleanBadgeHouse.asm create mode 100755 data/mapObjects/CeruleanCave1F.asm create mode 100755 data/mapObjects/CeruleanCave2F.asm create mode 100755 data/mapObjects/CeruleanCaveB1F.asm create mode 100755 data/mapObjects/CeruleanCity.asm create mode 100755 data/mapObjects/CeruleanGym.asm create mode 100755 data/mapObjects/CeruleanMart.asm create mode 100755 data/mapObjects/CeruleanPokecenter.asm create mode 100755 data/mapObjects/CeruleanTradeHouse.asm create mode 100755 data/mapObjects/CeruleanTrashedHouse.asm create mode 100755 data/mapObjects/ChampionsRoom.asm create mode 100755 data/mapObjects/CinnabarGym.asm create mode 100755 data/mapObjects/CinnabarIsland.asm create mode 100755 data/mapObjects/CinnabarLab.asm create mode 100755 data/mapObjects/CinnabarLabFossilRoom.asm create mode 100755 data/mapObjects/CinnabarLabMetronomeRoom.asm create mode 100755 data/mapObjects/CinnabarLabTradeRoom.asm create mode 100755 data/mapObjects/CinnabarMart.asm create mode 100755 data/mapObjects/CinnabarPokecenter.asm create mode 100755 data/mapObjects/Colosseum.asm create mode 100755 data/mapObjects/CopycatsHouse1F.asm create mode 100755 data/mapObjects/CopycatsHouse2F.asm create mode 100755 data/mapObjects/Daycare.asm create mode 100755 data/mapObjects/DiglettsCave.asm create mode 100755 data/mapObjects/DiglettsCaveRoute11.asm create mode 100755 data/mapObjects/DiglettsCaveRoute2.asm create mode 100755 data/mapObjects/FightingDojo.asm create mode 100755 data/mapObjects/FuchsiaBillsGrandpasHouse.asm create mode 100755 data/mapObjects/FuchsiaCity.asm create mode 100755 data/mapObjects/FuchsiaGoodRodHouse.asm create mode 100755 data/mapObjects/FuchsiaGym.asm create mode 100755 data/mapObjects/FuchsiaMart.asm create mode 100755 data/mapObjects/FuchsiaMeetingRoom.asm create mode 100755 data/mapObjects/FuchsiaPokecenter.asm create mode 100755 data/mapObjects/GameCorner.asm create mode 100755 data/mapObjects/GameCornerPrizeRoom.asm create mode 100755 data/mapObjects/HallOfFame.asm create mode 100755 data/mapObjects/IndigoPlateau.asm create mode 100755 data/mapObjects/IndigoPlateauLobby.asm create mode 100755 data/mapObjects/LancesRoom.asm create mode 100755 data/mapObjects/LavenderCuboneHouse.asm create mode 100755 data/mapObjects/LavenderMart.asm create mode 100755 data/mapObjects/LavenderPokecenter.asm create mode 100755 data/mapObjects/LavenderTown.asm create mode 100755 data/mapObjects/LoreleisRoom.asm create mode 100755 data/mapObjects/MrFujisHouse.asm create mode 100755 data/mapObjects/MrPsychicsHouse.asm create mode 100755 data/mapObjects/MtMoon1F.asm create mode 100755 data/mapObjects/MtMoonB1F.asm create mode 100755 data/mapObjects/MtMoonB2F.asm create mode 100755 data/mapObjects/MtMoonPokecenter.asm create mode 100755 data/mapObjects/Museum1F.asm create mode 100755 data/mapObjects/Museum2F.asm create mode 100755 data/mapObjects/NameRatersHouse.asm create mode 100755 data/mapObjects/OaksLab.asm create mode 100755 data/mapObjects/PalletTown.asm create mode 100755 data/mapObjects/PewterCity.asm create mode 100755 data/mapObjects/PewterGym.asm create mode 100755 data/mapObjects/PewterMart.asm create mode 100755 data/mapObjects/PewterNidoranHouse.asm create mode 100755 data/mapObjects/PewterPokecenter.asm create mode 100755 data/mapObjects/PewterSpeechHouse.asm create mode 100755 data/mapObjects/PokemonFanClub.asm create mode 100755 data/mapObjects/PokemonMansion1F.asm create mode 100755 data/mapObjects/PokemonMansion2F.asm create mode 100755 data/mapObjects/PokemonMansion3F.asm create mode 100755 data/mapObjects/PokemonMansionB1F.asm create mode 100755 data/mapObjects/PokemonTower1F.asm create mode 100755 data/mapObjects/PokemonTower2F.asm create mode 100755 data/mapObjects/PokemonTower3F.asm create mode 100755 data/mapObjects/PokemonTower4F.asm create mode 100755 data/mapObjects/PokemonTower5F.asm create mode 100755 data/mapObjects/PokemonTower6F.asm create mode 100755 data/mapObjects/PokemonTower7F.asm create mode 100755 data/mapObjects/PowerPlant.asm create mode 100755 data/mapObjects/RedsHouse1F.asm create mode 100755 data/mapObjects/RedsHouse2F.asm create mode 100755 data/mapObjects/RockTunnel1F.asm create mode 100755 data/mapObjects/RockTunnelB1F.asm create mode 100755 data/mapObjects/RockTunnelPokecenter.asm create mode 100755 data/mapObjects/RocketHideoutB1F.asm create mode 100755 data/mapObjects/RocketHideoutB2F.asm create mode 100755 data/mapObjects/RocketHideoutB3F.asm create mode 100755 data/mapObjects/RocketHideoutB4F.asm create mode 100755 data/mapObjects/RocketHideoutElevator.asm create mode 100755 data/mapObjects/Route1.asm create mode 100755 data/mapObjects/Route10.asm create mode 100755 data/mapObjects/Route11.asm create mode 100755 data/mapObjects/Route11Gate1F.asm create mode 100755 data/mapObjects/Route11Gate2F.asm create mode 100755 data/mapObjects/Route12.asm create mode 100755 data/mapObjects/Route12Gate1F.asm create mode 100755 data/mapObjects/Route12Gate2F.asm create mode 100755 data/mapObjects/Route12SuperRodHouse.asm create mode 100755 data/mapObjects/Route13.asm create mode 100755 data/mapObjects/Route14.asm create mode 100755 data/mapObjects/Route15.asm create mode 100755 data/mapObjects/Route15Gate1F.asm create mode 100755 data/mapObjects/Route15Gate2F.asm create mode 100755 data/mapObjects/Route16.asm create mode 100755 data/mapObjects/Route16FlyHouse.asm create mode 100755 data/mapObjects/Route16Gate1F.asm create mode 100755 data/mapObjects/Route16Gate2F.asm create mode 100755 data/mapObjects/Route17.asm create mode 100755 data/mapObjects/Route18.asm create mode 100755 data/mapObjects/Route18Gate1F.asm create mode 100755 data/mapObjects/Route18Gate2F.asm create mode 100755 data/mapObjects/Route19.asm create mode 100755 data/mapObjects/Route2.asm create mode 100755 data/mapObjects/Route20.asm create mode 100755 data/mapObjects/Route21.asm create mode 100755 data/mapObjects/Route22.asm create mode 100755 data/mapObjects/Route22Gate.asm create mode 100755 data/mapObjects/Route23.asm create mode 100755 data/mapObjects/Route24.asm create mode 100755 data/mapObjects/Route25.asm create mode 100755 data/mapObjects/Route2Gate.asm create mode 100755 data/mapObjects/Route2TradeHouse.asm create mode 100755 data/mapObjects/Route3.asm create mode 100755 data/mapObjects/Route4.asm create mode 100755 data/mapObjects/Route5.asm create mode 100755 data/mapObjects/Route5Gate.asm create mode 100755 data/mapObjects/Route6.asm create mode 100755 data/mapObjects/Route6Gate.asm create mode 100755 data/mapObjects/Route7.asm create mode 100755 data/mapObjects/Route7Gate.asm create mode 100755 data/mapObjects/Route8.asm create mode 100755 data/mapObjects/Route8Gate.asm create mode 100755 data/mapObjects/Route9.asm create mode 100755 data/mapObjects/SSAnne1F.asm create mode 100755 data/mapObjects/SSAnne1FRooms.asm create mode 100755 data/mapObjects/SSAnne2F.asm create mode 100755 data/mapObjects/SSAnne2FRooms.asm create mode 100755 data/mapObjects/SSAnne3F.asm create mode 100755 data/mapObjects/SSAnneB1F.asm create mode 100755 data/mapObjects/SSAnneB1FRooms.asm create mode 100755 data/mapObjects/SSAnneBow.asm create mode 100755 data/mapObjects/SSAnneCaptainsRoom.asm create mode 100755 data/mapObjects/SSAnneKitchen.asm create mode 100755 data/mapObjects/SafariZoneCenter.asm create mode 100755 data/mapObjects/SafariZoneCenterRestHouse.asm create mode 100755 data/mapObjects/SafariZoneEast.asm create mode 100755 data/mapObjects/SafariZoneEastRestHouse.asm create mode 100755 data/mapObjects/SafariZoneGate.asm create mode 100755 data/mapObjects/SafariZoneNorth.asm create mode 100755 data/mapObjects/SafariZoneNorthRestHouse.asm create mode 100755 data/mapObjects/SafariZoneSecretHouse.asm create mode 100755 data/mapObjects/SafariZoneWest.asm create mode 100755 data/mapObjects/SafariZoneWestRestHouse.asm create mode 100755 data/mapObjects/SaffronCity.asm create mode 100755 data/mapObjects/SaffronGym.asm create mode 100755 data/mapObjects/SaffronMart.asm create mode 100755 data/mapObjects/SaffronPidgeyHouse.asm create mode 100755 data/mapObjects/SaffronPokecenter.asm create mode 100755 data/mapObjects/SeafoamIslands1F.asm create mode 100755 data/mapObjects/SeafoamIslandsB1F.asm create mode 100755 data/mapObjects/SeafoamIslandsB2F.asm create mode 100755 data/mapObjects/SeafoamIslandsB3F.asm create mode 100755 data/mapObjects/SeafoamIslandsB4F.asm create mode 100755 data/mapObjects/SilphCo10F.asm create mode 100755 data/mapObjects/SilphCo11F.asm create mode 100755 data/mapObjects/SilphCo1F.asm create mode 100755 data/mapObjects/SilphCo2F.asm create mode 100755 data/mapObjects/SilphCo3F.asm create mode 100755 data/mapObjects/SilphCo4F.asm create mode 100755 data/mapObjects/SilphCo5F.asm create mode 100755 data/mapObjects/SilphCo6F.asm create mode 100755 data/mapObjects/SilphCo7F.asm create mode 100755 data/mapObjects/SilphCo8F.asm create mode 100755 data/mapObjects/SilphCo9F.asm create mode 100755 data/mapObjects/SilphCoElevator.asm create mode 100755 data/mapObjects/TradeCenter.asm create mode 100755 data/mapObjects/UndergroundPathNorthSouth.asm create mode 100755 data/mapObjects/UndergroundPathRoute5.asm create mode 100755 data/mapObjects/UndergroundPathRoute6.asm create mode 100755 data/mapObjects/UndergroundPathRoute7.asm create mode 100755 data/mapObjects/UndergroundPathRoute7Copy.asm create mode 100755 data/mapObjects/UndergroundPathRoute8.asm create mode 100755 data/mapObjects/UndergroundPathWestEast.asm create mode 100755 data/mapObjects/VermilionCity.asm create mode 100755 data/mapObjects/VermilionDock.asm create mode 100755 data/mapObjects/VermilionGym.asm create mode 100755 data/mapObjects/VermilionMart.asm create mode 100755 data/mapObjects/VermilionOldRodHouse.asm create mode 100755 data/mapObjects/VermilionPidgeyHouse.asm create mode 100755 data/mapObjects/VermilionPokecenter.asm create mode 100755 data/mapObjects/VermilionTradeHouse.asm create mode 100755 data/mapObjects/VictoryRoad1F.asm create mode 100755 data/mapObjects/VictoryRoad2F.asm create mode 100755 data/mapObjects/VictoryRoad3F.asm create mode 100755 data/mapObjects/ViridianCity.asm create mode 100755 data/mapObjects/ViridianForest.asm create mode 100755 data/mapObjects/ViridianForestNorthGate.asm create mode 100755 data/mapObjects/ViridianForestSouthGate.asm create mode 100755 data/mapObjects/ViridianGym.asm create mode 100755 data/mapObjects/ViridianMart.asm create mode 100755 data/mapObjects/ViridianNicknameHouse.asm create mode 100755 data/mapObjects/ViridianPokecenter.asm create mode 100755 data/mapObjects/ViridianSchoolHouse.asm create mode 100755 data/mapObjects/WardensHouse.asm delete mode 100755 data/mapObjects/agatha.asm delete mode 100755 data/mapObjects/bikeshop.asm delete mode 100755 data/mapObjects/billshouse.asm delete mode 100755 data/mapObjects/blueshouse.asm delete mode 100755 data/mapObjects/bruno.asm delete mode 100755 data/mapObjects/celadoncity.asm delete mode 100755 data/mapObjects/celadondiner.asm delete mode 100755 data/mapObjects/celadongamecorner.asm delete mode 100755 data/mapObjects/celadongym.asm delete mode 100755 data/mapObjects/celadonhotel.asm delete mode 100755 data/mapObjects/celadonhouse.asm delete mode 100755 data/mapObjects/celadonmansion1.asm delete mode 100755 data/mapObjects/celadonmansion2.asm delete mode 100755 data/mapObjects/celadonmansion3.asm delete mode 100755 data/mapObjects/celadonmansion4.asm delete mode 100755 data/mapObjects/celadonmansion5.asm delete mode 100755 data/mapObjects/celadonmart1.asm delete mode 100755 data/mapObjects/celadonmart2.asm delete mode 100755 data/mapObjects/celadonmart3.asm delete mode 100755 data/mapObjects/celadonmart4.asm delete mode 100755 data/mapObjects/celadonmart5.asm delete mode 100755 data/mapObjects/celadonmartelevator.asm delete mode 100755 data/mapObjects/celadonmartroof.asm delete mode 100755 data/mapObjects/celadonpokecenter.asm delete mode 100755 data/mapObjects/celadonprizeroom.asm delete mode 100755 data/mapObjects/ceruleancity.asm delete mode 100755 data/mapObjects/ceruleangym.asm delete mode 100755 data/mapObjects/ceruleanhouse1.asm delete mode 100755 data/mapObjects/ceruleanhouse2.asm delete mode 100755 data/mapObjects/ceruleanhousetrashed.asm delete mode 100755 data/mapObjects/ceruleanmart.asm delete mode 100755 data/mapObjects/ceruleanpokecenter.asm delete mode 100755 data/mapObjects/cinnabargym.asm delete mode 100755 data/mapObjects/cinnabarisland.asm delete mode 100755 data/mapObjects/cinnabarmart.asm delete mode 100755 data/mapObjects/cinnabarpokecenter.asm delete mode 100755 data/mapObjects/colosseum.asm delete mode 100755 data/mapObjects/copycatshouse1f.asm delete mode 100755 data/mapObjects/copycatshouse2f.asm delete mode 100755 data/mapObjects/daycarem.asm delete mode 100755 data/mapObjects/diglettscave.asm delete mode 100755 data/mapObjects/diglettscaveroute11.asm delete mode 100755 data/mapObjects/diglettscaveroute2.asm delete mode 100755 data/mapObjects/fanclub.asm delete mode 100755 data/mapObjects/fightingdojo.asm delete mode 100755 data/mapObjects/fuchsiacity.asm delete mode 100755 data/mapObjects/fuchsiagym.asm delete mode 100755 data/mapObjects/fuchsiahouse1.asm delete mode 100755 data/mapObjects/fuchsiahouse2.asm delete mode 100755 data/mapObjects/fuchsiahouse3.asm delete mode 100755 data/mapObjects/fuchsiamart.asm delete mode 100755 data/mapObjects/fuchsiameetingroom.asm delete mode 100755 data/mapObjects/fuchsiapokecenter.asm delete mode 100755 data/mapObjects/gary.asm delete mode 100755 data/mapObjects/halloffameroom.asm delete mode 100755 data/mapObjects/indigoplateau.asm delete mode 100755 data/mapObjects/indigoplateaulobby.asm delete mode 100755 data/mapObjects/lab1.asm delete mode 100755 data/mapObjects/lab2.asm delete mode 100755 data/mapObjects/lab3.asm delete mode 100755 data/mapObjects/lab4.asm delete mode 100755 data/mapObjects/lance.asm delete mode 100755 data/mapObjects/lavenderhouse1.asm delete mode 100755 data/mapObjects/lavenderhouse2.asm delete mode 100755 data/mapObjects/lavendermart.asm delete mode 100755 data/mapObjects/lavenderpokecenter.asm delete mode 100755 data/mapObjects/lavendertown.asm delete mode 100755 data/mapObjects/lorelei.asm delete mode 100755 data/mapObjects/mansion1.asm delete mode 100755 data/mapObjects/mansion2.asm delete mode 100755 data/mapObjects/mansion3.asm delete mode 100755 data/mapObjects/mansion4.asm delete mode 100755 data/mapObjects/mtmoon1.asm delete mode 100755 data/mapObjects/mtmoon2.asm delete mode 100755 data/mapObjects/mtmoon3.asm delete mode 100755 data/mapObjects/mtmoonpokecenter.asm delete mode 100755 data/mapObjects/museum1f.asm delete mode 100755 data/mapObjects/museum2f.asm delete mode 100755 data/mapObjects/namerater.asm delete mode 100755 data/mapObjects/oakslab.asm delete mode 100755 data/mapObjects/pallettown.asm delete mode 100755 data/mapObjects/pewtercity.asm delete mode 100755 data/mapObjects/pewtergym.asm delete mode 100755 data/mapObjects/pewterhouse1.asm delete mode 100755 data/mapObjects/pewterhouse2.asm delete mode 100755 data/mapObjects/pewtermart.asm delete mode 100755 data/mapObjects/pewterpokecenter.asm delete mode 100755 data/mapObjects/pokemontower1.asm delete mode 100755 data/mapObjects/pokemontower2.asm delete mode 100755 data/mapObjects/pokemontower3.asm delete mode 100755 data/mapObjects/pokemontower4.asm delete mode 100755 data/mapObjects/pokemontower5.asm delete mode 100755 data/mapObjects/pokemontower6.asm delete mode 100755 data/mapObjects/pokemontower7.asm delete mode 100755 data/mapObjects/powerplant.asm delete mode 100755 data/mapObjects/redshouse1f.asm delete mode 100755 data/mapObjects/redshouse2f.asm delete mode 100755 data/mapObjects/rockethideout1.asm delete mode 100755 data/mapObjects/rockethideout2.asm delete mode 100755 data/mapObjects/rockethideout3.asm delete mode 100755 data/mapObjects/rockethideout4.asm delete mode 100755 data/mapObjects/rockethideoutelevator.asm delete mode 100755 data/mapObjects/rocktunnel1.asm delete mode 100755 data/mapObjects/rocktunnel2.asm delete mode 100755 data/mapObjects/rocktunnelpokecenter.asm delete mode 100755 data/mapObjects/route1.asm delete mode 100755 data/mapObjects/route10.asm delete mode 100755 data/mapObjects/route11.asm delete mode 100755 data/mapObjects/route11gate.asm delete mode 100755 data/mapObjects/route11gateupstairs.asm delete mode 100755 data/mapObjects/route12.asm delete mode 100755 data/mapObjects/route12gate.asm delete mode 100755 data/mapObjects/route12gateupstairs.asm delete mode 100755 data/mapObjects/route12house.asm delete mode 100755 data/mapObjects/route13.asm delete mode 100755 data/mapObjects/route14.asm delete mode 100755 data/mapObjects/route15.asm delete mode 100755 data/mapObjects/route15gate.asm delete mode 100755 data/mapObjects/route15gateupstairs.asm delete mode 100755 data/mapObjects/route16.asm delete mode 100755 data/mapObjects/route16gate.asm delete mode 100755 data/mapObjects/route16gateupstairs.asm delete mode 100755 data/mapObjects/route16house.asm delete mode 100755 data/mapObjects/route17.asm delete mode 100755 data/mapObjects/route18.asm delete mode 100755 data/mapObjects/route18gate.asm delete mode 100755 data/mapObjects/route18gateupstairs.asm delete mode 100755 data/mapObjects/route19.asm delete mode 100755 data/mapObjects/route2.asm delete mode 100755 data/mapObjects/route20.asm delete mode 100755 data/mapObjects/route21.asm delete mode 100755 data/mapObjects/route22.asm delete mode 100755 data/mapObjects/route22gate.asm delete mode 100755 data/mapObjects/route23.asm delete mode 100755 data/mapObjects/route24.asm delete mode 100755 data/mapObjects/route25.asm delete mode 100755 data/mapObjects/route2gate.asm delete mode 100755 data/mapObjects/route2house.asm delete mode 100755 data/mapObjects/route3.asm delete mode 100755 data/mapObjects/route4.asm delete mode 100755 data/mapObjects/route5.asm delete mode 100755 data/mapObjects/route5gate.asm delete mode 100755 data/mapObjects/route6.asm delete mode 100755 data/mapObjects/route6gate.asm delete mode 100755 data/mapObjects/route7.asm delete mode 100755 data/mapObjects/route7gate.asm delete mode 100755 data/mapObjects/route8.asm delete mode 100755 data/mapObjects/route8gate.asm delete mode 100755 data/mapObjects/route9.asm delete mode 100755 data/mapObjects/safarizonecenter.asm delete mode 100755 data/mapObjects/safarizoneeast.asm delete mode 100755 data/mapObjects/safarizoneentrance.asm delete mode 100755 data/mapObjects/safarizonenorth.asm delete mode 100755 data/mapObjects/safarizoneresthouse1.asm delete mode 100755 data/mapObjects/safarizoneresthouse2.asm delete mode 100755 data/mapObjects/safarizoneresthouse3.asm delete mode 100755 data/mapObjects/safarizoneresthouse4.asm delete mode 100755 data/mapObjects/safarizonesecrethouse.asm delete mode 100755 data/mapObjects/safarizonewest.asm delete mode 100755 data/mapObjects/saffroncity.asm delete mode 100755 data/mapObjects/saffrongym.asm delete mode 100755 data/mapObjects/saffronhouse1.asm delete mode 100755 data/mapObjects/saffronhouse2.asm delete mode 100755 data/mapObjects/saffronmart.asm delete mode 100755 data/mapObjects/saffronpokecenter.asm delete mode 100755 data/mapObjects/school.asm delete mode 100755 data/mapObjects/seafoamislands1.asm delete mode 100755 data/mapObjects/seafoamislands2.asm delete mode 100755 data/mapObjects/seafoamislands3.asm delete mode 100755 data/mapObjects/seafoamislands4.asm delete mode 100755 data/mapObjects/seafoamislands5.asm delete mode 100755 data/mapObjects/silphco1.asm delete mode 100755 data/mapObjects/silphco10.asm delete mode 100755 data/mapObjects/silphco11.asm delete mode 100755 data/mapObjects/silphco2.asm delete mode 100755 data/mapObjects/silphco3.asm delete mode 100755 data/mapObjects/silphco4.asm delete mode 100755 data/mapObjects/silphco5.asm delete mode 100755 data/mapObjects/silphco6.asm delete mode 100755 data/mapObjects/silphco7.asm delete mode 100755 data/mapObjects/silphco8.asm delete mode 100755 data/mapObjects/silphco9.asm delete mode 100755 data/mapObjects/silphcoelevator.asm delete mode 100755 data/mapObjects/ssanne1.asm delete mode 100755 data/mapObjects/ssanne10.asm delete mode 100755 data/mapObjects/ssanne2.asm delete mode 100755 data/mapObjects/ssanne3.asm delete mode 100755 data/mapObjects/ssanne4.asm delete mode 100755 data/mapObjects/ssanne5.asm delete mode 100755 data/mapObjects/ssanne6.asm delete mode 100755 data/mapObjects/ssanne7.asm delete mode 100755 data/mapObjects/ssanne8.asm delete mode 100755 data/mapObjects/ssanne9.asm delete mode 100755 data/mapObjects/tradecenter.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute5.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute6.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute7.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute7copy.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute8.asm delete mode 100755 data/mapObjects/undergroundpathns.asm delete mode 100755 data/mapObjects/undergroundpathwe.asm delete mode 100755 data/mapObjects/unknowndungeon1.asm delete mode 100755 data/mapObjects/unknowndungeon2.asm delete mode 100755 data/mapObjects/unknowndungeon3.asm delete mode 100755 data/mapObjects/vermilioncity.asm delete mode 100755 data/mapObjects/vermiliondock.asm delete mode 100755 data/mapObjects/vermiliongym.asm delete mode 100755 data/mapObjects/vermilionhouse1.asm delete mode 100755 data/mapObjects/vermilionhouse2.asm delete mode 100755 data/mapObjects/vermilionhouse3.asm delete mode 100755 data/mapObjects/vermilionmart.asm delete mode 100755 data/mapObjects/vermilionpokecenter.asm delete mode 100755 data/mapObjects/victoryroad1.asm delete mode 100755 data/mapObjects/victoryroad2.asm delete mode 100755 data/mapObjects/victoryroad3.asm delete mode 100755 data/mapObjects/viridiancity.asm delete mode 100755 data/mapObjects/viridianforest.asm delete mode 100755 data/mapObjects/viridianforestentrance.asm delete mode 100755 data/mapObjects/viridianforestexit.asm delete mode 100755 data/mapObjects/viridiangym.asm delete mode 100755 data/mapObjects/viridianhouse.asm delete mode 100755 data/mapObjects/viridianmart.asm delete mode 100755 data/mapObjects/viridianpokecenter.asm create mode 100644 maps/AgathasRoom.blk create mode 100644 maps/BikeShop.blk create mode 100644 maps/BillsHouse.blk create mode 100644 maps/BluesHouse.blk create mode 100644 maps/BrunosRoom.blk create mode 100644 maps/CeladonChiefHouse.blk create mode 100644 maps/CeladonCity.blk create mode 100644 maps/CeladonDiner.blk create mode 100644 maps/CeladonGym.blk create mode 100644 maps/CeladonHotel.blk create mode 100644 maps/CeladonMansion1F.blk create mode 100644 maps/CeladonMansion2F.blk create mode 100644 maps/CeladonMansion3F.blk create mode 100644 maps/CeladonMansionRoof.blk create mode 100644 maps/CeladonMansionRoofHouse.blk create mode 100644 maps/CeladonMart1F.blk create mode 100644 maps/CeladonMart2F.blk create mode 100644 maps/CeladonMart3F.blk create mode 100644 maps/CeladonMart4F.blk create mode 100644 maps/CeladonMart5F.blk create mode 100644 maps/CeladonMartElevator.blk create mode 100644 maps/CeladonMartRoof.blk create mode 100644 maps/CeladonPokecenter.blk create mode 100644 maps/CeruleanBadgeHouse.blk create mode 100644 maps/CeruleanCave1F.blk create mode 100644 maps/CeruleanCave2F.blk create mode 100644 maps/CeruleanCaveB1F.blk create mode 100644 maps/CeruleanCity.blk create mode 100644 maps/CeruleanGym.blk create mode 100644 maps/CeruleanMart.blk create mode 100644 maps/CeruleanPokecenter.blk create mode 100644 maps/CeruleanTradeHouse.blk create mode 100644 maps/CeruleanTrashedHouse.blk create mode 100644 maps/ChampionsRoom.blk create mode 100644 maps/CinnabarGym.blk create mode 100644 maps/CinnabarIsland.blk create mode 100644 maps/CinnabarLab.blk create mode 100644 maps/CinnabarLabFossilRoom.blk create mode 100644 maps/CinnabarLabMetronomeRoom.blk create mode 100644 maps/CinnabarLabTradeRoom.blk create mode 100644 maps/CinnabarMart.blk create mode 100644 maps/CinnabarPokecenter.blk create mode 100644 maps/Colosseum.blk create mode 100644 maps/CopycatsHouse1F.blk create mode 100644 maps/CopycatsHouse2F.blk create mode 100644 maps/Daycare.blk create mode 100644 maps/DiglettsCave.blk create mode 100644 maps/DiglettsCaveRoute11.blk create mode 100644 maps/DiglettsCaveRoute2.blk create mode 100644 maps/FightingDojo.blk create mode 100644 maps/FuchsiaBillsGrandpasHouse.blk create mode 100644 maps/FuchsiaCity.blk create mode 100644 maps/FuchsiaGoodRodHouse.blk create mode 100644 maps/FuchsiaGym.blk create mode 100644 maps/FuchsiaMart.blk create mode 100644 maps/FuchsiaMeetingRoom.blk create mode 100644 maps/FuchsiaPokecenter.blk create mode 100644 maps/GameCorner.blk create mode 100644 maps/GameCornerPrizeRoom.blk create mode 100644 maps/HallOfFame.blk create mode 100644 maps/IndigoPlateau.blk create mode 100644 maps/IndigoPlateauLobby.blk create mode 100644 maps/LancesRoom.blk create mode 100644 maps/LavenderCuboneHouse.blk create mode 100644 maps/LavenderMart.blk create mode 100644 maps/LavenderPokecenter.blk create mode 100644 maps/LavenderTown.blk create mode 100644 maps/LoreleisRoom.blk create mode 100644 maps/MrFujisHouse.blk create mode 100644 maps/MrPsychicsHouse.blk create mode 100644 maps/MtMoon1F.blk create mode 100644 maps/MtMoonB1F.blk create mode 100644 maps/MtMoonB2F.blk create mode 100644 maps/MtMoonPokecenter.blk create mode 100644 maps/Museum1F.blk create mode 100644 maps/Museum2F.blk create mode 100644 maps/NameRatersHouse.blk create mode 100644 maps/OaksLab.blk create mode 100644 maps/PalletTown.blk create mode 100644 maps/PewterCity.blk create mode 100644 maps/PewterGym.blk create mode 100644 maps/PewterMart.blk create mode 100644 maps/PewterNidoranHouse.blk create mode 100644 maps/PewterPokecenter.blk create mode 100644 maps/PewterSpeechHouse.blk create mode 100644 maps/PokemonFanClub.blk create mode 100644 maps/PokemonMansion1F.blk create mode 100644 maps/PokemonMansion2F.blk create mode 100644 maps/PokemonMansion3F.blk create mode 100644 maps/PokemonMansionB1F.blk create mode 100644 maps/PokemonTower1F.blk create mode 100644 maps/PokemonTower2F.blk create mode 100644 maps/PokemonTower3F.blk create mode 100644 maps/PokemonTower4F.blk create mode 100644 maps/PokemonTower5F.blk create mode 100644 maps/PokemonTower6F.blk create mode 100644 maps/PokemonTower7F.blk create mode 100644 maps/PowerPlant.blk create mode 100644 maps/RedsHouse1F.blk create mode 100644 maps/RedsHouse2F.blk create mode 100644 maps/RockTunnel1F.blk create mode 100644 maps/RockTunnelB1F.blk create mode 100644 maps/RockTunnelPokecenter.blk create mode 100644 maps/RocketHideoutB1F.blk create mode 100644 maps/RocketHideoutB2F.blk create mode 100644 maps/RocketHideoutB3F.blk create mode 100644 maps/RocketHideoutB4F.blk create mode 100644 maps/RocketHideoutElevator.blk create mode 100644 maps/Route1.blk create mode 100644 maps/Route10.blk create mode 100644 maps/Route11.blk create mode 100644 maps/Route11Gate1F.blk create mode 100644 maps/Route11Gate2F.blk create mode 100644 maps/Route12.blk create mode 100644 maps/Route12Gate1F.blk create mode 100644 maps/Route12Gate2F.blk create mode 100644 maps/Route12SuperRodHouse.blk create mode 100644 maps/Route13.blk create mode 100644 maps/Route14.blk create mode 100644 maps/Route15.blk create mode 100644 maps/Route15Gate1F.blk create mode 100755 maps/Route15Gate2F.blk create mode 100644 maps/Route16.blk create mode 100644 maps/Route16FlyHouse.blk create mode 100644 maps/Route16Gate1F.blk create mode 100644 maps/Route16Gate2F.blk create mode 100644 maps/Route17.blk create mode 100644 maps/Route18.blk create mode 100644 maps/Route18Gate1F.blk create mode 100644 maps/Route18Gate2F.blk create mode 100644 maps/Route19.blk create mode 100644 maps/Route2.blk create mode 100644 maps/Route20.blk create mode 100644 maps/Route21.blk create mode 100644 maps/Route22.blk create mode 100644 maps/Route22Gate.blk create mode 100644 maps/Route23.blk create mode 100644 maps/Route24.blk create mode 100644 maps/Route25.blk create mode 100644 maps/Route2Gate.blk create mode 100644 maps/Route2TradeHouse.blk create mode 100644 maps/Route3.blk create mode 100644 maps/Route4.blk create mode 100644 maps/Route5.blk create mode 100644 maps/Route5Gate.blk create mode 100644 maps/Route6.blk create mode 100644 maps/Route6Gate.blk create mode 100644 maps/Route7.blk create mode 100644 maps/Route7Gate.blk create mode 100644 maps/Route8.blk create mode 100644 maps/Route8Gate.blk create mode 100644 maps/Route9.blk create mode 100644 maps/SSAnne1F.blk create mode 100644 maps/SSAnne1FRooms.blk create mode 100644 maps/SSAnne2F.blk create mode 100644 maps/SSAnne2FRooms.blk create mode 100644 maps/SSAnne3F.blk create mode 100644 maps/SSAnneB1F.blk create mode 100644 maps/SSAnneB1FRooms.blk create mode 100644 maps/SSAnneBow.blk create mode 100644 maps/SSAnneCaptainsRoom.blk create mode 100644 maps/SSAnneKitchen.blk create mode 100644 maps/SafariZoneCenter.blk create mode 100644 maps/SafariZoneCenterRestHouse.blk create mode 100644 maps/SafariZoneEast.blk create mode 100644 maps/SafariZoneEastRestHouse.blk create mode 100644 maps/SafariZoneGate.blk create mode 100644 maps/SafariZoneNorth.blk create mode 100644 maps/SafariZoneNorthRestHouse.blk create mode 100644 maps/SafariZoneSecretHouse.blk create mode 100644 maps/SafariZoneWest.blk create mode 100644 maps/SafariZoneWestRestHouse.blk create mode 100644 maps/SaffronCity.blk create mode 100644 maps/SaffronGym.blk create mode 100644 maps/SaffronMart.blk create mode 100644 maps/SaffronPidgeyHouse.blk create mode 100644 maps/SaffronPokecenter.blk create mode 100644 maps/SeafoamIslands1F.blk create mode 100644 maps/SeafoamIslandsB1F.blk create mode 100644 maps/SeafoamIslandsB2F.blk create mode 100644 maps/SeafoamIslandsB3F.blk create mode 100644 maps/SeafoamIslandsB4F.blk create mode 100644 maps/SilphCo10F.blk create mode 100644 maps/SilphCo11F.blk create mode 100644 maps/SilphCo1F.blk create mode 100644 maps/SilphCo2F.blk create mode 100644 maps/SilphCo3F.blk create mode 100644 maps/SilphCo4F.blk create mode 100644 maps/SilphCo5F.blk create mode 100644 maps/SilphCo6F.blk create mode 100644 maps/SilphCo7F.blk create mode 100644 maps/SilphCo8F.blk create mode 100644 maps/SilphCo9F.blk create mode 100644 maps/SilphCoElevator.blk create mode 100644 maps/TradeCenter.blk create mode 100644 maps/UndergroundPathNorthSouth.blk create mode 100644 maps/UndergroundPathRoute5.blk create mode 100644 maps/UndergroundPathRoute6.blk create mode 100644 maps/UndergroundPathRoute7.blk create mode 100644 maps/UndergroundPathRoute8.blk create mode 100644 maps/UndergroundPathWestEast.blk create mode 100755 maps/UnusedDiglettsCaveCopy.blk create mode 100755 maps/UnusedEmptyMap.blk create mode 100755 maps/UnusedPokecenterCopy.blk create mode 100644 maps/VermilionCity.blk create mode 100644 maps/VermilionDock.blk create mode 100644 maps/VermilionGym.blk create mode 100644 maps/VermilionMart.blk create mode 100644 maps/VermilionOldRodHouse.blk create mode 100644 maps/VermilionPidgeyHouse.blk create mode 100644 maps/VermilionPokecenter.blk create mode 100644 maps/VermilionTradeHouse.blk create mode 100644 maps/VictoryRoad1F.blk create mode 100644 maps/VictoryRoad2F.blk create mode 100644 maps/VictoryRoad3F.blk create mode 100644 maps/ViridianCity.blk create mode 100644 maps/ViridianForest.blk create mode 100644 maps/ViridianForestNorthGate.blk create mode 100644 maps/ViridianForestSouthGate.blk create mode 100644 maps/ViridianGym.blk create mode 100644 maps/ViridianMart.blk create mode 100644 maps/ViridianNicknameHouse.blk create mode 100644 maps/ViridianPokecenter.blk create mode 100644 maps/ViridianSchoolHouse.blk create mode 100644 maps/WardensHouse.blk delete mode 100644 maps/agatha.blk delete mode 100644 maps/bikeshop.blk delete mode 100644 maps/billshouse.blk delete mode 100644 maps/blueshouse.blk delete mode 100644 maps/bruno.blk delete mode 100644 maps/celadoncity.blk delete mode 100644 maps/celadondiner.blk delete mode 100644 maps/celadongamecorner.blk delete mode 100644 maps/celadongym.blk delete mode 100644 maps/celadonhotel.blk delete mode 100644 maps/celadonhouse.blk delete mode 100644 maps/celadonmansion1.blk delete mode 100644 maps/celadonmansion2.blk delete mode 100644 maps/celadonmansion3.blk delete mode 100644 maps/celadonmansion4.blk delete mode 100644 maps/celadonmansion5.blk delete mode 100644 maps/celadonmart1.blk delete mode 100644 maps/celadonmart2.blk delete mode 100644 maps/celadonmart3.blk delete mode 100644 maps/celadonmart4.blk delete mode 100644 maps/celadonmart5.blk delete mode 100644 maps/celadonmartelevator.blk delete mode 100644 maps/celadonmartroof.blk delete mode 100644 maps/celadonpokecenter.blk delete mode 100644 maps/celadonprizeroom.blk delete mode 100644 maps/ceruleancity.blk delete mode 100644 maps/ceruleangym.blk delete mode 100644 maps/ceruleanhouse1.blk delete mode 100644 maps/ceruleanhouse2.blk delete mode 100644 maps/ceruleanhousetrashed.blk delete mode 100644 maps/ceruleanmart.blk delete mode 100644 maps/ceruleanpokecenter.blk delete mode 100644 maps/cinnabargym.blk delete mode 100644 maps/cinnabarisland.blk delete mode 100644 maps/cinnabarmart.blk delete mode 100644 maps/cinnabarpokecenter.blk delete mode 100644 maps/colosseum.blk delete mode 100644 maps/copycatshouse1f.blk delete mode 100644 maps/copycatshouse2f.blk delete mode 100644 maps/daycarem.blk delete mode 100644 maps/diglettscave.blk delete mode 100644 maps/diglettscaveentranceroute11.blk delete mode 100644 maps/diglettscaveroute2.blk delete mode 100644 maps/fanclub.blk delete mode 100644 maps/fightingdojo.blk delete mode 100644 maps/fuchsiacity.blk delete mode 100644 maps/fuchsiagym.blk delete mode 100644 maps/fuchsiahouse1.blk delete mode 100644 maps/fuchsiahouse2.blk delete mode 100644 maps/fuchsiahouse3.blk delete mode 100644 maps/fuchsiamart.blk delete mode 100644 maps/fuchsiameetingroom.blk delete mode 100644 maps/fuchsiapokecenter.blk delete mode 100644 maps/gary.blk delete mode 100644 maps/halloffameroom.blk delete mode 100644 maps/indigoplateau.blk delete mode 100644 maps/indigoplateaulobby.blk delete mode 100644 maps/lab1.blk delete mode 100644 maps/lab2.blk delete mode 100644 maps/lab3.blk delete mode 100644 maps/lab4.blk delete mode 100644 maps/lance.blk delete mode 100644 maps/lavenderhouse1.blk delete mode 100644 maps/lavenderhouse2.blk delete mode 100644 maps/lavendermart.blk delete mode 100644 maps/lavenderpokecenter.blk delete mode 100644 maps/lavendertown.blk delete mode 100644 maps/lorelei.blk delete mode 100644 maps/mansion1.blk delete mode 100644 maps/mansion2.blk delete mode 100644 maps/mansion3.blk delete mode 100644 maps/mansion4.blk delete mode 100644 maps/mtmoon1.blk delete mode 100644 maps/mtmoon2.blk delete mode 100644 maps/mtmoon3.blk delete mode 100644 maps/mtmoonpokecenter.blk delete mode 100644 maps/museum1f.blk delete mode 100644 maps/museum2f.blk delete mode 100644 maps/namerater.blk delete mode 100644 maps/oakslab.blk delete mode 100644 maps/pallettown.blk delete mode 100644 maps/pewtercity.blk delete mode 100644 maps/pewtergym.blk delete mode 100644 maps/pewterhouse1.blk delete mode 100644 maps/pewterhouse2.blk delete mode 100644 maps/pewtermart.blk delete mode 100644 maps/pewterpokecenter.blk delete mode 100644 maps/pokemontower1.blk delete mode 100644 maps/pokemontower2.blk delete mode 100644 maps/pokemontower3.blk delete mode 100644 maps/pokemontower4.blk delete mode 100644 maps/pokemontower5.blk delete mode 100644 maps/pokemontower6.blk delete mode 100644 maps/pokemontower7.blk delete mode 100644 maps/powerplant.blk delete mode 100644 maps/redshouse1f.blk delete mode 100644 maps/redshouse2f.blk delete mode 100644 maps/rockethideout1.blk delete mode 100644 maps/rockethideout2.blk delete mode 100644 maps/rockethideout3.blk delete mode 100644 maps/rockethideout4.blk delete mode 100644 maps/rockethideoutelevator.blk delete mode 100644 maps/rocktunnel1.blk delete mode 100644 maps/rocktunnel2.blk delete mode 100644 maps/rocktunnelpokecenter.blk delete mode 100644 maps/route1.blk delete mode 100644 maps/route10.blk delete mode 100644 maps/route11.blk delete mode 100644 maps/route11gate.blk delete mode 100644 maps/route11gateupstairs.blk delete mode 100644 maps/route12.blk delete mode 100644 maps/route12gate.blk delete mode 100644 maps/route12gateupstairs.blk delete mode 100644 maps/route12house.blk delete mode 100644 maps/route13.blk delete mode 100644 maps/route14.blk delete mode 100644 maps/route15.blk delete mode 100644 maps/route15gate.blk delete mode 100755 maps/route15gateupstairs.blk delete mode 100644 maps/route16.blk delete mode 100644 maps/route16gate.blk delete mode 100644 maps/route16gateupstairs.blk delete mode 100644 maps/route16house.blk delete mode 100644 maps/route17.blk delete mode 100644 maps/route18.blk delete mode 100644 maps/route18gate.blk delete mode 100644 maps/route18gateupstairs.blk delete mode 100644 maps/route19-yellow.blk delete mode 100644 maps/route19.blk delete mode 100644 maps/route2.blk delete mode 100644 maps/route20.blk delete mode 100644 maps/route21.blk delete mode 100644 maps/route22.blk delete mode 100644 maps/route22gate.blk delete mode 100644 maps/route23.blk delete mode 100644 maps/route24.blk delete mode 100644 maps/route25.blk delete mode 100644 maps/route2gate.blk delete mode 100644 maps/route2house.blk delete mode 100644 maps/route3.blk delete mode 100644 maps/route4.blk delete mode 100644 maps/route5.blk delete mode 100644 maps/route5gate.blk delete mode 100644 maps/route6.blk delete mode 100644 maps/route6gate.blk delete mode 100644 maps/route7.blk delete mode 100644 maps/route7gate.blk delete mode 100644 maps/route8.blk delete mode 100644 maps/route8gate.blk delete mode 100644 maps/route9.blk delete mode 100644 maps/safarizonecenter.blk delete mode 100644 maps/safarizoneeast.blk delete mode 100644 maps/safarizoneentrance.blk delete mode 100644 maps/safarizonenorth.blk delete mode 100644 maps/safarizoneresthouse1.blk delete mode 100644 maps/safarizoneresthouse2.blk delete mode 100644 maps/safarizoneresthouse3.blk delete mode 100644 maps/safarizoneresthouse4.blk delete mode 100644 maps/safarizonesecrethouse.blk delete mode 100644 maps/safarizonewest.blk delete mode 100644 maps/saffroncity.blk delete mode 100644 maps/saffrongym.blk delete mode 100644 maps/saffronhouse1.blk delete mode 100644 maps/saffronhouse2.blk delete mode 100644 maps/saffronmart.blk delete mode 100644 maps/saffronpokecenter.blk delete mode 100644 maps/school.blk delete mode 100644 maps/seafoamislands1.blk delete mode 100644 maps/seafoamislands2.blk delete mode 100644 maps/seafoamislands3.blk delete mode 100644 maps/seafoamislands4.blk delete mode 100644 maps/seafoamislands5.blk delete mode 100644 maps/silphco1.blk delete mode 100644 maps/silphco10.blk delete mode 100644 maps/silphco11.blk delete mode 100644 maps/silphco2.blk delete mode 100644 maps/silphco3.blk delete mode 100644 maps/silphco4.blk delete mode 100644 maps/silphco5.blk delete mode 100644 maps/silphco6.blk delete mode 100644 maps/silphco7.blk delete mode 100644 maps/silphco8.blk delete mode 100644 maps/silphco9.blk delete mode 100644 maps/silphcoelevator.blk delete mode 100644 maps/ssanne1.blk delete mode 100644 maps/ssanne10.blk delete mode 100644 maps/ssanne2.blk delete mode 100644 maps/ssanne3.blk delete mode 100644 maps/ssanne4.blk delete mode 100644 maps/ssanne5.blk delete mode 100644 maps/ssanne6.blk delete mode 100644 maps/ssanne7.blk delete mode 100644 maps/ssanne8.blk delete mode 100644 maps/ssanne9.blk delete mode 100644 maps/tradecenter.blk delete mode 100644 maps/undergroundpathentranceroute5.blk delete mode 100644 maps/undergroundpathentranceroute6.blk delete mode 100644 maps/undergroundpathentranceroute7.blk delete mode 100644 maps/undergroundpathentranceroute8.blk delete mode 100644 maps/undergroundpathns.blk delete mode 100644 maps/undergroundpathwe.blk delete mode 100644 maps/unknowndungeon1.blk delete mode 100644 maps/unknowndungeon2.blk delete mode 100644 maps/unknowndungeon3.blk delete mode 100755 maps/unusedblocks58d7d.blk delete mode 100755 maps/unusedblocks60258.blk delete mode 100755 maps/unusedblocks60cef.blk delete mode 100644 maps/vermilioncity.blk delete mode 100644 maps/vermiliondock.blk delete mode 100644 maps/vermiliongym.blk delete mode 100644 maps/vermilionhouse1.blk delete mode 100644 maps/vermilionhouse2.blk delete mode 100644 maps/vermilionhouse3.blk delete mode 100644 maps/vermilionmart.blk delete mode 100644 maps/vermilionpokecenter.blk delete mode 100644 maps/victoryroad1.blk delete mode 100644 maps/victoryroad2.blk delete mode 100644 maps/victoryroad3.blk delete mode 100644 maps/viridiancity.blk delete mode 100644 maps/viridianforest.blk delete mode 100644 maps/viridianforestentrance.blk delete mode 100644 maps/viridianforestexit.blk delete mode 100644 maps/viridiangym.blk delete mode 100644 maps/viridianhouse.blk delete mode 100644 maps/viridianmart.blk delete mode 100644 maps/viridianpokecenter.blk create mode 100755 scripts/AgathasRoom.asm create mode 100755 scripts/BikeShop.asm create mode 100755 scripts/BillsHouse.asm create mode 100755 scripts/BluesHouse.asm create mode 100755 scripts/BrunosRoom.asm create mode 100755 scripts/CeladonChiefHouse.asm create mode 100755 scripts/CeladonCity.asm create mode 100755 scripts/CeladonDiner.asm create mode 100755 scripts/CeladonGym.asm create mode 100755 scripts/CeladonHotel.asm create mode 100755 scripts/CeladonMansion1F.asm create mode 100755 scripts/CeladonMansion2F.asm create mode 100755 scripts/CeladonMansion3F.asm create mode 100755 scripts/CeladonMansionRoof.asm create mode 100755 scripts/CeladonMansionRoofHouse.asm create mode 100755 scripts/CeladonMart1F.asm create mode 100755 scripts/CeladonMart2F.asm create mode 100755 scripts/CeladonMart3F.asm create mode 100755 scripts/CeladonMart4F.asm create mode 100755 scripts/CeladonMart5F.asm create mode 100755 scripts/CeladonMartElevator.asm create mode 100755 scripts/CeladonMartRoof.asm create mode 100755 scripts/CeladonPokecenter.asm create mode 100755 scripts/CeruleanBadgeHouse.asm create mode 100755 scripts/CeruleanCave1F.asm create mode 100755 scripts/CeruleanCave2F.asm create mode 100755 scripts/CeruleanCaveB1F.asm create mode 100755 scripts/CeruleanCity.asm create mode 100755 scripts/CeruleanCity_2.asm create mode 100755 scripts/CeruleanGym.asm create mode 100755 scripts/CeruleanMart.asm create mode 100755 scripts/CeruleanPokecenter.asm create mode 100755 scripts/CeruleanTradeHouse.asm create mode 100755 scripts/CeruleanTrashedHouse.asm create mode 100755 scripts/ChampionsRoom.asm create mode 100755 scripts/CinnabarGym.asm create mode 100755 scripts/CinnabarIsland.asm create mode 100755 scripts/CinnabarLab.asm create mode 100755 scripts/CinnabarLabFossilRoom.asm create mode 100755 scripts/CinnabarLabMetronomeRoom.asm create mode 100755 scripts/CinnabarLabTradeRoom.asm create mode 100755 scripts/CinnabarMart.asm create mode 100755 scripts/CinnabarPokecenter.asm create mode 100755 scripts/Colosseum.asm create mode 100755 scripts/CopycatsHouse1F.asm create mode 100755 scripts/CopycatsHouse2F.asm create mode 100755 scripts/Daycare.asm create mode 100755 scripts/DiglettsCave.asm create mode 100755 scripts/DiglettsCaveRoute11.asm create mode 100755 scripts/DiglettsCaveRoute2.asm create mode 100755 scripts/FightingDojo.asm create mode 100755 scripts/FuchsiaBillsGrandpasHouse.asm create mode 100755 scripts/FuchsiaCity.asm create mode 100755 scripts/FuchsiaGoodRodHouse.asm create mode 100755 scripts/FuchsiaGym.asm create mode 100755 scripts/FuchsiaMart.asm create mode 100755 scripts/FuchsiaMeetingRoom.asm create mode 100755 scripts/FuchsiaPokecenter.asm create mode 100755 scripts/GameCorner.asm create mode 100755 scripts/GameCornerPrizeRoom.asm create mode 100755 scripts/HallOfFame.asm create mode 100755 scripts/IndigoPlateau.asm create mode 100755 scripts/IndigoPlateauLobby.asm create mode 100755 scripts/LancesRoom.asm create mode 100755 scripts/LavenderCuboneHouse.asm create mode 100755 scripts/LavenderMart.asm create mode 100755 scripts/LavenderPokecenter.asm create mode 100755 scripts/LavenderTown.asm create mode 100755 scripts/LoreleisRoom.asm create mode 100755 scripts/MrFujisHouse.asm create mode 100755 scripts/MrPsychicsHouse.asm create mode 100755 scripts/MtMoon1F.asm create mode 100755 scripts/MtMoonB1F.asm create mode 100755 scripts/MtMoonB2F.asm create mode 100755 scripts/MtMoonPokecenter.asm create mode 100755 scripts/Museum1F.asm create mode 100755 scripts/Museum2F.asm create mode 100755 scripts/NameRatersHouse.asm create mode 100755 scripts/OaksLab.asm create mode 100755 scripts/PalletTown.asm create mode 100755 scripts/PewterCity.asm create mode 100755 scripts/PewterGym.asm create mode 100755 scripts/PewterMart.asm create mode 100755 scripts/PewterNidoranHouse.asm create mode 100755 scripts/PewterPokecenter.asm create mode 100755 scripts/PewterSpeechHouse.asm create mode 100755 scripts/PokemonFanClub.asm create mode 100755 scripts/PokemonMansion1F.asm create mode 100755 scripts/PokemonMansion2F.asm create mode 100755 scripts/PokemonMansion3F.asm create mode 100755 scripts/PokemonMansionB1F.asm create mode 100755 scripts/PokemonTower1F.asm create mode 100755 scripts/PokemonTower2F.asm create mode 100755 scripts/PokemonTower3F.asm create mode 100755 scripts/PokemonTower4F.asm create mode 100755 scripts/PokemonTower5F.asm create mode 100755 scripts/PokemonTower6F.asm create mode 100755 scripts/PokemonTower7F.asm create mode 100755 scripts/PowerPlant.asm create mode 100755 scripts/RedsHouse1F.asm create mode 100755 scripts/RedsHouse2F.asm create mode 100755 scripts/RockTunnel1F.asm create mode 100755 scripts/RockTunnelB1F.asm create mode 100755 scripts/RockTunnelPokecenter.asm create mode 100755 scripts/RocketHideoutB1F.asm create mode 100755 scripts/RocketHideoutB2F.asm create mode 100755 scripts/RocketHideoutB3F.asm create mode 100755 scripts/RocketHideoutB4F.asm create mode 100755 scripts/RocketHideoutElevator.asm create mode 100755 scripts/Route1.asm create mode 100755 scripts/Route10.asm create mode 100755 scripts/Route11.asm create mode 100755 scripts/Route11Gate1F.asm create mode 100755 scripts/Route11Gate2F.asm create mode 100755 scripts/Route12.asm create mode 100755 scripts/Route12Gate1F.asm create mode 100755 scripts/Route12Gate2F.asm create mode 100755 scripts/Route12SuperRodHouse.asm create mode 100755 scripts/Route13.asm create mode 100755 scripts/Route14.asm create mode 100755 scripts/Route15.asm create mode 100755 scripts/Route15Gate1F.asm create mode 100755 scripts/Route15Gate2F.asm create mode 100755 scripts/Route16.asm create mode 100755 scripts/Route16FlyHouse.asm create mode 100755 scripts/Route16Gate1F.asm create mode 100755 scripts/Route16Gate2F.asm create mode 100755 scripts/Route17.asm create mode 100755 scripts/Route18.asm create mode 100755 scripts/Route18Gate1F.asm create mode 100755 scripts/Route18Gate2F.asm create mode 100755 scripts/Route19.asm create mode 100755 scripts/Route2.asm create mode 100755 scripts/Route20.asm create mode 100755 scripts/Route21.asm create mode 100755 scripts/Route22.asm create mode 100755 scripts/Route22Gate.asm create mode 100755 scripts/Route23.asm create mode 100755 scripts/Route24.asm create mode 100755 scripts/Route25.asm create mode 100755 scripts/Route2Gate.asm create mode 100755 scripts/Route2TradeHouse.asm create mode 100755 scripts/Route3.asm create mode 100755 scripts/Route4.asm create mode 100755 scripts/Route5.asm create mode 100755 scripts/Route5Gate.asm create mode 100755 scripts/Route6.asm create mode 100755 scripts/Route6Gate.asm create mode 100755 scripts/Route7.asm create mode 100755 scripts/Route7Gate.asm create mode 100755 scripts/Route8.asm create mode 100755 scripts/Route8Gate.asm create mode 100755 scripts/Route9.asm create mode 100755 scripts/SSAnne1F.asm create mode 100755 scripts/SSAnne1FRooms.asm create mode 100755 scripts/SSAnne2F.asm create mode 100755 scripts/SSAnne2FRooms.asm create mode 100755 scripts/SSAnne3F.asm create mode 100755 scripts/SSAnneB1F.asm create mode 100755 scripts/SSAnneB1FRooms.asm create mode 100755 scripts/SSAnneBow.asm create mode 100755 scripts/SSAnneCaptainsRoom.asm create mode 100755 scripts/SSAnneKitchen.asm create mode 100755 scripts/SafariZoneCenter.asm create mode 100755 scripts/SafariZoneCenterRestHouse.asm create mode 100755 scripts/SafariZoneEast.asm create mode 100755 scripts/SafariZoneEastRestHouse.asm create mode 100755 scripts/SafariZoneGate.asm create mode 100755 scripts/SafariZoneNorth.asm create mode 100755 scripts/SafariZoneNorthRestHouse.asm create mode 100755 scripts/SafariZoneSecretHouse.asm create mode 100755 scripts/SafariZoneWest.asm create mode 100755 scripts/SafariZoneWestRestHouse.asm create mode 100755 scripts/SaffronCity.asm create mode 100755 scripts/SaffronGym.asm create mode 100755 scripts/SaffronMart.asm create mode 100755 scripts/SaffronPidgeyHouse.asm create mode 100755 scripts/SaffronPokecenter.asm create mode 100755 scripts/SeafoamIslands1F.asm create mode 100755 scripts/SeafoamIslandsB1F.asm create mode 100755 scripts/SeafoamIslandsB2F.asm create mode 100755 scripts/SeafoamIslandsB3F.asm create mode 100755 scripts/SeafoamIslandsB4F.asm create mode 100755 scripts/SilphCo10F.asm create mode 100755 scripts/SilphCo11F.asm create mode 100755 scripts/SilphCo1F.asm create mode 100755 scripts/SilphCo2F.asm create mode 100755 scripts/SilphCo3F.asm create mode 100755 scripts/SilphCo4F.asm create mode 100755 scripts/SilphCo5F.asm create mode 100755 scripts/SilphCo6F.asm create mode 100755 scripts/SilphCo7F.asm create mode 100755 scripts/SilphCo8F.asm create mode 100755 scripts/SilphCo9F.asm create mode 100755 scripts/SilphCoElevator.asm create mode 100755 scripts/TradeCenter.asm create mode 100755 scripts/UndergroundPathNorthSouth.asm create mode 100755 scripts/UndergroundPathRoute5.asm create mode 100755 scripts/UndergroundPathRoute6.asm create mode 100755 scripts/UndergroundPathRoute7.asm create mode 100755 scripts/UndergroundPathRoute7Copy.asm create mode 100755 scripts/UndergroundPathRoute8.asm create mode 100755 scripts/UndergroundPathWestEast.asm create mode 100755 scripts/VermilionCity.asm create mode 100755 scripts/VermilionDock.asm create mode 100755 scripts/VermilionGym.asm create mode 100755 scripts/VermilionMart.asm create mode 100755 scripts/VermilionOldRodHouse.asm create mode 100755 scripts/VermilionPidgeyHouse.asm create mode 100755 scripts/VermilionPokecenter.asm create mode 100755 scripts/VermilionTradeHouse.asm create mode 100755 scripts/VictoryRoad1F.asm create mode 100755 scripts/VictoryRoad2F.asm create mode 100755 scripts/VictoryRoad3F.asm create mode 100755 scripts/ViridianCity.asm create mode 100755 scripts/ViridianForest.asm create mode 100755 scripts/ViridianForestNorthGate.asm create mode 100755 scripts/ViridianForestSouthGate.asm create mode 100755 scripts/ViridianGym.asm create mode 100755 scripts/ViridianMart.asm create mode 100755 scripts/ViridianNicknameHouse.asm create mode 100755 scripts/ViridianPokecenter.asm create mode 100755 scripts/ViridianSchoolHouse.asm create mode 100755 scripts/WardensHouse.asm delete mode 100755 scripts/agatha.asm delete mode 100755 scripts/bikeshop.asm delete mode 100755 scripts/billshouse.asm delete mode 100755 scripts/blueshouse.asm delete mode 100755 scripts/bruno.asm delete mode 100755 scripts/celadoncity.asm delete mode 100755 scripts/celadondiner.asm delete mode 100755 scripts/celadongamecorner.asm delete mode 100755 scripts/celadongym.asm delete mode 100755 scripts/celadonhotel.asm delete mode 100755 scripts/celadonhouse.asm delete mode 100755 scripts/celadonmansion1.asm delete mode 100755 scripts/celadonmansion2.asm delete mode 100755 scripts/celadonmansion3.asm delete mode 100755 scripts/celadonmansion4.asm delete mode 100755 scripts/celadonmansion5.asm delete mode 100755 scripts/celadonmart1.asm delete mode 100755 scripts/celadonmart2.asm delete mode 100755 scripts/celadonmart3.asm delete mode 100755 scripts/celadonmart4.asm delete mode 100755 scripts/celadonmart5.asm delete mode 100755 scripts/celadonmartelevator.asm delete mode 100755 scripts/celadonmartroof.asm delete mode 100755 scripts/celadonpokecenter.asm delete mode 100755 scripts/celadonprizeroom.asm delete mode 100755 scripts/ceruleancity.asm delete mode 100755 scripts/ceruleancity2.asm delete mode 100755 scripts/ceruleangym.asm delete mode 100755 scripts/ceruleanhouse1.asm delete mode 100755 scripts/ceruleanhouse2.asm delete mode 100755 scripts/ceruleanhousetrashed.asm delete mode 100755 scripts/ceruleanmart.asm delete mode 100755 scripts/ceruleanpokecenter.asm delete mode 100755 scripts/cinnabargym.asm delete mode 100755 scripts/cinnabarisland.asm delete mode 100755 scripts/cinnabarmart.asm delete mode 100755 scripts/cinnabarpokecenter.asm delete mode 100755 scripts/colosseum.asm delete mode 100755 scripts/copycatshouse1f.asm delete mode 100755 scripts/copycatshouse2f.asm delete mode 100755 scripts/daycarem.asm delete mode 100755 scripts/diglettscave.asm delete mode 100755 scripts/diglettscaveroute11.asm delete mode 100755 scripts/diglettscaveroute2.asm delete mode 100755 scripts/fanclub.asm delete mode 100755 scripts/fightingdojo.asm delete mode 100755 scripts/fuchsiacity.asm delete mode 100755 scripts/fuchsiagym.asm delete mode 100755 scripts/fuchsiahouse1.asm delete mode 100755 scripts/fuchsiahouse2.asm delete mode 100755 scripts/fuchsiahouse3.asm delete mode 100755 scripts/fuchsiamart.asm delete mode 100755 scripts/fuchsiameetingroom.asm delete mode 100755 scripts/fuchsiapokecenter.asm delete mode 100755 scripts/gary.asm delete mode 100755 scripts/halloffameroom.asm delete mode 100755 scripts/indigoplateau.asm delete mode 100755 scripts/indigoplateaulobby.asm delete mode 100755 scripts/lab1.asm delete mode 100755 scripts/lab2.asm delete mode 100755 scripts/lab3.asm delete mode 100755 scripts/lab4.asm delete mode 100755 scripts/lance.asm delete mode 100755 scripts/lavenderhouse1.asm delete mode 100755 scripts/lavenderhouse2.asm delete mode 100755 scripts/lavendermart.asm delete mode 100755 scripts/lavenderpokecenter.asm delete mode 100755 scripts/lavendertown.asm delete mode 100755 scripts/lorelei.asm delete mode 100755 scripts/mansion1.asm delete mode 100755 scripts/mansion2.asm delete mode 100755 scripts/mansion3.asm delete mode 100755 scripts/mansion4.asm delete mode 100755 scripts/mtmoon1.asm delete mode 100755 scripts/mtmoon2.asm delete mode 100755 scripts/mtmoon3.asm delete mode 100755 scripts/mtmoonpokecenter.asm delete mode 100755 scripts/museum1f.asm delete mode 100755 scripts/museum2f.asm delete mode 100755 scripts/namerater.asm delete mode 100755 scripts/oakslab.asm delete mode 100755 scripts/pallettown.asm delete mode 100755 scripts/pewtercity.asm delete mode 100755 scripts/pewtergym.asm delete mode 100755 scripts/pewterhouse1.asm delete mode 100755 scripts/pewterhouse2.asm delete mode 100755 scripts/pewtermart.asm delete mode 100755 scripts/pewterpokecenter.asm delete mode 100755 scripts/pokemontower1.asm delete mode 100755 scripts/pokemontower2.asm delete mode 100755 scripts/pokemontower3.asm delete mode 100755 scripts/pokemontower4.asm delete mode 100755 scripts/pokemontower5.asm delete mode 100755 scripts/pokemontower6.asm delete mode 100755 scripts/pokemontower7.asm delete mode 100755 scripts/powerplant.asm delete mode 100755 scripts/redshouse1f.asm delete mode 100755 scripts/redshouse2f.asm delete mode 100755 scripts/rockethideout1.asm delete mode 100755 scripts/rockethideout2.asm delete mode 100755 scripts/rockethideout3.asm delete mode 100755 scripts/rockethideout4.asm delete mode 100755 scripts/rockethideoutelevator.asm delete mode 100755 scripts/rocktunnel1.asm delete mode 100755 scripts/rocktunnel2.asm delete mode 100755 scripts/rocktunnelpokecenter.asm delete mode 100755 scripts/route1.asm delete mode 100755 scripts/route10.asm delete mode 100755 scripts/route11.asm delete mode 100755 scripts/route11gate.asm delete mode 100755 scripts/route11gateupstairs.asm delete mode 100755 scripts/route12.asm delete mode 100755 scripts/route12gate.asm delete mode 100755 scripts/route12gateupstairs.asm delete mode 100755 scripts/route12house.asm delete mode 100755 scripts/route13.asm delete mode 100755 scripts/route14.asm delete mode 100755 scripts/route15.asm delete mode 100755 scripts/route15gate.asm delete mode 100755 scripts/route15gateupstairs.asm delete mode 100755 scripts/route16.asm delete mode 100755 scripts/route16gate.asm delete mode 100755 scripts/route16gateupstairs.asm delete mode 100755 scripts/route16house.asm delete mode 100755 scripts/route17.asm delete mode 100755 scripts/route18.asm delete mode 100755 scripts/route18gate.asm delete mode 100755 scripts/route18gateupstairs.asm delete mode 100755 scripts/route19.asm delete mode 100755 scripts/route2.asm delete mode 100755 scripts/route20.asm delete mode 100755 scripts/route21.asm delete mode 100755 scripts/route22.asm delete mode 100755 scripts/route22gate.asm delete mode 100755 scripts/route23.asm delete mode 100755 scripts/route24.asm delete mode 100755 scripts/route25.asm delete mode 100755 scripts/route2gate.asm delete mode 100755 scripts/route2house.asm delete mode 100755 scripts/route3.asm delete mode 100755 scripts/route4.asm delete mode 100755 scripts/route5.asm delete mode 100755 scripts/route5gate.asm delete mode 100755 scripts/route6.asm delete mode 100755 scripts/route6gate.asm delete mode 100755 scripts/route7.asm delete mode 100755 scripts/route7gate.asm delete mode 100755 scripts/route8.asm delete mode 100755 scripts/route8gate.asm delete mode 100755 scripts/route9.asm delete mode 100755 scripts/safarizonecenter.asm delete mode 100755 scripts/safarizoneeast.asm delete mode 100755 scripts/safarizoneentrance.asm delete mode 100755 scripts/safarizonenorth.asm delete mode 100755 scripts/safarizoneresthouse1.asm delete mode 100755 scripts/safarizoneresthouse2.asm delete mode 100755 scripts/safarizoneresthouse3.asm delete mode 100755 scripts/safarizoneresthouse4.asm delete mode 100755 scripts/safarizonesecrethouse.asm delete mode 100755 scripts/safarizonewest.asm delete mode 100755 scripts/saffroncity.asm delete mode 100755 scripts/saffrongym.asm delete mode 100755 scripts/saffronhouse1.asm delete mode 100755 scripts/saffronhouse2.asm delete mode 100755 scripts/saffronmart.asm delete mode 100755 scripts/saffronpokecenter.asm delete mode 100755 scripts/school.asm delete mode 100755 scripts/seafoamislands1.asm delete mode 100755 scripts/seafoamislands2.asm delete mode 100755 scripts/seafoamislands3.asm delete mode 100755 scripts/seafoamislands4.asm delete mode 100755 scripts/seafoamislands5.asm delete mode 100755 scripts/silphco1.asm delete mode 100755 scripts/silphco10.asm delete mode 100755 scripts/silphco11.asm delete mode 100755 scripts/silphco2.asm delete mode 100755 scripts/silphco3.asm delete mode 100755 scripts/silphco4.asm delete mode 100755 scripts/silphco5.asm delete mode 100755 scripts/silphco6.asm delete mode 100755 scripts/silphco7.asm delete mode 100755 scripts/silphco8.asm delete mode 100755 scripts/silphco9.asm delete mode 100755 scripts/silphcoelevator.asm delete mode 100755 scripts/ssanne1.asm delete mode 100755 scripts/ssanne10.asm delete mode 100755 scripts/ssanne2.asm delete mode 100755 scripts/ssanne3.asm delete mode 100755 scripts/ssanne4.asm delete mode 100755 scripts/ssanne5.asm delete mode 100755 scripts/ssanne6.asm delete mode 100755 scripts/ssanne7.asm delete mode 100755 scripts/ssanne8.asm delete mode 100755 scripts/ssanne9.asm delete mode 100755 scripts/tradecenter.asm delete mode 100755 scripts/undergroundpathentranceroute5.asm delete mode 100755 scripts/undergroundpathentranceroute6.asm delete mode 100755 scripts/undergroundpathentranceroute7.asm delete mode 100755 scripts/undergroundpathentranceroute7copy.asm delete mode 100755 scripts/undergroundpathentranceroute8.asm delete mode 100755 scripts/undergroundpathns.asm delete mode 100755 scripts/undergroundpathwe.asm delete mode 100755 scripts/unknowndungeon1.asm delete mode 100755 scripts/unknowndungeon2.asm delete mode 100755 scripts/unknowndungeon3.asm delete mode 100755 scripts/vermilioncity.asm delete mode 100755 scripts/vermiliondock.asm delete mode 100755 scripts/vermiliongym.asm delete mode 100755 scripts/vermilionhouse1.asm delete mode 100755 scripts/vermilionhouse2.asm delete mode 100755 scripts/vermilionhouse3.asm delete mode 100755 scripts/vermilionmart.asm delete mode 100755 scripts/vermilionpokecenter.asm delete mode 100755 scripts/victoryroad1.asm delete mode 100755 scripts/victoryroad2.asm delete mode 100755 scripts/victoryroad3.asm delete mode 100755 scripts/viridiancity.asm delete mode 100755 scripts/viridianforest.asm delete mode 100755 scripts/viridianforestentrance.asm delete mode 100755 scripts/viridianforestexit.asm delete mode 100755 scripts/viridiangym.asm delete mode 100755 scripts/viridianhouse.asm delete mode 100755 scripts/viridianmart.asm delete mode 100755 scripts/viridianpokecenter.asm create mode 100644 text/maps/AgathasRoom.asm create mode 100644 text/maps/BikeShop.asm create mode 100644 text/maps/BillsHouse.asm create mode 100644 text/maps/BluesHouse.asm create mode 100644 text/maps/BrunosRoom.asm create mode 100644 text/maps/CeladonChiefHouse.asm create mode 100644 text/maps/CeladonCity.asm create mode 100644 text/maps/CeladonDiner.asm create mode 100644 text/maps/CeladonGym.asm create mode 100644 text/maps/CeladonHotel.asm create mode 100644 text/maps/CeladonMansion1F.asm create mode 100644 text/maps/CeladonMansion2F.asm create mode 100644 text/maps/CeladonMansion3F.asm create mode 100644 text/maps/CeladonMansionRoof.asm create mode 100644 text/maps/CeladonMansionRoofHouse.asm create mode 100644 text/maps/CeladonMart1F.asm create mode 100644 text/maps/CeladonMart2F.asm create mode 100644 text/maps/CeladonMart3F.asm create mode 100644 text/maps/CeladonMart4F.asm create mode 100644 text/maps/CeladonMart5F.asm create mode 100644 text/maps/CeladonMartRoof.asm create mode 100644 text/maps/CeladonPokecenter.asm create mode 100644 text/maps/CeruleanBadgeHouse.asm create mode 100644 text/maps/CeruleanCaveB1F.asm create mode 100644 text/maps/CeruleanCity.asm create mode 100644 text/maps/CeruleanGym.asm create mode 100644 text/maps/CeruleanMart.asm create mode 100644 text/maps/CeruleanPokecenter.asm create mode 100644 text/maps/CeruleanTradeHouse.asm create mode 100644 text/maps/CeruleanTrashedHouse.asm create mode 100644 text/maps/ChampionsRoom.asm create mode 100644 text/maps/CinnabarGym.asm create mode 100644 text/maps/CinnabarIsland.asm create mode 100644 text/maps/CinnabarLab.asm create mode 100644 text/maps/CinnabarLabFossilRoom.asm create mode 100644 text/maps/CinnabarLabMetronomeRoom.asm create mode 100644 text/maps/CinnabarLabTradeRoom.asm create mode 100644 text/maps/CinnabarMart.asm create mode 100644 text/maps/CinnabarPokecenter.asm create mode 100644 text/maps/CopycatsHouse1F.asm create mode 100644 text/maps/CopycatsHouse2F.asm create mode 100644 text/maps/Daycare.asm create mode 100644 text/maps/Daycare_2.asm create mode 100644 text/maps/DiglettsCaveRoute11.asm create mode 100644 text/maps/DiglettsCaveRoute2.asm create mode 100644 text/maps/FightingDojo.asm create mode 100644 text/maps/FuchsiaBillsGrandpasHouse.asm create mode 100644 text/maps/FuchsiaCity.asm create mode 100644 text/maps/FuchsiaGoodRodHouse.asm create mode 100644 text/maps/FuchsiaGym.asm create mode 100644 text/maps/FuchsiaGym_2.asm create mode 100644 text/maps/FuchsiaMart.asm create mode 100644 text/maps/FuchsiaMeetingRoom.asm create mode 100644 text/maps/FuchsiaPokecenter.asm create mode 100644 text/maps/GameCorner.asm create mode 100644 text/maps/GameCornerPrizeRoom.asm create mode 100644 text/maps/HallOfFame.asm create mode 100644 text/maps/IndigoPlateauLobby.asm create mode 100644 text/maps/LancesRoom.asm create mode 100644 text/maps/LavenderCuboneHouse.asm create mode 100644 text/maps/LavenderMart.asm create mode 100644 text/maps/LavenderPokecenter.asm create mode 100644 text/maps/LavenderTown.asm create mode 100644 text/maps/LoreleisRoom.asm create mode 100644 text/maps/MrFujisHouse.asm create mode 100644 text/maps/MrPsychicsHouse.asm create mode 100644 text/maps/MtMoon1F.asm create mode 100644 text/maps/MtMoonB1F.asm create mode 100644 text/maps/MtMoonB2F.asm create mode 100644 text/maps/MtMoonPokecenter.asm create mode 100644 text/maps/Museum1F.asm create mode 100644 text/maps/Museum2F.asm create mode 100644 text/maps/NameRatersHouse.asm create mode 100644 text/maps/OaksLab.asm create mode 100644 text/maps/PalletTown.asm create mode 100644 text/maps/PewterCity.asm create mode 100644 text/maps/PewterGym.asm create mode 100644 text/maps/PewterGym_2.asm create mode 100644 text/maps/PewterMart.asm create mode 100644 text/maps/PewterNidoranHouse.asm create mode 100644 text/maps/PewterPokecenter.asm create mode 100644 text/maps/PewterSpeechHouse.asm create mode 100644 text/maps/PokemonFanClub.asm create mode 100644 text/maps/PokemonMansion1F.asm create mode 100644 text/maps/PokemonMansion2F.asm create mode 100644 text/maps/PokemonMansion3F.asm create mode 100644 text/maps/PokemonMansionB1F.asm create mode 100644 text/maps/PokemonTower1F.asm create mode 100644 text/maps/PokemonTower2F.asm create mode 100644 text/maps/PokemonTower3F.asm create mode 100644 text/maps/PokemonTower4F.asm create mode 100644 text/maps/PokemonTower5F.asm create mode 100644 text/maps/PokemonTower6F.asm create mode 100644 text/maps/PokemonTower7F.asm create mode 100644 text/maps/PowerPlant.asm create mode 100644 text/maps/RedsHouse1F.asm create mode 100644 text/maps/RockTunnel1F.asm create mode 100644 text/maps/RockTunnelB1F.asm create mode 100644 text/maps/RockTunnelB1F_2.asm create mode 100644 text/maps/RockTunnelPokecenter.asm create mode 100644 text/maps/RocketHideoutB1F.asm create mode 100644 text/maps/RocketHideoutB2F.asm create mode 100644 text/maps/RocketHideoutB3F.asm create mode 100644 text/maps/RocketHideoutB4F.asm create mode 100644 text/maps/RocketHideoutElevator.asm create mode 100644 text/maps/Route1.asm create mode 100644 text/maps/Route10.asm create mode 100644 text/maps/Route11.asm create mode 100644 text/maps/Route11Gate1F.asm create mode 100644 text/maps/Route11Gate2F.asm create mode 100644 text/maps/Route11_2.asm create mode 100644 text/maps/Route12.asm create mode 100644 text/maps/Route12Gate1F.asm create mode 100644 text/maps/Route12Gate2F.asm create mode 100644 text/maps/Route12SuperRodHouse.asm create mode 100644 text/maps/Route13.asm create mode 100644 text/maps/Route14.asm create mode 100644 text/maps/Route15.asm create mode 100644 text/maps/Route15Gate1F.asm create mode 100644 text/maps/Route15Gate2F.asm create mode 100644 text/maps/Route16.asm create mode 100644 text/maps/Route16FlyHouse.asm create mode 100644 text/maps/Route16Gate1F.asm create mode 100644 text/maps/Route16Gate2F.asm create mode 100644 text/maps/Route17.asm create mode 100644 text/maps/Route18.asm create mode 100644 text/maps/Route18Gate1F.asm create mode 100644 text/maps/Route18Gate2F.asm create mode 100644 text/maps/Route19.asm create mode 100644 text/maps/Route2.asm create mode 100644 text/maps/Route20.asm create mode 100644 text/maps/Route21.asm create mode 100644 text/maps/Route22.asm create mode 100644 text/maps/Route22Gate.asm create mode 100644 text/maps/Route23.asm create mode 100644 text/maps/Route24.asm create mode 100644 text/maps/Route24_2.asm create mode 100644 text/maps/Route25.asm create mode 100644 text/maps/Route2Gate.asm create mode 100644 text/maps/Route2TradeHouse.asm create mode 100644 text/maps/Route3.asm create mode 100644 text/maps/Route4.asm create mode 100644 text/maps/Route5.asm create mode 100644 text/maps/Route6.asm create mode 100644 text/maps/Route7.asm create mode 100644 text/maps/Route8.asm create mode 100644 text/maps/Route9.asm create mode 100644 text/maps/SSAnne1F.asm create mode 100644 text/maps/SSAnne1FRooms.asm create mode 100644 text/maps/SSAnne2F.asm create mode 100644 text/maps/SSAnne2FRooms.asm create mode 100644 text/maps/SSAnne3F.asm create mode 100644 text/maps/SSAnneB1FRooms.asm create mode 100644 text/maps/SSAnneBow.asm create mode 100644 text/maps/SSAnneCaptainsRoom.asm create mode 100644 text/maps/SSAnneKitchen.asm create mode 100644 text/maps/SafariZoneCenter.asm create mode 100644 text/maps/SafariZoneCenterRestHouse.asm create mode 100644 text/maps/SafariZoneEast.asm create mode 100644 text/maps/SafariZoneEastRestHouse.asm create mode 100644 text/maps/SafariZoneGate.asm create mode 100644 text/maps/SafariZoneNorth.asm create mode 100644 text/maps/SafariZoneNorthRestHouse.asm create mode 100644 text/maps/SafariZoneSecretHouse.asm create mode 100644 text/maps/SafariZoneWest.asm create mode 100644 text/maps/SafariZoneWestRestHouse.asm create mode 100644 text/maps/SaffronCity.asm create mode 100644 text/maps/SaffronGates.asm create mode 100644 text/maps/SaffronGym.asm create mode 100644 text/maps/SaffronMart.asm create mode 100644 text/maps/SaffronPidgeyHouse.asm create mode 100644 text/maps/SaffronPokecenter.asm create mode 100644 text/maps/SeafoamIslandsB4F.asm create mode 100644 text/maps/SilphCo10F.asm create mode 100644 text/maps/SilphCo11F.asm create mode 100644 text/maps/SilphCo1F.asm create mode 100644 text/maps/SilphCo2F.asm create mode 100644 text/maps/SilphCo3F.asm create mode 100644 text/maps/SilphCo4F.asm create mode 100644 text/maps/SilphCo5F.asm create mode 100644 text/maps/SilphCo5F_2.asm create mode 100644 text/maps/SilphCo6F.asm create mode 100644 text/maps/SilphCo7F.asm create mode 100644 text/maps/SilphCo8F.asm create mode 100644 text/maps/SilphCo9F.asm create mode 100644 text/maps/UndergroundPathRoute6.asm create mode 100644 text/maps/UndergroundPathRoute7.asm create mode 100644 text/maps/UndergroundPathRoute7Copy.asm create mode 100644 text/maps/UndergroundPathRoute8.asm create mode 100644 text/maps/VermilionCity.asm create mode 100644 text/maps/VermilionDock.asm create mode 100644 text/maps/VermilionGym.asm create mode 100644 text/maps/VermilionGym_2.asm create mode 100644 text/maps/VermilionMart.asm create mode 100644 text/maps/VermilionOldRodHouse.asm create mode 100644 text/maps/VermilionPidgeyHouse.asm create mode 100644 text/maps/VermilionPokecenter.asm create mode 100644 text/maps/VictoryRoad1F.asm create mode 100644 text/maps/VictoryRoad2F.asm create mode 100644 text/maps/VictoryRoad3F.asm create mode 100644 text/maps/ViridianCity.asm create mode 100644 text/maps/ViridianForest.asm create mode 100644 text/maps/ViridianForestNorthGate.asm create mode 100644 text/maps/ViridianForestSouthGate.asm create mode 100644 text/maps/ViridianGym.asm create mode 100644 text/maps/ViridianMart.asm create mode 100644 text/maps/ViridianNicknameHouse.asm create mode 100644 text/maps/ViridianPokecenter.asm create mode 100644 text/maps/ViridianSchoolHouse.asm create mode 100644 text/maps/WardensHouse.asm delete mode 100644 text/maps/agatha.asm delete mode 100644 text/maps/bike_shop.asm delete mode 100644 text/maps/bills_house.asm delete mode 100644 text/maps/blues_house.asm delete mode 100644 text/maps/bruno.asm delete mode 100644 text/maps/celadon_city.asm delete mode 100644 text/maps/celadon_dept_store_1f.asm delete mode 100644 text/maps/celadon_dept_store_2f.asm delete mode 100644 text/maps/celadon_dept_store_3f.asm delete mode 100644 text/maps/celadon_dept_store_4f.asm delete mode 100644 text/maps/celadon_dept_store_5f.asm delete mode 100644 text/maps/celadon_dept_store_roof.asm delete mode 100644 text/maps/celadon_diner.asm delete mode 100644 text/maps/celadon_game_corner.asm delete mode 100644 text/maps/celadon_gym.asm delete mode 100644 text/maps/celadon_hotel.asm delete mode 100644 text/maps/celadon_house.asm delete mode 100644 text/maps/celadon_mansion_1f.asm delete mode 100644 text/maps/celadon_mansion_2f.asm delete mode 100644 text/maps/celadon_mansion_3f.asm delete mode 100644 text/maps/celadon_mansion_4f_inside.asm delete mode 100644 text/maps/celadon_mansion_4f_outside.asm delete mode 100644 text/maps/celadon_pokecenter.asm delete mode 100644 text/maps/celadon_prize_room.asm delete mode 100644 text/maps/cerulean_badge_house.asm delete mode 100644 text/maps/cerulean_city.asm delete mode 100644 text/maps/cerulean_gym.asm delete mode 100644 text/maps/cerulean_mart.asm delete mode 100644 text/maps/cerulean_pokecenter.asm delete mode 100644 text/maps/cerulean_trade_house.asm delete mode 100644 text/maps/cerulean_trashed_house.asm delete mode 100644 text/maps/champion.asm delete mode 100644 text/maps/cinnabar_gym.asm delete mode 100644 text/maps/cinnabar_island.asm delete mode 100644 text/maps/cinnabar_lab.asm delete mode 100644 text/maps/cinnabar_lab_fossil_room.asm delete mode 100644 text/maps/cinnabar_lab_metronome_room.asm delete mode 100644 text/maps/cinnabar_lab_trade_room.asm delete mode 100644 text/maps/cinnabar_mart.asm delete mode 100644 text/maps/cinnabar_pokecenter.asm delete mode 100644 text/maps/copycats_house_1f.asm delete mode 100644 text/maps/copycats_house_2f.asm delete mode 100644 text/maps/daycare_1.asm delete mode 100644 text/maps/daycare_2.asm delete mode 100644 text/maps/digletts_cave_route_11_entrance.asm delete mode 100644 text/maps/digletts_cave_route_2_entrance.asm delete mode 100644 text/maps/fan_club.asm delete mode 100644 text/maps/fighting_dojo.asm delete mode 100644 text/maps/fuchsia_city.asm delete mode 100644 text/maps/fuchsia_fishing_house.asm delete mode 100644 text/maps/fuchsia_gym_1.asm delete mode 100644 text/maps/fuchsia_gym_2.asm delete mode 100644 text/maps/fuchsia_house.asm delete mode 100644 text/maps/fuchsia_mart.asm delete mode 100644 text/maps/fuchsia_meeting_room.asm delete mode 100644 text/maps/fuchsia_pokecenter.asm delete mode 100644 text/maps/fujis_house.asm delete mode 100644 text/maps/hall_of_fame.asm delete mode 100644 text/maps/indigo_plateau_lobby.asm delete mode 100644 text/maps/lance.asm delete mode 100644 text/maps/lavender_house.asm delete mode 100644 text/maps/lavender_mart.asm delete mode 100644 text/maps/lavender_pokecenter.asm delete mode 100644 text/maps/lavender_town.asm delete mode 100644 text/maps/lorelei.asm delete mode 100644 text/maps/mansion_1f.asm delete mode 100644 text/maps/mansion_2f.asm delete mode 100644 text/maps/mansion_3f.asm delete mode 100644 text/maps/mansion_b1f.asm delete mode 100644 text/maps/mr_psychics_house.asm delete mode 100644 text/maps/mt_moon_1f.asm delete mode 100644 text/maps/mt_moon_b1f.asm delete mode 100644 text/maps/mt_moon_b2f.asm delete mode 100644 text/maps/mt_moon_pokecenter.asm delete mode 100644 text/maps/museum_1f.asm delete mode 100644 text/maps/museum_2f.asm delete mode 100644 text/maps/name_rater.asm delete mode 100644 text/maps/oaks_lab.asm delete mode 100644 text/maps/pallet_town.asm delete mode 100644 text/maps/pewter_city.asm delete mode 100644 text/maps/pewter_gym_1.asm delete mode 100644 text/maps/pewter_gym_2.asm delete mode 100644 text/maps/pewter_house_1.asm delete mode 100644 text/maps/pewter_house_2.asm delete mode 100644 text/maps/pewter_mart.asm delete mode 100644 text/maps/pewter_pokecenter.asm delete mode 100644 text/maps/pokemon_league_gate.asm delete mode 100644 text/maps/pokemon_tower_1f.asm delete mode 100644 text/maps/pokemon_tower_2f.asm delete mode 100644 text/maps/pokemon_tower_3f.asm delete mode 100644 text/maps/pokemon_tower_4f.asm delete mode 100644 text/maps/pokemon_tower_5f.asm delete mode 100644 text/maps/pokemon_tower_6f.asm delete mode 100644 text/maps/pokemon_tower_7f.asm delete mode 100644 text/maps/power_plant.asm delete mode 100644 text/maps/reds_house_1f.asm delete mode 100644 text/maps/rock_tunnel_b1f.asm delete mode 100644 text/maps/rock_tunnel_b2f_1.asm delete mode 100644 text/maps/rock_tunnel_b2f_2.asm delete mode 100644 text/maps/rock_tunnel_pokecenter.asm delete mode 100644 text/maps/rocket_hideout_b1f.asm delete mode 100644 text/maps/rocket_hideout_b2f.asm delete mode 100644 text/maps/rocket_hideout_b3f.asm delete mode 100644 text/maps/rocket_hideout_b4f.asm delete mode 100644 text/maps/rocket_hideout_elevator.asm delete mode 100644 text/maps/route_1.asm delete mode 100644 text/maps/route_10.asm delete mode 100644 text/maps/route_11_1.asm delete mode 100644 text/maps/route_11_2.asm delete mode 100644 text/maps/route_11_gate.asm delete mode 100644 text/maps/route_11_gate_upstairs.asm delete mode 100644 text/maps/route_12.asm delete mode 100644 text/maps/route_12_gate.asm delete mode 100644 text/maps/route_12_gate_upstairs.asm delete mode 100644 text/maps/route_12_house.asm delete mode 100644 text/maps/route_13.asm delete mode 100644 text/maps/route_14.asm delete mode 100644 text/maps/route_15.asm delete mode 100644 text/maps/route_15_gate.asm delete mode 100644 text/maps/route_15_gate_upstairs.asm delete mode 100644 text/maps/route_16.asm delete mode 100644 text/maps/route_16_gate.asm delete mode 100644 text/maps/route_16_gate_upstairs.asm delete mode 100644 text/maps/route_16_house.asm delete mode 100644 text/maps/route_17.asm delete mode 100644 text/maps/route_18.asm delete mode 100644 text/maps/route_18_gate.asm delete mode 100644 text/maps/route_18_gate_upstairs.asm delete mode 100644 text/maps/route_19.asm delete mode 100644 text/maps/route_2.asm delete mode 100644 text/maps/route_20.asm delete mode 100644 text/maps/route_21.asm delete mode 100644 text/maps/route_22.asm delete mode 100644 text/maps/route_23.asm delete mode 100644 text/maps/route_24_1.asm delete mode 100644 text/maps/route_24_2.asm delete mode 100644 text/maps/route_25.asm delete mode 100644 text/maps/route_2_gate.asm delete mode 100644 text/maps/route_2_house.asm delete mode 100644 text/maps/route_3.asm delete mode 100644 text/maps/route_4.asm delete mode 100644 text/maps/route_5.asm delete mode 100644 text/maps/route_6.asm delete mode 100644 text/maps/route_7.asm delete mode 100644 text/maps/route_8.asm delete mode 100644 text/maps/route_9.asm delete mode 100644 text/maps/safari_zone_center.asm delete mode 100644 text/maps/safari_zone_east.asm delete mode 100644 text/maps/safari_zone_entrance.asm delete mode 100644 text/maps/safari_zone_north.asm delete mode 100644 text/maps/safari_zone_rest_house_1.asm delete mode 100644 text/maps/safari_zone_rest_house_2.asm delete mode 100644 text/maps/safari_zone_rest_house_3.asm delete mode 100644 text/maps/safari_zone_rest_house_4.asm delete mode 100644 text/maps/safari_zone_secret_house.asm delete mode 100644 text/maps/safari_zone_west.asm delete mode 100644 text/maps/saffron_city.asm delete mode 100644 text/maps/saffron_gates.asm delete mode 100644 text/maps/saffron_gym.asm delete mode 100644 text/maps/saffron_house.asm delete mode 100644 text/maps/saffron_mart.asm delete mode 100644 text/maps/saffron_pokecenter.asm delete mode 100644 text/maps/school.asm delete mode 100644 text/maps/seafoam_islands_b4f.asm delete mode 100644 text/maps/silph_co_10f.asm delete mode 100644 text/maps/silph_co_11f.asm delete mode 100644 text/maps/silph_co_1f.asm delete mode 100644 text/maps/silph_co_2f.asm delete mode 100644 text/maps/silph_co_3f.asm delete mode 100644 text/maps/silph_co_4f.asm delete mode 100644 text/maps/silph_co_5f_1.asm delete mode 100644 text/maps/silph_co_5f_2.asm delete mode 100644 text/maps/silph_co_6f.asm delete mode 100644 text/maps/silph_co_7f.asm delete mode 100644 text/maps/silph_co_8f.asm delete mode 100644 text/maps/silph_co_9f.asm delete mode 100644 text/maps/ss_anne_1.asm delete mode 100644 text/maps/ss_anne_10.asm delete mode 100644 text/maps/ss_anne_2.asm delete mode 100644 text/maps/ss_anne_3.asm delete mode 100644 text/maps/ss_anne_5.asm delete mode 100644 text/maps/ss_anne_6.asm delete mode 100644 text/maps/ss_anne_7.asm delete mode 100644 text/maps/ss_anne_8.asm delete mode 100644 text/maps/ss_anne_9.asm delete mode 100644 text/maps/underground_path_route_6_entrance.asm delete mode 100644 text/maps/underground_path_route_7_entrance.asm delete mode 100644 text/maps/underground_path_route_7_entrance_unused.asm delete mode 100644 text/maps/underground_path_route_8_entrance.asm delete mode 100644 text/maps/unknown_dungeon_b1f.asm delete mode 100644 text/maps/vermilion_city.asm delete mode 100644 text/maps/vermilion_dock.asm delete mode 100644 text/maps/vermilion_fishing_house.asm delete mode 100644 text/maps/vermilion_gym_1.asm delete mode 100644 text/maps/vermilion_gym_2.asm delete mode 100644 text/maps/vermilion_house.asm delete mode 100644 text/maps/vermilion_mart.asm delete mode 100644 text/maps/vermilion_pokecenter.asm delete mode 100644 text/maps/victory_road_1f.asm delete mode 100644 text/maps/victory_road_2f.asm delete mode 100644 text/maps/victory_road_3f.asm delete mode 100644 text/maps/viridian_city.asm delete mode 100644 text/maps/viridian_forest.asm delete mode 100644 text/maps/viridian_forest_entrance.asm delete mode 100644 text/maps/viridian_forest_exit.asm delete mode 100644 text/maps/viridian_gym.asm delete mode 100644 text/maps/viridian_house.asm delete mode 100644 text/maps/viridian_mart.asm delete mode 100644 text/maps/viridian_pokecenter.asm delete mode 100644 text/maps/wardens_house.asm diff --git a/audio.asm b/audio.asm index be1e4bb9..70cf06fc 100644 --- a/audio.asm +++ b/audio.asm @@ -1,4 +1,3 @@ - INCLUDE "constants.asm" @@ -12,7 +11,6 @@ SECTION "Sound Effect Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/sfxheaders3.asm" - SECTION "Music Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/musicheaders1.asm" @@ -23,7 +21,6 @@ SECTION "Music Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/musicheaders3.asm" - SECTION "Sound Effects 1", ROMX ; BANK $02 INCLUDE "audio/sfx/snare1_1.asm" diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 1a44b1e7..d2077629 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -6,231 +6,231 @@ const_value = 0 - const HS_PALLET_TOWN_OAK ; 00 - const HS_LYING_OLD_MAN ; 01 - const HS_OLD_MAN ; 02 - const HS_MUSEUM_GUY ; 03 - const HS_GYM_GUY ; 04 - const HS_CERULEAN_RIVAL ; 05 - const HS_CERULEAN_ROCKET ; 06 - const HS_CERULEAN_GUARD_1 ; 07 - const HS_UNKNOWN_DUNGEON_GUY ; 08 - const HS_CERULEAN_GUARD_2 ; 09 - const HS_SAFFRON_CITY_1 ; 0A - const HS_SAFFRON_CITY_2 ; 0B - const HS_SAFFRON_CITY_3 ; 0C - const HS_SAFFRON_CITY_4 ; 0D - const HS_SAFFRON_CITY_5 ; 0E - const HS_SAFFRON_CITY_6 ; 0F - const HS_SAFFRON_CITY_7 ; 10 - const HS_SAFFRON_CITY_8 ; 11 - const HS_SAFFRON_CITY_9 ; 12 - const HS_SAFFRON_CITY_A ; 13 - const HS_SAFFRON_CITY_B ; 14 - const HS_SAFFRON_CITY_C ; 15 - const HS_SAFFRON_CITY_D ; 16 - const HS_SAFFRON_CITY_E ; 17 - const HS_SAFFRON_CITY_F ; 18 - const HS_ROUTE_2_ITEM_1 ; 19 X - const HS_ROUTE_2_ITEM_2 ; 1A X - const HS_ROUTE_4_ITEM ; 1B X - const HS_ROUTE_9_ITEM ; 1C X - const HS_ROUTE_12_SNORLAX ; 1D - const HS_ROUTE_12_ITEM_1 ; 1E X - const HS_ROUTE_12_ITEM_2 ; 1F X - const HS_ROUTE_15_ITEM ; 20 X - const HS_ROUTE_16_SNORLAX ; 21 - const HS_ROUTE_22_RIVAL_1 ; 22 - const HS_ROUTE_22_RIVAL_2 ; 23 - const HS_NUGGET_BRIDGE_GUY ; 24 - const HS_ROUTE_24_ITEM ; 25 X - const HS_ROUTE_25_ITEM ; 26 X - const HS_DAISY_SITTING ; 27 - const HS_DAISY_WALKING ; 28 - const HS_TOWN_MAP ; 29 - const HS_OAKS_LAB_RIVAL ; 2A - const HS_STARTER_BALL_1 ; 2B - const HS_STARTER_BALL_2 ; 2C - const HS_STARTER_BALL_3 ; 2D - const HS_OAKS_LAB_OAK_1 ; 2E - const HS_POKEDEX_1 ; 2F - const HS_POKEDEX_2 ; 30 - const HS_OAKS_LAB_OAK_2 ; 31 - const HS_VIRIDIAN_GYM_GIOVANNI ; 32 - const HS_VIRIDIAN_GYM_ITEM ; 33 X - const HS_OLD_AMBER ; 34 - const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 35 X - const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 36 X - const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 37 X - const HS_POKEMONTOWER_2_RIVAL ; 38 - const HS_POKEMONTOWER_3_ITEM ; 39 X - const HS_POKEMONTOWER_4_ITEM_1 ; 3A X - const HS_POKEMONTOWER_4_ITEM_2 ; 3B X - const HS_POKEMONTOWER_4_ITEM_3 ; 3C X - const HS_POKEMONTOWER_5_ITEM ; 3D X - const HS_POKEMONTOWER_6_ITEM_1 ; 3E X - const HS_POKEMONTOWER_6_ITEM_2 ; 3F X - const HS_POKEMONTOWER_7_ROCKET_1 ; 40 X - const HS_POKEMONTOWER_7_ROCKET_2 ; 41 X - const HS_POKEMONTOWER_7_ROCKET_3 ; 42 X - const HS_POKEMONTOWER_7_MR_FUJI ; 43 - const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44 - const HS_CELADON_MANSION_5_GIFT ; 45 - const HS_GAME_CORNER_ROCKET ; 46 - const HS_FUCHSIA_HOUSE_2_ITEM ; 47 X - const HS_MANSION_1_ITEM_1 ; 48 X - const HS_MANSION_1_ITEM_2 ; 49 X - const HS_FIGHTING_DOJO_GIFT_1 ; 4A - const HS_FIGHTING_DOJO_GIFT_2 ; 4B - const HS_SILPH_CO_1F_RECEPTIONIST ; 4C - const HS_VOLTORB_1 ; 4D X - const HS_VOLTORB_2 ; 4E X - const HS_VOLTORB_3 ; 4F X - const HS_ELECTRODE_1 ; 50 X - const HS_VOLTORB_4 ; 51 X - const HS_VOLTORB_5 ; 52 X - const HS_ELECTRODE_2 ; 53 X - const HS_VOLTORB_6 ; 54 X - const HS_ZAPDOS ; 55 X - const HS_POWER_PLANT_ITEM_1 ; 56 X - const HS_POWER_PLANT_ITEM_2 ; 57 X - const HS_POWER_PLANT_ITEM_3 ; 58 X - const HS_POWER_PLANT_ITEM_4 ; 59 X - const HS_POWER_PLANT_ITEM_5 ; 5A X - const HS_MOLTRES ; 5B X - const HS_VICTORY_ROAD_2_ITEM_1 ; 5C X - const HS_VICTORY_ROAD_2_ITEM_2 ; 5D X - const HS_VICTORY_ROAD_2_ITEM_3 ; 5E X - const HS_VICTORY_ROAD_2_ITEM_4 ; 5F X - const HS_VICTORY_ROAD_2_BOULDER ; 60 - const HS_BILL_POKEMON ; 61 - const HS_BILL_1 ; 62 - const HS_BILL_2 ; 63 - const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X - const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X - const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X - const HS_MT_MOON_1_ITEM_1 ; 67 X - const HS_MT_MOON_1_ITEM_2 ; 68 X - const HS_MT_MOON_1_ITEM_3 ; 69 X - const HS_MT_MOON_1_ITEM_4 ; 6A X - const HS_MT_MOON_1_ITEM_5 ; 6B X - const HS_MT_MOON_1_ITEM_6 ; 6C X - const HS_MT_MOON_3_FOSSIL_1 ; 6D - const HS_MT_MOON_3_FOSSIL_2 ; 6E - const HS_MT_MOON_3_ITEM_1 ; 6F X - const HS_MT_MOON_3_ITEM_2 ; 70 X - const HS_SS_ANNE_2_RIVAL ; 71 - const HS_SS_ANNE_8_ITEM ; 72 X - const HS_SS_ANNE_9_ITEM_1 ; 73 X - const HS_SS_ANNE_9_ITEM_2 ; 74 X - const HS_SS_ANNE_10_ITEM_1 ; 75 X - const HS_SS_ANNE_10_ITEM_2 ; 76 X - const HS_SS_ANNE_10_ITEM_3 ; 77 X - const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X - const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X - const HS_VICTORY_ROAD_3_BOULDER ; 7A - const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7B X - const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7C X - const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7D X - const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 7E X - const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 7F X - const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 80 X - const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 81 X - const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 82 X - const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 83 - const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 84 X - const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 85 X - const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 86 X - const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 87 - const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 88 - const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated? - const HS_SILPH_CO_2F_2 ; 8A - const HS_SILPH_CO_2F_3 ; 8B - const HS_SILPH_CO_2F_4 ; 8C - const HS_SILPH_CO_2F_5 ; 8D - const HS_SILPH_CO_3F_1 ; 8E - const HS_SILPH_CO_3F_2 ; 8F - const HS_SILPH_CO_3F_ITEM ; 90 X - const HS_SILPH_CO_4F_1 ; 91 - const HS_SILPH_CO_4F_2 ; 92 - const HS_SILPH_CO_4F_3 ; 93 - const HS_SILPH_CO_4F_ITEM_1 ; 94 X - const HS_SILPH_CO_4F_ITEM_2 ; 95 X - const HS_SILPH_CO_4F_ITEM_3 ; 96 X - const HS_SILPH_CO_5F_1 ; 97 - const HS_SILPH_CO_5F_2 ; 98 - const HS_SILPH_CO_5F_3 ; 99 - const HS_SILPH_CO_5F_4 ; 9A - const HS_SILPH_CO_5F_ITEM_1 ; 9B X - const HS_SILPH_CO_5F_ITEM_2 ; 9C X - const HS_SILPH_CO_5F_ITEM_3 ; 9D X - const HS_SILPH_CO_6F_1 ; 9E - const HS_SILPH_CO_6F_2 ; 9F - const HS_SILPH_CO_6F_3 ; A0 - const HS_SILPH_CO_6F_ITEM_1 ; A1 X - const HS_SILPH_CO_6F_ITEM_2 ; A2 X - const HS_SILPH_CO_7F_1 ; A3 - const HS_SILPH_CO_7F_2 ; A4 - const HS_SILPH_CO_7F_3 ; A5 - const HS_SILPH_CO_7F_4 ; A6 - const HS_SILPH_CO_7F_RIVAL ; A7 - const HS_SILPH_CO_7F_ITEM_1 ; A8 X - const HS_SILPH_CO_7F_ITEM_2 ; A9 X - const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist - const HS_SILPH_CO_8F_1 ; AB - const HS_SILPH_CO_8F_2 ; AC - const HS_SILPH_CO_8F_3 ; AD - const HS_SILPH_CO_9F_1 ; AE - const HS_SILPH_CO_9F_2 ; AF - const HS_SILPH_CO_9F_3 ; B0 - const HS_SILPH_CO_10F_1 ; B1 - const HS_SILPH_CO_10F_2 ; B2 - const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated? - const HS_SILPH_CO_10F_ITEM_1 ; B4 X - const HS_SILPH_CO_10F_ITEM_2 ; B5 X - const HS_SILPH_CO_10F_ITEM_3 ; B6 X - const HS_SILPH_CO_11F_1 ; B7 - const HS_SILPH_CO_11F_2 ; B8 - const HS_SILPH_CO_11F_3 ; B9 - const HS_MAP_F4_1 ; BA XXX sprite doesn't exist - const HS_MANSION_2_ITEM ; BB X - const HS_MANSION_3_ITEM_1 ; BC X - const HS_MANSION_3_ITEM_2 ; BD X - const HS_MANSION_4_ITEM_1 ; BE X - const HS_MANSION_4_ITEM_2 ; BF X - const HS_MANSION_4_ITEM_3 ; C0 X - const HS_MANSION_4_ITEM_4 ; C1 X - const HS_MANSION_4_ITEM_5 ; C2 X - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X - const HS_SAFARI_ZONE_CENTER_ITEM ; CD X - const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; CE X - const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; CF X - const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D0 X - const HS_MEWTWO ; D1 X - const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D2 X - const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D3 X - const HS_VICTORY_ROAD_1_ITEM_1 ; D4 X - const HS_VICTORY_ROAD_1_ITEM_2 ; D5 X - const HS_CHAMPIONS_ROOM_OAK ; D6 - const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D7 - const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; D8 - const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; D9 - const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DA - const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DB - const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DC - const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DD - const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; DE - const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; DF - const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E0 - const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E1 - const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E2 - const HS_ARTICUNO ; E3 X + const HS_PALLET_TOWN_OAK ; 00 + const HS_LYING_OLD_MAN ; 01 + const HS_OLD_MAN ; 02 + const HS_MUSEUM_GUY ; 03 + const HS_GYM_GUY ; 04 + const HS_CERULEAN_RIVAL ; 05 + const HS_CERULEAN_ROCKET ; 06 + const HS_CERULEAN_GUARD_1 ; 07 + const HS_UNKNOWN_DUNGEON_GUY ; 08 + const HS_CERULEAN_GUARD_2 ; 09 + const HS_SAFFRON_CITY_1 ; 0A + const HS_SAFFRON_CITY_2 ; 0B + const HS_SAFFRON_CITY_3 ; 0C + const HS_SAFFRON_CITY_4 ; 0D + const HS_SAFFRON_CITY_5 ; 0E + const HS_SAFFRON_CITY_6 ; 0F + const HS_SAFFRON_CITY_7 ; 10 + const HS_SAFFRON_CITY_8 ; 11 + const HS_SAFFRON_CITY_9 ; 12 + const HS_SAFFRON_CITY_A ; 13 + const HS_SAFFRON_CITY_B ; 14 + const HS_SAFFRON_CITY_C ; 15 + const HS_SAFFRON_CITY_D ; 16 + const HS_SAFFRON_CITY_E ; 17 + const HS_SAFFRON_CITY_F ; 18 + const HS_ROUTE_2_ITEM_1 ; 19 X + const HS_ROUTE_2_ITEM_2 ; 1A X + const HS_ROUTE_4_ITEM ; 1B X + const HS_ROUTE_9_ITEM ; 1C X + const HS_ROUTE_12_SNORLAX ; 1D + const HS_ROUTE_12_ITEM_1 ; 1E X + const HS_ROUTE_12_ITEM_2 ; 1F X + const HS_ROUTE_15_ITEM ; 20 X + const HS_ROUTE_16_SNORLAX ; 21 + const HS_ROUTE_22_RIVAL_1 ; 22 + const HS_ROUTE_22_RIVAL_2 ; 23 + const HS_NUGGET_BRIDGE_GUY ; 24 + const HS_ROUTE_24_ITEM ; 25 X + const HS_ROUTE_25_ITEM ; 26 X + const HS_DAISY_SITTING ; 27 + const HS_DAISY_WALKING ; 28 + const HS_TOWN_MAP ; 29 + const HS_OAKS_LAB_RIVAL ; 2A + const HS_STARTER_BALL_1 ; 2B + const HS_STARTER_BALL_2 ; 2C + const HS_STARTER_BALL_3 ; 2D + const HS_OAKS_LAB_OAK_1 ; 2E + const HS_POKEDEX_1 ; 2F + const HS_POKEDEX_2 ; 30 + const HS_OAKS_LAB_OAK_2 ; 31 + const HS_VIRIDIAN_GYM_GIOVANNI ; 32 + const HS_VIRIDIAN_GYM_ITEM ; 33 X + const HS_OLD_AMBER ; 34 + const HS_CERULEAN_CAVE_1F_ITEM_1 ; 35 X + const HS_CERULEAN_CAVE_1F_ITEM_2 ; 36 X + const HS_CERULEAN_CAVE_1F_ITEM_3 ; 37 X + const HS_POKEMON_TOWER_2F_RIVAL ; 38 + const HS_POKEMON_TOWER_3F_ITEM ; 39 X + const HS_POKEMON_TOWER_4F_ITEM_1 ; 3A X + const HS_POKEMON_TOWER_4F_ITEM_2 ; 3B X + const HS_POKEMON_TOWER_4F_ITEM_3 ; 3C X + const HS_POKEMON_TOWER_5F_ITEM ; 3D X + const HS_POKEMON_TOWER_6F_ITEM_1 ; 3E X + const HS_POKEMON_TOWER_6F_ITEM_2 ; 3F X + const HS_POKEMON_TOWER_7F_ROCKET_1 ; 40 X + const HS_POKEMON_TOWER_7F_ROCKET_2 ; 41 X + const HS_POKEMON_TOWER_7F_ROCKET_3 ; 42 X + const HS_POKEMON_TOWER_7F_MR_FUJI ; 43 + const HS_MR_FUJIS_HOUSE_MR_FUJI ; 44 + const HS_CELADON_MANSION_EEVEE_GIFT ; 45 + const HS_GAME_CORNER_ROCKET ; 46 + const HS_WARDENS_HOUSE_ITEM ; 47 X + const HS_POKEMON_MANSION_1F_ITEM_1 ; 48 X + const HS_POKEMON_MANSION_1F_ITEM_2 ; 49 X + const HS_FIGHTING_DOJO_GIFT_1 ; 4A + const HS_FIGHTING_DOJO_GIFT_2 ; 4B + const HS_SILPH_CO_1F_RECEPTIONIST ; 4C + const HS_VOLTORB_1 ; 4D X + const HS_VOLTORB_2 ; 4E X + const HS_VOLTORB_3 ; 4F X + const HS_ELECTRODE_1 ; 50 X + const HS_VOLTORB_4 ; 51 X + const HS_VOLTORB_5 ; 52 X + const HS_ELECTRODE_2 ; 53 X + const HS_VOLTORB_6 ; 54 X + const HS_ZAPDOS ; 55 X + const HS_POWER_PLANT_ITEM_1 ; 56 X + const HS_POWER_PLANT_ITEM_2 ; 57 X + const HS_POWER_PLANT_ITEM_3 ; 58 X + const HS_POWER_PLANT_ITEM_4 ; 59 X + const HS_POWER_PLANT_ITEM_5 ; 5A X + const HS_MOLTRES ; 5B X + const HS_VICTORY_ROAD_2F_ITEM_1 ; 5C X + const HS_VICTORY_ROAD_2F_ITEM_2 ; 5D X + const HS_VICTORY_ROAD_2F_ITEM_3 ; 5E X + const HS_VICTORY_ROAD_2F_ITEM_4 ; 5F X + const HS_VICTORY_ROAD_2F_BOULDER ; 60 + const HS_BILL_POKEMON ; 61 + const HS_BILL_1 ; 62 + const HS_BILL_2 ; 63 + const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X + const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X + const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X + const HS_MT_MOON_1F_ITEM_1 ; 67 X + const HS_MT_MOON_1F_ITEM_2 ; 68 X + const HS_MT_MOON_1F_ITEM_3 ; 69 X + const HS_MT_MOON_1F_ITEM_4 ; 6A X + const HS_MT_MOON_1F_ITEM_5 ; 6B X + const HS_MT_MOON_1F_ITEM_6 ; 6C X + const HS_MT_MOON_B2F_FOSSIL_1 ; 6D + const HS_MT_MOON_B2F_FOSSIL_2 ; 6E + const HS_MT_MOON_B2F_ITEM_1 ; 6F X + const HS_MT_MOON_B2F_ITEM_2 ; 70 X + const HS_SS_ANNE_2F_RIVAL ; 71 + const HS_SS_ANNE_1F_ROOMS_ITEM ; 72 X + const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 73 X + const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 74 X + const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 75 X + const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 76 X + const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 77 X + const HS_VICTORY_ROAD_3F_ITEM_1 ; 78 X + const HS_VICTORY_ROAD_3F_ITEM_2 ; 79 X + const HS_VICTORY_ROAD_3F_BOULDER ; 7A + const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 7B X + const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 7C X + const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 7D X + const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 7E X + const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 7F X + const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 80 X + const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 81 X + const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 82 X + const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 83 + const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 84 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 85 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 86 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 87 + const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 88 + const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated? + const HS_SILPH_CO_2F_2 ; 8A + const HS_SILPH_CO_2F_3 ; 8B + const HS_SILPH_CO_2F_4 ; 8C + const HS_SILPH_CO_2F_5 ; 8D + const HS_SILPH_CO_3F_1 ; 8E + const HS_SILPH_CO_3F_2 ; 8F + const HS_SILPH_CO_3F_ITEM ; 90 X + const HS_SILPH_CO_4F_1 ; 91 + const HS_SILPH_CO_4F_2 ; 92 + const HS_SILPH_CO_4F_3 ; 93 + const HS_SILPH_CO_4F_ITEM_1 ; 94 X + const HS_SILPH_CO_4F_ITEM_2 ; 95 X + const HS_SILPH_CO_4F_ITEM_3 ; 96 X + const HS_SILPH_CO_5F_1 ; 97 + const HS_SILPH_CO_5F_2 ; 98 + const HS_SILPH_CO_5F_3 ; 99 + const HS_SILPH_CO_5F_4 ; 9A + const HS_SILPH_CO_5F_ITEM_1 ; 9B X + const HS_SILPH_CO_5F_ITEM_2 ; 9C X + const HS_SILPH_CO_5F_ITEM_3 ; 9D X + const HS_SILPH_CO_6F_1 ; 9E + const HS_SILPH_CO_6F_2 ; 9F + const HS_SILPH_CO_6F_3 ; A0 + const HS_SILPH_CO_6F_ITEM_1 ; A1 X + const HS_SILPH_CO_6F_ITEM_2 ; A2 X + const HS_SILPH_CO_7F_1 ; A3 + const HS_SILPH_CO_7F_2 ; A4 + const HS_SILPH_CO_7F_3 ; A5 + const HS_SILPH_CO_7F_4 ; A6 + const HS_SILPH_CO_7F_RIVAL ; A7 + const HS_SILPH_CO_7F_ITEM_1 ; A8 X + const HS_SILPH_CO_7F_ITEM_2 ; A9 X + const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist + const HS_SILPH_CO_8F_1 ; AB + const HS_SILPH_CO_8F_2 ; AC + const HS_SILPH_CO_8F_3 ; AD + const HS_SILPH_CO_9F_1 ; AE + const HS_SILPH_CO_9F_2 ; AF + const HS_SILPH_CO_9F_3 ; B0 + const HS_SILPH_CO_10F_1 ; B1 + const HS_SILPH_CO_10F_2 ; B2 + const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated? + const HS_SILPH_CO_10F_ITEM_1 ; B4 X + const HS_SILPH_CO_10F_ITEM_2 ; B5 X + const HS_SILPH_CO_10F_ITEM_3 ; B6 X + const HS_SILPH_CO_11F_1 ; B7 + const HS_SILPH_CO_11F_2 ; B8 + const HS_SILPH_CO_11F_3 ; B9 + const HS_UNUSED_MAP_F4_1 ; BA XXX sprite doesn't exist + const HS_POKEMON_MANSION_2F_ITEM ; BB X + const HS_POKEMON_MANSION_3F_ITEM_1 ; BC X + const HS_POKEMON_MANSION_3F_ITEM_2 ; BD X + const HS_POKEMON_MANSION_B1F_ITEM_1 ; BE X + const HS_POKEMON_MANSION_B1F_ITEM_2 ; BF X + const HS_POKEMON_MANSION_B1F_ITEM_3 ; C0 X + const HS_POKEMON_MANSION_B1F_ITEM_4 ; C1 X + const HS_POKEMON_MANSION_B1F_ITEM_5 ; C2 X + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X + const HS_SAFARI_ZONE_CENTER_ITEM ; CD X + const HS_CERULEAN_CAVE_2F_ITEM_1 ; CE X + const HS_CERULEAN_CAVE_2F_ITEM_2 ; CF X + const HS_CERULEAN_CAVE_2F_ITEM_3 ; D0 X + const HS_MEWTWO ; D1 X + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D2 X + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; D3 X + const HS_VICTORY_ROAD_1F_ITEM_1 ; D4 X + const HS_VICTORY_ROAD_1F_ITEM_2 ; D5 X + const HS_CHAMPIONS_ROOM_OAK ; D6 + const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D7 + const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D8 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D9 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; DA + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; DB + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; DC + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; DD + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; DE + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DF + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E0 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E1 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2 + const HS_ARTICUNO ; E3 X diff --git a/constants/map_constants.asm b/constants/map_constants.asm index cbedef3f..3ddc5746 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -5,251 +5,251 @@ mapconst: MACRO ENDM const_def - mapconst PALLET_TOWN, 9, 10 ; $00 - mapconst VIRIDIAN_CITY, 18, 20 ; $01 - mapconst PEWTER_CITY, 18, 20 ; $02 - mapconst CERULEAN_CITY, 18, 20 ; $03 - mapconst LAVENDER_TOWN, 9, 10 ; $04 - mapconst VERMILION_CITY, 18, 20 ; $05 - mapconst CELADON_CITY, 18, 25 ; $06 - mapconst FUCHSIA_CITY, 18, 20 ; $07 - mapconst CINNABAR_ISLAND, 9, 10 ; $08 - mapconst INDIGO_PLATEAU, 9, 10 ; $09 - mapconst SAFFRON_CITY, 18, 20 ; $0A - mapconst UNUSED_MAP_0B, 0, 0 ; $0B - mapconst ROUTE_1, 18, 10 ; $0C - mapconst ROUTE_2, 36, 10 ; $0D - mapconst ROUTE_3, 9, 35 ; $0E - mapconst ROUTE_4, 9, 45 ; $0F - mapconst ROUTE_5, 18, 10 ; $10 - mapconst ROUTE_6, 18, 10 ; $11 - mapconst ROUTE_7, 9, 10 ; $12 - mapconst ROUTE_8, 9, 30 ; $13 - mapconst ROUTE_9, 9, 30 ; $14 - mapconst ROUTE_10, 36, 10 ; $15 - mapconst ROUTE_11, 9, 30 ; $16 - mapconst ROUTE_12, 54, 10 ; $17 - mapconst ROUTE_13, 9, 30 ; $18 - mapconst ROUTE_14, 27, 10 ; $19 - mapconst ROUTE_15, 9, 30 ; $1A - mapconst ROUTE_16, 9, 20 ; $1B - mapconst ROUTE_17, 72, 10 ; $1C - mapconst ROUTE_18, 9, 25 ; $1D - mapconst ROUTE_19, 27, 10 ; $1E - mapconst ROUTE_20, 9, 50 ; $1F - mapconst ROUTE_21, 45, 10 ; $20 - mapconst ROUTE_22, 9, 20 ; $21 - mapconst ROUTE_23, 72, 10 ; $22 - mapconst ROUTE_24, 18, 10 ; $23 - mapconst ROUTE_25, 9, 30 ; $24 - mapconst REDS_HOUSE_1F, 4, 4 ; $25 - mapconst REDS_HOUSE_2F, 4, 4 ; $26 - mapconst BLUES_HOUSE, 4, 4 ; $27 - mapconst OAKS_LAB, 6, 5 ; $28 - mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29 - mapconst VIRIDIAN_MART, 4, 4 ; $2A - mapconst VIRIDIAN_SCHOOL, 4, 4 ; $2B - mapconst VIRIDIAN_HOUSE, 4, 4 ; $2C - mapconst VIRIDIAN_GYM, 9, 10 ; $2D - mapconst DIGLETTS_CAVE_EXIT, 4, 4 ; $2E - mapconst VIRIDIAN_FOREST_EXIT, 4, 5 ; $2F - mapconst ROUTE_2_HOUSE, 4, 4 ; $30 - mapconst ROUTE_2_GATE, 4, 5 ; $31 - mapconst VIRIDIAN_FOREST_ENTRANCE, 4, 5 ; $32 - mapconst VIRIDIAN_FOREST, 24, 17 ; $33 - mapconst MUSEUM_1F, 4, 10 ; $34 - mapconst MUSEUM_2F, 4, 7 ; $35 - mapconst PEWTER_GYM, 7, 5 ; $36 - mapconst PEWTER_HOUSE_1, 4, 4 ; $37 - mapconst PEWTER_MART, 4, 4 ; $38 - mapconst PEWTER_HOUSE_2, 4, 4 ; $39 - mapconst PEWTER_POKECENTER, 4, 7 ; $3A - mapconst MT_MOON_1, 18, 20 ; $3B - mapconst MT_MOON_2, 14, 14 ; $3C - mapconst MT_MOON_3, 18, 20 ; $3D - mapconst TRASHED_HOUSE, 4, 4 ; $3E - mapconst CERULEAN_HOUSE_1, 4, 4 ; $3F - mapconst CERULEAN_POKECENTER, 4, 7 ; $40 - mapconst CERULEAN_GYM, 7, 5 ; $41 - mapconst BIKE_SHOP, 4, 4 ; $42 - mapconst CERULEAN_MART, 4, 4 ; $43 - mapconst MT_MOON_POKECENTER, 4, 7 ; $44 - mapconst TRASHED_HOUSE_COPY, 4, 4 ; $45 - mapconst ROUTE_5_GATE, 3, 4 ; $46 - mapconst PATH_ENTRANCE_ROUTE_5, 4, 4 ; $47 - mapconst DAYCAREM, 4, 4 ; $48 - mapconst ROUTE_6_GATE, 3, 4 ; $49 - mapconst PATH_ENTRANCE_ROUTE_6, 4, 4 ; $4A - mapconst PATH_ENTRANCE_ROUTE_6_COPY, 4, 4 ; $4B - mapconst ROUTE_7_GATE, 4, 3 ; $4C - mapconst PATH_ENTRANCE_ROUTE_7, 4, 4 ; $4D - mapconst PATH_ENTRANCE_ROUTE_7_COPY, 4, 4 ; $4E - mapconst ROUTE_8_GATE, 4, 3 ; $4F - mapconst PATH_ENTRANCE_ROUTE_8, 4, 4 ; $50 - mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 - mapconst ROCK_TUNNEL_1, 18, 20 ; $52 - mapconst POWER_PLANT, 18, 20 ; $53 - mapconst ROUTE_11_GATE_1F, 5, 4 ; $54 - mapconst DIGLETTS_CAVE_ENTRANCE, 4, 4 ; $55 - mapconst ROUTE_11_GATE_2F, 4, 4 ; $56 - mapconst ROUTE_12_GATE_1F, 4, 5 ; $57 - mapconst BILLS_HOUSE, 4, 4 ; $58 - mapconst VERMILION_POKECENTER, 4, 7 ; $59 - mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A - mapconst VERMILION_MART, 4, 4 ; $5B - mapconst VERMILION_GYM, 9, 5 ; $5C - mapconst VERMILION_HOUSE_1, 4, 4 ; $5D - mapconst VERMILION_DOCK, 6, 14 ; $5E - mapconst SS_ANNE_1, 9, 20 ; $5F - mapconst SS_ANNE_2, 9, 20 ; $60 - mapconst SS_ANNE_3, 3, 10 ; $61 - mapconst SS_ANNE_4, 4, 15 ; $62 - mapconst SS_ANNE_5, 7, 10 ; $63 - mapconst SS_ANNE_6, 8, 7 ; $64 - mapconst SS_ANNE_7, 4, 3 ; $65 - mapconst SS_ANNE_8, 8, 12 ; $66 - mapconst SS_ANNE_9, 8, 12 ; $67 - mapconst SS_ANNE_10, 8, 12 ; $68 - mapconst UNUSED_MAP_69, 0, 0 ; $69 - mapconst UNUSED_MAP_6A, 0, 0 ; $6A - mapconst UNUSED_MAP_6B, 0, 0 ; $6B - mapconst VICTORY_ROAD_1, 9, 10 ; $6C - mapconst UNUSED_MAP_6D, 0, 0 ; $6D - mapconst UNUSED_MAP_6E, 0, 0 ; $6E - mapconst UNUSED_MAP_6F, 0, 0 ; $6F - mapconst UNUSED_MAP_70, 0, 0 ; $70 - mapconst LANCES_ROOM, 13, 13 ; $71 - mapconst UNUSED_MAP_72, 0, 0 ; $72 - mapconst UNUSED_MAP_73, 0, 0 ; $73 - mapconst UNUSED_MAP_74, 0, 0 ; $74 - mapconst UNUSED_MAP_75, 0, 0 ; $75 - mapconst HALL_OF_FAME, 4, 5 ; $76 - mapconst UNDERGROUND_PATH_NS, 24, 4 ; $77 - mapconst CHAMPIONS_ROOM, 4, 4 ; $78 - mapconst UNDERGROUND_PATH_WE, 4, 25 ; $79 - mapconst CELADON_MART_1, 4, 10 ; $7A - mapconst CELADON_MART_2, 4, 10 ; $7B - mapconst CELADON_MART_3, 4, 10 ; $7C - mapconst CELADON_MART_4, 4, 10 ; $7D - mapconst CELADON_MART_ROOF, 4, 10 ; $7E - mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F - mapconst CELADON_MANSION_1, 6, 4 ; $80 - mapconst CELADON_MANSION_2, 6, 4 ; $81 - mapconst CELADON_MANSION_3, 6, 4 ; $82 - mapconst CELADON_MANSION_4, 6, 4 ; $83 - mapconst CELADON_MANSION_5, 4, 4 ; $84 - mapconst CELADON_POKECENTER, 4, 7 ; $85 - mapconst CELADON_GYM, 9, 5 ; $86 - mapconst GAME_CORNER, 9, 10 ; $87 - mapconst CELADON_MART_5, 4, 10 ; $88 - mapconst CELADON_PRIZE_ROOM, 4, 5 ; $89 - mapconst CELADON_DINER, 4, 5 ; $8A - mapconst CELADON_HOUSE, 4, 4 ; $8B - mapconst CELADON_HOTEL, 4, 7 ; $8C - mapconst LAVENDER_POKECENTER, 4, 7 ; $8D - mapconst POKEMONTOWER_1, 9, 10 ; $8E - mapconst POKEMONTOWER_2, 9, 10 ; $8F - mapconst POKEMONTOWER_3, 9, 10 ; $90 - mapconst POKEMONTOWER_4, 9, 10 ; $91 - mapconst POKEMONTOWER_5, 9, 10 ; $92 - mapconst POKEMONTOWER_6, 9, 10 ; $93 - mapconst POKEMONTOWER_7, 9, 10 ; $94 - mapconst LAVENDER_HOUSE_1, 4, 4 ; $95 - mapconst LAVENDER_MART, 4, 4 ; $96 - mapconst LAVENDER_HOUSE_2, 4, 4 ; $97 - mapconst FUCHSIA_MART, 4, 4 ; $98 - mapconst FUCHSIA_HOUSE_1, 4, 4 ; $99 - mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A - mapconst FUCHSIA_HOUSE_2, 4, 5 ; $9B - mapconst SAFARI_ZONE_ENTRANCE, 3, 4 ; $9C - mapconst FUCHSIA_GYM, 9, 5 ; $9D - mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E - mapconst SEAFOAM_ISLANDS_2, 9, 15 ; $9F - mapconst SEAFOAM_ISLANDS_3, 9, 15 ; $A0 - mapconst SEAFOAM_ISLANDS_4, 9, 15 ; $A1 - mapconst SEAFOAM_ISLANDS_5, 9, 15 ; $A2 - mapconst VERMILION_HOUSE_2, 4, 4 ; $A3 - mapconst FUCHSIA_HOUSE_3, 4, 4 ; $A4 - mapconst MANSION_1, 14, 15 ; $A5 - mapconst CINNABAR_GYM, 9, 10 ; $A6 - mapconst CINNABAR_LAB_1, 4, 9 ; $A7 - mapconst CINNABAR_LAB_2, 4, 4 ; $A8 - mapconst CINNABAR_LAB_3, 4, 4 ; $A9 - mapconst CINNABAR_LAB_4, 4, 4 ; $AA - mapconst CINNABAR_POKECENTER, 4, 7 ; $AB - mapconst CINNABAR_MART, 4, 4 ; $AC - mapconst CINNABAR_MART_COPY, 4, 4 ; $AD - mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE - mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF - mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 - mapconst FIGHTING_DOJO, 6, 5 ; $B1 - mapconst SAFFRON_GYM, 9, 10 ; $B2 - mapconst SAFFRON_HOUSE_1, 4, 4 ; $B3 - mapconst SAFFRON_MART, 4, 4 ; $B4 - mapconst SILPH_CO_1F, 9, 15 ; $B5 - mapconst SAFFRON_POKECENTER, 4, 7 ; $B6 - mapconst SAFFRON_HOUSE_2, 4, 4 ; $B7 - mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8 - mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9 - mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA - mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB - mapconst ROUTE_16_HOUSE, 4, 4 ; $BC - mapconst ROUTE_12_HOUSE, 4, 4 ; $BD - mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE - mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF - mapconst SEAFOAM_ISLANDS_1, 9, 15 ; $C0 - mapconst ROUTE_22_GATE, 4, 5 ; $C1 - mapconst VICTORY_ROAD_2, 9, 15 ; $C2 - mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3 - mapconst VERMILION_HOUSE_3, 4, 4 ; $C4 - mapconst DIGLETTS_CAVE, 18, 20 ; $C5 - mapconst VICTORY_ROAD_3, 9, 15 ; $C6 - mapconst ROCKET_HIDEOUT_1, 14, 15 ; $C7 - mapconst ROCKET_HIDEOUT_2, 14, 15 ; $C8 - mapconst ROCKET_HIDEOUT_3, 14, 15 ; $C9 - mapconst ROCKET_HIDEOUT_4, 12, 15 ; $CA - mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB - mapconst UNUSED_MAP_CC, 0, 0 ; $CC - mapconst UNUSED_MAP_CD, 0, 0 ; $CD - mapconst UNUSED_MAP_CE, 0, 0 ; $CE - mapconst SILPH_CO_2F, 9, 15 ; $CF - mapconst SILPH_CO_3F, 9, 15 ; $D0 - mapconst SILPH_CO_4F, 9, 15 ; $D1 - mapconst SILPH_CO_5F, 9, 15 ; $D2 - mapconst SILPH_CO_6F, 9, 13 ; $D3 - mapconst SILPH_CO_7F, 9, 13 ; $D4 - mapconst SILPH_CO_8F, 9, 13 ; $D5 - mapconst MANSION_2, 14, 15 ; $D6 - mapconst MANSION_3, 9, 15 ; $D7 - mapconst MANSION_4, 14, 15 ; $D8 - mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9 - mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA - mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB - mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC - mapconst SAFARI_ZONE_REST_HOUSE_1, 4, 4 ; $DD - mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE - mapconst SAFARI_ZONE_REST_HOUSE_2, 4, 4 ; $DF - mapconst SAFARI_ZONE_REST_HOUSE_3, 4, 4 ; $E0 - mapconst SAFARI_ZONE_REST_HOUSE_4, 4, 4 ; $E1 - mapconst UNKNOWN_DUNGEON_2, 9, 15 ; $E2 - mapconst UNKNOWN_DUNGEON_3, 9, 15 ; $E3 - mapconst UNKNOWN_DUNGEON_1, 9, 15 ; $E4 - mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 - mapconst CERULEAN_HOUSE_2, 4, 4 ; $E6 - mapconst UNUSED_MAP_E7, 0, 0 ; $E7 - mapconst ROCK_TUNNEL_2, 18, 20 ; $E8 - mapconst SILPH_CO_9F, 9, 13 ; $E9 - mapconst SILPH_CO_10F, 9, 8 ; $EA - mapconst SILPH_CO_11F, 9, 9 ; $EB - mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC - mapconst UNUSED_MAP_ED, 0, 0 ; $ED - mapconst UNUSED_MAP_EE, 0, 0 ; $EE - mapconst TRADE_CENTER, 4, 5 ; $EF - mapconst COLOSSEUM, 4, 5 ; $F0 - mapconst UNUSED_MAP_F1, 0, 0 ; $F1 - mapconst UNUSED_MAP_F2, 0, 0 ; $F2 - mapconst UNUSED_MAP_F3, 0, 0 ; $F3 - mapconst UNUSED_MAP_F4, 0, 0 ; $F4 - mapconst LORELEIS_ROOM, 6, 5 ; $F5 - mapconst BRUNOS_ROOM, 6, 5 ; $F6 - mapconst AGATHAS_ROOM, 6, 5 ; $F7 + mapconst PALLET_TOWN, 9, 10 ; $00 + mapconst VIRIDIAN_CITY, 18, 20 ; $01 + mapconst PEWTER_CITY, 18, 20 ; $02 + mapconst CERULEAN_CITY, 18, 20 ; $03 + mapconst LAVENDER_TOWN, 9, 10 ; $04 + mapconst VERMILION_CITY, 18, 20 ; $05 + mapconst CELADON_CITY, 18, 25 ; $06 + mapconst FUCHSIA_CITY, 18, 20 ; $07 + mapconst CINNABAR_ISLAND, 9, 10 ; $08 + mapconst INDIGO_PLATEAU, 9, 10 ; $09 + mapconst SAFFRON_CITY, 18, 20 ; $0A + mapconst UNUSED_MAP_0B, 0, 0 ; $0B + mapconst ROUTE_1, 18, 10 ; $0C + mapconst ROUTE_2, 36, 10 ; $0D + mapconst ROUTE_3, 9, 35 ; $0E + mapconst ROUTE_4, 9, 45 ; $0F + mapconst ROUTE_5, 18, 10 ; $10 + mapconst ROUTE_6, 18, 10 ; $11 + mapconst ROUTE_7, 9, 10 ; $12 + mapconst ROUTE_8, 9, 30 ; $13 + mapconst ROUTE_9, 9, 30 ; $14 + mapconst ROUTE_10, 36, 10 ; $15 + mapconst ROUTE_11, 9, 30 ; $16 + mapconst ROUTE_12, 54, 10 ; $17 + mapconst ROUTE_13, 9, 30 ; $18 + mapconst ROUTE_14, 27, 10 ; $19 + mapconst ROUTE_15, 9, 30 ; $1A + mapconst ROUTE_16, 9, 20 ; $1B + mapconst ROUTE_17, 72, 10 ; $1C + mapconst ROUTE_18, 9, 25 ; $1D + mapconst ROUTE_19, 27, 10 ; $1E + mapconst ROUTE_20, 9, 50 ; $1F + mapconst ROUTE_21, 45, 10 ; $20 + mapconst ROUTE_22, 9, 20 ; $21 + mapconst ROUTE_23, 72, 10 ; $22 + mapconst ROUTE_24, 18, 10 ; $23 + mapconst ROUTE_25, 9, 30 ; $24 + mapconst REDS_HOUSE_1F, 4, 4 ; $25 + mapconst REDS_HOUSE_2F, 4, 4 ; $26 + mapconst BLUES_HOUSE, 4, 4 ; $27 + mapconst OAKS_LAB, 6, 5 ; $28 + mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29 + mapconst VIRIDIAN_MART, 4, 4 ; $2A + mapconst VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2B + mapconst VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2C + mapconst VIRIDIAN_GYM, 9, 10 ; $2D + mapconst DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $2E + mapconst VIRIDIAN_FOREST_NORTH_GATE, 4, 5 ; $2F + mapconst ROUTE_2_TRADE_HOUSE, 4, 4 ; $30 + mapconst ROUTE_2_GATE, 4, 5 ; $31 + mapconst VIRIDIAN_FOREST_SOUTH_GATE, 4, 5 ; $32 + mapconst VIRIDIAN_FOREST, 24, 17 ; $33 + mapconst MUSEUM_1F, 4, 10 ; $34 + mapconst MUSEUM_2F, 4, 7 ; $35 + mapconst PEWTER_GYM, 7, 5 ; $36 + mapconst PEWTER_NIDORAN_HOUSE, 4, 4 ; $37 + mapconst PEWTER_MART, 4, 4 ; $38 + mapconst PEWTER_SPEECH_HOUSE, 4, 4 ; $39 + mapconst PEWTER_POKECENTER, 4, 7 ; $3A + mapconst MT_MOON_1F, 18, 20 ; $3B + mapconst MT_MOON_B1F, 14, 14 ; $3C + mapconst MT_MOON_B2F, 18, 20 ; $3D + mapconst CERULEAN_TRASHED_HOUSE, 4, 4 ; $3E + mapconst CERULEAN_TRADE_HOUSE, 4, 4 ; $3F + mapconst CERULEAN_POKECENTER, 4, 7 ; $40 + mapconst CERULEAN_GYM, 7, 5 ; $41 + mapconst BIKE_SHOP, 4, 4 ; $42 + mapconst CERULEAN_MART, 4, 4 ; $43 + mapconst MT_MOON_POKECENTER, 4, 7 ; $44 + mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 + mapconst ROUTE_5_GATE, 3, 4 ; $46 + mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $47 + mapconst DAYCARE, 4, 4 ; $48 + mapconst ROUTE_6_GATE, 3, 4 ; $49 + mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4A + mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B + mapconst ROUTE_7_GATE, 4, 3 ; $4C + mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4D + mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E + mapconst ROUTE_8_GATE, 4, 3 ; $4F + mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $50 + mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 + mapconst ROCK_TUNNEL_1F, 18, 20 ; $52 + mapconst POWER_PLANT, 18, 20 ; $53 + mapconst ROUTE_11_GATE_1F, 5, 4 ; $54 + mapconst DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $55 + mapconst ROUTE_11_GATE_2F, 4, 4 ; $56 + mapconst ROUTE_12_GATE_1F, 4, 5 ; $57 + mapconst BILLS_HOUSE, 4, 4 ; $58 + mapconst VERMILION_POKECENTER, 4, 7 ; $59 + mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A + mapconst VERMILION_MART, 4, 4 ; $5B + mapconst VERMILION_GYM, 9, 5 ; $5C + mapconst VERMILION_PIDGEY_HOUSE, 4, 4 ; $5D + mapconst VERMILION_DOCK, 6, 14 ; $5E + mapconst SS_ANNE_1F, 9, 20 ; $5F + mapconst SS_ANNE_2F, 9, 20 ; $60 + mapconst SS_ANNE_3F, 3, 10 ; $61 + mapconst SS_ANNE_B1F, 4, 15 ; $62 + mapconst SS_ANNE_BOW, 7, 10 ; $63 + mapconst SS_ANNE_KITCHEN, 8, 7 ; $64 + mapconst SS_ANNE_CAPTAINS_ROOM, 4, 3 ; $65 + mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $66 + mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $67 + mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $68 + mapconst UNUSED_MAP_69, 0, 0 ; $69 + mapconst UNUSED_MAP_6A, 0, 0 ; $6A + mapconst UNUSED_MAP_6B, 0, 0 ; $6B + mapconst VICTORY_ROAD_1F, 9, 10 ; $6C + mapconst UNUSED_MAP_6D, 0, 0 ; $6D + mapconst UNUSED_MAP_6E, 0, 0 ; $6E + mapconst UNUSED_MAP_6F, 0, 0 ; $6F + mapconst UNUSED_MAP_70, 0, 0 ; $70 + mapconst LANCES_ROOM, 13, 13 ; $71 + mapconst UNUSED_MAP_72, 0, 0 ; $72 + mapconst UNUSED_MAP_73, 0, 0 ; $73 + mapconst UNUSED_MAP_74, 0, 0 ; $74 + mapconst UNUSED_MAP_75, 0, 0 ; $75 + mapconst HALL_OF_FAME, 4, 5 ; $76 + mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77 + mapconst CHAMPIONS_ROOM, 4, 4 ; $78 + mapconst UNDERGROUND_PATH_WEST_EAST, 4, 25 ; $79 + mapconst CELADON_MART_1F, 4, 10 ; $7A + mapconst CELADON_MART_2F, 4, 10 ; $7B + mapconst CELADON_MART_3F, 4, 10 ; $7C + mapconst CELADON_MART_4F, 4, 10 ; $7D + mapconst CELADON_MART_ROOF, 4, 10 ; $7E + mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F + mapconst CELADON_MANSION_1F, 6, 4 ; $80 + mapconst CELADON_MANSION_2F, 6, 4 ; $81 + mapconst CELADON_MANSION_3F, 6, 4 ; $82 + mapconst CELADON_MANSION_ROOF, 6, 4 ; $83 + mapconst CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $84 + mapconst CELADON_POKECENTER, 4, 7 ; $85 + mapconst CELADON_GYM, 9, 5 ; $86 + mapconst GAME_CORNER, 9, 10 ; $87 + mapconst CELADON_MART_5F, 4, 10 ; $88 + mapconst GAME_CORNER_PRIZE_ROOM, 4, 5 ; $89 + mapconst CELADON_DINER, 4, 5 ; $8A + mapconst CELADON_CHIEF_HOUSE, 4, 4 ; $8B + mapconst CELADON_HOTEL, 4, 7 ; $8C + mapconst LAVENDER_POKECENTER, 4, 7 ; $8D + mapconst POKEMON_TOWER_1F, 9, 10 ; $8E + mapconst POKEMON_TOWER_2F, 9, 10 ; $8F + mapconst POKEMON_TOWER_3F, 9, 10 ; $90 + mapconst POKEMON_TOWER_4F, 9, 10 ; $91 + mapconst POKEMON_TOWER_5F, 9, 10 ; $92 + mapconst POKEMON_TOWER_6F, 9, 10 ; $93 + mapconst POKEMON_TOWER_7F, 9, 10 ; $94 + mapconst MR_FUJIS_HOUSE, 4, 4 ; $95 + mapconst LAVENDER_MART, 4, 4 ; $96 + mapconst LAVENDER_CUBONE_HOUSE, 4, 4 ; $97 + mapconst FUCHSIA_MART, 4, 4 ; $98 + mapconst FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $99 + mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A + mapconst WARDENS_HOUSE, 4, 5 ; $9B + mapconst SAFARI_ZONE_GATE, 3, 4 ; $9C + mapconst FUCHSIA_GYM, 9, 5 ; $9D + mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E + mapconst SEAFOAM_ISLANDS_B1F, 9, 15 ; $9F + mapconst SEAFOAM_ISLANDS_B2F, 9, 15 ; $A0 + mapconst SEAFOAM_ISLANDS_B3F, 9, 15 ; $A1 + mapconst SEAFOAM_ISLANDS_B4F, 9, 15 ; $A2 + mapconst VERMILION_OLD_ROD_HOUSE, 4, 4 ; $A3 + mapconst FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A4 + mapconst POKEMON_MANSION_1F, 14, 15 ; $A5 + mapconst CINNABAR_GYM, 9, 10 ; $A6 + mapconst CINNABAR_LAB, 4, 9 ; $A7 + mapconst CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $A8 + mapconst CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $A9 + mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AA + mapconst CINNABAR_POKECENTER, 4, 7 ; $AB + mapconst CINNABAR_MART, 4, 4 ; $AC + mapconst CINNABAR_MART_COPY, 4, 4 ; $AD + mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE + mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF + mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 + mapconst FIGHTING_DOJO, 6, 5 ; $B1 + mapconst SAFFRON_GYM, 9, 10 ; $B2 + mapconst SAFFRON_PIDGEY_HOUSE, 4, 4 ; $B3 + mapconst SAFFRON_MART, 4, 4 ; $B4 + mapconst SILPH_CO_1F, 9, 15 ; $B5 + mapconst SAFFRON_POKECENTER, 4, 7 ; $B6 + mapconst MR_PSYCHICS_HOUSE, 4, 4 ; $B7 + mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8 + mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9 + mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA + mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB + mapconst ROUTE_16_FLY_HOUSE, 4, 4 ; $BC + mapconst ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; $BD + mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE + mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF + mapconst SEAFOAM_ISLANDS_1F, 9, 15 ; $C0 + mapconst ROUTE_22_GATE, 4, 5 ; $C1 + mapconst VICTORY_ROAD_2F, 9, 15 ; $C2 + mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3 + mapconst VERMILION_TRADE_HOUSE, 4, 4 ; $C4 + mapconst DIGLETTS_CAVE, 18, 20 ; $C5 + mapconst VICTORY_ROAD_3F, 9, 15 ; $C6 + mapconst ROCKET_HIDEOUT_B1F, 14, 15 ; $C7 + mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 + mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 + mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA + mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB + mapconst UNUSED_MAP_CC, 0, 0 ; $CC + mapconst UNUSED_MAP_CD, 0, 0 ; $CD + mapconst UNUSED_MAP_CE, 0, 0 ; $CE + mapconst SILPH_CO_2F, 9, 15 ; $CF + mapconst SILPH_CO_3F, 9, 15 ; $D0 + mapconst SILPH_CO_4F, 9, 15 ; $D1 + mapconst SILPH_CO_5F, 9, 15 ; $D2 + mapconst SILPH_CO_6F, 9, 13 ; $D3 + mapconst SILPH_CO_7F, 9, 13 ; $D4 + mapconst SILPH_CO_8F, 9, 13 ; $D5 + mapconst POKEMON_MANSION_2F, 14, 15 ; $D6 + mapconst POKEMON_MANSION_3F, 9, 15 ; $D7 + mapconst POKEMON_MANSION_B1F, 14, 15 ; $D8 + mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9 + mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA + mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB + mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC + mapconst SAFARI_ZONE_CENTER_REST_HOUSE, 4, 4 ; $DD + mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE + mapconst SAFARI_ZONE_WEST_REST_HOUSE, 4, 4 ; $DF + mapconst SAFARI_ZONE_EAST_REST_HOUSE, 4, 4 ; $E0 + mapconst SAFARI_ZONE_NORTH_REST_HOUSE, 4, 4 ; $E1 + mapconst CERULEAN_CAVE_2F, 9, 15 ; $E2 + mapconst CERULEAN_CAVE_B1F, 9, 15 ; $E3 + mapconst CERULEAN_CAVE_1F, 9, 15 ; $E4 + mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 + mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E6 + mapconst UNUSED_MAP_E7, 0, 0 ; $E7 + mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E8 + mapconst SILPH_CO_9F, 9, 13 ; $E9 + mapconst SILPH_CO_10F, 9, 8 ; $EA + mapconst SILPH_CO_11F, 9, 9 ; $EB + mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC + mapconst UNUSED_MAP_ED, 0, 0 ; $ED + mapconst UNUSED_MAP_EE, 0, 0 ; $EE + mapconst TRADE_CENTER, 4, 5 ; $EF + mapconst COLOSSEUM, 4, 5 ; $F0 + mapconst UNUSED_MAP_F1, 0, 0 ; $F1 + mapconst UNUSED_MAP_F2, 0, 0 ; $F2 + mapconst UNUSED_MAP_F3, 0, 0 ; $F3 + mapconst UNUSED_MAP_F4, 0, 0 ; $F4 + mapconst LORELEIS_ROOM, 6, 5 ; $F5 + mapconst BRUNOS_ROOM, 6, 5 ; $F6 + mapconst AGATHAS_ROOM, 6, 5 ; $F7 diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm index 926db476..fb352aa9 100755 --- a/data/force_bike_surf.asm +++ b/data/force_bike_surf.asm @@ -4,8 +4,8 @@ ForcedBikeOrSurfMaps: db ROUTE_16,$0B,$11 db ROUTE_18,$08,$21 db ROUTE_18,$09,$21 - db SEAFOAM_ISLANDS_4,$07,$12 - db SEAFOAM_ISLANDS_4,$07,$13 - db SEAFOAM_ISLANDS_5,$0E,$04 - db SEAFOAM_ISLANDS_5,$0E,$05 + db SEAFOAM_ISLANDS_B3F,$07,$12 + db SEAFOAM_ISLANDS_B3F,$07,$13 + db SEAFOAM_ISLANDS_B4F,$0E,$04 + db SEAFOAM_ISLANDS_B4F,$0E,$05 db $FF ;end diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index 96c4a07b..6b911dea 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -2,38 +2,38 @@ HiddenItemCoords: ; map ID, then coords db VIRIDIAN_FOREST,$12,$01 db VIRIDIAN_FOREST,$2a,$10 - db MT_MOON_3,$0c,$12 + db MT_MOON_B2F,$0c,$12 db ROUTE_25,$03,$26 db ROUTE_9,$07,$0e - db SS_ANNE_6,$09,$0d - db SS_ANNE_10,$01,$03 + db SS_ANNE_KITCHEN,$09,$0d + db SS_ANNE_B1F_ROOMS,$01,$03 db ROUTE_10,$11,$09 db ROUTE_10,$35,$10 - db ROCKET_HIDEOUT_1,$0f,$15 - db ROCKET_HIDEOUT_3,$11,$1b - db ROCKET_HIDEOUT_4,$01,$19 - db POKEMONTOWER_5,$0c,$04 + db ROCKET_HIDEOUT_B1F,$0f,$15 + db ROCKET_HIDEOUT_B3F,$11,$1b + db ROCKET_HIDEOUT_B4F,$01,$19 + db POKEMON_TOWER_5F,$0c,$04 db ROUTE_13,$0e,$01 db ROUTE_13,$0d,$10 - db MANSION_4,$09,$01 - db SAFARI_ZONE_ENTRANCE,$01,$0a + db POKEMON_MANSION_B1F,$09,$01 + db SAFARI_ZONE_GATE,$01,$0a db SAFARI_ZONE_WEST,$05,$06 db SILPH_CO_5F,$03,$0c db SILPH_CO_9F,$0f,$02 db COPYCATS_HOUSE_2F,$01,$01 - db UNKNOWN_DUNGEON_1,$0b,$0e - db UNKNOWN_DUNGEON_3,$03,$1b + db CERULEAN_CAVE_1F,$0b,$0e + db CERULEAN_CAVE_B1F,$03,$1b db POWER_PLANT,$10,$11 db POWER_PLANT,$01,$0c - db SEAFOAM_ISLANDS_3,$0f,$0f - db SEAFOAM_ISLANDS_5,$11,$19 - db MANSION_1,$10,$08 - db MANSION_3,$09,$01 + db SEAFOAM_ISLANDS_B2F,$0f,$0f + db SEAFOAM_ISLANDS_B4F,$11,$19 + db POKEMON_MANSION_1F,$10,$08 + db POKEMON_MANSION_3F,$09,$01 db ROUTE_23,$2c,$09 db ROUTE_23,$46,$13 db ROUTE_23,$5a,$08 - db VICTORY_ROAD_2,$02,$05 - db VICTORY_ROAD_2,$07,$1a + db VICTORY_ROAD_2F,$02,$05 + db VICTORY_ROAD_2F,$07,$1a db UNUSED_MAP_6F,$0b,$0e db VIRIDIAN_CITY,$04,$0e db ROUTE_11,$05,$30 @@ -43,14 +43,14 @@ HiddenItemCoords: db ROUTE_17,$48,$11 db ROUTE_17,$5b,$04 db ROUTE_17,$79,$08 - db UNDERGROUND_PATH_NS,$04,$03 - db UNDERGROUND_PATH_NS,$22,$04 - db UNDERGROUND_PATH_WE,$02,$0c - db UNDERGROUND_PATH_WE,$05,$15 + db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03 + db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04 + db UNDERGROUND_PATH_WEST_EAST,$02,$0c + db UNDERGROUND_PATH_WEST_EAST,$05,$15 db CELADON_CITY,$0f,$30 db ROUTE_25,$01,$0a - db MT_MOON_3,$09,$21 - db SEAFOAM_ISLANDS_4,$10,$09 + db MT_MOON_B2F,$09,$21 + db SEAFOAM_ISLANDS_B3F,$10,$09 db VERMILION_CITY,$0b,$0e db CERULEAN_CITY,$08,$0f db ROUTE_4,$03,$28 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 43627bfc..b1bfd844 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -4,7 +4,7 @@ HiddenObjectMaps: db OAKS_LAB db VIRIDIAN_POKECENTER db VIRIDIAN_MART - db VIRIDIAN_SCHOOL + db VIRIDIAN_SCHOOL_HOUSE db VIRIDIAN_GYM db MUSEUM_1F db PEWTER_GYM @@ -16,7 +16,7 @@ HiddenObjectMaps: db LAVENDER_POKECENTER db VERMILION_POKECENTER db VERMILION_GYM - db CELADON_MANSION_2 + db CELADON_MANSION_2F db CELADON_POKECENTER db CELADON_GYM db GAME_CORNER @@ -31,56 +31,56 @@ HiddenObjectMaps: db TRADE_CENTER db COLOSSEUM db VIRIDIAN_FOREST - db MT_MOON_3 + db MT_MOON_B2F db INDIGO_PLATEAU db ROUTE_25 db ROUTE_9 - db SS_ANNE_6 - db SS_ANNE_10 - db ROCKET_HIDEOUT_1 - db ROCKET_HIDEOUT_3 - db ROCKET_HIDEOUT_4 + db SS_ANNE_KITCHEN + db SS_ANNE_B1F_ROOMS + db ROCKET_HIDEOUT_B1F + db ROCKET_HIDEOUT_B3F + db ROCKET_HIDEOUT_B4F db SAFFRON_POKECENTER - db POKEMONTOWER_5 + db POKEMON_TOWER_5F db ROUTE_13 - db SAFARI_ZONE_ENTRANCE + db SAFARI_ZONE_GATE db SAFARI_ZONE_WEST db SILPH_CO_5F db SILPH_CO_9F db COPYCATS_HOUSE_2F - db UNKNOWN_DUNGEON_1 - db UNKNOWN_DUNGEON_3 + db CERULEAN_CAVE_1F + db CERULEAN_CAVE_B1F db POWER_PLANT - db SEAFOAM_ISLANDS_3 - db SEAFOAM_ISLANDS_5 - db MANSION_1 - db MANSION_3 + db SEAFOAM_ISLANDS_B2F + db SEAFOAM_ISLANDS_B4F + db POKEMON_MANSION_1F + db POKEMON_MANSION_3F db ROUTE_23 - db VICTORY_ROAD_2 - db $6F + db VICTORY_ROAD_2F + db UNUSED_MAP_6F db BILLS_HOUSE db VIRIDIAN_CITY - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE db ROUTE_15_GATE_2F - db LAVENDER_HOUSE_1 - db CELADON_MANSION_5 + db MR_FUJIS_HOUSE + db CELADON_MANSION_ROOF_HOUSE db FIGHTING_DOJO db ROUTE_10 db INDIGO_PLATEAU_LOBBY - db CINNABAR_LAB_4 + db CINNABAR_LAB_FOSSIL_ROOM db BIKE_SHOP db ROUTE_11 db ROUTE_12 - db MANSION_2 - db MANSION_4 + db POKEMON_MANSION_2F + db POKEMON_MANSION_B1F db SILPH_CO_11F db ROUTE_17 - db UNDERGROUND_PATH_NS - db UNDERGROUND_PATH_WE + db UNDERGROUND_PATH_NORTH_SOUTH + db UNDERGROUND_PATH_WEST_EAST db CELADON_CITY - db SEAFOAM_ISLANDS_4 + db SEAFOAM_ISLANDS_B3F db VERMILION_CITY db CERULEAN_CITY db ROUTE_4 diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 1fa4b64a..7f4593ca 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -343,38 +343,38 @@ MapHS2D: MapHS34: db MUSEUM_1F,$05,Show MapHSE4: - db UNKNOWN_DUNGEON_1,$01,Show - db UNKNOWN_DUNGEON_1,$02,Show - db UNKNOWN_DUNGEON_1,$03,Show + db CERULEAN_CAVE_1F,$01,Show + db CERULEAN_CAVE_1F,$02,Show + db CERULEAN_CAVE_1F,$03,Show MapHS8F: - db POKEMONTOWER_2,$01,Show + db POKEMON_TOWER_2F,$01,Show MapHS90: - db POKEMONTOWER_3,$04,Show + db POKEMON_TOWER_3F,$04,Show MapHS91: - db POKEMONTOWER_4,$04,Show - db POKEMONTOWER_4,$05,Show - db POKEMONTOWER_4,$06,Show + db POKEMON_TOWER_4F,$04,Show + db POKEMON_TOWER_4F,$05,Show + db POKEMON_TOWER_4F,$06,Show MapHS92: - db POKEMONTOWER_5,$06,Show + db POKEMON_TOWER_5F,$06,Show MapHS93: - db POKEMONTOWER_6,$04,Show - db POKEMONTOWER_6,$05,Show + db POKEMON_TOWER_6F,$04,Show + db POKEMON_TOWER_6F,$05,Show MapHS94: - db POKEMONTOWER_7,$01,Show - db POKEMONTOWER_7,$02,Show - db POKEMONTOWER_7,$03,Show - db POKEMONTOWER_7,$04,Show + db POKEMON_TOWER_7F,$01,Show + db POKEMON_TOWER_7F,$02,Show + db POKEMON_TOWER_7F,$03,Show + db POKEMON_TOWER_7F,$04,Show MapHS95: - db LAVENDER_HOUSE_1,$05,Hide + db MR_FUJIS_HOUSE,$05,Hide MapHS84: - db CELADON_MANSION_5,$02,Show + db CELADON_MANSION_ROOF_HOUSE,$02,Show MapHS87: db GAME_CORNER,$0B,Show MapHS9B: - db FUCHSIA_HOUSE_2,$02,Show + db WARDENS_HOUSE,$02,Show MapHSA5: - db MANSION_1,$02,Show - db MANSION_1,$03,Show + db POKEMON_MANSION_1F,$02,Show + db POKEMON_MANSION_1F,$03,Show MapHSB1: db FIGHTING_DOJO,$06,Show db FIGHTING_DOJO,$07,Show @@ -396,12 +396,12 @@ MapHS53: db POWER_PLANT,$0D,Show db POWER_PLANT,$0E,Show MapHSC2: - db VICTORY_ROAD_2,$06,Show - db VICTORY_ROAD_2,$07,Show - db VICTORY_ROAD_2,$08,Show - db VICTORY_ROAD_2,$09,Show - db VICTORY_ROAD_2,$0A,Show - db VICTORY_ROAD_2,$0D,Show + db VICTORY_ROAD_2F,$06,Show + db VICTORY_ROAD_2F,$07,Show + db VICTORY_ROAD_2F,$08,Show + db VICTORY_ROAD_2F,$09,Show + db VICTORY_ROAD_2F,$0A,Show + db VICTORY_ROAD_2F,$0D,Show MapHS58: db BILLS_HOUSE,$01,Show db BILLS_HOUSE,$02,Hide @@ -411,50 +411,50 @@ MapHS33: db VIRIDIAN_FOREST,$06,Show db VIRIDIAN_FOREST,$07,Show MapHS3B: - db MT_MOON_1,$08,Show - db MT_MOON_1,$09,Show - db MT_MOON_1,$0A,Show - db MT_MOON_1,$0B,Show - db MT_MOON_1,$0C,Show - db MT_MOON_1,$0D,Show + db MT_MOON_1F,$08,Show + db MT_MOON_1F,$09,Show + db MT_MOON_1F,$0A,Show + db MT_MOON_1F,$0B,Show + db MT_MOON_1F,$0C,Show + db MT_MOON_1F,$0D,Show MapHS3D: - db MT_MOON_3,$06,Show - db MT_MOON_3,$07,Show - db MT_MOON_3,$08,Show - db MT_MOON_3,$09,Show + db MT_MOON_B2F,$06,Show + db MT_MOON_B2F,$07,Show + db MT_MOON_B2F,$08,Show + db MT_MOON_B2F,$09,Show MapHS60: - db SS_ANNE_2,$02,Hide + db SS_ANNE_2F,$02,Hide MapHS66: - db SS_ANNE_8,$0A,Show + db SS_ANNE_1F_ROOMS,$0A,Show MapHS67: - db SS_ANNE_9,$06,Show - db SS_ANNE_9,$09,Show + db SS_ANNE_2F_ROOMS,$06,Show + db SS_ANNE_2F_ROOMS,$09,Show MapHS68: - db SS_ANNE_10,$09,Show - db SS_ANNE_10,$0A,Show - db SS_ANNE_10,$0B,Show + db SS_ANNE_B1F_ROOMS,$09,Show + db SS_ANNE_B1F_ROOMS,$0A,Show + db SS_ANNE_B1F_ROOMS,$0B,Show MapHSC6: - db VICTORY_ROAD_3,$05,Show - db VICTORY_ROAD_3,$06,Show - db VICTORY_ROAD_3,$0A,Show + db VICTORY_ROAD_3F,$05,Show + db VICTORY_ROAD_3F,$06,Show + db VICTORY_ROAD_3F,$0A,Show MapHSC7: - db ROCKET_HIDEOUT_1,$06,Show - db ROCKET_HIDEOUT_1,$07,Show + db ROCKET_HIDEOUT_B1F,$06,Show + db ROCKET_HIDEOUT_B1F,$07,Show MapHSC8: - db ROCKET_HIDEOUT_2,$02,Show - db ROCKET_HIDEOUT_2,$03,Show - db ROCKET_HIDEOUT_2,$04,Show - db ROCKET_HIDEOUT_2,$05,Show + db ROCKET_HIDEOUT_B2F,$02,Show + db ROCKET_HIDEOUT_B2F,$03,Show + db ROCKET_HIDEOUT_B2F,$04,Show + db ROCKET_HIDEOUT_B2F,$05,Show MapHSC9: - db ROCKET_HIDEOUT_3,$03,Show - db ROCKET_HIDEOUT_3,$04,Show + db ROCKET_HIDEOUT_B3F,$03,Show + db ROCKET_HIDEOUT_B3F,$04,Show MapHSCA: - db ROCKET_HIDEOUT_4,$01,Show - db ROCKET_HIDEOUT_4,$05,Show - db ROCKET_HIDEOUT_4,$06,Show - db ROCKET_HIDEOUT_4,$07,Show - db ROCKET_HIDEOUT_4,$08,Hide - db ROCKET_HIDEOUT_4,$09,Hide + db ROCKET_HIDEOUT_B4F,$01,Show + db ROCKET_HIDEOUT_B4F,$05,Show + db ROCKET_HIDEOUT_B4F,$06,Show + db ROCKET_HIDEOUT_B4F,$07,Show + db ROCKET_HIDEOUT_B4F,$08,Hide + db ROCKET_HIDEOUT_B4F,$09,Hide MapHSCF: db SILPH_CO_2F,$01,Show db SILPH_CO_2F,$02,Show @@ -515,18 +515,18 @@ MapHSEB: db SILPH_CO_11F,$04,Show db SILPH_CO_11F,$05,Show MapHSF4: - db $F4,$02,Show + db UNUSED_MAP_F4,$02,Show MapHSD6: - db MANSION_2,$02,Show + db POKEMON_MANSION_2F,$02,Show MapHSD7: - db MANSION_3,$03,Show - db MANSION_3,$04,Show + db POKEMON_MANSION_3F,$03,Show + db POKEMON_MANSION_3F,$04,Show MapHSD8: - db MANSION_4,$03,Show - db MANSION_4,$04,Show - db MANSION_4,$05,Show - db MANSION_4,$06,Show - db MANSION_4,$08,Show + db POKEMON_MANSION_B1F,$03,Show + db POKEMON_MANSION_B1F,$04,Show + db POKEMON_MANSION_B1F,$05,Show + db POKEMON_MANSION_B1F,$06,Show + db POKEMON_MANSION_B1F,$08,Show MapHSD9: db SAFARI_ZONE_EAST,$01,Show db SAFARI_ZONE_EAST,$02,Show @@ -543,35 +543,35 @@ MapHSDB: MapHSDC: db SAFARI_ZONE_CENTER,$01,Show MapHSE2: - db UNKNOWN_DUNGEON_2,$01,Show - db UNKNOWN_DUNGEON_2,$02,Show - db UNKNOWN_DUNGEON_2,$03,Show + db CERULEAN_CAVE_2F,$01,Show + db CERULEAN_CAVE_2F,$02,Show + db CERULEAN_CAVE_2F,$03,Show MapHSE3: - db UNKNOWN_DUNGEON_3,$01,Show - db UNKNOWN_DUNGEON_3,$02,Show - db UNKNOWN_DUNGEON_3,$03,Show + db CERULEAN_CAVE_B1F,$01,Show + db CERULEAN_CAVE_B1F,$02,Show + db CERULEAN_CAVE_B1F,$03,Show MapHS6C: - db VICTORY_ROAD_1,$03,Show - db VICTORY_ROAD_1,$04,Show + db VICTORY_ROAD_1F,$03,Show + db VICTORY_ROAD_1F,$04,Show MapHS78: db CHAMPIONS_ROOM,$02,Hide MapHSC0: - db SEAFOAM_ISLANDS_1,$01,Show - db SEAFOAM_ISLANDS_1,$02,Show + db SEAFOAM_ISLANDS_1F,$01,Show + db SEAFOAM_ISLANDS_1F,$02,Show MapHS9F: - db SEAFOAM_ISLANDS_2,$01,Hide - db SEAFOAM_ISLANDS_2,$02,Hide + db SEAFOAM_ISLANDS_B1F,$01,Hide + db SEAFOAM_ISLANDS_B1F,$02,Hide MapHSA0: - db SEAFOAM_ISLANDS_3,$01,Hide - db SEAFOAM_ISLANDS_3,$02,Hide + db SEAFOAM_ISLANDS_B2F,$01,Hide + db SEAFOAM_ISLANDS_B2F,$02,Hide MapHSA1: - db SEAFOAM_ISLANDS_4,$02,Show - db SEAFOAM_ISLANDS_4,$03,Show - db SEAFOAM_ISLANDS_4,$05,Hide - db SEAFOAM_ISLANDS_4,$06,Hide + db SEAFOAM_ISLANDS_B3F,$02,Show + db SEAFOAM_ISLANDS_B3F,$03,Show + db SEAFOAM_ISLANDS_B3F,$05,Hide + db SEAFOAM_ISLANDS_B3F,$06,Hide MapHSA2: - db SEAFOAM_ISLANDS_5,$01,Hide - db SEAFOAM_ISLANDS_5,$02,Hide - db SEAFOAM_ISLANDS_5,$03,Show + db SEAFOAM_ISLANDS_B4F,$01,Hide + db SEAFOAM_ISLANDS_B4F,$02,Hide + db SEAFOAM_ISLANDS_B4F,$03,Show db $FF,$01,Show diff --git a/data/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm new file mode 100755 index 00000000..73cd7291 --- /dev/null +++ b/data/mapHeaders/AgathasRoom.asm @@ -0,0 +1,8 @@ +AgathasRoom_h: + db CEMETERY ; tileset + db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) + dw AgathasRoom_Blocks ; blocks + dw AgathasRoom_TextPointers ; texts + dw AgathasRoom_Script ; scripts + db 0 ; connections + dw AgathasRoom_Object ; objects diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm new file mode 100755 index 00000000..c447fd80 --- /dev/null +++ b/data/mapHeaders/BikeShop.asm @@ -0,0 +1,8 @@ +BikeShop_h: + db CLUB ; tileset + db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) + dw BikeShop_Blocks ; blocks + dw BikeShop_TextPointers ; texts + dw BikeShop_Script ; scripts + db 0 ; connections + dw BikeShop_Object ; objects diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm new file mode 100755 index 00000000..bba9cf83 --- /dev/null +++ b/data/mapHeaders/BillsHouse.asm @@ -0,0 +1,8 @@ +BillsHouse_h: + db INTERIOR ; tileset + db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) + dw BillsHouse_Blocks ; blocks + dw BillsHouse_TextPointers ; texts + dw BillsHouse_Script ; scripts + db 0 ; connections + dw BillsHouse_Object ; objects diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm new file mode 100755 index 00000000..6ef0433e --- /dev/null +++ b/data/mapHeaders/BluesHouse.asm @@ -0,0 +1,8 @@ +BluesHouse_h: + db HOUSE ; tileset + db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) + dw BluesHouse_Blocks ; blocks + dw BluesHouse_TextPointers ; texts + dw BluesHouse_Script ; scripts + db 0 ; connections + dw BluesHouse_Object ; objects diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm new file mode 100755 index 00000000..78c7989d --- /dev/null +++ b/data/mapHeaders/BrunosRoom.asm @@ -0,0 +1,8 @@ +BrunosRoom_h: + db GYM ; tileset + db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) + dw BrunosRoom_Blocks ; blocks + dw BrunosRoom_TextPointers ; texts + dw BrunosRoom_Script ; scripts + db 0 ; connections + dw BrunosRoom_Object ; objects diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm new file mode 100755 index 00000000..a31c8121 --- /dev/null +++ b/data/mapHeaders/CeladonChiefHouse.asm @@ -0,0 +1,8 @@ +CeladonChiefHouse_h: + db MANSION ; tileset + db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x) + dw CeladonChiefHouse_Blocks ; blocks + dw CeladonChiefHouse_TextPointers ; texts + dw CeladonChiefHouse_Script ; scripts + db 0 ; connections + dw CeladonChiefHouse_Object ; objects diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm new file mode 100755 index 00000000..62243d27 --- /dev/null +++ b/data/mapHeaders/CeladonCity.asm @@ -0,0 +1,10 @@ +CeladonCity_h: + db OVERWORLD ; tileset + db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) + dw CeladonCity_Blocks ; blocks + dw CeladonCity_TextPointers ; texts + dw CeladonCity_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks + EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1 + dw CeladonCity_Object ; objects diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm new file mode 100755 index 00000000..d4220db7 --- /dev/null +++ b/data/mapHeaders/CeladonDiner.asm @@ -0,0 +1,8 @@ +CeladonDiner_h: + db LOBBY ; tileset + db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) + dw CeladonDiner_Blocks ; blocks + dw CeladonDiner_TextPointers ; texts + dw CeladonDiner_Script ; scripts + db 0 ; connections + dw CeladonDiner_Object ; objects diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm new file mode 100755 index 00000000..04a9427c --- /dev/null +++ b/data/mapHeaders/CeladonGym.asm @@ -0,0 +1,8 @@ +CeladonGym_h: + db GYM ; tileset + db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) + dw CeladonGym_Blocks ; blocks + dw CeladonGym_TextPointers ; texts + dw CeladonGym_Script ; scripts + db 0 ; connections + dw CeladonGym_Object ; objects diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm new file mode 100755 index 00000000..e06c2fd3 --- /dev/null +++ b/data/mapHeaders/CeladonHotel.asm @@ -0,0 +1,8 @@ +CeladonHotel_h: + db POKECENTER ; tileset + db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) + dw CeladonHotel_Blocks ; blocks + dw CeladonHotel_TextPointers ; texts + dw CeladonHotel_Script ; scripts + db 0 ; connections + dw CeladonHotel_Object ; objects diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm new file mode 100755 index 00000000..d2d0ee99 --- /dev/null +++ b/data/mapHeaders/CeladonMansion1F.asm @@ -0,0 +1,8 @@ +CeladonMansion1F_h: + db MANSION ; tileset + db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x) + dw CeladonMansion1F_Blocks ; blocks + dw CeladonMansion1F_TextPointers ; texts + dw CeladonMansion1F_Script ; scripts + db 0 ; connections + dw CeladonMansion1F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm new file mode 100755 index 00000000..eceac30e --- /dev/null +++ b/data/mapHeaders/CeladonMansion2F.asm @@ -0,0 +1,8 @@ +CeladonMansion2F_h: + db MANSION ; tileset + db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x) + dw CeladonMansion2F_Blocks ; blocks + dw CeladonMansion2F_TextPointers ; texts + dw CeladonMansion2F_Script ; scripts + db 0 ; connections + dw CeladonMansion2F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm new file mode 100755 index 00000000..b5a0a705 --- /dev/null +++ b/data/mapHeaders/CeladonMansion3F.asm @@ -0,0 +1,8 @@ +CeladonMansion3F_h: + db MANSION ; tileset + db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x) + dw CeladonMansion3F_Blocks ; blocks + dw CeladonMansion3F_TextPointers ; texts + dw CeladonMansion3F_Script ; scripts + db 0 ; connections + dw CeladonMansion3F_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm new file mode 100755 index 00000000..d7a050c8 --- /dev/null +++ b/data/mapHeaders/CeladonMansionRoof.asm @@ -0,0 +1,8 @@ +CeladonMansionRoof_h: + db MANSION ; tileset + db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x) + dw CeladonMansionRoof_Blocks ; blocks + dw CeladonMansionRoof_TextPointers ; texts + dw CeladonMansionRoof_Script ; scripts + db 0 ; connections + dw CeladonMansionRoof_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..7fcf49e1 --- /dev/null +++ b/data/mapHeaders/CeladonMansionRoofHouse.asm @@ -0,0 +1,8 @@ +CeladonMansionRoofHouse_h: + db HOUSE ; tileset + db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x) + dw CeladonMansionRoofHouse_Blocks ; blocks + dw CeladonMansionRoofHouse_TextPointers ; texts + dw CeladonMansionRoofHouse_Script ; scripts + db 0 ; connections + dw CeladonMansionRoofHouse_Object ; objects diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm new file mode 100755 index 00000000..51e968fa --- /dev/null +++ b/data/mapHeaders/CeladonMart1F.asm @@ -0,0 +1,8 @@ +CeladonMart1F_h: + db LOBBY ; tileset + db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x) + dw CeladonMart1F_Blocks ; blocks + dw CeladonMart1F_TextPointers ; texts + dw CeladonMart1F_Script ; scripts + db 0 ; connections + dw CeladonMart1F_Object ; objects diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm new file mode 100755 index 00000000..77106405 --- /dev/null +++ b/data/mapHeaders/CeladonMart2F.asm @@ -0,0 +1,8 @@ +CeladonMart2F_h: + db LOBBY ; tileset + db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x) + dw CeladonMart2F_Blocks ; blocks + dw CeladonMart2F_TextPointers ; texts + dw CeladonMart2F_Script ; scripts + db 0 ; connections + dw CeladonMart2F_Object ; objects diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm new file mode 100755 index 00000000..c460945c --- /dev/null +++ b/data/mapHeaders/CeladonMart3F.asm @@ -0,0 +1,8 @@ +CeladonMart3F_h: + db LOBBY ; tileset + db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x) + dw CeladonMart3F_Blocks ; blocks + dw CeladonMart3F_TextPointers ; texts + dw CeladonMart3F_Script ; scripts + db 0 ; connections + dw CeladonMart3F_Object ; objects diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm new file mode 100755 index 00000000..a742570b --- /dev/null +++ b/data/mapHeaders/CeladonMart4F.asm @@ -0,0 +1,8 @@ +CeladonMart4F_h: + db LOBBY ; tileset + db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x) + dw CeladonMart4F_Blocks ; blocks + dw CeladonMart4F_TextPointers ; texts + dw CeladonMart4F_Script ; scripts + db 0 ; connections + dw CeladonMart4F_Object ; objects diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm new file mode 100755 index 00000000..4b5223e0 --- /dev/null +++ b/data/mapHeaders/CeladonMart5F.asm @@ -0,0 +1,8 @@ +CeladonMart5F_h: + db LOBBY ; tileset + db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x) + dw CeladonMart5F_Blocks ; blocks + dw CeladonMart5F_TextPointers ; texts + dw CeladonMart5F_Script ; scripts + db 0 ; connections + dw CeladonMart5F_Object ; objects diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm new file mode 100755 index 00000000..06e87608 --- /dev/null +++ b/data/mapHeaders/CeladonMartElevator.asm @@ -0,0 +1,8 @@ +CeladonMartElevator_h: + db LOBBY ; tileset + db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) + dw CeladonMartElevator_Blocks ; blocks + dw CeladonMartElevator_TextPointers ; texts + dw CeladonMartElevator_Script ; scripts + db 0 ; connections + dw CeladonMartElevator_Object ; objects diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm new file mode 100755 index 00000000..163e25ed --- /dev/null +++ b/data/mapHeaders/CeladonMartRoof.asm @@ -0,0 +1,8 @@ +CeladonMartRoof_h: + db LOBBY ; tileset + db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) + dw CeladonMartRoof_Blocks ; blocks + dw CeladonMartRoof_TextPointers ; texts + dw CeladonMartRoof_Script ; scripts + db 0 ; connections + dw CeladonMartRoof_Object ; objects diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm new file mode 100755 index 00000000..b5d9bd73 --- /dev/null +++ b/data/mapHeaders/CeladonPokecenter.asm @@ -0,0 +1,8 @@ +CeladonPokecenter_h: + db POKECENTER ; tileset + db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) + dw CeladonPokecenter_Blocks ; blocks + dw CeladonPokecenter_TextPointers ; texts + dw CeladonPokecenter_Script ; scripts + db 0 ; connections + dw CeladonPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm new file mode 100755 index 00000000..a94f1912 --- /dev/null +++ b/data/mapHeaders/CeruleanBadgeHouse.asm @@ -0,0 +1,8 @@ +CeruleanBadgeHouse_h: + db SHIP ; tileset + db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x) + dw CeruleanBadgeHouse_Blocks ; blocks + dw CeruleanBadgeHouse_TextPointers ; texts + dw CeruleanBadgeHouse_Script ; scripts + db 0 ; connections + dw CeruleanBadgeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm new file mode 100755 index 00000000..932dfb48 --- /dev/null +++ b/data/mapHeaders/CeruleanCave1F.asm @@ -0,0 +1,8 @@ +CeruleanCave1F_h: + db CAVERN ; tileset + db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x) + dw CeruleanCave1F_Blocks ; blocks + dw CeruleanCave1F_TextPointers ; texts + dw CeruleanCave1F_Script ; scripts + db 0 ; connections + dw CeruleanCave1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm new file mode 100755 index 00000000..7cf82371 --- /dev/null +++ b/data/mapHeaders/CeruleanCave2F.asm @@ -0,0 +1,8 @@ +CeruleanCave2F_h: + db CAVERN ; tileset + db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x) + dw CeruleanCave2F_Blocks ; blocks + dw CeruleanCave2F_TextPointers ; texts + dw CeruleanCave2F_Script ; scripts + db 0 ; connections + dw CeruleanCave2F_Object ; objects diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm new file mode 100755 index 00000000..eb940faa --- /dev/null +++ b/data/mapHeaders/CeruleanCaveB1F.asm @@ -0,0 +1,8 @@ +CeruleanCaveB1F_h: + db CAVERN ; tileset + db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x) + dw CeruleanCaveB1F_Blocks ; blocks + dw CeruleanCaveB1F_TextPointers ; texts + dw CeruleanCaveB1F_Script ; scripts + db 0 ; connections + dw CeruleanCaveB1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm new file mode 100755 index 00000000..cd5444ab --- /dev/null +++ b/data/mapHeaders/CeruleanCity.asm @@ -0,0 +1,12 @@ +CeruleanCity_h: + db OVERWORLD ; tileset + db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) + dw CeruleanCity_Blocks ; blocks + dw CeruleanCity_TextPointers ; texts + dw CeruleanCity_Script ; scripts + db NORTH | SOUTH | WEST | EAST ; connections + NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks + SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1 + WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks + EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks + dw CeruleanCity_Object ; objects diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm new file mode 100755 index 00000000..3bdb0283 --- /dev/null +++ b/data/mapHeaders/CeruleanGym.asm @@ -0,0 +1,8 @@ +CeruleanGym_h: + db GYM ; tileset + db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) + dw CeruleanGym_Blocks ; blocks + dw CeruleanGym_TextPointers ; texts + dw CeruleanGym_Script ; scripts + db 0 ; connections + dw CeruleanGym_Object ; objects diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm new file mode 100755 index 00000000..f020d4a3 --- /dev/null +++ b/data/mapHeaders/CeruleanMart.asm @@ -0,0 +1,8 @@ +CeruleanMart_h: + db MART ; tileset + db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) + dw CeruleanMart_Blocks ; blocks + dw CeruleanMart_TextPointers ; texts + dw CeruleanMart_Script ; scripts + db 0 ; connections + dw CeruleanMart_Object ; objects diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm new file mode 100755 index 00000000..3286acbb --- /dev/null +++ b/data/mapHeaders/CeruleanPokecenter.asm @@ -0,0 +1,8 @@ +CeruleanPokecenter_h: + db POKECENTER ; tileset + db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) + dw CeruleanPokecenter_Blocks ; blocks + dw CeruleanPokecenter_TextPointers ; texts + dw CeruleanPokecenter_Script ; scripts + db 0 ; connections + dw CeruleanPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm new file mode 100755 index 00000000..23c5062c --- /dev/null +++ b/data/mapHeaders/CeruleanTradeHouse.asm @@ -0,0 +1,8 @@ +CeruleanTradeHouse_h: + db HOUSE ; tileset + db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x) + dw CeruleanTradeHouse_Blocks ; blocks + dw CeruleanTradeHouse_TextPointers ; texts + dw CeruleanTradeHouse_Script ; scripts + db 0 ; connections + dw CeruleanTradeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm new file mode 100755 index 00000000..e105b1ed --- /dev/null +++ b/data/mapHeaders/CeruleanTrashedHouse.asm @@ -0,0 +1,8 @@ +CeruleanTrashedHouse_h: + db HOUSE ; tileset + db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x) + dw CeruleanTrashedHouse_Blocks ; blocks + dw CeruleanTrashedHouse_TextPointers ; texts + dw CeruleanTrashedHouse_Script ; scripts + db 0 ; connections + dw CeruleanTrashedHouse_Object ; objects diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm new file mode 100755 index 00000000..a22b236a --- /dev/null +++ b/data/mapHeaders/ChampionsRoom.asm @@ -0,0 +1,8 @@ +ChampionsRoom_h: + db GYM ; tileset + db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) + dw ChampionsRoom_Blocks ; blocks + dw ChampionsRoom_TextPointers ; texts + dw ChampionsRoom_Script ; scripts + db $0 ; connections + dw ChampionsRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm new file mode 100755 index 00000000..e871b8f3 --- /dev/null +++ b/data/mapHeaders/CinnabarGym.asm @@ -0,0 +1,8 @@ +CinnabarGym_h: + db FACILITY ; tileset + db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) + dw CinnabarGym_Blocks ; blocks + dw CinnabarGym_TextPointers ; texts + dw CinnabarGym_Script ; scripts + db 0 ; connections + dw CinnabarGym_Object ; objects diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm new file mode 100755 index 00000000..b8c5d7d4 --- /dev/null +++ b/data/mapHeaders/CinnabarIsland.asm @@ -0,0 +1,10 @@ +CinnabarIsland_h: + db OVERWORLD ; tileset + db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) + dw CinnabarIsland_Blocks ; blocks + dw CinnabarIsland_TextPointers ; texts + dw CinnabarIsland_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21_Blocks + EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20_Blocks + dw CinnabarIsland_Object ; objects diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm new file mode 100755 index 00000000..c1167960 --- /dev/null +++ b/data/mapHeaders/CinnabarLab.asm @@ -0,0 +1,8 @@ +CinnabarLab_h: + db LAB ; tileset + db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x) + dw CinnabarLab_Blocks ; blocks + dw CinnabarLab_TextPointers ; texts + dw CinnabarLab_Script ; scripts + db 0 ; connections + dw CinnabarLab_Object ; objects diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..4ac2963b --- /dev/null +++ b/data/mapHeaders/CinnabarLabFossilRoom.asm @@ -0,0 +1,8 @@ +CinnabarLabFossilRoom_h: + db LAB ; tileset + db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x) + dw CinnabarLabFossilRoom_Blocks ; blocks + dw CinnabarLabFossilRoom_TextPointers ; texts + dw CinnabarLabFossilRoom_Script ; scripts + db 0 ; connections + dw CinnabarLabFossilRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm new file mode 100755 index 00000000..8eb9e502 --- /dev/null +++ b/data/mapHeaders/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,8 @@ +CinnabarLabMetronomeRoom_h: + db LAB ; tileset + db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x) + dw CinnabarLabMetronomeRoom_Blocks ; blocks + dw CinnabarLabMetronomeRoom_TextPointers ; texts + dw CinnabarLabMetronomeRoom_Script ; scripts + db 0 ; connections + dw CinnabarLabMetronomeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm new file mode 100755 index 00000000..1e0ffd0e --- /dev/null +++ b/data/mapHeaders/CinnabarLabTradeRoom.asm @@ -0,0 +1,8 @@ +CinnabarLabTradeRoom_h: + db LAB ; tileset + db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x) + dw CinnabarLabTradeRoom_Blocks ; blocks + dw CinnabarLabTradeRoom_TextPointers ; texts + dw CinnabarLabTradeRoom_Script ; scripts + db 0 ; connections + dw CinnabarLabTradeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm new file mode 100755 index 00000000..5833b2ef --- /dev/null +++ b/data/mapHeaders/CinnabarMart.asm @@ -0,0 +1,8 @@ +CinnabarMart_h: + db MART ; tileset + db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) + dw CinnabarMart_Blocks ; blocks + dw CinnabarMart_TextPointers ; texts + dw CinnabarMart_Script ; scripts + db 0 ; connections + dw CinnabarMart_Object ; objects diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm new file mode 100755 index 00000000..9c54b9b9 --- /dev/null +++ b/data/mapHeaders/CinnabarPokecenter.asm @@ -0,0 +1,8 @@ +CinnabarPokecenter_h: + db POKECENTER ; tileset + db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) + dw CinnabarPokecenter_Blocks ; blocks + dw CinnabarPokecenter_TextPointers ; texts + dw CinnabarPokecenter_Script ; scripts + db 0 ; connections + dw CinnabarPokecenter_Object ; objects diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm new file mode 100755 index 00000000..9b106204 --- /dev/null +++ b/data/mapHeaders/Colosseum.asm @@ -0,0 +1,8 @@ +Colosseum_h: + db CLUB ; tileset + db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) + dw Colosseum_Blocks ; blocks + dw Colosseum_TextPointers ; texts + dw Colosseum_Script ; scripts + db 0 ; connections + dw Colosseum_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm new file mode 100755 index 00000000..f3cfc261 --- /dev/null +++ b/data/mapHeaders/CopycatsHouse1F.asm @@ -0,0 +1,8 @@ +CopycatsHouse1F_h: + db REDS_HOUSE_1 ; tileset + db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) + dw CopycatsHouse1F_Blocks ; blocks + dw CopycatsHouse1F_TextPointers ; texts + dw CopycatsHouse1F_Script ; scripts + db 0 ; connections + dw CopycatsHouse1F_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm new file mode 100755 index 00000000..453ba455 --- /dev/null +++ b/data/mapHeaders/CopycatsHouse2F.asm @@ -0,0 +1,8 @@ +CopycatsHouse2F_h: + db REDS_HOUSE_2 ; tileset + db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) + dw CopycatsHouse2F_Blocks ; blocks + dw CopycatsHouse2F_TextPointers ; texts + dw CopycatsHouse2F_Script ; scripts + db 0 ; connections + dw CopycatsHouse2F_Object ; objects diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm new file mode 100755 index 00000000..2fb7a771 --- /dev/null +++ b/data/mapHeaders/Daycare.asm @@ -0,0 +1,8 @@ +Daycare_h: + db HOUSE ; tileset + db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x) + dw Daycare_Blocks ; blocks + dw Daycare_TextPointers ; texts + dw Daycare_Script ; scripts + db 0 ; connections + dw Daycare_Object ; objects diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm new file mode 100755 index 00000000..096019de --- /dev/null +++ b/data/mapHeaders/DiglettsCave.asm @@ -0,0 +1,8 @@ +DiglettsCave_h: + db CAVERN ; tileset + db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) + dw DiglettsCave_Blocks ; blocks + dw DiglettsCave_TextPointers ; texts + dw DiglettsCave_Script ; scripts + db 0 ; connections + dw DiglettsCave_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm new file mode 100755 index 00000000..363859b2 --- /dev/null +++ b/data/mapHeaders/DiglettsCaveRoute11.asm @@ -0,0 +1,8 @@ +DiglettsCaveRoute11_h: + db CAVERN ; tileset + db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x) + dw DiglettsCaveRoute11_Blocks ; blocks + dw DiglettsCaveRoute11_TextPointers ; texts + dw DiglettsCaveRoute11_Script ; scripts + db 0 ; connections + dw DiglettsCaveRoute11_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm new file mode 100755 index 00000000..c977415b --- /dev/null +++ b/data/mapHeaders/DiglettsCaveRoute2.asm @@ -0,0 +1,8 @@ +DiglettsCaveRoute2_h: + db CAVERN ; tileset + db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x) + dw DiglettsCaveRoute2_Blocks ; blocks + dw DiglettsCaveRoute2_TextPointers ; texts + dw DiglettsCaveRoute2_Script ; scripts + db 0 ; connections + dw DiglettsCaveRoute2_Object ; objects diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm new file mode 100755 index 00000000..5c802843 --- /dev/null +++ b/data/mapHeaders/FightingDojo.asm @@ -0,0 +1,8 @@ +FightingDojo_h: + db DOJO ; tileset + db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) + dw FightingDojo_Blocks ; blocks + dw FightingDojo_TextPointers ; texts + dw FightingDojo_Script ; scripts + db 0 ; connections + dw FightingDojo_Object ; objects diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm new file mode 100755 index 00000000..bc4fe8e6 --- /dev/null +++ b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,8 @@ +FuchsiaBillsGrandpasHouse_h: + db HOUSE ; tileset + db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x) + dw FuchsiaBillsGrandpasHouse_Blocks ; blocks + dw FuchsiaBillsGrandpasHouse_TextPointers ; texts + dw FuchsiaBillsGrandpasHouse_Script ; scripts + db 0 ; connections + dw FuchsiaBillsGrandpasHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm new file mode 100755 index 00000000..87398877 --- /dev/null +++ b/data/mapHeaders/FuchsiaCity.asm @@ -0,0 +1,11 @@ +FuchsiaCity_h: + db OVERWORLD ; tileset + db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) + dw FuchsiaCity_Blocks ; blocks + dw FuchsiaCity_TextPointers ; texts + dw FuchsiaCity_Script ; scripts + db SOUTH | WEST | EAST ; connections + SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19_Blocks + WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18_Blocks + EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15_Blocks + dw FuchsiaCity_Object ; objects diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm new file mode 100755 index 00000000..4871970e --- /dev/null +++ b/data/mapHeaders/FuchsiaGoodRodHouse.asm @@ -0,0 +1,8 @@ +FuchsiaGoodRodHouse_h: + db SHIP ; tileset + db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x) + dw FuchsiaGoodRodHouse_Blocks ; blocks + dw FuchsiaGoodRodHouse_TextPointers ; texts + dw FuchsiaGoodRodHouse_Script ; scripts + db 0 ; connections + dw FuchsiaGoodRodHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm new file mode 100755 index 00000000..71ef5960 --- /dev/null +++ b/data/mapHeaders/FuchsiaGym.asm @@ -0,0 +1,8 @@ +FuchsiaGym_h: + db GYM ; tileset + db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) + dw FuchsiaGym_Blocks ; blocks + dw FuchsiaGym_TextPointers ; texts + dw FuchsiaGym_Script ; scripts + db 0 ; connections + dw FuchsiaGym_Object ; objects diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm new file mode 100755 index 00000000..7c1c34d2 --- /dev/null +++ b/data/mapHeaders/FuchsiaMart.asm @@ -0,0 +1,8 @@ +FuchsiaMart_h: + db MART ; tileset + db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) + dw FuchsiaMart_Blocks ; blocks + dw FuchsiaMart_TextPointers ; texts + dw FuchsiaMart_Script ; scripts + db 0 ; connections + dw FuchsiaMart_Object ; objects diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm new file mode 100755 index 00000000..8bc0cdbf --- /dev/null +++ b/data/mapHeaders/FuchsiaMeetingRoom.asm @@ -0,0 +1,8 @@ +FuchsiaMeetingRoom_h: + db LAB ; tileset + db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) + dw FuchsiaMeetingRoom_Blocks ; blocks + dw FuchsiaMeetingRoom_TextPointers ; texts + dw FuchsiaMeetingRoom_Script ; scripts + db 0 ; connections + dw FuchsiaMeetingRoom_Object ; objects diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm new file mode 100755 index 00000000..bf654ea6 --- /dev/null +++ b/data/mapHeaders/FuchsiaPokecenter.asm @@ -0,0 +1,8 @@ +FuchsiaPokecenter_h: + db POKECENTER ; tileset + db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) + dw FuchsiaPokecenter_Blocks ; blocks + dw FuchsiaPokecenter_TextPointers ; texts + dw FuchsiaPokecenter_Script ; scripts + db 0 ; connections + dw FuchsiaPokecenter_Object ; objects diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm new file mode 100755 index 00000000..c8b69724 --- /dev/null +++ b/data/mapHeaders/GameCorner.asm @@ -0,0 +1,8 @@ +GameCorner_h: + db LOBBY ; tileset + db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) + dw GameCorner_Blocks ; blocks + dw GameCorner_TextPointers ; texts + dw GameCorner_Script ; scripts + db 0 ; connections + dw GameCorner_Object ; objects diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm new file mode 100755 index 00000000..e43d2ec7 --- /dev/null +++ b/data/mapHeaders/GameCornerPrizeRoom.asm @@ -0,0 +1,8 @@ +GameCornerPrizeRoom_h: + db LOBBY ; tileset + db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x) + dw GameCornerPrizeRoom_Blocks ; blocks + dw GameCornerPrizeRoom_TextPointers ; texts + dw GameCornerPrizeRoom_Script ; scripts + db 0 ; connections + dw GameCornerPrizeRoom_Object ; objects diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm new file mode 100755 index 00000000..e7f7a982 --- /dev/null +++ b/data/mapHeaders/HallOfFame.asm @@ -0,0 +1,8 @@ +HallOfFame_h: + db GYM ; tileset + db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) + dw HallOfFame_Blocks ; blocks + dw HallOfFame_TextPointers ; texts + dw HallOfFame_Script ; scripts + db 0 ; connections + dw HallOfFame_Object ; objects diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm new file mode 100755 index 00000000..ee8b2f0c --- /dev/null +++ b/data/mapHeaders/IndigoPlateau.asm @@ -0,0 +1,9 @@ +IndigoPlateau_h: + db PLATEAU ; tileset + db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) + dw IndigoPlateau_Blocks ; blocks + dw IndigoPlateau_TextPointers ; texts + dw IndigoPlateau_Script ; scripts + db SOUTH ; connections + SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23_Blocks + dw IndigoPlateau_Object ; objects diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm new file mode 100755 index 00000000..f099c87d --- /dev/null +++ b/data/mapHeaders/IndigoPlateauLobby.asm @@ -0,0 +1,8 @@ +IndigoPlateauLobby_h: + db MART ; tileset + db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) + dw IndigoPlateauLobby_Blocks ; blocks + dw IndigoPlateauLobby_TextPointers ; texts + dw IndigoPlateauLobby_Script ; scripts + db 0 ; connections + dw IndigoPlateauLobby_Object ; objects diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm new file mode 100755 index 00000000..a9cea4b6 --- /dev/null +++ b/data/mapHeaders/LancesRoom.asm @@ -0,0 +1,8 @@ +LancesRoom_h: + db DOJO ; tileset + db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) + dw LancesRoom_Blocks ; blocks + dw LancesRoom_TextPointers ; texts + dw LancesRoom_Script ; scripts + db 0 ; connections + dw LancesRoom_Object ; objects diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm new file mode 100755 index 00000000..06e9cb40 --- /dev/null +++ b/data/mapHeaders/LavenderCuboneHouse.asm @@ -0,0 +1,8 @@ +LavenderCuboneHouse_h: + db HOUSE ; tileset + db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x) + dw LavenderCuboneHouse_Blocks ; blocks + dw LavenderCuboneHouse_TextPointers ; texts + dw LavenderCuboneHouse_Script ; scripts + db 0 ; connections + dw LavenderCuboneHouse_Object ; objects diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm new file mode 100755 index 00000000..c6869d3c --- /dev/null +++ b/data/mapHeaders/LavenderMart.asm @@ -0,0 +1,8 @@ +LavenderMart_h: + db MART ; tileset + db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) + dw LavenderMart_Blocks ; blocks + dw LavenderMart_TextPointers ; texts + dw LavenderMart_Script ; scripts + db 0 ; connections + dw LavenderMart_Object ; objects diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm new file mode 100755 index 00000000..820e19cd --- /dev/null +++ b/data/mapHeaders/LavenderPokecenter.asm @@ -0,0 +1,8 @@ +LavenderPokecenter_h: + db POKECENTER ; tileset + db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) + dw LavenderPokecenter_Blocks ; blocks + dw LavenderPokecenter_TextPointers ; texts + dw LavenderPokecenter_Script ; scripts + db 0 ; connections + dw LavenderPokecenter_Object ; objects diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm new file mode 100755 index 00000000..99c9515d --- /dev/null +++ b/data/mapHeaders/LavenderTown.asm @@ -0,0 +1,11 @@ +LavenderTown_h: + db OVERWORLD ; tileset + db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) + dw LavenderTown_Blocks ; blocks + dw LavenderTown_TextPointers ; texts + dw LavenderTown_Script ; scripts + db NORTH | SOUTH | WEST ; connections + NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10_Blocks + SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12_Blocks, 1 + WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8_Blocks + dw LavenderTown_Object ; objects diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm new file mode 100755 index 00000000..216b6621 --- /dev/null +++ b/data/mapHeaders/LoreleisRoom.asm @@ -0,0 +1,8 @@ +LoreleisRoom_h: + db GYM ; tileset + db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) + dw LoreleisRoom_Blocks ; blocks + dw LoreleisRoom_TextPointers ; texts + dw LoreleisRoom_Script ; scripts + db 0 ; connections + dw LoreleisRoom_Object ; objects diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm new file mode 100755 index 00000000..4ae9c5b7 --- /dev/null +++ b/data/mapHeaders/MrFujisHouse.asm @@ -0,0 +1,8 @@ +MrFujisHouse_h: + db HOUSE ; tileset + db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x) + dw MrFujisHouse_Blocks ; blocks + dw MrFujisHouse_TextPointers ; texts + dw MrFujisHouse_Script ; scripts + db 0 ; connections + dw MrFujisHouse_Object ; objects diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm new file mode 100755 index 00000000..5e4ce91b --- /dev/null +++ b/data/mapHeaders/MrPsychicsHouse.asm @@ -0,0 +1,8 @@ +MrPsychicsHouse_h: + db HOUSE ; tileset + db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x) + dw MrPsychicsHouse_Blocks ; blocks + dw MrPsychicsHouse_TextPointers ; texts + dw MrPsychicsHouse_Script ; scripts + db 0 ; connections + dw MrPsychicsHouse_Object ; objects diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm new file mode 100755 index 00000000..29ce5d6b --- /dev/null +++ b/data/mapHeaders/MtMoon1F.asm @@ -0,0 +1,8 @@ +MtMoon1F_h: + db CAVERN ; tileset + db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x) + dw MtMoon1F_Blocks ; blocks + dw MtMoon1F_TextPointers ; texts + dw MtMoon1F_Script ; scripts + db 0 ; connections + dw MtMoon1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm new file mode 100755 index 00000000..7ebc3dab --- /dev/null +++ b/data/mapHeaders/MtMoonB1F.asm @@ -0,0 +1,8 @@ +MtMoonB1F_h: + db CAVERN ; tileset + db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x) + dw MtMoonB1F_Blocks ; blocks + dw MtMoonB1F_TextPointers ; texts + dw MtMoonB1F_Script ; scripts + db 0 ; connections + dw MtMoonB1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm new file mode 100755 index 00000000..2ec86247 --- /dev/null +++ b/data/mapHeaders/MtMoonB2F.asm @@ -0,0 +1,8 @@ +MtMoonB2F_h: + db CAVERN ; tileset + db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x) + dw MtMoonB2F_Blocks ; blocks + dw MtMoonB2F_TextPointers ; texts + dw MtMoonB2F_Script ; scripts + db 0 ; connections + dw MtMoonB2F_Object ; objects diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm new file mode 100755 index 00000000..c3c014ff --- /dev/null +++ b/data/mapHeaders/MtMoonPokecenter.asm @@ -0,0 +1,8 @@ +MtMoonPokecenter_h: + db POKECENTER ; tileset + db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) + dw MtMoonPokecenter_Blocks ; blocks + dw MtMoonPokecenter_TextPointers ; texts + dw MtMoonPokecenter_Script ; scripts + db 0 ; connections + dw MtMoonPokecenter_Object ; objects diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm new file mode 100755 index 00000000..55625fc4 --- /dev/null +++ b/data/mapHeaders/Museum1F.asm @@ -0,0 +1,8 @@ +Museum1F_h: + db MUSEUM ; tileset + db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) + dw Museum1F_Blocks ; blocks + dw Museum1F_TextPointers ; texts + dw Museum1F_Script ; scripts + db 0 ; connections + dw Museum1F_Object ; objects diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm new file mode 100755 index 00000000..b39e161d --- /dev/null +++ b/data/mapHeaders/Museum2F.asm @@ -0,0 +1,8 @@ +Museum2F_h: + db MUSEUM ; tileset + db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) + dw Museum2F_Blocks ; blocks + dw Museum2F_TextPointers ; texts + dw Museum2F_Script ; scripts + db 0 ; connections + dw Museum2F_Object ; objects diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm new file mode 100755 index 00000000..7e3acee1 --- /dev/null +++ b/data/mapHeaders/NameRatersHouse.asm @@ -0,0 +1,8 @@ +NameRatersHouse_h: + db HOUSE ; tileset + db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) + dw NameRatersHouse_Blocks ; blocks + dw NameRatersHouse_TextPointers ; texts + dw NameRatersHouse_Script ; scripts + db 0 ; connections + dw NameRatersHouse_Object ; objects diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm new file mode 100755 index 00000000..ffbcdd52 --- /dev/null +++ b/data/mapHeaders/OaksLab.asm @@ -0,0 +1,8 @@ +OaksLab_h: + db DOJO ; tileset + db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) + dw OaksLab_Blocks ; blocks + dw OaksLab_TextPointers ; texts + dw OaksLab_Script ; scripts + db 0 ; connections + dw OaksLab_Object ; objects diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm new file mode 100755 index 00000000..eb8525ae --- /dev/null +++ b/data/mapHeaders/PalletTown.asm @@ -0,0 +1,10 @@ +PalletTown_h: + db OVERWORLD ; tileset + db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) + dw PalletTown_Blocks ; blocks + dw PalletTown_TextPointers ; texts + dw PalletTown_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1_Blocks + SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21_Blocks, 1 + dw PalletTown_Object ; objects diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm new file mode 100755 index 00000000..73610f86 --- /dev/null +++ b/data/mapHeaders/PewterCity.asm @@ -0,0 +1,10 @@ +PewterCity_h: + db OVERWORLD ; tileset + db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) + dw PewterCity_Blocks ; blocks + dw PewterCity_TextPointers ; texts + dw PewterCity_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2_Blocks + EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3_Blocks + dw PewterCity_Object ; objects diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm new file mode 100755 index 00000000..bb9c2e84 --- /dev/null +++ b/data/mapHeaders/PewterGym.asm @@ -0,0 +1,8 @@ +PewterGym_h: + db GYM ; tileset + db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) + dw PewterGym_Blocks ; blocks + dw PewterGym_TextPointers ; texts + dw PewterGym_Script ; scripts + db 0 ; connections + dw PewterGym_Object ; objects diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm new file mode 100755 index 00000000..dc8c5c78 --- /dev/null +++ b/data/mapHeaders/PewterMart.asm @@ -0,0 +1,8 @@ +PewterMart_h: + db MART ; tileset + db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) + dw PewterMart_Blocks ; blocks + dw PewterMart_TextPointers ; texts + dw PewterMart_Script ; scripts + db 0 ; connections + dw PewterMart_Object ; objects diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm new file mode 100755 index 00000000..ffab8473 --- /dev/null +++ b/data/mapHeaders/PewterNidoranHouse.asm @@ -0,0 +1,8 @@ +PewterNidoranHouse_h: + db HOUSE ; tileset + db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x) + dw PewterNidoranHouse_Blocks ; blocks + dw PewterNidoranHouse_TextPointers ; texts + dw PewterNidoranHouse_Script ; scripts + db 0 ; connections + dw PewterNidoranHouse_Object ; objects diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm new file mode 100755 index 00000000..89adbb80 --- /dev/null +++ b/data/mapHeaders/PewterPokecenter.asm @@ -0,0 +1,8 @@ +PewterPokecenter_h: + db POKECENTER ; tileset + db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) + dw PewterPokecenter_Blocks ; blocks + dw PewterPokecenter_TextPointers ; texts + dw PewterPokecenter_Script ; scripts + db 0 ; connections + dw PewterPokecenter_Object ; objects diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm new file mode 100755 index 00000000..7750c8c7 --- /dev/null +++ b/data/mapHeaders/PewterSpeechHouse.asm @@ -0,0 +1,8 @@ +PewterSpeechHouse_h: + db HOUSE ; tileset + db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x) + dw PewterSpeechHouse_Blocks ; blocks + dw PewterSpeechHouse_TextPointers ; texts + dw PewterSpeechHouse_Script ; scripts + db 0 ; connections + dw PewterSpeechHouse_Object ; objects diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm new file mode 100755 index 00000000..18ebb923 --- /dev/null +++ b/data/mapHeaders/PokemonFanClub.asm @@ -0,0 +1,8 @@ +PokemonFanClub_h: + db INTERIOR ; tileset + db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) + dw PokemonFanClub_Blocks ; blocks + dw PokemonFanClub_TextPointers ; texts + dw PokemonFanClub_Script ; scripts + db 0 ; connections + dw PokemonFanClub_Object ; objects diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm new file mode 100755 index 00000000..357b0cbb --- /dev/null +++ b/data/mapHeaders/PokemonMansion1F.asm @@ -0,0 +1,8 @@ +PokemonMansion1F_h: + db FACILITY ; tileset + db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x) + dw PokemonMansion1F_Blocks ; blocks + dw PokemonMansion1F_TextPointers ; texts + dw PokemonMansion1F_Script ; scripts + db 0 ; connections + dw PokemonMansion1F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm new file mode 100755 index 00000000..71c0e3bb --- /dev/null +++ b/data/mapHeaders/PokemonMansion2F.asm @@ -0,0 +1,8 @@ +PokemonMansion2F_h: + db FACILITY ; tileset + db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x) + dw PokemonMansion2F_Blocks ; blocks + dw PokemonMansion2F_TextPointers ; texts + dw PokemonMansion2F_Script ; scripts + db 0 ; connections + dw PokemonMansion2F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm new file mode 100755 index 00000000..fe4076f9 --- /dev/null +++ b/data/mapHeaders/PokemonMansion3F.asm @@ -0,0 +1,8 @@ +PokemonMansion3F_h: + db FACILITY ; tileset + db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x) + dw PokemonMansion3F_Blocks ; blocks + dw PokemonMansion3F_TextPointers ; texts + dw PokemonMansion3F_Script ; scripts + db 0 ; connections + dw PokemonMansion3F_Object ; objects diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm new file mode 100755 index 00000000..ccf892b2 --- /dev/null +++ b/data/mapHeaders/PokemonMansionB1F.asm @@ -0,0 +1,8 @@ +PokemonMansionB1F_h: + db FACILITY ; tileset + db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x) + dw PokemonMansionB1F_Blocks ; blocks + dw PokemonMansionB1F_TextPointers ; texts + dw PokemonMansionB1F_Script ; scripts + db 0 ; connections + dw PokemonMansionB1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm new file mode 100755 index 00000000..561274bb --- /dev/null +++ b/data/mapHeaders/PokemonTower1F.asm @@ -0,0 +1,8 @@ +PokemonTower1F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x) + dw PokemonTower1F_Blocks ; blocks + dw PokemonTower1F_TextPointers ; texts + dw PokemonTower1F_Script ; scripts + db 0 ; connections + dw PokemonTower1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm new file mode 100755 index 00000000..41e3271e --- /dev/null +++ b/data/mapHeaders/PokemonTower2F.asm @@ -0,0 +1,8 @@ +PokemonTower2F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x) + dw PokemonTower2F_Blocks ; blocks + dw PokemonTower2F_TextPointers ; texts + dw PokemonTower2F_Script ; scripts + db 0 ; connections + dw PokemonTower2F_Object ; objects diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm new file mode 100755 index 00000000..932c4a20 --- /dev/null +++ b/data/mapHeaders/PokemonTower3F.asm @@ -0,0 +1,8 @@ +PokemonTower3F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x) + dw PokemonTower3F_Blocks ; blocks + dw PokemonTower3F_TextPointers ; texts + dw PokemonTower3F_Script ; scripts + db 0 ; connections + dw PokemonTower3F_Object ; objects diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm new file mode 100755 index 00000000..b3027cb0 --- /dev/null +++ b/data/mapHeaders/PokemonTower4F.asm @@ -0,0 +1,8 @@ +PokemonTower4F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x) + dw PokemonTower4F_Blocks ; blocks + dw PokemonTower4F_TextPointers ; texts + dw PokemonTower4F_Script ; scripts + db 0 ; connections + dw PokemonTower4F_Object ; objects diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm new file mode 100755 index 00000000..9452c553 --- /dev/null +++ b/data/mapHeaders/PokemonTower5F.asm @@ -0,0 +1,8 @@ +PokemonTower5F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x) + dw PokemonTower5F_Blocks ; blocks + dw PokemonTower5F_TextPointers ; texts + dw PokemonTower5F_Script ; scripts + db 0 ; connections + dw PokemonTower5F_Object ; objects diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm new file mode 100755 index 00000000..336c8f66 --- /dev/null +++ b/data/mapHeaders/PokemonTower6F.asm @@ -0,0 +1,8 @@ +PokemonTower6F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x) + dw PokemonTower6F_Blocks ; blocks + dw PokemonTower6F_TextPointers ; texts + dw PokemonTower6F_Script ; scripts + db 0 ; connections + dw PokemonTower6F_Object ; objects diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm new file mode 100755 index 00000000..da10fa53 --- /dev/null +++ b/data/mapHeaders/PokemonTower7F.asm @@ -0,0 +1,8 @@ +PokemonTower7F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x) + dw PokemonTower7F_Blocks ; blocks + dw PokemonTower7F_TextPointers ; texts + dw PokemonTower7F_Script ; scripts + db 0 ; connections + dw PokemonTower7F_Object ; objects diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm new file mode 100755 index 00000000..91f03d63 --- /dev/null +++ b/data/mapHeaders/PowerPlant.asm @@ -0,0 +1,8 @@ +PowerPlant_h: + db FACILITY ; tileset + db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) + dw PowerPlant_Blocks ; blocks + dw PowerPlant_TextPointers ; texts + dw PowerPlant_Script ; scripts + db 0 ; connections + dw PowerPlant_Object ; objects diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm new file mode 100755 index 00000000..c9acc489 --- /dev/null +++ b/data/mapHeaders/RedsHouse1F.asm @@ -0,0 +1,8 @@ +RedsHouse1F_h: + db REDS_HOUSE_1 ; tileset + db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) + dw RedsHouse1F_Blocks ; blocks + dw RedsHouse1F_TextPointers ; texts + dw RedsHouse1F_Script ; scripts + db 0 ; connections + dw RedsHouse1F_Object ; objects diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm new file mode 100755 index 00000000..42215466 --- /dev/null +++ b/data/mapHeaders/RedsHouse2F.asm @@ -0,0 +1,8 @@ +RedsHouse2F_h: + db REDS_HOUSE_2 ; tileset + db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) + dw RedsHouse2F_Blocks ; blocks + dw RedsHouse2F_TextPointers ; texts + dw RedsHouse2F_Script ; scripts + db $00 ; connections + dw RedsHouse2F_Object ; objects diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm new file mode 100755 index 00000000..dd552ac9 --- /dev/null +++ b/data/mapHeaders/RockTunnel1F.asm @@ -0,0 +1,8 @@ +RockTunnel1F_h: + db CAVERN ; tileset + db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x) + dw RockTunnel1F_Blocks ; blocks + dw RockTunnel1F_TextPointers ; texts + dw RockTunnel1F_Script ; scripts + db 0 ; connections + dw RockTunnel1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm new file mode 100755 index 00000000..4e765f20 --- /dev/null +++ b/data/mapHeaders/RockTunnelB1F.asm @@ -0,0 +1,8 @@ +RockTunnelB1F_h: + db CAVERN ; tileset + db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x) + dw RockTunnelB1F_Blocks ; blocks + dw RockTunnelB1F_TextPointers ; texts + dw RockTunnelB1F_Script ; scripts + db 0 ; connections + dw RockTunnelB1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm new file mode 100755 index 00000000..ac29f1cf --- /dev/null +++ b/data/mapHeaders/RockTunnelPokecenter.asm @@ -0,0 +1,8 @@ +RockTunnelPokecenter_h: + db POKECENTER ; tileset + db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) + dw RockTunnelPokecenter_Blocks ; blocks + dw RockTunnelPokecenter_TextPointers ; texts + dw RockTunnelPokecenter_Script ; scripts + db 0 ; connections + dw RockTunnelPokecenter_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm new file mode 100755 index 00000000..3c842f1e --- /dev/null +++ b/data/mapHeaders/RocketHideoutB1F.asm @@ -0,0 +1,8 @@ +RocketHideoutB1F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x) + dw RocketHideoutB1F_Blocks ; blocks + dw RocketHideoutB1F_TextPointers ; texts + dw RocketHideoutB1F_Script ; scripts + db 0 ; connections + dw RocketHideoutB1F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm new file mode 100755 index 00000000..b570c2a6 --- /dev/null +++ b/data/mapHeaders/RocketHideoutB2F.asm @@ -0,0 +1,8 @@ +RocketHideoutB2F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x) + dw RocketHideoutB2F_Blocks ; blocks + dw RocketHideoutB2F_TextPointers ; texts + dw RocketHideoutB2F_Script ; scripts + db 0 ; connections + dw RocketHideoutB2F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm new file mode 100755 index 00000000..7eab257e --- /dev/null +++ b/data/mapHeaders/RocketHideoutB3F.asm @@ -0,0 +1,8 @@ +RocketHideoutB3F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x) + dw RocketHideoutB3F_Blocks ; blocks + dw RocketHideoutB3F_TextPointers ; texts + dw RocketHideoutB3F_Script ; scripts + db 0 ; connections + dw RocketHideoutB3F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm new file mode 100755 index 00000000..57797c56 --- /dev/null +++ b/data/mapHeaders/RocketHideoutB4F.asm @@ -0,0 +1,8 @@ +RocketHideoutB4F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x) + dw RocketHideoutB4F_Blocks ; blocks + dw RocketHideoutB4F_TextPointers ; texts + dw RocketHideoutB4F_Script ; scripts + db 0 ; connections + dw RocketHideoutB4F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm new file mode 100755 index 00000000..742d0038 --- /dev/null +++ b/data/mapHeaders/RocketHideoutElevator.asm @@ -0,0 +1,8 @@ +RocketHideoutElevator_h: + db LOBBY ; tileset + db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) + dw RocketHideoutElevator_Blocks ; blocks + dw RocketHideoutElevator_TextPointers ; texts + dw RocketHideoutElevator_Script ; scripts + db 0 ; connections + dw RocketHideoutElevator_Object ; objects diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm new file mode 100755 index 00000000..ce460937 --- /dev/null +++ b/data/mapHeaders/Route1.asm @@ -0,0 +1,10 @@ +Route1_h: + db OVERWORLD ; tileset + db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) + dw Route1_Blocks ; blocks + dw Route1_TextPointers ; texts + dw Route1_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTown_Blocks, 1 + dw Route1_Object ; objects diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm new file mode 100755 index 00000000..8c51bfc6 --- /dev/null +++ b/data/mapHeaders/Route10.asm @@ -0,0 +1,10 @@ +Route10_h: + db OVERWORLD ; tileset + db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) + dw Route10_Blocks ; blocks + dw Route10_TextPointers ; texts + dw Route10_Script ; scripts + db SOUTH | WEST ; connections + SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks + WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9_Blocks + dw Route10_Object ; objects diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm new file mode 100755 index 00000000..b7814465 --- /dev/null +++ b/data/mapHeaders/Route11.asm @@ -0,0 +1,10 @@ +Route11_h: + db OVERWORLD ; tileset + db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) + dw Route11_Blocks ; blocks + dw Route11_TextPointers ; texts + dw Route11_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCity_Blocks + EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12_Blocks, 1 + dw Route11_Object ; objects diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm new file mode 100755 index 00000000..2e01d168 --- /dev/null +++ b/data/mapHeaders/Route11Gate1F.asm @@ -0,0 +1,8 @@ +Route11Gate1F_h: + db GATE ; tileset + db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) + dw Route11Gate1F_Blocks ; blocks + dw Route11Gate1F_TextPointers ; texts + dw Route11Gate1F_Script ; scripts + db 0 ; connections + dw Route11Gate1F_Object ; objects diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm new file mode 100755 index 00000000..ecb2ab7c --- /dev/null +++ b/data/mapHeaders/Route11Gate2F.asm @@ -0,0 +1,8 @@ +Route11Gate2F_h: + db GATE ; tileset + db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) + dw Route11Gate2F_Blocks ; blocks + dw Route11Gate2F_TextPointers ; texts + dw Route11Gate2F_Script ; scripts + db 0 ; connections + dw Route11Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm new file mode 100755 index 00000000..2f76aa27 --- /dev/null +++ b/data/mapHeaders/Route12.asm @@ -0,0 +1,11 @@ +Route12_h: + db OVERWORLD ; tileset + db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) + dw Route12_Blocks ; blocks + dw Route12_TextPointers ; texts + dw Route12_Script ; scripts + db NORTH | SOUTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks + SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13_Blocks + WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11_Blocks + dw Route12_Object ; objects diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm new file mode 100755 index 00000000..e44aecab --- /dev/null +++ b/data/mapHeaders/Route12Gate1F.asm @@ -0,0 +1,8 @@ +Route12Gate1F_h: + db GATE ; tileset + db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) + dw Route12Gate1F_Blocks ; blocks + dw Route12Gate1F_TextPointers ; texts + dw Route12Gate1F_Script ; scripts + db 0 ; connections + dw Route12Gate1F_Object ; objects diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm new file mode 100755 index 00000000..94d5d54c --- /dev/null +++ b/data/mapHeaders/Route12Gate2F.asm @@ -0,0 +1,8 @@ +Route12Gate2F_h: + db GATE ; tileset + db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) + dw Route12Gate2F_Blocks ; blocks + dw Route12Gate2F_TextPointers ; texts + dw Route12Gate2F_Script ; scripts + db 0 ; connections + dw Route12Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm new file mode 100755 index 00000000..ef5e0f2c --- /dev/null +++ b/data/mapHeaders/Route12SuperRodHouse.asm @@ -0,0 +1,8 @@ +Route12SuperRodHouse_h: + db HOUSE ; tileset + db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x) + dw Route12SuperRodHouse_Blocks ; blocks + dw Route12SuperRodHouse_TextPointers ; texts + dw Route12SuperRodHouse_Script ; scripts + db 0 ; connections + dw Route12SuperRodHouse_Object ; objects diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm new file mode 100755 index 00000000..e6e244b9 --- /dev/null +++ b/data/mapHeaders/Route13.asm @@ -0,0 +1,10 @@ +Route13_h: + db OVERWORLD ; tileset + db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) + dw Route13_Blocks ; blocks + dw Route13_TextPointers ; texts + dw Route13_Script ; scripts + db NORTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12_Blocks + WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14_Blocks + dw Route13_Object ; objects diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm new file mode 100755 index 00000000..c3934ac5 --- /dev/null +++ b/data/mapHeaders/Route14.asm @@ -0,0 +1,10 @@ +Route14_h: + db OVERWORLD ; tileset + db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) + dw Route14_Blocks ; blocks + dw Route14_TextPointers ; texts + dw Route14_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15_Blocks + EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13_Blocks + dw Route14_Object ; objects diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm new file mode 100755 index 00000000..eb14d750 --- /dev/null +++ b/data/mapHeaders/Route15.asm @@ -0,0 +1,10 @@ +Route15_h: + db OVERWORLD ; tileset + db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) + dw Route15_Blocks ; blocks + dw Route15_TextPointers ; texts + dw Route15_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks + EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14_Blocks + dw Route15_Object ; objects diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm new file mode 100755 index 00000000..b1ae5662 --- /dev/null +++ b/data/mapHeaders/Route15Gate1F.asm @@ -0,0 +1,8 @@ +Route15Gate1F_h: + db GATE ; tileset + db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) + dw Route15Gate1F_Blocks ; blocks + dw Route15Gate1F_TextPointers ; texts + dw Route15Gate1F_Script ; scripts + db 0 ; connections + dw Route15Gate1F_Object ; objects diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm new file mode 100755 index 00000000..501da092 --- /dev/null +++ b/data/mapHeaders/Route15Gate2F.asm @@ -0,0 +1,8 @@ +Route15Gate2F_h: + db GATE ; tileset + db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) + dw Route15Gate2F_Blocks ; blocks + dw Route15Gate2F_TextPointers ; texts + dw Route15Gate2F_Script ; scripts + db 0 ; connections + dw Route15Gate2F_Object ; objects diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm new file mode 100755 index 00000000..d12b6ea9 --- /dev/null +++ b/data/mapHeaders/Route16.asm @@ -0,0 +1,10 @@ +Route16_h: + db OVERWORLD ; tileset + db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) + dw Route16_Blocks ; blocks + dw Route16_TextPointers ; texts + dw Route16_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17_Blocks + EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCity_Blocks, 1 + dw Route16_Object ; objects diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm new file mode 100755 index 00000000..0d3f828d --- /dev/null +++ b/data/mapHeaders/Route16FlyHouse.asm @@ -0,0 +1,8 @@ +Route16FlyHouse_h: + db HOUSE ; tileset + db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x) + dw Route16FlyHouse_Blocks ; blocks + dw Route16FlyHouse_TextPointers ; texts + dw Route16FlyHouse_Script ; scripts + db 0 ; connections + dw Route16FlyHouse_Object ; objects diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm new file mode 100755 index 00000000..561fb597 --- /dev/null +++ b/data/mapHeaders/Route16Gate1F.asm @@ -0,0 +1,8 @@ +Route16Gate1F_h: + db GATE ; tileset + db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) + dw Route16Gate1F_Blocks ; blocks + dw Route16Gate1F_TextPointers ; texts + dw Route16Gate1F_Script ; scripts + db 0 ; connections + dw Route16Gate1F_Object ; objects diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm new file mode 100755 index 00000000..90783ab7 --- /dev/null +++ b/data/mapHeaders/Route16Gate2F.asm @@ -0,0 +1,8 @@ +Route16Gate2F_h: + db GATE ; tileset + db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) + dw Route16Gate2F_Blocks ; blocks + dw Route16Gate2F_TextPointers ; texts + dw Route16Gate2F_Script ; scripts + db 0 ; connections + dw Route16Gate2F_Object ; objects diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm new file mode 100755 index 00000000..58a785b4 --- /dev/null +++ b/data/mapHeaders/Route17.asm @@ -0,0 +1,10 @@ +Route17_h: + db OVERWORLD ; tileset + db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) + dw Route17_Blocks ; blocks + dw Route17_TextPointers ; texts + dw Route17_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16_Blocks + SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18_Blocks, 1 + dw Route17_Object ; objects diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm new file mode 100755 index 00000000..5e10bdbd --- /dev/null +++ b/data/mapHeaders/Route18.asm @@ -0,0 +1,10 @@ +Route18_h: + db OVERWORLD ; tileset + db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) + dw Route18_Blocks ; blocks + dw Route18_TextPointers ; texts + dw Route18_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17_Blocks + EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks, 1 + dw Route18_Object ; objects diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm new file mode 100755 index 00000000..0e4a0dc3 --- /dev/null +++ b/data/mapHeaders/Route18Gate1F.asm @@ -0,0 +1,8 @@ +Route18Gate1F_h: + db GATE ; tileset + db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) + dw Route18Gate1F_Blocks ; blocks + dw Route18Gate1F_TextPointers ; texts + dw Route18Gate1F_Script ; scripts + db 0 ; connections + dw Route18Gate1F_Object ; objects diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm new file mode 100755 index 00000000..5d8f7126 --- /dev/null +++ b/data/mapHeaders/Route18Gate2F.asm @@ -0,0 +1,8 @@ +Route18Gate2F_h: + db GATE ; tileset + db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) + dw Route18Gate2F_Blocks ; blocks + dw Route18Gate2F_TextPointers ; texts + dw Route18Gate2F_Script ; scripts + db 0 ; connections + dw Route18Gate2F_Object ; objects diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm new file mode 100755 index 00000000..79972677 --- /dev/null +++ b/data/mapHeaders/Route19.asm @@ -0,0 +1,10 @@ +Route19_h: + db OVERWORLD ; tileset + db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) + dw Route19_Blocks ; blocks + dw Route19_TextPointers ; texts + dw Route19_Script ; scripts + db NORTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCity_Blocks + WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20_Blocks + dw Route19_Object ; objects diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm new file mode 100755 index 00000000..94511d06 --- /dev/null +++ b/data/mapHeaders/Route2.asm @@ -0,0 +1,10 @@ +Route2_h: + db OVERWORLD ; tileset + db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) + dw Route2_Blocks ; blocks + dw Route2_TextPointers ; texts + dw Route2_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks, 1 + dw Route2_Object ; objects diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm new file mode 100755 index 00000000..689f51cd --- /dev/null +++ b/data/mapHeaders/Route20.asm @@ -0,0 +1,10 @@ +Route20_h: + db OVERWORLD ; tileset + db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) + dw Route20_Blocks ; blocks + dw Route20_TextPointers ; texts + dw Route20_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks + EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19_Blocks + dw Route20_Object ; objects diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm new file mode 100755 index 00000000..f37869dc --- /dev/null +++ b/data/mapHeaders/Route21.asm @@ -0,0 +1,10 @@ +Route21_h: + db OVERWORLD ; tileset + db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) + dw Route21_Blocks ; blocks + dw Route21_TextPointers ; texts + dw Route21_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTown_Blocks + SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks, 1 + dw Route21_Object ; objects diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm new file mode 100755 index 00000000..4d07475f --- /dev/null +++ b/data/mapHeaders/Route22.asm @@ -0,0 +1,10 @@ +Route22_h: + db OVERWORLD ; tileset + db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) + dw Route22_Blocks ; blocks + dw Route22_TextPointers ; texts + dw Route22_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23_Blocks + EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCity_Blocks, 1 + dw Route22_Object ; objects diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm new file mode 100755 index 00000000..4d3ae0cc --- /dev/null +++ b/data/mapHeaders/Route22Gate.asm @@ -0,0 +1,8 @@ +Route22Gate_h: + db GATE ; tileset + db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) + dw Route22Gate_Blocks ; blocks + dw Route22Gate_TextPointers ; texts + dw Route22Gate_Script ; scripts + db 0 ; connections + dw Route22Gate_Object ; objects diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm new file mode 100755 index 00000000..6b1fde97 --- /dev/null +++ b/data/mapHeaders/Route23.asm @@ -0,0 +1,10 @@ +Route23_h: + db PLATEAU ; tileset + db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) + dw Route23_Blocks ; blocks + dw Route23_TextPointers ; texts + dw Route23_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateau_Blocks + SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22_Blocks, 1 + dw Route23_Object ; objects diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm new file mode 100755 index 00000000..87776f60 --- /dev/null +++ b/data/mapHeaders/Route24.asm @@ -0,0 +1,10 @@ +Route24_h: + db OVERWORLD ; tileset + db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) + dw Route24_Blocks ; blocks + dw Route24_TextPointers ; texts + dw Route24_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks, 1 + EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25_Blocks + dw Route24_Object ; objects diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm new file mode 100755 index 00000000..c300eeb3 --- /dev/null +++ b/data/mapHeaders/Route25.asm @@ -0,0 +1,9 @@ +Route25_h: + db OVERWORLD ; tileset + db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) + dw Route25_Blocks ; blocks + dw Route25_TextPointers ; texts + dw Route25_Script ; scripts + db WEST ; connections + WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24_Blocks + dw Route25_Object ; objects diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm new file mode 100755 index 00000000..9b284178 --- /dev/null +++ b/data/mapHeaders/Route2Gate.asm @@ -0,0 +1,8 @@ +Route2Gate_h: + db GATE ; tileset + db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) + dw Route2Gate_Blocks ; blocks + dw Route2Gate_TextPointers ; texts + dw Route2Gate_Script ; scripts + db 0 ; connections + dw Route2Gate_Object ; objects diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm new file mode 100755 index 00000000..33693943 --- /dev/null +++ b/data/mapHeaders/Route2TradeHouse.asm @@ -0,0 +1,8 @@ +Route2TradeHouse_h: + db HOUSE ; tileset + db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x) + dw Route2TradeHouse_Blocks ; blocks + dw Route2TradeHouse_TextPointers ; texts + dw Route2TradeHouse_Script ; scripts + db 0 ; connections + dw Route2TradeHouse_Object ; objects diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm new file mode 100755 index 00000000..c611e4b8 --- /dev/null +++ b/data/mapHeaders/Route3.asm @@ -0,0 +1,10 @@ +Route3_h: + db OVERWORLD ; tileset + db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) + dw Route3_Blocks ; blocks + dw Route3_TextPointers ; texts + dw Route3_Script ; scripts + db NORTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4_Blocks + WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCity_Blocks + dw Route3_Object ; objects diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm new file mode 100755 index 00000000..999a1207 --- /dev/null +++ b/data/mapHeaders/Route4.asm @@ -0,0 +1,10 @@ +Route4_h: + db OVERWORLD ; tileset + db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) + dw Route4_Blocks ; blocks + dw Route4_TextPointers ; texts + dw Route4_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3_Blocks + EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks, 1 + dw Route4_Object ; objects diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm new file mode 100755 index 00000000..6480aebd --- /dev/null +++ b/data/mapHeaders/Route5.asm @@ -0,0 +1,10 @@ +Route5_h: + db OVERWORLD ; tileset + db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) + dw Route5_Blocks ; blocks + dw Route5_TextPointers ; texts + dw Route5_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCity_Blocks, 1 + dw Route5_Object ; objects diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm new file mode 100755 index 00000000..bb418182 --- /dev/null +++ b/data/mapHeaders/Route5Gate.asm @@ -0,0 +1,8 @@ +Route5Gate_h: + db GATE ; tileset + db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) + dw Route5Gate_Blocks ; blocks + dw Route5Gate_TextPointers ; texts + dw Route5Gate_Script ; scripts + db 0 ; connections + dw Route5Gate_Object ; objects diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm new file mode 100755 index 00000000..9385ce5f --- /dev/null +++ b/data/mapHeaders/Route6.asm @@ -0,0 +1,10 @@ +Route6_h: + db OVERWORLD ; tileset + db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) + dw Route6_Blocks ; blocks + dw Route6_TextPointers ; texts + dw Route6_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCity_Blocks, 1 + dw Route6_Object ; objects diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm new file mode 100755 index 00000000..282cc5b6 --- /dev/null +++ b/data/mapHeaders/Route6Gate.asm @@ -0,0 +1,8 @@ +Route6Gate_h: + db GATE ; tileset + db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) + dw Route6Gate_Blocks ; blocks + dw Route6Gate_TextPointers ; texts + dw Route6Gate_Script ; scripts + db 0 ; connections + dw Route6Gate_Object ; objects diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm new file mode 100755 index 00000000..9b34ea1f --- /dev/null +++ b/data/mapHeaders/Route7.asm @@ -0,0 +1,10 @@ +Route7_h: + db OVERWORLD ; tileset + db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) + dw Route7_Blocks ; blocks + dw Route7_TextPointers ; texts + dw Route7_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCity_Blocks + EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCity_Blocks, 1 + dw Route7_Object ; objects diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm new file mode 100755 index 00000000..61771e42 --- /dev/null +++ b/data/mapHeaders/Route7Gate.asm @@ -0,0 +1,8 @@ +Route7Gate_h: + db GATE ; tileset + db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) + dw Route7Gate_Blocks ; blocks + dw Route7Gate_TextPointers ; texts + dw Route7Gate_Script ; scripts + db 0 ; connections + dw Route7Gate_Object ; objects diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm new file mode 100755 index 00000000..bd2ee71e --- /dev/null +++ b/data/mapHeaders/Route8.asm @@ -0,0 +1,10 @@ +Route8_h: + db OVERWORLD ; tileset + db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) + dw Route8_Blocks ; blocks + dw Route8_TextPointers ; texts + dw Route8_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCity_Blocks + EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks + dw Route8_Object ; objects diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm new file mode 100755 index 00000000..dd14a237 --- /dev/null +++ b/data/mapHeaders/Route8Gate.asm @@ -0,0 +1,8 @@ +Route8Gate_h: + db GATE ; tileset + db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) + dw Route8Gate_Blocks ; blocks + dw Route8Gate_TextPointers ; texts + dw Route8Gate_Script ; scripts + db 0 ; connections + dw Route8Gate_Object ; objects diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm new file mode 100755 index 00000000..3dec3b0a --- /dev/null +++ b/data/mapHeaders/Route9.asm @@ -0,0 +1,10 @@ +Route9_h: + db OVERWORLD ; tileset + db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) + dw Route9_Blocks ; blocks + dw Route9_TextPointers ; texts + dw Route9_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks + EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10_Blocks, 1 + dw Route9_Object ; objects diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm new file mode 100755 index 00000000..a69423d6 --- /dev/null +++ b/data/mapHeaders/SSAnne1F.asm @@ -0,0 +1,8 @@ +SSAnne1F_h: + db SHIP ; tileset + db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x) + dw SSAnne1F_Blocks ; blocks + dw SSAnne1F_TextPointers ; texts + dw SSAnne1F_Script ; scripts + db 0 ; connections + dw SSAnne1F_Object ; objects diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm new file mode 100755 index 00000000..1f8af23d --- /dev/null +++ b/data/mapHeaders/SSAnne1FRooms.asm @@ -0,0 +1,8 @@ +SSAnne1FRooms_h: + db SHIP ; tileset + db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x) + dw SSAnne1FRooms_Blocks ; blocks + dw SSAnne1FRooms_TextPointers ; texts + dw SSAnne1FRooms_Script ; scripts + db 0 ; connections + dw SSAnne1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm new file mode 100755 index 00000000..d42d16f4 --- /dev/null +++ b/data/mapHeaders/SSAnne2F.asm @@ -0,0 +1,8 @@ +SSAnne2F_h: + db SHIP ; tileset + db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x) + dw SSAnne2F_Blocks ; blocks + dw SSAnne2F_TextPointers ; texts + dw SSAnne2F_Script ; scripts + db 0 ; connections + dw SSAnne2F_Object ; objects diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm new file mode 100755 index 00000000..f22de0fa --- /dev/null +++ b/data/mapHeaders/SSAnne2FRooms.asm @@ -0,0 +1,8 @@ +SSAnne2FRooms_h: + db SHIP ; tileset + db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x) + dw SSAnne2FRooms_Blocks ; blocks + dw SSAnne2FRooms_TextPointers ; texts + dw SSAnne2FRooms_Script ; scripts + db 0 ; connections + dw SSAnne2FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm new file mode 100755 index 00000000..1c5dafea --- /dev/null +++ b/data/mapHeaders/SSAnne3F.asm @@ -0,0 +1,8 @@ +SSAnne3F_h: + db SHIP ; tileset + db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x) + dw SSAnne3F_Blocks ; blocks + dw SSAnne3F_TextPointers ; texts + dw SSAnne3F_Script ; scripts + db 0 ; connections + dw SSAnne3F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm new file mode 100755 index 00000000..a3ca6dfa --- /dev/null +++ b/data/mapHeaders/SSAnneB1F.asm @@ -0,0 +1,8 @@ +SSAnneB1F_h: + db SHIP ; tileset + db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x) + dw SSAnneB1F_Blocks ; blocks + dw SSAnneB1F_TextPointers ; texts + dw SSAnneB1F_Script ; scripts + db 0 ; connections + dw SSAnneB1F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm new file mode 100755 index 00000000..f08e343b --- /dev/null +++ b/data/mapHeaders/SSAnneB1FRooms.asm @@ -0,0 +1,8 @@ +SSAnneB1FRooms_h: + db SHIP ; tileset + db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x) + dw SSAnneB1FRooms_Blocks ; blocks + dw SSAnneB1FRooms_TextPointers ; texts + dw SSAnneB1FRooms_Script ; scripts + db 0 ; connections + dw SSAnneB1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm new file mode 100755 index 00000000..baa71147 --- /dev/null +++ b/data/mapHeaders/SSAnneBow.asm @@ -0,0 +1,8 @@ +SSAnneBow_h: + db SHIP ; tileset + db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x) + dw SSAnneBow_Blocks ; blocks + dw SSAnneBow_TextPointers ; texts + dw SSAnneBow_Script ; scripts + db 0 ; connections + dw SSAnneBow_Object ; objects diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm new file mode 100755 index 00000000..433f060a --- /dev/null +++ b/data/mapHeaders/SSAnneCaptainsRoom.asm @@ -0,0 +1,8 @@ +SSAnneCaptainsRoom_h: + db SHIP ; tileset + db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x) + dw SSAnneCaptainsRoom_Blocks ; blocks + dw SSAnneCaptainsRoom_TextPointers ; texts + dw SSAnneCaptainsRoom_Script ; scripts + db 0 ; connections + dw SSAnneCaptainsRoom_Object ; objects diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm new file mode 100755 index 00000000..eacbbfb8 --- /dev/null +++ b/data/mapHeaders/SSAnneKitchen.asm @@ -0,0 +1,8 @@ +SSAnneKitchen_h: + db SHIP ; tileset + db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x) + dw SSAnneKitchen_Blocks ; blocks + dw SSAnneKitchen_TextPointers ; texts + dw SSAnneKitchen_Script ; scripts + db 0 ; connections + dw SSAnneKitchen_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm new file mode 100755 index 00000000..8ec6c890 --- /dev/null +++ b/data/mapHeaders/SafariZoneCenter.asm @@ -0,0 +1,8 @@ +SafariZoneCenter_h: + db FOREST ; tileset + db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) + dw SafariZoneCenter_Blocks ; blocks + dw SafariZoneCenter_TextPointers ; texts + dw SafariZoneCenter_Script ; scripts + db 0 ; connections + dw SafariZoneCenter_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm new file mode 100755 index 00000000..9b1064f2 --- /dev/null +++ b/data/mapHeaders/SafariZoneCenterRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneCenterRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneCenterRestHouse_Blocks ; blocks + dw SafariZoneCenterRestHouse_TextPointers ; texts + dw SafariZoneCenterRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneCenterRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm new file mode 100755 index 00000000..99556473 --- /dev/null +++ b/data/mapHeaders/SafariZoneEast.asm @@ -0,0 +1,8 @@ +SafariZoneEast_h: + db FOREST ; tileset + db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) + dw SafariZoneEast_Blocks ; blocks + dw SafariZoneEast_TextPointers ; texts + dw SafariZoneEast_Script ; scripts + db 0 ; connections + dw SafariZoneEast_Object ; objects diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm new file mode 100755 index 00000000..b9f219c5 --- /dev/null +++ b/data/mapHeaders/SafariZoneEastRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneEastRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneEastRestHouse_Blocks ; blocks + dw SafariZoneEastRestHouse_TextPointers ; texts + dw SafariZoneEastRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneEastRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm new file mode 100755 index 00000000..ed306ad0 --- /dev/null +++ b/data/mapHeaders/SafariZoneGate.asm @@ -0,0 +1,8 @@ +SafariZoneGate_h: + db GATE ; tileset + db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x) + dw SafariZoneGate_Blocks ; blocks + dw SafariZoneGate_TextPointers ; texts + dw SafariZoneGate_Script ; scripts + db 0 ; connections + dw SafariZoneGate_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm new file mode 100755 index 00000000..3d1a2f51 --- /dev/null +++ b/data/mapHeaders/SafariZoneNorth.asm @@ -0,0 +1,8 @@ +SafariZoneNorth_h: + db FOREST ; tileset + db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) + dw SafariZoneNorth_Blocks ; blocks + dw SafariZoneNorth_TextPointers ; texts + dw SafariZoneNorth_Script ; scripts + db 0 ; connections + dw SafariZoneNorth_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm new file mode 100755 index 00000000..938c15cf --- /dev/null +++ b/data/mapHeaders/SafariZoneNorthRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneNorthRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneNorthRestHouse_Blocks ; blocks + dw SafariZoneNorthRestHouse_TextPointers ; texts + dw SafariZoneNorthRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneNorthRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm new file mode 100755 index 00000000..91068691 --- /dev/null +++ b/data/mapHeaders/SafariZoneSecretHouse.asm @@ -0,0 +1,8 @@ +SafariZoneSecretHouse_h: + db LAB ; tileset + db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneSecretHouse_Blocks ; blocks + dw SafariZoneSecretHouse_TextPointers ; texts + dw SafariZoneSecretHouse_Script ; scripts + db 0 ; connections + dw SafariZoneSecretHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm new file mode 100755 index 00000000..876169d1 --- /dev/null +++ b/data/mapHeaders/SafariZoneWest.asm @@ -0,0 +1,8 @@ +SafariZoneWest_h: + db FOREST ; tileset + db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) + dw SafariZoneWest_Blocks ; blocks + dw SafariZoneWest_TextPointers ; texts + dw SafariZoneWest_Script ; scripts + db 0 ; connections + dw SafariZoneWest_Object ; objects diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm new file mode 100755 index 00000000..886382ec --- /dev/null +++ b/data/mapHeaders/SafariZoneWestRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneWestRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneWestRestHouse_Blocks ; blocks + dw SafariZoneWestRestHouse_TextPointers ; texts + dw SafariZoneWestRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneWestRestHouse_Object ; objects diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm new file mode 100755 index 00000000..13239891 --- /dev/null +++ b/data/mapHeaders/SaffronCity.asm @@ -0,0 +1,12 @@ +SaffronCity_h: + db OVERWORLD ; tileset + db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) + dw SaffronCity_Blocks ; blocks + dw SaffronCity_TextPointers ; texts + dw SaffronCity_Script ; scripts + db NORTH | SOUTH | WEST | EAST ; connections + NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks + SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1 + WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks + EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks + dw SaffronCity_Object ; objects diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm new file mode 100755 index 00000000..6cbadb2c --- /dev/null +++ b/data/mapHeaders/SaffronGym.asm @@ -0,0 +1,8 @@ +SaffronGym_h: + db FACILITY ; tileset + db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) + dw SaffronGym_Blocks ; blocks + dw SaffronGym_TextPointers ; texts + dw SaffronGym_Script ; scripts + db 0 ; connections + dw SaffronGym_Object ; objects diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm new file mode 100755 index 00000000..abd537b6 --- /dev/null +++ b/data/mapHeaders/SaffronMart.asm @@ -0,0 +1,8 @@ +SaffronMart_h: + db MART ; tileset + db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) + dw SaffronMart_Blocks ; blocks + dw SaffronMart_TextPointers ; texts + dw SaffronMart_Script ; scripts + db 0 ; connections + dw SaffronMart_Object ; objects diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm new file mode 100755 index 00000000..5d6e21ae --- /dev/null +++ b/data/mapHeaders/SaffronPidgeyHouse.asm @@ -0,0 +1,8 @@ +SaffronPidgeyHouse_h: + db HOUSE ; tileset + db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) + dw SaffronPidgeyHouse_Blocks ; blocks + dw SaffronPidgeyHouse_TextPointers ; texts + dw SaffronPidgeyHouse_Script ; scripts + db 0 ; connections + dw SaffronPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm new file mode 100755 index 00000000..32f1ec71 --- /dev/null +++ b/data/mapHeaders/SaffronPokecenter.asm @@ -0,0 +1,8 @@ +SaffronPokecenter_h: + db POKECENTER ; tileset + db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) + dw SaffronPokecenter_Blocks ; blocks + dw SaffronPokecenter_TextPointers ; texts + dw SaffronPokecenter_Script ; scripts + db 0 ; connections + dw SaffronPokecenter_Object ; objects diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm new file mode 100755 index 00000000..f5260cda --- /dev/null +++ b/data/mapHeaders/SeafoamIslands1F.asm @@ -0,0 +1,8 @@ +SeafoamIslands1F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x) + dw SeafoamIslands1F_Blocks ; blocks + dw SeafoamIslands1F_TextPointers ; texts + dw SeafoamIslands1F_Script ; scripts + db 0 ; connections + dw SeafoamIslands1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..23116f74 --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB1F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB1F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB1F_Blocks ; blocks + dw SeafoamIslandsB1F_TextPointers ; texts + dw SeafoamIslandsB1F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..10d45dad --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB2F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB2F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB2F_Blocks ; blocks + dw SeafoamIslandsB2F_TextPointers ; texts + dw SeafoamIslandsB2F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB2F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..812d1121 --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB3F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB3F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB3F_Blocks ; blocks + dw SeafoamIslandsB3F_TextPointers ; texts + dw SeafoamIslandsB3F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB3F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..96c25e06 --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB4F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB4F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB4F_Blocks ; blocks + dw SeafoamIslandsB4F_TextPointers ; texts + dw SeafoamIslandsB4F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB4F_Object ; objects diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm new file mode 100755 index 00000000..ad040479 --- /dev/null +++ b/data/mapHeaders/SilphCo10F.asm @@ -0,0 +1,8 @@ +SilphCo10F_h: + db FACILITY ; tileset + db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) + dw SilphCo10F_Blocks ; blocks + dw SilphCo10F_TextPointers ; texts + dw SilphCo10F_Script ; scripts + db 0 ; connections + dw SilphCo10F_Object ; objects diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm new file mode 100755 index 00000000..08d6d650 --- /dev/null +++ b/data/mapHeaders/SilphCo11F.asm @@ -0,0 +1,8 @@ +SilphCo11F_h: + db INTERIOR ; tileset + db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) + dw SilphCo11F_Blocks ; blocks + dw SilphCo11F_TextPointers ; texts + dw SilphCo11F_Script ; scripts + db 0 ; connections + dw SilphCo11F_Object ; objects diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm new file mode 100755 index 00000000..45e6c5bf --- /dev/null +++ b/data/mapHeaders/SilphCo1F.asm @@ -0,0 +1,8 @@ +SilphCo1F_h: + db FACILITY ; tileset + db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) + dw SilphCo1F_Blocks ; blocks + dw SilphCo1F_TextPointers ; texts + dw SilphCo1F_Script ; scripts + db 0 ; connections + dw SilphCo1F_Object ; objects diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm new file mode 100755 index 00000000..69c2fb51 --- /dev/null +++ b/data/mapHeaders/SilphCo2F.asm @@ -0,0 +1,8 @@ +SilphCo2F_h: + db FACILITY ; tileset + db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) + dw SilphCo2F_Blocks ; blocks + dw SilphCo2F_TextPointers ; texts + dw SilphCo2F_Script ; scripts + db 0 ; connections + dw SilphCo2F_Object ; objects diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm new file mode 100755 index 00000000..6911a604 --- /dev/null +++ b/data/mapHeaders/SilphCo3F.asm @@ -0,0 +1,8 @@ +SilphCo3F_h: + db FACILITY ; tileset + db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) + dw SilphCo3F_Blocks ; blocks + dw SilphCo3F_TextPointers ; texts + dw SilphCo3F_Script ; scripts + db 0 ; connections + dw SilphCo3F_Object ; objects diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm new file mode 100755 index 00000000..591ddc07 --- /dev/null +++ b/data/mapHeaders/SilphCo4F.asm @@ -0,0 +1,8 @@ +SilphCo4F_h: + db FACILITY ; tileset + db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) + dw SilphCo4F_Blocks ; blocks + dw SilphCo4F_TextPointers ; texts + dw SilphCo4F_Script ; scripts + db 0 ; connections + dw SilphCo4F_Object ; objects diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm new file mode 100755 index 00000000..0303ceba --- /dev/null +++ b/data/mapHeaders/SilphCo5F.asm @@ -0,0 +1,8 @@ +SilphCo5F_h: + db FACILITY ; tileset + db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) + dw SilphCo5F_Blocks ; blocks + dw SilphCo5F_TextPointers ; texts + dw SilphCo5F_Script ; scripts + db 0 ; connections + dw SilphCo5F_Object ; objects diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm new file mode 100755 index 00000000..b26a7587 --- /dev/null +++ b/data/mapHeaders/SilphCo6F.asm @@ -0,0 +1,8 @@ +SilphCo6F_h: + db FACILITY ; tileset + db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) + dw SilphCo6F_Blocks ; blocks + dw SilphCo6F_TextPointers ; texts + dw SilphCo6F_Script ; scripts + db 0 ; connections + dw SilphCo6F_Object ; objects diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm new file mode 100755 index 00000000..5c6ea959 --- /dev/null +++ b/data/mapHeaders/SilphCo7F.asm @@ -0,0 +1,8 @@ +SilphCo7F_h: + db FACILITY ; tileset + db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) + dw SilphCo7F_Blocks ; blocks + dw SilphCo7F_TextPointers ; texts + dw SilphCo7F_Script ; scripts + db 0 ; connections + dw SilphCo7F_Object ; objects diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm new file mode 100755 index 00000000..e467298e --- /dev/null +++ b/data/mapHeaders/SilphCo8F.asm @@ -0,0 +1,8 @@ +SilphCo8F_h: + db FACILITY ; tileset + db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) + dw SilphCo8F_Blocks ; blocks + dw SilphCo8F_TextPointers ; texts + dw SilphCo8F_Script ; scripts + db 0 ; connections + dw SilphCo8F_Object ; objects diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm new file mode 100755 index 00000000..ec591e51 --- /dev/null +++ b/data/mapHeaders/SilphCo9F.asm @@ -0,0 +1,8 @@ +SilphCo9F_h: + db FACILITY ; tileset + db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) + dw SilphCo9F_Blocks ; blocks + dw SilphCo9F_TextPointers ; texts + dw SilphCo9F_Script ; scripts + db 0 ; connections + dw SilphCo9F_Object ; objects diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm new file mode 100755 index 00000000..0abe2810 --- /dev/null +++ b/data/mapHeaders/SilphCoElevator.asm @@ -0,0 +1,8 @@ +SilphCoElevator_h: + db LOBBY ; tileset + db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) + dw SilphCoElevator_Blocks ; blocks + dw SilphCoElevator_TextPointers ; texts + dw SilphCoElevator_Script ; scripts + db 0 ; connections + dw SilphCoElevator_Object ; objects diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm new file mode 100755 index 00000000..39981c35 --- /dev/null +++ b/data/mapHeaders/TradeCenter.asm @@ -0,0 +1,8 @@ +TradeCenter_h: + db CLUB ; tileset + db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) + dw TradeCenter_Blocks ; blocks + dw TradeCenter_TextPointers ; texts + dw TradeCenter_Script ; scripts + db 0 ; connections + dw TradeCenter_Object ; objects diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..5dd8cdf8 --- /dev/null +++ b/data/mapHeaders/UndergroundPathNorthSouth.asm @@ -0,0 +1,8 @@ +UndergroundPathNorthSouth_h: + db UNDERGROUND ; tileset + db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x) + dw UndergroundPathNorthSouth_Blocks ; blocks + dw UndergroundPathNorthSouth_TextPointers ; texts + dw UndergroundPathNorthSouth_Script ; scripts + db 0 ; connections + dw UndergroundPathNorthSouth_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm new file mode 100755 index 00000000..14c6aa4d --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute5.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute5_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute5_Blocks ; blocks + dw UndergroundPathRoute5_TextPointers ; texts + dw UndergroundPathRoute5_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute5_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm new file mode 100755 index 00000000..6aea459c --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute6.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute6_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute6_Blocks ; blocks + dw UndergroundPathRoute6_TextPointers ; texts + dw UndergroundPathRoute6_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute6_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm new file mode 100755 index 00000000..91495ea3 --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute7.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute7_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute7_Blocks ; blocks + dw UndergroundPathRoute7_TextPointers ; texts + dw UndergroundPathRoute7_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute7_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..9d3f4c62 --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute7Copy.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute7Copy_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute7Copy_Blocks ; blocks + dw UndergroundPathRoute7Copy_TextPointers ; texts + dw UndergroundPathRoute7Copy_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute7Copy_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm new file mode 100755 index 00000000..f34265b8 --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute8.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute8_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute8_Blocks ; blocks + dw UndergroundPathRoute8_TextPointers ; texts + dw UndergroundPathRoute8_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute8_Object ; objects diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm new file mode 100755 index 00000000..d084bd73 --- /dev/null +++ b/data/mapHeaders/UndergroundPathWestEast.asm @@ -0,0 +1,8 @@ +UndergroundPathWestEast_h: + db UNDERGROUND ; tileset + db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x) + dw UndergroundPathWestEast_Blocks ; blocks + dw UndergroundPathWestEast_TextPointers ; texts + dw UndergroundPathWestEast_Script ; scripts + db 0 ; connections + dw UndergroundPathWestEast_Object ; objects diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm new file mode 100755 index 00000000..6521ad89 --- /dev/null +++ b/data/mapHeaders/VermilionCity.asm @@ -0,0 +1,10 @@ +VermilionCity_h: + db OVERWORLD ; tileset + db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) + dw VermilionCity_Blocks ; blocks + dw VermilionCity_TextPointers ; texts + dw VermilionCity_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6_Blocks + EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11_Blocks + dw VermilionCity_Object ; objects diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm new file mode 100755 index 00000000..f7dca8e6 --- /dev/null +++ b/data/mapHeaders/VermilionDock.asm @@ -0,0 +1,8 @@ +VermilionDock_h: + db SHIP_PORT ; tileset + db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) + dw VermilionDock_Blocks ; blocks + dw VermilionDock_TextPointers ; texts + dw VermilionDock_Script ; scripts + db 0 ; connections + dw VermilionDock_Object ; objects diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm new file mode 100755 index 00000000..fe304a2e --- /dev/null +++ b/data/mapHeaders/VermilionGym.asm @@ -0,0 +1,8 @@ +VermilionGym_h: + db GYM ; tileset + db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) + dw VermilionGym_Blocks ; blocks + dw VermilionGym_TextPointers ; texts + dw VermilionGym_Script ; scripts + db 0 ; connections + dw VermilionGym_Object ; objects diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm new file mode 100755 index 00000000..67f24f59 --- /dev/null +++ b/data/mapHeaders/VermilionMart.asm @@ -0,0 +1,8 @@ +VermilionMart_h: + db MART ; tileset + db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) + dw VermilionMart_Blocks ; blocks + dw VermilionMart_TextPointers ; texts + dw VermilionMart_Script ; scripts + db 0 ; connections + dw VermilionMart_Object ; objects diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm new file mode 100755 index 00000000..f4b69110 --- /dev/null +++ b/data/mapHeaders/VermilionOldRodHouse.asm @@ -0,0 +1,8 @@ +VermilionOldRodHouse_h: + db HOUSE ; tileset + db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x) + dw VermilionOldRodHouse_Blocks ; blocks + dw VermilionOldRodHouse_TextPointers ; texts + dw VermilionOldRodHouse_Script ; scripts + db 0 ; connections + dw VermilionOldRodHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm new file mode 100755 index 00000000..af052fa6 --- /dev/null +++ b/data/mapHeaders/VermilionPidgeyHouse.asm @@ -0,0 +1,8 @@ +VermilionPidgeyHouse_h: + db HOUSE ; tileset + db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) + dw VermilionPidgeyHouse_Blocks ; blocks + dw VermilionPidgeyHouse_TextPointers ; texts + dw VermilionPidgeyHouse_Script ; scripts + db 0 ; connections + dw VermilionPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm new file mode 100755 index 00000000..3d4c23ec --- /dev/null +++ b/data/mapHeaders/VermilionPokecenter.asm @@ -0,0 +1,8 @@ +VermilionPokecenter_h: + db POKECENTER ; tileset + db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) + dw VermilionPokecenter_Blocks ; blocks + dw VermilionPokecenter_TextPointers ; texts + dw VermilionPokecenter_Script ; scripts + db 0 ; connections + dw VermilionPokecenter_Object ; objects diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm new file mode 100755 index 00000000..21d30049 --- /dev/null +++ b/data/mapHeaders/VermilionTradeHouse.asm @@ -0,0 +1,8 @@ +VermilionTradeHouse_h: + db HOUSE ; tileset + db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x) + dw VermilionTradeHouse_Blocks ; blocks + dw VermilionTradeHouse_TextPointers ; texts + dw VermilionTradeHouse_Script ; scripts + db 0 ; connections + dw VermilionTradeHouse_Object ; objects diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm new file mode 100755 index 00000000..3508d782 --- /dev/null +++ b/data/mapHeaders/VictoryRoad1F.asm @@ -0,0 +1,8 @@ +VictoryRoad1F_h: + db CAVERN ; tileset + db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x) + dw VictoryRoad1F_Blocks ; blocks + dw VictoryRoad1F_TextPointers ; texts + dw VictoryRoad1F_Script ; scripts + db 0 ; connections + dw VictoryRoad1F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm new file mode 100755 index 00000000..31693c1c --- /dev/null +++ b/data/mapHeaders/VictoryRoad2F.asm @@ -0,0 +1,8 @@ +VictoryRoad2F_h: + db CAVERN ; tileset + db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x) + dw VictoryRoad2F_Blocks ; blocks + dw VictoryRoad2F_TextPointers ; texts + dw VictoryRoad2F_Script ; scripts + db 0 ; connections + dw VictoryRoad2F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm new file mode 100755 index 00000000..3f5e21d2 --- /dev/null +++ b/data/mapHeaders/VictoryRoad3F.asm @@ -0,0 +1,8 @@ +VictoryRoad3F_h: + db CAVERN ; tileset + db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x) + dw VictoryRoad3F_Blocks ; blocks + dw VictoryRoad3F_TextPointers ; texts + dw VictoryRoad3F_Script ; scripts + db 0 ; connections + dw VictoryRoad3F_Object ; objects diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm new file mode 100755 index 00000000..09f7b9f4 --- /dev/null +++ b/data/mapHeaders/ViridianCity.asm @@ -0,0 +1,11 @@ +ViridianCity_h: + db OVERWORLD ; tileset + db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) + dw ViridianCity_Blocks ; blocks + dw ViridianCity_TextPointers ; texts + dw ViridianCity_Script ; scripts + db NORTH | SOUTH | WEST ; connections + NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2_Blocks + SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1_Blocks, 1 + WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22_Blocks + dw ViridianCity_Object ; objects diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm new file mode 100755 index 00000000..a8df3e6e --- /dev/null +++ b/data/mapHeaders/ViridianForest.asm @@ -0,0 +1,8 @@ +ViridianForest_h: + db FOREST ; tileset + db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) + dw ViridianForest_Blocks ; blocks + dw ViridianForest_TextPointers ; texts + dw ViridianForest_Script ; scripts + db 0 ; connections + dw ViridianForest_Object ; objects diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm new file mode 100755 index 00000000..48535977 --- /dev/null +++ b/data/mapHeaders/ViridianForestNorthGate.asm @@ -0,0 +1,8 @@ +ViridianForestNorthGate_h: + db FOREST_GATE ; tileset + db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x) + dw ViridianForestNorthGate_Blocks ; blocks + dw ViridianForestNorthGate_TextPointers ; texts + dw ViridianForestNorthGate_Script ; scripts + db 0 ; connections + dw ViridianForestNorthGate_Object ; objects diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm new file mode 100755 index 00000000..b134ebea --- /dev/null +++ b/data/mapHeaders/ViridianForestSouthGate.asm @@ -0,0 +1,8 @@ +ViridianForestSouthGate_h: + db FOREST_GATE ; tileset + db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x) + dw ViridianForestSouthGate_Blocks ; blocks + dw ViridianForestSouthGate_TextPointers ; texts + dw ViridianForestSouthGate_Script ; scripts + db 0 ; connections + dw ViridianForestSouthGate_Object ; objects diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm new file mode 100755 index 00000000..9b27845c --- /dev/null +++ b/data/mapHeaders/ViridianGym.asm @@ -0,0 +1,8 @@ +ViridianGym_h: + db GYM ; tileset + db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) + dw ViridianGym_Blocks ; blocks + dw ViridianGym_TextPointers ; texts + dw ViridianGym_Script ; scripts + db 0 ; connections + dw ViridianGym_Object ; objects diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm new file mode 100755 index 00000000..063f3327 --- /dev/null +++ b/data/mapHeaders/ViridianMart.asm @@ -0,0 +1,8 @@ +ViridianMart_h: + db MART ; tileset + db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) + dw ViridianMart_Blocks ; blocks + dw ViridianMart_TextPointers ; texts + dw ViridianMart_Script ; scripts + db 0 ; connections + dw ViridianMart_Object ; objects diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm new file mode 100755 index 00000000..b6a00392 --- /dev/null +++ b/data/mapHeaders/ViridianNicknameHouse.asm @@ -0,0 +1,8 @@ +ViridianNicknameHouse_h: + db HOUSE ; tileset + db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x) + dw ViridianNicknameHouse_Blocks ; blocks + dw ViridianNicknameHouse_TextPointers ; texts + dw ViridianNicknameHouse_Script ; scripts + db 0 ; connections + dw ViridianNicknameHouse_Object ; objects diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm new file mode 100755 index 00000000..25c569d8 --- /dev/null +++ b/data/mapHeaders/ViridianPokecenter.asm @@ -0,0 +1,8 @@ +ViridianPokecenter_h: + db POKECENTER ; tileset + db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) + dw ViridianPokecenter_Blocks ; blocks + dw ViridianPokecenter_TextPointers ; texts + dw ViridianPokecenter_Script ; scripts + db 0 ; connections + dw ViridianPokecenter_Object ; objects diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm new file mode 100755 index 00000000..15e5c88f --- /dev/null +++ b/data/mapHeaders/ViridianSchoolHouse.asm @@ -0,0 +1,8 @@ +ViridianSchoolHouse_h: + db HOUSE ; tileset + db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x) + dw ViridianSchoolHouse_Blocks ; blocks + dw ViridianSchoolHouse_TextPointers ; texts + dw ViridianSchoolHouse_Script ; scripts + db 0 ; connections + dw ViridianSchoolHouse_Object ; objects diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm new file mode 100755 index 00000000..128e357a --- /dev/null +++ b/data/mapHeaders/WardensHouse.asm @@ -0,0 +1,8 @@ +WardensHouse_h: + db LAB ; tileset + db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x) + dw WardensHouse_Blocks ; blocks + dw WardensHouse_TextPointers ; texts + dw WardensHouse_Script ; scripts + db 0 ; connections + dw WardensHouse_Object ; objects diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm deleted file mode 100755 index 155f07db..00000000 --- a/data/mapHeaders/agatha.asm +++ /dev/null @@ -1,6 +0,0 @@ -Agatha_h: - db CEMETERY ; tileset - db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) - dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts - db 0 ; connections - dw AgathaObject ; objects diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm deleted file mode 100755 index 1524f59b..00000000 --- a/data/mapHeaders/bikeshop.asm +++ /dev/null @@ -1,6 +0,0 @@ -BikeShop_h: - db CLUB ; tileset - db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) - dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts - db 0 ; connections - dw BikeShopObject ; objects diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm deleted file mode 100755 index 832affe9..00000000 --- a/data/mapHeaders/billshouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -BillsHouse_h: - db INTERIOR ; tileset - db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) - dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts - db 0 ; connections - dw BillsHouseObject ; objects diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm deleted file mode 100755 index 4b5c45e7..00000000 --- a/data/mapHeaders/blueshouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -BluesHouse_h: - db HOUSE ; tileset - db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) - dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript ; blocks, texts, scripts - db 0 ; connections - dw BluesHouseObject ; objects diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm deleted file mode 100755 index 921fa80c..00000000 --- a/data/mapHeaders/bruno.asm +++ /dev/null @@ -1,6 +0,0 @@ -Bruno_h: - db GYM ; tileset - db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) - dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts - db 0 ; connections - dw BrunoObject ; objects diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm deleted file mode 100755 index 7f94cad5..00000000 --- a/data/mapHeaders/celadoncity.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_h: - db OVERWORLD ; tileset - db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) - dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16Blocks - EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7Blocks, 1 - dw CeladonCityObject ; objects diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm deleted file mode 100755 index f608af16..00000000 --- a/data/mapHeaders/celadondiner.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonDiner_h: - db LOBBY ; tileset - db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) - dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonDinerObject ; objects diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm deleted file mode 100755 index 76403d92..00000000 --- a/data/mapHeaders/celadongamecorner.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonGameCorner_h: - db LOBBY ; tileset - db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) - dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonGameCornerObject ; objects diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm deleted file mode 100755 index 78e486f3..00000000 --- a/data/mapHeaders/celadongym.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonGym_h: - db GYM ; tileset - db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) - dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonGymObject ; objects diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm deleted file mode 100755 index ddc27cd6..00000000 --- a/data/mapHeaders/celadonhotel.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonHotel_h: - db POKECENTER ; tileset - db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) - dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonHotelObject ; objects diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm deleted file mode 100755 index d6d27a64..00000000 --- a/data/mapHeaders/celadonhouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonHouse_h: - db MANSION ; tileset - db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) - dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonHouseObject ; objects diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm deleted file mode 100755 index da773943..00000000 --- a/data/mapHeaders/celadonmansion1.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion1_h: - db MANSION ; tileset - db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x) - dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion1Object ; objects diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm deleted file mode 100755 index 92970148..00000000 --- a/data/mapHeaders/celadonmansion2.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion2_h: - db MANSION ; tileset - db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x) - dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion2Object ; objects diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm deleted file mode 100755 index 95c93bd7..00000000 --- a/data/mapHeaders/celadonmansion3.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion3_h: - db MANSION ; tileset - db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x) - dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion3Object ; objects diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm deleted file mode 100755 index 6b4e833a..00000000 --- a/data/mapHeaders/celadonmansion4.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion4_h: - db MANSION ; tileset - db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x) - dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion4Object ; objects diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm deleted file mode 100755 index 7cc16d24..00000000 --- a/data/mapHeaders/celadonmansion5.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion5_h: - db HOUSE ; tileset - db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x) - dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion5Object ; objects diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm deleted file mode 100755 index 12b013a4..00000000 --- a/data/mapHeaders/celadonmart1.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart1_h: - db LOBBY ; tileset - db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x) - dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart1Object ; objects diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm deleted file mode 100755 index 210f85af..00000000 --- a/data/mapHeaders/celadonmart2.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart2_h: - db LOBBY ; tileset - db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x) - dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart2Object ; objects diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm deleted file mode 100755 index 511b1405..00000000 --- a/data/mapHeaders/celadonmart3.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart3_h: - db LOBBY ; tileset - db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x) - dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart3Object ; objects diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm deleted file mode 100755 index fd34406d..00000000 --- a/data/mapHeaders/celadonmart4.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart4_h: - db LOBBY ; tileset - db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x) - dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart4Object ; objects diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm deleted file mode 100755 index 66e70f28..00000000 --- a/data/mapHeaders/celadonmart5.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart5_h: - db LOBBY ; tileset - db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) - dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart5Object ; objects diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm deleted file mode 100755 index 149e5b0f..00000000 --- a/data/mapHeaders/celadonmartelevator.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMartElevator_h: - db LOBBY ; tileset - db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) - dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonMartElevatorObject ; objects diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm deleted file mode 100755 index 2073afd2..00000000 --- a/data/mapHeaders/celadonmartroof.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMartRoof_h: - db LOBBY ; tileset - db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) - dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonMartRoofObject ; objects diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm deleted file mode 100755 index bfeb76b7..00000000 --- a/data/mapHeaders/celadonpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonPokecenter_h: - db POKECENTER ; tileset - db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) - dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonPokecenterObject ; objects diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm deleted file mode 100755 index 83161b30..00000000 --- a/data/mapHeaders/celadonprizeroom.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonPrizeRoom_h: - db LOBBY ; tileset - db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x) - dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonPrizeRoomObject ; objects diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm deleted file mode 100755 index be6dc5b2..00000000 --- a/data/mapHeaders/ceruleancity.asm +++ /dev/null @@ -1,10 +0,0 @@ -CeruleanCity_h: - db OVERWORLD ; tileset - db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) - dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24Blocks - SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5Blocks, 1 - WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4Blocks - EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9Blocks - dw CeruleanCityObject ; objects diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm deleted file mode 100755 index 3c4f8052..00000000 --- a/data/mapHeaders/ceruleangym.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanGym_h: - db GYM ; tileset - db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) - dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanGymObject ; objects diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm deleted file mode 100755 index fa12c61c..00000000 --- a/data/mapHeaders/ceruleanhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanHouse1_h: - db HOUSE ; tileset - db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x) - dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw CeruleanHouse1Object ; objects diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm deleted file mode 100755 index 78f6d821..00000000 --- a/data/mapHeaders/ceruleanhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanHouse2_h: - db SHIP ; tileset - db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x) - dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw CeruleanHouse2Object ; objects diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm deleted file mode 100755 index 53eaa581..00000000 --- a/data/mapHeaders/ceruleanhousetrashed.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanHouseTrashed_h: - db HOUSE ; tileset - db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanHouseTrashedObject ; objects diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm deleted file mode 100755 index 12bafa98..00000000 --- a/data/mapHeaders/ceruleanmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanMart_h: - db MART ; tileset - db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) - dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanMartObject ; objects diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm deleted file mode 100755 index 41fcdd90..00000000 --- a/data/mapHeaders/ceruleanpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanPokecenter_h: - db POKECENTER ; tileset - db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) - dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanPokecenterObject ; objects diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm deleted file mode 100755 index 2cb7dc74..00000000 --- a/data/mapHeaders/cinnabargym.asm +++ /dev/null @@ -1,6 +0,0 @@ -CinnabarGym_h: - db FACILITY ; tileset - db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) - dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts - db 0 ; connections - dw CinnabarGymObject ; objects diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm deleted file mode 100755 index 6ae6424d..00000000 --- a/data/mapHeaders/cinnabarisland.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_h: - db OVERWORLD ; tileset - db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) - dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21Blocks - EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20Blocks - dw CinnabarIslandObject ; objects diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm deleted file mode 100755 index e2c8437d..00000000 --- a/data/mapHeaders/cinnabarmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -CinnabarMart_h: - db MART ; tileset - db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) - dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts - db 0 ; connections - dw CinnabarMartObject ; objects diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm deleted file mode 100755 index a11a02f3..00000000 --- a/data/mapHeaders/cinnabarpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -CinnabarPokecenter_h: - db POKECENTER ; tileset - db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) - dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw CinnabarPokecenterObject ; objects diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm deleted file mode 100755 index 13d9f0c4..00000000 --- a/data/mapHeaders/colosseum.asm +++ /dev/null @@ -1,6 +0,0 @@ -Colosseum_h: - db CLUB ; tileset - db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) - dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts - db 0 ; connections - dw ColosseumObject ; objects diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm deleted file mode 100755 index 7489eed7..00000000 --- a/data/mapHeaders/copycatshouse1f.asm +++ /dev/null @@ -1,6 +0,0 @@ -CopycatsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts - db 0 ; connections - dw CopycatsHouse1FObject ; objects diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm deleted file mode 100755 index 7566143f..00000000 --- a/data/mapHeaders/copycatshouse2f.asm +++ /dev/null @@ -1,6 +0,0 @@ -CopycatsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts - db 0 ; connections - dw CopycatsHouse2FObject ; objects diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm deleted file mode 100755 index b61a00f2..00000000 --- a/data/mapHeaders/daycarem.asm +++ /dev/null @@ -1,6 +0,0 @@ -DayCareM_h: - db HOUSE ; tileset - db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x) - dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts - db 0 ; connections - dw DayCareMObject ; objects diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm deleted file mode 100755 index 29c1db3e..00000000 --- a/data/mapHeaders/diglettscave.asm +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCave_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) - dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts - db 0 ; connections - dw DiglettsCaveObject ; objects diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm deleted file mode 100755 index bb3817ea..00000000 --- a/data/mapHeaders/diglettscaveroute11.asm +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCaveEntranceRoute11_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x) - dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts - db 0 ; connections - dw DiglettsCaveEntranceRoute11Object ; objects diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm deleted file mode 100755 index 505fbbff..00000000 --- a/data/mapHeaders/diglettscaveroute2.asm +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCaveRoute2_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x) - dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts - db 0 ; connections - dw DiglettsCaveRoute2Object ; objects diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm deleted file mode 100755 index 6b70e935..00000000 --- a/data/mapHeaders/fanclub.asm +++ /dev/null @@ -1,6 +0,0 @@ -FanClub_h: - db INTERIOR ; tileset - db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) - dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts - db 0 ; connections - dw FanClubObject ; objects diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm deleted file mode 100755 index 37f9437c..00000000 --- a/data/mapHeaders/fightingdojo.asm +++ /dev/null @@ -1,6 +0,0 @@ -FightingDojo_h: - db DOJO ; tileset - db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) - dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts - db 0 ; connections - dw FightingDojoObject ; objects diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm deleted file mode 100755 index 2bfd2793..00000000 --- a/data/mapHeaders/fuchsiacity.asm +++ /dev/null @@ -1,9 +0,0 @@ -FuchsiaCity_h: - db OVERWORLD ; tileset - db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) - dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts - db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19Blocks - WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15Blocks - dw FuchsiaCityObject ; objects diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm deleted file mode 100755 index 9bad3a7f..00000000 --- a/data/mapHeaders/fuchsiagym.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaGym_h: - db GYM ; tileset - db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) - dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaGymObject ; objects diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm deleted file mode 100755 index 7de94ad5..00000000 --- a/data/mapHeaders/fuchsiahouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaHouse1_h: - db HOUSE ; tileset - db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x) - dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaHouse1Object ; objects diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm deleted file mode 100755 index 7032f549..00000000 --- a/data/mapHeaders/fuchsiahouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaHouse2_h: - db LAB ; tileset - db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x) - dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaHouse2Object ; objects diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm deleted file mode 100755 index 01917145..00000000 --- a/data/mapHeaders/fuchsiahouse3.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaHouse3_h: - db SHIP ; tileset - db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x) - dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaHouse3Object ; objects diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm deleted file mode 100755 index c1445bc8..00000000 --- a/data/mapHeaders/fuchsiamart.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaMart_h: - db MART ; tileset - db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) - dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaMartObject ; objects diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm deleted file mode 100755 index e7f31770..00000000 --- a/data/mapHeaders/fuchsiameetingroom.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaMeetingRoom_h: - db LAB ; tileset - db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) - dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaMeetingRoomObject ; objects diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm deleted file mode 100755 index 4625c980..00000000 --- a/data/mapHeaders/fuchsiapokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaPokecenter_h: - db POKECENTER ; tileset - db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) - dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaPokecenterObject ; objects diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm deleted file mode 100755 index a9cf381b..00000000 --- a/data/mapHeaders/gary.asm +++ /dev/null @@ -1,6 +0,0 @@ -Gary_h: - db GYM ; tileset - db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) - dw GaryBlocks, GaryTextPointers, GaryScript ; blocks, texts, scripts - db $0 ; connections - dw GaryObject ; objects diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm deleted file mode 100755 index 9c06c434..00000000 --- a/data/mapHeaders/halloffameroom.asm +++ /dev/null @@ -1,6 +0,0 @@ -HallofFameRoom_h: - db GYM ; tileset - db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) - dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts - db 0 ; connections - dw HallofFameRoomObject ; objects diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm deleted file mode 100755 index deaf5041..00000000 --- a/data/mapHeaders/indigoplateau.asm +++ /dev/null @@ -1,7 +0,0 @@ -IndigoPlateau_h: - db PLATEAU ; tileset - db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) - dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts - db SOUTH ; connections - SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23Blocks - dw IndigoPlateauObject ; objects diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm deleted file mode 100755 index 67153dbc..00000000 --- a/data/mapHeaders/indigoplateaulobby.asm +++ /dev/null @@ -1,6 +0,0 @@ -IndigoPlateauLobby_h: - db MART ; tileset - db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) - dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts - db 0 ; connections - dw IndigoPlateauLobbyObject ; objects diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm deleted file mode 100755 index d4d04e3d..00000000 --- a/data/mapHeaders/lab1.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab1_h: - db LAB ; tileset - db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x) - dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts - db 0 ; connections - dw Lab1Object ; objects diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm deleted file mode 100755 index 3d264741..00000000 --- a/data/mapHeaders/lab2.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab2_h: - db LAB ; tileset - db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x) - dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts - db 0 ; connections - dw Lab2Object ; objects diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm deleted file mode 100755 index 0f401f65..00000000 --- a/data/mapHeaders/lab3.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab3_h: - db LAB ; tileset - db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x) - dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts - db 0 ; connections - dw Lab3Object ; objects diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm deleted file mode 100755 index 10ded376..00000000 --- a/data/mapHeaders/lab4.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab4_h: - db LAB ; tileset - db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x) - dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts - db 0 ; connections - dw Lab4Object ; objects diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm deleted file mode 100755 index d9a1ae75..00000000 --- a/data/mapHeaders/lance.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lance_h: - db DOJO ; tileset - db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) - dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts - db 0 ; connections - dw LanceObject ; objects diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm deleted file mode 100755 index 362e4359..00000000 --- a/data/mapHeaders/lavenderhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderHouse1_h: - db HOUSE ; tileset - db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x) - dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw LavenderHouse1Object ; objects diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm deleted file mode 100755 index 971e1e8d..00000000 --- a/data/mapHeaders/lavenderhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderHouse2_h: - db HOUSE ; tileset - db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x) - dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw LavenderHouse2Object ; objects diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm deleted file mode 100755 index 13cb06c5..00000000 --- a/data/mapHeaders/lavendermart.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderMart_h: - db MART ; tileset - db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) - dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts - db 0 ; connections - dw LavenderMartObject ; objects diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm deleted file mode 100755 index ce9650f1..00000000 --- a/data/mapHeaders/lavenderpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderPokecenter_h: - db POKECENTER ; tileset - db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) - dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw LavenderPokecenterObject ; objects diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm deleted file mode 100755 index 74bbd7a8..00000000 --- a/data/mapHeaders/lavendertown.asm +++ /dev/null @@ -1,9 +0,0 @@ -LavenderTown_h: - db OVERWORLD ; tileset - db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) - dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10Blocks - SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12Blocks, 1 - WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8Blocks - dw LavenderTownObject ; objects diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm deleted file mode 100755 index 82efe164..00000000 --- a/data/mapHeaders/lorelei.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lorelei_h: - db GYM ; tileset - db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) - dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts - db 0 ; connections - dw LoreleiObject ; objects diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm deleted file mode 100755 index 8b326941..00000000 --- a/data/mapHeaders/mansion1.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion1_h: - db FACILITY ; tileset - db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x) - dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion1Object ; objects diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm deleted file mode 100755 index fba95ed8..00000000 --- a/data/mapHeaders/mansion2.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion2_h: - db FACILITY ; tileset - db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x) - dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion2Object ; objects diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm deleted file mode 100755 index 933d4c6f..00000000 --- a/data/mapHeaders/mansion3.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion3_h: - db FACILITY ; tileset - db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x) - dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion3Object ; objects diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm deleted file mode 100755 index 806b66b6..00000000 --- a/data/mapHeaders/mansion4.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion4_h: - db FACILITY ; tileset - db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x) - dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion4Object ; objects diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm deleted file mode 100755 index 4fbd8de0..00000000 --- a/data/mapHeaders/mtmoon1.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoon1_h: - db CAVERN ; tileset - db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x) - dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts - db 0 ; connections - dw MtMoon1Object ; objects diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm deleted file mode 100755 index 81b0b365..00000000 --- a/data/mapHeaders/mtmoon2.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoon2_h: - db CAVERN ; tileset - db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x) - dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts - db 0 ; connections - dw MtMoon2Object ; objects diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm deleted file mode 100755 index f89d77cb..00000000 --- a/data/mapHeaders/mtmoon3.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoon3_h: - db CAVERN ; tileset - db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x) - dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts - db 0 ; connections - dw MtMoon3Object ; objects diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm deleted file mode 100755 index 0cb1791b..00000000 --- a/data/mapHeaders/mtmoonpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoonPokecenter_h: - db POKECENTER ; tileset - db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) - dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw MtMoonPokecenterObject ; objects diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm deleted file mode 100755 index eca97706..00000000 --- a/data/mapHeaders/museum1f.asm +++ /dev/null @@ -1,6 +0,0 @@ -Museum1F_h: - db MUSEUM ; tileset - db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) - dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts - db 0 ; connections - dw Museum1FObject ; objects diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm deleted file mode 100755 index 973f5045..00000000 --- a/data/mapHeaders/museum2f.asm +++ /dev/null @@ -1,6 +0,0 @@ -Museum2F_h: - db MUSEUM ; tileset - db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) - dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts - db 0 ; connections - dw Museum2FObject ; objects diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm deleted file mode 100755 index 01a488a7..00000000 --- a/data/mapHeaders/namerater.asm +++ /dev/null @@ -1,6 +0,0 @@ -NameRater_h: - db HOUSE ; tileset - db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) - dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts - db 0 ; connections - dw NameRaterObject ; objects diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm deleted file mode 100755 index 94608ef2..00000000 --- a/data/mapHeaders/oakslab.asm +++ /dev/null @@ -1,6 +0,0 @@ -OaksLab_h: - db DOJO ; tileset - db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) - dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts - db 0 ; connections - dw OaksLabObject ; objects diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm deleted file mode 100755 index 8b8137ce..00000000 --- a/data/mapHeaders/pallettown.asm +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_h: - db OVERWORLD ; tileset - db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) - dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks - SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1 - dw PalletTownObject ; objects diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm deleted file mode 100755 index 88faaacc..00000000 --- a/data/mapHeaders/pewtercity.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_h: - db OVERWORLD ; tileset - db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) - dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks - EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks - dw PewterCityObject ; objects diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm deleted file mode 100755 index a335ab50..00000000 --- a/data/mapHeaders/pewtergym.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterGym_h: - db GYM ; tileset - db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) - dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts - db 0 ; connections - dw PewterGymObject ; objects diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm deleted file mode 100755 index 90b69d00..00000000 --- a/data/mapHeaders/pewterhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterHouse1_h: - db HOUSE ; tileset - db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x) - dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw PewterHouse1Object ; objects diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm deleted file mode 100755 index 9baa3d41..00000000 --- a/data/mapHeaders/pewterhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterHouse2_h: - db HOUSE ; tileset - db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x) - dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw PewterHouse2Object ; objects diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm deleted file mode 100755 index 00b91247..00000000 --- a/data/mapHeaders/pewtermart.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterMart_h: - db MART ; tileset - db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) - dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts - db 0 ; connections - dw PewterMartObject ; objects diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm deleted file mode 100755 index 29851a96..00000000 --- a/data/mapHeaders/pewterpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterPokecenter_h: - db POKECENTER ; tileset - db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) - dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw PewterPokecenterObject ; objects diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm deleted file mode 100755 index 5ea76d21..00000000 --- a/data/mapHeaders/pokemontower1.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower1_h: - db CEMETERY ; tileset - db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x) - dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower1Object ; objects diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm deleted file mode 100755 index 3da497e4..00000000 --- a/data/mapHeaders/pokemontower2.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower2_h: - db CEMETERY ; tileset - db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x) - dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower2Object ; objects diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm deleted file mode 100755 index bec35122..00000000 --- a/data/mapHeaders/pokemontower3.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower3_h: - db CEMETERY ; tileset - db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x) - dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower3Object ; objects diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm deleted file mode 100755 index 4d96c709..00000000 --- a/data/mapHeaders/pokemontower4.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower4_h: - db CEMETERY ; tileset - db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x) - dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower4Object ; objects diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm deleted file mode 100755 index f91911b0..00000000 --- a/data/mapHeaders/pokemontower5.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower5_h: - db CEMETERY ; tileset - db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x) - dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower5Object ; objects diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm deleted file mode 100755 index 10a54cd5..00000000 --- a/data/mapHeaders/pokemontower6.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower6_h: - db CEMETERY ; tileset - db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x) - dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower6Object ; objects diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm deleted file mode 100755 index b69fd01e..00000000 --- a/data/mapHeaders/pokemontower7.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower7_h: - db CEMETERY ; tileset - db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x) - dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower7Object ; objects diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm deleted file mode 100755 index 3b13491d..00000000 --- a/data/mapHeaders/powerplant.asm +++ /dev/null @@ -1,6 +0,0 @@ -PowerPlant_h: - db FACILITY ; tileset - db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) - dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts - db 0 ; connections - dw PowerPlantObject ; objects diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm deleted file mode 100755 index a6f5783f..00000000 --- a/data/mapHeaders/redshouse1f.asm +++ /dev/null @@ -1,6 +0,0 @@ -RedsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript ; blocks, texts, scripts - db 0 ; connections - dw RedsHouse1FObject ; objects diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm deleted file mode 100755 index 89193e9e..00000000 --- a/data/mapHeaders/redshouse2f.asm +++ /dev/null @@ -1,6 +0,0 @@ -RedsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript ; blocks, texts, scripts - db $00 ; connections - dw RedsHouse2FObject ; objects diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm deleted file mode 100755 index bbe721ab..00000000 --- a/data/mapHeaders/rockethideout1.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout1_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x) - dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout1Object ; objects diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm deleted file mode 100755 index cc2ed948..00000000 --- a/data/mapHeaders/rockethideout2.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout2_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x) - dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout2Object ; objects diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm deleted file mode 100755 index 12e9aa1e..00000000 --- a/data/mapHeaders/rockethideout3.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout3_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x) - dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout3Object ; objects diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm deleted file mode 100755 index 0b858dc9..00000000 --- a/data/mapHeaders/rockethideout4.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout4_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x) - dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout4Object ; objects diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm deleted file mode 100755 index b4269444..00000000 --- a/data/mapHeaders/rockethideoutelevator.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideoutElevator_h: - db LOBBY ; tileset - db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) - dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts - db 0 ; connections - dw RocketHideoutElevatorObject ; objects diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm deleted file mode 100755 index 14fc41b1..00000000 --- a/data/mapHeaders/rocktunnel1.asm +++ /dev/null @@ -1,6 +0,0 @@ -RockTunnel1_h: - db CAVERN ; tileset - db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x) - dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts - db 0 ; connections - dw RockTunnel1Object ; objects diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm deleted file mode 100755 index c4184b8d..00000000 --- a/data/mapHeaders/rocktunnel2.asm +++ /dev/null @@ -1,6 +0,0 @@ -RockTunnel2_h: - db CAVERN ; tileset - db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x) - dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts - db 0 ; connections - dw RockTunnel2Object ; objects diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm deleted file mode 100755 index 977dd1cf..00000000 --- a/data/mapHeaders/rocktunnelpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -RockTunnelPokecenter_h: - db POKECENTER ; tileset - db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) - dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw RockTunnelPokecenterObject ; objects diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm deleted file mode 100755 index 5f6a858e..00000000 --- a/data/mapHeaders/route1.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route1_h: - db OVERWORLD ; tileset - db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) - dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks - SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTownBlocks, 1 - dw Route1Object ; objects diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm deleted file mode 100755 index 7ee588cf..00000000 --- a/data/mapHeaders/route10.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route10_h: - db OVERWORLD ; tileset - db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) - dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts - db SOUTH | WEST ; connections - SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTownBlocks - WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9Blocks - dw Route10Object ; objects diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm deleted file mode 100755 index 04ae8f24..00000000 --- a/data/mapHeaders/route11.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route11_h: - db OVERWORLD ; tileset - db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) - dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCityBlocks - EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12Blocks, 1 - dw Route11Object ; objects diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm deleted file mode 100755 index 22f90adb..00000000 --- a/data/mapHeaders/route11gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route11Gate_h: - db GATE ; tileset - db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) - dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route11GateObject ; objects diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm deleted file mode 100755 index d3f4a3e1..00000000 --- a/data/mapHeaders/route11gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route11GateUpstairs_h: - db GATE ; tileset - db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) - dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route11GateUpstairsObject ; objects diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm deleted file mode 100755 index b11e0128..00000000 --- a/data/mapHeaders/route12.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route12_h: - db OVERWORLD ; tileset - db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) - dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTownBlocks - SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13Blocks - WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11Blocks - dw Route12Object ; objects diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm deleted file mode 100755 index a870a191..00000000 --- a/data/mapHeaders/route12gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route12Gate_h: - db GATE ; tileset - db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) - dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route12GateObject ; objects diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm deleted file mode 100755 index 767cb764..00000000 --- a/data/mapHeaders/route12gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route12GateUpstairs_h: - db GATE ; tileset - db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) - dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route12GateUpstairsObject ; objects diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm deleted file mode 100755 index 48428b10..00000000 --- a/data/mapHeaders/route12house.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route12House_h: - db HOUSE ; tileset - db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x) - dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts - db 0 ; connections - dw Route12HouseObject ; objects diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm deleted file mode 100755 index 53a88633..00000000 --- a/data/mapHeaders/route13.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route13_h: - db OVERWORLD ; tileset - db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) - dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12Blocks - WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14Blocks - dw Route13Object ; objects diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm deleted file mode 100755 index f860d332..00000000 --- a/data/mapHeaders/route14.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route14_h: - db OVERWORLD ; tileset - db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) - dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15Blocks - EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13Blocks - dw Route14Object ; objects diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm deleted file mode 100755 index 48d5ff20..00000000 --- a/data/mapHeaders/route15.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route15_h: - db OVERWORLD ; tileset - db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) - dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks - EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14Blocks - dw Route15Object ; objects diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm deleted file mode 100755 index ae71bc35..00000000 --- a/data/mapHeaders/route15gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route15Gate_h: - db GATE ; tileset - db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) - dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route15GateObject ; objects diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm deleted file mode 100755 index 02996057..00000000 --- a/data/mapHeaders/route15gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route15GateUpstairs_h: - db GATE ; tileset - db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) - dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route15GateUpstairsObject ; objects diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm deleted file mode 100755 index eee71ba2..00000000 --- a/data/mapHeaders/route16.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16_h: - db OVERWORLD ; tileset - db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) - dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17Blocks - EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCityBlocks, 1 - dw Route16Object ; objects diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm deleted file mode 100755 index 32d0729b..00000000 --- a/data/mapHeaders/route16gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route16Gate_h: - db GATE ; tileset - db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) - dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route16GateObject ; objects diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm deleted file mode 100755 index 32c32433..00000000 --- a/data/mapHeaders/route16gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route16GateUpstairs_h: - db GATE ; tileset - db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) - dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route16GateUpstairsObject ; objects diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm deleted file mode 100755 index 2b633873..00000000 --- a/data/mapHeaders/route16house.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route16House_h: - db HOUSE ; tileset - db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x) - dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts - db 0 ; connections - dw Route16HouseObject ; objects diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm deleted file mode 100755 index 82a5d0f4..00000000 --- a/data/mapHeaders/route17.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route17_h: - db OVERWORLD ; tileset - db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) - dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16Blocks - SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18Blocks, 1 - dw Route17Object ; objects diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm deleted file mode 100755 index 180111b5..00000000 --- a/data/mapHeaders/route18.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route18_h: - db OVERWORLD ; tileset - db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) - dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17Blocks - EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks, 1 - dw Route18Object ; objects diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm deleted file mode 100755 index 1b519527..00000000 --- a/data/mapHeaders/route18gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route18Gate_h: - db GATE ; tileset - db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) - dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route18GateObject ; objects diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm deleted file mode 100755 index 3f78af1b..00000000 --- a/data/mapHeaders/route18gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route18GateUpstairs_h: - db GATE ; tileset - db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) - dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route18GateUpstairsObject ; objects diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm deleted file mode 100755 index 1de353f8..00000000 --- a/data/mapHeaders/route19.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route19_h: - db OVERWORLD ; tileset - db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) - dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCityBlocks - WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20Blocks - dw Route19Object ; objects diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm deleted file mode 100755 index 550cd702..00000000 --- a/data/mapHeaders/route2.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route2_h: - db OVERWORLD ; tileset - db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) - dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks - SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 - dw Route2Object ; objects diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm deleted file mode 100755 index f871179f..00000000 --- a/data/mapHeaders/route20.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route20_h: - db OVERWORLD ; tileset - db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) - dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks - EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19Blocks - dw Route20Object ; objects diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm deleted file mode 100755 index a2c06868..00000000 --- a/data/mapHeaders/route21.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route21_h: - db OVERWORLD ; tileset - db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) - dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTownBlocks - SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks, 1 - dw Route21Object ; objects diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm deleted file mode 100755 index c227d433..00000000 --- a/data/mapHeaders/route22.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route22_h: - db OVERWORLD ; tileset - db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) - dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23Blocks - EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCityBlocks, 1 - dw Route22Object ; objects diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm deleted file mode 100755 index a8c20e97..00000000 --- a/data/mapHeaders/route22gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route22Gate_h: - db GATE ; tileset - db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) - dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route22GateObject ; objects diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm deleted file mode 100755 index bec192c2..00000000 --- a/data/mapHeaders/route23.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route23_h: - db PLATEAU ; tileset - db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) - dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateauBlocks - SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22Blocks, 1 - dw Route23Object ; objects diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm deleted file mode 100755 index 9a313aba..00000000 --- a/data/mapHeaders/route24.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route24_h: - db OVERWORLD ; tileset - db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) - dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCityBlocks, 1 - EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25Blocks - dw Route24Object ; objects diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm deleted file mode 100755 index 39ffa45d..00000000 --- a/data/mapHeaders/route25.asm +++ /dev/null @@ -1,7 +0,0 @@ -Route25_h: - db OVERWORLD ; tileset - db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) - dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts - db WEST ; connections - WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24Blocks - dw Route25Object ; objects diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm deleted file mode 100755 index 7ef9f1a8..00000000 --- a/data/mapHeaders/route2gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route2Gate_h: - db GATE ; tileset - db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) - dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route2GateObject ; objects diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm deleted file mode 100755 index 2fc12748..00000000 --- a/data/mapHeaders/route2house.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route2House_h: - db HOUSE ; tileset - db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x) - dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts - db 0 ; connections - dw Route2HouseObject ; objects diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm deleted file mode 100755 index 19adfea8..00000000 --- a/data/mapHeaders/route3.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route3_h: - db OVERWORLD ; tileset - db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) - dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4Blocks - WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCityBlocks - dw Route3Object ; objects diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm deleted file mode 100755 index 26670e6d..00000000 --- a/data/mapHeaders/route4.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route4_h: - db OVERWORLD ; tileset - db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) - dw Route4Blocks, Route4TextPointers, Route4Script ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks - EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1 - dw Route4Object ; objects diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm deleted file mode 100755 index b982c02d..00000000 --- a/data/mapHeaders/route5.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route5_h: - db OVERWORLD ; tileset - db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) - dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCityBlocks - SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCityBlocks, 1 - dw Route5Object ; objects diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm deleted file mode 100755 index be3fd45c..00000000 --- a/data/mapHeaders/route5gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route5Gate_h: - db GATE ; tileset - db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) - dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route5GateObject ; objects diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm deleted file mode 100755 index 6ed13d4e..00000000 --- a/data/mapHeaders/route6.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route6_h: - db OVERWORLD ; tileset - db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) - dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCityBlocks - SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCityBlocks, 1 - dw Route6Object ; objects diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm deleted file mode 100755 index 37c5032f..00000000 --- a/data/mapHeaders/route6gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route6Gate_h: - db GATE ; tileset - db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) - dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route6GateObject ; objects diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm deleted file mode 100755 index 62f3bedf..00000000 --- a/data/mapHeaders/route7.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route7_h: - db OVERWORLD ; tileset - db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) - dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCityBlocks - EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCityBlocks, 1 - dw Route7Object ; objects diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm deleted file mode 100755 index 9b5802b3..00000000 --- a/data/mapHeaders/route7gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route7Gate_h: - db GATE ; tileset - db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) - dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route7GateObject ; objects diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm deleted file mode 100755 index 5187fd8f..00000000 --- a/data/mapHeaders/route8.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route8_h: - db OVERWORLD ; tileset - db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) - dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCityBlocks - EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTownBlocks - dw Route8Object ; objects diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm deleted file mode 100755 index 66593058..00000000 --- a/data/mapHeaders/route8gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route8Gate_h: - db GATE ; tileset - db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) - dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route8GateObject ; objects diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm deleted file mode 100755 index 044a4ec0..00000000 --- a/data/mapHeaders/route9.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route9_h: - db OVERWORLD ; tileset - db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) - dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCityBlocks - EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10Blocks, 1 - dw Route9Object ; objects diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm deleted file mode 100755 index 39f20b5d..00000000 --- a/data/mapHeaders/safarizonecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneCenter_h: - db FOREST ; tileset - db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) - dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneCenterObject ; objects diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm deleted file mode 100755 index f94a92bf..00000000 --- a/data/mapHeaders/safarizoneeast.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneEast_h: - db FOREST ; tileset - db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) - dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneEastObject ; objects diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm deleted file mode 100755 index e2eabdcd..00000000 --- a/data/mapHeaders/safarizoneentrance.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneEntrance_h: - db GATE ; tileset - db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x) - dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneEntranceObject ; objects diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm deleted file mode 100755 index 5b01138d..00000000 --- a/data/mapHeaders/safarizonenorth.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneNorth_h: - db FOREST ; tileset - db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) - dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneNorthObject ; objects diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm deleted file mode 100755 index 0169c61f..00000000 --- a/data/mapHeaders/safarizoneresthouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse1_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse1Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm deleted file mode 100755 index 804d619c..00000000 --- a/data/mapHeaders/safarizoneresthouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse2_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse2Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm deleted file mode 100755 index becd3e7c..00000000 --- a/data/mapHeaders/safarizoneresthouse3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse3_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse3Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm deleted file mode 100755 index 7cc8fd25..00000000 --- a/data/mapHeaders/safarizoneresthouse4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse4_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse4Object ; objects diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm deleted file mode 100755 index 35575a10..00000000 --- a/data/mapHeaders/safarizonesecrethouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneSecretHouse_h: - db LAB ; tileset - db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneSecretHouseObject ; objects diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm deleted file mode 100755 index 24ac7686..00000000 --- a/data/mapHeaders/safarizonewest.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneWest_h: - db FOREST ; tileset - db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) - dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneWestObject ; objects diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm deleted file mode 100755 index 8f4ea922..00000000 --- a/data/mapHeaders/saffroncity.asm +++ /dev/null @@ -1,10 +0,0 @@ -SaffronCity_h: - db OVERWORLD ; tileset - db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) - dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5Blocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6Blocks, 1 - WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7Blocks - EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8Blocks - dw SaffronCityObject ; objects diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm deleted file mode 100755 index 4e9fe383..00000000 --- a/data/mapHeaders/saffrongym.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronGym_h: - db FACILITY ; tileset - db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) - dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts - db 0 ; connections - dw SaffronGymObject ; objects diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm deleted file mode 100755 index 747b46b4..00000000 --- a/data/mapHeaders/saffronhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronHouse1_h: - db HOUSE ; tileset - db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x) - dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw SaffronHouse1Object ; objects diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm deleted file mode 100755 index 6a642a73..00000000 --- a/data/mapHeaders/saffronhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronHouse2_h: - db HOUSE ; tileset - db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x) - dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw SaffronHouse2Object ; objects diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm deleted file mode 100755 index 72aadb56..00000000 --- a/data/mapHeaders/saffronmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronMart_h: - db MART ; tileset - db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) - dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts - db 0 ; connections - dw SaffronMartObject ; objects diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm deleted file mode 100755 index 85e3b5e3..00000000 --- a/data/mapHeaders/saffronpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronPokecenter_h: - db POKECENTER ; tileset - db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) - dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw SaffronPokecenterObject ; objects diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm deleted file mode 100755 index 4c122f2a..00000000 --- a/data/mapHeaders/school.asm +++ /dev/null @@ -1,6 +0,0 @@ -School_h: - db HOUSE ; tileset - db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x) - dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts - db 0 ; connections - dw SchoolObject ; objects diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm deleted file mode 100755 index 32754b23..00000000 --- a/data/mapHeaders/seafoamislands1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands1_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x) - dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands1Object ; objects diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm deleted file mode 100755 index f59d7201..00000000 --- a/data/mapHeaders/seafoamislands2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands2_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x) - dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands2Object ; objects diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm deleted file mode 100755 index e75325ea..00000000 --- a/data/mapHeaders/seafoamislands3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands3_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x) - dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands3Object ; objects diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm deleted file mode 100755 index 297ecbbb..00000000 --- a/data/mapHeaders/seafoamislands4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands4_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x) - dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands4Object ; objects diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm deleted file mode 100755 index 1e8af6f7..00000000 --- a/data/mapHeaders/seafoamislands5.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands5_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x) - dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands5Object ; objects diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm deleted file mode 100755 index 4a2b176f..00000000 --- a/data/mapHeaders/silphco1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo1_h: - db FACILITY ; tileset - db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) - dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo1Object ; objects diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm deleted file mode 100755 index 716fa025..00000000 --- a/data/mapHeaders/silphco10.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo10_h: - db FACILITY ; tileset - db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) - dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo10Object ; objects diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm deleted file mode 100755 index 4ed282a9..00000000 --- a/data/mapHeaders/silphco11.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo11_h: - db INTERIOR ; tileset - db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) - dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo11Object ; objects diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm deleted file mode 100755 index fae02d5b..00000000 --- a/data/mapHeaders/silphco2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo2_h: - db FACILITY ; tileset - db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) - dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo2Object ; objects diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm deleted file mode 100755 index 98a130c0..00000000 --- a/data/mapHeaders/silphco3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo3_h: - db FACILITY ; tileset - db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) - dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo3Object ; objects diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm deleted file mode 100755 index bc91f24b..00000000 --- a/data/mapHeaders/silphco4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo4_h: - db FACILITY ; tileset - db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) - dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo4Object ; objects diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm deleted file mode 100755 index c9a4c1d2..00000000 --- a/data/mapHeaders/silphco5.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo5_h: - db FACILITY ; tileset - db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) - dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo5Object ; objects diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm deleted file mode 100755 index 675709c2..00000000 --- a/data/mapHeaders/silphco6.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo6_h: - db FACILITY ; tileset - db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) - dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo6Object ; objects diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm deleted file mode 100755 index ee46c3fb..00000000 --- a/data/mapHeaders/silphco7.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo7_h: - db FACILITY ; tileset - db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) - dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo7Object ; objects diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm deleted file mode 100755 index 90c0ba0f..00000000 --- a/data/mapHeaders/silphco8.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo8_h: - db FACILITY ; tileset - db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) - dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo8Object ; objects diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm deleted file mode 100755 index 182ec5b2..00000000 --- a/data/mapHeaders/silphco9.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo9_h: - db FACILITY ; tileset - db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) - dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo9Object ; objects diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm deleted file mode 100755 index 3663cacd..00000000 --- a/data/mapHeaders/silphcoelevator.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCoElevator_h: - db LOBBY ; tileset - db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) - dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts - db 0 ; connections - dw SilphCoElevatorObject ; objects diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm deleted file mode 100755 index c69481d6..00000000 --- a/data/mapHeaders/ssanne1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne1_h: - db SHIP ; tileset - db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x) - dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne1Object ; objects diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm deleted file mode 100755 index 79464beb..00000000 --- a/data/mapHeaders/ssanne10.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne10_h: - db SHIP ; tileset - db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x) - dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne10Object ; objects diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm deleted file mode 100755 index 7a6294e5..00000000 --- a/data/mapHeaders/ssanne2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne2_h: - db SHIP ; tileset - db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x) - dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne2Object ; objects diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm deleted file mode 100755 index 78f9660b..00000000 --- a/data/mapHeaders/ssanne3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne3_h: - db SHIP ; tileset - db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x) - dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne3Object ; objects diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm deleted file mode 100755 index 9ad2c66c..00000000 --- a/data/mapHeaders/ssanne4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne4_h: - db SHIP ; tileset - db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x) - dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne4Object ; objects diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm deleted file mode 100755 index a2c2b943..00000000 --- a/data/mapHeaders/ssanne5.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne5_h: - db SHIP ; tileset - db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x) - dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne5Object ; objects diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm deleted file mode 100755 index 5a939b8f..00000000 --- a/data/mapHeaders/ssanne6.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne6_h: - db SHIP ; tileset - db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x) - dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne6Object ; objects diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm deleted file mode 100755 index 97666530..00000000 --- a/data/mapHeaders/ssanne7.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne7_h: - db SHIP ; tileset - db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x) - dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne7Object ; objects diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm deleted file mode 100755 index 2771ad40..00000000 --- a/data/mapHeaders/ssanne8.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne8_h: - db SHIP ; tileset - db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x) - dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne8Object ; objects diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm deleted file mode 100755 index 8f944cf9..00000000 --- a/data/mapHeaders/ssanne9.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne9_h: - db SHIP ; tileset - db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x) - dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne9Object ; objects diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm deleted file mode 100755 index 5d6c7d95..00000000 --- a/data/mapHeaders/tradecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -TradeCenter_h: - db CLUB ; tileset - db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) - dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts - db 0 ; connections - dw TradeCenterObject ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm deleted file mode 100755 index 9f5a2125..00000000 --- a/data/mapHeaders/undergroundpathentranceroute5.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute5_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute5Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm deleted file mode 100755 index 4a5670af..00000000 --- a/data/mapHeaders/undergroundpathentranceroute6.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute6_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute6Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm deleted file mode 100755 index e3fe68f0..00000000 --- a/data/mapHeaders/undergroundpathentranceroute7.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute7_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute7Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm deleted file mode 100755 index a15f2f4d..00000000 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute7Copy_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute7CopyObject ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm deleted file mode 100755 index 0698da9a..00000000 --- a/data/mapHeaders/undergroundpathentranceroute8.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute8_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute8Object ; objects diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm deleted file mode 100755 index ba021bea..00000000 --- a/data/mapHeaders/undergroundpathns.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathNS_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x) - dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathNSObject ; objects diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm deleted file mode 100755 index 7061a8d1..00000000 --- a/data/mapHeaders/undergroundpathwe.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathWE_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x) - dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathWEObject ; objects diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm deleted file mode 100755 index 0c6adbbd..00000000 --- a/data/mapHeaders/unknowndungeon1.asm +++ /dev/null @@ -1,6 +0,0 @@ -UnknownDungeon1_h: - db CAVERN ; tileset - db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x) - dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts - db 0 ; connections - dw UnknownDungeon1Object ; objects diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm deleted file mode 100755 index b5147da2..00000000 --- a/data/mapHeaders/unknowndungeon2.asm +++ /dev/null @@ -1,6 +0,0 @@ -UnknownDungeon2_h: - db CAVERN ; tileset - db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x) - dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts - db 0 ; connections - dw UnknownDungeon2Object ; objects diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm deleted file mode 100755 index 4b5372d2..00000000 --- a/data/mapHeaders/unknowndungeon3.asm +++ /dev/null @@ -1,6 +0,0 @@ -UnknownDungeon3_h: - db CAVERN ; tileset - db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x) - dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts - db 0 ; connections - dw UnknownDungeon3Object ; objects diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm deleted file mode 100755 index c162ab24..00000000 --- a/data/mapHeaders/vermilioncity.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_h: - db OVERWORLD ; tileset - db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) - dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6Blocks - EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11Blocks - dw VermilionCityObject ; objects diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm deleted file mode 100755 index 5d93f284..00000000 --- a/data/mapHeaders/vermiliondock.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionDock_h: - db SHIP_PORT ; tileset - db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) - dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionDockObject ; objects diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm deleted file mode 100755 index e960a70f..00000000 --- a/data/mapHeaders/vermiliongym.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionGym_h: - db GYM ; tileset - db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) - dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionGymObject ; objects diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm deleted file mode 100755 index 47375c91..00000000 --- a/data/mapHeaders/vermilionhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionHouse1_h: - db HOUSE ; tileset - db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x) - dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw VermilionHouse1Object ; objects diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm deleted file mode 100755 index 3a870db3..00000000 --- a/data/mapHeaders/vermilionhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionHouse2_h: - db HOUSE ; tileset - db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x) - dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw VermilionHouse2Object ; objects diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm deleted file mode 100755 index 139f69f6..00000000 --- a/data/mapHeaders/vermilionhouse3.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionHouse3_h: - db HOUSE ; tileset - db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x) - dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts - db 0 ; connections - dw VermilionHouse3Object ; objects diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm deleted file mode 100755 index e9dcd913..00000000 --- a/data/mapHeaders/vermilionmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionMart_h: - db MART ; tileset - db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) - dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionMartObject ; objects diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm deleted file mode 100755 index 6a84204d..00000000 --- a/data/mapHeaders/vermilionpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionPokecenter_h: - db POKECENTER ; tileset - db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) - dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionPokecenterObject ; objects diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm deleted file mode 100755 index cb902e37..00000000 --- a/data/mapHeaders/victoryroad1.asm +++ /dev/null @@ -1,6 +0,0 @@ -VictoryRoad1_h: - db CAVERN ; tileset - db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x) - dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts - db 0 ; connections - dw VictoryRoad1Object ; objects diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm deleted file mode 100755 index 223652e5..00000000 --- a/data/mapHeaders/victoryroad2.asm +++ /dev/null @@ -1,6 +0,0 @@ -VictoryRoad2_h: - db CAVERN ; tileset - db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x) - dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts - db 0 ; connections - dw VictoryRoad2Object ; objects diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm deleted file mode 100755 index 5401fe10..00000000 --- a/data/mapHeaders/victoryroad3.asm +++ /dev/null @@ -1,6 +0,0 @@ -VictoryRoad3_h: - db CAVERN ; tileset - db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x) - dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts - db 0 ; connections - dw VictoryRoad3Object ; objects diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm deleted file mode 100755 index 79b19368..00000000 --- a/data/mapHeaders/viridiancity.asm +++ /dev/null @@ -1,9 +0,0 @@ -ViridianCity_h: - db OVERWORLD ; tileset - db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) - dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2Blocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1Blocks, 1 - WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22Blocks - dw ViridianCityObject ; objects diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm deleted file mode 100755 index 250f3de8..00000000 --- a/data/mapHeaders/viridianforest.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianForest_h: - db FOREST ; tileset - db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) - dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianForestObject ; objects diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm deleted file mode 100755 index 81534daa..00000000 --- a/data/mapHeaders/viridianforestentrance.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianForestEntrance_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x) - dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianForestEntranceObject ; objects diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm deleted file mode 100755 index 9c492487..00000000 --- a/data/mapHeaders/viridianforestexit.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianForestExit_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x) - dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianForestExitObject ; objects diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm deleted file mode 100755 index 19833cf0..00000000 --- a/data/mapHeaders/viridiangym.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianGym_h: - db GYM ; tileset - db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) - dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianGymObject ; objects diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm deleted file mode 100755 index 9b2c73de..00000000 --- a/data/mapHeaders/viridianhouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianHouse_h: - db HOUSE ; tileset - db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x) - dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianHouseObject ; objects diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm deleted file mode 100755 index 39281567..00000000 --- a/data/mapHeaders/viridianmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianMart_h: - db MART ; tileset - db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) - dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianMartObject ; objects diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm deleted file mode 100755 index fbef5193..00000000 --- a/data/mapHeaders/viridianpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianPokecenter_h: - db POKECENTER ; tileset - db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) - dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianPokecenterObject ; objects diff --git a/data/mapObjects/AgathasRoom.asm b/data/mapObjects/AgathasRoom.asm new file mode 100755 index 00000000..4a82e78d --- /dev/null +++ b/data/mapObjects/AgathasRoom.asm @@ -0,0 +1,19 @@ +AgathasRoom_Object: + db $0 ; border block + + db 4 ; warps + warp 4, 11, 2, BRUNOS_ROOM + warp 5, 11, 3, BRUNOS_ROOM + warp 4, 0, 0, LANCES_ROOM + warp 5, 0, 0, LANCES_ROOM + + db 0 ; signs + + db 1 ; objects + object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 + + ; warp-to + warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM + warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/BikeShop.asm b/data/mapObjects/BikeShop.asm new file mode 100755 index 00000000..9f21ab3e --- /dev/null +++ b/data/mapObjects/BikeShop.asm @@ -0,0 +1,17 @@ +BikeShop_Object: + db $e ; border block + + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person + object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person + object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person + + ; warp-to + warp_to 2, 7, BIKE_SHOP_WIDTH + warp_to 3, 7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/BillsHouse.asm b/data/mapObjects/BillsHouse.asm new file mode 100755 index 00000000..c8f708cb --- /dev/null +++ b/data/mapObjects/BillsHouse.asm @@ -0,0 +1,17 @@ +BillsHouse_Object: + db $d ; border block + + db 2 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person + + ; warp-to + warp_to 2, 7, BILLS_HOUSE_WIDTH + warp_to 3, 7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/BluesHouse.asm b/data/mapObjects/BluesHouse.asm new file mode 100755 index 00000000..45ca1286 --- /dev/null +++ b/data/mapObjects/BluesHouse.asm @@ -0,0 +1,17 @@ +BluesHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map + object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table + + ; warp-to + warp_to 2, 7, BLUES_HOUSE_WIDTH + warp_to 3, 7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/BrunosRoom.asm b/data/mapObjects/BrunosRoom.asm new file mode 100755 index 00000000..dde1e2dd --- /dev/null +++ b/data/mapObjects/BrunosRoom.asm @@ -0,0 +1,19 @@ +BrunosRoom_Object: + db $3 ; border block + + db 4 ; warps + warp 4, 11, 2, LORELEIS_ROOM + warp 5, 11, 3, LORELEIS_ROOM + warp 4, 0, 0, AGATHAS_ROOM + warp 5, 0, 1, AGATHAS_ROOM + + db 0 ; signs + + db 1 ; objects + object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 + + ; warp-to + warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/CeladonChiefHouse.asm b/data/mapObjects/CeladonChiefHouse.asm new file mode 100755 index 00000000..88850f35 --- /dev/null +++ b/data/mapObjects/CeladonChiefHouse.asm @@ -0,0 +1,17 @@ +CeladonChiefHouse_Object: + db $f ; border block + + db 2 ; warps + warp 2, 7, 11, -1 + warp 3, 7, 11, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person + object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person + + ; warp-to + warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH + warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH diff --git a/data/mapObjects/CeladonCity.asm b/data/mapObjects/CeladonCity.asm new file mode 100755 index 00000000..005fc61e --- /dev/null +++ b/data/mapObjects/CeladonCity.asm @@ -0,0 +1,54 @@ +CeladonCity_Object: + db $f ; border block + + db 13 ; warps + warp 8, 13, 0, CELADON_MART_1F + warp 10, 13, 2, CELADON_MART_1F + warp 24, 9, 0, CELADON_MANSION_1F + warp 24, 3, 2, CELADON_MANSION_1F + warp 25, 3, 2, CELADON_MANSION_1F + warp 41, 9, 0, CELADON_POKECENTER + warp 12, 27, 0, CELADON_GYM + warp 28, 19, 0, GAME_CORNER + warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used + warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM + warp 31, 27, 0, CELADON_DINER + warp 35, 27, 0, CELADON_CHIEF_HOUSE + warp 43, 27, 0, CELADON_HOTEL + + db 9 ; signs + sign 27, 15, 10 ; CeladonCityText10 + sign 19, 15, 11 ; CeladonCityText11 + sign 42, 9, 12 ; PokeCenterSignText + sign 13, 29, 13 ; CeladonCityText13 + sign 21, 9, 14 ; CeladonCityText14 + sign 12, 13, 15 ; CeladonCityText15 + sign 39, 21, 16 ; CeladonCityText16 + sign 33, 21, 17 ; CeladonCityText17 + sign 27, 21, 18 ; CeladonCityText18 + + db 9 ; objects + object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person + object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person + object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person + object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person + object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person + object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person + object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person + object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person + object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person + + ; warp-to + warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F + warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F + warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F + warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F + warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F + warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER + warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM + warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER + warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F + warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM + warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER + warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE + warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/CeladonDiner.asm b/data/mapObjects/CeladonDiner.asm new file mode 100755 index 00000000..0a4a895d --- /dev/null +++ b/data/mapObjects/CeladonDiner.asm @@ -0,0 +1,19 @@ +CeladonDiner_Object: + db $f ; border block + + db 2 ; warps + warp 3, 7, 10, -1 + warp 4, 7, 10, -1 + + db 0 ; signs + + db 5 ; objects + object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person + object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person + object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person + object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person + object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person + + ; warp-to + warp_to 3, 7, CELADON_DINER_WIDTH + warp_to 4, 7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/CeladonGym.asm b/data/mapObjects/CeladonGym.asm new file mode 100755 index 00000000..98fce576 --- /dev/null +++ b/data/mapObjects/CeladonGym.asm @@ -0,0 +1,22 @@ +CeladonGym_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 17, 6, -1 + warp 5, 17, 6, -1 + + db 0 ; signs + + db 8 ; objects + object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 + object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 + + ; warp-to + warp_to 4, 17, CELADON_GYM_WIDTH + warp_to 5, 17, CELADON_GYM_WIDTH diff --git a/data/mapObjects/CeladonHotel.asm b/data/mapObjects/CeladonHotel.asm new file mode 100755 index 00000000..f4aa1305 --- /dev/null +++ b/data/mapObjects/CeladonHotel.asm @@ -0,0 +1,17 @@ +CeladonHotel_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 12, -1 + warp 4, 7, 12, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person + + ; warp-to + warp_to 3, 7, CELADON_HOTEL_WIDTH + warp_to 4, 7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/CeladonMansion1F.asm b/data/mapObjects/CeladonMansion1F.asm new file mode 100755 index 00000000..1abd434c --- /dev/null +++ b/data/mapObjects/CeladonMansion1F.asm @@ -0,0 +1,25 @@ +CeladonMansion1F_Object: + db $f ; border block + + db 5 ; warps + warp 4, 11, 2, -1 + warp 5, 11, 2, -1 + warp 4, 0, 4, -1 + warp 7, 1, 1, CELADON_MANSION_2F + warp 2, 1, 2, CELADON_MANSION_2F + + db 1 ; signs + sign 4, 9, 5 ; CeladonMansion1Text5 + + db 4 ; objects + object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person + object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person + object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person + + ; warp-to + warp_to 4, 11, CELADON_MANSION_1F_WIDTH + warp_to 5, 11, CELADON_MANSION_1F_WIDTH + warp_to 4, 0, CELADON_MANSION_1F_WIDTH + warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F + warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/mapObjects/CeladonMansion2F.asm new file mode 100755 index 00000000..09c94d29 --- /dev/null +++ b/data/mapObjects/CeladonMansion2F.asm @@ -0,0 +1,19 @@ +CeladonMansion2F_Object: + db $f ; border block + + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_3F + warp 7, 1, 3, CELADON_MANSION_1F + warp 2, 1, 4, CELADON_MANSION_1F + warp 4, 1, 3, CELADON_MANSION_3F + + db 1 ; signs + sign 4, 9, 1 ; CeladonMansion2Text1 + + db 0 ; objects + + ; warp-to + warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F + warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F + warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F + warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/mapObjects/CeladonMansion3F.asm new file mode 100755 index 00000000..32701f14 --- /dev/null +++ b/data/mapObjects/CeladonMansion3F.asm @@ -0,0 +1,26 @@ +CeladonMansion3F_Object: + db $f ; border block + + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_2F + warp 7, 1, 0, CELADON_MANSION_ROOF + warp 2, 1, 1, CELADON_MANSION_ROOF + warp 4, 1, 3, CELADON_MANSION_2F + + db 4 ; signs + sign 1, 3, 5 ; CeladonMansion3Text5 + sign 4, 3, 6 ; CeladonMansion3Text6 + sign 1, 6, 7 ; CeladonMansion3Text7 + sign 4, 9, 8 ; CeladonMansion3Text8 + + db 4 ; objects + object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person + object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person + object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person + + ; warp-to + warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F + warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF + warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF + warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/mapObjects/CeladonMansionRoof.asm new file mode 100755 index 00000000..353b0b96 --- /dev/null +++ b/data/mapObjects/CeladonMansionRoof.asm @@ -0,0 +1,17 @@ +CeladonMansionRoof_Object: + db $9 ; border block + + db 3 ; warps + warp 6, 1, 1, CELADON_MANSION_3F + warp 2, 1, 2, CELADON_MANSION_3F + warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE + + db 1 ; signs + sign 3, 7, 1 ; CeladonMansion4Text1 + + db 0 ; objects + + ; warp-to + warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F + warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F + warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/mapObjects/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..b6a6149f --- /dev/null +++ b/data/mapObjects/CeladonMansionRoofHouse.asm @@ -0,0 +1,16 @@ +CeladonMansionRoofHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 2, CELADON_MANSION_ROOF + warp 3, 7, 2, CELADON_MANSION_ROOF + + db 0 ; signs + + db 2 ; objects + object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person + + ; warp-to + warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF + warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF diff --git a/data/mapObjects/CeladonMart1F.asm b/data/mapObjects/CeladonMart1F.asm new file mode 100755 index 00000000..2037369a --- /dev/null +++ b/data/mapObjects/CeladonMart1F.asm @@ -0,0 +1,25 @@ +CeladonMart1F_Object: + db $f ; border block + + db 6 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 16, 7, 1, -1 + warp 17, 7, 1, -1 + warp 12, 1, 0, CELADON_MART_2F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + db 2 ; signs + sign 11, 4, 2 ; CeladonMart1Text2 + sign 14, 1, 3 ; CeladonMart1Text3 + + db 1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 2, 7, CELADON_MART_1F_WIDTH + warp_to 3, 7, CELADON_MART_1F_WIDTH + warp_to 16, 7, CELADON_MART_1F_WIDTH + warp_to 17, 7, CELADON_MART_1F_WIDTH + warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F + warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart2F.asm b/data/mapObjects/CeladonMart2F.asm new file mode 100755 index 00000000..2f5f428e --- /dev/null +++ b/data/mapObjects/CeladonMart2F.asm @@ -0,0 +1,21 @@ +CeladonMart2F_Object: + db $f ; border block + + db 3 ; warps + warp 12, 1, 4, CELADON_MART_1F + warp 16, 1, 1, CELADON_MART_3F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + db 1 ; signs + sign 14, 1, 5 ; CeladonMart2Text5 + + db 4 ; objects + object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person + object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person + + ; warp-to + warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F + warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F + warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart3F.asm b/data/mapObjects/CeladonMart3F.asm new file mode 100755 index 00000000..6dfce535 --- /dev/null +++ b/data/mapObjects/CeladonMart3F.asm @@ -0,0 +1,33 @@ +CeladonMart3F_Object: + db $f ; border block + + db 3 ; warps + warp 12, 1, 0, CELADON_MART_4F + warp 16, 1, 1, CELADON_MART_2F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + db 12 ; signs + sign 2, 4, 6 ; CeladonMart3Text6 + sign 3, 4, 7 ; CeladonMart3Text7 + sign 5, 4, 8 ; CeladonMart3Text8 + sign 6, 4, 9 ; CeladonMart3Text9 + sign 2, 6, 10 ; CeladonMart3Text10 + sign 3, 6, 11 ; CeladonMart3Text11 + sign 5, 6, 12 ; CeladonMart3Text12 + sign 6, 6, 13 ; CeladonMart3Text13 + sign 14, 1, 14 ; CeladonMart3Text14 + sign 4, 1, 15 ; CeladonMart3Text15 + sign 6, 1, 16 ; CeladonMart3Text16 + sign 10, 1, 17 ; CeladonMart3Text17 + + db 5 ; objects + object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person + object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person + object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person + object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person + object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person + + ; warp-to + warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F + warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F + warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart4F.asm b/data/mapObjects/CeladonMart4F.asm new file mode 100755 index 00000000..18ba3bdc --- /dev/null +++ b/data/mapObjects/CeladonMart4F.asm @@ -0,0 +1,20 @@ +CeladonMart4F_Object: + db $f ; border block + + db 3 ; warps + warp 12, 1, 0, CELADON_MART_3F + warp 16, 1, 1, CELADON_MART_5F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + db 1 ; signs + sign 14, 1, 4 ; CeladonMart4Text4 + + db 3 ; objects + object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person + object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person + + ; warp-to + warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F + warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F + warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart5F.asm b/data/mapObjects/CeladonMart5F.asm new file mode 100755 index 00000000..fb1201c9 --- /dev/null +++ b/data/mapObjects/CeladonMart5F.asm @@ -0,0 +1,21 @@ +CeladonMart5F_Object: + db $f ; border block + + db 3 ; warps + warp 12, 1, 0, CELADON_MART_ROOF + warp 16, 1, 1, CELADON_MART_4F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + db 1 ; signs + sign 14, 1, 5 ; CeladonMart5Text5 + + db 4 ; objects + object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person + object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person + object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person + object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF + warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F + warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/mapObjects/CeladonMartElevator.asm new file mode 100755 index 00000000..9688daef --- /dev/null +++ b/data/mapObjects/CeladonMartElevator.asm @@ -0,0 +1,15 @@ +CeladonMartElevator_Object: + db $f ; border block + + db 2 ; warps + warp 1, 3, 5, CELADON_MART_1F + warp 2, 3, 5, CELADON_MART_1F + + db 1 ; signs + sign 3, 0, 1 ; CeladonMartElevatorText1 + + db 0 ; objects + + ; warp-to + warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F + warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F diff --git a/data/mapObjects/CeladonMartRoof.asm b/data/mapObjects/CeladonMartRoof.asm new file mode 100755 index 00000000..05cef2d4 --- /dev/null +++ b/data/mapObjects/CeladonMartRoof.asm @@ -0,0 +1,18 @@ +CeladonMartRoof_Object: + db $42 ; border block + + db 1 ; warps + warp 15, 2, 0, CELADON_MART_5F + + db 4 ; signs + sign 10, 1, 3 ; CeladonMartRoofText3 + sign 11, 1, 4 ; CeladonMartRoofText4 + sign 12, 2, 5 ; CeladonMartRoofText5 + sign 13, 2, 6 ; CeladonMartRoofText6 + + db 2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person + + ; warp-to + warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F diff --git a/data/mapObjects/CeladonPokecenter.asm b/data/mapObjects/CeladonPokecenter.asm new file mode 100755 index 00000000..da5d595f --- /dev/null +++ b/data/mapObjects/CeladonPokecenter.asm @@ -0,0 +1,18 @@ +CeladonPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person + object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, CELADON_POKECENTER_WIDTH + warp_to 4, 7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanBadgeHouse.asm b/data/mapObjects/CeruleanBadgeHouse.asm new file mode 100755 index 00000000..62a6873b --- /dev/null +++ b/data/mapObjects/CeruleanBadgeHouse.asm @@ -0,0 +1,17 @@ +CeruleanBadgeHouse_Object: + db $c ; border block + + db 3 ; warps + warp 2, 0, 9, -1 + warp 2, 7, 8, -1 + warp 3, 7, 8, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person + + ; warp-to + warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH + warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm new file mode 100755 index 00000000..f9670482 --- /dev/null +++ b/data/mapObjects/CeruleanCave1F.asm @@ -0,0 +1,31 @@ +CeruleanCave1F_Object: + db $7d ; border block + + db 9 ; warps + warp 24, 17, 6, -1 + warp 25, 17, 6, -1 + warp 27, 1, 0, CERULEAN_CAVE_2F + warp 23, 7, 1, CERULEAN_CAVE_2F + warp 18, 9, 2, CERULEAN_CAVE_2F + warp 7, 1, 3, CERULEAN_CAVE_2F + warp 1, 3, 4, CERULEAN_CAVE_2F + warp 3, 11, 5, CERULEAN_CAVE_2F + warp 0, 6, 0, CERULEAN_CAVE_B1F + + db 0 ; signs + + db 3 ; objects + object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE + object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER + object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET + + ; warp-to + warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH + warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH + warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm new file mode 100755 index 00000000..f8312da0 --- /dev/null +++ b/data/mapObjects/CeruleanCave2F.asm @@ -0,0 +1,25 @@ +CeruleanCave2F_Object: + db $7d ; border block + + db 6 ; warps + warp 29, 1, 2, CERULEAN_CAVE_1F + warp 22, 6, 3, CERULEAN_CAVE_1F + warp 19, 7, 4, CERULEAN_CAVE_1F + warp 9, 1, 5, CERULEAN_CAVE_1F + warp 1, 3, 6, CERULEAN_CAVE_1F + warp 3, 11, 7, CERULEAN_CAVE_1F + + db 0 ; signs + + db 3 ; objects + object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP + object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE + + ; warp-to + warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/mapObjects/CeruleanCaveB1F.asm new file mode 100755 index 00000000..461f77aa --- /dev/null +++ b/data/mapObjects/CeruleanCaveB1F.asm @@ -0,0 +1,15 @@ +CeruleanCaveB1F_Object: + db $7d ; border block + + db 1 ; warps + warp 3, 6, 8, CERULEAN_CAVE_1F + + db 0 ; signs + + db 3 ; objects + object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 + object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE + + ; warp-to + warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCity.asm b/data/mapObjects/CeruleanCity.asm new file mode 100755 index 00000000..d5adcfd7 --- /dev/null +++ b/data/mapObjects/CeruleanCity.asm @@ -0,0 +1,47 @@ +CeruleanCity_Object: + db $f ; border block + + db 10 ; warps + warp 27, 11, 0, CERULEAN_TRASHED_HOUSE + warp 13, 15, 0, CERULEAN_TRADE_HOUSE + warp 19, 17, 0, CERULEAN_POKECENTER + warp 30, 19, 0, CERULEAN_GYM + warp 13, 25, 0, BIKE_SHOP + warp 25, 25, 0, CERULEAN_MART + warp 4, 11, 0, CERULEAN_CAVE_1F + warp 27, 9, 2, CERULEAN_TRASHED_HOUSE + warp 9, 11, 1, CERULEAN_BADGE_HOUSE + warp 9, 9, 0, CERULEAN_BADGE_HOUSE + + db 6 ; signs + sign 23, 19, 12 ; CeruleanCityText12 + sign 17, 29, 13 ; CeruleanCityText13 + sign 26, 25, 14 ; MartSignText + sign 20, 17, 15 ; PokeCenterSignText + sign 11, 25, 16 ; CeruleanCityText16 + sign 27, 21, 17 ; CeruleanCityText17 + + db 11 ; objects + object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 + object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person + object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person + object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person + object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person + object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person + object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person + object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person + object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person + object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person + + ; warp-to + warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE + warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE + warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER + warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM + warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP + warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART + warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F + warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE + warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE + warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE diff --git a/data/mapObjects/CeruleanGym.asm b/data/mapObjects/CeruleanGym.asm new file mode 100755 index 00000000..96713648 --- /dev/null +++ b/data/mapObjects/CeruleanGym.asm @@ -0,0 +1,18 @@ +CeruleanGym_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 13, 3, -1 + warp 5, 13, 3, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 + object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 + object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 + object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 4, 13, CERULEAN_GYM_WIDTH + warp_to 5, 13, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/CeruleanMart.asm b/data/mapObjects/CeruleanMart.asm new file mode 100755 index 00000000..4659375f --- /dev/null +++ b/data/mapObjects/CeruleanMart.asm @@ -0,0 +1,17 @@ +CeruleanMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person + object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person + + ; warp-to + warp_to 3, 7, CERULEAN_MART_WIDTH + warp_to 4, 7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm new file mode 100755 index 00000000..f65db52c --- /dev/null +++ b/data/mapObjects/CeruleanPokecenter.asm @@ -0,0 +1,18 @@ +CeruleanPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 2, -1 + warp 4, 7, 2, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person + object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, CERULEAN_POKECENTER_WIDTH + warp_to 4, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/mapObjects/CeruleanTradeHouse.asm new file mode 100755 index 00000000..a4a46e9b --- /dev/null +++ b/data/mapObjects/CeruleanTradeHouse.asm @@ -0,0 +1,16 @@ +CeruleanTradeHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person + + ; warp-to + warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanTrashedHouse.asm b/data/mapObjects/CeruleanTrashedHouse.asm new file mode 100755 index 00000000..44b7cf20 --- /dev/null +++ b/data/mapObjects/CeruleanTrashedHouse.asm @@ -0,0 +1,19 @@ +CeruleanTrashedHouse_Object: + db $a ; border block + + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 3, 0, 7, -1 + + db 1 ; signs + sign 3, 0, 3 ; CeruleanHouseTrashedText3 + + db 2 ; objects + object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person + object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person + + ; warp-to + warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH + warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ChampionsRoom.asm b/data/mapObjects/ChampionsRoom.asm new file mode 100755 index 00000000..1e0cb7f4 --- /dev/null +++ b/data/mapObjects/ChampionsRoom.asm @@ -0,0 +1,20 @@ +ChampionsRoom_Object: + db $3 ; border block + + db 4 ; warps + warp 3, 7, 1, LANCES_ROOM + warp 4, 7, 2, LANCES_ROOM + warp 3, 0, 0, HALL_OF_FAME + warp 4, 0, 0, HALL_OF_FAME + + db 0 ; signs + + db 2 ; objects + object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person + + ; warp-to + warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/CinnabarGym.asm b/data/mapObjects/CinnabarGym.asm new file mode 100755 index 00000000..ab204d43 --- /dev/null +++ b/data/mapObjects/CinnabarGym.asm @@ -0,0 +1,23 @@ +CinnabarGym_Object: + db $2e ; border block + + db 2 ; warps + warp 16, 17, 1, -1 + warp 17, 17, 1, -1 + + db 0 ; signs + + db 9 ; objects + object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 + object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 + object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 + object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 + object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 + object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 + object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 + object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 + object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person + + ; warp-to + warp_to 16, 17, CINNABAR_GYM_WIDTH + warp_to 17, 17, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/CinnabarIsland.asm b/data/mapObjects/CinnabarIsland.asm new file mode 100755 index 00000000..1932e134 --- /dev/null +++ b/data/mapObjects/CinnabarIsland.asm @@ -0,0 +1,27 @@ +CinnabarIsland_Object: + db $43 ; border block + + db 5 ; warps + warp 6, 3, 1, POKEMON_MANSION_1F + warp 18, 3, 0, CINNABAR_GYM + warp 6, 9, 0, CINNABAR_LAB + warp 11, 11, 0, CINNABAR_POKECENTER + warp 15, 11, 0, CINNABAR_MART + + db 5 ; signs + sign 9, 5, 3 ; CinnabarIslandText3 + sign 16, 11, 4 ; MartSignText + sign 12, 11, 5 ; PokeCenterSignText + sign 9, 11, 6 ; CinnabarIslandText6 + sign 13, 3, 7 ; CinnabarIslandText7 + + db 2 ; objects + object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + + ; warp-to + warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F + warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM + warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB + warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER + warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm new file mode 100755 index 00000000..deb5d8ed --- /dev/null +++ b/data/mapObjects/CinnabarLab.asm @@ -0,0 +1,25 @@ +CinnabarLab_Object: + db $17 ; border block + + db 5 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 + warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM + warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM + warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM + + db 4 ; signs + sign 3, 2, 2 ; Lab1Text2 + sign 9, 4, 3 ; Lab1Text3 + sign 13, 4, 4 ; Lab1Text4 + sign 17, 4, 5 ; Lab1Text5 + + db 1 ; objects + object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 2, 7, CINNABAR_LAB_WIDTH + warp_to 3, 7, CINNABAR_LAB_WIDTH + warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM + warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM + warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/mapObjects/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..d31502e6 --- /dev/null +++ b/data/mapObjects/CinnabarLabFossilRoom.asm @@ -0,0 +1,16 @@ +CinnabarLabFossilRoom_Object: + db $17 ; border block + + db 2 ; warps + warp 2, 7, 4, CINNABAR_LAB + warp 3, 7, 4, CINNABAR_LAB + + db 0 ; signs + + db 2 ; objects + object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person + object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person + + ; warp-to + warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarLabMetronomeRoom.asm b/data/mapObjects/CinnabarLabMetronomeRoom.asm new file mode 100755 index 00000000..37f93d43 --- /dev/null +++ b/data/mapObjects/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,19 @@ +CinnabarLabMetronomeRoom_Object: + db $17 ; border block + + db 2 ; warps + warp 2, 7, 3, CINNABAR_LAB + warp 3, 7, 3, CINNABAR_LAB + + db 3 ; signs + sign 0, 4, 3 ; Lab3Text3 + sign 1, 4, 4 ; Lab3Text4 + sign 2, 1, 5 ; Lab3Text5 + + db 2 ; objects + object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person + + ; warp-to + warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/mapObjects/CinnabarLabTradeRoom.asm new file mode 100755 index 00000000..449cc914 --- /dev/null +++ b/data/mapObjects/CinnabarLabTradeRoom.asm @@ -0,0 +1,17 @@ +CinnabarLabTradeRoom_Object: + db $17 ; border block + + db 2 ; warps + warp 2, 7, 2, CINNABAR_LAB + warp 3, 7, 2, CINNABAR_LAB + + db 0 ; signs + + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person + object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person + + ; warp-to + warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarMart.asm b/data/mapObjects/CinnabarMart.asm new file mode 100755 index 00000000..af88ddf0 --- /dev/null +++ b/data/mapObjects/CinnabarMart.asm @@ -0,0 +1,17 @@ +CinnabarMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person + object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person + + ; warp-to + warp_to 3, 7, CINNABAR_MART_WIDTH + warp_to 4, 7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm new file mode 100755 index 00000000..9583ef2a --- /dev/null +++ b/data/mapObjects/CinnabarPokecenter.asm @@ -0,0 +1,18 @@ +CinnabarPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person + object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, CINNABAR_POKECENTER_WIDTH + warp_to 4, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/Colosseum.asm b/data/mapObjects/Colosseum.asm new file mode 100755 index 00000000..18762584 --- /dev/null +++ b/data/mapObjects/Colosseum.asm @@ -0,0 +1,9 @@ +Colosseum_Object: + db $e ; border block + + db 0 ; warps + + db 0 ; signs + + db 1 ; objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/CopycatsHouse1F.asm b/data/mapObjects/CopycatsHouse1F.asm new file mode 100755 index 00000000..cb4dbb0b --- /dev/null +++ b/data/mapObjects/CopycatsHouse1F.asm @@ -0,0 +1,19 @@ +CopycatsHouse1F_Object: + db $a ; border block + + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 7, 1, 0, COPYCATS_HOUSE_2F + + db 0 ; signs + + db 3 ; objects + object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person + object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person + + ; warp-to + warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH + warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH + warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/CopycatsHouse2F.asm b/data/mapObjects/CopycatsHouse2F.asm new file mode 100755 index 00000000..18b56419 --- /dev/null +++ b/data/mapObjects/CopycatsHouse2F.asm @@ -0,0 +1,19 @@ +CopycatsHouse2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 1, 2, COPYCATS_HOUSE_1F + + db 2 ; signs + sign 3, 5, 6 ; CopycatsHouse2FText6 + sign 0, 1, 7 ; CopycatsHouse2FText7 + + db 5 ; objects + object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person + object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person + object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person + object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person + + ; warp-to + warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/Daycare.asm b/data/mapObjects/Daycare.asm new file mode 100755 index 00000000..c58c83e4 --- /dev/null +++ b/data/mapObjects/Daycare.asm @@ -0,0 +1,15 @@ +Daycare_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person + + ; warp-to + warp_to 2, 7, DAYCARE_WIDTH + warp_to 3, 7, DAYCARE_WIDTH diff --git a/data/mapObjects/DiglettsCave.asm b/data/mapObjects/DiglettsCave.asm new file mode 100755 index 00000000..b4fd0af8 --- /dev/null +++ b/data/mapObjects/DiglettsCave.asm @@ -0,0 +1,14 @@ +DiglettsCave_Object: + db $19 ; border block + + db 2 ; warps + warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2 + warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2 + warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/DiglettsCaveRoute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm new file mode 100755 index 00000000..a4c70f06 --- /dev/null +++ b/data/mapObjects/DiglettsCaveRoute11.asm @@ -0,0 +1,17 @@ +DiglettsCaveRoute11_Object: + db $7d ; border block + + db 3 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 + warp 4, 4, 1, DIGLETTS_CAVE + + db 0 ; signs + + db 1 ; objects + object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/DiglettsCaveRoute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm new file mode 100755 index 00000000..0567fee6 --- /dev/null +++ b/data/mapObjects/DiglettsCaveRoute2.asm @@ -0,0 +1,17 @@ +DiglettsCaveRoute2_Object: + db $7d ; border block + + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 4, 4, 0, DIGLETTS_CAVE + + db 0 ; signs + + db 1 ; objects + object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/FightingDojo.asm b/data/mapObjects/FightingDojo.asm new file mode 100755 index 00000000..fdc7b838 --- /dev/null +++ b/data/mapObjects/FightingDojo.asm @@ -0,0 +1,21 @@ +FightingDojo_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 11, 1, -1 + warp 5, 11, 1, -1 + + db 0 ; signs + + db 7 ; objects + object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 + object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 + object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 + object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 + object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 + object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person + object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person + + ; warp-to + warp_to 4, 11, FIGHTING_DOJO_WIDTH + warp_to 5, 11, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm new file mode 100755 index 00000000..363b56f9 --- /dev/null +++ b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,17 @@ +FuchsiaBillsGrandpasHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person + object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person + + ; warp-to + warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH + warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH diff --git a/data/mapObjects/FuchsiaCity.asm b/data/mapObjects/FuchsiaCity.asm new file mode 100755 index 00000000..09c97b02 --- /dev/null +++ b/data/mapObjects/FuchsiaCity.asm @@ -0,0 +1,52 @@ +FuchsiaCity_Object: + db $f ; border block + + db 9 ; warps + warp 5, 13, 0, FUCHSIA_MART + warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE + warp 19, 27, 0, FUCHSIA_POKECENTER + warp 27, 27, 0, WARDENS_HOUSE + warp 18, 3, 0, SAFARI_ZONE_GATE + warp 5, 27, 0, FUCHSIA_GYM + warp 22, 13, 0, FUCHSIA_MEETING_ROOM + warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE + warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE + + db 14 ; signs + sign 15, 23, 11 ; FuchsiaCityText11 + sign 25, 15, 12 ; FuchsiaCityText12 + sign 17, 5, 13 ; FuchsiaCityText13 + sign 6, 13, 14 ; MartSignText + sign 20, 27, 15 ; PokeCenterSignText + sign 27, 29, 16 ; FuchsiaCityText16 + sign 21, 15, 17 ; FuchsiaCityText17 + sign 5, 29, 18 ; FuchsiaCityText18 + sign 33, 7, 19 ; FuchsiaCityText19 + sign 27, 7, 20 ; FuchsiaCityText20 + sign 13, 7, 21 ; FuchsiaCityText21 + sign 31, 13, 22 ; FuchsiaCityText22 + sign 13, 15, 23 ; FuchsiaCityText23 + sign 7, 7, 24 ; FuchsiaCityText24 + + db 10 ; objects + object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person + object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person + object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person + object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person + object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person + object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person + object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person + object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person + object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person + + ; warp-to + warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART + warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE + warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER + warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE + warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE + warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM + warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM + warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE + warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/mapObjects/FuchsiaGoodRodHouse.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm new file mode 100755 index 00000000..390447c8 --- /dev/null +++ b/data/mapObjects/FuchsiaGoodRodHouse.asm @@ -0,0 +1,17 @@ +FuchsiaGoodRodHouse_Object: + db $c ; border block + + db 3 ; warps + warp 2, 0, 8, -1 + warp 2, 7, 7, -1 + warp 3, 7, 7, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person + + ; warp-to + warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH + warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH + warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/FuchsiaGym.asm b/data/mapObjects/FuchsiaGym.asm new file mode 100755 index 00000000..5d707d53 --- /dev/null +++ b/data/mapObjects/FuchsiaGym.asm @@ -0,0 +1,22 @@ +FuchsiaGym_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 17, 5, -1 + warp 5, 17, 5, -1 + + db 0 ; signs + + db 8 ; objects + object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 + object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 + object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 + object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 + object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 + object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 + object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person + + ; warp-to + warp_to 4, 17, FUCHSIA_GYM_WIDTH + warp_to 5, 17, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/FuchsiaMart.asm b/data/mapObjects/FuchsiaMart.asm new file mode 100755 index 00000000..cfa71d8d --- /dev/null +++ b/data/mapObjects/FuchsiaMart.asm @@ -0,0 +1,17 @@ +FuchsiaMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person + object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person + + ; warp-to + warp_to 3, 7, FUCHSIA_MART_WIDTH + warp_to 4, 7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/FuchsiaMeetingRoom.asm b/data/mapObjects/FuchsiaMeetingRoom.asm new file mode 100755 index 00000000..9130d920 --- /dev/null +++ b/data/mapObjects/FuchsiaMeetingRoom.asm @@ -0,0 +1,17 @@ +FuchsiaMeetingRoom_Object: + db $17 ; border block + + db 2 ; warps + warp 4, 7, 6, -1 + warp 5, 7, 6, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person + object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person + object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person + + ; warp-to + warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH + warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm new file mode 100755 index 00000000..73dc529d --- /dev/null +++ b/data/mapObjects/FuchsiaPokecenter.asm @@ -0,0 +1,18 @@ +FuchsiaPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 2, -1 + warp 4, 7, 2, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person + object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH + warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/GameCorner.asm b/data/mapObjects/GameCorner.asm new file mode 100755 index 00000000..2704f6ab --- /dev/null +++ b/data/mapObjects/GameCorner.asm @@ -0,0 +1,28 @@ +GameCorner_Object: + db $f ; border block + + db 3 ; warps + warp 15, 17, 7, -1 + warp 16, 17, 7, -1 + warp 17, 4, 1, ROCKET_HIDEOUT_B1F + + db 1 ; signs + sign 9, 4, 12 ; CeladonGameCornerText12 + + db 11 ; objects + object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person + object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person + object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person + object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person + object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person + object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person + object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person + object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person + object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person + object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person + object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 + + ; warp-to + warp_to 15, 17, GAME_CORNER_WIDTH + warp_to 16, 17, GAME_CORNER_WIDTH + warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/GameCornerPrizeRoom.asm b/data/mapObjects/GameCornerPrizeRoom.asm new file mode 100755 index 00000000..35cd3ac8 --- /dev/null +++ b/data/mapObjects/GameCornerPrizeRoom.asm @@ -0,0 +1,19 @@ +GameCornerPrizeRoom_Object: + db $f ; border block + + db 2 ; warps + warp 4, 7, 9, -1 + warp 5, 7, 9, -1 + + db 3 ; signs + sign 2, 2, 3 ; CeladonPrizeRoomText3 + sign 4, 2, 4 ; CeladonPrizeRoomText4 + sign 6, 2, 5 ; CeladonPrizeRoomText5 + + db 2 ; objects + object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person + object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person + + ; warp-to + warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH + warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/HallOfFame.asm b/data/mapObjects/HallOfFame.asm new file mode 100755 index 00000000..3762d871 --- /dev/null +++ b/data/mapObjects/HallOfFame.asm @@ -0,0 +1,15 @@ +HallOfFame_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 7, 2, CHAMPIONS_ROOM + warp 5, 7, 3, CHAMPIONS_ROOM + + db 0 ; signs + + db 1 ; objects + object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM + warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/IndigoPlateau.asm b/data/mapObjects/IndigoPlateau.asm new file mode 100755 index 00000000..1447be11 --- /dev/null +++ b/data/mapObjects/IndigoPlateau.asm @@ -0,0 +1,14 @@ +IndigoPlateau_Object: + db $e ; border block + + db 2 ; warps + warp 9, 5, 0, INDIGO_PLATEAU_LOBBY + warp 10, 5, 0, INDIGO_PLATEAU_LOBBY + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/mapObjects/IndigoPlateauLobby.asm new file mode 100755 index 00000000..ea113a16 --- /dev/null +++ b/data/mapObjects/IndigoPlateauLobby.asm @@ -0,0 +1,21 @@ +IndigoPlateauLobby_Object: + db $0 ; border block + + db 3 ; warps + warp 7, 11, 0, -1 + warp 8, 11, 1, -1 + warp 8, 0, 0, LORELEIS_ROOM + + db 0 ; signs + + db 5 ; objects + object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person + object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person + object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person + + ; warp-to + warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/LancesRoom.asm b/data/mapObjects/LancesRoom.asm new file mode 100755 index 00000000..6f22631a --- /dev/null +++ b/data/mapObjects/LancesRoom.asm @@ -0,0 +1,17 @@ +LancesRoom_Object: + db $3 ; border block + + db 3 ; warps + warp 24, 16, 2, AGATHAS_ROOM + warp 5, 0, 0, CHAMPIONS_ROOM + warp 6, 0, 0, CHAMPIONS_ROOM + + db 0 ; signs + + db 1 ; objects + object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 + + ; warp-to + warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/LavenderCuboneHouse.asm b/data/mapObjects/LavenderCuboneHouse.asm new file mode 100755 index 00000000..96f1b3ba --- /dev/null +++ b/data/mapObjects/LavenderCuboneHouse.asm @@ -0,0 +1,16 @@ +LavenderCuboneHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person + object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person + + ; warp-to + warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH + warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH diff --git a/data/mapObjects/LavenderMart.asm b/data/mapObjects/LavenderMart.asm new file mode 100755 index 00000000..df14ad39 --- /dev/null +++ b/data/mapObjects/LavenderMart.asm @@ -0,0 +1,17 @@ +LavenderMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person + + ; warp-to + warp_to 3, 7, LAVENDER_MART_WIDTH + warp_to 4, 7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/mapObjects/LavenderPokecenter.asm new file mode 100755 index 00000000..89e25571 --- /dev/null +++ b/data/mapObjects/LavenderPokecenter.asm @@ -0,0 +1,18 @@ +LavenderPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person + object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, LAVENDER_POKECENTER_WIDTH + warp_to 4, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/LavenderTown.asm b/data/mapObjects/LavenderTown.asm new file mode 100755 index 00000000..4aead666 --- /dev/null +++ b/data/mapObjects/LavenderTown.asm @@ -0,0 +1,31 @@ +LavenderTown_Object: + db $2c ; border block + + db 6 ; warps + warp 3, 5, 0, LAVENDER_POKECENTER + warp 14, 5, 0, POKEMON_TOWER_1F + warp 7, 9, 0, MR_FUJIS_HOUSE + warp 15, 13, 0, LAVENDER_MART + warp 3, 13, 0, LAVENDER_CUBONE_HOUSE + warp 7, 13, 0, NAME_RATERS_HOUSE + + db 6 ; signs + sign 11, 9, 4 ; LavenderTownText4 + sign 9, 3, 5 ; LavenderTownText5 + sign 16, 13, 6 ; MartSignText + sign 4, 5, 7 ; PokeCenterSignText + sign 5, 9, 8 ; LavenderTownText8 + sign 17, 7, 9 ; LavenderTownText9 + + db 3 ; objects + object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person + + ; warp-to + warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER + warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F + warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE + warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART + warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE + warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/LoreleisRoom.asm b/data/mapObjects/LoreleisRoom.asm new file mode 100755 index 00000000..06450bb4 --- /dev/null +++ b/data/mapObjects/LoreleisRoom.asm @@ -0,0 +1,19 @@ +LoreleisRoom_Object: + db $3 ; border block + + db 4 ; warps + warp 4, 11, 2, INDIGO_PLATEAU_LOBBY + warp 5, 11, 2, INDIGO_PLATEAU_LOBBY + warp 4, 0, 0, BRUNOS_ROOM + warp 5, 0, 1, BRUNOS_ROOM + + db 0 ; signs + + db 1 ; objects + object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 + + ; warp-to + warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/MrFujisHouse.asm b/data/mapObjects/MrFujisHouse.asm new file mode 100755 index 00000000..5b6ca2a6 --- /dev/null +++ b/data/mapObjects/MrFujisHouse.asm @@ -0,0 +1,20 @@ +MrFujisHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 + + db 0 ; signs + + db 6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person + object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person + object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person + object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person + + ; warp-to + warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH + warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH diff --git a/data/mapObjects/MrPsychicsHouse.asm b/data/mapObjects/MrPsychicsHouse.asm new file mode 100755 index 00000000..01f9e11c --- /dev/null +++ b/data/mapObjects/MrPsychicsHouse.asm @@ -0,0 +1,15 @@ +MrPsychicsHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 7, -1 + warp 3, 7, 7, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person + + ; warp-to + warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH + warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH diff --git a/data/mapObjects/MtMoon1F.asm b/data/mapObjects/MtMoon1F.asm new file mode 100755 index 00000000..56820161 --- /dev/null +++ b/data/mapObjects/MtMoon1F.asm @@ -0,0 +1,34 @@ +MtMoon1F_Object: + db $3 ; border block + + db 5 ; warps + warp 14, 35, 1, -1 + warp 15, 35, 1, -1 + warp 5, 5, 0, MT_MOON_B1F + warp 17, 11, 2, MT_MOON_B1F + warp 25, 15, 3, MT_MOON_B1F + + db 1 ; signs + sign 15, 23, 14 ; MtMoon1Text14 + + db 13 ; objects + object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 + object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 + object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 + object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 + object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 + object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 + object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 + object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION + object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE + object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY + object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE + object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION + object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 + + ; warp-to + warp_to 14, 35, MT_MOON_1F_WIDTH + warp_to 15, 35, MT_MOON_1F_WIDTH + warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F + warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F + warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonB1F.asm b/data/mapObjects/MtMoonB1F.asm new file mode 100755 index 00000000..a8365ba7 --- /dev/null +++ b/data/mapObjects/MtMoonB1F.asm @@ -0,0 +1,26 @@ +MtMoonB1F_Object: + db $3 ; border block + + db 8 ; warps + warp 5, 5, 2, MT_MOON_1F + warp 17, 11, 0, MT_MOON_B2F + warp 25, 9, 3, MT_MOON_1F + warp 25, 15, 4, MT_MOON_1F + warp 21, 17, 1, MT_MOON_B2F + warp 13, 27, 2, MT_MOON_B2F + warp 23, 3, 3, MT_MOON_B2F + warp 27, 3, 2, -1 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F + warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F + warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F + warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 27, 3, MT_MOON_B1F_WIDTH diff --git a/data/mapObjects/MtMoonB2F.asm b/data/mapObjects/MtMoonB2F.asm new file mode 100755 index 00000000..27b2383f --- /dev/null +++ b/data/mapObjects/MtMoonB2F.asm @@ -0,0 +1,27 @@ +MtMoonB2F_Object: + db $3 ; border block + + db 4 ; warps + warp 25, 9, 1, MT_MOON_B1F + warp 21, 17, 4, MT_MOON_B1F + warp 15, 27, 5, MT_MOON_B1F + warp 5, 7, 6, MT_MOON_B1F + + db 0 ; signs + + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 + object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 + object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 + object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 + object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person + object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person + object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP + object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01 + + ; warp-to + warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F + warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F + warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F + warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm new file mode 100755 index 00000000..b23703e6 --- /dev/null +++ b/data/mapObjects/MtMoonPokecenter.asm @@ -0,0 +1,20 @@ +MtMoonPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 + + db 0 ; signs + + db 6 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person + object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person + object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person + + ; warp-to + warp_to 3, 7, MT_MOON_POKECENTER_WIDTH + warp_to 4, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/Museum1F.asm b/data/mapObjects/Museum1F.asm new file mode 100755 index 00000000..1cfd2c68 --- /dev/null +++ b/data/mapObjects/Museum1F.asm @@ -0,0 +1,25 @@ +Museum1F_Object: + db $a ; border block + + db 5 ; warps + warp 10, 7, 0, -1 + warp 11, 7, 0, -1 + warp 16, 7, 1, -1 + warp 17, 7, 1, -1 + warp 7, 7, 0, MUSEUM_2F + + db 0 ; signs + + db 5 ; objects + object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person + object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person + object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person + object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person + + ; warp-to + warp_to 10, 7, MUSEUM_1F_WIDTH + warp_to 11, 7, MUSEUM_1F_WIDTH + warp_to 16, 7, MUSEUM_1F_WIDTH + warp_to 17, 7, MUSEUM_1F_WIDTH + warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/Museum2F.asm b/data/mapObjects/Museum2F.asm new file mode 100755 index 00000000..80815820 --- /dev/null +++ b/data/mapObjects/Museum2F.asm @@ -0,0 +1,19 @@ +Museum2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 7, 4, MUSEUM_1F + + db 2 ; signs + sign 11, 2, 6 ; Museum2FText6 + sign 2, 5, 7 ; Museum2FText7 + + db 5 ; objects + object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person + object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person + object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person + object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person + object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person + + ; warp-to + warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/NameRatersHouse.asm b/data/mapObjects/NameRatersHouse.asm new file mode 100755 index 00000000..da95bc43 --- /dev/null +++ b/data/mapObjects/NameRatersHouse.asm @@ -0,0 +1,15 @@ +NameRatersHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 5, -1 + warp 3, 7, 5, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person + + ; warp-to + warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH + warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/OaksLab.asm b/data/mapObjects/OaksLab.asm new file mode 100755 index 00000000..fa78ccdf --- /dev/null +++ b/data/mapObjects/OaksLab.asm @@ -0,0 +1,25 @@ +OaksLab_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 11, 2, -1 + warp 5, 11, 2, -1 + + db 0 ; signs + + db 11 ; objects + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 + object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person + object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person + object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person + object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person + object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person + object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person + object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person + object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person + object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person + object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person + + ; warp-to + warp_to 4, 11, OAKS_LAB_WIDTH + warp_to 5, 11, OAKS_LAB_WIDTH diff --git a/data/mapObjects/PalletTown.asm b/data/mapObjects/PalletTown.asm new file mode 100755 index 00000000..68b01175 --- /dev/null +++ b/data/mapObjects/PalletTown.asm @@ -0,0 +1,23 @@ +PalletTown_Object: + db $b ; border block + + db 3 ; warps + warp 5, 5, 0, REDS_HOUSE_1F + warp 13, 5, 0, BLUES_HOUSE + warp 12, 11, 1, OAKS_LAB + + db 4 ; signs + sign 13, 13, 4 ; PalletTownText4 + sign 7, 9, 5 ; PalletTownText5 + sign 3, 5, 6 ; PalletTownText6 + sign 11, 5, 7 ; PalletTownText7 + + db 3 ; objects + object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person + object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person + object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person + + ; warp-to + warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F + warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE + warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/PewterCity.asm b/data/mapObjects/PewterCity.asm new file mode 100755 index 00000000..e1a3eecb --- /dev/null +++ b/data/mapObjects/PewterCity.asm @@ -0,0 +1,36 @@ +PewterCity_Object: + db $a ; border block + + db 7 ; warps + warp 14, 7, 0, MUSEUM_1F + warp 19, 5, 2, MUSEUM_1F + warp 16, 17, 0, PEWTER_GYM + warp 29, 13, 0, PEWTER_NIDORAN_HOUSE + warp 23, 17, 0, PEWTER_MART + warp 7, 29, 0, PEWTER_SPEECH_HOUSE + warp 13, 25, 0, PEWTER_POKECENTER + + db 7 ; signs + sign 19, 29, 6 ; PewterCityText6 + sign 33, 19, 7 ; PewterCityText7 + sign 24, 17, 8 ; MartSignText + sign 14, 25, 9 ; PokeCenterSignText + sign 15, 9, 10 ; PewterCityText10 + sign 11, 17, 11 ; PewterCityText11 + sign 25, 23, 12 ; PewterCityText12 + + db 5 ; objects + object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person + object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person + object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person + + ; warp-to + warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM + warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE + warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART + warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE + warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/PewterGym.asm b/data/mapObjects/PewterGym.asm new file mode 100755 index 00000000..538c3923 --- /dev/null +++ b/data/mapObjects/PewterGym.asm @@ -0,0 +1,17 @@ +PewterGym_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 13, 2, -1 + warp 5, 13, 2, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 + object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person + + ; warp-to + warp_to 4, 13, PEWTER_GYM_WIDTH + warp_to 5, 13, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/PewterMart.asm b/data/mapObjects/PewterMart.asm new file mode 100755 index 00000000..9b983316 --- /dev/null +++ b/data/mapObjects/PewterMart.asm @@ -0,0 +1,17 @@ +PewterMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person + + ; warp-to + warp_to 3, 7, PEWTER_MART_WIDTH + warp_to 4, 7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/PewterNidoranHouse.asm b/data/mapObjects/PewterNidoranHouse.asm new file mode 100755 index 00000000..f00317d1 --- /dev/null +++ b/data/mapObjects/PewterNidoranHouse.asm @@ -0,0 +1,17 @@ +PewterNidoranHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person + object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person + object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person + + ; warp-to + warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH + warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH diff --git a/data/mapObjects/PewterPokecenter.asm b/data/mapObjects/PewterPokecenter.asm new file mode 100755 index 00000000..2b375bf9 --- /dev/null +++ b/data/mapObjects/PewterPokecenter.asm @@ -0,0 +1,18 @@ +PewterPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 6, -1 + warp 4, 7, 6, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person + object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, PEWTER_POKECENTER_WIDTH + warp_to 4, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/PewterSpeechHouse.asm b/data/mapObjects/PewterSpeechHouse.asm new file mode 100755 index 00000000..e7134cb5 --- /dev/null +++ b/data/mapObjects/PewterSpeechHouse.asm @@ -0,0 +1,16 @@ +PewterSpeechHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 5, -1 + warp 3, 7, 5, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person + + ; warp-to + warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH + warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH diff --git a/data/mapObjects/PokemonFanClub.asm b/data/mapObjects/PokemonFanClub.asm new file mode 100755 index 00000000..e1f175f0 --- /dev/null +++ b/data/mapObjects/PokemonFanClub.asm @@ -0,0 +1,22 @@ +PokemonFanClub_Object: + db $d ; border block + + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 + + db 2 ; signs + sign 1, 0, 7 ; FanClubText7 + sign 6, 0, 8 ; FanClubText8 + + db 6 ; objects + object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person + object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person + object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person + object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person + object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person + object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person + + ; warp-to + warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH + warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm new file mode 100755 index 00000000..109b5b8e --- /dev/null +++ b/data/mapObjects/PokemonMansion1F.asm @@ -0,0 +1,29 @@ +PokemonMansion1F_Object: + db $2e ; border block + + db 8 ; warps + warp 4, 27, 0, -1 + warp 5, 27, 0, -1 + warp 6, 27, 0, -1 + warp 7, 27, 0, -1 + warp 5, 10, 0, POKEMON_MANSION_2F + warp 21, 23, 0, POKEMON_MANSION_B1F + warp 26, 27, 0, -1 + warp 27, 27, 0, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS + + ; warp-to + warp_to 4, 27, POKEMON_MANSION_1F_WIDTH + warp_to 5, 27, POKEMON_MANSION_1F_WIDTH + warp_to 6, 27, POKEMON_MANSION_1F_WIDTH + warp_to 7, 27, POKEMON_MANSION_1F_WIDTH + warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F + warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F + warp_to 26, 27, POKEMON_MANSION_1F_WIDTH + warp_to 27, 27, POKEMON_MANSION_1F_WIDTH diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm new file mode 100755 index 00000000..6c0cc5f8 --- /dev/null +++ b/data/mapObjects/PokemonMansion2F.asm @@ -0,0 +1,22 @@ +PokemonMansion2F_Object: + db $1 ; border block + + db 4 ; warps + warp 5, 10, 4, POKEMON_MANSION_1F + warp 7, 10, 0, POKEMON_MANSION_3F + warp 25, 14, 2, POKEMON_MANSION_3F + warp 6, 1, 1, POKEMON_MANSION_3F + + db 0 ; signs + + db 4 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 + object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person + + ; warp-to + warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F + warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F + warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F + warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F diff --git a/data/mapObjects/PokemonMansion3F.asm b/data/mapObjects/PokemonMansion3F.asm new file mode 100755 index 00000000..7c8c9c22 --- /dev/null +++ b/data/mapObjects/PokemonMansion3F.asm @@ -0,0 +1,21 @@ +PokemonMansion3F_Object: + db $1 ; border block + + db 3 ; warps + warp 7, 10, 1, POKEMON_MANSION_2F + warp 6, 1, 3, POKEMON_MANSION_2F + warp 25, 14, 2, POKEMON_MANSION_2F + + db 0 ; signs + + db 5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 + object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 + object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION + object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON + object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person + + ; warp-to + warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F + warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F + warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/mapObjects/PokemonMansionB1F.asm new file mode 100755 index 00000000..ac232799 --- /dev/null +++ b/data/mapObjects/PokemonMansionB1F.asm @@ -0,0 +1,20 @@ +PokemonMansionB1F_Object: + db $1 ; border block + + db 1 ; warps + warp 23, 22, 5, POKEMON_MANSION_1F + + db 0 ; signs + + db 8 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 + object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 + object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY + object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE + object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 + object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 + object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person + object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY + + ; warp-to + warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F diff --git a/data/mapObjects/PokemonTower1F.asm b/data/mapObjects/PokemonTower1F.asm new file mode 100755 index 00000000..cf62836b --- /dev/null +++ b/data/mapObjects/PokemonTower1F.asm @@ -0,0 +1,21 @@ +PokemonTower1F_Object: + db $1 ; border block + + db 3 ; warps + warp 10, 17, 1, -1 + warp 11, 17, 1, -1 + warp 18, 9, 1, POKEMON_TOWER_2F + + db 0 ; signs + + db 5 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person + object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person + object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person + object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person + object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person + + ; warp-to + warp_to 10, 17, POKEMON_TOWER_1F_WIDTH + warp_to 11, 17, POKEMON_TOWER_1F_WIDTH + warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F diff --git a/data/mapObjects/PokemonTower2F.asm b/data/mapObjects/PokemonTower2F.asm new file mode 100755 index 00000000..5ce437d1 --- /dev/null +++ b/data/mapObjects/PokemonTower2F.asm @@ -0,0 +1,16 @@ +PokemonTower2F_Object: + db $1 ; border block + + db 2 ; warps + warp 3, 9, 0, POKEMON_TOWER_3F + warp 18, 9, 2, POKEMON_TOWER_1F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person + object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person + + ; warp-to + warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F + warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F diff --git a/data/mapObjects/PokemonTower3F.asm b/data/mapObjects/PokemonTower3F.asm new file mode 100755 index 00000000..79b83f88 --- /dev/null +++ b/data/mapObjects/PokemonTower3F.asm @@ -0,0 +1,18 @@ +PokemonTower3F_Object: + db $1 ; border block + + db 2 ; warps + warp 3, 9, 0, POKEMON_TOWER_2F + warp 18, 9, 1, POKEMON_TOWER_4F + + db 0 ; signs + + db 4 ; objects + object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 + object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 + object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 + object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE + + ; warp-to + warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F + warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F diff --git a/data/mapObjects/PokemonTower4F.asm b/data/mapObjects/PokemonTower4F.asm new file mode 100755 index 00000000..db86c02c --- /dev/null +++ b/data/mapObjects/PokemonTower4F.asm @@ -0,0 +1,20 @@ +PokemonTower4F_Object: + db $1 ; border block + + db 2 ; warps + warp 3, 9, 0, POKEMON_TOWER_5F + warp 18, 9, 1, POKEMON_TOWER_3F + + db 0 ; signs + + db 6 ; objects + object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 + object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 + object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 + object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER + object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING + object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP + + ; warp-to + warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F + warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F diff --git a/data/mapObjects/PokemonTower5F.asm b/data/mapObjects/PokemonTower5F.asm new file mode 100755 index 00000000..b482871f --- /dev/null +++ b/data/mapObjects/PokemonTower5F.asm @@ -0,0 +1,20 @@ +PokemonTower5F_Object: + db $1 ; border block + + db 2 ; warps + warp 3, 9, 0, POKEMON_TOWER_4F + warp 18, 9, 0, POKEMON_TOWER_6F + + db 0 ; signs + + db 6 ; objects + object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person + object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 + object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 + object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 + object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 + object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET + + ; warp-to + warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F + warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/PokemonTower6F.asm b/data/mapObjects/PokemonTower6F.asm new file mode 100755 index 00000000..823fe78a --- /dev/null +++ b/data/mapObjects/PokemonTower6F.asm @@ -0,0 +1,19 @@ +PokemonTower6F_Object: + db $1 ; border block + + db 2 ; warps + warp 18, 9, 1, POKEMON_TOWER_5F + warp 9, 16, 0, POKEMON_TOWER_7F + + db 0 ; signs + + db 5 ; objects + object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 + object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 + object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY + object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY + + ; warp-to + warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F + warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F diff --git a/data/mapObjects/PokemonTower7F.asm b/data/mapObjects/PokemonTower7F.asm new file mode 100755 index 00000000..79cb5b0d --- /dev/null +++ b/data/mapObjects/PokemonTower7F.asm @@ -0,0 +1,16 @@ +PokemonTower7F_Object: + db $1 ; border block + + db 1 ; warps + warp 9, 16, 1, POKEMON_TOWER_6F + + db 0 ; signs + + db 4 ; objects + object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 + object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 + object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/PowerPlant.asm b/data/mapObjects/PowerPlant.asm new file mode 100755 index 00000000..a8548b1c --- /dev/null +++ b/data/mapObjects/PowerPlant.asm @@ -0,0 +1,30 @@ +PowerPlant_Object: + db $2e ; border block + + db 3 ; warps + warp 4, 35, 3, -1 + warp 5, 35, 3, -1 + warp 0, 11, 3, -1 + + db 0 ; signs + + db 14 ; objects + object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 + object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 + object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 + object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 + object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 + object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 + object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 + object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 + object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 + object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS + object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP + object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY + object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25 + object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33 + + ; warp-to + warp_to 4, 35, POWER_PLANT_WIDTH + warp_to 5, 35, POWER_PLANT_WIDTH + warp_to 0, 11, POWER_PLANT_WIDTH diff --git a/data/mapObjects/RedsHouse1F.asm b/data/mapObjects/RedsHouse1F.asm new file mode 100755 index 00000000..a54b5411 --- /dev/null +++ b/data/mapObjects/RedsHouse1F.asm @@ -0,0 +1,18 @@ +RedsHouse1F_Object: + db $a ; border block + + db 3 ; warps + warp 2, 7, 0, -1 ; exit1 + warp 3, 7, 0, -1 ; exit2 + warp 7, 1, 0, REDS_HOUSE_2F ; staircase + + db 1 ; signs + sign 3, 1, 2 ; TV + + db 1 ; objects + object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom + + ; warp-to + warp_to 2, 7, REDS_HOUSE_1F_WIDTH + warp_to 3, 7, REDS_HOUSE_1F_WIDTH + warp_to 7, 1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/RedsHouse2F.asm b/data/mapObjects/RedsHouse2F.asm new file mode 100755 index 00000000..98e9c236 --- /dev/null +++ b/data/mapObjects/RedsHouse2F.asm @@ -0,0 +1,12 @@ +RedsHouse2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 1, 2, REDS_HOUSE_1F + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 7, 1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/RockTunnel1F.asm b/data/mapObjects/RockTunnel1F.asm new file mode 100755 index 00000000..1cf5a12f --- /dev/null +++ b/data/mapObjects/RockTunnel1F.asm @@ -0,0 +1,34 @@ +RockTunnel1F_Object: + db $3 ; border block + + db 8 ; warps + warp 15, 3, 1, -1 + warp 15, 0, 1, -1 + warp 15, 33, 2, -1 + warp 15, 35, 2, -1 + warp 37, 3, 0, ROCK_TUNNEL_B1F + warp 5, 3, 1, ROCK_TUNNEL_B1F + warp 17, 11, 2, ROCK_TUNNEL_B1F + warp 37, 17, 3, ROCK_TUNNEL_B1F + + db 1 ; signs + sign 11, 29, 8 ; RockTunnel1Text8 + + db 7 ; objects + object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 + object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 + object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 + object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 + object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 + object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 + object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + + ; warp-to + warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH + warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH + warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH + warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH + warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F + warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F + warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F + warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F diff --git a/data/mapObjects/RockTunnelB1F.asm b/data/mapObjects/RockTunnelB1F.asm new file mode 100755 index 00000000..f562168e --- /dev/null +++ b/data/mapObjects/RockTunnelB1F.asm @@ -0,0 +1,26 @@ +RockTunnelB1F_Object: + db $3 ; border block + + db 4 ; warps + warp 33, 25, 4, ROCK_TUNNEL_1F + warp 27, 3, 5, ROCK_TUNNEL_1F + warp 23, 11, 6, ROCK_TUNNEL_1F + warp 3, 3, 7, ROCK_TUNNEL_1F + + db 0 ; signs + + db 8 ; objects + object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 + object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 + object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 + object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 + object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 + object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 + object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 + object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 + + ; warp-to + warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F + warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F + warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F + warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm new file mode 100755 index 00000000..a7619f7f --- /dev/null +++ b/data/mapObjects/RockTunnelPokecenter.asm @@ -0,0 +1,18 @@ +RockTunnelPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person + object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH + warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/RocketHideoutB1F.asm b/data/mapObjects/RocketHideoutB1F.asm new file mode 100755 index 00000000..99537510 --- /dev/null +++ b/data/mapObjects/RocketHideoutB1F.asm @@ -0,0 +1,27 @@ +RocketHideoutB1F_Object: + db $2e ; border block + + db 5 ; warps + warp 23, 2, 0, ROCKET_HIDEOUT_B2F + warp 21, 2, 2, GAME_CORNER + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 24, 3, ROCKET_HIDEOUT_B2F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + db 0 ; signs + + db 7 ; objects + object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 + object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 + object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 + object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 + object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 + object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE + object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION + + ; warp-to + warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER + warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/mapObjects/RocketHideoutB2F.asm new file mode 100755 index 00000000..36fe9289 --- /dev/null +++ b/data/mapObjects/RocketHideoutB2F.asm @@ -0,0 +1,25 @@ +RocketHideoutB2F_Object: + db $2e ; border block + + db 5 ; warps + warp 27, 8, 0, ROCKET_HIDEOUT_B1F + warp 21, 8, 0, ROCKET_HIDEOUT_B3F + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 22, 3, ROCKET_HIDEOUT_B1F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + db 0 ; signs + + db 5 ; objects + object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 + object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE + object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET + object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 + object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION + + ; warp-to + warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F + warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F + warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F + warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB3F.asm b/data/mapObjects/RocketHideoutB3F.asm new file mode 100755 index 00000000..6169dbed --- /dev/null +++ b/data/mapObjects/RocketHideoutB3F.asm @@ -0,0 +1,18 @@ +RocketHideoutB3F_Object: + db $2e ; border block + + db 2 ; warps + warp 25, 6, 1, ROCKET_HIDEOUT_B2F + warp 19, 18, 0, ROCKET_HIDEOUT_B4F + + db 0 ; signs + + db 4 ; objects + object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 + object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 + object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10 + object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY + + ; warp-to + warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/mapObjects/RocketHideoutB4F.asm new file mode 100755 index 00000000..be353f25 --- /dev/null +++ b/data/mapObjects/RocketHideoutB4F.asm @@ -0,0 +1,25 @@ +RocketHideoutB4F_Object: + db $2e ; border block + + db 3 ; warps + warp 19, 10, 1, ROCKET_HIDEOUT_B3F + warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR + warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR + + db 0 ; signs + + db 9 ; objects + object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 + object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 + object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 + object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 + object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP + object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02 + object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON + object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE + object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY + + ; warp-to + warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F + warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/mapObjects/RocketHideoutElevator.asm new file mode 100755 index 00000000..bc4fd7ff --- /dev/null +++ b/data/mapObjects/RocketHideoutElevator.asm @@ -0,0 +1,15 @@ +RocketHideoutElevator_Object: + db $f ; border block + + db 2 ; warps + warp 2, 1, 2, ROCKET_HIDEOUT_B1F + warp 3, 1, 4, ROCKET_HIDEOUT_B1F + + db 1 ; signs + sign 1, 1, 1 ; RocketHideoutElevatorText1 + + db 0 ; objects + + ; warp-to + warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F + warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/Route1.asm b/data/mapObjects/Route1.asm new file mode 100755 index 00000000..0815fe67 --- /dev/null +++ b/data/mapObjects/Route1.asm @@ -0,0 +1,14 @@ +Route1_Object: + db $b ; border block + + db 0 ; warps + + db 1 ; signs + sign 9, 27, 3 ; Route1Text3 + + db 2 ; objects + object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person + object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person + + ; warp-to (unused) + warp_to 2, 7, 4 diff --git a/data/mapObjects/Route10.asm b/data/mapObjects/Route10.asm new file mode 100755 index 00000000..12850577 --- /dev/null +++ b/data/mapObjects/Route10.asm @@ -0,0 +1,28 @@ +Route10_Object: + db $2c ; border block + + db 4 ; warps + warp 11, 19, 0, ROCK_TUNNEL_POKECENTER + warp 8, 17, 0, ROCK_TUNNEL_1F + warp 8, 53, 2, ROCK_TUNNEL_1F + warp 6, 39, 0, POWER_PLANT + + db 4 ; signs + sign 7, 19, 7 ; Route10Text7 + sign 12, 19, 8 ; PokeCenterSignText + sign 9, 55, 9 ; Route10Text9 + sign 5, 41, 10 ; Route10Text10 + + db 6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 + object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 + object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 + object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 + object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + + ; warp-to + warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER + warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F + warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F + warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/Route11.asm b/data/mapObjects/Route11.asm new file mode 100755 index 00000000..5ed232f5 --- /dev/null +++ b/data/mapObjects/Route11.asm @@ -0,0 +1,31 @@ +Route11_Object: + db $f ; border block + + db 5 ; warps + warp 49, 8, 0, ROUTE_11_GATE_1F + warp 49, 9, 1, ROUTE_11_GATE_1F + warp 58, 8, 2, ROUTE_11_GATE_1F + warp 58, 9, 3, ROUTE_11_GATE_1F + warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 + + db 1 ; signs + sign 1, 5, 11 ; Route11Text11 + + db 10 ; objects + object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 + object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 + object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 + object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 + object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 + object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 + object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 + object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 + + ; warp-to + warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/Route11Gate1F.asm b/data/mapObjects/Route11Gate1F.asm new file mode 100755 index 00000000..5c4a120c --- /dev/null +++ b/data/mapObjects/Route11Gate1F.asm @@ -0,0 +1,21 @@ +Route11Gate1F_Object: + db $a ; border block + + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_11_GATE_2F + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + + ; warp-to + warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/Route11Gate2F.asm b/data/mapObjects/Route11Gate2F.asm new file mode 100755 index 00000000..bf305bba --- /dev/null +++ b/data/mapObjects/Route11Gate2F.asm @@ -0,0 +1,16 @@ +Route11Gate2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 7, 4, ROUTE_11_GATE_1F + + db 2 ; signs + sign 1, 2, 3 ; Route11GateUpstairsText3 + sign 6, 2, 4 ; Route11GateUpstairsText4 + + db 2 ; objects + object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person + object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person + + ; warp-to + warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/Route12.asm b/data/mapObjects/Route12.asm new file mode 100755 index 00000000..a9d84cf0 --- /dev/null +++ b/data/mapObjects/Route12.asm @@ -0,0 +1,30 @@ +Route12_Object: + db $43 ; border block + + db 4 ; warps + warp 10, 15, 0, ROUTE_12_GATE_1F + warp 11, 15, 1, ROUTE_12_GATE_1F + warp 10, 21, 2, ROUTE_12_GATE_1F + warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE + + db 2 ; signs + sign 13, 13, 11 ; Route12Text11 + sign 11, 63, 12 ; Route12Text12 + + db 10 ; objects + object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person + object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 + object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4 + object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 + object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 + object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 + object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 + object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 + object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16 + object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON + + ; warp-to + warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/mapObjects/Route12Gate1F.asm b/data/mapObjects/Route12Gate1F.asm new file mode 100755 index 00000000..94f6b91a --- /dev/null +++ b/data/mapObjects/Route12Gate1F.asm @@ -0,0 +1,21 @@ +Route12Gate1F_Object: + db $a ; border block + + db 5 ; warps + warp 4, 0, 0, -1 + warp 5, 0, 1, -1 + warp 4, 7, 2, -1 + warp 5, 7, 2, -1 + warp 8, 6, 0, ROUTE_12_GATE_2F + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH + warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH + warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH + warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH + warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/Route12Gate2F.asm b/data/mapObjects/Route12Gate2F.asm new file mode 100755 index 00000000..cc6c1c19 --- /dev/null +++ b/data/mapObjects/Route12Gate2F.asm @@ -0,0 +1,15 @@ +Route12Gate2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 7, 4, ROUTE_12_GATE_1F + + db 2 ; signs + sign 1, 2, 2 ; Route12GateUpstairsText2 + sign 6, 2, 3 ; Route12GateUpstairsText3 + + db 1 ; objects + object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person + + ; warp-to + warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/Route12SuperRodHouse.asm b/data/mapObjects/Route12SuperRodHouse.asm new file mode 100755 index 00000000..458378a2 --- /dev/null +++ b/data/mapObjects/Route12SuperRodHouse.asm @@ -0,0 +1,15 @@ +Route12SuperRodHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person + + ; warp-to + warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH + warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/Route13.asm b/data/mapObjects/Route13.asm new file mode 100755 index 00000000..3f460901 --- /dev/null +++ b/data/mapObjects/Route13.asm @@ -0,0 +1,21 @@ +Route13_Object: + db $43 ; border block + + db 0 ; warps + + db 3 ; signs + sign 15, 13, 11 ; Route13Text11 + sign 33, 5, 12 ; Route13Text12 + sign 31, 11, 13 ; Route13Text13 + + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 + object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 + object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 + object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 + object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 + object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 + object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 + object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 + object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 + object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 diff --git a/data/mapObjects/Route14.asm b/data/mapObjects/Route14.asm new file mode 100755 index 00000000..565e587f --- /dev/null +++ b/data/mapObjects/Route14.asm @@ -0,0 +1,19 @@ +Route14_Object: + db $43 ; border block + + db 0 ; warps + + db 1 ; signs + sign 17, 13, 11 ; Route14Text11 + + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 + object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 + object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 + object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 + object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 + object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 + object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 diff --git a/data/mapObjects/Route15.asm b/data/mapObjects/Route15.asm new file mode 100755 index 00000000..f52cc1b8 --- /dev/null +++ b/data/mapObjects/Route15.asm @@ -0,0 +1,30 @@ +Route15_Object: + db $43 ; border block + + db 4 ; warps + warp 7, 8, 0, ROUTE_15_GATE_1F + warp 7, 9, 1, ROUTE_15_GATE_1F + warp 14, 8, 2, ROUTE_15_GATE_1F + warp 14, 9, 3, ROUTE_15_GATE_1F + + db 1 ; signs + sign 39, 9, 12 ; Route15Text12 + + db 11 ; objects + object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 + object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 + object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 + object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20 + + ; warp-to + warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/Route15Gate1F.asm b/data/mapObjects/Route15Gate1F.asm new file mode 100755 index 00000000..23b1f5a7 --- /dev/null +++ b/data/mapObjects/Route15Gate1F.asm @@ -0,0 +1,21 @@ +Route15Gate1F_Object: + db $a ; border block + + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_15_GATE_2F + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + + ; warp-to + warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/Route15Gate2F.asm b/data/mapObjects/Route15Gate2F.asm new file mode 100755 index 00000000..162f2b1f --- /dev/null +++ b/data/mapObjects/Route15Gate2F.asm @@ -0,0 +1,14 @@ +Route15Gate2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 7, 4, ROUTE_15_GATE_1F + + db 1 ; signs + sign 6, 2, 2 ; Route15GateUpstairsText2 + + db 1 ; objects + object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1 + + ; warp-to + warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/Route16.asm b/data/mapObjects/Route16.asm new file mode 100755 index 00000000..fb23e6ca --- /dev/null +++ b/data/mapObjects/Route16.asm @@ -0,0 +1,37 @@ +Route16_Object: + db $f ; border block + + db 9 ; warps + warp 17, 10, 0, ROUTE_16_GATE_1F + warp 17, 11, 1, ROUTE_16_GATE_1F + warp 24, 10, 2, ROUTE_16_GATE_1F + warp 24, 11, 3, ROUTE_16_GATE_1F + warp 17, 4, 4, ROUTE_16_GATE_1F + warp 17, 5, 5, ROUTE_16_GATE_1F + warp 24, 4, 6, ROUTE_16_GATE_1F + warp 24, 5, 7, ROUTE_16_GATE_1F + warp 7, 5, 0, ROUTE_16_FLY_HOUSE + + db 2 ; signs + sign 27, 11, 8 ; Route16Text8 + sign 5, 17, 9 ; Route16Text9 + + db 7 ; objects + object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 + object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 + object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 + object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 + object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 + object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 + object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person + + ; warp-to + warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE diff --git a/data/mapObjects/Route16FlyHouse.asm b/data/mapObjects/Route16FlyHouse.asm new file mode 100755 index 00000000..ec493fef --- /dev/null +++ b/data/mapObjects/Route16FlyHouse.asm @@ -0,0 +1,16 @@ +Route16FlyHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 8, -1 + warp 3, 7, 8, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person + + ; warp-to + warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH + warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH diff --git a/data/mapObjects/Route16Gate1F.asm b/data/mapObjects/Route16Gate1F.asm new file mode 100755 index 00000000..1d5baa1d --- /dev/null +++ b/data/mapObjects/Route16Gate1F.asm @@ -0,0 +1,30 @@ +Route16Gate1F_Object: + db $a ; border block + + db 9 ; warps + warp 0, 8, 0, -1 + warp 0, 9, 1, -1 + warp 7, 8, 2, -1 + warp 7, 9, 2, -1 + warp 0, 2, 4, -1 + warp 0, 3, 5, -1 + warp 7, 2, 6, -1 + warp 7, 3, 7, -1 + warp 6, 12, 0, ROUTE_16_GATE_2F + + db 0 ; signs + + db 2 ; objects + object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person + object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person + + ; warp-to + warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH + warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH + warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH + warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH + warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH + warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/Route16Gate2F.asm b/data/mapObjects/Route16Gate2F.asm new file mode 100755 index 00000000..5914f854 --- /dev/null +++ b/data/mapObjects/Route16Gate2F.asm @@ -0,0 +1,16 @@ +Route16Gate2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 7, 8, ROUTE_16_GATE_1F + + db 2 ; signs + sign 1, 2, 3 ; Route16GateUpstairsText3 + sign 6, 2, 4 ; Route16GateUpstairsText4 + + db 2 ; objects + object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person + + ; warp-to + warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/Route17.asm b/data/mapObjects/Route17.asm new file mode 100755 index 00000000..f5bc4307 --- /dev/null +++ b/data/mapObjects/Route17.asm @@ -0,0 +1,24 @@ +Route17_Object: + db $43 ; border block + + db 0 ; warps + + db 6 ; signs + sign 9, 51, 11 ; Route17Text11 + sign 9, 63, 12 ; Route17Text12 + sign 9, 75, 13 ; Route17Text13 + sign 9, 87, 14 ; Route17Text14 + sign 9, 111, 15 ; Route17Text15 + sign 9, 141, 16 ; Route17Text16 + + db 10 ; objects + object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 + object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 + object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 + object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 + object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 + object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 + object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 + object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 + object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 + object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 diff --git a/data/mapObjects/Route18.asm b/data/mapObjects/Route18.asm new file mode 100755 index 00000000..8bacd6c0 --- /dev/null +++ b/data/mapObjects/Route18.asm @@ -0,0 +1,23 @@ +Route18_Object: + db $43 ; border block + + db 4 ; warps + warp 33, 8, 0, ROUTE_18_GATE_1F + warp 33, 9, 1, ROUTE_18_GATE_1F + warp 40, 8, 2, ROUTE_18_GATE_1F + warp 40, 9, 3, ROUTE_18_GATE_1F + + db 2 ; signs + sign 43, 7, 4 ; Route18Text4 + sign 33, 5, 5 ; Route18Text5 + + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 + object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 + object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 + + ; warp-to + warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route18Gate1F.asm b/data/mapObjects/Route18Gate1F.asm new file mode 100755 index 00000000..83cb386a --- /dev/null +++ b/data/mapObjects/Route18Gate1F.asm @@ -0,0 +1,21 @@ +Route18Gate1F_Object: + db $a ; border block + + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_18_GATE_2F + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/Route18Gate2F.asm b/data/mapObjects/Route18Gate2F.asm new file mode 100755 index 00000000..e48ec3b8 --- /dev/null +++ b/data/mapObjects/Route18Gate2F.asm @@ -0,0 +1,15 @@ +Route18Gate2F_Object: + db $a ; border block + + db 1 ; warps + warp 7, 7, 4, ROUTE_18_GATE_1F + + db 2 ; signs + sign 1, 2, 2 ; Route18GateUpstairsText2 + sign 6, 2, 3 ; Route18GateUpstairsText3 + + db 1 ; objects + object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person + + ; warp-to + warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route19.asm b/data/mapObjects/Route19.asm new file mode 100755 index 00000000..9b39618e --- /dev/null +++ b/data/mapObjects/Route19.asm @@ -0,0 +1,21 @@ +Route19_Object: + db $43 ; border block + + db 0 ; warps + + db 1 ; signs + sign 11, 9, 11 ; Route19Text11 + + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 + object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 + object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 + object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 + object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 + object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 + object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 + object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 + + ; warp-to diff --git a/data/mapObjects/Route2.asm b/data/mapObjects/Route2.asm new file mode 100755 index 00000000..b27ad199 --- /dev/null +++ b/data/mapObjects/Route2.asm @@ -0,0 +1,33 @@ +Route2_Object: + db $f ; border block + + db 6 ; warps + warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 + warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 19, 0, ROUTE_2_TRADE_HOUSE + warp 16, 35, 1, ROUTE_2_GATE + warp 15, 39, 2, ROUTE_2_GATE + warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE + + db 2 ; signs + sign 5, 65, 3 ; Route2Text3 + sign 11, 11, 4 ; Route2Text4 + + db 2 ; objects + object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE + object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP + + ; warp-to + warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 + warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE + warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + + ; unused + warp_to 2, 7, 4 + db $12, $c7, $9, $7 + warp_to 2, 7, 4 + warp_to 2, 7, 4 + warp_to 2, 7, 4 diff --git a/data/mapObjects/Route20.asm b/data/mapObjects/Route20.asm new file mode 100755 index 00000000..7bceef97 --- /dev/null +++ b/data/mapObjects/Route20.asm @@ -0,0 +1,26 @@ +Route20_Object: + db $43 ; border block + + db 2 ; warps + warp 48, 5, 0, SEAFOAM_ISLANDS_1F + warp 58, 9, 2, SEAFOAM_ISLANDS_1F + + db 2 ; signs + sign 51, 7, 11 ; Route20Text11 + sign 57, 11, 12 ; Route20Text12 + + db 10 ; objects + object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 + object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 + object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 + object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 + object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 + object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 + object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 + object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 + object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 + + ; warp-to + warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/Route21.asm b/data/mapObjects/Route21.asm new file mode 100755 index 00000000..b7759b59 --- /dev/null +++ b/data/mapObjects/Route21.asm @@ -0,0 +1,17 @@ +Route21_Object: + db $43 ; border block + + db 0 ; warps + + db 0 ; signs + + db 9 ; objects + object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 + object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 + object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 + object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 + object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 + object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 + object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 + object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 + object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/mapObjects/Route22.asm b/data/mapObjects/Route22.asm new file mode 100755 index 00000000..56e759fd --- /dev/null +++ b/data/mapObjects/Route22.asm @@ -0,0 +1,15 @@ +Route22_Object: + db $2c ; border block + + db 1 ; warps + warp 8, 5, 0, ROUTE_22_GATE + + db 1 ; signs + sign 7, 11, 3 ; Route22FrontGateText + + db 2 ; objects + object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person + object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person + + ; warp-to + warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/Route22Gate.asm b/data/mapObjects/Route22Gate.asm new file mode 100755 index 00000000..3f693c7f --- /dev/null +++ b/data/mapObjects/Route22Gate.asm @@ -0,0 +1,19 @@ +Route22Gate_Object: + db $a ; border block + + db 4 ; warps + warp 4, 7, 0, -1 + warp 5, 7, 0, -1 + warp 4, 0, 0, -1 + warp 5, 0, 1, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + + ; warp-to + warp_to 4, 7, ROUTE_22_GATE_WIDTH + warp_to 5, 7, ROUTE_22_GATE_WIDTH + warp_to 4, 0, ROUTE_22_GATE_WIDTH + warp_to 5, 0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/Route23.asm b/data/mapObjects/Route23.asm new file mode 100755 index 00000000..b510c285 --- /dev/null +++ b/data/mapObjects/Route23.asm @@ -0,0 +1,26 @@ +Route23_Object: + db $f ; border block + + db 4 ; warps + warp 7, 139, 2, ROUTE_22_GATE + warp 8, 139, 3, ROUTE_22_GATE + warp 4, 31, 0, VICTORY_ROAD_1F + warp 14, 31, 1, VICTORY_ROAD_2F + + db 1 ; signs + sign 3, 33, 8 ; Route23Text8 + + db 7 ; objects + object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person + object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person + object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person + object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person + object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person + object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person + object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person + + ; warp-to + warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F + warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/Route24.asm b/data/mapObjects/Route24.asm new file mode 100755 index 00000000..8ef0d2b9 --- /dev/null +++ b/data/mapObjects/Route24.asm @@ -0,0 +1,16 @@ +Route24_Object: + db $2c ; border block + + db 0 ; warps + + db 0 ; signs + + db 8 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 + object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 + object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 + object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 + object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 + object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 + object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45 diff --git a/data/mapObjects/Route25.asm b/data/mapObjects/Route25.asm new file mode 100755 index 00000000..a85f85ca --- /dev/null +++ b/data/mapObjects/Route25.asm @@ -0,0 +1,23 @@ +Route25_Object: + db $2c ; border block + + db 1 ; warps + warp 45, 3, 0, BILLS_HOUSE + + db 1 ; signs + sign 43, 3, 11 ; Route25Text11 + + db 10 ; objects + object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 + object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 + object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 + object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 + object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 + object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 + object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 + object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 + object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 + object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19 + + ; warp-to + warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/Route2Gate.asm b/data/mapObjects/Route2Gate.asm new file mode 100755 index 00000000..a7feb780 --- /dev/null +++ b/data/mapObjects/Route2Gate.asm @@ -0,0 +1,20 @@ +Route2Gate_Object: + db $a ; border block + + db 4 ; warps + warp 4, 0, 3, -1 + warp 5, 0, 3, -1 + warp 4, 7, 4, -1 + warp 5, 7, 4, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person + object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person + + ; warp-to + warp_to 4, 0, ROUTE_2_GATE_WIDTH + warp_to 5, 0, ROUTE_2_GATE_WIDTH + warp_to 4, 7, ROUTE_2_GATE_WIDTH + warp_to 5, 7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/mapObjects/Route2TradeHouse.asm new file mode 100755 index 00000000..89ece3ea --- /dev/null +++ b/data/mapObjects/Route2TradeHouse.asm @@ -0,0 +1,16 @@ +Route2TradeHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person + + ; warp-to + warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH + warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/Route3.asm b/data/mapObjects/Route3.asm new file mode 100755 index 00000000..372ea6cf --- /dev/null +++ b/data/mapObjects/Route3.asm @@ -0,0 +1,18 @@ +Route3_Object: + db $2c ; border block + + db 0 ; warps + + db 1 ; signs + sign 59, 9, 10 ; Route3Text10 + + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person + object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 + object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 + object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3 diff --git a/data/mapObjects/Route4.asm b/data/mapObjects/Route4.asm new file mode 100755 index 00000000..4ab88f8f --- /dev/null +++ b/data/mapObjects/Route4.asm @@ -0,0 +1,22 @@ +Route4_Object: + db $2c ; border block + + db 3 ; warps + warp 11, 5, 0, MT_MOON_POKECENTER + warp 18, 5, 0, MT_MOON_1F + warp 24, 5, 7, MT_MOON_B1F + + db 3 ; signs + sign 12, 5, 4 ; PokeCenterSignText + sign 17, 7, 5 ; Route4Text5 + sign 27, 7, 6 ; Route4Text6 + + db 3 ; objects + object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person + object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 + object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04 + + ; warp-to + warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER + warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F + warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/Route5.asm b/data/mapObjects/Route5.asm new file mode 100755 index 00000000..df2c8c03 --- /dev/null +++ b/data/mapObjects/Route5.asm @@ -0,0 +1,21 @@ +Route5_Object: + db $a ; border block + + db 5 ; warps + warp 10, 29, 3, ROUTE_5_GATE + warp 9, 29, 2, ROUTE_5_GATE + warp 10, 33, 0, ROUTE_5_GATE + warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 + warp 10, 21, 0, DAYCARE + + db 1 ; signs + sign 17, 29, 1 ; Route5Text1 + + db 0 ; objects + + ; warp-to + warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5 + warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE diff --git a/data/mapObjects/Route5Gate.asm b/data/mapObjects/Route5Gate.asm new file mode 100755 index 00000000..e0e06a1d --- /dev/null +++ b/data/mapObjects/Route5Gate.asm @@ -0,0 +1,19 @@ +Route5Gate_Object: + db $a ; border block + + db 4 ; warps + warp 3, 5, 2, -1 + warp 4, 5, 2, -1 + warp 3, 0, 1, -1 + warp 4, 0, 0, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person + + ; warp-to + warp_to 3, 5, ROUTE_5_GATE_WIDTH + warp_to 4, 5, ROUTE_5_GATE_WIDTH + warp_to 3, 0, ROUTE_5_GATE_WIDTH + warp_to 4, 0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/Route6.asm b/data/mapObjects/Route6.asm new file mode 100755 index 00000000..fc2d7e24 --- /dev/null +++ b/data/mapObjects/Route6.asm @@ -0,0 +1,25 @@ +Route6_Object: + db $f ; border block + + db 4 ; warps + warp 9, 1, 2, ROUTE_6_GATE + warp 10, 1, 2, ROUTE_6_GATE + warp 10, 7, 0, ROUTE_6_GATE + warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 + + db 1 ; signs + sign 19, 15, 7 ; Route6Text7 + + db 6 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 + object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 + object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 + object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 + object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 + object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + + ; warp-to + warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/Route6Gate.asm b/data/mapObjects/Route6Gate.asm new file mode 100755 index 00000000..8ed96d04 --- /dev/null +++ b/data/mapObjects/Route6Gate.asm @@ -0,0 +1,19 @@ +Route6Gate_Object: + db $a ; border block + + db 4 ; warps + warp 3, 5, 2, -1 + warp 4, 5, 2, -1 + warp 3, 0, 1, -1 + warp 4, 0, 1, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + + ; warp-to + warp_to 3, 5, ROUTE_6_GATE_WIDTH + warp_to 4, 5, ROUTE_6_GATE_WIDTH + warp_to 3, 0, ROUTE_6_GATE_WIDTH + warp_to 4, 0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/Route7.asm b/data/mapObjects/Route7.asm new file mode 100755 index 00000000..182904ef --- /dev/null +++ b/data/mapObjects/Route7.asm @@ -0,0 +1,21 @@ +Route7_Object: + db $f ; border block + + db 5 ; warps + warp 18, 9, 2, ROUTE_7_GATE + warp 18, 10, 3, ROUTE_7_GATE + warp 11, 9, 0, ROUTE_7_GATE + warp 11, 10, 1, ROUTE_7_GATE + warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 + + db 1 ; signs + sign 3, 13, 1 ; Route7Text1 + + db 0 ; objects + + ; warp-to + warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7 diff --git a/data/mapObjects/Route7Gate.asm b/data/mapObjects/Route7Gate.asm new file mode 100755 index 00000000..7f1afe0a --- /dev/null +++ b/data/mapObjects/Route7Gate.asm @@ -0,0 +1,19 @@ +Route7Gate_Object: + db $a ; border block + + db 4 ; warps + warp 0, 3, 3, -1 + warp 0, 4, 3, -1 + warp 5, 3, 0, -1 + warp 5, 4, 1, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 0, 3, ROUTE_7_GATE_WIDTH + warp_to 0, 4, ROUTE_7_GATE_WIDTH + warp_to 5, 3, ROUTE_7_GATE_WIDTH + warp_to 5, 4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/Route8.asm b/data/mapObjects/Route8.asm new file mode 100755 index 00000000..137d70a0 --- /dev/null +++ b/data/mapObjects/Route8.asm @@ -0,0 +1,30 @@ +Route8_Object: + db $2c ; border block + + db 5 ; warps + warp 1, 9, 0, ROUTE_8_GATE + warp 1, 10, 1, ROUTE_8_GATE + warp 8, 9, 2, ROUTE_8_GATE + warp 8, 10, 3, ROUTE_8_GATE + warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 + + db 1 ; signs + sign 17, 3, 10 ; Route8Text10 + + db 9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 + object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 + object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 + object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 + object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 + object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 + object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 + + ; warp-to + warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/Route8Gate.asm b/data/mapObjects/Route8Gate.asm new file mode 100755 index 00000000..3bba95a0 --- /dev/null +++ b/data/mapObjects/Route8Gate.asm @@ -0,0 +1,19 @@ +Route8Gate_Object: + db $a ; border block + + db 4 ; warps + warp 0, 3, 0, -1 + warp 0, 4, 1, -1 + warp 5, 3, 2, -1 + warp 5, 4, 3, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 0, 3, ROUTE_8_GATE_WIDTH + warp_to 0, 4, ROUTE_8_GATE_WIDTH + warp_to 5, 3, ROUTE_8_GATE_WIDTH + warp_to 5, 4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/Route9.asm b/data/mapObjects/Route9.asm new file mode 100755 index 00000000..a991c0c7 --- /dev/null +++ b/data/mapObjects/Route9.asm @@ -0,0 +1,19 @@ +Route9_Object: + db $2c ; border block + + db 0 ; warps + + db 1 ; signs + sign 25, 7, 11 ; Route9Text11 + + db 10 ; objects + object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 + object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 + object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 + object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 + object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 + object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 + object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 + object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 + object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30 diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm new file mode 100755 index 00000000..3e454f06 --- /dev/null +++ b/data/mapObjects/SSAnne1F.asm @@ -0,0 +1,34 @@ +SSAnne1F_Object: + db $c ; border block + + db 11 ; warps + warp 26, 0, 1, VERMILION_DOCK + warp 27, 0, 1, VERMILION_DOCK + warp 31, 8, 0, SS_ANNE_1F_ROOMS + warp 23, 8, 1, SS_ANNE_1F_ROOMS + warp 19, 8, 2, SS_ANNE_1F_ROOMS + warp 15, 8, 3, SS_ANNE_1F_ROOMS + warp 11, 8, 4, SS_ANNE_1F_ROOMS + warp 7, 8, 5, SS_ANNE_1F_ROOMS + warp 2, 6, 6, SS_ANNE_2F + warp 37, 15, 5, SS_ANNE_B1F + warp 3, 16, 0, SS_ANNE_KITCHEN + + db 0 ; signs + + db 2 ; objects + object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person + object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person + + ; warp-to + warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK + warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK + warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F + warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F + warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/mapObjects/SSAnne1FRooms.asm new file mode 100755 index 00000000..617d2a55 --- /dev/null +++ b/data/mapObjects/SSAnne1FRooms.asm @@ -0,0 +1,33 @@ +SSAnne1FRooms_Object: + db $c ; border block + + db 6 ; warps + warp 0, 0, 2, SS_ANNE_1F + warp 10, 0, 3, SS_ANNE_1F + warp 20, 0, 4, SS_ANNE_1F + warp 0, 10, 5, SS_ANNE_1F + warp 10, 10, 6, SS_ANNE_1F + warp 20, 10, 7, SS_ANNE_1F + + db 0 ; signs + + db 11 ; objects + object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 + object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 + object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 + object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 + object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person + object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person + object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person + object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person + object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person + object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08 + object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person + + ; warp-to + warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm new file mode 100755 index 00000000..6abd5ac4 --- /dev/null +++ b/data/mapObjects/SSAnne2F.asm @@ -0,0 +1,30 @@ +SSAnne2F_Object: + db $c ; border block + + db 9 ; warps + warp 9, 11, 0, SS_ANNE_2F_ROOMS + warp 13, 11, 2, SS_ANNE_2F_ROOMS + warp 17, 11, 4, SS_ANNE_2F_ROOMS + warp 21, 11, 6, SS_ANNE_2F_ROOMS + warp 25, 11, 8, SS_ANNE_2F_ROOMS + warp 29, 11, 10, SS_ANNE_2F_ROOMS + warp 2, 4, 8, SS_ANNE_1F + warp 2, 12, 1, SS_ANNE_3F + warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM + + db 0 ; signs + + db 2 ; objects + object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person + object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 + + ; warp-to + warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F + warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F + warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/mapObjects/SSAnne2FRooms.asm new file mode 100755 index 00000000..ebb053a8 --- /dev/null +++ b/data/mapObjects/SSAnne2FRooms.asm @@ -0,0 +1,47 @@ +SSAnne2FRooms_Object: + db $c ; border block + + db 12 ; warps + warp 2, 5, 0, SS_ANNE_2F + warp 3, 5, 0, SS_ANNE_2F + warp 12, 5, 1, SS_ANNE_2F + warp 13, 5, 1, SS_ANNE_2F + warp 22, 5, 2, SS_ANNE_2F + warp 23, 5, 2, SS_ANNE_2F + warp 2, 15, 3, SS_ANNE_2F + warp 3, 15, 3, SS_ANNE_2F + warp 12, 15, 4, SS_ANNE_2F + warp 13, 15, 4, SS_ANNE_2F + warp 22, 15, 5, SS_ANNE_2F + warp 23, 15, 5, SS_ANNE_2F + + db 0 ; signs + + db 13 ; objects + object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person + object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person + object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person + object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person + object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person + + ; warp-to + warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnne3F.asm b/data/mapObjects/SSAnne3F.asm new file mode 100755 index 00000000..f0bfc17b --- /dev/null +++ b/data/mapObjects/SSAnne3F.asm @@ -0,0 +1,15 @@ +SSAnne3F_Object: + db $c ; border block + + db 2 ; warps + warp 0, 3, 0, SS_ANNE_BOW + warp 19, 3, 7, SS_ANNE_2F + + db 0 ; signs + + db 1 ; objects + object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person + + ; warp-to + warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW + warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneB1F.asm b/data/mapObjects/SSAnneB1F.asm new file mode 100755 index 00000000..fe54ea24 --- /dev/null +++ b/data/mapObjects/SSAnneB1F.asm @@ -0,0 +1,22 @@ +SSAnneB1F_Object: + db $c ; border block + + db 6 ; warps + warp 23, 3, 8, SS_ANNE_B1F_ROOMS + warp 19, 3, 6, SS_ANNE_B1F_ROOMS + warp 15, 3, 4, SS_ANNE_B1F_ROOMS + warp 11, 3, 2, SS_ANNE_B1F_ROOMS + warp 7, 3, 0, SS_ANNE_B1F_ROOMS + warp 27, 5, 9, SS_ANNE_1F + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm new file mode 100755 index 00000000..1d31b89c --- /dev/null +++ b/data/mapObjects/SSAnneB1FRooms.asm @@ -0,0 +1,41 @@ +SSAnneB1FRooms_Object: + db $c ; border block + + db 10 ; warps + warp 2, 5, 4, SS_ANNE_B1F + warp 3, 5, 4, SS_ANNE_B1F + warp 12, 5, 3, SS_ANNE_B1F + warp 13, 5, 3, SS_ANNE_B1F + warp 22, 5, 2, SS_ANNE_B1F + warp 23, 5, 2, SS_ANNE_B1F + warp 2, 15, 1, SS_ANNE_B1F + warp 3, 15, 1, SS_ANNE_B1F + warp 12, 15, 0, SS_ANNE_B1F + warp 13, 15, 0, SS_ANNE_B1F + + db 0 ; signs + + db 11 ; objects + object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 + object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 + object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 + object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 + object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 + object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 + object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person + object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person + object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER + object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 + object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION + + ; warp-to + warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F diff --git a/data/mapObjects/SSAnneBow.asm b/data/mapObjects/SSAnneBow.asm new file mode 100755 index 00000000..8873c8f8 --- /dev/null +++ b/data/mapObjects/SSAnneBow.asm @@ -0,0 +1,19 @@ +SSAnneBow_Object: + db $23 ; border block + + db 2 ; warps + warp 13, 6, 0, SS_ANNE_3F + warp 13, 7, 0, SS_ANNE_3F + + db 0 ; signs + + db 5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person + object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person + object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 + object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 + + ; warp-to + warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F + warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F diff --git a/data/mapObjects/SSAnneCaptainsRoom.asm b/data/mapObjects/SSAnneCaptainsRoom.asm new file mode 100755 index 00000000..545656cc --- /dev/null +++ b/data/mapObjects/SSAnneCaptainsRoom.asm @@ -0,0 +1,15 @@ +SSAnneCaptainsRoom_Object: + db $c ; border block + + db 1 ; warps + warp 0, 7, 8, SS_ANNE_2F + + db 2 ; signs + sign 4, 1, 2 ; SSAnne7Text2 + sign 1, 2, 3 ; SSAnne7Text3 + + db 1 ; objects + object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person + + ; warp-to + warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneKitchen.asm b/data/mapObjects/SSAnneKitchen.asm new file mode 100755 index 00000000..b5771e68 --- /dev/null +++ b/data/mapObjects/SSAnneKitchen.asm @@ -0,0 +1,19 @@ +SSAnneKitchen_Object: + db $c ; border block + + db 1 ; warps + warp 6, 0, 10, SS_ANNE_1F + + db 0 ; signs + + db 7 ; objects + object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person + object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person + object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person + object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person + object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person + object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person + object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person + + ; warp-to + warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SafariZoneCenter.asm b/data/mapObjects/SafariZoneCenter.asm new file mode 100755 index 00000000..e54cec74 --- /dev/null +++ b/data/mapObjects/SafariZoneCenter.asm @@ -0,0 +1,31 @@ +SafariZoneCenter_Object: + db $0 ; border block + + db 9 ; warps + warp 14, 25, 2, SAFARI_ZONE_GATE + warp 15, 25, 3, SAFARI_ZONE_GATE + warp 0, 10, 4, SAFARI_ZONE_WEST + warp 0, 11, 5, SAFARI_ZONE_WEST + warp 14, 0, 4, SAFARI_ZONE_NORTH + warp 15, 0, 5, SAFARI_ZONE_NORTH + warp 29, 10, 2, SAFARI_ZONE_EAST + warp 29, 11, 3, SAFARI_ZONE_EAST + warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE + + db 2 ; signs + sign 18, 20, 2 ; SafariZoneCenterText2 + sign 14, 22, 3 ; SafariZoneCenterText3 + + db 1 ; objects + object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET + + ; warp-to + warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE + warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE + warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/mapObjects/SafariZoneCenterRestHouse.asm b/data/mapObjects/SafariZoneCenterRestHouse.asm new file mode 100755 index 00000000..9eda9970 --- /dev/null +++ b/data/mapObjects/SafariZoneCenterRestHouse.asm @@ -0,0 +1,16 @@ +SafariZoneCenterRestHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 8, SAFARI_ZONE_CENTER + warp 3, 7, 8, SAFARI_ZONE_CENTER + + db 0 ; signs + + db 2 ; objects + object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person + + ; warp-to + warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/SafariZoneEast.asm b/data/mapObjects/SafariZoneEast.asm new file mode 100755 index 00000000..df612ea9 --- /dev/null +++ b/data/mapObjects/SafariZoneEast.asm @@ -0,0 +1,27 @@ +SafariZoneEast_Object: + db $0 ; border block + + db 5 ; warps + warp 0, 4, 6, SAFARI_ZONE_NORTH + warp 0, 5, 7, SAFARI_ZONE_NORTH + warp 0, 22, 6, SAFARI_ZONE_CENTER + warp 0, 23, 6, SAFARI_ZONE_CENTER + warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE + + db 3 ; signs + sign 26, 10, 5 ; SafariZoneEastText5 + sign 6, 4, 6 ; SafariZoneEastText6 + sign 5, 23, 7 ; SafariZoneEastText7 + + db 4 ; objects + object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE + object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION + object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS + object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37 + + ; warp-to + warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/mapObjects/SafariZoneEastRestHouse.asm b/data/mapObjects/SafariZoneEastRestHouse.asm new file mode 100755 index 00000000..e7c68343 --- /dev/null +++ b/data/mapObjects/SafariZoneEastRestHouse.asm @@ -0,0 +1,17 @@ +SafariZoneEastRestHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 4, SAFARI_ZONE_EAST + warp 3, 7, 4, SAFARI_ZONE_EAST + + db 0 ; signs + + db 3 ; objects + object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person + object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person + object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person + + ; warp-to + warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST + warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/SafariZoneGate.asm b/data/mapObjects/SafariZoneGate.asm new file mode 100755 index 00000000..6749b45b --- /dev/null +++ b/data/mapObjects/SafariZoneGate.asm @@ -0,0 +1,20 @@ +SafariZoneGate_Object: + db $a ; border block + + db 4 ; warps + warp 3, 5, 4, -1 + warp 4, 5, 4, -1 + warp 3, 0, 0, SAFARI_ZONE_CENTER + warp 4, 0, 1, SAFARI_ZONE_CENTER + + db 0 ; signs + + db 2 ; objects + object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person + object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person + + ; warp-to + warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH + warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH + warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/SafariZoneNorth.asm b/data/mapObjects/SafariZoneNorth.asm new file mode 100755 index 00000000..9eda7b4b --- /dev/null +++ b/data/mapObjects/SafariZoneNorth.asm @@ -0,0 +1,35 @@ +SafariZoneNorth_Object: + db $0 ; border block + + db 9 ; warps + warp 2, 35, 0, SAFARI_ZONE_WEST + warp 3, 35, 1, SAFARI_ZONE_WEST + warp 8, 35, 2, SAFARI_ZONE_WEST + warp 9, 35, 3, SAFARI_ZONE_WEST + warp 20, 35, 4, SAFARI_ZONE_CENTER + warp 21, 35, 5, SAFARI_ZONE_CENTER + warp 39, 30, 0, SAFARI_ZONE_EAST + warp 39, 31, 1, SAFARI_ZONE_EAST + warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE + + db 5 ; signs + sign 36, 4, 3 ; SafariZoneNorthText3 + sign 4, 25, 4 ; SafariZoneNorthText4 + sign 13, 31, 5 ; SafariZoneNorthText5 + sign 19, 33, 6 ; SafariZoneNorthText6 + sign 26, 28, 7 ; SafariZoneNorthText7 + + db 2 ; objects + object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN + object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40 + + ; warp-to + warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/mapObjects/SafariZoneNorthRestHouse.asm b/data/mapObjects/SafariZoneNorthRestHouse.asm new file mode 100755 index 00000000..34b3ab4f --- /dev/null +++ b/data/mapObjects/SafariZoneNorthRestHouse.asm @@ -0,0 +1,17 @@ +SafariZoneNorthRestHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 8, SAFARI_ZONE_NORTH + warp 3, 7, 8, SAFARI_ZONE_NORTH + + db 0 ; signs + + db 3 ; objects + object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person + object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person + + ; warp-to + warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH + warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/SafariZoneSecretHouse.asm b/data/mapObjects/SafariZoneSecretHouse.asm new file mode 100755 index 00000000..2a5fc22d --- /dev/null +++ b/data/mapObjects/SafariZoneSecretHouse.asm @@ -0,0 +1,15 @@ +SafariZoneSecretHouse_Object: + db $17 ; border block + + db 2 ; warps + warp 2, 7, 6, SAFARI_ZONE_WEST + warp 3, 7, 6, SAFARI_ZONE_WEST + + db 0 ; signs + + db 1 ; objects + object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/SafariZoneWest.asm b/data/mapObjects/SafariZoneWest.asm new file mode 100755 index 00000000..7faced72 --- /dev/null +++ b/data/mapObjects/SafariZoneWest.asm @@ -0,0 +1,34 @@ +SafariZoneWest_Object: + db $0 ; border block + + db 8 ; warps + warp 20, 0, 0, SAFARI_ZONE_NORTH + warp 21, 0, 1, SAFARI_ZONE_NORTH + warp 26, 0, 2, SAFARI_ZONE_NORTH + warp 27, 0, 3, SAFARI_ZONE_NORTH + warp 29, 22, 2, SAFARI_ZONE_CENTER + warp 29, 23, 3, SAFARI_ZONE_CENTER + warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE + warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE + + db 4 ; signs + sign 12, 12, 5 ; SafariZoneWestText5 + sign 17, 3, 6 ; SafariZoneWestText6 + sign 26, 4, 7 ; SafariZoneWestText7 + sign 24, 22, 8 ; SafariZoneWestText8 + + db 4 ; objects + object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION + object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32 + object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE + object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH + + ; warp-to + warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE + warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/mapObjects/SafariZoneWestRestHouse.asm b/data/mapObjects/SafariZoneWestRestHouse.asm new file mode 100755 index 00000000..9f1bc0ed --- /dev/null +++ b/data/mapObjects/SafariZoneWestRestHouse.asm @@ -0,0 +1,17 @@ +SafariZoneWestRestHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 7, SAFARI_ZONE_WEST + warp 3, 7, 7, SAFARI_ZONE_WEST + + db 0 ; signs + + db 3 ; objects + object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person + object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person + + ; warp-to + warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/SaffronCity.asm b/data/mapObjects/SaffronCity.asm new file mode 100755 index 00000000..b8d3a9cf --- /dev/null +++ b/data/mapObjects/SaffronCity.asm @@ -0,0 +1,51 @@ +SaffronCity_Object: + db $f ; border block + + db 8 ; warps + warp 7, 5, 0, COPYCATS_HOUSE_1F + warp 26, 3, 0, FIGHTING_DOJO + warp 34, 3, 0, SAFFRON_GYM + warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE + warp 25, 11, 0, SAFFRON_MART + warp 18, 21, 0, SILPH_CO_1F + warp 9, 29, 0, SAFFRON_POKECENTER + warp 29, 29, 0, MR_PSYCHICS_HOUSE + + db 10 ; signs + sign 17, 5, 16 ; SaffronCityText16 + sign 27, 5, 17 ; SaffronCityText17 + sign 35, 5, 18 ; SaffronCityText18 + sign 26, 11, 19 ; MartSignText + sign 39, 19, 20 ; SaffronCityText20 + sign 5, 21, 21 ; SaffronCityText21 + sign 15, 21, 22 ; SaffronCityText22 + sign 10, 29, 23 ; PokeCenterSignText + sign 27, 29, 24 ; SaffronCityText24 + sign 1, 19, 25 ; SaffronCityText25 + + db 15 ; objects + object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person + object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person + object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person + object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person + object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person + object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person + object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person + object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person + object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person + object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person + object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person + object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person + + ; warp-to + warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F + warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO + warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM + warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE + warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART + warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F + warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER + warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE diff --git a/data/mapObjects/SaffronGym.asm b/data/mapObjects/SaffronGym.asm new file mode 100755 index 00000000..1869421a --- /dev/null +++ b/data/mapObjects/SaffronGym.asm @@ -0,0 +1,83 @@ +SaffronGym_Object: + db $2e ; border block + + db 32 ; warps + warp 8, 17, 2, -1 + warp 9, 17, 2, -1 + warp 1, 3, 22, SAFFRON_GYM + warp 5, 3, 15, SAFFRON_GYM + warp 1, 5, 18, SAFFRON_GYM + warp 5, 5, 8, SAFFRON_GYM + warp 1, 9, 27, SAFFRON_GYM + warp 5, 9, 16, SAFFRON_GYM + warp 1, 11, 5, SAFFRON_GYM + warp 5, 11, 13, SAFFRON_GYM + warp 1, 15, 23, SAFFRON_GYM + warp 5, 15, 30, SAFFRON_GYM + warp 1, 17, 17, SAFFRON_GYM + warp 5, 17, 9, SAFFRON_GYM + warp 9, 3, 26, SAFFRON_GYM + warp 11, 3, 3, SAFFRON_GYM + warp 9, 5, 7, SAFFRON_GYM + warp 11, 5, 12, SAFFRON_GYM + warp 11, 11, 4, SAFFRON_GYM + warp 11, 15, 31, SAFFRON_GYM + warp 15, 3, 24, SAFFRON_GYM + warp 19, 3, 28, SAFFRON_GYM + warp 15, 5, 2, SAFFRON_GYM + warp 19, 5, 10, SAFFRON_GYM + warp 15, 9, 20, SAFFRON_GYM + warp 19, 9, 29, SAFFRON_GYM + warp 15, 11, 14, SAFFRON_GYM + warp 19, 11, 6, SAFFRON_GYM + warp 15, 15, 21, SAFFRON_GYM + warp 19, 15, 25, SAFFRON_GYM + warp 15, 17, 11, SAFFRON_GYM + warp 19, 17, 19, SAFFRON_GYM + + db 0 ; signs + + db 9 ; objects + object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 + object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 + object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 + object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 + object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 + object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 + object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person + + ; warp-to + warp_to 8, 17, SAFFRON_GYM_WIDTH + warp_to 9, 17, SAFFRON_GYM_WIDTH + warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/SaffronMart.asm b/data/mapObjects/SaffronMart.asm new file mode 100755 index 00000000..c376f2de --- /dev/null +++ b/data/mapObjects/SaffronMart.asm @@ -0,0 +1,17 @@ +SaffronMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person + object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person + + ; warp-to + warp_to 3, 7, SAFFRON_MART_WIDTH + warp_to 4, 7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/SaffronPidgeyHouse.asm b/data/mapObjects/SaffronPidgeyHouse.asm new file mode 100755 index 00000000..65a851bf --- /dev/null +++ b/data/mapObjects/SaffronPidgeyHouse.asm @@ -0,0 +1,18 @@ +SaffronPidgeyHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person + object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person + object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person + + ; warp-to + warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH + warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/mapObjects/SaffronPokecenter.asm new file mode 100755 index 00000000..e54fd76b --- /dev/null +++ b/data/mapObjects/SaffronPokecenter.asm @@ -0,0 +1,18 @@ +SaffronPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 6, -1 + warp 4, 7, 6, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, SAFFRON_POKECENTER_WIDTH + warp_to 4, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm new file mode 100755 index 00000000..8707ee0a --- /dev/null +++ b/data/mapObjects/SeafoamIslands1F.asm @@ -0,0 +1,30 @@ +SeafoamIslands1F_Object: + db $7d ; border block + + db 7 ; warps + warp 4, 17, 0, -1 + warp 5, 17, 0, -1 + warp 26, 17, 1, -1 + warp 27, 17, 1, -1 + warp 7, 5, 1, SEAFOAM_ISLANDS_B1F + warp 25, 3, 6, SEAFOAM_ISLANDS_B1F + warp 23, 15, 4, SEAFOAM_ISLANDS_B1F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + ; warp-to + warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F + + ; holes + warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/mapObjects/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..426ca0c3 --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB1F.asm @@ -0,0 +1,26 @@ +SeafoamIslandsB1F_Object: + db $7d ; border block + + db 7 ; warps + warp 4, 2, 0, SEAFOAM_ISLANDS_B2F + warp 7, 5, 4, SEAFOAM_ISLANDS_1F + warp 13, 7, 2, SEAFOAM_ISLANDS_B2F + warp 19, 15, 3, SEAFOAM_ISLANDS_B2F + warp 23, 15, 6, SEAFOAM_ISLANDS_1F + warp 25, 11, 5, SEAFOAM_ISLANDS_B2F + warp 25, 3, 5, SEAFOAM_ISLANDS_1F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + ; warp-to + warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/mapObjects/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..9c1a7898 --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB2F.asm @@ -0,0 +1,26 @@ +SeafoamIslandsB2F_Object: + db $7d ; border block + + db 7 ; warps + warp 5, 3, 0, SEAFOAM_ISLANDS_B1F + warp 5, 13, 0, SEAFOAM_ISLANDS_B3F + warp 13, 7, 2, SEAFOAM_ISLANDS_B1F + warp 19, 15, 3, SEAFOAM_ISLANDS_B1F + warp 25, 3, 3, SEAFOAM_ISLANDS_B3F + warp 25, 11, 5, SEAFOAM_ISLANDS_B1F + warp 25, 14, 4, SEAFOAM_ISLANDS_B3F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + ; warp-to + warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/mapObjects/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..d194e1cd --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB3F.asm @@ -0,0 +1,30 @@ +SeafoamIslandsB3F_Object: + db $7d ; border block + + db 7 ; warps + warp 5, 12, 1, SEAFOAM_ISLANDS_B2F + warp 8, 6, 2, SEAFOAM_ISLANDS_B4F + warp 25, 4, 3, SEAFOAM_ISLANDS_B4F + warp 25, 3, 4, SEAFOAM_ISLANDS_B2F + warp 25, 14, 6, SEAFOAM_ISLANDS_B2F + warp 20, 17, 0, SEAFOAM_ISLANDS_B4F + warp 21, 17, 1, SEAFOAM_ISLANDS_B4F + + db 0 ; signs + + db 6 ; objects + object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person + object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person + + ; warp-to + warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F + warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F + warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F + warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/mapObjects/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..62d88b0c --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB4F.asm @@ -0,0 +1,23 @@ +SeafoamIslandsB4F_Object: + db $7d ; border block + + db 4 ; warps + warp 20, 17, 5, SEAFOAM_ISLANDS_B3F + warp 21, 17, 6, SEAFOAM_ISLANDS_B3F + warp 11, 7, 1, SEAFOAM_ISLANDS_B3F + warp 25, 4, 2, SEAFOAM_ISLANDS_B3F + + db 2 ; signs + sign 9, 15, 4 ; SeafoamIslands5Text4 + sign 23, 1, 5 ; SeafoamIslands5Text5 + + db 3 ; objects + object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person + object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person + object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 + + ; warp-to + warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SilphCo10F.asm b/data/mapObjects/SilphCo10F.asm new file mode 100755 index 00000000..1c8948d3 --- /dev/null +++ b/data/mapObjects/SilphCo10F.asm @@ -0,0 +1,28 @@ +SilphCo10F_Object: + db $2e ; border block + + db 6 ; warps + warp 8, 0, 0, SILPH_CO_9F + warp 10, 0, 0, SILPH_CO_11F + warp 12, 0, 0, SILPH_CO_ELEVATOR + warp 9, 11, 3, SILPH_CO_4F + warp 13, 15, 5, SILPH_CO_4F + warp 13, 7, 6, SILPH_CO_4F + + db 0 ; signs + + db 6 ; objects + object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 + object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 + object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person + object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26 + object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY + object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS + + ; warp-to + warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F + warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F + warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/SilphCo11F.asm b/data/mapObjects/SilphCo11F.asm new file mode 100755 index 00000000..7a1dff73 --- /dev/null +++ b/data/mapObjects/SilphCo11F.asm @@ -0,0 +1,23 @@ +SilphCo11F_Object: + db $d ; border block + + db 4 ; warps + warp 9, 0, 1, SILPH_CO_10F + warp 13, 0, 0, SILPH_CO_ELEVATOR + warp 5, 5, 9, -1 + warp 3, 2, 3, SILPH_CO_7F + + db 0 ; signs + + db 5 ; objects + object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person + object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 + object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 + object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 + + ; warp-to + warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F + warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 5, 5, SILPH_CO_11F_WIDTH + warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/SilphCo1F.asm b/data/mapObjects/SilphCo1F.asm new file mode 100755 index 00000000..fc040091 --- /dev/null +++ b/data/mapObjects/SilphCo1F.asm @@ -0,0 +1,21 @@ +SilphCo1F_Object: + db $2e ; border block + + db 5 ; warps + warp 10, 17, 5, -1 + warp 11, 17, 5, -1 + warp 26, 0, 0, SILPH_CO_2F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 16, 10, 6, SILPH_CO_3F + + db 0 ; signs + + db 1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person + + ; warp-to + warp_to 10, 17, SILPH_CO_1F_WIDTH + warp_to 11, 17, SILPH_CO_1F_WIDTH + warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F + warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo2F.asm b/data/mapObjects/SilphCo2F.asm new file mode 100755 index 00000000..bc30d78d --- /dev/null +++ b/data/mapObjects/SilphCo2F.asm @@ -0,0 +1,29 @@ +SilphCo2F_Object: + db $2e ; border block + + db 7 ; warps + warp 24, 0, 2, SILPH_CO_1F + warp 26, 0, 0, SILPH_CO_3F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 6, SILPH_CO_3F + warp 13, 3, 4, SILPH_CO_8F + warp 27, 15, 5, SILPH_CO_8F + warp 9, 15, 4, SILPH_CO_6F + + db 0 ; signs + + db 5 ; objects + object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person + object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 + object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 + object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 + object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 + + ; warp-to + warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F + warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/SilphCo3F.asm b/data/mapObjects/SilphCo3F.asm new file mode 100755 index 00000000..f45cdf81 --- /dev/null +++ b/data/mapObjects/SilphCo3F.asm @@ -0,0 +1,34 @@ +SilphCo3F_Object: + db $2e ; border block + + db 10 ; warps + warp 26, 0, 1, SILPH_CO_2F + warp 24, 0, 0, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 23, 11, 9, SILPH_CO_3F + warp 3, 3, 5, SILPH_CO_5F + warp 3, 15, 6, SILPH_CO_5F + warp 27, 3, 3, SILPH_CO_2F + warp 3, 11, 3, SILPH_CO_9F + warp 11, 11, 4, SILPH_CO_7F + warp 27, 15, 3, SILPH_CO_3F + + db 0 ; signs + + db 4 ; objects + object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 + object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 + object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION + + ; warp-to + warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F + warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F + warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F + warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F + warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo4F.asm b/data/mapObjects/SilphCo4F.asm new file mode 100755 index 00000000..3d865bbc --- /dev/null +++ b/data/mapObjects/SilphCo4F.asm @@ -0,0 +1,31 @@ +SilphCo4F_Object: + db $2e ; border block + + db 7 ; warps + warp 24, 0, 1, SILPH_CO_3F + warp 26, 0, 1, SILPH_CO_5F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 11, 7, 3, SILPH_CO_10F + warp 17, 3, 3, SILPH_CO_6F + warp 3, 15, 4, SILPH_CO_10F + warp 17, 11, 5, SILPH_CO_10F + + db 0 ; signs + + db 7 ; objects + object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 + object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 + object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 + object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL + object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE + object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE + + ; warp-to + warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F + warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F + warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F + warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/SilphCo5F.asm b/data/mapObjects/SilphCo5F.asm new file mode 100755 index 00000000..c10f17c8 --- /dev/null +++ b/data/mapObjects/SilphCo5F.asm @@ -0,0 +1,35 @@ +SilphCo5F_Object: + db $2e ; border block + + db 7 ; warps + warp 24, 0, 1, SILPH_CO_6F + warp 26, 0, 1, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 27, 3, 5, SILPH_CO_7F + warp 9, 15, 4, SILPH_CO_9F + warp 11, 5, 4, SILPH_CO_3F + warp 3, 15, 5, SILPH_CO_3F + + db 0 ; signs + + db 11 ; objects + object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 + object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 + object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 + object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 + object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09 + object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN + object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY + object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person + object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person + object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person + + ; warp-to + warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F + warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F + warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F + warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F + warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F + warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo6F.asm b/data/mapObjects/SilphCo6F.asm new file mode 100755 index 00000000..ad2ac32f --- /dev/null +++ b/data/mapObjects/SilphCo6F.asm @@ -0,0 +1,30 @@ +SilphCo6F_Object: + db $2e ; border block + + db 5 ; warps + warp 16, 0, 1, SILPH_CO_7F + warp 14, 0, 0, SILPH_CO_5F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 4, SILPH_CO_4F + warp 23, 3, 6, SILPH_CO_2F + + db 0 ; signs + + db 10 ; objects + object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person + object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person + object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person + object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person + object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person + object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 + object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 + object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP + object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY + + ; warp-to + warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F + warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F + warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F + warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/SilphCo7F.asm b/data/mapObjects/SilphCo7F.asm new file mode 100755 index 00000000..255f4b33 --- /dev/null +++ b/data/mapObjects/SilphCo7F.asm @@ -0,0 +1,33 @@ +SilphCo7F_Object: + db $2e ; border block + + db 6 ; warps + warp 16, 0, 1, SILPH_CO_8F + warp 22, 0, 0, SILPH_CO_6F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 5, 7, 3, SILPH_CO_11F + warp 5, 3, 8, SILPH_CO_3F + warp 21, 15, 3, SILPH_CO_5F + + db 0 ; signs + + db 11 ; objects + object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person + object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person + object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person + object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 + object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 + object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 + object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person + object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM + object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03 + + ; warp-to + warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F + warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F + warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F + warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F + warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/SilphCo8F.asm b/data/mapObjects/SilphCo8F.asm new file mode 100755 index 00000000..d05c7844 --- /dev/null +++ b/data/mapObjects/SilphCo8F.asm @@ -0,0 +1,28 @@ +SilphCo8F_Object: + db $2e ; border block + + db 7 ; warps + warp 16, 0, 1, SILPH_CO_9F + warp 14, 0, 0, SILPH_CO_7F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 11, 6, SILPH_CO_8F + warp 3, 15, 4, SILPH_CO_2F + warp 11, 5, 5, SILPH_CO_2F + warp 11, 9, 3, SILPH_CO_8F + + db 0 ; signs + + db 4 ; objects + object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 + object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 + object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 + + ; warp-to + warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F + warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F + warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F + warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/SilphCo9F.asm b/data/mapObjects/SilphCo9F.asm new file mode 100755 index 00000000..28ef5f10 --- /dev/null +++ b/data/mapObjects/SilphCo9F.asm @@ -0,0 +1,24 @@ +SilphCo9F_Object: + db $2e ; border block + + db 5 ; warps + warp 14, 0, 0, SILPH_CO_10F + warp 16, 0, 0, SILPH_CO_8F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 9, 3, 7, SILPH_CO_3F + warp 17, 15, 4, SILPH_CO_5F + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 + object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 + object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 + + ; warp-to + warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F + warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F + warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F + warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/SilphCoElevator.asm b/data/mapObjects/SilphCoElevator.asm new file mode 100755 index 00000000..9c4b5a79 --- /dev/null +++ b/data/mapObjects/SilphCoElevator.asm @@ -0,0 +1,15 @@ +SilphCoElevator_Object: + db $f ; border block + + db 2 ; warps + warp 1, 3, 0, 237 + warp 2, 3, 0, 237 + + db 1 ; signs + sign 3, 0, 1 ; SilphCoElevatorText1 + + db 0 ; objects + + ; warp-to + warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH + warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/TradeCenter.asm b/data/mapObjects/TradeCenter.asm new file mode 100755 index 00000000..e6df8087 --- /dev/null +++ b/data/mapObjects/TradeCenter.asm @@ -0,0 +1,9 @@ +TradeCenter_Object: + db $e ; border block + + db 0 ; warps + + db 0 ; signs + + db 1 ; objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/mapObjects/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..35e21cca --- /dev/null +++ b/data/mapObjects/UndergroundPathNorthSouth.asm @@ -0,0 +1,14 @@ +UndergroundPathNorthSouth_Object: + db $1 ; border block + + db 2 ; warps + warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5 + warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5 + warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/mapObjects/UndergroundPathRoute5.asm new file mode 100755 index 00000000..af71ebb4 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute5.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute5_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH + + db 0 ; signs + + db 1 ; objects + object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/mapObjects/UndergroundPathRoute6.asm new file mode 100755 index 00000000..5a40ade2 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute6.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute6_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH + + db 0 ; signs + + db 1 ; objects + object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/mapObjects/UndergroundPathRoute7.asm new file mode 100755 index 00000000..4666e0c9 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute7.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute7_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + db 0 ; signs + + db 1 ; objects + object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/mapObjects/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..c020646e --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute7Copy.asm @@ -0,0 +1,18 @@ +UndergroundPathRoute7Copy_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + db 0 ; signs + + db 2 ; objects + object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person + object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/mapObjects/UndergroundPathRoute8.asm new file mode 100755 index 00000000..8be0d474 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute8.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute8_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST + + db 0 ; signs + + db 1 ; objects + object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/mapObjects/UndergroundPathWestEast.asm new file mode 100755 index 00000000..fa064aca --- /dev/null +++ b/data/mapObjects/UndergroundPathWestEast.asm @@ -0,0 +1,14 @@ +UndergroundPathWestEast_Object: + db $1 ; border block + + db 2 ; warps + warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7 + warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7 + warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/VermilionCity.asm b/data/mapObjects/VermilionCity.asm new file mode 100755 index 00000000..b1e1a005 --- /dev/null +++ b/data/mapObjects/VermilionCity.asm @@ -0,0 +1,41 @@ +VermilionCity_Object: + db $43 ; border block + + db 9 ; warps + warp 11, 3, 0, VERMILION_POKECENTER + warp 9, 13, 0, POKEMON_FAN_CLUB + warp 23, 13, 0, VERMILION_MART + warp 12, 19, 0, VERMILION_GYM + warp 23, 19, 0, VERMILION_PIDGEY_HOUSE + warp 18, 31, 0, VERMILION_DOCK + warp 19, 31, 0, VERMILION_DOCK + warp 15, 13, 0, VERMILION_TRADE_HOUSE + warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE + + db 7 ; signs + sign 27, 3, 7 ; VermilionCityText7 + sign 37, 13, 8 ; VermilionCityText8 + sign 24, 13, 9 ; MartSignText + sign 12, 3, 10 ; PokeCenterSignText + sign 7, 13, 11 ; VermilionCityText11 + sign 7, 19, 12 ; VermilionCityText12 + sign 29, 15, 13 ; VermilionCityText13 + + db 6 ; objects + object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person + object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person + object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person + object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person + + ; warp-to + warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER + warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB + warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART + warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM + warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE + warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE + warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE diff --git a/data/mapObjects/VermilionDock.asm b/data/mapObjects/VermilionDock.asm new file mode 100755 index 00000000..6f07554a --- /dev/null +++ b/data/mapObjects/VermilionDock.asm @@ -0,0 +1,14 @@ +VermilionDock_Object: + db $f ; border block + + db 2 ; warps + warp 14, 0, 5, -1 + warp 14, 2, 1, SS_ANNE_1F + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 14, 0, VERMILION_DOCK_WIDTH + warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/VermilionGym.asm b/data/mapObjects/VermilionGym.asm new file mode 100755 index 00000000..4ace83be --- /dev/null +++ b/data/mapObjects/VermilionGym.asm @@ -0,0 +1,19 @@ +VermilionGym_Object: + db $3 ; border block + + db 2 ; warps + warp 4, 17, 3, -1 + warp 5, 17, 3, -1 + + db 0 ; signs + + db 5 ; objects + object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 + object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 + object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 + object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 + object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person + + ; warp-to + warp_to 4, 17, VERMILION_GYM_WIDTH + warp_to 5, 17, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/VermilionMart.asm b/data/mapObjects/VermilionMart.asm new file mode 100755 index 00000000..74bcf35f --- /dev/null +++ b/data/mapObjects/VermilionMart.asm @@ -0,0 +1,17 @@ +VermilionMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 2, -1 + warp 4, 7, 2, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person + object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person + + ; warp-to + warp_to 3, 7, VERMILION_MART_WIDTH + warp_to 4, 7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/VermilionOldRodHouse.asm b/data/mapObjects/VermilionOldRodHouse.asm new file mode 100755 index 00000000..f5b4b96a --- /dev/null +++ b/data/mapObjects/VermilionOldRodHouse.asm @@ -0,0 +1,15 @@ +VermilionOldRodHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 8, -1 + warp 3, 7, 8, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person + + ; warp-to + warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH + warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/VermilionPidgeyHouse.asm b/data/mapObjects/VermilionPidgeyHouse.asm new file mode 100755 index 00000000..0e820f86 --- /dev/null +++ b/data/mapObjects/VermilionPidgeyHouse.asm @@ -0,0 +1,17 @@ +VermilionPidgeyHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person + object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person + + ; warp-to + warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH + warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/mapObjects/VermilionPokecenter.asm new file mode 100755 index 00000000..d2142045 --- /dev/null +++ b/data/mapObjects/VermilionPokecenter.asm @@ -0,0 +1,18 @@ +VermilionPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person + object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, VERMILION_POKECENTER_WIDTH + warp_to 4, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/mapObjects/VermilionTradeHouse.asm new file mode 100755 index 00000000..30212b2a --- /dev/null +++ b/data/mapObjects/VermilionTradeHouse.asm @@ -0,0 +1,15 @@ +VermilionTradeHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 7, -1 + warp 3, 7, 7, -1 + + db 0 ; signs + + db 1 ; objects + object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person + + ; warp-to + warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH + warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/VictoryRoad1F.asm b/data/mapObjects/VictoryRoad1F.asm new file mode 100755 index 00000000..cc0c47ce --- /dev/null +++ b/data/mapObjects/VictoryRoad1F.asm @@ -0,0 +1,23 @@ +VictoryRoad1F_Object: + db $7d ; border block + + db 3 ; warps + warp 8, 17, 2, -1 + warp 9, 17, 2, -1 + warp 1, 1, 0, VICTORY_ROAD_2F + + db 0 ; signs + + db 7 ; objects + object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 + object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 + object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43 + object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY + object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person + object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + + ; warp-to + warp_to 8, 17, VICTORY_ROAD_1F_WIDTH + warp_to 9, 17, VICTORY_ROAD_1F_WIDTH + warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/VictoryRoad2F.asm b/data/mapObjects/VictoryRoad2F.asm new file mode 100755 index 00000000..55559bca --- /dev/null +++ b/data/mapObjects/VictoryRoad2F.asm @@ -0,0 +1,37 @@ +VictoryRoad2F_Object: + db $7d ; border block + + db 7 ; warps + warp 0, 8, 2, VICTORY_ROAD_1F + warp 29, 7, 3, -1 + warp 29, 8, 3, -1 + warp 23, 7, 0, VICTORY_ROAD_3F + warp 25, 14, 2, VICTORY_ROAD_3F + warp 27, 7, 1, VICTORY_ROAD_3F + warp 1, 1, 3, VICTORY_ROAD_3F + + db 0 ; signs + + db 13 ; objects + object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 + object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 + object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 + object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 + object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 + object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17 + object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL + object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05 + object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC + object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person + + ; warp-to + warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F + warp_to 29, 7, VICTORY_ROAD_2F_WIDTH + warp_to 29, 8, VICTORY_ROAD_2F_WIDTH + warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F diff --git a/data/mapObjects/VictoryRoad3F.asm b/data/mapObjects/VictoryRoad3F.asm new file mode 100755 index 00000000..2eb42417 --- /dev/null +++ b/data/mapObjects/VictoryRoad3F.asm @@ -0,0 +1,28 @@ +VictoryRoad3F_Object: + db $7d ; border block + + db 4 ; warps + warp 23, 7, 3, VICTORY_ROAD_2F + warp 26, 8, 5, VICTORY_ROAD_2F + warp 27, 15, 4, VICTORY_ROAD_2F + warp 2, 0, 6, VICTORY_ROAD_2F + + db 0 ; signs + + db 10 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE + object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47 + object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person + object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person + object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person + + ; warp-to + warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/ViridianCity.asm b/data/mapObjects/ViridianCity.asm new file mode 100755 index 00000000..32fe8d3a --- /dev/null +++ b/data/mapObjects/ViridianCity.asm @@ -0,0 +1,33 @@ +ViridianCity_Object: + db $f ; border block + + db 5 ; warps + warp 23, 25, 0, VIRIDIAN_POKECENTER + warp 29, 19, 0, VIRIDIAN_MART + warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE + warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE + warp 32, 7, 0, VIRIDIAN_GYM + + db 6 ; signs + sign 17, 17, 8 ; ViridianCityText8 + sign 19, 1, 9 ; ViridianCityText9 + sign 21, 29, 10 ; ViridianCityText10 + sign 30, 19, 11 ; MartSignText + sign 24, 25, 12 ; PokeCenterSignText + sign 27, 7, 13 ; ViridianCityText13 + + db 7 ; objects + object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person + object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person + object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person + object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person + object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person + object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person + object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person + + ; warp-to + warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER + warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART + warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE + warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE + warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/ViridianForest.asm b/data/mapObjects/ViridianForest.asm new file mode 100755 index 00000000..cbcb6ff8 --- /dev/null +++ b/data/mapObjects/ViridianForest.asm @@ -0,0 +1,36 @@ +ViridianForest_Object: + db $3 ; border block + + db 6 ; warps + warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE + warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + + db 6 ; signs + sign 24, 40, 9 ; ViridianForestText9 + sign 16, 32, 10 ; ViridianForestText10 + sign 26, 17, 11 ; ViridianForestText11 + sign 4, 24, 12 ; ViridianForestText12 + sign 18, 45, 13 ; ViridianForestText13 + sign 2, 1, 14 ; ViridianForestText14 + + db 8 ; objects + object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person + object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 + object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 + object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE + object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION + object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL + object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person + + ; warp-to + warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/mapObjects/ViridianForestNorthGate.asm b/data/mapObjects/ViridianForestNorthGate.asm new file mode 100755 index 00000000..81e7fece --- /dev/null +++ b/data/mapObjects/ViridianForestNorthGate.asm @@ -0,0 +1,20 @@ +ViridianForestNorthGate_Object: + db $a ; border block + + db 4 ; warps + warp 4, 0, 1, -1 + warp 5, 0, 1, -1 + warp 4, 7, 0, VIRIDIAN_FOREST + warp 5, 7, 0, VIRIDIAN_FOREST + + db 0 ; signs + + db 2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person + object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person + + ; warp-to + warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH + warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH + warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/mapObjects/ViridianForestSouthGate.asm new file mode 100755 index 00000000..76f87e51 --- /dev/null +++ b/data/mapObjects/ViridianForestSouthGate.asm @@ -0,0 +1,20 @@ +ViridianForestSouthGate_Object: + db $a ; border block + + db 4 ; warps + warp 4, 0, 3, VIRIDIAN_FOREST + warp 5, 0, 4, VIRIDIAN_FOREST + warp 4, 7, 5, -1 + warp 5, 7, 5, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person + + ; warp-to + warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH + warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH diff --git a/data/mapObjects/ViridianGym.asm b/data/mapObjects/ViridianGym.asm new file mode 100755 index 00000000..e3fd17bd --- /dev/null +++ b/data/mapObjects/ViridianGym.asm @@ -0,0 +1,25 @@ +ViridianGym_Object: + db $3 ; border block + + db 2 ; warps + warp 16, 17, 4, -1 + warp 17, 17, 4, -1 + + db 0 ; signs + + db 11 ; objects + object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 + object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 + object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 + object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 + object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 + object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 + object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 + object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 + object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 + object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person + object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE + + ; warp-to + warp_to 16, 17, VIRIDIAN_GYM_WIDTH + warp_to 17, 17, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/ViridianMart.asm b/data/mapObjects/ViridianMart.asm new file mode 100755 index 00000000..b3e7fee5 --- /dev/null +++ b/data/mapObjects/ViridianMart.asm @@ -0,0 +1,17 @@ +ViridianMart_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 1, -1 + warp 4, 7, 1, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person + + ; warp-to + warp_to 3, 7, VIRIDIAN_MART_WIDTH + warp_to 4, 7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/ViridianNicknameHouse.asm b/data/mapObjects/ViridianNicknameHouse.asm new file mode 100755 index 00000000..aaf20a91 --- /dev/null +++ b/data/mapObjects/ViridianNicknameHouse.asm @@ -0,0 +1,18 @@ +ViridianNicknameHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person + object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person + object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person + + ; warp-to + warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH + warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/mapObjects/ViridianPokecenter.asm new file mode 100755 index 00000000..43b73e68 --- /dev/null +++ b/data/mapObjects/ViridianPokecenter.asm @@ -0,0 +1,18 @@ +ViridianPokecenter_Object: + db $0 ; border block + + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 + + db 0 ; signs + + db 4 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + + ; warp-to + warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH + warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/mapObjects/ViridianSchoolHouse.asm new file mode 100755 index 00000000..01f2465d --- /dev/null +++ b/data/mapObjects/ViridianSchoolHouse.asm @@ -0,0 +1,16 @@ +ViridianSchoolHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 + + db 0 ; signs + + db 2 ; objects + object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person + object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person + + ; warp-to + warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH + warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH diff --git a/data/mapObjects/WardensHouse.asm b/data/mapObjects/WardensHouse.asm new file mode 100755 index 00000000..d8445738 --- /dev/null +++ b/data/mapObjects/WardensHouse.asm @@ -0,0 +1,19 @@ +WardensHouse_Object: + db $17 ; border block + + db 2 ; warps + warp 4, 7, 3, -1 + warp 5, 7, 3, -1 + + db 2 ; signs + sign 4, 3, 4 ; FuchsiaHouse2Text4 + sign 5, 3, 5 ; FuchsiaHouse2Text5 + + db 3 ; objects + object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person + object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY + object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + + ; warp-to + warp_to 4, 7, WARDENS_HOUSE_WIDTH + warp_to 5, 7, WARDENS_HOUSE_WIDTH diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm deleted file mode 100755 index cd8bbfe7..00000000 --- a/data/mapObjects/agatha.asm +++ /dev/null @@ -1,19 +0,0 @@ -AgathaObject: - db $0 ; border block - - db 4 ; warps - warp 4, 11, 2, BRUNOS_ROOM - warp 5, 11, 3, BRUNOS_ROOM - warp 4, 0, 0, LANCES_ROOM - warp 5, 0, 0, LANCES_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 - - ; warp-to - warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM - warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm deleted file mode 100755 index 98208a94..00000000 --- a/data/mapObjects/bikeshop.asm +++ /dev/null @@ -1,17 +0,0 @@ -BikeShopObject: - db $e ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person - object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, BIKE_SHOP_WIDTH - warp_to 3, 7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm deleted file mode 100755 index 317d7c01..00000000 --- a/data/mapObjects/billshouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -BillsHouseObject: - db $d ; border block - - db 2 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, BILLS_HOUSE_WIDTH - warp_to 3, 7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm deleted file mode 100755 index 19338885..00000000 --- a/data/mapObjects/blueshouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -BluesHouseObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map - object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table - - ; warp-to - warp_to 2, 7, BLUES_HOUSE_WIDTH - warp_to 3, 7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm deleted file mode 100755 index 45d21186..00000000 --- a/data/mapObjects/bruno.asm +++ /dev/null @@ -1,19 +0,0 @@ -BrunoObject: - db $3 ; border block - - db 4 ; warps - warp 4, 11, 2, LORELEIS_ROOM - warp 5, 11, 3, LORELEIS_ROOM - warp 4, 0, 0, AGATHAS_ROOM - warp 5, 0, 1, AGATHAS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 - - ; warp-to - warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM - warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm deleted file mode 100755 index f3e481f4..00000000 --- a/data/mapObjects/celadoncity.asm +++ /dev/null @@ -1,54 +0,0 @@ -CeladonCityObject: - db $f ; border block - - db 13 ; warps - warp 8, 13, 0, CELADON_MART_1 - warp 10, 13, 2, CELADON_MART_1 - warp 24, 9, 0, CELADON_MANSION_1 - warp 24, 3, 2, CELADON_MANSION_1 - warp 25, 3, 2, CELADON_MANSION_1 - warp 41, 9, 0, CELADON_POKECENTER - warp 12, 27, 0, CELADON_GYM - warp 28, 19, 0, GAME_CORNER - warp 39, 19, 0, CELADON_MART_5 ; beta warp! no longer used - warp 33, 19, 0, CELADON_PRIZE_ROOM - warp 31, 27, 0, CELADON_DINER - warp 35, 27, 0, CELADON_HOUSE - warp 43, 27, 0, CELADON_HOTEL - - db 9 ; signs - sign 27, 15, 10 ; CeladonCityText10 - sign 19, 15, 11 ; CeladonCityText11 - sign 42, 9, 12 ; PokeCenterSignText - sign 13, 29, 13 ; CeladonCityText13 - sign 21, 9, 14 ; CeladonCityText14 - sign 12, 13, 15 ; CeladonCityText15 - sign 39, 21, 16 ; CeladonCityText16 - sign 33, 21, 17 ; CeladonCityText17 - sign 27, 21, 18 ; CeladonCityText18 - - db 9 ; objects - object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person - object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person - object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person - object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person - object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person - object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person - object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person - object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person - object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person - - ; warp-to - warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1 - warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1 - warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER - warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM - warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5 - warp_to 33, 19, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM - warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_HOUSE - warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm deleted file mode 100755 index b976a045..00000000 --- a/data/mapObjects/celadondiner.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonDinerObject: - db $f ; border block - - db 2 ; warps - warp 3, 7, 10, -1 - warp 4, 7, 10, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person - object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person - object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person - object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, CELADON_DINER_WIDTH - warp_to 4, 7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm deleted file mode 100755 index a09691d6..00000000 --- a/data/mapObjects/celadongamecorner.asm +++ /dev/null @@ -1,28 +0,0 @@ -CeladonGameCornerObject: - db $f ; border block - - db 3 ; warps - warp 15, 17, 7, -1 - warp 16, 17, 7, -1 - warp 17, 4, 1, ROCKET_HIDEOUT_1 - - db 1 ; signs - sign 9, 4, 12 ; CeladonGameCornerText12 - - db 11 ; objects - object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person - object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person - object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person - object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person - object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person - object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person - object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person - object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 - - ; warp-to - warp_to 15, 17, GAME_CORNER_WIDTH - warp_to 16, 17, GAME_CORNER_WIDTH - warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm deleted file mode 100755 index b087153b..00000000 --- a/data/mapObjects/celadongym.asm +++ /dev/null @@ -1,22 +0,0 @@ -CeladonGymObject: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 6, -1 - warp 5, 17, 6, -1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 - object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 - object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 - object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 - object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 - object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 - object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 - object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 - - ; warp-to - warp_to 4, 17, CELADON_GYM_WIDTH - warp_to 5, 17, CELADON_GYM_WIDTH diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm deleted file mode 100755 index 09b4d99c..00000000 --- a/data/mapObjects/celadonhotel.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonHotelObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 12, -1 - warp 4, 7, 12, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, CELADON_HOTEL_WIDTH - warp_to 4, 7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm deleted file mode 100755 index d24354a6..00000000 --- a/data/mapObjects/celadonhouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonHouseObject: - db $f ; border block - - db 2 ; warps - warp 2, 7, 11, -1 - warp 3, 7, 11, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person - object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person - - ; warp-to - warp_to 2, 7, CELADON_HOUSE_WIDTH - warp_to 3, 7, CELADON_HOUSE_WIDTH diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm deleted file mode 100755 index 423a9a2e..00000000 --- a/data/mapObjects/celadonmansion1.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeladonMansion1Object: - db $f ; border block - - db 5 ; warps - warp 4, 11, 2, -1 - warp 5, 11, 2, -1 - warp 4, 0, 4, -1 - warp 7, 1, 1, CELADON_MANSION_2 - warp 2, 1, 2, CELADON_MANSION_2 - - db 1 ; signs - sign 4, 9, 5 ; CeladonMansion1Text5 - - db 4 ; objects - object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person - object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person - object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person - - ; warp-to - warp_to 4, 11, CELADON_MANSION_1_WIDTH - warp_to 5, 11, CELADON_MANSION_1_WIDTH - warp_to 4, 0, CELADON_MANSION_1_WIDTH - warp_to 7, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 - warp_to 2, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm deleted file mode 100755 index f2b96d89..00000000 --- a/data/mapObjects/celadonmansion2.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonMansion2Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_3 - warp 7, 1, 3, CELADON_MANSION_1 - warp 2, 1, 4, CELADON_MANSION_1 - warp 4, 1, 3, CELADON_MANSION_3 - - db 1 ; signs - sign 4, 9, 1 ; CeladonMansion2Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 - warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm deleted file mode 100755 index e9718d9f..00000000 --- a/data/mapObjects/celadonmansion3.asm +++ /dev/null @@ -1,26 +0,0 @@ -CeladonMansion3Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_2 - warp 7, 1, 0, CELADON_MANSION_4 - warp 2, 1, 1, CELADON_MANSION_4 - warp 4, 1, 3, CELADON_MANSION_2 - - db 4 ; signs - sign 1, 3, 5 ; CeladonMansion3Text5 - sign 4, 3, 6 ; CeladonMansion3Text6 - sign 1, 6, 7 ; CeladonMansion3Text7 - sign 4, 9, 8 ; CeladonMansion3Text8 - - db 4 ; objects - object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person - object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person - object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person - - ; warp-to - warp_to 6, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 - warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 - warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 - warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm deleted file mode 100755 index 98f538eb..00000000 --- a/data/mapObjects/celadonmansion4.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonMansion4Object: - db $9 ; border block - - db 3 ; warps - warp 6, 1, 1, CELADON_MANSION_3 - warp 2, 1, 2, CELADON_MANSION_3 - warp 2, 7, 0, CELADON_MANSION_5 - - db 1 ; signs - sign 3, 7, 1 ; CeladonMansion4Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm deleted file mode 100755 index 0fd06d13..00000000 --- a/data/mapObjects/celadonmansion5.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeladonMansion5Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, CELADON_MANSION_4 - warp 3, 7, 2, CELADON_MANSION_4 - - db 0 ; signs - - db 2 ; objects - object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 - warp_to 3, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm deleted file mode 100755 index bfd66996..00000000 --- a/data/mapObjects/celadonmart1.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeladonMart1Object: - db $f ; border block - - db 6 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 16, 7, 1, -1 - warp 17, 7, 1, -1 - warp 12, 1, 0, CELADON_MART_2 - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 2 ; signs - sign 11, 4, 2 ; CeladonMart1Text2 - sign 14, 1, 3 ; CeladonMart1Text3 - - db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 2, 7, CELADON_MART_1_WIDTH - warp_to 3, 7, CELADON_MART_1_WIDTH - warp_to 16, 7, CELADON_MART_1_WIDTH - warp_to 17, 7, CELADON_MART_1_WIDTH - warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2 - warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm deleted file mode 100755 index 215861e6..00000000 --- a/data/mapObjects/celadonmart2.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart2Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 4, CELADON_MART_1 - warp 16, 1, 1, CELADON_MART_3 - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 5 ; CeladonMart2Text5 - - db 4 ; objects - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person - object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1 - warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3 - warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm deleted file mode 100755 index 023e3b46..00000000 --- a/data/mapObjects/celadonmart3.asm +++ /dev/null @@ -1,33 +0,0 @@ -CeladonMart3Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_4 - warp 16, 1, 1, CELADON_MART_2 - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 12 ; signs - sign 2, 4, 6 ; CeladonMart3Text6 - sign 3, 4, 7 ; CeladonMart3Text7 - sign 5, 4, 8 ; CeladonMart3Text8 - sign 6, 4, 9 ; CeladonMart3Text9 - sign 2, 6, 10 ; CeladonMart3Text10 - sign 3, 6, 11 ; CeladonMart3Text11 - sign 5, 6, 12 ; CeladonMart3Text12 - sign 6, 6, 13 ; CeladonMart3Text13 - sign 14, 1, 14 ; CeladonMart3Text14 - sign 4, 1, 15 ; CeladonMart3Text15 - sign 6, 1, 16 ; CeladonMart3Text16 - sign 10, 1, 17 ; CeladonMart3Text17 - - db 5 ; objects - object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person - object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person - object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person - object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_3_WIDTH ; CELADON_MART_4 - warp_to 16, 1, CELADON_MART_3_WIDTH ; CELADON_MART_2 - warp_to 1, 1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm deleted file mode 100755 index e3ea8955..00000000 --- a/data/mapObjects/celadonmart4.asm +++ /dev/null @@ -1,20 +0,0 @@ -CeladonMart4Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_3 - warp 16, 1, 1, CELADON_MART_5 - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 4 ; CeladonMart4Text4 - - db 3 ; objects - object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person - object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_4_WIDTH ; CELADON_MART_3 - warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5 - warp_to 1, 1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm deleted file mode 100755 index ac2fa454..00000000 --- a/data/mapObjects/celadonmart5.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart5Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_ROOF - warp 16, 1, 1, CELADON_MART_4 - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 5 ; CeladonMart5Text5 - - db 4 ; objects - object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person - object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF - warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4 - warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm deleted file mode 100755 index 49745aa9..00000000 --- a/data/mapObjects/celadonmartelevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -CeladonMartElevatorObject: - db $f ; border block - - db 2 ; warps - warp 1, 3, 5, CELADON_MART_1 - warp 2, 3, 5, CELADON_MART_1 - - db 1 ; signs - sign 3, 0, 1 ; CeladonMartElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 - warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm deleted file mode 100755 index 0268b1ec..00000000 --- a/data/mapObjects/celadonmartroof.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeladonMartRoofObject: - db $42 ; border block - - db 1 ; warps - warp 15, 2, 0, CELADON_MART_5 - - db 4 ; signs - sign 10, 1, 3 ; CeladonMartRoofText3 - sign 11, 1, 4 ; CeladonMartRoofText4 - sign 12, 2, 5 ; CeladonMartRoofText5 - sign 13, 2, 6 ; CeladonMartRoofText6 - - db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person - - ; warp-to - warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm deleted file mode 100755 index ab037ec0..00000000 --- a/data/mapObjects/celadonpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeladonPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, CELADON_POKECENTER_WIDTH - warp_to 4, 7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm deleted file mode 100755 index bdaafe02..00000000 --- a/data/mapObjects/celadonprizeroom.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonPrizeRoomObject: - db $f ; border block - - db 2 ; warps - warp 4, 7, 9, -1 - warp 5, 7, 9, -1 - - db 3 ; signs - sign 2, 2, 3 ; CeladonPrizeRoomText3 - sign 4, 2, 4 ; CeladonPrizeRoomText4 - sign 6, 2, 5 ; CeladonPrizeRoomText5 - - db 2 ; objects - object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person - object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person - - ; warp-to - warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH - warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm deleted file mode 100755 index 66d18a29..00000000 --- a/data/mapObjects/ceruleancity.asm +++ /dev/null @@ -1,47 +0,0 @@ -CeruleanCityObject: - db $f ; border block - - db 10 ; warps - warp 27, 11, 0, TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_HOUSE_1 - warp 19, 17, 0, CERULEAN_POKECENTER - warp 30, 19, 0, CERULEAN_GYM - warp 13, 25, 0, BIKE_SHOP - warp 25, 25, 0, CERULEAN_MART - warp 4, 11, 0, UNKNOWN_DUNGEON_1 - warp 27, 9, 2, TRASHED_HOUSE - warp 9, 11, 1, CERULEAN_HOUSE_2 - warp 9, 9, 0, CERULEAN_HOUSE_2 - - db 6 ; signs - sign 23, 19, 12 ; CeruleanCityText12 - sign 17, 29, 13 ; CeruleanCityText13 - sign 26, 25, 14 ; MartSignText - sign 20, 17, 15 ; PokeCenterSignText - sign 11, 25, 16 ; CeruleanCityText16 - sign 27, 21, 17 ; CeruleanCityText17 - - db 11 ; objects - object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 - object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person - object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person - object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person - object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person - object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person - object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person - object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person - - ; warp-to - warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 - warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER - warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM - warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP - warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART - warp_to 4, 11, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 - warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm deleted file mode 100755 index d774c5dd..00000000 --- a/data/mapObjects/ceruleangym.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeruleanGymObject: - db $3 ; border block - - db 2 ; warps - warp 4, 13, 3, -1 - warp 5, 13, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 - object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 - object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 4, 13, CERULEAN_GYM_WIDTH - warp_to 5, 13, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm deleted file mode 100755 index a8c636cf..00000000 --- a/data/mapObjects/ceruleanhouse1.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeruleanHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH - warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm deleted file mode 100755 index cf54c719..00000000 --- a/data/mapObjects/ceruleanhouse2.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanHouse2Object: - db $c ; border block - - db 3 ; warps - warp 2, 0, 9, -1 - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 0, CERULEAN_HOUSE_2_WIDTH - warp_to 2, 7, CERULEAN_HOUSE_2_WIDTH - warp_to 3, 7, CERULEAN_HOUSE_2_WIDTH diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm deleted file mode 100755 index 7b90ff73..00000000 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeruleanHouseTrashedObject: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 3, 0, 7, -1 - - db 1 ; signs - sign 3, 0, 3 ; CeruleanHouseTrashedText3 - - db 2 ; objects - object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person - object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person - - ; warp-to - warp_to 2, 7, TRASHED_HOUSE_WIDTH - warp_to 3, 7, TRASHED_HOUSE_WIDTH - warp_to 3, 0, TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm deleted file mode 100755 index 389e0317..00000000 --- a/data/mapObjects/ceruleanmart.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person - object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, CERULEAN_MART_WIDTH - warp_to 4, 7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm deleted file mode 100755 index a6d7a5b5..00000000 --- a/data/mapObjects/ceruleanpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeruleanPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person - object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, CERULEAN_POKECENTER_WIDTH - warp_to 4, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm deleted file mode 100755 index 3fc25a02..00000000 --- a/data/mapObjects/cinnabargym.asm +++ /dev/null @@ -1,23 +0,0 @@ -CinnabarGymObject: - db $2e ; border block - - db 2 ; warps - warp 16, 17, 1, -1 - warp 17, 17, 1, -1 - - db 0 ; signs - - db 9 ; objects - object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 - object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 - object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 - object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 - object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 - object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 - object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 - object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person - - ; warp-to - warp_to 16, 17, CINNABAR_GYM_WIDTH - warp_to 17, 17, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm deleted file mode 100755 index a66d6444..00000000 --- a/data/mapObjects/cinnabarisland.asm +++ /dev/null @@ -1,27 +0,0 @@ -CinnabarIslandObject: - db $43 ; border block - - db 5 ; warps - warp 6, 3, 1, MANSION_1 - warp 18, 3, 0, CINNABAR_GYM - warp 6, 9, 0, CINNABAR_LAB_1 - warp 11, 11, 0, CINNABAR_POKECENTER - warp 15, 11, 0, CINNABAR_MART - - db 5 ; signs - sign 9, 5, 3 ; CinnabarIslandText3 - sign 16, 11, 4 ; MartSignText - sign 12, 11, 5 ; PokeCenterSignText - sign 9, 11, 6 ; CinnabarIslandText6 - sign 13, 3, 7 ; CinnabarIslandText7 - - db 2 ; objects - object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person - - ; warp-to - warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1 - warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM - warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 - warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER - warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm deleted file mode 100755 index cf135039..00000000 --- a/data/mapObjects/cinnabarmart.asm +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, CINNABAR_MART_WIDTH - warp_to 4, 7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm deleted file mode 100755 index d1707ec7..00000000 --- a/data/mapObjects/cinnabarpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -CinnabarPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person - object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, CINNABAR_POKECENTER_WIDTH - warp_to 4, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm deleted file mode 100755 index 1c32de2f..00000000 --- a/data/mapObjects/colosseum.asm +++ /dev/null @@ -1,9 +0,0 @@ -ColosseumObject: - db $e ; border block - - db 0 ; warps - - db 0 ; signs - - db 1 ; objects - object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm deleted file mode 100755 index e0e02a8d..00000000 --- a/data/mapObjects/copycatshouse1f.asm +++ /dev/null @@ -1,19 +0,0 @@ -CopycatsHouse1FObject: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 7, 1, 0, COPYCATS_HOUSE_2F - - db 0 ; signs - - db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person - object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person - - ; warp-to - warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH - warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH - warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm deleted file mode 100755 index 529f3416..00000000 --- a/data/mapObjects/copycatshouse2f.asm +++ /dev/null @@ -1,19 +0,0 @@ -CopycatsHouse2FObject: - db $a ; border block - - db 1 ; warps - warp 7, 1, 2, COPYCATS_HOUSE_1F - - db 2 ; signs - sign 3, 5, 6 ; CopycatsHouse2FText6 - sign 0, 1, 7 ; CopycatsHouse2FText7 - - db 5 ; objects - object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person - object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person - object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person - object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person - - ; warp-to - warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm deleted file mode 100755 index 7c10fe70..00000000 --- a/data/mapObjects/daycarem.asm +++ /dev/null @@ -1,15 +0,0 @@ -DayCareMObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, DAYCAREM_WIDTH - warp_to 3, 7, DAYCAREM_WIDTH diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm deleted file mode 100755 index ef4de039..00000000 --- a/data/mapObjects/diglettscave.asm +++ /dev/null @@ -1,14 +0,0 @@ -DiglettsCaveObject: - db $19 ; border block - - db 2 ; warps - warp 5, 5, 2, DIGLETTS_CAVE_EXIT - warp 37, 31, 2, DIGLETTS_CAVE_ENTRANCE - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm deleted file mode 100755 index af28bfbf..00000000 --- a/data/mapObjects/diglettscaveroute11.asm +++ /dev/null @@ -1,17 +0,0 @@ -DiglettsCaveEntranceRoute11Object: - db $7d ; border block - - db 3 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - warp 4, 4, 1, DIGLETTS_CAVE - - db 0 ; signs - - db 1 ; objects - object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm deleted file mode 100755 index 645cc385..00000000 --- a/data/mapObjects/diglettscaveroute2.asm +++ /dev/null @@ -1,17 +0,0 @@ -DiglettsCaveRoute2Object: - db $7d ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 4, 4, 0, DIGLETTS_CAVE - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm deleted file mode 100755 index 8e0fd931..00000000 --- a/data/mapObjects/fanclub.asm +++ /dev/null @@ -1,22 +0,0 @@ -FanClubObject: - db $d ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 2 ; signs - sign 1, 0, 7 ; FanClubText7 - sign 6, 0, 8 ; FanClubText8 - - db 6 ; objects - object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person - object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person - object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person - object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person - object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH - warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm deleted file mode 100755 index b9ff9449..00000000 --- a/data/mapObjects/fightingdojo.asm +++ /dev/null @@ -1,21 +0,0 @@ -FightingDojoObject: - db $3 ; border block - - db 2 ; warps - warp 4, 11, 1, -1 - warp 5, 11, 1, -1 - - db 0 ; signs - - db 7 ; objects - object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 - object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 - object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 - object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 - object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 - object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person - object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person - - ; warp-to - warp_to 4, 11, FIGHTING_DOJO_WIDTH - warp_to 5, 11, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm deleted file mode 100755 index c89c03cd..00000000 --- a/data/mapObjects/fuchsiacity.asm +++ /dev/null @@ -1,52 +0,0 @@ -FuchsiaCityObject: - db $f ; border block - - db 9 ; warps - warp 5, 13, 0, FUCHSIA_MART - warp 11, 27, 0, FUCHSIA_HOUSE_1 - warp 19, 27, 0, FUCHSIA_POKECENTER - warp 27, 27, 0, FUCHSIA_HOUSE_2 - warp 18, 3, 0, SAFARI_ZONE_ENTRANCE - warp 5, 27, 0, FUCHSIA_GYM - warp 22, 13, 0, FUCHSIA_MEETING_ROOM - warp 31, 27, 1, FUCHSIA_HOUSE_3 - warp 31, 24, 0, FUCHSIA_HOUSE_3 - - db 14 ; signs - sign 15, 23, 11 ; FuchsiaCityText11 - sign 25, 15, 12 ; FuchsiaCityText12 - sign 17, 5, 13 ; FuchsiaCityText13 - sign 6, 13, 14 ; MartSignText - sign 20, 27, 15 ; PokeCenterSignText - sign 27, 29, 16 ; FuchsiaCityText16 - sign 21, 15, 17 ; FuchsiaCityText17 - sign 5, 29, 18 ; FuchsiaCityText18 - sign 33, 7, 19 ; FuchsiaCityText19 - sign 27, 7, 20 ; FuchsiaCityText20 - sign 13, 7, 21 ; FuchsiaCityText21 - sign 31, 13, 22 ; FuchsiaCityText22 - sign 13, 15, 23 ; FuchsiaCityText23 - sign 7, 7, 24 ; FuchsiaCityText24 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person - object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person - object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person - object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person - object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person - object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person - object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person - object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person - object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person - - ; warp-to - warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 - warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to 27, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 - warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM - warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 - warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm deleted file mode 100755 index 23314fb9..00000000 --- a/data/mapObjects/fuchsiagym.asm +++ /dev/null @@ -1,22 +0,0 @@ -FuchsiaGymObject: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 5, -1 - warp 5, 17, 5, -1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 - object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 - object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 - object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 - object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 - object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 - object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 - object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person - - ; warp-to - warp_to 4, 17, FUCHSIA_GYM_WIDTH - warp_to 5, 17, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm deleted file mode 100755 index ca4638f9..00000000 --- a/data/mapObjects/fuchsiahouse1.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person - object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, FUCHSIA_HOUSE_1_WIDTH - warp_to 3, 7, FUCHSIA_HOUSE_1_WIDTH diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm deleted file mode 100755 index e3702594..00000000 --- a/data/mapObjects/fuchsiahouse2.asm +++ /dev/null @@ -1,19 +0,0 @@ -FuchsiaHouse2Object: - db $17 ; border block - - db 2 ; warps - warp 4, 7, 3, -1 - warp 5, 7, 3, -1 - - db 2 ; signs - sign 4, 3, 4 ; FuchsiaHouse2Text4 - sign 5, 3, 5 ; FuchsiaHouse2Text5 - - db 3 ; objects - object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY - object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - - ; warp-to - warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH - warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm deleted file mode 100755 index 0bed500b..00000000 --- a/data/mapObjects/fuchsiahouse3.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaHouse3Object: - db $c ; border block - - db 3 ; warps - warp 2, 0, 8, -1 - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 0, FUCHSIA_HOUSE_3_WIDTH - warp_to 2, 7, FUCHSIA_HOUSE_3_WIDTH - warp_to 3, 7, FUCHSIA_HOUSE_3_WIDTH diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm deleted file mode 100755 index bfb93979..00000000 --- a/data/mapObjects/fuchsiamart.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person - - ; warp-to - warp_to 3, 7, FUCHSIA_MART_WIDTH - warp_to 4, 7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm deleted file mode 100755 index c6c10415..00000000 --- a/data/mapObjects/fuchsiameetingroom.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaMeetingRoomObject: - db $17 ; border block - - db 2 ; warps - warp 4, 7, 6, -1 - warp 5, 7, 6, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person - object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person - object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH - warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm deleted file mode 100755 index 12540cd3..00000000 --- a/data/mapObjects/fuchsiapokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -FuchsiaPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH - warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm deleted file mode 100755 index 10d9f0ed..00000000 --- a/data/mapObjects/gary.asm +++ /dev/null @@ -1,20 +0,0 @@ -GaryObject: - db $3 ; border block - - db 4 ; warps - warp 3, 7, 1, LANCES_ROOM - warp 4, 7, 2, LANCES_ROOM - warp 3, 0, 0, HALL_OF_FAME - warp 4, 0, 0, HALL_OF_FAME - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person - - ; warp-to - warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME - warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm deleted file mode 100755 index a815a053..00000000 --- a/data/mapObjects/halloffameroom.asm +++ /dev/null @@ -1,15 +0,0 @@ -HallofFameRoomObject: - db $3 ; border block - - db 2 ; warps - warp 4, 7, 2, CHAMPIONS_ROOM - warp 5, 7, 3, CHAMPIONS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM - warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm deleted file mode 100755 index d18f25e1..00000000 --- a/data/mapObjects/indigoplateau.asm +++ /dev/null @@ -1,14 +0,0 @@ -IndigoPlateauObject: - db $e ; border block - - db 2 ; warps - warp 9, 5, 0, INDIGO_PLATEAU_LOBBY - warp 10, 5, 0, INDIGO_PLATEAU_LOBBY - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm deleted file mode 100755 index d82256a1..00000000 --- a/data/mapObjects/indigoplateaulobby.asm +++ /dev/null @@ -1,21 +0,0 @@ -IndigoPlateauLobbyObject: - db $0 ; border block - - db 3 ; warps - warp 7, 11, 0, -1 - warp 8, 11, 1, -1 - warp 8, 0, 0, LORELEIS_ROOM - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person - object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person - object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm deleted file mode 100755 index b9eea581..00000000 --- a/data/mapObjects/lab1.asm +++ /dev/null @@ -1,25 +0,0 @@ -Lab1Object: - db $17 ; border block - - db 5 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - warp 8, 4, 0, CINNABAR_LAB_2 - warp 12, 4, 0, CINNABAR_LAB_3 - warp 16, 4, 0, CINNABAR_LAB_4 - - db 4 ; signs - sign 3, 2, 2 ; Lab1Text2 - sign 9, 4, 3 ; Lab1Text3 - sign 13, 4, 4 ; Lab1Text4 - sign 17, 4, 5 ; Lab1Text5 - - db 1 ; objects - object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_1_WIDTH - warp_to 3, 7, CINNABAR_LAB_1_WIDTH - warp_to 8, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 - warp_to 12, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 - warp_to 16, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm deleted file mode 100755 index 3062fcae..00000000 --- a/data/mapObjects/lab2.asm +++ /dev/null @@ -1,17 +0,0 @@ -Lab2Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 2, CINNABAR_LAB_1 - warp 3, 7, 2, CINNABAR_LAB_1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm deleted file mode 100755 index 73ba321d..00000000 --- a/data/mapObjects/lab3.asm +++ /dev/null @@ -1,19 +0,0 @@ -Lab3Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 3, CINNABAR_LAB_1 - warp 3, 7, 3, CINNABAR_LAB_1 - - db 3 ; signs - sign 0, 4, 3 ; Lab3Text3 - sign 1, 4, 4 ; Lab3Text4 - sign 2, 1, 5 ; Lab3Text5 - - db 2 ; objects - object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm deleted file mode 100755 index b9956f5f..00000000 --- a/data/mapObjects/lab4.asm +++ /dev/null @@ -1,16 +0,0 @@ -Lab4Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 4, CINNABAR_LAB_1 - warp 3, 7, 4, CINNABAR_LAB_1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm deleted file mode 100755 index 77c0058c..00000000 --- a/data/mapObjects/lance.asm +++ /dev/null @@ -1,17 +0,0 @@ -LanceObject: - db $3 ; border block - - db 3 ; warps - warp 24, 16, 2, AGATHAS_ROOM - warp 5, 0, 0, CHAMPIONS_ROOM - warp 6, 0, 0, CHAMPIONS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 - - ; warp-to - warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM - warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM - warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm deleted file mode 100755 index d9b61302..00000000 --- a/data/mapObjects/lavenderhouse1.asm +++ /dev/null @@ -1,20 +0,0 @@ -LavenderHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person - object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person - object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person - - ; warp-to - warp_to 2, 7, LAVENDER_HOUSE_1_WIDTH - warp_to 3, 7, LAVENDER_HOUSE_1_WIDTH diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm deleted file mode 100755 index 6d900f45..00000000 --- a/data/mapObjects/lavenderhouse2.asm +++ /dev/null @@ -1,16 +0,0 @@ -LavenderHouse2Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person - object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 2, 7, LAVENDER_HOUSE_2_WIDTH - warp_to 3, 7, LAVENDER_HOUSE_2_WIDTH diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm deleted file mode 100755 index 6661fee9..00000000 --- a/data/mapObjects/lavendermart.asm +++ /dev/null @@ -1,17 +0,0 @@ -LavenderMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, LAVENDER_MART_WIDTH - warp_to 4, 7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm deleted file mode 100755 index b3eea8ec..00000000 --- a/data/mapObjects/lavenderpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -LavenderPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person - object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, LAVENDER_POKECENTER_WIDTH - warp_to 4, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm deleted file mode 100755 index 5788c4f3..00000000 --- a/data/mapObjects/lavendertown.asm +++ /dev/null @@ -1,31 +0,0 @@ -LavenderTownObject: - db $2c ; border block - - db 6 ; warps - warp 3, 5, 0, LAVENDER_POKECENTER - warp 14, 5, 0, POKEMONTOWER_1 - warp 7, 9, 0, LAVENDER_HOUSE_1 - warp 15, 13, 0, LAVENDER_MART - warp 3, 13, 0, LAVENDER_HOUSE_2 - warp 7, 13, 0, NAME_RATERS_HOUSE - - db 6 ; signs - sign 11, 9, 4 ; LavenderTownText4 - sign 9, 3, 5 ; LavenderTownText5 - sign 16, 13, 6 ; MartSignText - sign 4, 5, 7 ; PokeCenterSignText - sign 5, 9, 8 ; LavenderTownText8 - sign 17, 7, 9 ; LavenderTownText9 - - db 3 ; objects - object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER - warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1 - warp_to 7, 9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1 - warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART - warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2 - warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm deleted file mode 100755 index e5f0f9f2..00000000 --- a/data/mapObjects/lorelei.asm +++ /dev/null @@ -1,19 +0,0 @@ -LoreleiObject: - db $3 ; border block - - db 4 ; warps - warp 4, 11, 2, INDIGO_PLATEAU_LOBBY - warp 5, 11, 2, INDIGO_PLATEAU_LOBBY - warp 4, 0, 0, BRUNOS_ROOM - warp 5, 0, 1, BRUNOS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 - - ; warp-to - warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm deleted file mode 100755 index fe543f27..00000000 --- a/data/mapObjects/mansion1.asm +++ /dev/null @@ -1,29 +0,0 @@ -Mansion1Object: - db $2e ; border block - - db 8 ; warps - warp 4, 27, 0, -1 - warp 5, 27, 0, -1 - warp 6, 27, 0, -1 - warp 7, 27, 0, -1 - warp 5, 10, 0, MANSION_2 - warp 21, 23, 0, MANSION_4 - warp 26, 27, 0, -1 - warp 27, 27, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS - - ; warp-to - warp_to 4, 27, MANSION_1_WIDTH - warp_to 5, 27, MANSION_1_WIDTH - warp_to 6, 27, MANSION_1_WIDTH - warp_to 7, 27, MANSION_1_WIDTH - warp_to 5, 10, MANSION_1_WIDTH ; MANSION_2 - warp_to 21, 23, MANSION_1_WIDTH ; MANSION_4 - warp_to 26, 27, MANSION_1_WIDTH - warp_to 27, 27, MANSION_1_WIDTH diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm deleted file mode 100755 index cea8c8fc..00000000 --- a/data/mapObjects/mansion2.asm +++ /dev/null @@ -1,22 +0,0 @@ -Mansion2Object: - db $1 ; border block - - db 4 ; warps - warp 5, 10, 4, MANSION_1 - warp 7, 10, 0, MANSION_3 - warp 25, 14, 2, MANSION_3 - warp 6, 1, 1, MANSION_3 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 - object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person - - ; warp-to - warp_to 5, 10, MANSION_2_WIDTH ; MANSION_1 - warp_to 7, 10, MANSION_2_WIDTH ; MANSION_3 - warp_to 25, 14, MANSION_2_WIDTH ; MANSION_3 - warp_to 6, 1, MANSION_2_WIDTH ; MANSION_3 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm deleted file mode 100755 index f6ec7aee..00000000 --- a/data/mapObjects/mansion3.asm +++ /dev/null @@ -1,21 +0,0 @@ -Mansion3Object: - db $1 ; border block - - db 3 ; warps - warp 7, 10, 1, MANSION_2 - warp 6, 1, 3, MANSION_2 - warp 25, 14, 2, MANSION_2 - - db 0 ; signs - - db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 - object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 - object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION - object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON - object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person - - ; warp-to - warp_to 7, 10, MANSION_3_WIDTH ; MANSION_2 - warp_to 6, 1, MANSION_3_WIDTH ; MANSION_2 - warp_to 25, 14, MANSION_3_WIDTH ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm deleted file mode 100755 index 3db9d016..00000000 --- a/data/mapObjects/mansion4.asm +++ /dev/null @@ -1,20 +0,0 @@ -Mansion4Object: - db $1 ; border block - - db 1 ; warps - warp 23, 22, 5, MANSION_1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 - object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY - object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE - object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 - object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 - object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person - object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY - - ; warp-to - warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm deleted file mode 100755 index 707281aa..00000000 --- a/data/mapObjects/mtmoon1.asm +++ /dev/null @@ -1,34 +0,0 @@ -MtMoon1Object: - db $3 ; border block - - db 5 ; warps - warp 14, 35, 1, -1 - warp 15, 35, 1, -1 - warp 5, 5, 0, MT_MOON_2 - warp 17, 11, 2, MT_MOON_2 - warp 25, 15, 3, MT_MOON_2 - - db 1 ; signs - sign 15, 23, 14 ; MtMoon1Text14 - - db 13 ; objects - object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 - object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 - object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 - object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 - object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 - object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 - object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 - object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION - object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE - object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY - object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE - object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION - object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 - - ; warp-to - warp_to 14, 35, MT_MOON_1_WIDTH - warp_to 15, 35, MT_MOON_1_WIDTH - warp_to 5, 5, MT_MOON_1_WIDTH ; MT_MOON_2 - warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_2 - warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm deleted file mode 100755 index abff4094..00000000 --- a/data/mapObjects/mtmoon2.asm +++ /dev/null @@ -1,26 +0,0 @@ -MtMoon2Object: - db $3 ; border block - - db 8 ; warps - warp 5, 5, 2, MT_MOON_1 - warp 17, 11, 0, MT_MOON_3 - warp 25, 9, 3, MT_MOON_1 - warp 25, 15, 4, MT_MOON_1 - warp 21, 17, 1, MT_MOON_3 - warp 13, 27, 2, MT_MOON_3 - warp 23, 3, 3, MT_MOON_3 - warp 27, 3, 2, -1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to 17, 11, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 25, 9, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to 25, 15, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to 21, 17, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 13, 27, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 23, 3, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 27, 3, MT_MOON_2_WIDTH diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm deleted file mode 100755 index 13aa5a79..00000000 --- a/data/mapObjects/mtmoon3.asm +++ /dev/null @@ -1,27 +0,0 @@ -MtMoon3Object: - db $3 ; border block - - db 4 ; warps - warp 25, 9, 1, MT_MOON_2 - warp 21, 17, 4, MT_MOON_2 - warp 15, 27, 5, MT_MOON_2 - warp 5, 7, 6, MT_MOON_2 - - db 0 ; signs - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 - object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 - object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 - object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 - object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person - object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person - object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP - object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01 - - ; warp-to - warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm deleted file mode 100755 index 841d0194..00000000 --- a/data/mapObjects/mtmoonpokecenter.asm +++ /dev/null @@ -1,20 +0,0 @@ -MtMoonPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person - object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person - object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person - object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 3, 7, MT_MOON_POKECENTER_WIDTH - warp_to 4, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm deleted file mode 100755 index 3034dc74..00000000 --- a/data/mapObjects/museum1f.asm +++ /dev/null @@ -1,25 +0,0 @@ -Museum1FObject: - db $a ; border block - - db 5 ; warps - warp 10, 7, 0, -1 - warp 11, 7, 0, -1 - warp 16, 7, 1, -1 - warp 17, 7, 1, -1 - warp 7, 7, 0, MUSEUM_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person - object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person - object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person - - ; warp-to - warp_to 10, 7, MUSEUM_1F_WIDTH - warp_to 11, 7, MUSEUM_1F_WIDTH - warp_to 16, 7, MUSEUM_1F_WIDTH - warp_to 17, 7, MUSEUM_1F_WIDTH - warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm deleted file mode 100755 index 11fad941..00000000 --- a/data/mapObjects/museum2f.asm +++ /dev/null @@ -1,19 +0,0 @@ -Museum2FObject: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, MUSEUM_1F - - db 2 ; signs - sign 11, 2, 6 ; Museum2FText6 - sign 2, 5, 7 ; Museum2FText7 - - db 5 ; objects - object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person - object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person - object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person - object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person - object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm deleted file mode 100755 index 10487f0b..00000000 --- a/data/mapObjects/namerater.asm +++ /dev/null @@ -1,15 +0,0 @@ -NameRaterObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 5, -1 - warp 3, 7, 5, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH - warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm deleted file mode 100755 index d7fc8029..00000000 --- a/data/mapObjects/oakslab.asm +++ /dev/null @@ -1,25 +0,0 @@ -OaksLabObject: - db $3 ; border block - - db 2 ; warps - warp 4, 11, 2, -1 - warp 5, 11, 2, -1 - - db 0 ; signs - - db 11 ; objects - object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 - object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person - object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person - object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person - object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person - object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person - object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person - object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person - object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person - object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person - - ; warp-to - warp_to 4, 11, OAKS_LAB_WIDTH - warp_to 5, 11, OAKS_LAB_WIDTH diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm deleted file mode 100755 index 1bd3d62b..00000000 --- a/data/mapObjects/pallettown.asm +++ /dev/null @@ -1,23 +0,0 @@ -PalletTownObject: - db $b ; border block - - db 3 ; warps - warp 5, 5, 0, REDS_HOUSE_1F - warp 13, 5, 0, BLUES_HOUSE - warp 12, 11, 1, OAKS_LAB - - db 4 ; signs - sign 13, 13, 4 ; PalletTownText4 - sign 7, 9, 5 ; PalletTownText5 - sign 3, 5, 6 ; PalletTownText6 - sign 11, 5, 7 ; PalletTownText7 - - db 3 ; objects - object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person - object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person - object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person - - ; warp-to - warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F - warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE - warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm deleted file mode 100755 index 4e7d24d0..00000000 --- a/data/mapObjects/pewtercity.asm +++ /dev/null @@ -1,36 +0,0 @@ -PewterCityObject: - db $a ; border block - - db 7 ; warps - warp 14, 7, 0, MUSEUM_1F - warp 19, 5, 2, MUSEUM_1F - warp 16, 17, 0, PEWTER_GYM - warp 29, 13, 0, PEWTER_HOUSE_1 - warp 23, 17, 0, PEWTER_MART - warp 7, 29, 0, PEWTER_HOUSE_2 - warp 13, 25, 0, PEWTER_POKECENTER - - db 7 ; signs - sign 19, 29, 6 ; PewterCityText6 - sign 33, 19, 7 ; PewterCityText7 - sign 24, 17, 8 ; MartSignText - sign 14, 25, 9 ; PokeCenterSignText - sign 15, 9, 10 ; PewterCityText10 - sign 11, 17, 11 ; PewterCityText11 - sign 25, 23, 12 ; PewterCityText12 - - db 5 ; objects - object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person - object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM - warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 - warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART - warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 - warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm deleted file mode 100755 index fc571f26..00000000 --- a/data/mapObjects/pewtergym.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterGymObject: - db $3 ; border block - - db 2 ; warps - warp 4, 13, 2, -1 - warp 5, 13, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 - object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 4, 13, PEWTER_GYM_WIDTH - warp_to 5, 13, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm deleted file mode 100755 index 63abe6b3..00000000 --- a/data/mapObjects/pewterhouse1.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person - object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, PEWTER_HOUSE_1_WIDTH - warp_to 3, 7, PEWTER_HOUSE_1_WIDTH diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm deleted file mode 100755 index 48cb243d..00000000 --- a/data/mapObjects/pewterhouse2.asm +++ /dev/null @@ -1,16 +0,0 @@ -PewterHouse2Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 5, -1 - warp 3, 7, 5, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, PEWTER_HOUSE_2_WIDTH - warp_to 3, 7, PEWTER_HOUSE_2_WIDTH diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm deleted file mode 100755 index e79952c9..00000000 --- a/data/mapObjects/pewtermart.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, PEWTER_MART_WIDTH - warp_to 4, 7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm deleted file mode 100755 index 29f02eb9..00000000 --- a/data/mapObjects/pewterpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -PewterPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 6, -1 - warp 4, 7, 6, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person - object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, PEWTER_POKECENTER_WIDTH - warp_to 4, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm deleted file mode 100755 index f15299da..00000000 --- a/data/mapObjects/pokemontower1.asm +++ /dev/null @@ -1,21 +0,0 @@ -PokemonTower1Object: - db $1 ; border block - - db 3 ; warps - warp 10, 17, 1, -1 - warp 11, 17, 1, -1 - warp 18, 9, 1, POKEMONTOWER_2 - - db 0 ; signs - - db 5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person - object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person - object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person - object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person - - ; warp-to - warp_to 10, 17, POKEMONTOWER_1_WIDTH - warp_to 11, 17, POKEMONTOWER_1_WIDTH - warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm deleted file mode 100755 index 80615cd5..00000000 --- a/data/mapObjects/pokemontower2.asm +++ /dev/null @@ -1,16 +0,0 @@ -PokemonTower2Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_3 - warp 18, 9, 2, POKEMONTOWER_1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3 - warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm deleted file mode 100755 index 0e7f5e1f..00000000 --- a/data/mapObjects/pokemontower3.asm +++ /dev/null @@ -1,18 +0,0 @@ -PokemonTower3Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_2 - warp 18, 9, 1, POKEMONTOWER_4 - - db 0 ; signs - - db 4 ; objects - object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 - object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 - object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 - object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE - - ; warp-to - warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2 - warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm deleted file mode 100755 index 9acea43e..00000000 --- a/data/mapObjects/pokemontower4.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonTower4Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_5 - warp 18, 9, 1, POKEMONTOWER_3 - - db 0 ; signs - - db 6 ; objects - object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 - object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 - object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 - object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER - object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING - object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP - - ; warp-to - warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 - warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm deleted file mode 100755 index ac0668b2..00000000 --- a/data/mapObjects/pokemontower5.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonTower5Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_4 - warp 18, 9, 0, POKEMONTOWER_6 - - db 0 ; signs - - db 6 ; objects - object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 - object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 - object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 - object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 - object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET - - ; warp-to - warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4 - warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm deleted file mode 100755 index 1dd66629..00000000 --- a/data/mapObjects/pokemontower6.asm +++ /dev/null @@ -1,19 +0,0 @@ -PokemonTower6Object: - db $1 ; border block - - db 2 ; warps - warp 18, 9, 1, POKEMONTOWER_5 - warp 9, 16, 0, POKEMONTOWER_7 - - db 0 ; signs - - db 5 ; objects - object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 - object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 - object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 - object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY - object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY - - ; warp-to - warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 - warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm deleted file mode 100755 index 9609253f..00000000 --- a/data/mapObjects/pokemontower7.asm +++ /dev/null @@ -1,16 +0,0 @@ -PokemonTower7Object: - db $1 ; border block - - db 1 ; warps - warp 9, 16, 1, POKEMONTOWER_6 - - db 0 ; signs - - db 4 ; objects - object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 - object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 - object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 - object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm deleted file mode 100755 index 402f899f..00000000 --- a/data/mapObjects/powerplant.asm +++ /dev/null @@ -1,30 +0,0 @@ -PowerPlantObject: - db $2e ; border block - - db 3 ; warps - warp 4, 35, 3, -1 - warp 5, 35, 3, -1 - warp 0, 11, 3, -1 - - db 0 ; signs - - db 14 ; objects - object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 - object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 - object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 - object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 - object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 - object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 - object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 - object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 - object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 - object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS - object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP - object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY - object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25 - object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33 - - ; warp-to - warp_to 4, 35, POWER_PLANT_WIDTH - warp_to 5, 35, POWER_PLANT_WIDTH - warp_to 0, 11, POWER_PLANT_WIDTH diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm deleted file mode 100755 index aabe6656..00000000 --- a/data/mapObjects/redshouse1f.asm +++ /dev/null @@ -1,18 +0,0 @@ -RedsHouse1FObject: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 ; exit1 - warp 3, 7, 0, -1 ; exit2 - warp 7, 1, 0, REDS_HOUSE_2F ; staircase - - db 1 ; signs - sign 3, 1, 2 ; TV - - db 1 ; objects - object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom - - ; warp-to - warp_to 2, 7, REDS_HOUSE_1F_WIDTH - warp_to 3, 7, REDS_HOUSE_1F_WIDTH - warp_to 7, 1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm deleted file mode 100755 index af3c4b6b..00000000 --- a/data/mapObjects/redshouse2f.asm +++ /dev/null @@ -1,12 +0,0 @@ -RedsHouse2FObject: - db $a ; border block - - db 1 ; warps - warp 7, 1, 2, REDS_HOUSE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 7, 1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm deleted file mode 100755 index 3a51808d..00000000 --- a/data/mapObjects/rockethideout1.asm +++ /dev/null @@ -1,27 +0,0 @@ -RocketHideout1Object: - db $2e ; border block - - db 5 ; warps - warp 23, 2, 0, ROCKET_HIDEOUT_2 - warp 21, 2, 2, GAME_CORNER - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 24, 3, ROCKET_HIDEOUT_2 - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 7 ; objects - object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 - object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 - object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 - object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 - object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 - object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE - object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION - - ; warp-to - warp_to 23, 2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 - warp_to 21, 2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER - warp_to 24, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 24, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 - warp_to 25, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm deleted file mode 100755 index 328a4fb5..00000000 --- a/data/mapObjects/rockethideout2.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideout2Object: - db $2e ; border block - - db 5 ; warps - warp 27, 8, 0, ROCKET_HIDEOUT_1 - warp 21, 8, 0, ROCKET_HIDEOUT_3 - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 22, 3, ROCKET_HIDEOUT_1 - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 - object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE - object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET - object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 - object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION - - ; warp-to - warp_to 27, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 - warp_to 21, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 - warp_to 24, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 22, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 - warp_to 25, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm deleted file mode 100755 index a8da69d2..00000000 --- a/data/mapObjects/rockethideout3.asm +++ /dev/null @@ -1,18 +0,0 @@ -RocketHideout3Object: - db $2e ; border block - - db 2 ; warps - warp 25, 6, 1, ROCKET_HIDEOUT_2 - warp 19, 18, 0, ROCKET_HIDEOUT_4 - - db 0 ; signs - - db 4 ; objects - object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 - object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 - object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10 - object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY - - ; warp-to - warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 - warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm deleted file mode 100755 index 97025c71..00000000 --- a/data/mapObjects/rockethideout4.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideout4Object: - db $2e ; border block - - db 3 ; warps - warp 19, 10, 1, ROCKET_HIDEOUT_3 - warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR - warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 9 ; objects - object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 - object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 - object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 - object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP - object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02 - object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON - object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE - object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY - - ; warp-to - warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 - warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm deleted file mode 100755 index 583c9f89..00000000 --- a/data/mapObjects/rockethideoutelevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -RocketHideoutElevatorObject: - db $f ; border block - - db 2 ; warps - warp 2, 1, 2, ROCKET_HIDEOUT_1 - warp 3, 1, 4, ROCKET_HIDEOUT_1 - - db 1 ; signs - sign 1, 1, 1 ; RocketHideoutElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 - warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm deleted file mode 100755 index 1cfeca65..00000000 --- a/data/mapObjects/rocktunnel1.asm +++ /dev/null @@ -1,34 +0,0 @@ -RockTunnel1Object: - db $3 ; border block - - db 8 ; warps - warp 15, 3, 1, -1 - warp 15, 0, 1, -1 - warp 15, 33, 2, -1 - warp 15, 35, 2, -1 - warp 37, 3, 0, ROCK_TUNNEL_2 - warp 5, 3, 1, ROCK_TUNNEL_2 - warp 17, 11, 2, ROCK_TUNNEL_2 - warp 37, 17, 3, ROCK_TUNNEL_2 - - db 1 ; signs - sign 11, 29, 8 ; RockTunnel1Text8 - - db 7 ; objects - object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 - object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 - object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 - object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 - - ; warp-to - warp_to 15, 3, ROCK_TUNNEL_1_WIDTH - warp_to 15, 0, ROCK_TUNNEL_1_WIDTH - warp_to 15, 33, ROCK_TUNNEL_1_WIDTH - warp_to 15, 35, ROCK_TUNNEL_1_WIDTH - warp_to 37, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to 5, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to 17, 11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to 37, 17, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm deleted file mode 100755 index d60863c1..00000000 --- a/data/mapObjects/rocktunnel2.asm +++ /dev/null @@ -1,26 +0,0 @@ -RockTunnel2Object: - db $3 ; border block - - db 4 ; warps - warp 33, 25, 4, ROCK_TUNNEL_1 - warp 27, 3, 5, ROCK_TUNNEL_1 - warp 23, 11, 6, ROCK_TUNNEL_1 - warp 3, 3, 7, ROCK_TUNNEL_1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 - object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 - object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 - object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 - object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 - object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 - - ; warp-to - warp_to 33, 25, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to 27, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to 23, 11, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to 3, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm deleted file mode 100755 index c664b206..00000000 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -RockTunnelPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person - object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH - warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm deleted file mode 100755 index 26505ea6..00000000 --- a/data/mapObjects/route1.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route1Object: - db $b ; border block - - db 0 ; warps - - db 1 ; signs - sign 9, 27, 3 ; Route1Text3 - - db 2 ; objects - object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person - object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person - - ; warp-to (unused) - warp_to 2, 7, 4 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm deleted file mode 100755 index 90abb47d..00000000 --- a/data/mapObjects/route10.asm +++ /dev/null @@ -1,28 +0,0 @@ -Route10Object: - db $2c ; border block - - db 4 ; warps - warp 11, 19, 0, ROCK_TUNNEL_POKECENTER - warp 8, 17, 0, ROCK_TUNNEL_1 - warp 8, 53, 2, ROCK_TUNNEL_1 - warp 6, 39, 0, POWER_PLANT - - db 4 ; signs - sign 7, 19, 7 ; Route10Text7 - sign 12, 19, 8 ; PokeCenterSignText - sign 9, 55, 9 ; Route10Text9 - sign 5, 41, 10 ; Route10Text10 - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 - object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 - object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 - object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 - object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 - - ; warp-to - warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER - warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 - warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 - warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm deleted file mode 100755 index 8d8e35d6..00000000 --- a/data/mapObjects/route11.asm +++ /dev/null @@ -1,31 +0,0 @@ -Route11Object: - db $f ; border block - - db 5 ; warps - warp 49, 8, 0, ROUTE_11_GATE_1F - warp 49, 9, 1, ROUTE_11_GATE_1F - warp 58, 8, 2, ROUTE_11_GATE_1F - warp 58, 9, 3, ROUTE_11_GATE_1F - warp 4, 5, 0, DIGLETTS_CAVE_ENTRANCE - - db 1 ; signs - sign 1, 5, 11 ; Route11Text11 - - db 10 ; objects - object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 - object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 - object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 - object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 - object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 - object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 - object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 - object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 - - ; warp-to - warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm deleted file mode 100755 index fa627963..00000000 --- a/data/mapObjects/route11gate.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route11GateObject: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_11_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm deleted file mode 100755 index e112c685..00000000 --- a/data/mapObjects/route11gateupstairs.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route11GateUpstairsObject: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_11_GATE_1F - - db 2 ; signs - sign 1, 2, 3 ; Route11GateUpstairsText3 - sign 6, 2, 4 ; Route11GateUpstairsText4 - - db 2 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person - - ; warp-to - warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm deleted file mode 100755 index b72317d4..00000000 --- a/data/mapObjects/route12.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route12Object: - db $43 ; border block - - db 4 ; warps - warp 10, 15, 0, ROUTE_12_GATE_1F - warp 11, 15, 1, ROUTE_12_GATE_1F - warp 10, 21, 2, ROUTE_12_GATE_1F - warp 11, 77, 0, ROUTE_12_HOUSE - - db 2 ; signs - sign 13, 13, 11 ; Route12Text11 - sign 11, 63, 12 ; Route12Text12 - - db 10 ; objects - object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person - object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 - object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 - object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 - object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 - object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 - object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 - object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16 - object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON - - ; warp-to - warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_HOUSE diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm deleted file mode 100755 index bbfab54c..00000000 --- a/data/mapObjects/route12gate.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route12GateObject: - db $a ; border block - - db 5 ; warps - warp 4, 0, 0, -1 - warp 5, 0, 1, -1 - warp 4, 7, 2, -1 - warp 5, 7, 2, -1 - warp 8, 6, 0, ROUTE_12_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH - warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH - warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH - warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH - warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm deleted file mode 100755 index 9351ebac..00000000 --- a/data/mapObjects/route12gateupstairs.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route12GateUpstairsObject: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_12_GATE_1F - - db 2 ; signs - sign 1, 2, 2 ; Route12GateUpstairsText2 - sign 6, 2, 3 ; Route12GateUpstairsText3 - - db 1 ; objects - object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person - - ; warp-to - warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm deleted file mode 100755 index 3161ebe6..00000000 --- a/data/mapObjects/route12house.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route12HouseObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, ROUTE_12_HOUSE_WIDTH - warp_to 3, 7, ROUTE_12_HOUSE_WIDTH diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm deleted file mode 100755 index b2a40c2c..00000000 --- a/data/mapObjects/route13.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route13Object: - db $43 ; border block - - db 0 ; warps - - db 3 ; signs - sign 15, 13, 11 ; Route13Text11 - sign 33, 5, 12 ; Route13Text12 - sign 31, 11, 13 ; Route13Text13 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 - object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 - object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 - object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 - object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 - object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 - object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 - object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 - object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm deleted file mode 100755 index 9694715b..00000000 --- a/data/mapObjects/route14.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route14Object: - db $43 ; border block - - db 0 ; warps - - db 1 ; signs - sign 17, 13, 11 ; Route14Text11 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 - object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 - object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 - object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 - object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 - object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 - object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm deleted file mode 100755 index 21fd2d97..00000000 --- a/data/mapObjects/route15.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route15Object: - db $43 ; border block - - db 4 ; warps - warp 7, 8, 0, ROUTE_15_GATE_1F - warp 7, 9, 1, ROUTE_15_GATE_1F - warp 14, 8, 2, ROUTE_15_GATE_1F - warp 14, 9, 3, ROUTE_15_GATE_1F - - db 1 ; signs - sign 39, 9, 12 ; Route15Text12 - - db 11 ; objects - object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 - object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 - object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 - object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 - object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 - object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20 - - ; warp-to - warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm deleted file mode 100755 index 13c39674..00000000 --- a/data/mapObjects/route15gate.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route15GateObject: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_15_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm deleted file mode 100755 index ff180883..00000000 --- a/data/mapObjects/route15gateupstairs.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route15GateUpstairsObject: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_15_GATE_1F - - db 1 ; signs - sign 6, 2, 2 ; Route15GateUpstairsText2 - - db 1 ; objects - object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1 - - ; warp-to - warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm deleted file mode 100755 index 35ffea17..00000000 --- a/data/mapObjects/route16.asm +++ /dev/null @@ -1,37 +0,0 @@ -Route16Object: - db $f ; border block - - db 9 ; warps - warp 17, 10, 0, ROUTE_16_GATE_1F - warp 17, 11, 1, ROUTE_16_GATE_1F - warp 24, 10, 2, ROUTE_16_GATE_1F - warp 24, 11, 3, ROUTE_16_GATE_1F - warp 17, 4, 4, ROUTE_16_GATE_1F - warp 17, 5, 5, ROUTE_16_GATE_1F - warp 24, 4, 6, ROUTE_16_GATE_1F - warp 24, 5, 7, ROUTE_16_GATE_1F - warp 7, 5, 0, ROUTE_16_HOUSE - - db 2 ; signs - sign 27, 11, 8 ; Route16Text8 - sign 5, 17, 9 ; Route16Text9 - - db 7 ; objects - object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 - object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 - object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 - object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 - object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 - object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 - object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm deleted file mode 100755 index 4e1863ed..00000000 --- a/data/mapObjects/route16gate.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route16GateObject: - db $a ; border block - - db 9 ; warps - warp 0, 8, 0, -1 - warp 0, 9, 1, -1 - warp 7, 8, 2, -1 - warp 7, 9, 2, -1 - warp 0, 2, 4, -1 - warp 0, 3, 5, -1 - warp 7, 2, 6, -1 - warp 7, 3, 7, -1 - warp 6, 12, 0, ROUTE_16_GATE_2F - - db 0 ; signs - - db 2 ; objects - object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person - object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH - warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm deleted file mode 100755 index 41487e6e..00000000 --- a/data/mapObjects/route16gateupstairs.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route16GateUpstairsObject: - db $a ; border block - - db 1 ; warps - warp 7, 7, 8, ROUTE_16_GATE_1F - - db 2 ; signs - sign 1, 2, 3 ; Route16GateUpstairsText3 - sign 6, 2, 4 ; Route16GateUpstairsText4 - - db 2 ; objects - object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person - - ; warp-to - warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm deleted file mode 100755 index 7a097105..00000000 --- a/data/mapObjects/route16house.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route16HouseObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person - - ; warp-to - warp_to 2, 7, ROUTE_16_HOUSE_WIDTH - warp_to 3, 7, ROUTE_16_HOUSE_WIDTH diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm deleted file mode 100755 index 48750597..00000000 --- a/data/mapObjects/route17.asm +++ /dev/null @@ -1,24 +0,0 @@ -Route17Object: - db $43 ; border block - - db 0 ; warps - - db 6 ; signs - sign 9, 51, 11 ; Route17Text11 - sign 9, 63, 12 ; Route17Text12 - sign 9, 75, 13 ; Route17Text13 - sign 9, 87, 14 ; Route17Text14 - sign 9, 111, 15 ; Route17Text15 - sign 9, 141, 16 ; Route17Text16 - - db 10 ; objects - object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 - object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 - object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 - object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 - object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 - object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 - object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 - object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 - object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 - object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm deleted file mode 100755 index d7851f88..00000000 --- a/data/mapObjects/route18.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route18Object: - db $43 ; border block - - db 4 ; warps - warp 33, 8, 0, ROUTE_18_GATE_1F - warp 33, 9, 1, ROUTE_18_GATE_1F - warp 40, 8, 2, ROUTE_18_GATE_1F - warp 40, 9, 3, ROUTE_18_GATE_1F - - db 2 ; signs - sign 43, 7, 4 ; Route18Text4 - sign 33, 5, 5 ; Route18Text5 - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 - object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 - object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 - - ; warp-to - warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm deleted file mode 100755 index c73d7131..00000000 --- a/data/mapObjects/route18gate.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route18GateObject: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_18_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm deleted file mode 100755 index 6d298055..00000000 --- a/data/mapObjects/route18gateupstairs.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route18GateUpstairsObject: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_18_GATE_1F - - db 2 ; signs - sign 1, 2, 2 ; Route18GateUpstairsText2 - sign 6, 2, 3 ; Route18GateUpstairsText3 - - db 1 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person - - ; warp-to - warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm deleted file mode 100755 index 935b3d4d..00000000 --- a/data/mapObjects/route19.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route19Object: - db $43 ; border block - - db 0 ; warps - - db 1 ; signs - sign 11, 9, 11 ; Route19Text11 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 - object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 - object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 - object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 - object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 - object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 - object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 - object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 - - ; warp-to diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm deleted file mode 100755 index b62f9fdb..00000000 --- a/data/mapObjects/route2.asm +++ /dev/null @@ -1,33 +0,0 @@ -Route2Object: - db $f ; border block - - db 6 ; warps - warp 12, 9, 0, DIGLETTS_CAVE_EXIT - warp 3, 11, 1, VIRIDIAN_FOREST_EXIT - warp 15, 19, 0, ROUTE_2_HOUSE - warp 16, 35, 1, ROUTE_2_GATE - warp 15, 39, 2, ROUTE_2_GATE - warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE - - db 2 ; signs - sign 5, 65, 3 ; Route2Text3 - sign 11, 11, 4 ; Route2Text4 - - db 2 ; objects - object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE - object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP - - ; warp-to - warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE - warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - - ; unused - warp_to 2, 7, 4 - db $12, $c7, $9, $7 - warp_to 2, 7, 4 - warp_to 2, 7, 4 - warp_to 2, 7, 4 diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm deleted file mode 100755 index 5f4d5647..00000000 --- a/data/mapObjects/route20.asm +++ /dev/null @@ -1,26 +0,0 @@ -Route20Object: - db $43 ; border block - - db 2 ; warps - warp 48, 5, 0, SEAFOAM_ISLANDS_1 - warp 58, 9, 2, SEAFOAM_ISLANDS_1 - - db 2 ; signs - sign 51, 7, 11 ; Route20Text11 - sign 57, 11, 12 ; Route20Text12 - - db 10 ; objects - object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 - object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 - object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 - object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 - object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 - object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 - object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 - object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 - object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 - object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 - - ; warp-to - warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm deleted file mode 100755 index bb2409ce..00000000 --- a/data/mapObjects/route21.asm +++ /dev/null @@ -1,17 +0,0 @@ -Route21Object: - db $43 ; border block - - db 0 ; warps - - db 0 ; signs - - db 9 ; objects - object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 - object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 - object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 - object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 - object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 - object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 - object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 - object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 - object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm deleted file mode 100755 index e91eb792..00000000 --- a/data/mapObjects/route22.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route22Object: - db $2c ; border block - - db 1 ; warps - warp 8, 5, 0, ROUTE_22_GATE - - db 1 ; signs - sign 7, 11, 3 ; Route22FrontGateText - - db 2 ; objects - object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person - object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm deleted file mode 100755 index aa9512c6..00000000 --- a/data/mapObjects/route22gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route22GateObject: - db $a ; border block - - db 4 ; warps - warp 4, 7, 0, -1 - warp 5, 7, 0, -1 - warp 4, 0, 0, -1 - warp 5, 0, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 4, 7, ROUTE_22_GATE_WIDTH - warp_to 5, 7, ROUTE_22_GATE_WIDTH - warp_to 4, 0, ROUTE_22_GATE_WIDTH - warp_to 5, 0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm deleted file mode 100755 index 2fd3e3d7..00000000 --- a/data/mapObjects/route23.asm +++ /dev/null @@ -1,26 +0,0 @@ -Route23Object: - db $f ; border block - - db 4 ; warps - warp 7, 139, 2, ROUTE_22_GATE - warp 8, 139, 3, ROUTE_22_GATE - warp 4, 31, 0, VICTORY_ROAD_1 - warp 14, 31, 1, VICTORY_ROAD_2 - - db 1 ; signs - sign 3, 33, 8 ; Route23Text8 - - db 7 ; objects - object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person - object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person - object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person - object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person - object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person - object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person - object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1 - warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm deleted file mode 100755 index 0fcc1d7b..00000000 --- a/data/mapObjects/route24.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route24Object: - db $2c ; border block - - db 0 ; warps - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 - object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 - object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 - object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 - object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 - object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 - object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm deleted file mode 100755 index 3ba5fbdb..00000000 --- a/data/mapObjects/route25.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route25Object: - db $2c ; border block - - db 1 ; warps - warp 45, 3, 0, BILLS_HOUSE - - db 1 ; signs - sign 43, 3, 11 ; Route25Text11 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 - object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 - object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 - object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 - object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 - object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 - object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 - object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 - object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19 - - ; warp-to - warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm deleted file mode 100755 index 714b8ee6..00000000 --- a/data/mapObjects/route2gate.asm +++ /dev/null @@ -1,20 +0,0 @@ -Route2GateObject: - db $a ; border block - - db 4 ; warps - warp 4, 0, 3, -1 - warp 5, 0, 3, -1 - warp 4, 7, 4, -1 - warp 5, 7, 4, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person - - ; warp-to - warp_to 4, 0, ROUTE_2_GATE_WIDTH - warp_to 5, 0, ROUTE_2_GATE_WIDTH - warp_to 4, 7, ROUTE_2_GATE_WIDTH - warp_to 5, 7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm deleted file mode 100755 index b27b65ef..00000000 --- a/data/mapObjects/route2house.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route2HouseObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person - - ; warp-to - warp_to 2, 7, ROUTE_2_HOUSE_WIDTH - warp_to 3, 7, ROUTE_2_HOUSE_WIDTH diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm deleted file mode 100755 index 422fa29b..00000000 --- a/data/mapObjects/route3.asm +++ /dev/null @@ -1,18 +0,0 @@ -Route3Object: - db $2c ; border block - - db 0 ; warps - - db 1 ; signs - sign 59, 9, 10 ; Route3Text10 - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 - object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 - object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 - object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm deleted file mode 100755 index 7d09c28a..00000000 --- a/data/mapObjects/route4.asm +++ /dev/null @@ -1,22 +0,0 @@ -Route4Object: - db $2c ; border block - - db 3 ; warps - warp 11, 5, 0, MT_MOON_POKECENTER - warp 18, 5, 0, MT_MOON_1 - warp 24, 5, 7, MT_MOON_2 - - db 3 ; signs - sign 12, 5, 4 ; PokeCenterSignText - sign 17, 7, 5 ; Route4Text5 - sign 27, 7, 6 ; Route4Text6 - - db 3 ; objects - object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person - object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 - object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04 - - ; warp-to - warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER - warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1 - warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm deleted file mode 100755 index 62aa6431..00000000 --- a/data/mapObjects/route5.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route5Object: - db $a ; border block - - db 5 ; warps - warp 10, 29, 3, ROUTE_5_GATE - warp 9, 29, 2, ROUTE_5_GATE - warp 10, 33, 0, ROUTE_5_GATE - warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5 - warp 10, 21, 0, DAYCAREM - - db 1 ; signs - sign 17, 29, 1 ; Route5Text1 - - db 0 ; objects - - ; warp-to - warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 17, 27, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 - warp_to 10, 21, ROUTE_5_WIDTH ; DAYCAREM diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm deleted file mode 100755 index 8b230942..00000000 --- a/data/mapObjects/route5gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route5GateObject: - db $a ; border block - - db 4 ; warps - warp 3, 5, 2, -1 - warp 4, 5, 2, -1 - warp 3, 0, 1, -1 - warp 4, 0, 0, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 3, 5, ROUTE_5_GATE_WIDTH - warp_to 4, 5, ROUTE_5_GATE_WIDTH - warp_to 3, 0, ROUTE_5_GATE_WIDTH - warp_to 4, 0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm deleted file mode 100755 index e0eea85b..00000000 --- a/data/mapObjects/route6.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route6Object: - db $f ; border block - - db 4 ; warps - warp 9, 1, 2, ROUTE_6_GATE - warp 10, 1, 2, ROUTE_6_GATE - warp 10, 7, 0, ROUTE_6_GATE - warp 17, 13, 0, PATH_ENTRANCE_ROUTE_6 - - db 1 ; signs - sign 19, 15, 7 ; Route6Text7 - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 - object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 - - ; warp-to - warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 17, 13, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm deleted file mode 100755 index e3b7b2b8..00000000 --- a/data/mapObjects/route6gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route6GateObject: - db $a ; border block - - db 4 ; warps - warp 3, 5, 2, -1 - warp 4, 5, 2, -1 - warp 3, 0, 1, -1 - warp 4, 0, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 3, 5, ROUTE_6_GATE_WIDTH - warp_to 4, 5, ROUTE_6_GATE_WIDTH - warp_to 3, 0, ROUTE_6_GATE_WIDTH - warp_to 4, 0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm deleted file mode 100755 index d32e6019..00000000 --- a/data/mapObjects/route7.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route7Object: - db $f ; border block - - db 5 ; warps - warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 3, ROUTE_7_GATE - warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 1, ROUTE_7_GATE - warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7 - - db 1 ; signs - sign 3, 13, 1 ; Route7Text1 - - db 0 ; objects - - ; warp-to - warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 5, 13, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm deleted file mode 100755 index 0b726fd3..00000000 --- a/data/mapObjects/route7gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route7GateObject: - db $a ; border block - - db 4 ; warps - warp 0, 3, 3, -1 - warp 0, 4, 3, -1 - warp 5, 3, 0, -1 - warp 5, 4, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 3, ROUTE_7_GATE_WIDTH - warp_to 0, 4, ROUTE_7_GATE_WIDTH - warp_to 5, 3, ROUTE_7_GATE_WIDTH - warp_to 5, 4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm deleted file mode 100755 index dc7580fc..00000000 --- a/data/mapObjects/route8.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route8Object: - db $2c ; border block - - db 5 ; warps - warp 1, 9, 0, ROUTE_8_GATE - warp 1, 10, 1, ROUTE_8_GATE - warp 8, 9, 2, ROUTE_8_GATE - warp 8, 10, 3, ROUTE_8_GATE - warp 13, 3, 0, PATH_ENTRANCE_ROUTE_8 - - db 1 ; signs - sign 17, 3, 10 ; Route8Text10 - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 - object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 - object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 - object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 - object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 - object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 - object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 - - ; warp-to - warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 13, 3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm deleted file mode 100755 index ac286aa0..00000000 --- a/data/mapObjects/route8gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route8GateObject: - db $a ; border block - - db 4 ; warps - warp 0, 3, 0, -1 - warp 0, 4, 1, -1 - warp 5, 3, 2, -1 - warp 5, 4, 3, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 3, ROUTE_8_GATE_WIDTH - warp_to 0, 4, ROUTE_8_GATE_WIDTH - warp_to 5, 3, ROUTE_8_GATE_WIDTH - warp_to 5, 4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm deleted file mode 100755 index ab3ceefe..00000000 --- a/data/mapObjects/route9.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route9Object: - db $2c ; border block - - db 0 ; warps - - db 1 ; signs - sign 25, 7, 11 ; Route9Text11 - - db 10 ; objects - object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 - object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 - object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 - object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 - object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 - object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 - object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 - object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 - object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm deleted file mode 100755 index 550f9aa4..00000000 --- a/data/mapObjects/safarizonecenter.asm +++ /dev/null @@ -1,31 +0,0 @@ -SafariZoneCenterObject: - db $0 ; border block - - db 9 ; warps - warp 14, 25, 2, SAFARI_ZONE_ENTRANCE - warp 15, 25, 3, SAFARI_ZONE_ENTRANCE - warp 0, 10, 4, SAFARI_ZONE_WEST - warp 0, 11, 5, SAFARI_ZONE_WEST - warp 14, 0, 4, SAFARI_ZONE_NORTH - warp 15, 0, 5, SAFARI_ZONE_NORTH - warp 29, 10, 2, SAFARI_ZONE_EAST - warp 29, 11, 3, SAFARI_ZONE_EAST - warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1 - - db 2 ; signs - sign 18, 20, 2 ; SafariZoneCenterText2 - sign 14, 22, 3 ; SafariZoneCenterText3 - - db 1 ; objects - object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET - - ; warp-to - warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1 diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm deleted file mode 100755 index 53553161..00000000 --- a/data/mapObjects/safarizoneeast.asm +++ /dev/null @@ -1,27 +0,0 @@ -SafariZoneEastObject: - db $0 ; border block - - db 5 ; warps - warp 0, 4, 6, SAFARI_ZONE_NORTH - warp 0, 5, 7, SAFARI_ZONE_NORTH - warp 0, 22, 6, SAFARI_ZONE_CENTER - warp 0, 23, 6, SAFARI_ZONE_CENTER - warp 25, 9, 0, SAFARI_ZONE_REST_HOUSE_3 - - db 3 ; signs - sign 26, 10, 5 ; SafariZoneEastText5 - sign 6, 4, 6 ; SafariZoneEastText6 - sign 5, 23, 7 ; SafariZoneEastText7 - - db 4 ; objects - object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION - object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS - object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37 - - ; warp-to - warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3 diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm deleted file mode 100755 index 5a3379c7..00000000 --- a/data/mapObjects/safarizoneentrance.asm +++ /dev/null @@ -1,20 +0,0 @@ -SafariZoneEntranceObject: - db $a ; border block - - db 4 ; warps - warp 3, 5, 4, -1 - warp 4, 5, 4, -1 - warp 3, 0, 0, SAFARI_ZONE_CENTER - warp 4, 0, 1, SAFARI_ZONE_CENTER - - db 0 ; signs - - db 2 ; objects - object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person - object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH - warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH - warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER - warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm deleted file mode 100755 index 6cbe51f6..00000000 --- a/data/mapObjects/safarizonenorth.asm +++ /dev/null @@ -1,35 +0,0 @@ -SafariZoneNorthObject: - db $0 ; border block - - db 9 ; warps - warp 2, 35, 0, SAFARI_ZONE_WEST - warp 3, 35, 1, SAFARI_ZONE_WEST - warp 8, 35, 2, SAFARI_ZONE_WEST - warp 9, 35, 3, SAFARI_ZONE_WEST - warp 20, 35, 4, SAFARI_ZONE_CENTER - warp 21, 35, 5, SAFARI_ZONE_CENTER - warp 39, 30, 0, SAFARI_ZONE_EAST - warp 39, 31, 1, SAFARI_ZONE_EAST - warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4 - - db 5 ; signs - sign 36, 4, 3 ; SafariZoneNorthText3 - sign 4, 25, 4 ; SafariZoneNorthText4 - sign 13, 31, 5 ; SafariZoneNorthText5 - sign 19, 33, 6 ; SafariZoneNorthText6 - sign 26, 28, 7 ; SafariZoneNorthText7 - - db 2 ; objects - object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN - object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40 - - ; warp-to - warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm deleted file mode 100755 index 031debec..00000000 --- a/data/mapObjects/safarizoneresthouse1.asm +++ /dev/null @@ -1,16 +0,0 @@ -SafariZoneRestHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, SAFARI_ZONE_CENTER - warp 3, 7, 8, SAFARI_ZONE_CENTER - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm deleted file mode 100755 index 7e589731..00000000 --- a/data/mapObjects/safarizoneresthouse2.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneRestHouse2Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, SAFARI_ZONE_WEST - warp 3, 7, 7, SAFARI_ZONE_WEST - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person - object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm deleted file mode 100755 index 00623953..00000000 --- a/data/mapObjects/safarizoneresthouse3.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneRestHouse3Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, SAFARI_ZONE_EAST - warp 3, 7, 4, SAFARI_ZONE_EAST - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person - object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm deleted file mode 100755 index d3b81b4e..00000000 --- a/data/mapObjects/safarizoneresthouse4.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneRestHouse4Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, SAFARI_ZONE_NORTH - warp 3, 7, 8, SAFARI_ZONE_NORTH - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person - object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm deleted file mode 100755 index 4faa90c6..00000000 --- a/data/mapObjects/safarizonesecrethouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -SafariZoneSecretHouseObject: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 6, SAFARI_ZONE_WEST - warp 3, 7, 6, SAFARI_ZONE_WEST - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm deleted file mode 100755 index 5d3c6d19..00000000 --- a/data/mapObjects/safarizonewest.asm +++ /dev/null @@ -1,34 +0,0 @@ -SafariZoneWestObject: - db $0 ; border block - - db 8 ; warps - warp 20, 0, 0, SAFARI_ZONE_NORTH - warp 21, 0, 1, SAFARI_ZONE_NORTH - warp 26, 0, 2, SAFARI_ZONE_NORTH - warp 27, 0, 3, SAFARI_ZONE_NORTH - warp 29, 22, 2, SAFARI_ZONE_CENTER - warp 29, 23, 3, SAFARI_ZONE_CENTER - warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE - warp 11, 11, 0, SAFARI_ZONE_REST_HOUSE_2 - - db 4 ; signs - sign 12, 12, 5 ; SafariZoneWestText5 - sign 17, 3, 6 ; SafariZoneWestText6 - sign 26, 4, 7 ; SafariZoneWestText7 - sign 24, 22, 8 ; SafariZoneWestText8 - - db 4 ; objects - object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION - object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32 - object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE - object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH - - ; warp-to - warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm deleted file mode 100755 index d9afc7ec..00000000 --- a/data/mapObjects/saffroncity.asm +++ /dev/null @@ -1,51 +0,0 @@ -SaffronCityObject: - db $f ; border block - - db 8 ; warps - warp 7, 5, 0, COPYCATS_HOUSE_1F - warp 26, 3, 0, FIGHTING_DOJO - warp 34, 3, 0, SAFFRON_GYM - warp 13, 11, 0, SAFFRON_HOUSE_1 - warp 25, 11, 0, SAFFRON_MART - warp 18, 21, 0, SILPH_CO_1F - warp 9, 29, 0, SAFFRON_POKECENTER - warp 29, 29, 0, SAFFRON_HOUSE_2 - - db 10 ; signs - sign 17, 5, 16 ; SaffronCityText16 - sign 27, 5, 17 ; SaffronCityText17 - sign 35, 5, 18 ; SaffronCityText18 - sign 26, 11, 19 ; MartSignText - sign 39, 19, 20 ; SaffronCityText20 - sign 5, 21, 21 ; SaffronCityText21 - sign 15, 21, 22 ; SaffronCityText22 - sign 10, 29, 23 ; PokeCenterSignText - sign 27, 29, 24 ; SaffronCityText24 - sign 1, 19, 25 ; SaffronCityText25 - - db 15 ; objects - object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person - object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person - object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person - object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person - object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person - object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person - object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person - object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person - object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person - object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person - object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person - object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person - object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person - - ; warp-to - warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F - warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO - warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM - warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 - warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART - warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F - warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER - warp_to 29, 29, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm deleted file mode 100755 index b466d152..00000000 --- a/data/mapObjects/saffrongym.asm +++ /dev/null @@ -1,83 +0,0 @@ -SaffronGymObject: - db $2e ; border block - - db 32 ; warps - warp 8, 17, 2, -1 - warp 9, 17, 2, -1 - warp 1, 3, 22, SAFFRON_GYM - warp 5, 3, 15, SAFFRON_GYM - warp 1, 5, 18, SAFFRON_GYM - warp 5, 5, 8, SAFFRON_GYM - warp 1, 9, 27, SAFFRON_GYM - warp 5, 9, 16, SAFFRON_GYM - warp 1, 11, 5, SAFFRON_GYM - warp 5, 11, 13, SAFFRON_GYM - warp 1, 15, 23, SAFFRON_GYM - warp 5, 15, 30, SAFFRON_GYM - warp 1, 17, 17, SAFFRON_GYM - warp 5, 17, 9, SAFFRON_GYM - warp 9, 3, 26, SAFFRON_GYM - warp 11, 3, 3, SAFFRON_GYM - warp 9, 5, 7, SAFFRON_GYM - warp 11, 5, 12, SAFFRON_GYM - warp 11, 11, 4, SAFFRON_GYM - warp 11, 15, 31, SAFFRON_GYM - warp 15, 3, 24, SAFFRON_GYM - warp 19, 3, 28, SAFFRON_GYM - warp 15, 5, 2, SAFFRON_GYM - warp 19, 5, 10, SAFFRON_GYM - warp 15, 9, 20, SAFFRON_GYM - warp 19, 9, 29, SAFFRON_GYM - warp 15, 11, 14, SAFFRON_GYM - warp 19, 11, 6, SAFFRON_GYM - warp 15, 15, 21, SAFFRON_GYM - warp 19, 15, 25, SAFFRON_GYM - warp 15, 17, 11, SAFFRON_GYM - warp 19, 17, 19, SAFFRON_GYM - - db 0 ; signs - - db 9 ; objects - object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 - object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 - object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 - object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 - object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 - object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person - - ; warp-to - warp_to 8, 17, SAFFRON_GYM_WIDTH - warp_to 9, 17, SAFFRON_GYM_WIDTH - warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm deleted file mode 100755 index c6abb539..00000000 --- a/data/mapObjects/saffronhouse1.asm +++ /dev/null @@ -1,18 +0,0 @@ -SaffronHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person - object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person - - ; warp-to - warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH - warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm deleted file mode 100755 index ac1827b9..00000000 --- a/data/mapObjects/saffronhouse2.asm +++ /dev/null @@ -1,15 +0,0 @@ -SaffronHouse2Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 2, 7, SAFFRON_HOUSE_2_WIDTH - warp_to 3, 7, SAFFRON_HOUSE_2_WIDTH diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm deleted file mode 100755 index 6293b901..00000000 --- a/data/mapObjects/saffronmart.asm +++ /dev/null @@ -1,17 +0,0 @@ -SaffronMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person - - ; warp-to - warp_to 3, 7, SAFFRON_MART_WIDTH - warp_to 4, 7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm deleted file mode 100755 index b367ec89..00000000 --- a/data/mapObjects/saffronpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -SaffronPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 6, -1 - warp 4, 7, 6, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, SAFFRON_POKECENTER_WIDTH - warp_to 4, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm deleted file mode 100755 index 8f07144f..00000000 --- a/data/mapObjects/school.asm +++ /dev/null @@ -1,16 +0,0 @@ -SchoolObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person - object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person - - ; warp-to - warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH - warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm deleted file mode 100755 index a1617004..00000000 --- a/data/mapObjects/seafoamislands1.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslands1Object: - db $7d ; border block - - db 7 ; warps - warp 4, 17, 0, -1 - warp 5, 17, 0, -1 - warp 26, 17, 1, -1 - warp 27, 17, 1, -1 - warp 7, 5, 1, SEAFOAM_ISLANDS_2 - warp 25, 3, 6, SEAFOAM_ISLANDS_2 - warp 23, 15, 4, SEAFOAM_ISLANDS_2 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - - ; holes - warp_to 17, 6, SEAFOAM_ISLANDS_1_WIDTH - warp_to 24, 6, SEAFOAM_ISLANDS_1_WIDTH diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm deleted file mode 100755 index 76c2ce3c..00000000 --- a/data/mapObjects/seafoamislands2.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslands2Object: - db $7d ; border block - - db 7 ; warps - warp 4, 2, 0, SEAFOAM_ISLANDS_3 - warp 7, 5, 4, SEAFOAM_ISLANDS_1 - warp 13, 7, 2, SEAFOAM_ISLANDS_3 - warp 19, 15, 3, SEAFOAM_ISLANDS_3 - warp 23, 15, 6, SEAFOAM_ISLANDS_1 - warp 25, 11, 5, SEAFOAM_ISLANDS_3 - warp 25, 3, 5, SEAFOAM_ISLANDS_1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 7, 5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 13, 7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 19, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 23, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 25, 11, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 25, 3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm deleted file mode 100755 index a5cb848a..00000000 --- a/data/mapObjects/seafoamislands3.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslands3Object: - db $7d ; border block - - db 7 ; warps - warp 5, 3, 0, SEAFOAM_ISLANDS_2 - warp 5, 13, 0, SEAFOAM_ISLANDS_4 - warp 13, 7, 2, SEAFOAM_ISLANDS_2 - warp 19, 15, 3, SEAFOAM_ISLANDS_2 - warp 25, 3, 3, SEAFOAM_ISLANDS_4 - warp 25, 11, 5, SEAFOAM_ISLANDS_2 - warp 25, 14, 4, SEAFOAM_ISLANDS_4 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 5, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 5, 13, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 13, 7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 19, 15, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 25, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 25, 11, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 25, 14, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm deleted file mode 100755 index 0faaae28..00000000 --- a/data/mapObjects/seafoamislands4.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslands4Object: - db $7d ; border block - - db 7 ; warps - warp 5, 12, 1, SEAFOAM_ISLANDS_3 - warp 8, 6, 2, SEAFOAM_ISLANDS_5 - warp 25, 4, 3, SEAFOAM_ISLANDS_5 - warp 25, 3, 4, SEAFOAM_ISLANDS_3 - warp 25, 14, 6, SEAFOAM_ISLANDS_3 - warp 20, 17, 0, SEAFOAM_ISLANDS_5 - warp 21, 17, 1, SEAFOAM_ISLANDS_5 - - db 0 ; signs - - db 6 ; objects - object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person - object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person - object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person - - ; warp-to - warp_to 5, 12, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 8, 6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to 25, 4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to 25, 3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 25, 14, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 20, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to 21, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm deleted file mode 100755 index 9bd82887..00000000 --- a/data/mapObjects/seafoamislands5.asm +++ /dev/null @@ -1,23 +0,0 @@ -SeafoamIslands5Object: - db $7d ; border block - - db 4 ; warps - warp 20, 17, 5, SEAFOAM_ISLANDS_4 - warp 21, 17, 6, SEAFOAM_ISLANDS_4 - warp 11, 7, 1, SEAFOAM_ISLANDS_4 - warp 25, 4, 2, SEAFOAM_ISLANDS_4 - - db 2 ; signs - sign 9, 15, 4 ; SeafoamIslands5Text4 - sign 23, 1, 5 ; SeafoamIslands5Text5 - - db 3 ; objects - object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person - object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person - object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 - - ; warp-to - warp_to 20, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 21, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 11, 7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 25, 4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm deleted file mode 100755 index 0f98247b..00000000 --- a/data/mapObjects/silphco1.asm +++ /dev/null @@ -1,21 +0,0 @@ -SilphCo1Object: - db $2e ; border block - - db 5 ; warps - warp 10, 17, 5, -1 - warp 11, 17, 5, -1 - warp 26, 0, 0, SILPH_CO_2F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 16, 10, 6, SILPH_CO_3F - - db 0 ; signs - - db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 10, 17, SILPH_CO_1F_WIDTH - warp_to 11, 17, SILPH_CO_1F_WIDTH - warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F - warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm deleted file mode 100755 index 90fa2acd..00000000 --- a/data/mapObjects/silphco10.asm +++ /dev/null @@ -1,28 +0,0 @@ -SilphCo10Object: - db $2e ; border block - - db 6 ; warps - warp 8, 0, 0, SILPH_CO_9F - warp 10, 0, 0, SILPH_CO_11F - warp 12, 0, 0, SILPH_CO_ELEVATOR - warp 9, 11, 3, SILPH_CO_4F - warp 13, 15, 5, SILPH_CO_4F - warp 13, 7, 6, SILPH_CO_4F - - db 0 ; signs - - db 6 ; objects - object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 - object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 - object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person - object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26 - object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY - object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS - - ; warp-to - warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F - warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F - warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm deleted file mode 100755 index a130f4f1..00000000 --- a/data/mapObjects/silphco11.asm +++ /dev/null @@ -1,23 +0,0 @@ -SilphCo11Object: - db $d ; border block - - db 4 ; warps - warp 9, 0, 1, SILPH_CO_10F - warp 13, 0, 0, SILPH_CO_ELEVATOR - warp 5, 5, 9, -1 - warp 3, 2, 3, SILPH_CO_7F - - db 0 ; signs - - db 5 ; objects - object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person - object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 - object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 - - ; warp-to - warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F - warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 5, SILPH_CO_11F_WIDTH - warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm deleted file mode 100755 index 4b7f34f6..00000000 --- a/data/mapObjects/silphco2.asm +++ /dev/null @@ -1,29 +0,0 @@ -SilphCo2Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 2, SILPH_CO_1F - warp 26, 0, 0, SILPH_CO_3F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 3, 3, 6, SILPH_CO_3F - warp 13, 3, 4, SILPH_CO_8F - warp 27, 15, 5, SILPH_CO_8F - warp 9, 15, 4, SILPH_CO_6F - - db 0 ; signs - - db 5 ; objects - object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person - object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 - object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 - object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 - object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 - - ; warp-to - warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F - warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm deleted file mode 100755 index 86b3b215..00000000 --- a/data/mapObjects/silphco3.asm +++ /dev/null @@ -1,34 +0,0 @@ -SilphCo3Object: - db $2e ; border block - - db 10 ; warps - warp 26, 0, 1, SILPH_CO_2F - warp 24, 0, 0, SILPH_CO_4F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 23, 11, 9, SILPH_CO_3F - warp 3, 3, 5, SILPH_CO_5F - warp 3, 15, 6, SILPH_CO_5F - warp 27, 3, 3, SILPH_CO_2F - warp 3, 11, 3, SILPH_CO_9F - warp 11, 11, 4, SILPH_CO_7F - warp 27, 15, 3, SILPH_CO_3F - - db 0 ; signs - - db 4 ; objects - object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 - object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 - object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION - - ; warp-to - warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F - warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F - warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F - warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F - warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm deleted file mode 100755 index 73082342..00000000 --- a/data/mapObjects/silphco4.asm +++ /dev/null @@ -1,31 +0,0 @@ -SilphCo4Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 1, SILPH_CO_3F - warp 26, 0, 1, SILPH_CO_5F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 11, 7, 3, SILPH_CO_10F - warp 17, 3, 3, SILPH_CO_6F - warp 3, 15, 4, SILPH_CO_10F - warp 17, 11, 5, SILPH_CO_10F - - db 0 ; signs - - db 7 ; objects - object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 - object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 - object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 - object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL - object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE - object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE - - ; warp-to - warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F - warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F - warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F - warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm deleted file mode 100755 index 5a7d59fc..00000000 --- a/data/mapObjects/silphco5.asm +++ /dev/null @@ -1,35 +0,0 @@ -SilphCo5Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 1, SILPH_CO_6F - warp 26, 0, 1, SILPH_CO_4F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 27, 3, 5, SILPH_CO_7F - warp 9, 15, 4, SILPH_CO_9F - warp 11, 5, 4, SILPH_CO_3F - warp 3, 15, 5, SILPH_CO_3F - - db 0 ; signs - - db 11 ; objects - object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 - object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 - object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 - object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 - object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09 - object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN - object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY - object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person - object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person - object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person - - ; warp-to - warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F - warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F - warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F - warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F - warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F - warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm deleted file mode 100755 index c936970d..00000000 --- a/data/mapObjects/silphco6.asm +++ /dev/null @@ -1,30 +0,0 @@ -SilphCo6Object: - db $2e ; border block - - db 5 ; warps - warp 16, 0, 1, SILPH_CO_7F - warp 14, 0, 0, SILPH_CO_5F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 3, 3, 4, SILPH_CO_4F - warp 23, 3, 6, SILPH_CO_2F - - db 0 ; signs - - db 10 ; objects - object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person - object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person - object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person - object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person - object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 - object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 - object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 - object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP - object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY - - ; warp-to - warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F - warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F - warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F - warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm deleted file mode 100755 index 96dc64a5..00000000 --- a/data/mapObjects/silphco7.asm +++ /dev/null @@ -1,33 +0,0 @@ -SilphCo7Object: - db $2e ; border block - - db 6 ; warps - warp 16, 0, 1, SILPH_CO_8F - warp 22, 0, 0, SILPH_CO_6F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 5, 7, 3, SILPH_CO_11F - warp 5, 3, 8, SILPH_CO_3F - warp 21, 15, 3, SILPH_CO_5F - - db 0 ; signs - - db 11 ; objects - object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person - object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person - object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 - object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 - object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 - object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person - object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM - object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03 - - ; warp-to - warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F - warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F - warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F - warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F - warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm deleted file mode 100755 index 513e84ea..00000000 --- a/data/mapObjects/silphco8.asm +++ /dev/null @@ -1,28 +0,0 @@ -SilphCo8Object: - db $2e ; border block - - db 7 ; warps - warp 16, 0, 1, SILPH_CO_9F - warp 14, 0, 0, SILPH_CO_7F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 3, 11, 6, SILPH_CO_8F - warp 3, 15, 4, SILPH_CO_2F - warp 11, 5, 5, SILPH_CO_2F - warp 11, 9, 3, SILPH_CO_8F - - db 0 ; signs - - db 4 ; objects - object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 - object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 - object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 - - ; warp-to - warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F - warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F - warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F - warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm deleted file mode 100755 index 377d7ca0..00000000 --- a/data/mapObjects/silphco9.asm +++ /dev/null @@ -1,24 +0,0 @@ -SilphCo9Object: - db $2e ; border block - - db 5 ; warps - warp 14, 0, 0, SILPH_CO_10F - warp 16, 0, 0, SILPH_CO_8F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 9, 3, 7, SILPH_CO_3F - warp 17, 15, 4, SILPH_CO_5F - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 - object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 - object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 - - ; warp-to - warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F - warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F - warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F - warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm deleted file mode 100755 index 205fc046..00000000 --- a/data/mapObjects/silphcoelevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -SilphCoElevatorObject: - db $f ; border block - - db 2 ; warps - warp 1, 3, 0, 237 - warp 2, 3, 0, 237 - - db 1 ; signs - sign 3, 0, 1 ; SilphCoElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH - warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm deleted file mode 100755 index 9d5ddd1f..00000000 --- a/data/mapObjects/ssanne1.asm +++ /dev/null @@ -1,34 +0,0 @@ -SSAnne1Object: - db $c ; border block - - db 11 ; warps - warp 26, 0, 1, VERMILION_DOCK - warp 27, 0, 1, VERMILION_DOCK - warp 31, 8, 0, SS_ANNE_8 - warp 23, 8, 1, SS_ANNE_8 - warp 19, 8, 2, SS_ANNE_8 - warp 15, 8, 3, SS_ANNE_8 - warp 11, 8, 4, SS_ANNE_8 - warp 7, 8, 5, SS_ANNE_8 - warp 2, 6, 6, SS_ANNE_2 - warp 37, 15, 5, SS_ANNE_4 - warp 3, 16, 0, SS_ANNE_6 - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person - object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 26, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK - warp_to 27, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK - warp_to 31, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 23, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 19, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 15, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 11, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 7, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 2, 6, SS_ANNE_1_WIDTH ; SS_ANNE_2 - warp_to 37, 15, SS_ANNE_1_WIDTH ; SS_ANNE_4 - warp_to 3, 16, SS_ANNE_1_WIDTH ; SS_ANNE_6 diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm deleted file mode 100755 index 93fb2cde..00000000 --- a/data/mapObjects/ssanne10.asm +++ /dev/null @@ -1,41 +0,0 @@ -SSAnne10Object: - db $c ; border block - - db 10 ; warps - warp 2, 5, 4, SS_ANNE_4 - warp 3, 5, 4, SS_ANNE_4 - warp 12, 5, 3, SS_ANNE_4 - warp 13, 5, 3, SS_ANNE_4 - warp 22, 5, 2, SS_ANNE_4 - warp 23, 5, 2, SS_ANNE_4 - warp 2, 15, 1, SS_ANNE_4 - warp 3, 15, 1, SS_ANNE_4 - warp 12, 15, 0, SS_ANNE_4 - warp 13, 15, 0, SS_ANNE_4 - - db 0 ; signs - - db 11 ; objects - object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 - object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 - object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 - object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 - object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 - object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 - object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person - object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person - object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER - object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 - object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION - - ; warp-to - warp_to 2, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 3, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 12, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 13, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 22, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 23, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 2, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 3, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 12, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 13, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm deleted file mode 100755 index 3a685610..00000000 --- a/data/mapObjects/ssanne2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SSAnne2Object: - db $c ; border block - - db 9 ; warps - warp 9, 11, 0, SS_ANNE_9 - warp 13, 11, 2, SS_ANNE_9 - warp 17, 11, 4, SS_ANNE_9 - warp 21, 11, 6, SS_ANNE_9 - warp 25, 11, 8, SS_ANNE_9 - warp 29, 11, 10, SS_ANNE_9 - warp 2, 4, 8, SS_ANNE_1 - warp 2, 12, 1, SS_ANNE_3 - warp 36, 4, 0, SS_ANNE_7 - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person - object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 - - ; warp-to - warp_to 9, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 13, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 17, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 21, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 25, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 29, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 2, 4, SS_ANNE_2_WIDTH ; SS_ANNE_1 - warp_to 2, 12, SS_ANNE_2_WIDTH ; SS_ANNE_3 - warp_to 36, 4, SS_ANNE_2_WIDTH ; SS_ANNE_7 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm deleted file mode 100755 index 3a45e1f9..00000000 --- a/data/mapObjects/ssanne3.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne3Object: - db $c ; border block - - db 2 ; warps - warp 0, 3, 0, SS_ANNE_5 - warp 19, 3, 7, SS_ANNE_2 - - db 0 ; signs - - db 1 ; objects - object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person - - ; warp-to - warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_5 - warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm deleted file mode 100755 index 7f0d6853..00000000 --- a/data/mapObjects/ssanne4.asm +++ /dev/null @@ -1,22 +0,0 @@ -SSAnne4Object: - db $c ; border block - - db 6 ; warps - warp 23, 3, 8, SS_ANNE_10 - warp 19, 3, 6, SS_ANNE_10 - warp 15, 3, 4, SS_ANNE_10 - warp 11, 3, 2, SS_ANNE_10 - warp 7, 3, 0, SS_ANNE_10 - warp 27, 5, 9, SS_ANNE_1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm deleted file mode 100755 index 106557be..00000000 --- a/data/mapObjects/ssanne5.asm +++ /dev/null @@ -1,19 +0,0 @@ -SSAnne5Object: - db $23 ; border block - - db 2 ; warps - warp 13, 6, 0, SS_ANNE_3 - warp 13, 7, 0, SS_ANNE_3 - - db 0 ; signs - - db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person - object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person - object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 - object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 - - ; warp-to - warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3 - warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm deleted file mode 100755 index a25fe9b3..00000000 --- a/data/mapObjects/ssanne6.asm +++ /dev/null @@ -1,19 +0,0 @@ -SSAnne6Object: - db $c ; border block - - db 1 ; warps - warp 6, 0, 10, SS_ANNE_1 - - db 0 ; signs - - db 7 ; objects - object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person - object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person - object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person - object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person - object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person - object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person - object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person - - ; warp-to - warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm deleted file mode 100755 index 7657170e..00000000 --- a/data/mapObjects/ssanne7.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne7Object: - db $c ; border block - - db 1 ; warps - warp 0, 7, 8, SS_ANNE_2 - - db 2 ; signs - sign 4, 1, 2 ; SSAnne7Text2 - sign 1, 2, 3 ; SSAnne7Text3 - - db 1 ; objects - object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person - - ; warp-to - warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm deleted file mode 100755 index d26921bd..00000000 --- a/data/mapObjects/ssanne8.asm +++ /dev/null @@ -1,33 +0,0 @@ -SSAnne8Object: - db $c ; border block - - db 6 ; warps - warp 0, 0, 2, SS_ANNE_1 - warp 10, 0, 3, SS_ANNE_1 - warp 20, 0, 4, SS_ANNE_1 - warp 0, 10, 5, SS_ANNE_1 - warp 10, 10, 6, SS_ANNE_1 - warp 20, 10, 7, SS_ANNE_1 - - db 0 ; signs - - db 11 ; objects - object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 - object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 - object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 - object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person - object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person - object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person - object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person - object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08 - object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person - - ; warp-to - warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm deleted file mode 100755 index 455e6983..00000000 --- a/data/mapObjects/ssanne9.asm +++ /dev/null @@ -1,47 +0,0 @@ -SSAnne9Object: - db $c ; border block - - db 12 ; warps - warp 2, 5, 0, SS_ANNE_2 - warp 3, 5, 0, SS_ANNE_2 - warp 12, 5, 1, SS_ANNE_2 - warp 13, 5, 1, SS_ANNE_2 - warp 22, 5, 2, SS_ANNE_2 - warp 23, 5, 2, SS_ANNE_2 - warp 2, 15, 3, SS_ANNE_2 - warp 3, 15, 3, SS_ANNE_2 - warp 12, 15, 4, SS_ANNE_2 - warp 13, 15, 4, SS_ANNE_2 - warp 22, 15, 5, SS_ANNE_2 - warp 23, 15, 5, SS_ANNE_2 - - db 0 ; signs - - db 13 ; objects - object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 - object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 - object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER - object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY - object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person - object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person - - ; warp-to - warp_to 2, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 3, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 12, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 13, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 22, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 23, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 2, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 3, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 12, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 13, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 22, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 23, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm deleted file mode 100755 index 63c3e04a..00000000 --- a/data/mapObjects/tradecenter.asm +++ /dev/null @@ -1,9 +0,0 @@ -TradeCenterObject: - db $e ; border block - - db 0 ; warps - - db 0 ; signs - - db 1 ; objects - object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm deleted file mode 100755 index 3e3d52dd..00000000 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute5Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 0, UNDERGROUND_PATH_NS - - db 0 ; signs - - db 1 ; objects - object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_5_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_5_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm deleted file mode 100755 index f9c6d224..00000000 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute6Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 1, UNDERGROUND_PATH_NS - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_6_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_6_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm deleted file mode 100755 index 80dde9a3..00000000 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute7Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WE - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm deleted file mode 100755 index 20b74599..00000000 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ /dev/null @@ -1,18 +0,0 @@ -UndergroundPathEntranceRoute7CopyObject: - db $a ; border block - - db 3 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WE - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm deleted file mode 100755 index 02390322..00000000 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute8Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 1, UNDERGROUND_PATH_WE - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_8_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_8_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm deleted file mode 100755 index 00b096e8..00000000 --- a/data/mapObjects/undergroundpathns.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathNSObject: - db $1 ; border block - - db 2 ; warps - warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5 - warp 2, 41, 2, PATH_ENTRANCE_ROUTE_6 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5 - warp_to 2, 41, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm deleted file mode 100755 index 0af2ccc3..00000000 --- a/data/mapObjects/undergroundpathwe.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathWEObject: - db $1 ; border block - - db 2 ; warps - warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7 - warp 47, 2, 2, PATH_ENTRANCE_ROUTE_8 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 2, 5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7 - warp_to 47, 2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm deleted file mode 100755 index 97ff99a8..00000000 --- a/data/mapObjects/unknowndungeon1.asm +++ /dev/null @@ -1,31 +0,0 @@ -UnknownDungeon1Object: - db $7d ; border block - - db 9 ; warps - warp 24, 17, 6, -1 - warp 25, 17, 6, -1 - warp 27, 1, 0, UNKNOWN_DUNGEON_2 - warp 23, 7, 1, UNKNOWN_DUNGEON_2 - warp 18, 9, 2, UNKNOWN_DUNGEON_2 - warp 7, 1, 3, UNKNOWN_DUNGEON_2 - warp 1, 3, 4, UNKNOWN_DUNGEON_2 - warp 3, 11, 5, UNKNOWN_DUNGEON_2 - warp 0, 6, 0, UNKNOWN_DUNGEON_3 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER - object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET - - ; warp-to - warp_to 24, 17, UNKNOWN_DUNGEON_1_WIDTH - warp_to 25, 17, UNKNOWN_DUNGEON_1_WIDTH - warp_to 27, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 23, 7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 18, 9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 7, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 1, 3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 3, 11, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 0, 6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm deleted file mode 100755 index 51626589..00000000 --- a/data/mapObjects/unknowndungeon2.asm +++ /dev/null @@ -1,25 +0,0 @@ -UnknownDungeon2Object: - db $7d ; border block - - db 6 ; warps - warp 29, 1, 2, UNKNOWN_DUNGEON_1 - warp 22, 6, 3, UNKNOWN_DUNGEON_1 - warp 19, 7, 4, UNKNOWN_DUNGEON_1 - warp 9, 1, 5, UNKNOWN_DUNGEON_1 - warp 1, 3, 6, UNKNOWN_DUNGEON_1 - warp 3, 11, 7, UNKNOWN_DUNGEON_1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP - object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE - - ; warp-to - warp_to 29, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 22, 6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 19, 7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 9, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 1, 3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 3, 11, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm deleted file mode 100755 index d44ba254..00000000 --- a/data/mapObjects/unknowndungeon3.asm +++ /dev/null @@ -1,15 +0,0 @@ -UnknownDungeon3Object: - db $7d ; border block - - db 1 ; warps - warp 3, 6, 8, UNKNOWN_DUNGEON_1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE - - ; warp-to - warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm deleted file mode 100755 index 86cc5685..00000000 --- a/data/mapObjects/vermilioncity.asm +++ /dev/null @@ -1,41 +0,0 @@ -VermilionCityObject: - db $43 ; border block - - db 9 ; warps - warp 11, 3, 0, VERMILION_POKECENTER - warp 9, 13, 0, POKEMON_FAN_CLUB - warp 23, 13, 0, VERMILION_MART - warp 12, 19, 0, VERMILION_GYM - warp 23, 19, 0, VERMILION_HOUSE_1 - warp 18, 31, 0, VERMILION_DOCK - warp 19, 31, 0, VERMILION_DOCK - warp 15, 13, 0, VERMILION_HOUSE_3 - warp 7, 3, 0, VERMILION_HOUSE_2 - - db 7 ; signs - sign 27, 3, 7 ; VermilionCityText7 - sign 37, 13, 8 ; VermilionCityText8 - sign 24, 13, 9 ; MartSignText - sign 12, 3, 10 ; PokeCenterSignText - sign 7, 13, 11 ; VermilionCityText11 - sign 7, 19, 12 ; VermilionCityText12 - sign 29, 15, 13 ; VermilionCityText13 - - db 6 ; objects - object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person - object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person - object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person - object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person - object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person - - ; warp-to - warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER - warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB - warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART - warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM - warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1 - warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3 - warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2 diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm deleted file mode 100755 index 289689b5..00000000 --- a/data/mapObjects/vermiliondock.asm +++ /dev/null @@ -1,14 +0,0 @@ -VermilionDockObject: - db $f ; border block - - db 2 ; warps - warp 14, 0, 5, -1 - warp 14, 2, 1, SS_ANNE_1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 14, 0, VERMILION_DOCK_WIDTH - warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm deleted file mode 100755 index 843454c0..00000000 --- a/data/mapObjects/vermiliongym.asm +++ /dev/null @@ -1,19 +0,0 @@ -VermilionGymObject: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 3, -1 - warp 5, 17, 3, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 - object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 - object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 4, 17, VERMILION_GYM_WIDTH - warp_to 5, 17, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm deleted file mode 100755 index bbb7491b..00000000 --- a/data/mapObjects/vermilionhouse1.asm +++ /dev/null @@ -1,17 +0,0 @@ -VermilionHouse1Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person - object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person - object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, VERMILION_HOUSE_1_WIDTH - warp_to 3, 7, VERMILION_HOUSE_1_WIDTH diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm deleted file mode 100755 index e612b06a..00000000 --- a/data/mapObjects/vermilionhouse2.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionHouse2Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, VERMILION_HOUSE_2_WIDTH - warp_to 3, 7, VERMILION_HOUSE_2_WIDTH diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm deleted file mode 100755 index a6dd42fa..00000000 --- a/data/mapObjects/vermilionhouse3.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionHouse3Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person - - ; warp-to - warp_to 2, 7, VERMILION_HOUSE_3_WIDTH - warp_to 3, 7, VERMILION_HOUSE_3_WIDTH diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm deleted file mode 100755 index f5b15c7d..00000000 --- a/data/mapObjects/vermilionmart.asm +++ /dev/null @@ -1,17 +0,0 @@ -VermilionMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person - object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, VERMILION_MART_WIDTH - warp_to 4, 7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm deleted file mode 100755 index da792d34..00000000 --- a/data/mapObjects/vermilionpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -VermilionPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person - object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, VERMILION_POKECENTER_WIDTH - warp_to 4, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm deleted file mode 100755 index 62309bbd..00000000 --- a/data/mapObjects/victoryroad1.asm +++ /dev/null @@ -1,23 +0,0 @@ -VictoryRoad1Object: - db $7d ; border block - - db 3 ; warps - warp 8, 17, 2, -1 - warp 9, 17, 2, -1 - warp 1, 1, 0, VICTORY_ROAD_2 - - db 0 ; signs - - db 7 ; objects - object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43 - object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY - object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - - ; warp-to - warp_to 8, 17, VICTORY_ROAD_1_WIDTH - warp_to 9, 17, VICTORY_ROAD_1_WIDTH - warp_to 1, 1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm deleted file mode 100755 index 283e74c8..00000000 --- a/data/mapObjects/victoryroad2.asm +++ /dev/null @@ -1,37 +0,0 @@ -VictoryRoad2Object: - db $7d ; border block - - db 7 ; warps - warp 0, 8, 2, VICTORY_ROAD_1 - warp 29, 7, 3, -1 - warp 29, 8, 3, -1 - warp 23, 7, 0, VICTORY_ROAD_3 - warp 25, 14, 2, VICTORY_ROAD_3 - warp 27, 7, 1, VICTORY_ROAD_3 - warp 1, 1, 3, VICTORY_ROAD_3 - - db 0 ; signs - - db 13 ; objects - object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 - object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 - object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 - object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17 - object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL - object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05 - object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC - object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person - object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person - - ; warp-to - warp_to 0, 8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1 - warp_to 29, 7, VICTORY_ROAD_2_WIDTH - warp_to 29, 8, VICTORY_ROAD_2_WIDTH - warp_to 23, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to 25, 14, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to 27, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to 1, 1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm deleted file mode 100755 index ffa2a843..00000000 --- a/data/mapObjects/victoryroad3.asm +++ /dev/null @@ -1,28 +0,0 @@ -VictoryRoad3Object: - db $7d ; border block - - db 4 ; warps - warp 23, 7, 3, VICTORY_ROAD_2 - warp 26, 8, 5, VICTORY_ROAD_2 - warp 27, 15, 4, VICTORY_ROAD_2 - warp 2, 0, 6, VICTORY_ROAD_2 - - db 0 ; signs - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE - object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47 - object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person - object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person - object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person - - ; warp-to - warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm deleted file mode 100755 index b45ba9d5..00000000 --- a/data/mapObjects/viridiancity.asm +++ /dev/null @@ -1,33 +0,0 @@ -ViridianCityObject: - db $f ; border block - - db 5 ; warps - warp 23, 25, 0, VIRIDIAN_POKECENTER - warp 29, 19, 0, VIRIDIAN_MART - warp 21, 15, 0, VIRIDIAN_SCHOOL - warp 21, 9, 0, VIRIDIAN_HOUSE - warp 32, 7, 0, VIRIDIAN_GYM - - db 6 ; signs - sign 17, 17, 8 ; ViridianCityText8 - sign 19, 1, 9 ; ViridianCityText9 - sign 21, 29, 10 ; ViridianCityText10 - sign 30, 19, 11 ; MartSignText - sign 24, 25, 12 ; PokeCenterSignText - sign 27, 7, 13 ; ViridianCityText13 - - db 7 ; objects - object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person - object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person - object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person - object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person - object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person - object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person - object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person - - ; warp-to - warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER - warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART - warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL - warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE - warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm deleted file mode 100755 index 601f73e2..00000000 --- a/data/mapObjects/viridianforest.asm +++ /dev/null @@ -1,36 +0,0 @@ -ViridianForestObject: - db $3 ; border block - - db 6 ; warps - warp 1, 0, 2, VIRIDIAN_FOREST_EXIT - warp 2, 0, 3, VIRIDIAN_FOREST_EXIT - warp 15, 47, 1, VIRIDIAN_FOREST_ENTRANCE - warp 16, 47, 1, VIRIDIAN_FOREST_ENTRANCE - warp 17, 47, 1, VIRIDIAN_FOREST_ENTRANCE - warp 18, 47, 1, VIRIDIAN_FOREST_ENTRANCE - - db 6 ; signs - sign 24, 40, 9 ; ViridianForestText9 - sign 16, 32, 10 ; ViridianForestText10 - sign 26, 17, 11 ; ViridianForestText11 - sign 4, 24, 12 ; ViridianForestText12 - sign 18, 45, 13 ; ViridianForestText13 - sign 2, 1, 14 ; ViridianForestText14 - - db 8 ; objects - object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 - object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE - object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION - object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL - object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person - - ; warp-to - warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm deleted file mode 100755 index 319ba272..00000000 --- a/data/mapObjects/viridianforestentrance.asm +++ /dev/null @@ -1,20 +0,0 @@ -ViridianForestEntranceObject: - db $a ; border block - - db 4 ; warps - warp 4, 0, 3, VIRIDIAN_FOREST - warp 5, 0, 4, VIRIDIAN_FOREST - warp 4, 7, 5, -1 - warp 5, 7, 5, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person - - ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to 4, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH - warp_to 5, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm deleted file mode 100755 index 521ad818..00000000 --- a/data/mapObjects/viridianforestexit.asm +++ /dev/null @@ -1,20 +0,0 @@ -ViridianForestExitObject: - db $a ; border block - - db 4 ; warps - warp 4, 0, 1, -1 - warp 5, 0, 1, -1 - warp 4, 7, 0, VIRIDIAN_FOREST - warp 5, 7, 0, VIRIDIAN_FOREST - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person - object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm deleted file mode 100755 index c6ddb1d4..00000000 --- a/data/mapObjects/viridiangym.asm +++ /dev/null @@ -1,25 +0,0 @@ -ViridianGymObject: - db $3 ; border block - - db 2 ; warps - warp 16, 17, 4, -1 - warp 17, 17, 4, -1 - - db 0 ; signs - - db 11 ; objects - object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 - object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 - object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 - object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 - object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 - object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 - object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 - object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 - object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person - object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE - - ; warp-to - warp_to 16, 17, VIRIDIAN_GYM_WIDTH - warp_to 17, 17, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm deleted file mode 100755 index 932542a6..00000000 --- a/data/mapObjects/viridianhouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -ViridianHouseObject: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person - object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person - object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person - - ; warp-to - warp_to 2, 7, VIRIDIAN_HOUSE_WIDTH - warp_to 3, 7, VIRIDIAN_HOUSE_WIDTH diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm deleted file mode 100755 index e692f810..00000000 --- a/data/mapObjects/viridianmart.asm +++ /dev/null @@ -1,17 +0,0 @@ -ViridianMartObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 1, -1 - warp 4, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, VIRIDIAN_MART_WIDTH - warp_to 4, 7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm deleted file mode 100755 index 9c8ebbfe..00000000 --- a/data/mapObjects/viridianpokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -ViridianPokecenterObject: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH - warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ab8ae1ca..3dc1988a 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,176 +1,176 @@ ; see also MapHeaderPointers MapHeaderBanks: - db BANK(PalletTown_h) ;PALLET_TOWN - db BANK(ViridianCity_h) ; VIRIDIAN_CITY - db BANK(PewterCity_h) ; PEWTER_CITY - db BANK(CeruleanCity_h) ; CERULEAN_CITY - db BANK(LavenderTown_h) ; LAVENDER_TOWN - db BANK(VermilionCity_h) ; VERMILION_CITY - db BANK(CeladonCity_h) ; CELADON_CITY - db BANK(FuchsiaCity_h) ; FUCHSIA_CITY - db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND - db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU - db BANK(SaffronCity_h) ; SAFFRON_CITY - db $1 ; unused - db BANK(Route1_h) ; ROUTE_1 - db BANK(Route2_h) ; ROUTE_2 - db BANK(Route3_h) ; ROUTE_3 - db BANK(Route4_h) ; ROUTE_4 - db BANK(Route5_h) ; ROUTE_5 - db BANK(Route6_h) ; ROUTE_6 - db BANK(Route7_h) ; ROUTE_7 - db BANK(Route8_h) ; ROUTE_8 - db BANK(Route9_h) ; ROUTE_9 - db BANK(Route10_h) ; ROUTE_10 - db BANK(Route11_h) ; ROUTE_11 - db BANK(Route12_h) ; ROUTE_12 - db BANK(Route13_h) ; ROUTE_13 - db BANK(Route14_h) ; ROUTE_14 - db BANK(Route15_h) ; ROUTE_15 - db BANK(Route16_h) ; ROUTE_16 - db BANK(Route17_h) ; ROUTE_17 - db BANK(Route18_h) ; ROUTE_18 - db BANK(Route19_h) ; ROUTE_19 - db BANK(Route20_h) ; ROUTE_20 - db BANK(Route21_h) ; ROUTE_21 - db BANK(Route22_h) ; ROUTE_22 - db BANK(Route23_h) ; ROUTE_23 - db BANK(Route24_h) ; ROUTE_24 - db BANK(Route25_h) ; ROUTE_25 + db BANK(PalletTown_h) + db BANK(ViridianCity_h) + db BANK(PewterCity_h) + db BANK(CeruleanCity_h) + db BANK(LavenderTown_h) + db BANK(VermilionCity_h) + db BANK(CeladonCity_h) + db BANK(FuchsiaCity_h) + db BANK(CinnabarIsland_h) + db BANK(IndigoPlateau_h) + db BANK(SaffronCity_h) + db $01 ; UNUSED_MAP_0B + db BANK(Route1_h) + db BANK(Route2_h) + db BANK(Route3_h) + db BANK(Route4_h) + db BANK(Route5_h) + db BANK(Route6_h) + db BANK(Route7_h) + db BANK(Route8_h) + db BANK(Route9_h) + db BANK(Route10_h) + db BANK(Route11_h) + db BANK(Route12_h) + db BANK(Route13_h) + db BANK(Route14_h) + db BANK(Route15_h) + db BANK(Route16_h) + db BANK(Route17_h) + db BANK(Route18_h) + db BANK(Route19_h) + db BANK(Route20_h) + db BANK(Route21_h) + db BANK(Route22_h) + db BANK(Route23_h) + db BANK(Route24_h) + db BANK(Route25_h) db BANK(RedsHouse1F_h) db BANK(RedsHouse2F_h) db BANK(BluesHouse_h) db BANK(OaksLab_h) db BANK(ViridianPokecenter_h) db BANK(ViridianMart_h) - db BANK(School_h) - db BANK(ViridianHouse_h) + db BANK(ViridianSchoolHouse_h) + db BANK(ViridianNicknameHouse_h) db BANK(ViridianGym_h) db BANK(DiglettsCaveRoute2_h) - db BANK(ViridianForestExit_h) - db BANK(Route2House_h) + db BANK(ViridianForestNorthGate_h) + db BANK(Route2TradeHouse_h) db BANK(Route2Gate_h) - db BANK(ViridianForestEntrance_h) + db BANK(ViridianForestSouthGate_h) db BANK(ViridianForest_h) db BANK(Museum1F_h) db BANK(Museum2F_h) db BANK(PewterGym_h) - db BANK(PewterHouse1_h) + db BANK(PewterNidoranHouse_h) db BANK(PewterMart_h) - db BANK(PewterHouse2_h) + db BANK(PewterSpeechHouse_h) db BANK(PewterPokecenter_h) - db BANK(MtMoon1_h) - db BANK(MtMoon2_h) - db BANK(MtMoon3_h) - db BANK(CeruleanHouseTrashed_h) - db BANK(CeruleanHouse1_h) + db BANK(MtMoon1F_h) + db BANK(MtMoonB1F_h) + db BANK(MtMoonB2F_h) + db BANK(CeruleanTrashedHouse_h) + db BANK(CeruleanTradeHouse_h) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) db BANK(BikeShop_h) db BANK(CeruleanMart_h) db BANK(MtMoonPokecenter_h) - db BANK(CeruleanHouseTrashed_h) + db BANK(CeruleanTrashedHouse_h) db BANK(Route5Gate_h) - db BANK(UndergroundPathEntranceRoute5_h) - db BANK(DayCareM_h) + db BANK(UndergroundPathRoute5_h) + db BANK(Daycare_h) db BANK(Route6Gate_h) - db BANK(UndergroundPathEntranceRoute6_h) - db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + db BANK(UndergroundPathRoute6_h) + db BANK(UndergroundPathRoute6_h) ; UNDERGROUND_PATH_ROUTE_6_COPY db BANK(Route7Gate_h) - db BANK(UndergroundPathEntranceRoute7_h) - db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + db BANK(UndergroundPathRoute7_h) + db BANK(UndergroundPathRoute7Copy_h) db BANK(Route8Gate_h) - db BANK(UndergroundPathEntranceRoute8_h) + db BANK(UndergroundPathRoute8_h) db BANK(RockTunnelPokecenter_h) - db BANK(RockTunnel1_h) + db BANK(RockTunnel1F_h) db BANK(PowerPlant_h) - db BANK(Route11Gate_h) - db BANK(DiglettsCaveEntranceRoute11_h) - db BANK(Route11GateUpstairs_h) - db BANK(Route12Gate_h) + db BANK(Route11Gate1F_h) + db BANK(DiglettsCaveRoute11_h) + db BANK(Route11Gate2F_h) + db BANK(Route12Gate1F_h) db BANK(BillsHouse_h) db BANK(VermilionPokecenter_h) - db BANK(FanClub_h) + db BANK(PokemonFanClub_h) db BANK(VermilionMart_h) db BANK(VermilionGym_h) - db BANK(VermilionHouse1_h) + db BANK(VermilionPidgeyHouse_h) db BANK(VermilionDock_h) - db BANK(SSAnne1_h) - db BANK(SSAnne2_h) - db BANK(SSAnne3_h) - db BANK(SSAnne4_h) - db BANK(SSAnne5_h) - db BANK(SSAnne6_h) - db BANK(SSAnne7_h) - db BANK(SSAnne8_h) - db BANK(SSAnne9_h) - db BANK(SSAnne10_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(VictoryRoad1_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(Lance_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(HallofFameRoom_h) - db BANK(UndergroundPathNS_h) - db BANK(Gary_h) - db BANK(UndergroundPathWE_h) - db BANK(CeladonMart1_h) - db BANK(CeladonMart2_h) - db BANK(CeladonMart3_h) - db BANK(CeladonMart4_h) + db BANK(SSAnne1F_h) + db BANK(SSAnne2F_h) + db BANK(SSAnne3F_h) + db BANK(SSAnneB1F_h) + db BANK(SSAnneBow_h) + db BANK(SSAnneKitchen_h) + db BANK(SSAnneCaptainsRoom_h) + db BANK(SSAnne1FRooms_h) + db BANK(SSAnne2FRooms_h) + db BANK(SSAnneB1FRooms_h) + db $1D ; UNUSED_MAP_69 + db $1D ; UNUSED_MAP_6A + db $1D ; UNUSED_MAP_6B + db BANK(VictoryRoad1F_h) + db $1D ; UNUSED_MAP_6D + db $1D ; UNUSED_MAP_6E + db $1D ; UNUSED_MAP_6F + db $1D ; UNUSED_MAP_70 + db BANK(LancesRoom_h) + db $1D ; UNUSED_MAP_72 + db $1D ; UNUSED_MAP_73 + db $1D ; UNUSED_MAP_74 + db $1D ; UNUSED_MAP_75 + db BANK(HallOfFame_h) + db BANK(UndergroundPathNorthSouth_h) + db BANK(ChampionsRoom_h) + db BANK(UndergroundPathWestEast_h) + db BANK(CeladonMart1F_h) + db BANK(CeladonMart2F_h) + db BANK(CeladonMart3F_h) + db BANK(CeladonMart4F_h) db BANK(CeladonMartRoof_h) db BANK(CeladonMartElevator_h) - db BANK(CeladonMansion1_h) - db BANK(CeladonMansion2_h) - db BANK(CeladonMansion3_h) - db BANK(CeladonMansion4_h) - db BANK(CeladonMansion5_h) + db BANK(CeladonMansion1F_h) + db BANK(CeladonMansion2F_h) + db BANK(CeladonMansion3F_h) + db BANK(CeladonMansionRoof_h) + db BANK(CeladonMansionRoofHouse_h) db BANK(CeladonPokecenter_h) db BANK(CeladonGym_h) - db BANK(CeladonGameCorner_h) - db BANK(CeladonMart5_h) - db BANK(CeladonPrizeRoom_h) + db BANK(GameCorner_h) + db BANK(CeladonMart5F_h) + db BANK(GameCornerPrizeRoom_h) db BANK(CeladonDiner_h) - db BANK(CeladonHouse_h) + db BANK(CeladonChiefHouse_h) db BANK(CeladonHotel_h) db BANK(LavenderPokecenter_h) - db BANK(PokemonTower1_h) - db BANK(PokemonTower2_h) - db BANK(PokemonTower3_h) - db BANK(PokemonTower4_h) - db BANK(PokemonTower5_h) - db BANK(PokemonTower6_h) - db BANK(PokemonTower7_h) - db BANK(LavenderHouse1_h) + db BANK(PokemonTower1F_h) + db BANK(PokemonTower2F_h) + db BANK(PokemonTower3F_h) + db BANK(PokemonTower4F_h) + db BANK(PokemonTower5F_h) + db BANK(PokemonTower6F_h) + db BANK(PokemonTower7F_h) + db BANK(MrFujisHouse_h) db BANK(LavenderMart_h) - db BANK(LavenderHouse2_h) + db BANK(LavenderCuboneHouse_h) db BANK(FuchsiaMart_h) - db BANK(FuchsiaHouse1_h) + db BANK(FuchsiaBillsGrandpasHouse_h) db BANK(FuchsiaPokecenter_h) - db BANK(FuchsiaHouse2_h) - db BANK(SafariZoneEntrance_h) + db BANK(WardensHouse_h) + db BANK(SafariZoneGate_h) db BANK(FuchsiaGym_h) db BANK(FuchsiaMeetingRoom_h) - db BANK(SeafoamIslands2_h) - db BANK(SeafoamIslands3_h) - db BANK(SeafoamIslands4_h) - db BANK(SeafoamIslands5_h) - db BANK(VermilionHouse2_h) - db BANK(FuchsiaHouse3_h) - db BANK(Mansion1_h) + db BANK(SeafoamIslandsB1F_h) + db BANK(SeafoamIslandsB2F_h) + db BANK(SeafoamIslandsB3F_h) + db BANK(SeafoamIslandsB4F_h) + db BANK(VermilionOldRodHouse_h) + db BANK(FuchsiaGoodRodHouse_h) + db BANK(PokemonMansion1F_h) db BANK(CinnabarGym_h) - db BANK(Lab1_h) - db BANK(Lab2_h) - db BANK(Lab3_h) - db BANK(Lab4_h) + db BANK(CinnabarLab_h) + db BANK(CinnabarLabTradeRoom_h) + db BANK(CinnabarLabMetronomeRoom_h) + db BANK(CinnabarLabFossilRoom_h) db BANK(CinnabarPokecenter_h) db BANK(CinnabarMart_h) db BANK(CinnabarMart_h) @@ -179,72 +179,72 @@ MapHeaderBanks: db BANK(CopycatsHouse2F_h) db BANK(FightingDojo_h) db BANK(SaffronGym_h) - db BANK(SaffronHouse1_h) + db BANK(SaffronPidgeyHouse_h) db BANK(SaffronMart_h) - db BANK(SilphCo1_h) + db BANK(SilphCo1F_h) db BANK(SaffronPokecenter_h) - db BANK(SaffronHouse2_h) - db BANK(Route15Gate_h) - db BANK(Route15GateUpstairs_h) - db BANK(Route16Gate_h) - db BANK(Route16GateUpstairs_h) - db BANK(Route16House_h) - db BANK(Route12House_h) - db BANK(Route18Gate_h) - db BANK(Route18GateUpstairs_h) - db BANK(SeafoamIslands1_h) + db BANK(MrPsychicsHouse_h) + db BANK(Route15Gate1F_h) + db BANK(Route15Gate2F_h) + db BANK(Route16Gate1F_h) + db BANK(Route16Gate2F_h) + db BANK(Route16FlyHouse_h) + db BANK(Route12SuperRodHouse_h) + db BANK(Route18Gate1F_h) + db BANK(Route18Gate2F_h) + db BANK(SeafoamIslands1F_h) db BANK(Route22Gate_h) - db BANK(VictoryRoad2_h) - db BANK(Route12GateUpstairs_h) - db BANK(VermilionHouse3_h) + db BANK(VictoryRoad2F_h) + db BANK(Route12Gate2F_h) + db BANK(VermilionTradeHouse_h) db BANK(DiglettsCave_h) - db BANK(VictoryRoad3_h) - db BANK(RocketHideout1_h) - db BANK(RocketHideout2_h) - db BANK(RocketHideout3_h) - db BANK(RocketHideout4_h) + db BANK(VictoryRoad3F_h) + db BANK(RocketHideoutB1F_h) + db BANK(RocketHideoutB2F_h) + db BANK(RocketHideoutB3F_h) + db BANK(RocketHideoutB4F_h) db BANK(RocketHideoutElevator_h) - db $01 - db $01 - db $01 - db BANK(SilphCo2_h) - db BANK(SilphCo3_h) - db BANK(SilphCo4_h) - db BANK(SilphCo5_h) - db BANK(SilphCo6_h) - db BANK(SilphCo7_h) - db BANK(SilphCo8_h) - db BANK(Mansion2_h) - db BANK(Mansion3_h) - db BANK(Mansion4_h) + db $01 ; UNUSED_MAP_CC + db $01 ; UNUSED_MAP_CD + db $01 ; UNUSED_MAP_CE + db BANK(SilphCo2F_h) + db BANK(SilphCo3F_h) + db BANK(SilphCo4F_h) + db BANK(SilphCo5F_h) + db BANK(SilphCo6F_h) + db BANK(SilphCo7F_h) + db BANK(SilphCo8F_h) + db BANK(PokemonMansion2F_h) + db BANK(PokemonMansion3F_h) + db BANK(PokemonMansionB1F_h) db BANK(SafariZoneEast_h) db BANK(SafariZoneNorth_h) db BANK(SafariZoneWest_h) db BANK(SafariZoneCenter_h) - db BANK(SafariZoneRestHouse1_h) + db BANK(SafariZoneCenterRestHouse_h) db BANK(SafariZoneSecretHouse_h) - db BANK(SafariZoneRestHouse2_h) - db BANK(SafariZoneRestHouse3_h) - db BANK(SafariZoneRestHouse4_h) - db BANK(UnknownDungeon2_h) - db BANK(UnknownDungeon3_h) - db BANK(UnknownDungeon1_h) - db BANK(NameRater_h) - db BANK(CeruleanHouse2_h) - db $01 - db BANK(RockTunnel2_h) - db BANK(SilphCo9_h) - db BANK(SilphCo10_h) - db BANK(SilphCo11_h) + db BANK(SafariZoneWestRestHouse_h) + db BANK(SafariZoneEastRestHouse_h) + db BANK(SafariZoneNorthRestHouse_h) + db BANK(CeruleanCave2F_h) + db BANK(CeruleanCaveB1F_h) + db BANK(CeruleanCave1F_h) + db BANK(NameRatersHouse_h) + db BANK(CeruleanBadgeHouse_h) + db $01 ; UNUSED_MAP_E7 + db BANK(RockTunnelB1F_h) + db BANK(SilphCo9F_h) + db BANK(SilphCo10F_h) + db BANK(SilphCo11F_h) db BANK(SilphCoElevator_h) - db $11 - db $11 + db $11 ; UNUSED_MAP_ED + db $11 ; UNUSED_MAP_EE db BANK(TradeCenter_h) db BANK(Colosseum_h) - db $11 - db $11 - db $11 - db $11 - db BANK(Lorelei_h) - db BANK(Bruno_h) - db BANK(Agatha_h) + db $11 ; UNUSED_MAP_F1 + db $11 ; UNUSED_MAP_F2 + db $11 ; UNUSED_MAP_F3 + db $11 ; UNUSED_MAP_F4 + db BANK(LoreleisRoom_h) + db BANK(BrunosRoom_h) + db BANK(AgathasRoom_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index b777e4ca..9d85eaae 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -11,7 +11,7 @@ MapHeaderPointers:: dw CinnabarIsland_h dw IndigoPlateau_h dw SaffronCity_h - dw SaffronCity_h + dw SaffronCity_h ; UNUSED_MAP_0B dw Route1_h dw Route2_h dw Route3_h @@ -40,211 +40,211 @@ MapHeaderPointers:: dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h - dw OaksLab_h ;id=40 + dw OaksLab_h dw ViridianPokecenter_h dw ViridianMart_h - dw School_h - dw ViridianHouse_h + dw ViridianSchoolHouse_h + dw ViridianNicknameHouse_h dw ViridianGym_h dw DiglettsCaveRoute2_h - dw ViridianForestExit_h - dw Route2House_h + dw ViridianForestNorthGate_h + dw Route2TradeHouse_h dw Route2Gate_h - dw ViridianForestEntrance_h ;id=50 + dw ViridianForestSouthGate_h dw ViridianForest_h dw Museum1F_h dw Museum2F_h dw PewterGym_h - dw PewterHouse1_h + dw PewterNidoranHouse_h dw PewterMart_h - dw PewterHouse2_h + dw PewterSpeechHouse_h dw PewterPokecenter_h - dw MtMoon1_h - dw MtMoon2_h ;id=60 - dw MtMoon3_h - dw CeruleanHouseTrashed_h - dw CeruleanHouse1_h + dw MtMoon1F_h + dw MtMoonB1F_h + dw MtMoonB2F_h + dw CeruleanTrashedHouse_h + dw CeruleanTradeHouse_h dw CeruleanPokecenter_h dw CeruleanGym_h dw BikeShop_h dw CeruleanMart_h dw MtMoonPokecenter_h - dw CeruleanHouseTrashed_h ; copy + dw CeruleanTrashedHouse_h ; CERULEAN_TRASHED_HOUSE_COPY dw Route5Gate_h - dw UndergroundPathEntranceRoute5_h - dw DayCareM_h + dw UndergroundPathRoute5_h + dw Daycare_h dw Route6Gate_h - dw UndergroundPathEntranceRoute6_h - dw UndergroundPathEntranceRoute6_h ; unused + dw UndergroundPathRoute6_h + dw UndergroundPathRoute6_h ; UNDERGROUND_PATH_ROUTE_6_COPY dw Route7Gate_h - dw UndergroundPathEntranceRoute7_h - dw UndergroundPathEntranceRoute7Copy_h + dw UndergroundPathRoute7_h + dw UndergroundPathRoute7Copy_h dw Route8Gate_h - dw UndergroundPathEntranceRoute8_h ;id=80 + dw UndergroundPathRoute8_h dw RockTunnelPokecenter_h - dw RockTunnel1_h + dw RockTunnel1F_h dw PowerPlant_h - dw Route11Gate_h - dw DiglettsCaveEntranceRoute11_h - dw Route11GateUpstairs_h - dw Route12Gate_h + dw Route11Gate1F_h + dw DiglettsCaveRoute11_h + dw Route11Gate2F_h + dw Route12Gate1F_h dw BillsHouse_h dw VermilionPokecenter_h - dw FanClub_h ;id=90 + dw PokemonFanClub_h dw VermilionMart_h dw VermilionGym_h - dw VermilionHouse1_h + dw VermilionPidgeyHouse_h dw VermilionDock_h - dw SSAnne1_h - dw SSAnne2_h - dw SSAnne3_h - dw SSAnne4_h - dw SSAnne5_h - dw SSAnne6_h ;id=100 - dw SSAnne7_h - dw SSAnne8_h - dw SSAnne9_h - dw SSAnne10_h - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw VictoryRoad1_h - dw Lance_h ; unused - dw Lance_h ; unused ;id=110 - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw HallofFameRoom_h - dw UndergroundPathNS_h - dw Gary_h ;id=120 - dw UndergroundPathWE_h - dw CeladonMart1_h - dw CeladonMart2_h - dw CeladonMart3_h - dw CeladonMart4_h + dw SSAnne1F_h + dw SSAnne2F_h + dw SSAnne3F_h + dw SSAnneB1F_h + dw SSAnneBow_h + dw SSAnneKitchen_h + dw SSAnneCaptainsRoom_h + dw SSAnne1FRooms_h + dw SSAnne2FRooms_h + dw SSAnneB1FRooms_h + dw LancesRoom_h ; UNUSED_MAP_69 + dw LancesRoom_h ; UNUSED_MAP_6A + dw LancesRoom_h ; UNUSED_MAP_6B + dw VictoryRoad1F_h + dw LancesRoom_h ; UNUSED_MAP_6D + dw LancesRoom_h ; UNUSED_MAP_6E + dw LancesRoom_h ; UNUSED_MAP_6F + dw LancesRoom_h ; UNUSED_MAP_70 + dw LancesRoom_h + dw LancesRoom_h ; UNUSED_MAP_72 + dw LancesRoom_h ; UNUSED_MAP_73 + dw LancesRoom_h ; UNUSED_MAP_74 + dw LancesRoom_h ; UNUSED_MAP_75 + dw HallOfFame_h + dw UndergroundPathNorthSouth_h + dw ChampionsRoom_h + dw UndergroundPathWestEast_h + dw CeladonMart1F_h + dw CeladonMart2F_h + dw CeladonMart3F_h + dw CeladonMart4F_h dw CeladonMartRoof_h dw CeladonMartElevator_h - dw CeladonMansion1_h - dw CeladonMansion2_h - dw CeladonMansion3_h ;id=130 - dw CeladonMansion4_h - dw CeladonMansion5_h + dw CeladonMansion1F_h + dw CeladonMansion2F_h + dw CeladonMansion3F_h + dw CeladonMansionRoof_h + dw CeladonMansionRoofHouse_h dw CeladonPokecenter_h dw CeladonGym_h - dw CeladonGameCorner_h - dw CeladonMart5_h - dw CeladonPrizeRoom_h + dw GameCorner_h + dw CeladonMart5F_h + dw GameCornerPrizeRoom_h dw CeladonDiner_h - dw CeladonHouse_h - dw CeladonHotel_h ;id=140 + dw CeladonChiefHouse_h + dw CeladonHotel_h dw LavenderPokecenter_h - dw PokemonTower1_h - dw PokemonTower2_h - dw PokemonTower3_h - dw PokemonTower4_h - dw PokemonTower5_h - dw PokemonTower6_h - dw PokemonTower7_h - dw LavenderHouse1_h - dw LavenderMart_h ;id=150 - dw LavenderHouse2_h + dw PokemonTower1F_h + dw PokemonTower2F_h + dw PokemonTower3F_h + dw PokemonTower4F_h + dw PokemonTower5F_h + dw PokemonTower6F_h + dw PokemonTower7F_h + dw MrFujisHouse_h + dw LavenderMart_h + dw LavenderCuboneHouse_h dw FuchsiaMart_h - dw FuchsiaHouse1_h + dw FuchsiaBillsGrandpasHouse_h dw FuchsiaPokecenter_h - dw FuchsiaHouse2_h - dw SafariZoneEntrance_h + dw WardensHouse_h + dw SafariZoneGate_h dw FuchsiaGym_h dw FuchsiaMeetingRoom_h - dw SeafoamIslands2_h - dw SeafoamIslands3_h ;id=160 - dw SeafoamIslands4_h - dw SeafoamIslands5_h - dw VermilionHouse2_h - dw FuchsiaHouse3_h - dw Mansion1_h + dw SeafoamIslandsB1F_h + dw SeafoamIslandsB2F_h + dw SeafoamIslandsB3F_h + dw SeafoamIslandsB4F_h + dw VermilionOldRodHouse_h + dw FuchsiaGoodRodHouse_h + dw PokemonMansion1F_h dw CinnabarGym_h - dw Lab1_h - dw Lab2_h - dw Lab3_h - dw Lab4_h ;id=170 + dw CinnabarLab_h + dw CinnabarLabTradeRoom_h + dw CinnabarLabMetronomeRoom_h + dw CinnabarLabFossilRoom_h dw CinnabarPokecenter_h dw CinnabarMart_h - dw CinnabarMart_h ; unused + dw CinnabarMart_h ; CINNABAR_MART_COPY dw IndigoPlateauLobby_h dw CopycatsHouse1F_h dw CopycatsHouse2F_h dw FightingDojo_h dw SaffronGym_h - dw SaffronHouse1_h - dw SaffronMart_h ;id=180 - dw SilphCo1_h + dw SaffronPidgeyHouse_h + dw SaffronMart_h + dw SilphCo1F_h dw SaffronPokecenter_h - dw SaffronHouse2_h - dw Route15Gate_h - dw Route15GateUpstairs_h - dw Route16Gate_h - dw Route16GateUpstairs_h - dw Route16House_h - dw Route12House_h - dw Route18Gate_h ;id=190 - dw Route18GateUpstairs_h - dw SeafoamIslands1_h + dw MrPsychicsHouse_h + dw Route15Gate1F_h + dw Route15Gate2F_h + dw Route16Gate1F_h + dw Route16Gate2F_h + dw Route16FlyHouse_h + dw Route12SuperRodHouse_h + dw Route18Gate1F_h + dw Route18Gate2F_h + dw SeafoamIslands1F_h dw Route22Gate_h - dw VictoryRoad2_h - dw Route12GateUpstairs_h - dw VermilionHouse3_h + dw VictoryRoad2F_h + dw Route12Gate2F_h + dw VermilionTradeHouse_h dw DiglettsCave_h - dw VictoryRoad3_h - dw RocketHideout1_h - dw RocketHideout2_h ;200 - dw RocketHideout3_h - dw RocketHideout4_h + dw VictoryRoad3F_h + dw RocketHideoutB1F_h + dw RocketHideoutB2F_h + dw RocketHideoutB3F_h + dw RocketHideoutB4F_h dw RocketHideoutElevator_h - dw RocketHideoutElevator_h ; unused - dw RocketHideoutElevator_h ; unused - dw RocketHideoutElevator_h ; unused - dw SilphCo2_h - dw SilphCo3_h - dw SilphCo4_h - dw SilphCo5_h ;210 - dw SilphCo6_h - dw SilphCo7_h - dw SilphCo8_h - dw Mansion2_h - dw Mansion3_h - dw Mansion4_h + dw RocketHideoutElevator_h ; UNUSED_MAP_CC + dw RocketHideoutElevator_h ; UNUSED_MAP_CD + dw RocketHideoutElevator_h ; UNUSED_MAP_CE + dw SilphCo2F_h + dw SilphCo3F_h + dw SilphCo4F_h + dw SilphCo5F_h + dw SilphCo6F_h + dw SilphCo7F_h + dw SilphCo8F_h + dw PokemonMansion2F_h + dw PokemonMansion3F_h + dw PokemonMansionB1F_h dw SafariZoneEast_h dw SafariZoneNorth_h dw SafariZoneWest_h - dw SafariZoneCenter_h ;220 - dw SafariZoneRestHouse1_h + dw SafariZoneCenter_h + dw SafariZoneCenterRestHouse_h dw SafariZoneSecretHouse_h - dw SafariZoneRestHouse2_h - dw SafariZoneRestHouse3_h - dw SafariZoneRestHouse4_h - dw UnknownDungeon2_h - dw UnknownDungeon3_h - dw UnknownDungeon1_h - dw NameRater_h - dw CeruleanHouse2_h - dw Route16Gate_h ; unused - dw RockTunnel2_h - dw SilphCo9_h - dw SilphCo10_h - dw SilphCo11_h + dw SafariZoneWestRestHouse_h + dw SafariZoneEastRestHouse_h + dw SafariZoneNorthRestHouse_h + dw CeruleanCave2F_h + dw CeruleanCaveB1F_h + dw CeruleanCave1F_h + dw NameRatersHouse_h + dw CeruleanBadgeHouse_h + dw Route16Gate1F_h ; UNUSED_MAP_E7 + dw RockTunnelB1F_h + dw SilphCo9F_h + dw SilphCo10F_h + dw SilphCo11F_h dw SilphCoElevator_h - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused + dw SilphCo2F_h ; UNUSED_MAP_ED + dw SilphCo2F_h ; UNUSED_MAP_EE dw TradeCenter_h dw Colosseum_h - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw Lorelei_h - dw Bruno_h - dw Agatha_h ;247 + dw SilphCo2F_h ; UNUSED_MAP_F1 + dw SilphCo2F_h ; UNUSED_MAP_F2 + dw SilphCo2F_h ; UNUSED_MAP_F3 + dw SilphCo2F_h ; UNUSED_MAP_F4 + dw LoreleisRoom_h + dw BrunosRoom_h + dw AgathasRoom_h ;247 diff --git a/data/map_songs.asm b/data/map_songs.asm index 892f475e..55ec5abf 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,5 +1,5 @@ MapSongBanks: - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY @@ -10,7 +10,7 @@ MapSongBanks: db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; unused + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 @@ -36,214 +36,214 @@ MapSongBanks: db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse1F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse2F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BluesHouse - db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OaksLab - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianPokecenter - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianMart - db MUSIC_CITIES1, BANK(Music_Cities1) ; School - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse - db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest - db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F - db MUSIC_GYM, BANK(Music_Gym) ; PewterGym - db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart - db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon1 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3 - db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed - db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter - db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym - db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanMart - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MtMoonPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CeruleanHouseTrashed - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route5Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5 - db MUSIC_CITIES1, BANK(Music_Cities1) ; DayCareM - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route6Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; FREEZE - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route7Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute7 - db MUSIC_CELADON, BANK(Music_Celadon) ;FREEZE - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route8Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute8 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; RockTunnelPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel1 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; PowerPlant - db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11Gate - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11GateUpstairs - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12Gate - db MUSIC_CITIES2, BANK(Music_Cities2) ; BillsHouse - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionPokecenter - db MUSIC_VERMILION, BANK(Music_Vermilion) ; FanClub - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionMart - db MUSIC_GYM, BANK(Music_Gym) ; VermilionGym - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse1 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VermilionDock - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne1 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne2 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne3 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne4 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne5 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne6 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne7 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne8 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne9 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne10 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad1 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ;unused - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ;unused - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Lance - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HallofFameRoom - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathNS - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Gary - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathWE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart3 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart4 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartRoof - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartElevator - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion1 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion2 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion3 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion4 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion5 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonPokecenter - db MUSIC_GYM, BANK(Music_Gym) ; CeladonGym - db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; CeladonGameCorner - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart5 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonPrizeRoom - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonDiner - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHouse - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHotel - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderPokecenter - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower1 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower2 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower3 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower4 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower5 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower6 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower7 - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderMart - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaMart - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaPokecenter - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse2 - db MUSIC_CITIES2, BANK(Music_Cities2) ; SafariZoneEntrance - db MUSIC_GYM, BANK(Music_Gym) ; FuchsiaGym - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaMeetingRoom - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands2 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands3 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands4 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands5 - db MUSIC_CITIES2, BANK(Music_Cities2) ; VermilionHouse2 - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse3 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion1 - db MUSIC_GYM, BANK(Music_Gym) ; CinnabarGym - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab1 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab2 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab3 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab4 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarPokecenter - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart - db MUSIC_CINNABAR, BANK(Music_Cinnabar) - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby - db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo - db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym - db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronMart - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronPokecenter - db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs - db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House - db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18GateUpstairs - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands1 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; Route22Gate - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12GateUpstairs - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse3 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCave - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout1 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout2 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout4 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideoutElevator - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo3 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo4 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo5 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo6 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo7 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo8 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion2 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion3 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion4 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneEast - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneNorth - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneWest - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneCenter - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse1 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneSecretHouse - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse2 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse3 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse4 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon2 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon1 - db MUSIC_CITIES2, BANK(Music_Cities2) ; NameRater - db MUSIC_CITIES1, BANK(Music_Cities1) ; CeruleanHouse2 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo9 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo10 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo11 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter - db MUSIC_CELADON, BANK(Music_Celadon) ; Colosseum - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_GYM, BANK(Music_Gym) ; Lorelei - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_1F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_2F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BLUES_HOUSE + db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OAKS_LAB + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_POKECENTER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_MART + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_SCHOOL_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_NICKNAME_HOUSE + db MUSIC_GYM, BANK(Music_Gym) ; VIRIDIAN_GYM + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_2 + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_NORTH_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_TRADE_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_SOUTH_GATE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; VIRIDIAN_FOREST + db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_2F + db MUSIC_GYM, BANK(Music_Gym) ; PEWTER_GYM + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_NIDORAN_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_MART + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_SPEECH_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_1F + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER + db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM + db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_MART + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MT_MOON_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CERULEAN_TRASHED_HOUSE_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_5_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_5 + db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7 + db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_8_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_8 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ROCK_TUNNEL_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; POWER_PLANT + db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_11 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_1F + db MUSIC_CITIES2, BANK(Music_Cities2) ; BILLS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_POKECENTER + db MUSIC_VERMILION, BANK(Music_Vermilion) ; POKEMON_FAN_CLUB + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_MART + db MUSIC_GYM, BANK(Music_Gym) ; VERMILION_GYM + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_PIDGEY_HOUSE + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VERMILION_DOCK + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_3F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_BOW + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_KITCHEN + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_CAPTAINS_ROOM + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F_ROOMS + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F_ROOMS + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F_ROOMS + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_6A + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_1F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_6E + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_6F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70 + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75 + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; CHAMPIONS_ROOM + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_WEST_EAST + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_1F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_2F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_3F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_4F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ROOF + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ELEVATOR + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_1F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_2F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_3F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_POKECENTER + db MUSIC_GYM, BANK(Music_Gym) ; CELADON_GYM + db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; GAME_CORNER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_5F + db MUSIC_CELADON, BANK(Music_Celadon) ; GAME_CORNER_PRIZE_ROOM + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_DINER + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CHIEF_HOUSE + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_HOTEL + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_POKECENTER + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_1F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_2F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_3F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_4F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_5F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_6F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_7F + db MUSIC_LAVENDER, BANK(Music_Lavender) ; MR_FUJIS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_MART + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_CUBONE_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_MART + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_BILLS_GRANDPAS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_POKECENTER + db MUSIC_CITIES2, BANK(Music_Cities2) ; WARDENS_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; SAFARI_ZONE_GATE + db MUSIC_GYM, BANK(Music_Gym) ; FUCHSIA_GYM + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_MEETING_ROOM + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B2F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B3F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B4F + db MUSIC_CITIES2, BANK(Music_Cities2) ; VERMILION_OLD_ROD_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_GOOD_ROD_HOUSE + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_1F + db MUSIC_GYM, BANK(Music_Gym) ; CINNABAR_GYM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_TRADE_ROOM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_METRONOME_ROOM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_FOSSIL_ROOM + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_POKECENTER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_MART + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_MART_COPY + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU_LOBBY + db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; FIGHTING_DOJO + db MUSIC_GYM, BANK(Music_Gym) ; SAFFRON_GYM + db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_PIDGEY_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_MART + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_1F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_POKECENTER + db MUSIC_CITIES1, BANK(Music_Cities1) ; MR_PSYCHICS_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_2F + db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_16_FLY_HOUSE + db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_12_SUPER_ROD_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_2F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ROUTE_22_GATE + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_2F + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_TRADE_HOUSE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_3F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B2F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B3F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B4F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_ELEVATOR + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CC + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CD + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CE + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_2F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_3F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_4F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_5F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_6F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_7F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_8F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_2F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_3F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_B1F + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_SECRET_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH_REST_HOUSE + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_2F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_B1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F + db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7 + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_11F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_ELEVATOR + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_ED + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE + db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER + db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F1 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F2 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4 + db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM diff --git a/data/special_warps.asm b/data/special_warps.asm index 27837109..6b536b67 100755 --- a/data/special_warps.asm +++ b/data/special_warps.asm @@ -2,33 +2,33 @@ ; 00: target map ID ; 01: which dungeon warp in the source map was used DungeonWarpList: - db SEAFOAM_ISLANDS_2,$01 - db SEAFOAM_ISLANDS_2,$02 - db SEAFOAM_ISLANDS_3,$01 - db SEAFOAM_ISLANDS_3,$02 - db SEAFOAM_ISLANDS_4,$01 - db SEAFOAM_ISLANDS_4,$02 - db SEAFOAM_ISLANDS_5,$01 - db SEAFOAM_ISLANDS_5,$02 - db VICTORY_ROAD_2,$02 - db MANSION_1,$01 - db MANSION_1,$02 - db MANSION_2,$03 + db SEAFOAM_ISLANDS_B1F,$01 + db SEAFOAM_ISLANDS_B1F,$02 + db SEAFOAM_ISLANDS_B2F,$01 + db SEAFOAM_ISLANDS_B2F,$02 + db SEAFOAM_ISLANDS_B3F,$01 + db SEAFOAM_ISLANDS_B3F,$02 + db SEAFOAM_ISLANDS_B4F,$01 + db SEAFOAM_ISLANDS_B4F,$02 + db VICTORY_ROAD_2F,$02 + db POKEMON_MANSION_1F,$01 + db POKEMON_MANSION_1F,$02 + db POKEMON_MANSION_2F,$03 db $FF DungeonWarpData: - FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23 - FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,22 - FLYWARP_DATA SEAFOAM_ISLANDS_4_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_4_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_5_WIDTH,14,4 - FLYWARP_DATA SEAFOAM_ISLANDS_5_WIDTH,14,5 - FLYWARP_DATA VICTORY_ROAD_2_WIDTH,16,22 - FLYWARP_DATA MANSION_1_WIDTH,14,16 - FLYWARP_DATA MANSION_1_WIDTH,14,16 - FLYWARP_DATA MANSION_2_WIDTH,14,18 + FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,18 + FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,23 + FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,19 + FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,22 + FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,18 + FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,19 + FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,4 + FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,5 + FLYWARP_DATA VICTORY_ROAD_2F_WIDTH,16,22 + FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 + FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 + FLYWARP_DATA POKEMON_MANSION_2F_WIDTH,14,18 ;Format: ; db Map_id diff --git a/data/super_rod.asm b/data/super_rod.asm index 93ea992b..d3d64632 100755 --- a/data/super_rod.asm +++ b/data/super_rod.asm @@ -25,15 +25,15 @@ SuperRodData: dbw ROUTE_25, FishingGroup3 dbw CERULEAN_GYM, FishingGroup3 dbw VERMILION_DOCK, FishingGroup4 - dbw SEAFOAM_ISLANDS_4, FishingGroup8 - dbw SEAFOAM_ISLANDS_5, FishingGroup8 + dbw SEAFOAM_ISLANDS_B3F, FishingGroup8 + dbw SEAFOAM_ISLANDS_B4F, FishingGroup8 dbw SAFARI_ZONE_EAST, FishingGroup6 dbw SAFARI_ZONE_NORTH, FishingGroup6 dbw SAFARI_ZONE_WEST, FishingGroup6 dbw SAFARI_ZONE_CENTER, FishingGroup6 - dbw UNKNOWN_DUNGEON_2, FishingGroup9 - dbw UNKNOWN_DUNGEON_3, FishingGroup9 - dbw UNKNOWN_DUNGEON_1, FishingGroup9 + dbw CERULEAN_CAVE_2F, FishingGroup9 + dbw CERULEAN_CAVE_B1F, FishingGroup9 + dbw CERULEAN_CAVE_1F, FishingGroup9 db $FF ; fishing groups diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index abf584de..63ebd51b 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -38,64 +38,64 @@ ExternalMapEntries: EMAP $B,$0,Route25Name InternalMapEntries: - IMAP OAKS_LAB, $2,$B,PalletTownName - IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName - IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name - IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName - IMAP PEWTER_POKECENTER, $2,$3,PewterCityName - IMAP MT_MOON_3, $6,$2,MountMoonName - IMAP CERULEAN_MART, $A,$2,CeruleanCityName - IMAP MT_MOON_POKECENTER, $5,$2,Route4Name - IMAP TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName - IMAP DAYCAREM, $A,$4,Route5Name - IMAP PATH_ENTRANCE_ROUTE_6_COPY,$A,$6,Route6Name - IMAP PATH_ENTRANCE_ROUTE_7_COPY,$9,$5,Route7Name - IMAP PATH_ENTRANCE_ROUTE_8, $B,$5,Route8Name - IMAP ROCK_TUNNEL_1, $E,$3,RockTunnelName - IMAP POWER_PLANT, $F,$4,PowerPlantName - IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name - IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name - IMAP BILLS_HOUSE, $C,$0,SeaCottageName - IMAP VERMILION_DOCK, $A,$9,VermilionCityName - IMAP SS_ANNE_10, $9,$A,SSAnneName - IMAP VICTORY_ROAD_1, $0,$4,VictoryRoadName - IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_NS, $A,$5,UndergroundPathName - IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_WE, $A,$5,UndergroundPathName - IMAP CELADON_HOTEL, $7,$5,CeladonCityName - IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName - IMAP POKEMONTOWER_7, $F,$5,PokemonTowerName - IMAP LAVENDER_HOUSE_2, $E,$5,LavenderTownName - IMAP FUCHSIA_HOUSE_2, $8,$D,FuchsiaCityName - IMAP SAFARI_ZONE_ENTRANCE, $8,$C,SafariZoneName - IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName - IMAP SEAFOAM_ISLANDS_5, $5,$F,SeafoamIslandsName - IMAP VERMILION_HOUSE_2, $A,$9,VermilionCityName - IMAP FUCHSIA_HOUSE_3, $8,$D,FuchsiaCityName - IMAP MANSION_1, $2,$F,PokemonMansionName - IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName - IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName - IMAP SAFFRON_HOUSE_2, $A,$5,SaffronCityName - IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name - IMAP ROUTE_16_HOUSE, $4,$5,Route16Name - IMAP ROUTE_12_HOUSE, $E,$A,Route12Name - IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name - IMAP SEAFOAM_ISLANDS_1, $5,$F,SeafoamIslandsName - IMAP ROUTE_22_GATE, $0,$7,Route22Name - IMAP VICTORY_ROAD_2, $0,$4,VictoryRoadName - IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name - IMAP VERMILION_HOUSE_3, $A,$9,VermilionCityName - IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName - IMAP VICTORY_ROAD_3, $0,$4,VictoryRoadName - IMAP UNUSED_MAP_CE, $7,$5,RocketHQName - IMAP SILPH_CO_8F, $A,$5,SilphCoName - IMAP MANSION_4, $2,$F,PokemonMansionName - IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName - IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName - IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_HOUSE_2, $A,$2,CeruleanCityName - IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName - IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName - IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName + IMAP OAKS_LAB, $2,$B,PalletTownName + IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName + IMAP VIRIDIAN_FOREST_SOUTH_GATE, $2,$6,Route2Name + IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName + IMAP PEWTER_POKECENTER, $2,$3,PewterCityName + IMAP MT_MOON_B2F, $6,$2,MountMoonName + IMAP CERULEAN_MART, $A,$2,CeruleanCityName + IMAP MT_MOON_POKECENTER, $5,$2,Route4Name + IMAP CERULEAN_TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName + IMAP DAYCARE, $A,$4,Route5Name + IMAP UNDERGROUND_PATH_ROUTE_6_COPY, $A,$6,Route6Name + IMAP UNDERGROUND_PATH_ROUTE_7_COPY, $9,$5,Route7Name + IMAP UNDERGROUND_PATH_ROUTE_8, $B,$5,Route8Name + IMAP ROCK_TUNNEL_1F, $E,$3,RockTunnelName + IMAP POWER_PLANT, $F,$4,PowerPlantName + IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name + IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name + IMAP BILLS_HOUSE, $C,$0,SeaCottageName + IMAP VERMILION_DOCK, $A,$9,VermilionCityName + IMAP SS_ANNE_B1F_ROOMS, $9,$A,SSAnneName + IMAP VICTORY_ROAD_1F, $0,$4,VictoryRoadName + IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_NORTH_SOUTH, $A,$5,UndergroundPathName + IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_WEST_EAST, $A,$5,UndergroundPathName + IMAP CELADON_HOTEL, $7,$5,CeladonCityName + IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName + IMAP POKEMON_TOWER_7F, $F,$5,PokemonTowerName + IMAP LAVENDER_CUBONE_HOUSE, $E,$5,LavenderTownName + IMAP WARDENS_HOUSE, $8,$D,FuchsiaCityName + IMAP SAFARI_ZONE_GATE, $8,$C,SafariZoneName + IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName + IMAP SEAFOAM_ISLANDS_B4F, $5,$F,SeafoamIslandsName + IMAP VERMILION_OLD_ROD_HOUSE, $A,$9,VermilionCityName + IMAP FUCHSIA_GOOD_ROD_HOUSE, $8,$D,FuchsiaCityName + IMAP POKEMON_MANSION_1F, $2,$F,PokemonMansionName + IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName + IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName + IMAP MR_PSYCHICS_HOUSE, $A,$5,SaffronCityName + IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name + IMAP ROUTE_16_FLY_HOUSE, $4,$5,Route16Name + IMAP ROUTE_12_SUPER_ROD_HOUSE, $E,$A,Route12Name + IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name + IMAP SEAFOAM_ISLANDS_1F, $5,$F,SeafoamIslandsName + IMAP ROUTE_22_GATE, $0,$7,Route22Name + IMAP VICTORY_ROAD_2F, $0,$4,VictoryRoadName + IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name + IMAP VERMILION_TRADE_HOUSE, $A,$9,VermilionCityName + IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName + IMAP VICTORY_ROAD_3F, $0,$4,VictoryRoadName + IMAP UNUSED_MAP_CE, $7,$5,RocketHQName + IMAP SILPH_CO_8F, $A,$5,SilphCoName + IMAP POKEMON_MANSION_B1F, $2,$F,PokemonMansionName + IMAP SAFARI_ZONE_NORTH_REST_HOUSE, $8,$C,SafariZoneName + IMAP CERULEAN_CAVE_1F, $9,$1,CeruleanCaveName + IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName + IMAP CERULEAN_BADGE_HOUSE, $A,$2,CeruleanCityName + IMAP ROCK_TUNNEL_B1F, $E,$3,RockTunnelName + IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName + IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName db $FF diff --git a/data/town_map_order.asm b/data/town_map_order.asm index 10131a31..a082c376 100755 --- a/data/town_map_order.asm +++ b/data/town_map_order.asm @@ -7,7 +7,7 @@ TownMapOrder: db DIGLETTS_CAVE db PEWTER_CITY db ROUTE_3 - db MT_MOON_1 + db MT_MOON_1F db ROUTE_4 db CERULEAN_CITY db ROUTE_24 @@ -16,12 +16,12 @@ TownMapOrder: db ROUTE_5 db ROUTE_6 db VERMILION_CITY - db SS_ANNE_1 + db SS_ANNE_1F db ROUTE_9 db ROCK_TUNNEL_POKECENTER db ROUTE_10 db LAVENDER_TOWN - db POKEMONTOWER_2 + db POKEMON_TOWER_2F db ROUTE_8 db ROUTE_7 db CELADON_CITY @@ -37,13 +37,13 @@ TownMapOrder: db FUCHSIA_CITY db SAFARI_ZONE_EAST db ROUTE_19 - db SEAFOAM_ISLANDS_2 + db SEAFOAM_ISLANDS_B1F db ROUTE_20 db CINNABAR_ISLAND db ROUTE_21 db ROUTE_22 db ROUTE_23 - db VICTORY_ROAD_3 + db VICTORY_ROAD_3F db INDIGO_PLATEAU db POWER_PLANT TownMapOrderEnd: diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 985a1eb2..1967d33b 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -118,8 +118,8 @@ GetBattleTransitionID_CompareLevels: ld [wBattleTransitionSpiralDirection], a ret -; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, -; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE +; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, +; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] @@ -155,30 +155,30 @@ GetBattleTransitionID_IsDungeonMap: ; is equal to one of these maps DungeonMaps1: db VIRIDIAN_FOREST - db ROCK_TUNNEL_1 - db SEAFOAM_ISLANDS_1 - db ROCK_TUNNEL_2 + db ROCK_TUNNEL_1F + db SEAFOAM_ISLANDS_1F + db ROCK_TUNNEL_B1F db $FF ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps DungeonMaps2: ; all MT_MOON maps - db MT_MOON_1 - db MT_MOON_3 + db MT_MOON_1F + db MT_MOON_B2F - ; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME - db SS_ANNE_1 + ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1F db HALL_OF_FAME - ; all POKEMONTOWER maps and Lavender Town buildings + ; all POKEMON_TOWER maps and Lavender Town buildings db LAVENDER_POKECENTER - db LAVENDER_HOUSE_2 + db LAVENDER_CUBONE_HOUSE - ; SILPH_CO_[2-8]F, MANSION[2-4], SAFARI_ZONE, and UNKNOWN_DUNGEON maps, - ; except for SILPH_CO_1F + ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and + ; CERULEAN_CAVE maps, except for SILPH_CO_1F db SILPH_CO_2F - db UNKNOWN_DUNGEON_1 + db CERULEAN_CAVE_1F db $FF LoadBattleTransitionTile: diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 3d46c947..4a138048 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -3,9 +3,9 @@ PrintBeginningBattleText: dec a jr nz, .trainerBattle ld a, [wCurMap] - cp POKEMONTOWER_3 + cp POKEMON_TOWER_3F jr c, .notPokemonTower - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr c, .pokemonTower .notPokemonTower ld a, [wEnemyMonSpecies2] diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9265503d..056a9588 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3371,9 +3371,9 @@ IsGhostBattle: dec a ret nz ld a, [wCurMap] - cp POKEMONTOWER_1 + cp POKEMON_TOWER_1F jr c, .next - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr nc, .next ld b, SILPH_SCOPE call IsItemInBag diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index bdd5d8f4..7bc912d2 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -30,7 +30,7 @@ InitBattleVariables: ld a, [wCurMap] cp SAFARI_ZONE_EAST jr c, .notSafariBattle - cp SAFARI_ZONE_REST_HOUSE_1 + cp SAFARI_ZONE_CENTER_REST_HOUSE jr nc, .notSafariBattle ld a, BATTLE_TYPE_SAFARI ld [wBattleType], a diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f04c1deb..491be861 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -79,12 +79,12 @@ SafariZoneGameOver: call DisplayTextID xor a ld [wPlayerMovingDirection], a - ld a, SAFARI_ZONE_ENTRANCE + ld a, SAFARI_ZONE_GATE ld [hWarpDestinationMap], a ld a, $3 ld [wDestinationWarpID], a ld a, $5 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a SetEvent EVENT_SAFARI_GAME_OVER ld a, 1 ld [wSafariZoneGameOver], a diff --git a/engine/items/items.asm b/engine/items/items.asm index 3bb2ec9e..38e8a704 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -166,7 +166,7 @@ ItemUseBall: ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. ld a, [wCurMap] - cp POKEMONTOWER_6 + cp POKEMON_TOWER_6F jr nz, .loop ld a, [wEnemyMonSpecies2] cp MAROWAK @@ -1511,7 +1511,7 @@ ItemUseEscapeRope: ResetEvent EVENT_IN_SAFARI_ZONE xor a ld [wNumSafariBalls], a - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a inc a ld [wEscapedFromBattle], a ld [wActionResultOrTookBattleTurn], a ; item used diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm index 69914bfc..b1506742 100644 --- a/engine/overworld/field_move_messages.asm +++ b/engine/overworld/field_move_messages.asm @@ -28,7 +28,7 @@ IsSurfingAllowed: bit 5, a jr nz, .forcedToRideBike ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ret nz CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 2c75b9d8..968615f0 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -268,7 +268,7 @@ RLEList_PewterGymGuy: FreezeEnemyTrainerSprite: ld a, [wCurMap] - cp POKEMONTOWER_7 + cp POKEMON_TOWER_7F ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them ld hl, RivalIDs ld a, [wEngagedTrainerClass] diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index b8d734f2..73c55da2 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -55,14 +55,14 @@ CheckForceBikeOrSurf: cp c ;compare x-coord jr nz, .loop ; incorrect x-coord, check next item ld a, [wCurMap] - cp SEAFOAM_ISLANDS_4 + cp SEAFOAM_ISLANDS_B3F ld a, $2 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a jr z, .forceSurfing ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ld a, $2 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a jr z, .forceSurfing ;force bike riding ld hl, wd732 @@ -156,7 +156,7 @@ IsWarpTileInFrontOfPlayer: push bc call _GetTileAndCoordsInFrontOfPlayer ld a, [wCurMap] - cp SS_ANNE_5 + cp SS_ANNE_BOW jr z, .ssAnne5 ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction srl a @@ -237,7 +237,7 @@ PrintSafariZoneSteps: ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F ret nc coord hl, 0, 0 ld b, 3 diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm index 9bfe82bd..bac2f0ca 100644 --- a/engine/overworld/set_blackout_map.asm +++ b/engine/overworld/set_blackout_map.asm @@ -23,7 +23,7 @@ SetLastBlackoutMap: ret SafariZoneRestHouses: - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE db -1 diff --git a/engine/palettes.asm b/engine/palettes.asm index 4808776e..4ab83f36 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -147,7 +147,7 @@ SetPal_Overworld: ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding cp NAME_RATERS_HOUSE jr c, .caveOrBruno diff --git a/gfx/blocksets/facility.bst b/gfx/blocksets/facility.bst index 1ed2d436..31d69fd1 100644 Binary files a/gfx/blocksets/facility.bst and b/gfx/blocksets/facility.bst differ diff --git a/home.asm b/home.asm index 5b8aaf6c..70dab701 100644 --- a/home.asm +++ b/home.asm @@ -1,4 +1,3 @@ - ; The rst vectors are unused. SECTION "rst 00", ROM0 rst $38 @@ -83,7 +82,6 @@ HideSprites:: INCLUDE "home/copy.asm" - SECTION "Entry", ROM0 nop @@ -98,7 +96,6 @@ SECTION "Header", ROM0 ds $150 - $104 - SECTION "Main", ROM0 Start:: diff --git a/home/overworld.asm b/home/overworld.asm index 317459ce..66bf73a7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -494,7 +494,7 @@ WarpFound2:: ld [wUnusedD366], a ; not read ld a, [hWarpDestinationMap] ld [wCurMap], a - cp ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1F jr nz, .notRockTunnel ld a, $06 ld [wMapPalOffset], a @@ -718,15 +718,15 @@ CheckIfInOutsideMap:: ; sets carry if the check passes, otherwise clears carry ExtraWarpCheck:: ld a, [wCurMap] - cp SS_ANNE_3 + cp SS_ANNE_3F jr z, .useFunction1 - cp ROCKET_HIDEOUT_1 + cp ROCKET_HIDEOUT_B1F jr z, .useFunction2 - cp ROCKET_HIDEOUT_2 + cp ROCKET_HIDEOUT_B2F jr z, .useFunction2 - cp ROCKET_HIDEOUT_4 + cp ROCKET_HIDEOUT_B4F jr z, .useFunction2 - cp ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1F jr z, .useFunction2 ld a, [wCurMapTileset] and a ; outside tileset (OVERWORLD) diff --git a/main.asm b/main.asm index 73ab724f..da4e691d 100755 --- a/main.asm +++ b/main.asm @@ -86,6 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" + SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" @@ -127,6 +128,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" + SECTION "NPC Sprites 1", ROMX ; BANK $04 OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" @@ -262,74 +264,74 @@ INCLUDE "engine/menu/pc.asm" SECTION "bank6", ROMX -INCLUDE "data/mapHeaders/celadoncity.asm" -INCLUDE "data/mapObjects/celadoncity.asm" -CeladonCityBlocks: INCBIN "maps/celadoncity.blk" +INCLUDE "data/mapHeaders/CeladonCity.asm" +INCLUDE "data/mapObjects/CeladonCity.asm" +CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" -INCLUDE "data/mapHeaders/pallettown.asm" -INCLUDE "data/mapObjects/pallettown.asm" -PalletTownBlocks: INCBIN "maps/pallettown.blk" +INCLUDE "data/mapHeaders/PalletTown.asm" +INCLUDE "data/mapObjects/PalletTown.asm" +PalletTown_Blocks: INCBIN "maps/PalletTown.blk" -INCLUDE "data/mapHeaders/viridiancity.asm" -INCLUDE "data/mapObjects/viridiancity.asm" -ViridianCityBlocks: INCBIN "maps/viridiancity.blk" +INCLUDE "data/mapHeaders/ViridianCity.asm" +INCLUDE "data/mapObjects/ViridianCity.asm" +ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk" -INCLUDE "data/mapHeaders/pewtercity.asm" - db $0 -INCLUDE "data/mapObjects/pewtercity.asm" -PewterCityBlocks: INCBIN "maps/pewtercity.blk" +INCLUDE "data/mapHeaders/PewterCity.asm" + ds 1 +INCLUDE "data/mapObjects/PewterCity.asm" +PewterCity_Blocks: INCBIN "maps/PewterCity.blk" -INCLUDE "data/mapHeaders/ceruleancity.asm" -INCLUDE "data/mapObjects/ceruleancity.asm" -CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" +INCLUDE "data/mapHeaders/CeruleanCity.asm" +INCLUDE "data/mapObjects/CeruleanCity.asm" +CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk" -INCLUDE "data/mapHeaders/vermilioncity.asm" -INCLUDE "data/mapObjects/vermilioncity.asm" -VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" +INCLUDE "data/mapHeaders/VermilionCity.asm" +INCLUDE "data/mapObjects/VermilionCity.asm" +VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk" -INCLUDE "data/mapHeaders/fuchsiacity.asm" -INCLUDE "data/mapObjects/fuchsiacity.asm" -FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" +INCLUDE "data/mapHeaders/FuchsiaCity.asm" +INCLUDE "data/mapObjects/FuchsiaCity.asm" +FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk" INCLUDE "engine/play_time.asm" -INCLUDE "scripts/pallettown.asm" -INCLUDE "scripts/viridiancity.asm" -INCLUDE "scripts/pewtercity.asm" -INCLUDE "scripts/ceruleancity.asm" -INCLUDE "scripts/vermilioncity.asm" -INCLUDE "scripts/celadoncity.asm" -INCLUDE "scripts/fuchsiacity.asm" - -INCLUDE "data/mapHeaders/blueshouse.asm" -INCLUDE "scripts/blueshouse.asm" -INCLUDE "data/mapObjects/blueshouse.asm" -BluesHouseBlocks: INCBIN "maps/blueshouse.blk" - -INCLUDE "data/mapHeaders/vermilionhouse3.asm" -INCLUDE "scripts/vermilionhouse3.asm" -INCLUDE "data/mapObjects/vermilionhouse3.asm" -VermilionHouse3Blocks: INCBIN "maps/vermilionhouse3.blk" - -INCLUDE "data/mapHeaders/indigoplateaulobby.asm" -INCLUDE "scripts/indigoplateaulobby.asm" -INCLUDE "data/mapObjects/indigoplateaulobby.asm" -IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk" - -INCLUDE "data/mapHeaders/silphco4.asm" -INCLUDE "scripts/silphco4.asm" -INCLUDE "data/mapObjects/silphco4.asm" -SilphCo4Blocks: INCBIN "maps/silphco4.blk" - -INCLUDE "data/mapHeaders/silphco5.asm" -INCLUDE "scripts/silphco5.asm" -INCLUDE "data/mapObjects/silphco5.asm" -SilphCo5Blocks: INCBIN "maps/silphco5.blk" - -INCLUDE "data/mapHeaders/silphco6.asm" -INCLUDE "scripts/silphco6.asm" -INCLUDE "data/mapObjects/silphco6.asm" -SilphCo6Blocks: INCBIN "maps/silphco6.blk" +INCLUDE "scripts/PalletTown.asm" +INCLUDE "scripts/ViridianCity.asm" +INCLUDE "scripts/PewterCity.asm" +INCLUDE "scripts/CeruleanCity.asm" +INCLUDE "scripts/VermilionCity.asm" +INCLUDE "scripts/CeladonCity.asm" +INCLUDE "scripts/FuchsiaCity.asm" + +INCLUDE "data/mapHeaders/BluesHouse.asm" +INCLUDE "scripts/BluesHouse.asm" +INCLUDE "data/mapObjects/BluesHouse.asm" +BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk" + +INCLUDE "data/mapHeaders/VermilionTradeHouse.asm" +INCLUDE "scripts/VermilionTradeHouse.asm" +INCLUDE "data/mapObjects/VermilionTradeHouse.asm" +VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk" + +INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm" +INCLUDE "scripts/IndigoPlateauLobby.asm" +INCLUDE "data/mapObjects/IndigoPlateauLobby.asm" +IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk" + +INCLUDE "data/mapHeaders/SilphCo4F.asm" +INCLUDE "scripts/SilphCo4F.asm" +INCLUDE "data/mapObjects/SilphCo4F.asm" +SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk" + +INCLUDE "data/mapHeaders/SilphCo5F.asm" +INCLUDE "scripts/SilphCo5F.asm" +INCLUDE "data/mapObjects/SilphCo5F.asm" +SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk" + +INCLUDE "data/mapHeaders/SilphCo6F.asm" +INCLUDE "scripts/SilphCo6F.asm" +INCLUDE "data/mapObjects/SilphCo6F.asm" +SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk" INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" @@ -338,38 +340,38 @@ INCLUDE "engine/overworld/ledges.asm" SECTION "bank7", ROMX -INCLUDE "data/mapHeaders/cinnabarisland.asm" -INCLUDE "data/mapObjects/cinnabarisland.asm" -CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk" +INCLUDE "data/mapHeaders/CinnabarIsland.asm" +INCLUDE "data/mapObjects/CinnabarIsland.asm" +CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk" -INCLUDE "data/mapHeaders/route1.asm" -INCLUDE "data/mapObjects/route1.asm" -Route1Blocks: INCBIN "maps/route1.blk" +INCLUDE "data/mapHeaders/Route1.asm" +INCLUDE "data/mapObjects/Route1.asm" +Route1_Blocks: INCBIN "maps/Route1.blk" -UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk" +UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk" -OaksLabBlocks: INCBIN "maps/oakslab.blk" +OaksLab_Blocks: INCBIN "maps/OaksLab.blk" -Route16HouseBlocks: -Route2HouseBlocks: -SaffronHouse1Blocks: -SaffronHouse2Blocks: -VermilionHouse1Blocks: -NameRaterBlocks: -LavenderHouse1Blocks: -LavenderHouse2Blocks: -CeruleanHouse1Blocks: -PewterHouse1Blocks: -PewterHouse2Blocks: -ViridianHouseBlocks: INCBIN "maps/viridianhouse.blk" +MrPsychicsHouse_Blocks: +NameRatersHouse_Blocks: +MrFujisHouse_Blocks: +Route16FlyHouse_Blocks: +Route2TradeHouse_Blocks: +SaffronPidgeyHouse_Blocks: +VermilionPidgeyHouse_Blocks: +LavenderCuboneHouse_Blocks: +CeruleanTradeHouse_Blocks: +PewterNidoranHouse_Blocks: +PewterSpeechHouse_Blocks: +ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" -CeladonMansion5Blocks: -SchoolBlocks: INCBIN "maps/school.blk" +CeladonMansionRoofHouse_Blocks: +ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk" -CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" +CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk" -DiglettsCaveEntranceRoute11Blocks: -DiglettsCaveRoute2Blocks: INCBIN "maps/diglettscaveroute2.blk" +DiglettsCaveRoute11_Blocks: +DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk" INCLUDE "text/monster_names.asm" @@ -377,141 +379,141 @@ INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" -INCLUDE "scripts/cinnabarisland.asm" +INCLUDE "scripts/CinnabarIsland.asm" -INCLUDE "scripts/route1.asm" +INCLUDE "scripts/Route1.asm" -INCLUDE "data/mapHeaders/oakslab.asm" -INCLUDE "scripts/oakslab.asm" -INCLUDE "data/mapObjects/oakslab.asm" - -INCLUDE "data/mapHeaders/viridianmart.asm" -INCLUDE "scripts/viridianmart.asm" -INCLUDE "data/mapObjects/viridianmart.asm" -ViridianMartBlocks: INCBIN "maps/viridianmart.blk" +INCLUDE "data/mapHeaders/OaksLab.asm" +INCLUDE "scripts/OaksLab.asm" +INCLUDE "data/mapObjects/OaksLab.asm" + +INCLUDE "data/mapHeaders/ViridianMart.asm" +INCLUDE "scripts/ViridianMart.asm" +INCLUDE "data/mapObjects/ViridianMart.asm" +ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk" -INCLUDE "data/mapHeaders/school.asm" -INCLUDE "scripts/school.asm" -INCLUDE "data/mapObjects/school.asm" - -INCLUDE "data/mapHeaders/viridianhouse.asm" - db $0 -INCLUDE "scripts/viridianhouse.asm" -INCLUDE "data/mapObjects/viridianhouse.asm" +INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm" +INCLUDE "scripts/ViridianSchoolHouse.asm" +INCLUDE "data/mapObjects/ViridianSchoolHouse.asm" + +INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm" + ds 1 +INCLUDE "scripts/ViridianNicknameHouse.asm" +INCLUDE "data/mapObjects/ViridianNicknameHouse.asm" -INCLUDE "data/mapHeaders/pewterhouse1.asm" -INCLUDE "scripts/pewterhouse1.asm" -INCLUDE "data/mapObjects/pewterhouse1.asm" +INCLUDE "data/mapHeaders/PewterNidoranHouse.asm" +INCLUDE "scripts/PewterNidoranHouse.asm" +INCLUDE "data/mapObjects/PewterNidoranHouse.asm" -INCLUDE "data/mapHeaders/pewterhouse2.asm" -INCLUDE "scripts/pewterhouse2.asm" -INCLUDE "data/mapObjects/pewterhouse2.asm" - -INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm" -INCLUDE "scripts/ceruleanhousetrashed.asm" -INCLUDE "data/mapObjects/ceruleanhousetrashed.asm" - -INCLUDE "data/mapHeaders/ceruleanhouse1.asm" -INCLUDE "scripts/ceruleanhouse1.asm" -INCLUDE "data/mapObjects/ceruleanhouse1.asm" - -INCLUDE "data/mapHeaders/bikeshop.asm" -INCLUDE "scripts/bikeshop.asm" -INCLUDE "data/mapObjects/bikeshop.asm" -BikeShopBlocks: INCBIN "maps/bikeshop.blk" - -INCLUDE "data/mapHeaders/lavenderhouse1.asm" -INCLUDE "scripts/lavenderhouse1.asm" -INCLUDE "data/mapObjects/lavenderhouse1.asm" - -INCLUDE "data/mapHeaders/lavenderhouse2.asm" -INCLUDE "scripts/lavenderhouse2.asm" -INCLUDE "data/mapObjects/lavenderhouse2.asm" - -INCLUDE "data/mapHeaders/namerater.asm" -INCLUDE "scripts/namerater.asm" -INCLUDE "data/mapObjects/namerater.asm" - -INCLUDE "data/mapHeaders/vermilionhouse1.asm" -INCLUDE "scripts/vermilionhouse1.asm" -INCLUDE "data/mapObjects/vermilionhouse1.asm" - -INCLUDE "data/mapHeaders/vermiliondock.asm" -INCLUDE "scripts/vermiliondock.asm" -INCLUDE "data/mapObjects/vermiliondock.asm" -VermilionDockBlocks: INCBIN "maps/vermiliondock.blk" - -INCLUDE "data/mapHeaders/celadonmansion5.asm" -INCLUDE "scripts/celadonmansion5.asm" -INCLUDE "data/mapObjects/celadonmansion5.asm" - -INCLUDE "data/mapHeaders/fuchsiamart.asm" -INCLUDE "scripts/fuchsiamart.asm" -INCLUDE "data/mapObjects/fuchsiamart.asm" -FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk" - -INCLUDE "data/mapHeaders/saffronhouse1.asm" -INCLUDE "scripts/saffronhouse1.asm" -INCLUDE "data/mapObjects/saffronhouse1.asm" - -INCLUDE "data/mapHeaders/saffronhouse2.asm" -INCLUDE "scripts/saffronhouse2.asm" -INCLUDE "data/mapObjects/saffronhouse2.asm" - -INCLUDE "data/mapHeaders/diglettscaveroute2.asm" -INCLUDE "scripts/diglettscaveroute2.asm" -INCLUDE "data/mapObjects/diglettscaveroute2.asm" - -INCLUDE "data/mapHeaders/route2house.asm" -INCLUDE "scripts/route2house.asm" -INCLUDE "data/mapObjects/route2house.asm" - -INCLUDE "data/mapHeaders/route5gate.asm" -INCLUDE "scripts/route5gate.asm" -INCLUDE "data/mapObjects/route5gate.asm" -Route5GateBlocks: INCBIN "maps/route5gate.blk" - -INCLUDE "data/mapHeaders/route6gate.asm" -INCLUDE "scripts/route6gate.asm" -INCLUDE "data/mapObjects/route6gate.asm" -Route6GateBlocks: INCBIN "maps/route6gate.blk" - -INCLUDE "data/mapHeaders/route7gate.asm" -INCLUDE "scripts/route7gate.asm" -INCLUDE "data/mapObjects/route7gate.asm" -Route7GateBlocks: INCBIN "maps/route7gate.blk" - -INCLUDE "data/mapHeaders/route8gate.asm" -INCLUDE "scripts/route8gate.asm" -INCLUDE "data/mapObjects/route8gate.asm" -Route8GateBlocks: INCBIN "maps/route8gate.blk" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" -INCLUDE "scripts/undergroundpathentranceroute8.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" - -INCLUDE "data/mapHeaders/powerplant.asm" -INCLUDE "scripts/powerplant.asm" -INCLUDE "data/mapObjects/powerplant.asm" -PowerPlantBlocks: INCBIN "maps/powerplant.blk" - -INCLUDE "data/mapHeaders/diglettscaveroute11.asm" -INCLUDE "scripts/diglettscaveroute11.asm" -INCLUDE "data/mapObjects/diglettscaveroute11.asm" - -INCLUDE "data/mapHeaders/route16house.asm" -INCLUDE "scripts/route16house.asm" -INCLUDE "data/mapObjects/route16house.asm" - -INCLUDE "data/mapHeaders/route22gate.asm" -INCLUDE "scripts/route22gate.asm" -INCLUDE "data/mapObjects/route22gate.asm" -Route22GateBlocks: INCBIN "maps/route22gate.blk" - -INCLUDE "data/mapHeaders/billshouse.asm" -INCLUDE "scripts/billshouse.asm" -INCLUDE "data/mapObjects/billshouse.asm" -BillsHouseBlocks: INCBIN "maps/billshouse.blk" +INCLUDE "data/mapHeaders/PewterSpeechHouse.asm" +INCLUDE "scripts/PewterSpeechHouse.asm" +INCLUDE "data/mapObjects/PewterSpeechHouse.asm" + +INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm" +INCLUDE "scripts/CeruleanTrashedHouse.asm" +INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm" + +INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm" +INCLUDE "scripts/CeruleanTradeHouse.asm" +INCLUDE "data/mapObjects/CeruleanTradeHouse.asm" + +INCLUDE "data/mapHeaders/BikeShop.asm" +INCLUDE "scripts/BikeShop.asm" +INCLUDE "data/mapObjects/BikeShop.asm" +BikeShop_Blocks: INCBIN "maps/BikeShop.blk" + +INCLUDE "data/mapHeaders/MrFujisHouse.asm" +INCLUDE "scripts/MrFujisHouse.asm" +INCLUDE "data/mapObjects/MrFujisHouse.asm" + +INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm" +INCLUDE "scripts/LavenderCuboneHouse.asm" +INCLUDE "data/mapObjects/LavenderCuboneHouse.asm" + +INCLUDE "data/mapHeaders/NameRatersHouse.asm" +INCLUDE "scripts/NameRatersHouse.asm" +INCLUDE "data/mapObjects/NameRatersHouse.asm" + +INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm" +INCLUDE "scripts/VermilionPidgeyHouse.asm" +INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm" + +INCLUDE "data/mapHeaders/VermilionDock.asm" +INCLUDE "scripts/VermilionDock.asm" +INCLUDE "data/mapObjects/VermilionDock.asm" +VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk" + +INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm" +INCLUDE "scripts/CeladonMansionRoofHouse.asm" +INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm" + +INCLUDE "data/mapHeaders/FuchsiaMart.asm" +INCLUDE "scripts/FuchsiaMart.asm" +INCLUDE "data/mapObjects/FuchsiaMart.asm" +FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk" + +INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm" +INCLUDE "scripts/SaffronPidgeyHouse.asm" +INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm" + +INCLUDE "data/mapHeaders/MrPsychicsHouse.asm" +INCLUDE "scripts/MrPsychicsHouse.asm" +INCLUDE "data/mapObjects/MrPsychicsHouse.asm" + +INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm" +INCLUDE "scripts/DiglettsCaveRoute2.asm" +INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm" + +INCLUDE "data/mapHeaders/Route2TradeHouse.asm" +INCLUDE "scripts/Route2TradeHouse.asm" +INCLUDE "data/mapObjects/Route2TradeHouse.asm" + +INCLUDE "data/mapHeaders/Route5Gate.asm" +INCLUDE "scripts/Route5Gate.asm" +INCLUDE "data/mapObjects/Route5Gate.asm" +Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk" + +INCLUDE "data/mapHeaders/Route6Gate.asm" +INCLUDE "scripts/Route6Gate.asm" +INCLUDE "data/mapObjects/Route6Gate.asm" +Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk" + +INCLUDE "data/mapHeaders/Route7Gate.asm" +INCLUDE "scripts/Route7Gate.asm" +INCLUDE "data/mapObjects/Route7Gate.asm" +Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk" + +INCLUDE "data/mapHeaders/Route8Gate.asm" +INCLUDE "scripts/Route8Gate.asm" +INCLUDE "data/mapObjects/Route8Gate.asm" +Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk" + +INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm" +INCLUDE "scripts/UndergroundPathRoute8.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute8.asm" + +INCLUDE "data/mapHeaders/PowerPlant.asm" +INCLUDE "scripts/PowerPlant.asm" +INCLUDE "data/mapObjects/PowerPlant.asm" +PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk" + +INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm" +INCLUDE "scripts/DiglettsCaveRoute11.asm" +INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm" + +INCLUDE "data/mapHeaders/Route16FlyHouse.asm" +INCLUDE "scripts/Route16FlyHouse.asm" +INCLUDE "data/mapObjects/Route16FlyHouse.asm" + +INCLUDE "data/mapHeaders/Route22Gate.asm" +INCLUDE "scripts/Route22Gate.asm" +INCLUDE "data/mapObjects/Route22Gate.asm" +Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk" + +INCLUDE "data/mapHeaders/BillsHouse.asm" +INCLUDE "scripts/BillsHouse.asm" +INCLUDE "data/mapObjects/BillsHouse.asm" +BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk" INCLUDE "engine/menu/oaks_pc.asm" @@ -581,6 +583,7 @@ TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" SECTION "Battle (BANK 9)", ROMX + INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" @@ -655,6 +658,7 @@ MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" SECTION "Battle (BANK A)", ROMX + INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" @@ -814,6 +818,7 @@ OldManPic:: INCBIN "pic/trainer/oldman.pic" SECTION "Battle (BANK C)", ROMX + INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" @@ -926,326 +931,326 @@ INCLUDE "engine/trade2.asm" SECTION "bank11", ROMX -INCLUDE "data/mapHeaders/lavendertown.asm" -INCLUDE "data/mapObjects/lavendertown.asm" -LavenderTownBlocks: INCBIN "maps/lavendertown.blk" +INCLUDE "data/mapHeaders/LavenderTown.asm" +INCLUDE "data/mapObjects/LavenderTown.asm" +LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk" -ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" +ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk" -SafariZoneRestHouse1Blocks: -SafariZoneRestHouse2Blocks: -SafariZoneRestHouse3Blocks: -SafariZoneRestHouse4Blocks: INCBIN "maps/safarizoneresthouse1.blk" +SafariZoneCenterRestHouse_Blocks: +SafariZoneWestRestHouse_Blocks: +SafariZoneEastRestHouse_Blocks: +SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk" -INCLUDE "scripts/lavendertown.asm" +INCLUDE "scripts/LavenderTown.asm" INCLUDE "engine/pokedex_rating.asm" -INCLUDE "data/mapHeaders/viridianpokecenter.asm" -INCLUDE "scripts/viridianpokecenter.asm" -INCLUDE "data/mapObjects/viridianpokecenter.asm" - -INCLUDE "data/mapHeaders/mansion1.asm" -INCLUDE "scripts/mansion1.asm" -INCLUDE "data/mapObjects/mansion1.asm" -Mansion1Blocks: INCBIN "maps/mansion1.blk" - -INCLUDE "data/mapHeaders/rocktunnel1.asm" -INCLUDE "scripts/rocktunnel1.asm" -INCLUDE "data/mapObjects/rocktunnel1.asm" -RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk" - -INCLUDE "data/mapHeaders/seafoamislands1.asm" -INCLUDE "scripts/seafoamislands1.asm" -INCLUDE "data/mapObjects/seafoamislands1.asm" -SeafoamIslands1Blocks: INCBIN "maps/seafoamislands1.blk" - -INCLUDE "data/mapHeaders/ssanne3.asm" -INCLUDE "scripts/ssanne3.asm" -INCLUDE "data/mapObjects/ssanne3.asm" -SSAnne3Blocks: INCBIN "maps/ssanne3.blk" - -INCLUDE "data/mapHeaders/victoryroad3.asm" -INCLUDE "scripts/victoryroad3.asm" -INCLUDE "data/mapObjects/victoryroad3.asm" -VictoryRoad3Blocks: INCBIN "maps/victoryroad3.blk" - -INCLUDE "data/mapHeaders/rockethideout1.asm" -INCLUDE "scripts/rockethideout1.asm" -INCLUDE "data/mapObjects/rockethideout1.asm" -RocketHideout1Blocks: INCBIN "maps/rockethideout1.blk" - -INCLUDE "data/mapHeaders/rockethideout2.asm" -INCLUDE "scripts/rockethideout2.asm" -INCLUDE "data/mapObjects/rockethideout2.asm" -RocketHideout2Blocks: INCBIN "maps/rockethideout2.blk" - -INCLUDE "data/mapHeaders/rockethideout3.asm" -INCLUDE "scripts/rockethideout3.asm" -INCLUDE "data/mapObjects/rockethideout3.asm" -RocketHideout3Blocks: INCBIN "maps/rockethideout3.blk" - -INCLUDE "data/mapHeaders/rockethideout4.asm" -INCLUDE "scripts/rockethideout4.asm" -INCLUDE "data/mapObjects/rockethideout4.asm" -RocketHideout4Blocks: INCBIN "maps/rockethideout4.blk" - -INCLUDE "data/mapHeaders/rockethideoutelevator.asm" -INCLUDE "scripts/rockethideoutelevator.asm" -INCLUDE "data/mapObjects/rockethideoutelevator.asm" -RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk" - -INCLUDE "data/mapHeaders/silphcoelevator.asm" -INCLUDE "scripts/silphcoelevator.asm" -INCLUDE "data/mapObjects/silphcoelevator.asm" -SilphCoElevatorBlocks: INCBIN "maps/silphcoelevator.blk" - -INCLUDE "data/mapHeaders/safarizoneeast.asm" -INCLUDE "scripts/safarizoneeast.asm" -INCLUDE "data/mapObjects/safarizoneeast.asm" -SafariZoneEastBlocks: INCBIN "maps/safarizoneeast.blk" - -INCLUDE "data/mapHeaders/safarizonenorth.asm" -INCLUDE "scripts/safarizonenorth.asm" -INCLUDE "data/mapObjects/safarizonenorth.asm" -SafariZoneNorthBlocks: INCBIN "maps/safarizonenorth.blk" - -INCLUDE "data/mapHeaders/safarizonecenter.asm" -INCLUDE "scripts/safarizonecenter.asm" -INCLUDE "data/mapObjects/safarizonecenter.asm" -SafariZoneCenterBlocks: INCBIN "maps/safarizonecenter.blk" - -INCLUDE "data/mapHeaders/safarizoneresthouse1.asm" -INCLUDE "scripts/safarizoneresthouse1.asm" -INCLUDE "data/mapObjects/safarizoneresthouse1.asm" - -INCLUDE "data/mapHeaders/safarizoneresthouse2.asm" -INCLUDE "scripts/safarizoneresthouse2.asm" -INCLUDE "data/mapObjects/safarizoneresthouse2.asm" - -INCLUDE "data/mapHeaders/safarizoneresthouse3.asm" -INCLUDE "scripts/safarizoneresthouse3.asm" -INCLUDE "data/mapObjects/safarizoneresthouse3.asm" - -INCLUDE "data/mapHeaders/safarizoneresthouse4.asm" -INCLUDE "scripts/safarizoneresthouse4.asm" -INCLUDE "data/mapObjects/safarizoneresthouse4.asm" - -INCLUDE "data/mapHeaders/unknowndungeon2.asm" -INCLUDE "scripts/unknowndungeon2.asm" -INCLUDE "data/mapObjects/unknowndungeon2.asm" -UnknownDungeon2Blocks: INCBIN "maps/unknowndungeon2.blk" - -INCLUDE "data/mapHeaders/unknowndungeon3.asm" -INCLUDE "scripts/unknowndungeon3.asm" -INCLUDE "data/mapObjects/unknowndungeon3.asm" -UnknownDungeon3Blocks: INCBIN "maps/unknowndungeon3.blk" - -INCLUDE "data/mapHeaders/rocktunnel2.asm" -INCLUDE "scripts/rocktunnel2.asm" -INCLUDE "data/mapObjects/rocktunnel2.asm" -RockTunnel2Blocks: INCBIN "maps/rocktunnel2.blk" - -INCLUDE "data/mapHeaders/seafoamislands2.asm" -INCLUDE "scripts/seafoamislands2.asm" -INCLUDE "data/mapObjects/seafoamislands2.asm" -SeafoamIslands2Blocks: INCBIN "maps/seafoamislands2.blk" - -INCLUDE "data/mapHeaders/seafoamislands3.asm" -INCLUDE "scripts/seafoamislands3.asm" -INCLUDE "data/mapObjects/seafoamislands3.asm" -SeafoamIslands3Blocks: INCBIN "maps/seafoamislands3.blk" - -INCLUDE "data/mapHeaders/seafoamislands4.asm" -INCLUDE "scripts/seafoamislands4.asm" -INCLUDE "data/mapObjects/seafoamislands4.asm" -SeafoamIslands4Blocks: INCBIN "maps/seafoamislands4.blk" - -INCLUDE "data/mapHeaders/seafoamislands5.asm" -INCLUDE "scripts/seafoamislands5.asm" -INCLUDE "data/mapObjects/seafoamislands5.asm" -SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" +INCLUDE "data/mapHeaders/ViridianPokecenter.asm" +INCLUDE "scripts/ViridianPokecenter.asm" +INCLUDE "data/mapObjects/ViridianPokecenter.asm" + +INCLUDE "data/mapHeaders/PokemonMansion1F.asm" +INCLUDE "scripts/PokemonMansion1F.asm" +INCLUDE "data/mapObjects/PokemonMansion1F.asm" +PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk" + +INCLUDE "data/mapHeaders/RockTunnel1F.asm" +INCLUDE "scripts/RockTunnel1F.asm" +INCLUDE "data/mapObjects/RockTunnel1F.asm" +RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslands1F.asm" +INCLUDE "scripts/SeafoamIslands1F.asm" +INCLUDE "data/mapObjects/SeafoamIslands1F.asm" +SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk" + +INCLUDE "data/mapHeaders/SSAnne3F.asm" +INCLUDE "scripts/SSAnne3F.asm" +INCLUDE "data/mapObjects/SSAnne3F.asm" +SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk" + +INCLUDE "data/mapHeaders/VictoryRoad3F.asm" +INCLUDE "scripts/VictoryRoad3F.asm" +INCLUDE "data/mapObjects/VictoryRoad3F.asm" +VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB1F.asm" +INCLUDE "scripts/RocketHideoutB1F.asm" +INCLUDE "data/mapObjects/RocketHideoutB1F.asm" +RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB2F.asm" +INCLUDE "scripts/RocketHideoutB2F.asm" +INCLUDE "data/mapObjects/RocketHideoutB2F.asm" +RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB3F.asm" +INCLUDE "scripts/RocketHideoutB3F.asm" +INCLUDE "data/mapObjects/RocketHideoutB3F.asm" +RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutB4F.asm" +INCLUDE "scripts/RocketHideoutB4F.asm" +INCLUDE "data/mapObjects/RocketHideoutB4F.asm" +RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk" + +INCLUDE "data/mapHeaders/RocketHideoutElevator.asm" +INCLUDE "scripts/RocketHideoutElevator.asm" +INCLUDE "data/mapObjects/RocketHideoutElevator.asm" +RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" + +INCLUDE "data/mapHeaders/SilphCoElevator.asm" +INCLUDE "scripts/SilphCoElevator.asm" +INCLUDE "data/mapObjects/SilphCoElevator.asm" +SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" + +INCLUDE "data/mapHeaders/SafariZoneEast.asm" +INCLUDE "scripts/SafariZoneEast.asm" +INCLUDE "data/mapObjects/SafariZoneEast.asm" +SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk" + +INCLUDE "data/mapHeaders/SafariZoneNorth.asm" +INCLUDE "scripts/SafariZoneNorth.asm" +INCLUDE "data/mapObjects/SafariZoneNorth.asm" +SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk" + +INCLUDE "data/mapHeaders/SafariZoneCenter.asm" +INCLUDE "scripts/SafariZoneCenter.asm" +INCLUDE "data/mapObjects/SafariZoneCenter.asm" +SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk" + +INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm" +INCLUDE "scripts/SafariZoneCenterRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm" + +INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm" +INCLUDE "scripts/SafariZoneWestRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm" + +INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm" +INCLUDE "scripts/SafariZoneEastRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm" + +INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm" +INCLUDE "scripts/SafariZoneNorthRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm" + +INCLUDE "data/mapHeaders/CeruleanCave2F.asm" +INCLUDE "scripts/CeruleanCave2F.asm" +INCLUDE "data/mapObjects/CeruleanCave2F.asm" +CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk" + +INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm" +INCLUDE "scripts/CeruleanCaveB1F.asm" +INCLUDE "data/mapObjects/CeruleanCaveB1F.asm" +CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk" + +INCLUDE "data/mapHeaders/RockTunnelB1F.asm" +INCLUDE "scripts/RockTunnelB1F.asm" +INCLUDE "data/mapObjects/RockTunnelB1F.asm" +RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm" +INCLUDE "scripts/SeafoamIslandsB1F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm" +SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm" +INCLUDE "scripts/SeafoamIslandsB2F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm" +SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm" +INCLUDE "scripts/SeafoamIslandsB3F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm" +SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk" + +INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm" +INCLUDE "scripts/SeafoamIslandsB4F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm" +SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk" INCLUDE "engine/overworld/hidden_objects.asm" SECTION "bank12", ROMX -INCLUDE "data/mapHeaders/route7.asm" -INCLUDE "data/mapObjects/route7.asm" -Route7Blocks: INCBIN "maps/route7.blk" +INCLUDE "data/mapHeaders/Route7.asm" +INCLUDE "data/mapObjects/Route7.asm" +Route7_Blocks: INCBIN "maps/Route7.blk" -CeladonPokecenterBlocks: -RockTunnelPokecenterBlocks: -MtMoonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" +CeladonPokecenter_Blocks: +RockTunnelPokecenter_Blocks: +MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk" -Route18GateBlocks: -Route15GateBlocks: -Route11GateBlocks: INCBIN "maps/route11gate.blk" +Route18Gate1F_Blocks: +Route15Gate1F_Blocks: +Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk" -Route18GateUpstairsBlocks: -Route16GateUpstairsBlocks: -Route12GateUpstairsBlocks: -Route15GateUpstairsBlocks: -Route11GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk" +Route18Gate2F_Blocks: +Route16Gate2F_Blocks: +Route15Gate2F_Blocks: +Route12Gate2F_Blocks: +Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk" INCLUDE "engine/predefs12.asm" -INCLUDE "scripts/route7.asm" - -INCLUDE "data/mapHeaders/redshouse1f.asm" -INCLUDE "scripts/redshouse1f.asm" -INCLUDE "data/mapObjects/redshouse1f.asm" -RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk" - -INCLUDE "data/mapHeaders/celadonmart3.asm" -INCLUDE "scripts/celadonmart3.asm" -INCLUDE "data/mapObjects/celadonmart3.asm" -CeladonMart3Blocks: INCBIN "maps/celadonmart3.blk" - -INCLUDE "data/mapHeaders/celadonmart4.asm" -INCLUDE "scripts/celadonmart4.asm" -INCLUDE "data/mapObjects/celadonmart4.asm" -CeladonMart4Blocks: INCBIN "maps/celadonmart4.blk" - -INCLUDE "data/mapHeaders/celadonmartroof.asm" -INCLUDE "scripts/celadonmartroof.asm" -INCLUDE "data/mapObjects/celadonmartroof.asm" -CeladonMartRoofBlocks: INCBIN "maps/celadonmartroof.blk" - -INCLUDE "data/mapHeaders/celadonmartelevator.asm" -INCLUDE "scripts/celadonmartelevator.asm" -INCLUDE "data/mapObjects/celadonmartelevator.asm" -CeladonMartElevatorBlocks: INCBIN "maps/celadonmartelevator.blk" - -INCLUDE "data/mapHeaders/celadonmansion1.asm" -INCLUDE "scripts/celadonmansion1.asm" -INCLUDE "data/mapObjects/celadonmansion1.asm" -CeladonMansion1Blocks: INCBIN "maps/celadonmansion1.blk" - -INCLUDE "data/mapHeaders/celadonmansion2.asm" -INCLUDE "scripts/celadonmansion2.asm" -INCLUDE "data/mapObjects/celadonmansion2.asm" -CeladonMansion2Blocks: INCBIN "maps/celadonmansion2.blk" - -INCLUDE "data/mapHeaders/celadonmansion3.asm" -INCLUDE "scripts/celadonmansion3.asm" -INCLUDE "data/mapObjects/celadonmansion3.asm" -CeladonMansion3Blocks: INCBIN "maps/celadonmansion3.blk" - -INCLUDE "data/mapHeaders/celadonmansion4.asm" -INCLUDE "scripts/celadonmansion4.asm" -INCLUDE "data/mapObjects/celadonmansion4.asm" -CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk" - -INCLUDE "data/mapHeaders/celadonpokecenter.asm" -INCLUDE "scripts/celadonpokecenter.asm" -INCLUDE "data/mapObjects/celadonpokecenter.asm" - -INCLUDE "data/mapHeaders/celadongym.asm" -INCLUDE "scripts/celadongym.asm" -INCLUDE "data/mapObjects/celadongym.asm" -CeladonGymBlocks: INCBIN "maps/celadongym.blk" - -INCLUDE "data/mapHeaders/celadongamecorner.asm" -INCLUDE "scripts/celadongamecorner.asm" -INCLUDE "data/mapObjects/celadongamecorner.asm" -CeladonGameCornerBlocks: INCBIN "maps/celadongamecorner.blk" - -INCLUDE "data/mapHeaders/celadonmart5.asm" -INCLUDE "scripts/celadonmart5.asm" -INCLUDE "data/mapObjects/celadonmart5.asm" -CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk" - -INCLUDE "data/mapHeaders/celadonprizeroom.asm" -INCLUDE "scripts/celadonprizeroom.asm" -INCLUDE "data/mapObjects/celadonprizeroom.asm" -CeladonPrizeRoomBlocks: INCBIN "maps/celadonprizeroom.blk" - -INCLUDE "data/mapHeaders/celadondiner.asm" -INCLUDE "scripts/celadondiner.asm" -INCLUDE "data/mapObjects/celadondiner.asm" -CeladonDinerBlocks: INCBIN "maps/celadondiner.blk" - -INCLUDE "data/mapHeaders/celadonhouse.asm" -INCLUDE "scripts/celadonhouse.asm" -INCLUDE "data/mapObjects/celadonhouse.asm" -CeladonHouseBlocks: INCBIN "maps/celadonhouse.blk" - -INCLUDE "data/mapHeaders/celadonhotel.asm" -INCLUDE "scripts/celadonhotel.asm" -INCLUDE "data/mapObjects/celadonhotel.asm" -CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk" - -INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" -INCLUDE "scripts/mtmoonpokecenter.asm" -INCLUDE "data/mapObjects/mtmoonpokecenter.asm" - -INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm" -INCLUDE "scripts/rocktunnelpokecenter.asm" -INCLUDE "data/mapObjects/rocktunnelpokecenter.asm" - -INCLUDE "data/mapHeaders/route11gate.asm" -INCLUDE "scripts/route11gate.asm" -INCLUDE "data/mapObjects/route11gate.asm" - -INCLUDE "data/mapHeaders/route11gateupstairs.asm" -INCLUDE "scripts/route11gateupstairs.asm" -INCLUDE "data/mapObjects/route11gateupstairs.asm" - -INCLUDE "data/mapHeaders/route12gate.asm" -INCLUDE "scripts/route12gate.asm" -INCLUDE "data/mapObjects/route12gate.asm" -Route12GateBlocks: INCBIN "maps/route12gate.blk" - -INCLUDE "data/mapHeaders/route12gateupstairs.asm" -INCLUDE "scripts/route12gateupstairs.asm" -INCLUDE "data/mapObjects/route12gateupstairs.asm" - -INCLUDE "data/mapHeaders/route15gate.asm" -INCLUDE "scripts/route15gate.asm" -INCLUDE "data/mapObjects/route15gate.asm" - -INCLUDE "data/mapHeaders/route15gateupstairs.asm" -INCLUDE "scripts/route15gateupstairs.asm" -INCLUDE "data/mapObjects/route15gateupstairs.asm" - -INCLUDE "data/mapHeaders/route16gate.asm" -INCLUDE "scripts/route16gate.asm" -INCLUDE "data/mapObjects/route16gate.asm" -Route16GateBlocks: INCBIN "maps/route16gate.blk" - -INCLUDE "data/mapHeaders/route16gateupstairs.asm" -INCLUDE "scripts/route16gateupstairs.asm" -INCLUDE "data/mapObjects/route16gateupstairs.asm" - -INCLUDE "data/mapHeaders/route18gate.asm" -INCLUDE "scripts/route18gate.asm" -INCLUDE "data/mapObjects/route18gate.asm" - -INCLUDE "data/mapHeaders/route18gateupstairs.asm" -INCLUDE "scripts/route18gateupstairs.asm" -INCLUDE "data/mapObjects/route18gateupstairs.asm" - -INCLUDE "data/mapHeaders/mtmoon1.asm" -INCLUDE "scripts/mtmoon1.asm" -INCLUDE "data/mapObjects/mtmoon1.asm" -MtMoon1Blocks: INCBIN "maps/mtmoon1.blk" - -INCLUDE "data/mapHeaders/mtmoon3.asm" -INCLUDE "scripts/mtmoon3.asm" -INCLUDE "data/mapObjects/mtmoon3.asm" -MtMoon3Blocks: INCBIN "maps/mtmoon3.blk" - -INCLUDE "data/mapHeaders/safarizonewest.asm" -INCLUDE "scripts/safarizonewest.asm" -INCLUDE "data/mapObjects/safarizonewest.asm" -SafariZoneWestBlocks: INCBIN "maps/safarizonewest.blk" - -INCLUDE "data/mapHeaders/safarizonesecrethouse.asm" -INCLUDE "scripts/safarizonesecrethouse.asm" -INCLUDE "data/mapObjects/safarizonesecrethouse.asm" -SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" +INCLUDE "scripts/Route7.asm" + +INCLUDE "data/mapHeaders/RedsHouse1F.asm" +INCLUDE "scripts/RedsHouse1F.asm" +INCLUDE "data/mapObjects/RedsHouse1F.asm" +RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk" + +INCLUDE "data/mapHeaders/CeladonMart3F.asm" +INCLUDE "scripts/CeladonMart3F.asm" +INCLUDE "data/mapObjects/CeladonMart3F.asm" +CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk" + +INCLUDE "data/mapHeaders/CeladonMart4F.asm" +INCLUDE "scripts/CeladonMart4F.asm" +INCLUDE "data/mapObjects/CeladonMart4F.asm" +CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk" + +INCLUDE "data/mapHeaders/CeladonMartRoof.asm" +INCLUDE "scripts/CeladonMartRoof.asm" +INCLUDE "data/mapObjects/CeladonMartRoof.asm" +CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk" + +INCLUDE "data/mapHeaders/CeladonMartElevator.asm" +INCLUDE "scripts/CeladonMartElevator.asm" +INCLUDE "data/mapObjects/CeladonMartElevator.asm" +CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk" + +INCLUDE "data/mapHeaders/CeladonMansion1F.asm" +INCLUDE "scripts/CeladonMansion1F.asm" +INCLUDE "data/mapObjects/CeladonMansion1F.asm" +CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk" + +INCLUDE "data/mapHeaders/CeladonMansion2F.asm" +INCLUDE "scripts/CeladonMansion2F.asm" +INCLUDE "data/mapObjects/CeladonMansion2F.asm" +CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk" + +INCLUDE "data/mapHeaders/CeladonMansion3F.asm" +INCLUDE "scripts/CeladonMansion3F.asm" +INCLUDE "data/mapObjects/CeladonMansion3F.asm" +CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk" + +INCLUDE "data/mapHeaders/CeladonMansionRoof.asm" +INCLUDE "scripts/CeladonMansionRoof.asm" +INCLUDE "data/mapObjects/CeladonMansionRoof.asm" +CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk" + +INCLUDE "data/mapHeaders/CeladonPokecenter.asm" +INCLUDE "scripts/CeladonPokecenter.asm" +INCLUDE "data/mapObjects/CeladonPokecenter.asm" + +INCLUDE "data/mapHeaders/CeladonGym.asm" +INCLUDE "scripts/CeladonGym.asm" +INCLUDE "data/mapObjects/CeladonGym.asm" +CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" + +INCLUDE "data/mapHeaders/GameCorner.asm" +INCLUDE "scripts/GameCorner.asm" +INCLUDE "data/mapObjects/GameCorner.asm" +GameCorner_Blocks: INCBIN "maps/GameCorner.blk" + +INCLUDE "data/mapHeaders/CeladonMart5F.asm" +INCLUDE "scripts/CeladonMart5F.asm" +INCLUDE "data/mapObjects/CeladonMart5F.asm" +CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk" + +INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm" +INCLUDE "scripts/GameCornerPrizeRoom.asm" +INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm" +GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk" + +INCLUDE "data/mapHeaders/CeladonDiner.asm" +INCLUDE "scripts/CeladonDiner.asm" +INCLUDE "data/mapObjects/CeladonDiner.asm" +CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk" + +INCLUDE "data/mapHeaders/CeladonChiefHouse.asm" +INCLUDE "scripts/CeladonChiefHouse.asm" +INCLUDE "data/mapObjects/CeladonChiefHouse.asm" +CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk" + +INCLUDE "data/mapHeaders/CeladonHotel.asm" +INCLUDE "scripts/CeladonHotel.asm" +INCLUDE "data/mapObjects/CeladonHotel.asm" +CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk" + +INCLUDE "data/mapHeaders/MtMoonPokecenter.asm" +INCLUDE "scripts/MtMoonPokecenter.asm" +INCLUDE "data/mapObjects/MtMoonPokecenter.asm" + +INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm" +INCLUDE "scripts/RockTunnelPokecenter.asm" +INCLUDE "data/mapObjects/RockTunnelPokecenter.asm" + +INCLUDE "data/mapHeaders/Route11Gate1F.asm" +INCLUDE "scripts/Route11Gate1F.asm" +INCLUDE "data/mapObjects/Route11Gate1F.asm" + +INCLUDE "data/mapHeaders/Route11Gate2F.asm" +INCLUDE "scripts/Route11Gate2F.asm" +INCLUDE "data/mapObjects/Route11Gate2F.asm" + +INCLUDE "data/mapHeaders/Route12Gate1F.asm" +INCLUDE "scripts/Route12Gate1F.asm" +INCLUDE "data/mapObjects/Route12Gate1F.asm" +Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk" + +INCLUDE "data/mapHeaders/Route12Gate2F.asm" +INCLUDE "scripts/Route12Gate2F.asm" +INCLUDE "data/mapObjects/Route12Gate2F.asm" + +INCLUDE "data/mapHeaders/Route15Gate1F.asm" +INCLUDE "scripts/Route15Gate1F.asm" +INCLUDE "data/mapObjects/Route15Gate1F.asm" + +INCLUDE "data/mapHeaders/Route15Gate2F.asm" +INCLUDE "scripts/Route15Gate2F.asm" +INCLUDE "data/mapObjects/Route15Gate2F.asm" + +INCLUDE "data/mapHeaders/Route16Gate1F.asm" +INCLUDE "scripts/Route16Gate1F.asm" +INCLUDE "data/mapObjects/Route16Gate1F.asm" +Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk" + +INCLUDE "data/mapHeaders/Route16Gate2F.asm" +INCLUDE "scripts/Route16Gate2F.asm" +INCLUDE "data/mapObjects/Route16Gate2F.asm" + +INCLUDE "data/mapHeaders/Route18Gate1F.asm" +INCLUDE "scripts/Route18Gate1F.asm" +INCLUDE "data/mapObjects/Route18Gate1F.asm" + +INCLUDE "data/mapHeaders/Route18Gate2F.asm" +INCLUDE "scripts/Route18Gate2F.asm" +INCLUDE "data/mapObjects/Route18Gate2F.asm" + +INCLUDE "data/mapHeaders/MtMoon1F.asm" +INCLUDE "scripts/MtMoon1F.asm" +INCLUDE "data/mapObjects/MtMoon1F.asm" +MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk" + +INCLUDE "data/mapHeaders/MtMoonB2F.asm" +INCLUDE "scripts/MtMoonB2F.asm" +INCLUDE "data/mapObjects/MtMoonB2F.asm" +MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk" + +INCLUDE "data/mapHeaders/SafariZoneWest.asm" +INCLUDE "scripts/SafariZoneWest.asm" +INCLUDE "data/mapObjects/SafariZoneWest.asm" +SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk" + +INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm" +INCLUDE "scripts/SafariZoneSecretHouse.asm" +INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm" +SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk" SECTION "bank13", ROMX @@ -1298,15 +1303,15 @@ ChannelerPic:: INCBIN "pic/trainer/channeler.pic" AgathaPic:: INCBIN "pic/trainer/agatha.pic" LancePic:: INCBIN "pic/trainer/lance.pic" -INCLUDE "data/mapHeaders/tradecenter.asm" -INCLUDE "scripts/tradecenter.asm" -INCLUDE "data/mapObjects/tradecenter.asm" -TradeCenterBlocks: INCBIN "maps/tradecenter.blk" +INCLUDE "data/mapHeaders/TradeCenter.asm" +INCLUDE "scripts/TradeCenter.asm" +INCLUDE "data/mapObjects/TradeCenter.asm" +TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk" -INCLUDE "data/mapHeaders/colosseum.asm" -INCLUDE "scripts/colosseum.asm" -INCLUDE "data/mapObjects/colosseum.asm" -ColosseumBlocks: INCBIN "maps/colosseum.blk" +INCLUDE "data/mapHeaders/Colosseum.asm" +INCLUDE "scripts/Colosseum.asm" +INCLUDE "data/mapObjects/Colosseum.asm" +Colosseum_Blocks: INCBIN "maps/Colosseum.blk" INCLUDE "engine/give_pokemon.asm" @@ -1315,71 +1320,71 @@ INCLUDE "engine/predefs.asm" SECTION "bank14", ROMX -INCLUDE "data/mapHeaders/route22.asm" -INCLUDE "data/mapObjects/route22.asm" -Route22Blocks: INCBIN "maps/route22.blk" - -INCLUDE "data/mapHeaders/route20.asm" -INCLUDE "data/mapObjects/route20.asm" -Route20Blocks: INCBIN "maps/route20.blk" - -INCLUDE "data/mapHeaders/route23.asm" -INCLUDE "data/mapObjects/route23.asm" -Route23Blocks: INCBIN "maps/route23.blk" - -INCLUDE "data/mapHeaders/route24.asm" -INCLUDE "data/mapObjects/route24.asm" -Route24Blocks: INCBIN "maps/route24.blk" - -INCLUDE "data/mapHeaders/route25.asm" -INCLUDE "data/mapObjects/route25.asm" -Route25Blocks: INCBIN "maps/route25.blk" - -INCLUDE "data/mapHeaders/indigoplateau.asm" -INCLUDE "scripts/indigoplateau.asm" -INCLUDE "data/mapObjects/indigoplateau.asm" -IndigoPlateauBlocks: INCBIN "maps/indigoplateau.blk" - -INCLUDE "data/mapHeaders/saffroncity.asm" -INCLUDE "data/mapObjects/saffroncity.asm" -SaffronCityBlocks: INCBIN "maps/saffroncity.blk" -INCLUDE "scripts/saffroncity.asm" - -INCLUDE "scripts/route20.asm" -INCLUDE "scripts/route22.asm" -INCLUDE "scripts/route23.asm" -INCLUDE "scripts/route24.asm" -INCLUDE "scripts/route25.asm" - -INCLUDE "data/mapHeaders/victoryroad2.asm" -INCLUDE "scripts/victoryroad2.asm" -INCLUDE "data/mapObjects/victoryroad2.asm" -VictoryRoad2Blocks: INCBIN "maps/victoryroad2.blk" - -INCLUDE "data/mapHeaders/mtmoon2.asm" -INCLUDE "scripts/mtmoon2.asm" -INCLUDE "data/mapObjects/mtmoon2.asm" -MtMoon2Blocks: INCBIN "maps/mtmoon2.blk" - -INCLUDE "data/mapHeaders/silphco7.asm" -INCLUDE "scripts/silphco7.asm" -INCLUDE "data/mapObjects/silphco7.asm" -SilphCo7Blocks: INCBIN "maps/silphco7.blk" - -INCLUDE "data/mapHeaders/mansion2.asm" -INCLUDE "scripts/mansion2.asm" -INCLUDE "data/mapObjects/mansion2.asm" -Mansion2Blocks: INCBIN "maps/mansion2.blk" - -INCLUDE "data/mapHeaders/mansion3.asm" -INCLUDE "scripts/mansion3.asm" -INCLUDE "data/mapObjects/mansion3.asm" -Mansion3Blocks: INCBIN "maps/mansion3.blk" - -INCLUDE "data/mapHeaders/mansion4.asm" -INCLUDE "scripts/mansion4.asm" -INCLUDE "data/mapObjects/mansion4.asm" -Mansion4Blocks: INCBIN "maps/mansion4.blk" +INCLUDE "data/mapHeaders/Route22.asm" +INCLUDE "data/mapObjects/Route22.asm" +Route22_Blocks: INCBIN "maps/Route22.blk" + +INCLUDE "data/mapHeaders/Route20.asm" +INCLUDE "data/mapObjects/Route20.asm" +Route20_Blocks: INCBIN "maps/Route20.blk" + +INCLUDE "data/mapHeaders/Route23.asm" +INCLUDE "data/mapObjects/Route23.asm" +Route23_Blocks: INCBIN "maps/Route23.blk" + +INCLUDE "data/mapHeaders/Route24.asm" +INCLUDE "data/mapObjects/Route24.asm" +Route24_Blocks: INCBIN "maps/Route24.blk" + +INCLUDE "data/mapHeaders/Route25.asm" +INCLUDE "data/mapObjects/Route25.asm" +Route25_Blocks: INCBIN "maps/Route25.blk" + +INCLUDE "data/mapHeaders/IndigoPlateau.asm" +INCLUDE "scripts/IndigoPlateau.asm" +INCLUDE "data/mapObjects/IndigoPlateau.asm" +IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk" + +INCLUDE "data/mapHeaders/SaffronCity.asm" +INCLUDE "data/mapObjects/SaffronCity.asm" +SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk" +INCLUDE "scripts/SaffronCity.asm" + +INCLUDE "scripts/Route20.asm" +INCLUDE "scripts/Route22.asm" +INCLUDE "scripts/Route23.asm" +INCLUDE "scripts/Route24.asm" +INCLUDE "scripts/Route25.asm" + +INCLUDE "data/mapHeaders/VictoryRoad2F.asm" +INCLUDE "scripts/VictoryRoad2F.asm" +INCLUDE "data/mapObjects/VictoryRoad2F.asm" +VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk" + +INCLUDE "data/mapHeaders/MtMoonB1F.asm" +INCLUDE "scripts/MtMoonB1F.asm" +INCLUDE "data/mapObjects/MtMoonB1F.asm" +MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk" + +INCLUDE "data/mapHeaders/SilphCo7F.asm" +INCLUDE "scripts/SilphCo7F.asm" +INCLUDE "data/mapObjects/SilphCo7F.asm" +SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk" + +INCLUDE "data/mapHeaders/PokemonMansion2F.asm" +INCLUDE "scripts/PokemonMansion2F.asm" +INCLUDE "data/mapObjects/PokemonMansion2F.asm" +PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk" + +INCLUDE "data/mapHeaders/PokemonMansion3F.asm" +INCLUDE "scripts/PokemonMansion3F.asm" +INCLUDE "data/mapObjects/PokemonMansion3F.asm" +PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk" + +INCLUDE "data/mapHeaders/PokemonMansionB1F.asm" +INCLUDE "scripts/PokemonMansionB1F.asm" +INCLUDE "data/mapObjects/PokemonMansionB1F.asm" +PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk" INCLUDE "engine/battle/init_battle_variables.asm" INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" @@ -1393,90 +1398,90 @@ INCLUDE "engine/hidden_object_functions14.asm" SECTION "bank15", ROMX -INCLUDE "data/mapHeaders/route2.asm" -INCLUDE "data/mapObjects/route2.asm" -Route2Blocks: INCBIN "maps/route2.blk" +INCLUDE "data/mapHeaders/Route2.asm" +INCLUDE "data/mapObjects/Route2.asm" +Route2_Blocks: INCBIN "maps/Route2.blk" -INCLUDE "data/mapHeaders/route3.asm" -INCLUDE "data/mapObjects/route3.asm" -Route3Blocks: INCBIN "maps/route3.blk" +INCLUDE "data/mapHeaders/Route3.asm" +INCLUDE "data/mapObjects/Route3.asm" +Route3_Blocks: INCBIN "maps/Route3.blk" -INCLUDE "data/mapHeaders/route4.asm" -INCLUDE "data/mapObjects/route4.asm" -Route4Blocks: INCBIN "maps/route4.blk" +INCLUDE "data/mapHeaders/Route4.asm" +INCLUDE "data/mapObjects/Route4.asm" +Route4_Blocks: INCBIN "maps/Route4.blk" -INCLUDE "data/mapHeaders/route5.asm" -INCLUDE "data/mapObjects/route5.asm" -Route5Blocks: INCBIN "maps/route5.blk" +INCLUDE "data/mapHeaders/Route5.asm" +INCLUDE "data/mapObjects/Route5.asm" +Route5_Blocks: INCBIN "maps/Route5.blk" -INCLUDE "data/mapHeaders/route9.asm" -INCLUDE "data/mapObjects/route9.asm" -Route9Blocks: INCBIN "maps/route9.blk" +INCLUDE "data/mapHeaders/Route9.asm" +INCLUDE "data/mapObjects/Route9.asm" +Route9_Blocks: INCBIN "maps/Route9.blk" -INCLUDE "data/mapHeaders/route13.asm" -INCLUDE "data/mapObjects/route13.asm" -Route13Blocks: INCBIN "maps/route13.blk" +INCLUDE "data/mapHeaders/Route13.asm" +INCLUDE "data/mapObjects/Route13.asm" +Route13_Blocks: INCBIN "maps/Route13.blk" -INCLUDE "data/mapHeaders/route14.asm" -INCLUDE "data/mapObjects/route14.asm" -Route14Blocks: INCBIN "maps/route14.blk" +INCLUDE "data/mapHeaders/Route14.asm" +INCLUDE "data/mapObjects/Route14.asm" +Route14_Blocks: INCBIN "maps/Route14.blk" -INCLUDE "data/mapHeaders/route17.asm" -INCLUDE "data/mapObjects/route17.asm" -Route17Blocks: INCBIN "maps/route17.blk" +INCLUDE "data/mapHeaders/Route17.asm" +INCLUDE "data/mapObjects/Route17.asm" +Route17_Blocks: INCBIN "maps/Route17.blk" -INCLUDE "data/mapHeaders/route19.asm" -INCLUDE "data/mapObjects/route19.asm" -Route19Blocks: INCBIN "maps/route19.blk" +INCLUDE "data/mapHeaders/Route19.asm" +INCLUDE "data/mapObjects/Route19.asm" +Route19_Blocks: INCBIN "maps/Route19.blk" -INCLUDE "data/mapHeaders/route21.asm" -INCLUDE "data/mapObjects/route21.asm" -Route21Blocks: INCBIN "maps/route21.blk" +INCLUDE "data/mapHeaders/Route21.asm" +INCLUDE "data/mapObjects/Route21.asm" +Route21_Blocks: INCBIN "maps/Route21.blk" -VermilionHouse2Blocks: -Route12HouseBlocks: -DayCareMBlocks: INCBIN "maps/daycarem.blk" +VermilionOldRodHouse_Blocks: +Route12SuperRodHouse_Blocks: +Daycare_Blocks: INCBIN "maps/Daycare.blk" -FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk" +FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" INCLUDE "engine/battle/experience.asm" -INCLUDE "scripts/route2.asm" -INCLUDE "scripts/route3.asm" -INCLUDE "scripts/route4.asm" -INCLUDE "scripts/route5.asm" -INCLUDE "scripts/route9.asm" -INCLUDE "scripts/route13.asm" -INCLUDE "scripts/route14.asm" -INCLUDE "scripts/route17.asm" -INCLUDE "scripts/route19.asm" -INCLUDE "scripts/route21.asm" - -INCLUDE "data/mapHeaders/vermilionhouse2.asm" -INCLUDE "scripts/vermilionhouse2.asm" -INCLUDE "data/mapObjects/vermilionhouse2.asm" - -INCLUDE "data/mapHeaders/celadonmart2.asm" -INCLUDE "scripts/celadonmart2.asm" -INCLUDE "data/mapObjects/celadonmart2.asm" -CeladonMart2Blocks: INCBIN "maps/celadonmart2.blk" - -INCLUDE "data/mapHeaders/fuchsiahouse3.asm" -INCLUDE "scripts/fuchsiahouse3.asm" -INCLUDE "data/mapObjects/fuchsiahouse3.asm" - -INCLUDE "data/mapHeaders/daycarem.asm" -INCLUDE "scripts/daycarem.asm" -INCLUDE "data/mapObjects/daycarem.asm" - -INCLUDE "data/mapHeaders/route12house.asm" -INCLUDE "scripts/route12house.asm" -INCLUDE "data/mapObjects/route12house.asm" - -INCLUDE "data/mapHeaders/silphco8.asm" -INCLUDE "scripts/silphco8.asm" -INCLUDE "data/mapObjects/silphco8.asm" -SilphCo8Blocks: INCBIN "maps/silphco8.blk" +INCLUDE "scripts/Route2.asm" +INCLUDE "scripts/Route3.asm" +INCLUDE "scripts/Route4.asm" +INCLUDE "scripts/Route5.asm" +INCLUDE "scripts/Route9.asm" +INCLUDE "scripts/Route13.asm" +INCLUDE "scripts/Route14.asm" +INCLUDE "scripts/Route17.asm" +INCLUDE "scripts/Route19.asm" +INCLUDE "scripts/Route21.asm" + +INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm" +INCLUDE "scripts/VermilionOldRodHouse.asm" +INCLUDE "data/mapObjects/VermilionOldRodHouse.asm" + +INCLUDE "data/mapHeaders/CeladonMart2F.asm" +INCLUDE "scripts/CeladonMart2F.asm" +INCLUDE "data/mapObjects/CeladonMart2F.asm" +CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk" + +INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm" +INCLUDE "scripts/FuchsiaGoodRodHouse.asm" +INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm" + +INCLUDE "data/mapHeaders/Daycare.asm" +INCLUDE "scripts/Daycare.asm" +INCLUDE "data/mapObjects/Daycare.asm" + +INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm" +INCLUDE "scripts/Route12SuperRodHouse.asm" +INCLUDE "data/mapObjects/Route12SuperRodHouse.asm" + +INCLUDE "data/mapHeaders/SilphCo8F.asm" +INCLUDE "scripts/SilphCo8F.asm" +INCLUDE "data/mapObjects/SilphCo8F.asm" +SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" INCLUDE "engine/menu/diploma.asm" @@ -1485,39 +1490,39 @@ INCLUDE "engine/overworld/trainers.asm" SECTION "bank16", ROMX -INCLUDE "data/mapHeaders/route6.asm" -INCLUDE "data/mapObjects/route6.asm" -Route6Blocks: INCBIN "maps/route6.blk" +INCLUDE "data/mapHeaders/Route6.asm" +INCLUDE "data/mapObjects/Route6.asm" +Route6_Blocks: INCBIN "maps/Route6.blk" -INCLUDE "data/mapHeaders/route8.asm" -INCLUDE "data/mapObjects/route8.asm" -Route8Blocks: INCBIN "maps/route8.blk" +INCLUDE "data/mapHeaders/Route8.asm" +INCLUDE "data/mapObjects/Route8.asm" +Route8_Blocks: INCBIN "maps/Route8.blk" -INCLUDE "data/mapHeaders/route10.asm" -INCLUDE "data/mapObjects/route10.asm" -Route10Blocks: INCBIN "maps/route10.blk" +INCLUDE "data/mapHeaders/Route10.asm" +INCLUDE "data/mapObjects/Route10.asm" +Route10_Blocks: INCBIN "maps/Route10.blk" -INCLUDE "data/mapHeaders/route11.asm" -INCLUDE "data/mapObjects/route11.asm" -Route11Blocks: INCBIN "maps/route11.blk" +INCLUDE "data/mapHeaders/Route11.asm" +INCLUDE "data/mapObjects/Route11.asm" +Route11_Blocks: INCBIN "maps/Route11.blk" -INCLUDE "data/mapHeaders/route12.asm" -INCLUDE "data/mapObjects/route12.asm" -Route12Blocks: INCBIN "maps/route12.blk" +INCLUDE "data/mapHeaders/Route12.asm" +INCLUDE "data/mapObjects/Route12.asm" +Route12_Blocks: INCBIN "maps/Route12.blk" -INCLUDE "data/mapHeaders/route15.asm" -INCLUDE "data/mapObjects/route15.asm" -Route15Blocks: INCBIN "maps/route15.blk" +INCLUDE "data/mapHeaders/Route15.asm" +INCLUDE "data/mapObjects/Route15.asm" +Route15_Blocks: INCBIN "maps/Route15.blk" -INCLUDE "data/mapHeaders/route16.asm" -INCLUDE "data/mapObjects/route16.asm" -Route16Blocks: INCBIN "maps/route16.blk" +INCLUDE "data/mapHeaders/Route16.asm" +INCLUDE "data/mapObjects/Route16.asm" +Route16_Blocks: INCBIN "maps/Route16.blk" -INCLUDE "data/mapHeaders/route18.asm" -INCLUDE "data/mapObjects/route18.asm" -Route18Blocks: INCBIN "maps/route18.blk" +INCLUDE "data/mapHeaders/Route18.asm" +INCLUDE "data/mapObjects/Route18.asm" +Route18_Blocks: INCBIN "maps/Route18.blk" - INCBIN "maps/unusedblocks58d7d.blk" + INCBIN "maps/UnusedPokecenterCopy.blk" INCLUDE "engine/battle/common_text.asm" @@ -1525,198 +1530,198 @@ INCLUDE "engine/experience.asm" INCLUDE "engine/overworld/oaks_aide.asm" -INCLUDE "scripts/route6.asm" -INCLUDE "scripts/route8.asm" -INCLUDE "scripts/route10.asm" -INCLUDE "scripts/route11.asm" -INCLUDE "scripts/route12.asm" -INCLUDE "scripts/route15.asm" -INCLUDE "scripts/route16.asm" -INCLUDE "scripts/route18.asm" - -INCLUDE "data/mapHeaders/fanclub.asm" -INCLUDE "scripts/fanclub.asm" -INCLUDE "data/mapObjects/fanclub.asm" -FanClubBlocks: INCBIN "maps/fanclub.blk" - -INCLUDE "data/mapHeaders/silphco2.asm" -INCLUDE "scripts/silphco2.asm" -INCLUDE "data/mapObjects/silphco2.asm" -SilphCo2Blocks: INCBIN "maps/silphco2.blk" - -INCLUDE "data/mapHeaders/silphco3.asm" -INCLUDE "scripts/silphco3.asm" -INCLUDE "data/mapObjects/silphco3.asm" -SilphCo3Blocks: INCBIN "maps/silphco3.blk" - -INCLUDE "data/mapHeaders/silphco10.asm" -INCLUDE "scripts/silphco10.asm" -INCLUDE "data/mapObjects/silphco10.asm" -SilphCo10Blocks: INCBIN "maps/silphco10.blk" - -INCLUDE "data/mapHeaders/lance.asm" -INCLUDE "scripts/lance.asm" -INCLUDE "data/mapObjects/lance.asm" -LanceBlocks: INCBIN "maps/lance.blk" - -INCLUDE "data/mapHeaders/halloffameroom.asm" -INCLUDE "scripts/halloffameroom.asm" -INCLUDE "data/mapObjects/halloffameroom.asm" -HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" +INCLUDE "scripts/Route6.asm" +INCLUDE "scripts/Route8.asm" +INCLUDE "scripts/Route10.asm" +INCLUDE "scripts/Route11.asm" +INCLUDE "scripts/Route12.asm" +INCLUDE "scripts/Route15.asm" +INCLUDE "scripts/Route16.asm" +INCLUDE "scripts/Route18.asm" + +INCLUDE "data/mapHeaders/PokemonFanClub.asm" +INCLUDE "scripts/PokemonFanClub.asm" +INCLUDE "data/mapObjects/PokemonFanClub.asm" +PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk" + +INCLUDE "data/mapHeaders/SilphCo2F.asm" +INCLUDE "scripts/SilphCo2F.asm" +INCLUDE "data/mapObjects/SilphCo2F.asm" +SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk" + +INCLUDE "data/mapHeaders/SilphCo3F.asm" +INCLUDE "scripts/SilphCo3F.asm" +INCLUDE "data/mapObjects/SilphCo3F.asm" +SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" + +INCLUDE "data/mapHeaders/SilphCo10F.asm" +INCLUDE "scripts/SilphCo10F.asm" +INCLUDE "data/mapObjects/SilphCo10F.asm" +SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" + +INCLUDE "data/mapHeaders/LancesRoom.asm" +INCLUDE "scripts/LancesRoom.asm" +INCLUDE "data/mapObjects/LancesRoom.asm" +LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk" + +INCLUDE "data/mapHeaders/HallOfFame.asm" +INCLUDE "scripts/HallOfFame.asm" +INCLUDE "data/mapObjects/HallOfFame.asm" +HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk" INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17", ROMX -SaffronMartBlocks: -LavenderMartBlocks: -CeruleanMartBlocks: -VermilionMartBlocks: INCBIN "maps/vermilionmart.blk" +SaffronMart_Blocks: +LavenderMart_Blocks: +CeruleanMart_Blocks: +VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk" -CopycatsHouse2FBlocks: -RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" +CopycatsHouse2F_Blocks: +RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk" -Museum1FBlocks: INCBIN "maps/museum1f.blk" +Museum1F_Blocks: INCBIN "maps/Museum1F.blk" -Museum2FBlocks: INCBIN "maps/museum2f.blk" +Museum2F_Blocks: INCBIN "maps/Museum2F.blk" -SaffronPokecenterBlocks: -VermilionPokecenterBlocks: -LavenderPokecenterBlocks: -PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" +SaffronPokecenter_Blocks: +VermilionPokecenter_Blocks: +LavenderPokecenter_Blocks: +PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk" -UndergroundPathEntranceRoute7Blocks: -UndergroundPathEntranceRoute7CopyBlocks: -UndergroundPathEntranceRoute6Blocks: -UndergroundPathEntranceRoute5Blocks: INCBIN "maps/undergroundpathentranceroute5.blk" +UndergroundPathRoute7_Blocks: +UndergroundPathRoute7Copy_Blocks: +UndergroundPathRoute6_Blocks: +UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk" -Route2GateBlocks: -ViridianForestEntranceBlocks: -ViridianForestExitBlocks: INCBIN "maps/viridianforestexit.blk" +Route2Gate_Blocks: +ViridianForestSouthGate_Blocks: +ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk" -INCLUDE "data/mapHeaders/redshouse2f.asm" -INCLUDE "scripts/redshouse2f.asm" -INCLUDE "data/mapObjects/redshouse2f.asm" +INCLUDE "data/mapHeaders/RedsHouse2F.asm" +INCLUDE "scripts/RedsHouse2F.asm" +INCLUDE "data/mapObjects/RedsHouse2F.asm" INCLUDE "engine/predefs17.asm" -INCLUDE "data/mapHeaders/museum1f.asm" -INCLUDE "scripts/museum1f.asm" -INCLUDE "data/mapObjects/museum1f.asm" - -INCLUDE "data/mapHeaders/museum2f.asm" -INCLUDE "scripts/museum2f.asm" -INCLUDE "data/mapObjects/museum2f.asm" - -INCLUDE "data/mapHeaders/pewtergym.asm" -INCLUDE "scripts/pewtergym.asm" -INCLUDE "data/mapObjects/pewtergym.asm" -PewterGymBlocks: INCBIN "maps/pewtergym.blk" - -INCLUDE "data/mapHeaders/pewterpokecenter.asm" -INCLUDE "scripts/pewterpokecenter.asm" -INCLUDE "data/mapObjects/pewterpokecenter.asm" - -INCLUDE "data/mapHeaders/ceruleanpokecenter.asm" -INCLUDE "scripts/ceruleanpokecenter.asm" -INCLUDE "data/mapObjects/ceruleanpokecenter.asm" -CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk" - -INCLUDE "data/mapHeaders/ceruleangym.asm" -INCLUDE "scripts/ceruleangym.asm" -INCLUDE "data/mapObjects/ceruleangym.asm" -CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk" - -INCLUDE "data/mapHeaders/ceruleanmart.asm" -INCLUDE "scripts/ceruleanmart.asm" -INCLUDE "data/mapObjects/ceruleanmart.asm" - -INCLUDE "data/mapHeaders/lavenderpokecenter.asm" -INCLUDE "scripts/lavenderpokecenter.asm" -INCLUDE "data/mapObjects/lavenderpokecenter.asm" - -INCLUDE "data/mapHeaders/lavendermart.asm" -INCLUDE "scripts/lavendermart.asm" -INCLUDE "data/mapObjects/lavendermart.asm" - -INCLUDE "data/mapHeaders/vermilionpokecenter.asm" -INCLUDE "scripts/vermilionpokecenter.asm" -INCLUDE "data/mapObjects/vermilionpokecenter.asm" - -INCLUDE "data/mapHeaders/vermilionmart.asm" -INCLUDE "scripts/vermilionmart.asm" -INCLUDE "data/mapObjects/vermilionmart.asm" - -INCLUDE "data/mapHeaders/vermiliongym.asm" -INCLUDE "scripts/vermiliongym.asm" -INCLUDE "data/mapObjects/vermiliongym.asm" -VermilionGymBlocks: INCBIN "maps/vermiliongym.blk" - -INCLUDE "data/mapHeaders/copycatshouse2f.asm" -INCLUDE "scripts/copycatshouse2f.asm" -INCLUDE "data/mapObjects/copycatshouse2f.asm" - -INCLUDE "data/mapHeaders/fightingdojo.asm" -INCLUDE "scripts/fightingdojo.asm" -INCLUDE "data/mapObjects/fightingdojo.asm" -FightingDojoBlocks: INCBIN "maps/fightingdojo.blk" - -INCLUDE "data/mapHeaders/saffrongym.asm" -INCLUDE "scripts/saffrongym.asm" -INCLUDE "data/mapObjects/saffrongym.asm" -SaffronGymBlocks: INCBIN "maps/saffrongym.blk" - -INCLUDE "data/mapHeaders/saffronmart.asm" -INCLUDE "scripts/saffronmart.asm" -INCLUDE "data/mapObjects/saffronmart.asm" - -INCLUDE "data/mapHeaders/silphco1.asm" -INCLUDE "scripts/silphco1.asm" -INCLUDE "data/mapObjects/silphco1.asm" -SilphCo1Blocks: INCBIN "maps/silphco1.blk" - -INCLUDE "data/mapHeaders/saffronpokecenter.asm" -INCLUDE "scripts/saffronpokecenter.asm" -INCLUDE "data/mapObjects/saffronpokecenter.asm" - -INCLUDE "data/mapHeaders/viridianforestexit.asm" -INCLUDE "scripts/viridianforestexit.asm" -INCLUDE "data/mapObjects/viridianforestexit.asm" - -INCLUDE "data/mapHeaders/route2gate.asm" -INCLUDE "scripts/route2gate.asm" -INCLUDE "data/mapObjects/route2gate.asm" - -INCLUDE "data/mapHeaders/viridianforestentrance.asm" -INCLUDE "scripts/viridianforestentrance.asm" -INCLUDE "data/mapObjects/viridianforestentrance.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm" -INCLUDE "scripts/undergroundpathentranceroute5.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" -INCLUDE "scripts/undergroundpathentranceroute6.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm" -INCLUDE "scripts/undergroundpathentranceroute7.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" - -INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" -INCLUDE "scripts/undergroundpathentranceroute7copy.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" - -INCLUDE "data/mapHeaders/silphco9.asm" -INCLUDE "scripts/silphco9.asm" -INCLUDE "data/mapObjects/silphco9.asm" -SilphCo9Blocks: INCBIN "maps/silphco9.blk" - -INCLUDE "data/mapHeaders/victoryroad1.asm" -INCLUDE "scripts/victoryroad1.asm" -INCLUDE "data/mapObjects/victoryroad1.asm" -VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk" +INCLUDE "data/mapHeaders/Museum1F.asm" +INCLUDE "scripts/Museum1F.asm" +INCLUDE "data/mapObjects/Museum1F.asm" + +INCLUDE "data/mapHeaders/Museum2F.asm" +INCLUDE "scripts/Museum2F.asm" +INCLUDE "data/mapObjects/Museum2F.asm" + +INCLUDE "data/mapHeaders/PewterGym.asm" +INCLUDE "scripts/PewterGym.asm" +INCLUDE "data/mapObjects/PewterGym.asm" +PewterGym_Blocks: INCBIN "maps/PewterGym.blk" + +INCLUDE "data/mapHeaders/PewterPokecenter.asm" +INCLUDE "scripts/PewterPokecenter.asm" +INCLUDE "data/mapObjects/PewterPokecenter.asm" + +INCLUDE "data/mapHeaders/CeruleanPokecenter.asm" +INCLUDE "scripts/CeruleanPokecenter.asm" +INCLUDE "data/mapObjects/CeruleanPokecenter.asm" +CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk" + +INCLUDE "data/mapHeaders/CeruleanGym.asm" +INCLUDE "scripts/CeruleanGym.asm" +INCLUDE "data/mapObjects/CeruleanGym.asm" +CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk" + +INCLUDE "data/mapHeaders/CeruleanMart.asm" +INCLUDE "scripts/CeruleanMart.asm" +INCLUDE "data/mapObjects/CeruleanMart.asm" + +INCLUDE "data/mapHeaders/LavenderPokecenter.asm" +INCLUDE "scripts/LavenderPokecenter.asm" +INCLUDE "data/mapObjects/LavenderPokecenter.asm" + +INCLUDE "data/mapHeaders/LavenderMart.asm" +INCLUDE "scripts/LavenderMart.asm" +INCLUDE "data/mapObjects/LavenderMart.asm" + +INCLUDE "data/mapHeaders/VermilionPokecenter.asm" +INCLUDE "scripts/VermilionPokecenter.asm" +INCLUDE "data/mapObjects/VermilionPokecenter.asm" + +INCLUDE "data/mapHeaders/VermilionMart.asm" +INCLUDE "scripts/VermilionMart.asm" +INCLUDE "data/mapObjects/VermilionMart.asm" + +INCLUDE "data/mapHeaders/VermilionGym.asm" +INCLUDE "scripts/VermilionGym.asm" +INCLUDE "data/mapObjects/VermilionGym.asm" +VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk" + +INCLUDE "data/mapHeaders/CopycatsHouse2F.asm" +INCLUDE "scripts/CopycatsHouse2F.asm" +INCLUDE "data/mapObjects/CopycatsHouse2F.asm" + +INCLUDE "data/mapHeaders/FightingDojo.asm" +INCLUDE "scripts/FightingDojo.asm" +INCLUDE "data/mapObjects/FightingDojo.asm" +FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk" + +INCLUDE "data/mapHeaders/SaffronGym.asm" +INCLUDE "scripts/SaffronGym.asm" +INCLUDE "data/mapObjects/SaffronGym.asm" +SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk" + +INCLUDE "data/mapHeaders/SaffronMart.asm" +INCLUDE "scripts/SaffronMart.asm" +INCLUDE "data/mapObjects/SaffronMart.asm" + +INCLUDE "data/mapHeaders/SilphCo1F.asm" +INCLUDE "scripts/SilphCo1F.asm" +INCLUDE "data/mapObjects/SilphCo1F.asm" +SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk" + +INCLUDE "data/mapHeaders/SaffronPokecenter.asm" +INCLUDE "scripts/SaffronPokecenter.asm" +INCLUDE "data/mapObjects/SaffronPokecenter.asm" + +INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm" +INCLUDE "scripts/ViridianForestNorthGate.asm" +INCLUDE "data/mapObjects/ViridianForestNorthGate.asm" + +INCLUDE "data/mapHeaders/Route2Gate.asm" +INCLUDE "scripts/Route2Gate.asm" +INCLUDE "data/mapObjects/Route2Gate.asm" + +INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm" +INCLUDE "scripts/ViridianForestSouthGate.asm" +INCLUDE "data/mapObjects/ViridianForestSouthGate.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm" +INCLUDE "scripts/UndergroundPathRoute5.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute5.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm" +INCLUDE "scripts/UndergroundPathRoute6.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute6.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm" +INCLUDE "scripts/UndergroundPathRoute7.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute7.asm" + +INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm" +INCLUDE "scripts/UndergroundPathRoute7Copy.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm" + +INCLUDE "data/mapHeaders/SilphCo9F.asm" +INCLUDE "scripts/SilphCo9F.asm" +INCLUDE "data/mapObjects/SilphCo9F.asm" +SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" + +INCLUDE "data/mapHeaders/VictoryRoad1F.asm" +INCLUDE "scripts/VictoryRoad1F.asm" +INCLUDE "data/mapObjects/VictoryRoad1F.asm" +VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk" INCLUDE "engine/predefs17_2.asm" @@ -1725,123 +1730,123 @@ INCLUDE "engine/hidden_object_functions17.asm" SECTION "bank18", ROMX -ViridianForestBlocks: INCBIN "maps/viridianforest.blk" -UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" -UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk" +ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk" +UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk" +UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk" - INCBIN "maps/unusedblocks60258.blk" + INCBIN "maps/UnusedDiglettsCaveCopy.blk" -SSAnne10Blocks: -SSAnne9Blocks: INCBIN "maps/ssanne9.blk" +SSAnneB1FRooms_Blocks: +SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk" -INCLUDE "data/mapHeaders/pokemontower1.asm" -INCLUDE "scripts/pokemontower1.asm" -INCLUDE "data/mapObjects/pokemontower1.asm" -PokemonTower1Blocks: INCBIN "maps/pokemontower1.blk" +INCLUDE "data/mapHeaders/PokemonTower1F.asm" +INCLUDE "scripts/PokemonTower1F.asm" +INCLUDE "data/mapObjects/PokemonTower1F.asm" +PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk" -INCLUDE "data/mapHeaders/pokemontower2.asm" -INCLUDE "scripts/pokemontower2.asm" -INCLUDE "data/mapObjects/pokemontower2.asm" -PokemonTower2Blocks: INCBIN "maps/pokemontower2.blk" +INCLUDE "data/mapHeaders/PokemonTower2F.asm" +INCLUDE "scripts/PokemonTower2F.asm" +INCLUDE "data/mapObjects/PokemonTower2F.asm" +PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk" -INCLUDE "data/mapHeaders/pokemontower3.asm" -INCLUDE "scripts/pokemontower3.asm" -INCLUDE "data/mapObjects/pokemontower3.asm" -PokemonTower3Blocks: INCBIN "maps/pokemontower3.blk" +INCLUDE "data/mapHeaders/PokemonTower3F.asm" +INCLUDE "scripts/PokemonTower3F.asm" +INCLUDE "data/mapObjects/PokemonTower3F.asm" +PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk" -INCLUDE "data/mapHeaders/pokemontower4.asm" -INCLUDE "scripts/pokemontower4.asm" -INCLUDE "data/mapObjects/pokemontower4.asm" -PokemonTower4Blocks: INCBIN "maps/pokemontower4.blk" +INCLUDE "data/mapHeaders/PokemonTower4F.asm" +INCLUDE "scripts/PokemonTower4F.asm" +INCLUDE "data/mapObjects/PokemonTower4F.asm" +PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk" -INCLUDE "data/mapHeaders/pokemontower5.asm" -INCLUDE "scripts/pokemontower5.asm" -INCLUDE "data/mapObjects/pokemontower5.asm" -PokemonTower5Blocks: INCBIN "maps/pokemontower5.blk" +INCLUDE "data/mapHeaders/PokemonTower5F.asm" +INCLUDE "scripts/PokemonTower5F.asm" +INCLUDE "data/mapObjects/PokemonTower5F.asm" +PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk" -INCLUDE "data/mapHeaders/pokemontower6.asm" -INCLUDE "scripts/pokemontower6.asm" -INCLUDE "data/mapObjects/pokemontower6.asm" -PokemonTower6Blocks: INCBIN "maps/pokemontower6.blk" +INCLUDE "data/mapHeaders/PokemonTower6F.asm" +INCLUDE "scripts/PokemonTower6F.asm" +INCLUDE "data/mapObjects/PokemonTower6F.asm" +PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk" - INCBIN "maps/unusedblocks60cef.blk" + INCBIN "maps/UnusedEmptyMap.blk" -INCLUDE "data/mapHeaders/pokemontower7.asm" -INCLUDE "scripts/pokemontower7.asm" -INCLUDE "data/mapObjects/pokemontower7.asm" -PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" +INCLUDE "data/mapHeaders/PokemonTower7F.asm" +INCLUDE "scripts/PokemonTower7F.asm" +INCLUDE "data/mapObjects/PokemonTower7F.asm" +PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk" -INCLUDE "data/mapHeaders/celadonmart1.asm" -INCLUDE "scripts/celadonmart1.asm" -INCLUDE "data/mapObjects/celadonmart1.asm" -CeladonMart1Blocks: INCBIN "maps/celadonmart1.blk" +INCLUDE "data/mapHeaders/CeladonMart1F.asm" +INCLUDE "scripts/CeladonMart1F.asm" +INCLUDE "data/mapObjects/CeladonMart1F.asm" +CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" INCLUDE "engine/overworld/cinnabar_lab.asm" -INCLUDE "data/mapHeaders/viridianforest.asm" -INCLUDE "scripts/viridianforest.asm" -INCLUDE "data/mapObjects/viridianforest.asm" - -INCLUDE "data/mapHeaders/ssanne1.asm" -INCLUDE "scripts/ssanne1.asm" -INCLUDE "data/mapObjects/ssanne1.asm" -SSAnne1Blocks: INCBIN "maps/ssanne1.blk" - -INCLUDE "data/mapHeaders/ssanne2.asm" -INCLUDE "scripts/ssanne2.asm" -INCLUDE "data/mapObjects/ssanne2.asm" -SSAnne2Blocks: INCBIN "maps/ssanne2.blk" - -INCLUDE "data/mapHeaders/ssanne4.asm" -INCLUDE "scripts/ssanne4.asm" -INCLUDE "data/mapObjects/ssanne4.asm" -SSAnne4Blocks: INCBIN "maps/ssanne4.blk" - -INCLUDE "data/mapHeaders/ssanne5.asm" -INCLUDE "scripts/ssanne5.asm" -INCLUDE "data/mapObjects/ssanne5.asm" -SSAnne5Blocks: INCBIN "maps/ssanne5.blk" - -INCLUDE "data/mapHeaders/ssanne6.asm" -INCLUDE "scripts/ssanne6.asm" -INCLUDE "data/mapObjects/ssanne6.asm" -SSAnne6Blocks: INCBIN "maps/ssanne6.blk" - -INCLUDE "data/mapHeaders/ssanne7.asm" -INCLUDE "scripts/ssanne7.asm" -INCLUDE "data/mapObjects/ssanne7.asm" -SSAnne7Blocks: INCBIN "maps/ssanne7.blk" - -INCLUDE "data/mapHeaders/ssanne8.asm" -INCLUDE "scripts/ssanne8.asm" -INCLUDE "data/mapObjects/ssanne8.asm" -SSAnne8Blocks: INCBIN "maps/ssanne8.blk" - -INCLUDE "data/mapHeaders/ssanne9.asm" -INCLUDE "scripts/ssanne9.asm" -INCLUDE "data/mapObjects/ssanne9.asm" - -INCLUDE "data/mapHeaders/ssanne10.asm" -INCLUDE "scripts/ssanne10.asm" -INCLUDE "data/mapObjects/ssanne10.asm" - -INCLUDE "data/mapHeaders/undergroundpathns.asm" -INCLUDE "scripts/undergroundpathns.asm" -INCLUDE "data/mapObjects/undergroundpathns.asm" - -INCLUDE "data/mapHeaders/undergroundpathwe.asm" -INCLUDE "scripts/undergroundpathwe.asm" -INCLUDE "data/mapObjects/undergroundpathwe.asm" - -INCLUDE "data/mapHeaders/diglettscave.asm" -INCLUDE "scripts/diglettscave.asm" -INCLUDE "data/mapObjects/diglettscave.asm" -DiglettsCaveBlocks: INCBIN "maps/diglettscave.blk" - -INCLUDE "data/mapHeaders/silphco11.asm" -INCLUDE "scripts/silphco11.asm" -INCLUDE "data/mapObjects/silphco11.asm" -SilphCo11Blocks: INCBIN "maps/silphco11.blk" +INCLUDE "data/mapHeaders/ViridianForest.asm" +INCLUDE "scripts/ViridianForest.asm" +INCLUDE "data/mapObjects/ViridianForest.asm" + +INCLUDE "data/mapHeaders/SSAnne1F.asm" +INCLUDE "scripts/SSAnne1F.asm" +INCLUDE "data/mapObjects/SSAnne1F.asm" +SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk" + +INCLUDE "data/mapHeaders/SSAnne2F.asm" +INCLUDE "scripts/SSAnne2F.asm" +INCLUDE "data/mapObjects/SSAnne2F.asm" +SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk" + +INCLUDE "data/mapHeaders/SSAnneB1F.asm" +INCLUDE "scripts/SSAnneB1F.asm" +INCLUDE "data/mapObjects/SSAnneB1F.asm" +SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk" + +INCLUDE "data/mapHeaders/SSAnneBow.asm" +INCLUDE "scripts/SSAnneBow.asm" +INCLUDE "data/mapObjects/SSAnneBow.asm" +SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk" + +INCLUDE "data/mapHeaders/SSAnneKitchen.asm" +INCLUDE "scripts/SSAnneKitchen.asm" +INCLUDE "data/mapObjects/SSAnneKitchen.asm" +SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk" + +INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm" +INCLUDE "scripts/SSAnneCaptainsRoom.asm" +INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm" +SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk" + +INCLUDE "data/mapHeaders/SSAnne1FRooms.asm" +INCLUDE "scripts/SSAnne1FRooms.asm" +INCLUDE "data/mapObjects/SSAnne1FRooms.asm" +SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk" + +INCLUDE "data/mapHeaders/SSAnne2FRooms.asm" +INCLUDE "scripts/SSAnne2FRooms.asm" +INCLUDE "data/mapObjects/SSAnne2FRooms.asm" + +INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm" +INCLUDE "scripts/SSAnneB1FRooms.asm" +INCLUDE "data/mapObjects/SSAnneB1FRooms.asm" + +INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm" +INCLUDE "scripts/UndergroundPathNorthSouth.asm" +INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm" + +INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm" +INCLUDE "scripts/UndergroundPathWestEast.asm" +INCLUDE "data/mapObjects/UndergroundPathWestEast.asm" + +INCLUDE "data/mapHeaders/DiglettsCave.asm" +INCLUDE "scripts/DiglettsCave.asm" +INCLUDE "data/mapObjects/DiglettsCave.asm" +DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk" + +INCLUDE "data/mapHeaders/SilphCo11F.asm" +INCLUDE "scripts/SilphCo11F.asm" +INCLUDE "data/mapObjects/SilphCo11F.asm" +SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk" INCLUDE "engine/hidden_object_functions18.asm" @@ -1903,6 +1908,7 @@ Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp" Forest_Block: INCBIN "gfx/blocksets/forest.bst" Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" + ds 1 SECTION "bank1B", ROMX @@ -1940,17 +1946,17 @@ INCLUDE "engine/save.asm" SECTION "bank1D", ROMX -CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" +CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk" -CinnabarMartBlocks: -PewterMartBlocks: INCBIN "maps/pewtermart.blk" +CinnabarMart_Blocks: +PewterMart_Blocks: INCBIN "maps/PewterMart.blk" -FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" +FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk" -CinnabarPokecenterBlocks: -FuchsiaPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk" +CinnabarPokecenter_Blocks: +FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk" -CeruleanHouse2Blocks: INCBIN "maps/ceruleanhouse2.blk" +CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk" INCLUDE "engine/HoF_room_pc.asm" @@ -1958,112 +1964,112 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/items/itemfinder.asm" -INCLUDE "scripts/ceruleancity2.asm" +INCLUDE "scripts/CeruleanCity_2.asm" -INCLUDE "data/mapHeaders/viridiangym.asm" -INCLUDE "scripts/viridiangym.asm" -INCLUDE "data/mapObjects/viridiangym.asm" -ViridianGymBlocks: INCBIN "maps/viridiangym.blk" +INCLUDE "data/mapHeaders/ViridianGym.asm" +INCLUDE "scripts/ViridianGym.asm" +INCLUDE "data/mapObjects/ViridianGym.asm" +ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk" -INCLUDE "data/mapHeaders/pewtermart.asm" -INCLUDE "scripts/pewtermart.asm" -INCLUDE "data/mapObjects/pewtermart.asm" +INCLUDE "data/mapHeaders/PewterMart.asm" +INCLUDE "scripts/PewterMart.asm" +INCLUDE "data/mapObjects/PewterMart.asm" -INCLUDE "data/mapHeaders/unknowndungeon1.asm" -INCLUDE "scripts/unknowndungeon1.asm" -INCLUDE "data/mapObjects/unknowndungeon1.asm" -UnknownDungeon1Blocks: INCBIN "maps/unknowndungeon1.blk" +INCLUDE "data/mapHeaders/CeruleanCave1F.asm" +INCLUDE "scripts/CeruleanCave1F.asm" +INCLUDE "data/mapObjects/CeruleanCave1F.asm" +CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk" -INCLUDE "data/mapHeaders/ceruleanhouse2.asm" -INCLUDE "scripts/ceruleanhouse2.asm" -INCLUDE "data/mapObjects/ceruleanhouse2.asm" +INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm" +INCLUDE "scripts/CeruleanBadgeHouse.asm" +INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm" INCLUDE "engine/menu/vending_machine.asm" -INCLUDE "data/mapHeaders/fuchsiahouse1.asm" -INCLUDE "scripts/fuchsiahouse1.asm" -INCLUDE "data/mapObjects/fuchsiahouse1.asm" - -INCLUDE "data/mapHeaders/fuchsiapokecenter.asm" -INCLUDE "scripts/fuchsiapokecenter.asm" -INCLUDE "data/mapObjects/fuchsiapokecenter.asm" - -INCLUDE "data/mapHeaders/fuchsiahouse2.asm" -INCLUDE "scripts/fuchsiahouse2.asm" -INCLUDE "data/mapObjects/fuchsiahouse2.asm" -FuchsiaHouse2Blocks: INCBIN "maps/fuchsiahouse2.blk" - -INCLUDE "data/mapHeaders/safarizoneentrance.asm" -INCLUDE "scripts/safarizoneentrance.asm" -INCLUDE "data/mapObjects/safarizoneentrance.asm" -SafariZoneEntranceBlocks: INCBIN "maps/safarizoneentrance.blk" - -INCLUDE "data/mapHeaders/fuchsiagym.asm" -INCLUDE "scripts/fuchsiagym.asm" -INCLUDE "data/mapObjects/fuchsiagym.asm" -FuchsiaGymBlocks: INCBIN "maps/fuchsiagym.blk" - -INCLUDE "data/mapHeaders/fuchsiameetingroom.asm" -INCLUDE "scripts/fuchsiameetingroom.asm" -INCLUDE "data/mapObjects/fuchsiameetingroom.asm" -FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk" - -INCLUDE "data/mapHeaders/cinnabargym.asm" -INCLUDE "scripts/cinnabargym.asm" -INCLUDE "data/mapObjects/cinnabargym.asm" -CinnabarGymBlocks: INCBIN "maps/cinnabargym.blk" - -INCLUDE "data/mapHeaders/lab1.asm" -INCLUDE "scripts/lab1.asm" -INCLUDE "data/mapObjects/lab1.asm" -Lab1Blocks: INCBIN "maps/lab1.blk" - -INCLUDE "data/mapHeaders/lab2.asm" -INCLUDE "scripts/lab2.asm" -INCLUDE "data/mapObjects/lab2.asm" -Lab2Blocks: INCBIN "maps/lab2.blk" - -INCLUDE "data/mapHeaders/lab3.asm" -INCLUDE "scripts/lab3.asm" -INCLUDE "data/mapObjects/lab3.asm" -Lab3Blocks: INCBIN "maps/lab3.blk" - -INCLUDE "data/mapHeaders/lab4.asm" -INCLUDE "scripts/lab4.asm" -INCLUDE "data/mapObjects/lab4.asm" -Lab4Blocks: INCBIN "maps/lab4.blk" - -INCLUDE "data/mapHeaders/cinnabarpokecenter.asm" -INCLUDE "scripts/cinnabarpokecenter.asm" -INCLUDE "data/mapObjects/cinnabarpokecenter.asm" - -INCLUDE "data/mapHeaders/cinnabarmart.asm" -INCLUDE "scripts/cinnabarmart.asm" -INCLUDE "data/mapObjects/cinnabarmart.asm" - -INCLUDE "data/mapHeaders/copycatshouse1f.asm" -INCLUDE "scripts/copycatshouse1f.asm" -INCLUDE "data/mapObjects/copycatshouse1f.asm" - -INCLUDE "data/mapHeaders/gary.asm" -INCLUDE "scripts/gary.asm" -INCLUDE "data/mapObjects/gary.asm" -GaryBlocks: INCBIN "maps/gary.blk" - -INCLUDE "data/mapHeaders/lorelei.asm" -INCLUDE "scripts/lorelei.asm" -INCLUDE "data/mapObjects/lorelei.asm" -LoreleiBlocks: INCBIN "maps/lorelei.blk" - -INCLUDE "data/mapHeaders/bruno.asm" -INCLUDE "scripts/bruno.asm" -INCLUDE "data/mapObjects/bruno.asm" -BrunoBlocks: INCBIN "maps/bruno.blk" - -INCLUDE "data/mapHeaders/agatha.asm" -INCLUDE "scripts/agatha.asm" -INCLUDE "data/mapObjects/agatha.asm" -AgathaBlocks: INCBIN "maps/agatha.blk" +INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm" + +INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm" +INCLUDE "scripts/FuchsiaPokecenter.asm" +INCLUDE "data/mapObjects/FuchsiaPokecenter.asm" + +INCLUDE "data/mapHeaders/WardensHouse.asm" +INCLUDE "scripts/WardensHouse.asm" +INCLUDE "data/mapObjects/WardensHouse.asm" +WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk" + +INCLUDE "data/mapHeaders/SafariZoneGate.asm" +INCLUDE "scripts/SafariZoneGate.asm" +INCLUDE "data/mapObjects/SafariZoneGate.asm" +SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk" + +INCLUDE "data/mapHeaders/FuchsiaGym.asm" +INCLUDE "scripts/FuchsiaGym.asm" +INCLUDE "data/mapObjects/FuchsiaGym.asm" +FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk" + +INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm" +INCLUDE "scripts/FuchsiaMeetingRoom.asm" +INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm" +FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarGym.asm" +INCLUDE "scripts/CinnabarGym.asm" +INCLUDE "data/mapObjects/CinnabarGym.asm" +CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk" + +INCLUDE "data/mapHeaders/CinnabarLab.asm" +INCLUDE "scripts/CinnabarLab.asm" +INCLUDE "data/mapObjects/CinnabarLab.asm" +CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk" + +INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm" +INCLUDE "scripts/CinnabarLabTradeRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm" +CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm" +INCLUDE "scripts/CinnabarLabMetronomeRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm" +CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm" +INCLUDE "scripts/CinnabarLabFossilRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm" +CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk" + +INCLUDE "data/mapHeaders/CinnabarPokecenter.asm" +INCLUDE "scripts/CinnabarPokecenter.asm" +INCLUDE "data/mapObjects/CinnabarPokecenter.asm" + +INCLUDE "data/mapHeaders/CinnabarMart.asm" +INCLUDE "scripts/CinnabarMart.asm" +INCLUDE "data/mapObjects/CinnabarMart.asm" + +INCLUDE "data/mapHeaders/CopycatsHouse1F.asm" +INCLUDE "scripts/CopycatsHouse1F.asm" +INCLUDE "data/mapObjects/CopycatsHouse1F.asm" + +INCLUDE "data/mapHeaders/ChampionsRoom.asm" +INCLUDE "scripts/ChampionsRoom.asm" +INCLUDE "data/mapObjects/ChampionsRoom.asm" +ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk" + +INCLUDE "data/mapHeaders/LoreleisRoom.asm" +INCLUDE "scripts/LoreleisRoom.asm" +INCLUDE "data/mapObjects/LoreleisRoom.asm" +LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk" + +INCLUDE "data/mapHeaders/BrunosRoom.asm" +INCLUDE "scripts/BrunosRoom.asm" +INCLUDE "data/mapObjects/BrunosRoom.asm" +BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk" + +INCLUDE "data/mapHeaders/AgathasRoom.asm" +INCLUDE "scripts/AgathasRoom.asm" +INCLUDE "data/mapObjects/AgathasRoom.asm" +AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" INCLUDE "engine/menu/league_pc.asm" diff --git a/maps/AgathasRoom.blk b/maps/AgathasRoom.blk new file mode 100644 index 00000000..4167fdc5 --- /dev/null +++ b/maps/AgathasRoom.blk @@ -0,0 +1 @@ +GG6GGg66NeRN6eReg6eeRK6eRgR6hh \ No newline at end of file diff --git a/maps/BikeShop.blk b/maps/BikeShop.blk new file mode 100644 index 00000000..925be45c --- /dev/null +++ b/maps/BikeShop.blk @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/maps/BillsHouse.blk b/maps/BillsHouse.blk new file mode 100644 index 00000000..112a2e81 --- /dev/null +++ b/maps/BillsHouse.blk @@ -0,0 +1,2 @@ + +   \ No newline at end of file diff --git a/maps/BluesHouse.blk b/maps/BluesHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/BluesHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/BrunosRoom.blk b/maps/BrunosRoom.blk new file mode 100644 index 00000000..2ecc677e --- /dev/null +++ b/maps/BrunosRoom.blk @@ -0,0 +1,4 @@ + +  +    + \ No newline at end of file diff --git a/maps/CeladonChiefHouse.blk b/maps/CeladonChiefHouse.blk new file mode 100644 index 00000000..4181d9de --- /dev/null +++ b/maps/CeladonChiefHouse.blk @@ -0,0 +1 @@ +D@?D BC FG 6A 6 \ No newline at end of file diff --git a/maps/CeladonCity.blk b/maps/CeladonCity.blk new file mode 100644 index 00000000..f1fce6bc --- /dev/null +++ b/maps/CeladonCity.blk @@ -0,0 +1,28 @@ +lllllllllllllllllllllll + + + + + + + + +oo +ooo +oooooo +n !UUUU !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! ! +n7~7~7~UU7~|~|~7~|~ +nUUUUUyUU !UUUUUUUUUUUU +n/7~UUUUUUUUUUUU +n + + + + + + + + + +llllll26llll +nooooooooooooooooo6ooooo \ No newline at end of file diff --git a/maps/CeladonDiner.blk b/maps/CeladonDiner.blk new file mode 100644 index 00000000..4ef657b9 --- /dev/null +++ b/maps/CeladonDiner.blk @@ -0,0 +1 @@ +,*.20 ! - ! 1() \ No newline at end of file diff --git a/maps/CeladonGym.blk b/maps/CeladonGym.blk new file mode 100644 index 00000000..dcecc50c --- /dev/null +++ b/maps/CeladonGym.blk @@ -0,0 +1 @@ +38:933<3=33;?>3344356344321 \ No newline at end of file diff --git a/maps/CeladonHotel.blk b/maps/CeladonHotel.blk new file mode 100644 index 00000000..07a8b781 --- /dev/null +++ b/maps/CeladonHotel.blk @@ -0,0 +1,2 @@ +  +  \ No newline at end of file diff --git a/maps/CeladonMansion1F.blk b/maps/CeladonMansion1F.blk new file mode 100644 index 00000000..97a1a91f --- /dev/null +++ b/maps/CeladonMansion1F.blk @@ -0,0 +1 @@ +$*   > \ No newline at end of file diff --git a/maps/CeladonMansion2F.blk b/maps/CeladonMansion2F.blk new file mode 100644 index 00000000..920282c1 --- /dev/null +++ b/maps/CeladonMansion2F.blk @@ -0,0 +1 @@ +' +/  \ No newline at end of file diff --git a/maps/CeladonMansion3F.blk b/maps/CeladonMansion3F.blk new file mode 100644 index 00000000..5451ea7d --- /dev/null +++ b/maps/CeladonMansion3F.blk @@ -0,0 +1,2 @@ +()#,- +   \ No newline at end of file diff --git a/maps/CeladonMansionRoof.blk b/maps/CeladonMansionRoof.blk new file mode 100644 index 00000000..dafad3db --- /dev/null +++ b/maps/CeladonMansionRoof.blk @@ -0,0 +1 @@ +E;=!"%&3  \ No newline at end of file diff --git a/maps/CeladonMansionRoofHouse.blk b/maps/CeladonMansionRoofHouse.blk new file mode 100644 index 00000000..51bf8401 --- /dev/null +++ b/maps/CeladonMansionRoofHouse.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/CeladonMart1F.blk b/maps/CeladonMart1F.blk new file mode 100644 index 00000000..0c805e4c --- /dev/null +++ b/maps/CeladonMart1F.blk @@ -0,0 +1 @@ + %    &   \ No newline at end of file diff --git a/maps/CeladonMart2F.blk b/maps/CeladonMart2F.blk new file mode 100644 index 00000000..4ddd4f4b --- /dev/null +++ b/maps/CeladonMart2F.blk @@ -0,0 +1,4 @@ + %       + + + diff --git a/maps/CeladonMart3F.blk b/maps/CeladonMart3F.blk new file mode 100644 index 00000000..3be70750 --- /dev/null +++ b/maps/CeladonMart3F.blk @@ -0,0 +1,2 @@ + $$$$%      + diff --git a/maps/CeladonMart4F.blk b/maps/CeladonMart4F.blk new file mode 100644 index 00000000..2066e69e --- /dev/null +++ b/maps/CeladonMart4F.blk @@ -0,0 +1,4 @@ + %     ' + + + \ No newline at end of file diff --git a/maps/CeladonMart5F.blk b/maps/CeladonMart5F.blk new file mode 100644 index 00000000..8558b3de --- /dev/null +++ b/maps/CeladonMart5F.blk @@ -0,0 +1,4 @@ + %       + + + diff --git a/maps/CeladonMartElevator.blk b/maps/CeladonMartElevator.blk new file mode 100644 index 00000000..824bc3de --- /dev/null +++ b/maps/CeladonMartElevator.blk @@ -0,0 +1 @@ +*+() \ No newline at end of file diff --git a/maps/CeladonMartRoof.blk b/maps/CeladonMartRoof.blk new file mode 100644 index 00000000..520407ba --- /dev/null +++ b/maps/CeladonMartRoof.blk @@ -0,0 +1 @@ +6;??A6! ++++> \ No newline at end of file diff --git a/maps/DiglettsCaveRoute11.blk b/maps/DiglettsCaveRoute11.blk new file mode 100644 index 00000000..5282c7dd --- /dev/null +++ b/maps/DiglettsCaveRoute11.blk @@ -0,0 +1,2 @@ +}}}}}'} +$} \ No newline at end of file diff --git a/maps/DiglettsCaveRoute2.blk b/maps/DiglettsCaveRoute2.blk new file mode 100644 index 00000000..5282c7dd --- /dev/null +++ b/maps/DiglettsCaveRoute2.blk @@ -0,0 +1,2 @@ +}}}}}'} +$} \ No newline at end of file diff --git a/maps/FightingDojo.blk b/maps/FightingDojo.blk new file mode 100644 index 00000000..3b13cc90 --- /dev/null +++ b/maps/FightingDojo.blk @@ -0,0 +1 @@ +IJgIJKQPLKLKLK21LRFFo \ No newline at end of file diff --git a/maps/FuchsiaBillsGrandpasHouse.blk b/maps/FuchsiaBillsGrandpasHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/FuchsiaBillsGrandpasHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.blk new file mode 100644 index 00000000..e57addb1 --- /dev/null +++ b/maps/FuchsiaCity.blk @@ -0,0 +1,4 @@ + !zoooooz7:~zooooooznttmVUwnmnwVwVmzoo`wVwVwmzzzzzzznzzzzzzzzzzz !oooo`z !nlllmzz|szzzzzz7:~`wVwmzoooooyzznVUVzzzzzogmzznUlllll11NkkkPRR`Uwwww11NU_tnN>?????????;_t + + +nN$ !WWWW !%_8989nNX|~0|rY1<=<=1nNX11111111Y_Vw1wnNZ\ooo\[11nPRRRR>?;ttttPRRRRRn11111(,)1111>?; \ No newline at end of file diff --git a/maps/FuchsiaGoodRodHouse.blk b/maps/FuchsiaGoodRodHouse.blk new file mode 100644 index 00000000..35443909 --- /dev/null +++ b/maps/FuchsiaGoodRodHouse.blk @@ -0,0 +1 @@ += ==  ,  5 \ No newline at end of file diff --git a/maps/FuchsiaGym.blk b/maps/FuchsiaGym.blk new file mode 100644 index 00000000..dd4f5019 --- /dev/null +++ b/maps/FuchsiaGym.blk @@ -0,0 +1 @@ +-.0-/0/-/--/./0---21 \ No newline at end of file diff --git a/maps/FuchsiaMart.blk b/maps/FuchsiaMart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/FuchsiaMart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/FuchsiaMeetingRoom.blk b/maps/FuchsiaMeetingRoom.blk new file mode 100644 index 00000000..a1c8d921 --- /dev/null +++ b/maps/FuchsiaMeetingRoom.blk @@ -0,0 +1 @@ +589467777   \ No newline at end of file diff --git a/maps/FuchsiaPokecenter.blk b/maps/FuchsiaPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/FuchsiaPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/GameCorner.blk b/maps/GameCorner.blk new file mode 100644 index 00000000..82fd0b61 --- /dev/null +++ b/maps/GameCorner.blk @@ -0,0 +1,5 @@ + + + + +4***C*///3 : : : :9!9!9!99!9!9!98!8!8!8 () \ No newline at end of file diff --git a/maps/GameCornerPrizeRoom.blk b/maps/GameCornerPrizeRoom.blk new file mode 100644 index 00000000..f0a6c058 --- /dev/null +++ b/maps/GameCornerPrizeRoom.blk @@ -0,0 +1 @@ +?@@@?>>>>> = \ No newline at end of file diff --git a/maps/HallOfFame.blk b/maps/HallOfFame.blk new file mode 100644 index 00000000..f1aa64a4 --- /dev/null +++ b/maps/HallOfFame.blk @@ -0,0 +1 @@ +e7l \ No newline at end of file diff --git a/maps/IndigoPlateau.blk b/maps/IndigoPlateau.blk new file mode 100644 index 00000000..a850b3c6 --- /dev/null +++ b/maps/IndigoPlateau.blk @@ -0,0 +1 @@ +!"'')))CB***,,,(CB(+++)))CB***,,,(CB(+++)))CB***,,,(CB(+++ \ No newline at end of file diff --git a/maps/IndigoPlateauLobby.blk b/maps/IndigoPlateauLobby.blk new file mode 100644 index 00000000..38561b84 Binary files /dev/null and b/maps/IndigoPlateauLobby.blk differ diff --git a/maps/LancesRoom.blk b/maps/LancesRoom.blk new file mode 100644 index 00000000..b05f1c35 --- /dev/null +++ b/maps/LancesRoom.blk @@ -0,0 +1 @@ +I12JI12JK21LKLK21LKLK21LR12oK21LK21LRVrsNoKLIJKLKpKLKSFFoKLKLKUHHH[LRFFFFFFFo \ No newline at end of file diff --git a/maps/LavenderCuboneHouse.blk b/maps/LavenderCuboneHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/LavenderCuboneHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/LavenderMart.blk b/maps/LavenderMart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/LavenderMart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/LavenderPokecenter.blk b/maps/LavenderPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/LavenderPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/LavenderTown.blk b/maps/LavenderTown.blk new file mode 100644 index 00000000..d094f3b9 --- /dev/null +++ b/maps/LavenderTown.blk @@ -0,0 +1 @@ +WW%{{(hi,{ !{y(7}~,{|r{{$WW*{{{{{{{{y({{yy{{{({{{{{{{ !({{{|s({{{{{{{{{(???;{>???, \ No newline at end of file diff --git a/maps/LoreleisRoom.blk b/maps/LoreleisRoom.blk new file mode 100644 index 00000000..8df8e929 --- /dev/null +++ b/maps/LoreleisRoom.blk @@ -0,0 +1 @@ +!!$!!  DD \ No newline at end of file diff --git a/maps/MrFujisHouse.blk b/maps/MrFujisHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/MrFujisHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/MrPsychicsHouse.blk b/maps/MrPsychicsHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/MrPsychicsHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/MtMoon1F.blk b/maps/MtMoon1F.blk new file mode 100644 index 00000000..04edbba7 --- /dev/null +++ b/maps/MtMoon1F.blk @@ -0,0 +1 @@ + !!!!!!!!!!!!!!!!!"( " " "(( !" !!"* " !!"$ !!!!!!!!" \ No newline at end of file diff --git a/maps/MtMoonB1F.blk b/maps/MtMoonB1F.blk new file mode 100644 index 00000000..ee1aa030 --- /dev/null +++ b/maps/MtMoonB1F.blk @@ -0,0 +1 @@ +??????<==??????=<?????????=<???????< \ No newline at end of file diff --git a/maps/MtMoonB2F.blk b/maps/MtMoonB2F.blk new file mode 100644 index 00000000..216fe705 --- /dev/null +++ b/maps/MtMoonB2F.blk @@ -0,0 +1 @@ +..................//......../fED/AB.@AB../=/)/333)+/> .....//../3333/0...../D))E/=HI333/33JGGGGK/....@AB./../)///,/=/88888888889999999999 \ No newline at end of file diff --git a/maps/MtMoonPokecenter.blk b/maps/MtMoonPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/MtMoonPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/Museum1F.blk b/maps/Museum1F.blk new file mode 100644 index 00000000..a96771ba Binary files /dev/null and b/maps/Museum1F.blk differ diff --git a/maps/Museum2F.blk b/maps/Museum2F.blk new file mode 100644 index 00000000..355e5d80 Binary files /dev/null and b/maps/Museum2F.blk differ diff --git a/maps/NameRatersHouse.blk b/maps/NameRatersHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/NameRatersHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/OaksLab.blk b/maps/OaksLab.blk new file mode 100644 index 00000000..64d2d6a2 --- /dev/null +++ b/maps/OaksLab.blk @@ -0,0 +1 @@ +efghhkkijmnhhhh \ No newline at end of file diff --git a/maps/PalletTown.blk b/maps/PalletTown.blk new file mode 100644 index 00000000..64e5b9cc Binary files /dev/null and b/maps/PalletTown.blk differ diff --git a/maps/PewterCity.blk b/maps/PewterCity.blk new file mode 100644 index 00000000..b199480b --- /dev/null +++ b/maps/PewterCity.blk @@ -0,0 +1,57 @@ + + +RRRRRRRRRRRRRRRooo?;tt  !oo +ttn,)ttuqqv|}~ +4 +ttn,)/7}:~B/B,) + + + + + + +n,)tttttt>??,) + + + +(,,,) + +  !$WW,) + + +|s + + +,),)ooooo + + + + + +>??,) !1wVww1(,,,) + + +|rtnttttm$WW,)nttttmM + ++%t + + +n/mM + +)M + +%QQQQQQQQQQ + + + + + + + + + + + + + + diff --git a/maps/PewterGym.blk b/maps/PewterGym.blk new file mode 100644 index 00000000..e7fc2212 --- /dev/null +++ b/maps/PewterGym.blk @@ -0,0 +1,4 @@ + + + +       \ No newline at end of file diff --git a/maps/PewterMart.blk b/maps/PewterMart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/PewterMart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/PewterNidoranHouse.blk b/maps/PewterNidoranHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/PewterNidoranHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/PewterPokecenter.blk b/maps/PewterPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/PewterPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/PewterSpeechHouse.blk b/maps/PewterSpeechHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/PewterSpeechHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/PokemonFanClub.blk b/maps/PokemonFanClub.blk new file mode 100644 index 00000000..2622e175 --- /dev/null +++ b/maps/PokemonFanClub.blk @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/maps/PokemonMansion1F.blk b/maps/PokemonMansion1F.blk new file mode 100644 index 00000000..afcb8e7e --- /dev/null +++ b/maps/PokemonMansion1F.blk @@ -0,0 +1,9 @@ +@AAAAAAAAAAAAAB\S]\wGF@c]DCFSXWXUFPIIXF8G]D:; +FCC181]D?; +SJIIIXWQD?; +F]D?; +FHXWQD?; +F R]D?; +FDFD?; +F NDFD?; +FFHX?;WJIIIIII \ No newline at end of file diff --git a/maps/PokemonMansion2F.blk b/maps/PokemonMansion2F.blk new file mode 100644 index 00000000..37896766 --- /dev/null +++ b/maps/PokemonMansion2F.blk @@ -0,0 +1 @@ +heejBAABAAA@aei\VFGp]\VXW8FDCCZ1FPIIIJ `cgAeiDwon d8FDZ8SIX8WQka*]8FnFD1FlOkaaBFlDVVlDGGSlDZFlHIIJIJm \ No newline at end of file diff --git a/maps/PokemonMansion3F.blk b/maps/PokemonMansion3F.blk new file mode 100644 index 00000000..1a86bc71 --- /dev/null +++ b/maps/PokemonMansion3F.blk @@ -0,0 +1 @@ +@AAsAeeBaaa@DVU\81wG1\Z18F\8gi VIIIQDo] 8FDG1]ItWRWIQ\]DoFHIIHIIJ \ No newline at end of file diff --git a/maps/PokemonMansionB1F.blk b/maps/PokemonMansionB1F.blk new file mode 100644 index 00000000..9ced2192 --- /dev/null +++ b/maps/PokemonMansionB1F.blk @@ -0,0 +1 @@ +`aaaBaaaabAAAABdFfwCCCFDGVXWIJIXWQDF@cgBAAAAAAABFD  FFFDFFFD  FFFPIIIJZaaYVQDFDFDVGDFDDnFDZwDFHIIIIIJIIIHIIIJ \ No newline at end of file diff --git a/maps/PokemonTower1F.blk b/maps/PokemonTower1F.blk new file mode 100644 index 00000000..25afe15f --- /dev/null +++ b/maps/PokemonTower1F.blk @@ -0,0 +1,3 @@ + + 9  +9 %?? %  \ No newline at end of file diff --git a/maps/PokemonTower2F.blk b/maps/PokemonTower2F.blk new file mode 100644 index 00000000..c8acf99d --- /dev/null +++ b/maps/PokemonTower2F.blk @@ -0,0 +1,2 @@ +`[a[Q ^L666_  +6RLL6RRRR6R6 WRRROX 666 SVT \ No newline at end of file diff --git a/maps/PokemonTower3F.blk b/maps/PokemonTower3F.blk new file mode 100644 index 00000000..26d28b79 --- /dev/null +++ b/maps/PokemonTower3F.blk @@ -0,0 +1,3 @@ + +[Q 9OOOOX  +PPRQPQ 9NLLML VV SVT \ No newline at end of file diff --git a/maps/PokemonTower4F.blk b/maps/PokemonTower4F.blk new file mode 100644 index 00000000..2df4ab1a --- /dev/null +++ b/maps/PokemonTower4F.blk @@ -0,0 +1,3 @@ + + [Q ^QOL_  +fONMOOMOgNOg 9f NO SU \ No newline at end of file diff --git a/maps/PokemonTower5F.blk b/maps/PokemonTower5F.blk new file mode 100644 index 00000000..a05a575c --- /dev/null +++ b/maps/PokemonTower5F.blk @@ -0,0 +1,2 @@ + +[e66 WiL6LjX :66OO66PR636RQP66OL6 ^gOOh_ 666  \ No newline at end of file diff --git a/maps/PokemonTower6F.blk b/maps/PokemonTower6F.blk new file mode 100644 index 00000000..7256a841 --- /dev/null +++ b/maps/PokemonTower6F.blk @@ -0,0 +1,2 @@ +`[a]66 ^NL6R6_  +6666R6LZRPOOL66O6LLOO W6O6OQX O6R 0 \ No newline at end of file diff --git a/maps/PokemonTower7F.blk b/maps/PokemonTower7F.blk new file mode 100644 index 00000000..4598f336 --- /dev/null +++ b/maps/PokemonTower7F.blk @@ -0,0 +1 @@ +lm 9  9 9 59    1 \ No newline at end of file diff --git a/maps/PowerPlant.blk b/maps/PowerPlant.blk new file mode 100644 index 00000000..7f2d7eeb --- /dev/null +++ b/maps/PowerPlant.blk @@ -0,0 +1 @@ +@aaaheeieeeeieeeeeeiDp1]F55]Dh*gic+aYF815]@cg\81]cDF81]D\1]1DF8]p\8qDF81]heeA@Aeic+aDVIXWIIQ\p1]IIIHIIIIIXRF\R]DF`a*\8]5555DFdDqDFD1aa*+abIIIIIIIIIIUFD8f81]hcghe*V11]\8k11]\1k*gaaeaa@c+aaeiD1\D FHX,WHIIIIIIIHIIIIIIJ \ No newline at end of file diff --git a/maps/RedsHouse1F.blk b/maps/RedsHouse1F.blk new file mode 100644 index 00000000..1b7d4f07 --- /dev/null +++ b/maps/RedsHouse1F.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/RedsHouse2F.blk b/maps/RedsHouse2F.blk new file mode 100644 index 00000000..dd9d1ea4 --- /dev/null +++ b/maps/RedsHouse2F.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/RockTunnel1F.blk b/maps/RockTunnel1F.blk new file mode 100644 index 00000000..bbd18ce6 --- /dev/null +++ b/maps/RockTunnel1F.blk @@ -0,0 +1 @@ + " "(>( " " "( " " " "( " " " " "*>NQRMN \ No newline at end of file diff --git a/maps/RockTunnelB1F.blk b/maps/RockTunnelB1F.blk new file mode 100644 index 00000000..a579831b --- /dev/null +++ b/maps/RockTunnelB1F.blk @@ -0,0 +1 @@ + " " " " " " " " ">>> " " " " " " " "> " " " " " " " " " " " " " " \ No newline at end of file diff --git a/maps/RockTunnelPokecenter.blk b/maps/RockTunnelPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/RockTunnelPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/RocketHideoutB1F.blk b/maps/RocketHideoutB1F.blk new file mode 100644 index 00000000..18b02211 --- /dev/null +++ b/maps/RocketHideoutB1F.blk @@ -0,0 +1 @@ +.........@AAB...........DnoF......@AAAAcgAB....DF....@*+B  @*+B....DF  DF....DGGF  DGGF....F  F....@AAAAAABgB....444F,WJ....666F.......666F.......777oF.......HIIIIIIJ... \ No newline at end of file diff --git a/maps/RocketHideoutB2F.blk b/maps/RocketHideoutB2F.blk new file mode 100644 index 00000000..b8fc41f8 --- /dev/null +++ b/maps/RocketHideoutB2F.blk @@ -0,0 +1,3 @@ +.............................................@AAzAAAAA@ABAABD +UoF nFy9&F FD + 'V Fy5YFD5)@AAAABD)US,WJD ) F...D  YnF...D)& DF...HI3333333HIJ... \ No newline at end of file diff --git a/maps/RocketHideoutB3F.blk b/maps/RocketHideoutB3F.blk new file mode 100644 index 00000000..23b45286 --- /dev/null +++ b/maps/RocketHideoutB3F.blk @@ -0,0 +1,2 @@ +..................................@AAAAAAAAAB....DnF....@AAAAcZIXF....y&FF....y&5WIQ....D5 &FF....D')F....D5oFIIIJ....y +`*qb.......D)df.......@A*gpF.......HIIIIIIJ... \ No newline at end of file diff --git a/maps/RocketHideoutB4F.blk b/maps/RocketHideoutB4F.blk new file mode 100644 index 00000000..389c1c7c --- /dev/null +++ b/maps/RocketHideoutB4F.blk @@ -0,0 +1 @@ +....`aaa@ABaaaB....dpFF....DGGRFGGF....PIIIDF F....D DF f....DG DnFXWQ....DGgpSJF....DFS,WJ....`aaaacF.......dF.......DGG F.......HIIIIIIJ... \ No newline at end of file diff --git a/maps/RocketHideoutElevator.blk b/maps/RocketHideoutElevator.blk new file mode 100644 index 00000000..0c296a34 --- /dev/null +++ b/maps/RocketHideoutElevator.blk @@ -0,0 +1 @@ +DMGJLKJ KHFI \ No newline at end of file diff --git a/maps/Route1.blk b/maps/Route1.blk new file mode 100644 index 00000000..56a9e4a3 --- /dev/null +++ b/maps/Route1.blk @@ -0,0 +1,38 @@ + +MRRO1PRRN +M + + +1 + +tN +MB11N +nttn m +nB m +n +tt +111m +noo m +M + +tt1 N +M +1111ttN +M//N +M +111111N +Moooo N +M + +tt 1N +M1N +n + 1 + m +n t1 tm +nQQc bQQm +n + +M N + +m \ No newline at end of file diff --git a/maps/Route10.blk b/maps/Route10.blk new file mode 100644 index 00000000..aed525c5 --- /dev/null +++ b/maps/Route10.blk @@ -0,0 +1,43 @@ +WWWWWWWWW*CCCCCCCCC(aaaaaaae( + Me( + Me(;/Oe() + + + + + +Me(,???; + +Me(+WWWp !Me()1wV5|rMe() + + +5UUMe()UUU5 + +Me()UUU5 + +Me()UUU + + +Me() + + + + + +Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{(){e(){{{{$%{e(){{{{{{{e().(,????????,,,,,,,+WW*+WWWW% +L()11111 + +()1111>;/()>??,) + +()z$WWW%/() + + + + + + +z(,???; + + + +(,,+W%/ (,,)zzzuqv(,,)z1>hi, \ No newline at end of file diff --git a/maps/Route11.blk b/maps/Route11.blk new file mode 100644 index 00000000..c026d913 --- /dev/null +++ b/maps/Route11.blk @@ -0,0 +1,34 @@ +1111mI#####H I####H + + + + +1>?;m' ' ' ^ + + + + +V$%m' ' ' +L + + +11111" I##" &##H oo !m' ' ' ' ' 7}}~ +CCCdmD##E D###" ' ]ll + + +CCCdm ' ' ' + + + + +m] &##" ' + + + + +D#########E D###E + + + + + \ No newline at end of file diff --git a/maps/Route11Gate1F.blk b/maps/Route11Gate1F.blk new file mode 100644 index 00000000..d1a18368 Binary files /dev/null and b/maps/Route11Gate1F.blk differ diff --git a/maps/Route11Gate2F.blk b/maps/Route11Gate2F.blk new file mode 100644 index 00000000..f90c7db9 Binary files /dev/null and b/maps/Route11Gate2F.blk differ diff --git a/maps/Route12.blk b/maps/Route12.blk new file mode 100644 index 00000000..d79f59e3 --- /dev/null +++ b/maps/Route12.blk @@ -0,0 +1,21 @@ +,,,)1(,,,,,+W%1$WWWW,)CCTCCCC,)CCTCCkk,)CCTCCCC,)TTzTCCC,)TxxTyTT,)TCCTxxx,)TC !CC,)xChiCC,)kk7:~kk,)CCCTCCC,)CCCTCCC,)TTTzTTC,)xxxxxTC,)TCCTTTC,)TCCTxxC,)zTTTCTCW%TxxxCTCTCCCCxCzTzTTTCTxTxxxCxCTTTCCCCxxzTCTTTCTxCTxTCTTCTCTTzTCTCxxxxCTTTzTTCxxxTxxC66kkkTCCCLLaaayCCCxxxTCCCCCCTCCCCCCTCCCCCCTCCC +nCCCTTTC +nCCCxxTC +nT111C +nTwwwwwC +nTxxxxxC +nTTTzTCC +nxxxTxCC +nl6CTCCC +n +5TTCCC +nl +xzTTC +nTTTTxxC +nxxxTTTC +nCCCxxTC +nll3TzTC +n nxTxC +n nCTCC +n nTzCC +n nTxCC \ No newline at end of file diff --git a/maps/Route12Gate1F.blk b/maps/Route12Gate1F.blk new file mode 100644 index 00000000..5c626eaf Binary files /dev/null and b/maps/Route12Gate1F.blk differ diff --git a/maps/Route12Gate2F.blk b/maps/Route12Gate2F.blk new file mode 100644 index 00000000..f90c7db9 Binary files /dev/null and b/maps/Route12Gate2F.blk differ diff --git a/maps/Route12SuperRodHouse.blk b/maps/Route12SuperRodHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/Route12SuperRodHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/Route13.blk b/maps/Route13.blk new file mode 100644 index 00000000..9d607b6d --- /dev/null +++ b/maps/Route13.blk @@ -0,0 +1,2 @@ +11111111111111111TCCCwwwwwwwwwwwwwwwwwllllllTCCCwwwwww1wwww1wwV4 + nTCCCwwwww1wwwwwwwwwm nTCCCww1wwwwwwwww1woooooTCCCwww1wwwwww1wwVw1TTTTTTTTCCCww1wwwVwwwwwwwwwxxxxxxxxCCCQQQQQQQjCCCCCCCCCCCCCCCCCCCkkkkkkkkkkk \ No newline at end of file diff --git a/maps/Route14.blk b/maps/Route14.blk new file mode 100644 index 00000000..38cae243 --- /dev/null +++ b/maps/Route14.blk @@ -0,0 +1,74 @@ + +M11111111 +Mwwwwwwww +M1wwwwwww +Mwwwww1ww +Mw1wwwwww +Mwwww1www +M111 +U +w +M111 +UM +M +UM +M mUM +M mUM +M mUMCC +MnmUMCC +M5 +UmUMCC +M + +UmU +cC +M + +UmU +MC +M + +U5U +MC +M + +UmU +MC + +UmU +MC + +UmU +MCUnUUU +U +MC5 + + + +U +MC + + + + + +U +MCUUUUUUU +MC + + + + + + + +MCQQQQQQQQQC + + + + + + + + +C \ No newline at end of file diff --git a/maps/Route15.blk b/maps/Route15.blk new file mode 100644 index 00000000..77a33889 --- /dev/null +++ b/maps/Route15.blk @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +oL + + + + +RRRRRRRRRRRRRRRRRRRRR + + + + +NUUUUUUUUUUUUUUUUUUUUUURR !P11117}~UU ttt 11tt t tQQ + + +NUUUUUUUUUUUUUUUUUUUUUU + + + + +N1111111111111111111111l + + + + + +QQQQQQQQQQQQQQQQQQQQQQQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maps/Route15Gate1F.blk b/maps/Route15Gate1F.blk new file mode 100644 index 00000000..d1a18368 Binary files /dev/null and b/maps/Route15Gate1F.blk differ diff --git a/maps/Route15Gate2F.blk b/maps/Route15Gate2F.blk new file mode 100755 index 00000000..f90c7db9 Binary files /dev/null and b/maps/Route15Gate2F.blk differ diff --git a/maps/Route16.blk b/maps/Route16.blk new file mode 100644 index 00000000..d3a7d5e5 --- /dev/null +++ b/maps/Route16.blk @@ -0,0 +1,22 @@ +RRRRRRRRRRRRRRRRRRN + + + + + + + + ! + + N7}~ N + + + ! +Pwwwwwwwwhiooooo`N1 + +111117}~wVwwwwwwN1 + +11111111N1 + +11bQQQQQN111 +N \ No newline at end of file diff --git a/maps/Route16FlyHouse.blk b/maps/Route16FlyHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/Route16FlyHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/Route16Gate1F.blk b/maps/Route16Gate1F.blk new file mode 100644 index 00000000..9cd90e33 Binary files /dev/null and b/maps/Route16Gate1F.blk differ diff --git a/maps/Route16Gate2F.blk b/maps/Route16Gate2F.blk new file mode 100644 index 00000000..f90c7db9 Binary files /dev/null and b/maps/Route16Gate2F.blk differ diff --git a/maps/Route17.blk b/maps/Route17.blk new file mode 100644 index 00000000..2a27af66 --- /dev/null +++ b/maps/Route17.blk @@ -0,0 +1 @@ +N]tt]tNeCCN'tt'tNeCCN'tt'tQQQcN'tt'ttttMN'tt't MN'tt't MN'tt't MN'tt't MN'tt't MN'tt't MN'tt'ttttMN'tt'ttttMN'tt'ttttMN'tt']tMN'tt'ed'tMN'tt'ed'tMN'tt'ed'tMN'tt'ed'tMN'tt^ed'tMN'1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'eded'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'eded'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'eded'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN't1ed'tMN't.d'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'1111'1MN'1'1MN'1eCCd'1MN'1eCCd'1MN'11111'1MN^11111^1MNww1ww1wwMg]11]jCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd^1^eCCd\eC \ No newline at end of file diff --git a/maps/Route18.blk b/maps/Route18.blk new file mode 100644 index 00000000..aeb83516 --- /dev/null +++ b/maps/Route18.blk @@ -0,0 +1 @@ +Cd1111eCCk1111111111111Cd1tt1eCCCd1111111111111Cd1tt1eCCCdwwwwV !11111Cd1tt1tttttttttthiwVwwwCd111111111111117}~C-bQQ@MQQcCCCCCCCCCCCCCCCCN MttMCCCCCCCCCCCCCCCCN MttMkkkkkkkkkkkkkkkkPRRRORRO \ No newline at end of file diff --git a/maps/Route18Gate1F.blk b/maps/Route18Gate1F.blk new file mode 100644 index 00000000..d1a18368 Binary files /dev/null and b/maps/Route18Gate1F.blk differ diff --git a/maps/Route18Gate2F.blk b/maps/Route18Gate2F.blk new file mode 100644 index 00000000..f90c7db9 Binary files /dev/null and b/maps/Route18Gate2F.blk differ diff --git a/maps/Route19.blk b/maps/Route19.blk new file mode 100644 index 00000000..0bd469e7 --- /dev/null +++ b/maps/Route19.blk @@ -0,0 +1 @@ +(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/maps/Route2.blk b/maps/Route2.blk new file mode 100644 index 00000000..dd6227fd --- /dev/null +++ b/maps/Route2.blk @@ -0,0 +1,54 @@ + 1111 1111 >??;111111$W%1lm2ll1tt + + ! + +11111R|~RRRR + +1UUUU + +11  1112ll + + +/ + +t/ + +tR +R !lm2ll|}~ + ! + + + + +R|~RR/UUUUUn + + + +n + +ttt n/t n + + + +t +ooo4 + + +tnm + + +t +lllmt + +t111 +mtt +/4/tt +1 +m + + +111 +mtt +tt1 +mtt +o4ooo \ No newline at end of file diff --git a/maps/Route20.blk b/maps/Route20.blk new file mode 100644 index 00000000..aae6a458 --- /dev/null +++ b/maps/Route20.blk @@ -0,0 +1 @@ +kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkeCCCCCCCCCCCCCCCCCCCCd>?;zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCd$%zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCdzTzz>?;eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCTTCCCdzTzzz$%eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCxxCCC-CjTzCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCkkkkkCCCCCCCCCCCCCCCCCCC.CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk \ No newline at end of file diff --git a/maps/Route21.blk b/maps/Route21.blk new file mode 100644 index 00000000..fa1f5b79 --- /dev/null +++ b/maps/Route21.blk @@ -0,0 +1,10 @@ +QcedQQQbQQ +Med +ttN + +tMed Nt +tMed N + +tMed N + +tMe-gROeCCCCCCg.CCCCkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkCCCCCCCCCCCCTCCC \ No newline at end of file diff --git a/maps/Route22.blk b/maps/Route22.blk new file mode 100644 index 00000000..231c6838 --- /dev/null +++ b/maps/Route22.blk @@ -0,0 +1,3 @@ + !(,,,,,,+WWW*,;hi$WWWWWW%/(,)7}}:}~UUUUUUUUUU$W)UUUUUU>;/b + +)/ ed() N)11Vwww UU() N>)$%/()UUUUUUUUUUUUUUUUUU(,??????????????????, \ No newline at end of file diff --git a/maps/Route22Gate.blk b/maps/Route22Gate.blk new file mode 100644 index 00000000..9cdf5b28 Binary files /dev/null and b/maps/Route22Gate.blk differ diff --git a/maps/Route23.blk b/maps/Route23.blk new file mode 100644 index 00000000..1ecf1d1a --- /dev/null +++ b/maps/Route23.blk @@ -0,0 +1,57 @@ +566CB556566CB55656++CB,,5656ACBAAA5656BAACCC5656CACBAB5656ACCCBA5656CBBBBA56,+BACBAB,+AACCCBBBAAAAAAAAAAAA)*A56A56AA''56A +H + +AAA + + + +56 + + + +* + + + +566 + + + +D +E +,(+((+ +@ +,(+ + +)* + + + + + + +D +E + +E +56 +56((+ +56@@ + +56@ +56@@5656@ +56@ +,(+ + + +@@@56 + + +D +E,(+,(+FFGFG,((565656,+A5687FG56,((+,(+FGFG + + +,(((+ + + +,+AAAAAAAAA)*)*AA,((+,((+AAAAA)*A)**A,((+A,(+(+AAAAAA))**A)*A,(,(+(+A,+AAAAAAA)*AA)*AA,(+AA,(((+:<<<<;>====? \ No newline at end of file diff --git a/maps/Route24.blk b/maps/Route24.blk new file mode 100644 index 00000000..21de9390 --- /dev/null +++ b/maps/Route24.blk @@ -0,0 +1,13 @@ +,,,,,,,,,,,+WWWWWWWW,)1111G1X +,)\K1Z,)11111111,) + + +1bQQQ,)tt +1N +>?,)tt +1N +(,,) +jTN +(,,) eTN +(,,) eTN +$W,) eTNMCC,) eTNMCC,) eTNMCC,) eTNMCC,) eTNMCC,).TNMCC,)CCTNMCC \ No newline at end of file diff --git a/maps/Route25.blk b/maps/Route25.blk new file mode 100644 index 00000000..49c98815 --- /dev/null +++ b/maps/Route25.blk @@ -0,0 +1,19 @@ +,,,,+WWWWWWWWWWWWWWWW%89$WWWW%WWWW%n +n + +n + +`ttttMwwV<=wwwRCC + + +LLL +nlnttntttttUUUU + +MCCLlL +mln +ttottttttUUUU + +MCC11111ml +mL + +ttmttttTTMCCQQQQQQQQQQQQQQQQQQQeCCTTCCdMCC?????????????????;RRRRRRRRROCC,,,,,,,,,,,,,,,,,)CC,,,,,,,,,,,,,,,,,)CCCCCCCCCCCC \ No newline at end of file diff --git a/maps/Route2Gate.blk b/maps/Route2Gate.blk new file mode 100644 index 00000000..19af9540 Binary files /dev/null and b/maps/Route2Gate.blk differ diff --git a/maps/Route2TradeHouse.blk b/maps/Route2TradeHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/Route2TradeHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/Route3.blk b/maps/Route3.blk new file mode 100644 index 00000000..a5284350 --- /dev/null +++ b/maps/Route3.blk @@ -0,0 +1,55 @@ +,,,,,,,,,,,,,,,,,,,,,,,,,,,)m(,,,,,,+WWWWWWWWW*,+WWWWWWWW*,) +(,,,,,,) + + + + + + + +t(,) + + + + + + + +(,) +>?,,,WWWW%/BB/$W%/>?;/(,)/$WW*, +@ + + + + +n + +n + + + + + + +(,) + + +$W% +V (, +A +n/BB (,)tt + + + + + (,????; + + + + + +n (,)ttt + + + + (,,,,,)>??????;(,)>??????????,,WWWW%(,,,,,,)(,)(,,,,,,,,,,,, \ No newline at end of file diff --git a/maps/Route4.blk b/maps/Route4.blk new file mode 100644 index 00000000..cb6a6a74 --- /dev/null +++ b/maps/Route4.blk @@ -0,0 +1,64 @@ +,,,,+WW*,,,,,,,,,+WWWWWWWWWWWWWWWWWWWWWW*,,,,,+WW% !$*,,,,,,,,) +X +YY + +X +X + +X + + + + +1111$WWWW,)|r$*+WWWW% +Z/[Y + +X +X + +Zaaaaa,)()11 + + + + + + +Y + +X +Z/g,)()/[ + +Z/okkkk,)() + + + + + + + + + + + + + + + + + + +m n1111111,)(,????????;//m n/bQQQQ,,;(,,,,,,,,,)ttt + + + + + + +m + + +N + + + +,,)>??,,,,,,,,,,,?????????????????????;tt \ No newline at end of file diff --git a/maps/Route5.blk b/maps/Route5.blk new file mode 100644 index 00000000..224a5b4b --- /dev/null +++ b/maps/Route5.blk @@ -0,0 +1,9 @@ +m'n + + + +N'Mm'nN'Mm'n N'Mm'nN'Mm'n N'Mm'nN'Mm'n N'Mm'nN'Mm'_1111'Mm'_1 1'Mm^_11^Mm_Mm !m|~m_Mm !Mnww7}:~wwmntt + + + +ttm \ No newline at end of file diff --git a/maps/Route5Gate.blk b/maps/Route5Gate.blk new file mode 100644 index 00000000..f69dfa87 --- /dev/null +++ b/maps/Route5Gate.blk @@ -0,0 +1 @@ +kj li \ No newline at end of file diff --git a/maps/Route6.blk b/maps/Route6.blk new file mode 100644 index 00000000..b488b37b --- /dev/null +++ b/maps/Route6.blk @@ -0,0 +1,21 @@ +ttt +MM +tttQQQQ !QQQttt +hittt/7:~/ + + + + + + + + + +/ !11111111|~ 1 11 1 1 1111111 1  1 eCCCCCd 1 Qc + +11111 +MRR1 + j1bQQQQCCC1N + + + diff --git a/maps/Route6Gate.blk b/maps/Route6Gate.blk new file mode 100644 index 00000000..f69dfa87 --- /dev/null +++ b/maps/Route6Gate.blk @@ -0,0 +1 @@ +kj li \ No newline at end of file diff --git a/maps/Route7.blk b/maps/Route7.blk new file mode 100644 index 00000000..1e58b2f8 --- /dev/null +++ b/maps/Route7.blk @@ -0,0 +1 @@ +111G _{11G t_{\Kt111_{1111_ ! !\7}~w|~1111_{1111111_{ \ No newline at end of file diff --git a/maps/Route7Gate.blk b/maps/Route7Gate.blk new file mode 100644 index 00000000..79911bdc --- /dev/null +++ b/maps/Route7Gate.blk @@ -0,0 +1 @@ +p!on%m \ No newline at end of file diff --git a/maps/Route8.blk b/maps/Route8.blk new file mode 100644 index 00000000..8a9da3d9 --- /dev/null +++ b/maps/Route8.blk @@ -0,0 +1,45 @@ +(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%N + + + + + + + + + + +M()NM11N +I#######H +Mbtt()NtttMN +' +RRRRR +' +MN + +$% !QQtM11N +'Mt tN' +MN +www7}~wMaa + +'Mt t5' +MN +]>;N + + + +] + + + + +'5t tN' + + + + +'()N + + + +D#####EMtttttND#####E()>?????????????????????????,, \ No newline at end of file diff --git a/maps/Route8Gate.blk b/maps/Route8Gate.blk new file mode 100644 index 00000000..79911bdc --- /dev/null +++ b/maps/Route8Gate.blk @@ -0,0 +1 @@ +p!on%m \ No newline at end of file diff --git a/maps/Route9.blk b/maps/Route9.blk new file mode 100644 index 00000000..e1ebe7cb --- /dev/null +++ b/maps/Route9.blk @@ -0,0 +1,29 @@ +$WWWWWWWWWWWWWWWW*+WWWWWWW*,,+ttM + + + + +>; () + + + + + + +(,,)ttM >;/()/$%/>;(,,)RROL()11$%11111111$%1$WW% + +51111>,)/>;1>;1>;1111111QQc>;$W%1111 +$%$%/()>;>??ttM()/>;/$%$%(,,ttM()1111111() + + + + + + + + + + + + +(,,ttM(,???????,,?????????????,,, \ No newline at end of file diff --git a/maps/SSAnne1F.blk b/maps/SSAnne1F.blk new file mode 100644 index 00000000..fd236973 --- /dev/null +++ b/maps/SSAnne1F.blk @@ -0,0 +1 @@ +           :  \ No newline at end of file diff --git a/maps/SSAnne1FRooms.blk b/maps/SSAnne1FRooms.blk new file mode 100644 index 00000000..1749e638 --- /dev/null +++ b/maps/SSAnne1FRooms.blk @@ -0,0 +1,7 @@ + + + + 6 6 6 + + + 6 6 6 \ No newline at end of file diff --git a/maps/SSAnne2F.blk b/maps/SSAnne2F.blk new file mode 100644 index 00000000..db2ae854 --- /dev/null +++ b/maps/SSAnne2F.blk @@ -0,0 +1 @@ +           \ No newline at end of file diff --git a/maps/SSAnne2FRooms.blk b/maps/SSAnne2FRooms.blk new file mode 100644 index 00000000..b6666f9a --- /dev/null +++ b/maps/SSAnne2FRooms.blk @@ -0,0 +1 @@ +78 78 78;9 ;9 ;9    78 78 78;9 ;9 ;9    \ No newline at end of file diff --git a/maps/SSAnne3F.blk b/maps/SSAnne3F.blk new file mode 100644 index 00000000..6e4b42f4 --- /dev/null +++ b/maps/SSAnne3F.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/SSAnneB1F.blk b/maps/SSAnneB1F.blk new file mode 100644 index 00000000..f22fb770 --- /dev/null +++ b/maps/SSAnneB1F.blk @@ -0,0 +1 @@ + 4  \ No newline at end of file diff --git a/maps/SSAnneB1FRooms.blk b/maps/SSAnneB1FRooms.blk new file mode 100644 index 00000000..b6666f9a --- /dev/null +++ b/maps/SSAnneB1FRooms.blk @@ -0,0 +1 @@ +78 78 78;9 ;9 ;9    78 78 78;9 ;9 ;9    \ No newline at end of file diff --git a/maps/SSAnneBow.blk b/maps/SSAnneBow.blk new file mode 100644 index 00000000..e97bab53 --- /dev/null +++ b/maps/SSAnneBow.blk @@ -0,0 +1 @@ +##&&&&&&&&#$$$ )' )$ !"' (!" #(%%%%%%%% \ No newline at end of file diff --git a/maps/SSAnneCaptainsRoom.blk b/maps/SSAnneCaptainsRoom.blk new file mode 100644 index 00000000..b5359f38 --- /dev/null +++ b/maps/SSAnneCaptainsRoom.blk @@ -0,0 +1 @@ +01/23 . \ No newline at end of file diff --git a/maps/SSAnneKitchen.blk b/maps/SSAnneKitchen.blk new file mode 100644 index 00000000..2a417ad2 --- /dev/null +++ b/maps/SSAnneKitchen.blk @@ -0,0 +1,7 @@ + + + + + + +   5 * * *5 * * *5 , , , +-+-+-+ \ No newline at end of file diff --git a/maps/SafariZoneCenter.blk b/maps/SafariZoneCenter.blk new file mode 100644 index 00000000..f4814712 --- /dev/null +++ b/maps/SafariZoneCenter.blk @@ -0,0 +1 @@ +~}}}}}X}}}}}}#",~#"#")~#"~)#"~%$~%$%$,~$#\QQQQQR|||VZ].U[.W.%Z^QQQO["~,||'&'&%"~}}"~#",#$~,%$!#$,~)%$!,,#$~~'&&X''& \ No newline at end of file diff --git a/maps/SafariZoneCenterRestHouse.blk b/maps/SafariZoneCenterRestHouse.blk new file mode 100644 index 00000000..625b41b6 Binary files /dev/null and b/maps/SafariZoneCenterRestHouse.blk differ diff --git a/maps/SafariZoneEast.blk b/maps/SafariZoneEast.blk new file mode 100644 index 00000000..564fa502 --- /dev/null +++ b/maps/SafariZoneEast.blk @@ -0,0 +1 @@ +H}}}}IL||%$#V!<===>%H}}}}DGESF%%$$~#((",),)~( PQQQR!~((U<===>%(($PQQOD?CGFL||,T----@B,~,<====JB~}}},DGEEEGF"~V,3L||||%$~||||||||M \ No newline at end of file diff --git a/maps/SafariZoneEastRestHouse.blk b/maps/SafariZoneEastRestHouse.blk new file mode 100644 index 00000000..625b41b6 Binary files /dev/null and b/maps/SafariZoneEastRestHouse.blk differ diff --git a/maps/SafariZoneGate.blk b/maps/SafariZoneGate.blk new file mode 100644 index 00000000..f69dfa87 --- /dev/null +++ b/maps/SafariZoneGate.blk @@ -0,0 +1 @@ +kj li \ No newline at end of file diff --git a/maps/SafariZoneNorth.blk b/maps/SafariZoneNorth.blk new file mode 100644 index 00000000..a5f4251c --- /dev/null +++ b/maps/SafariZoneNorth.blk @@ -0,0 +1 @@ +}}}}}}}}}}}}}}#"#"#$~%$~}}}}}}!~#"~%"~%$%\R%"~),Z["5555555%~,Z["))<==>)\R($DG?BZ[%$%,)@B,Z[,,@B)~)<====>)@B~##"@ACEGF@B\R@AB"<====JB~Z[$DGFDGEEEEF~%Z[~%!)~3~,")))W,~,~3$%$IYHIYH999IYH}}}}}}}} \ No newline at end of file diff --git a/maps/SafariZoneNorthRestHouse.blk b/maps/SafariZoneNorthRestHouse.blk new file mode 100644 index 00000000..625b41b6 Binary files /dev/null and b/maps/SafariZoneNorthRestHouse.blk differ diff --git a/maps/SafariZoneSecretHouse.blk b/maps/SafariZoneSecretHouse.blk new file mode 100644 index 00000000..d5dbe9e1 --- /dev/null +++ b/maps/SafariZoneSecretHouse.blk @@ -0,0 +1 @@ +  \ No newline at end of file diff --git a/maps/SafariZoneWest.blk b/maps/SafariZoneWest.blk new file mode 100644 index 00000000..88c8460c --- /dev/null +++ b/maps/SafariZoneWest.blk @@ -0,0 +1 @@ +|||||XX+*3)~+*.)!~+<==>))~+.DE?B))~~\QQR@B~~Z--[!@B)~@K==>~<====JCESF,~#DGEEEEF~,,~%$%$!W}}}}|||}||}}}} \ No newline at end of file diff --git a/maps/SafariZoneWestRestHouse.blk b/maps/SafariZoneWestRestHouse.blk new file mode 100644 index 00000000..625b41b6 Binary files /dev/null and b/maps/SafariZoneWestRestHouse.blk differ diff --git a/maps/SaffronCity.blk b/maps/SaffronCity.blk new file mode 100644 index 00000000..e0c2b224 Binary files /dev/null and b/maps/SaffronCity.blk differ diff --git a/maps/SaffronGym.blk b/maps/SaffronGym.blk new file mode 100644 index 00000000..44a24aad --- /dev/null +++ b/maps/SaffronGym.blk @@ -0,0 +1 @@ +AAA@AABAAA//D//F////D//F//AAA@AABAAA//DF////D/F//AAA@AABAAA//DE/F////D,F// \ No newline at end of file diff --git a/maps/SaffronMart.blk b/maps/SaffronMart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/SaffronMart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/SaffronPidgeyHouse.blk b/maps/SaffronPidgeyHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/SaffronPidgeyHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/SaffronPokecenter.blk b/maps/SaffronPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/SaffronPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/SeafoamIslands1F.blk b/maps/SeafoamIslands1F.blk new file mode 100644 index 00000000..3cd6e5c7 --- /dev/null +++ b/maps/SeafoamIslands1F.blk @@ -0,0 +1 @@ +................(..<,-..xmw..m..)L^^^..m..m(...$..........$. \ No newline at end of file diff --git a/maps/SeafoamIslandsB1F.blk b/maps/SeafoamIslandsB1F.blk new file mode 100644 index 00000000..61402221 --- /dev/null +++ b/maps/SeafoamIslandsB1F.blk @@ -0,0 +1 @@ +...........',->..|m..,<wmx..fL^^^..(..f-..m(m>................ \ No newline at end of file diff --git a/maps/SeafoamIslandsB2F.blk b/maps/SeafoamIslandsB2F.blk new file mode 100644 index 00000000..cc037328 --- /dev/null +++ b/maps/SeafoamIslandsB2F.blk @@ -0,0 +1 @@ +................><..-..=xRw....)+|..(-..>y................ \ No newline at end of file diff --git a/maps/SeafoamIslandsB3F.blk b/maps/SeafoamIslandsB3F.blk new file mode 100644 index 00000000..956a1053 --- /dev/null +++ b/maps/SeafoamIslandsB3F.blk @@ -0,0 +1 @@ +vvvvvv=,)vy',-vvvv-+,+vvvvvav )vaxwzvm \ No newline at end of file diff --git a/maps/SeafoamIslandsB4F.blk b/maps/SeafoamIslandsB4F.blk new file mode 100644 index 00000000..a118fe57 --- /dev/null +++ b/maps/SeafoamIslandsB4F.blk @@ -0,0 +1 @@ +.vvu..v-v..vvvvvv,-a..vv|vvvvv..vv,vvvvv..vvf+vvvvvv..vvvvvvvvvvv..vvuvvvv..vvL. \ No newline at end of file diff --git a/maps/SilphCo10F.blk b/maps/SilphCo10F.blk new file mode 100644 index 00000000..88669221 --- /dev/null +++ b/maps/SilphCo10F.blk @@ -0,0 +1,2 @@ +<===$}|>DFDZcgBDF /F@*+BcgBD5F/{FD5F{7FD +F7/FHIIJIIIJ \ No newline at end of file diff --git a/maps/SilphCo11F.blk b/maps/SilphCo11F.blk new file mode 100644 index 00000000..9bd21b04 --- /dev/null +++ b/maps/SilphCo11F.blk @@ -0,0 +1 @@ +!"!"""#$921114($35($$*($$*($$*($768*($$*(%&&&%&.&' \ No newline at end of file diff --git a/maps/SilphCo1F.blk b/maps/SilphCo1F.blk new file mode 100644 index 00000000..3bf7c8f0 --- /dev/null +++ b/maps/SilphCo1F.blk @@ -0,0 +1 @@ +<========|==}>~""# FD[[FD  [[[[[[9 FD[[FD  FDFD  FHIIIX,WIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo2F.blk b/maps/SilphCo2F.blk new file mode 100644 index 00000000..33003175 --- /dev/null +++ b/maps/SilphCo2F.blk @@ -0,0 +1 @@ +@aaaaB====|=$}>D/F/F@cgaaaaaaAcgBDFD{{ @aab@cgAB66 UfD{ F66FD7/F77YG/FHIIIIJIIIIIHIIJ \ No newline at end of file diff --git a/maps/SilphCo3F.blk b/maps/SilphCo3F.blk new file mode 100644 index 00000000..15dcaf1f --- /dev/null +++ b/maps/SilphCo3F.blk @@ -0,0 +1 @@ +<=========|=}$>D//F`aaABaAaBZaaabd4VVVfD6GGFD/7Z/ZZ/CCFPIIIJIIIJVIIIQD//FHIIIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo4F.blk b/maps/SilphCo4F.blk new file mode 100644 index 00000000..4e6c32f8 --- /dev/null +++ b/maps/SilphCo4F.blk @@ -0,0 +1 @@ +<===>aaaa<|=$}>D55F/DFD555FGGD@cgBD55F/DD 4 FD5FcgaDD6FDF/DD 6 F@cgAcgApD6FD/D 7 FHIIIIIIIIIHIIIJ \ No newline at end of file diff --git a/maps/SilphCo5F.blk b/maps/SilphCo5F.blk new file mode 100644 index 00000000..1fa92a59 --- /dev/null +++ b/maps/SilphCo5F.blk @@ -0,0 +1 @@ +@aaB======|=}$>DV /FD/ZAAcgBFDZ`aBGG{FFPIIQdV6FFDVD6FFD5DZGGGFFD/5Z/HIJIIIIIJFHIIJIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo6F.blk b/maps/SilphCo6F.blk new file mode 100644 index 00000000..02d5b56e --- /dev/null +++ b/maps/SilphCo6F.blk @@ -0,0 +1 @@ +`aB====$}|==>d/V/FD`aAAcgBF d44444FF@ABD67776FFDV64446FFD77777FFDZgcgAAAcFHIJIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo7F.blk b/maps/SilphCo7F.blk new file mode 100644 index 00000000..a8dd509a --- /dev/null +++ b/maps/SilphCo7F.blk @@ -0,0 +1 @@ +@Aa`AAB}|=$>D/d""#qFDGD ZcgBD/@cgBF 4F@aaD44FF 6FDD66FF 7FD D77FFcgBDHIIIJF/FHIIIIIIIJWIIJ \ No newline at end of file diff --git a/maps/SilphCo8F.blk b/maps/SilphCo8F.blk new file mode 100644 index 00000000..5df4ebd8 --- /dev/null +++ b/maps/SilphCo8F.blk @@ -0,0 +1 @@ +@AABaab$}|==>D44FfFD66F/F@AAABD66VWQDCC FD76/FDFD/7ZGFDG FPIIJWJHXWQ/FHIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/SilphCo9F.blk b/maps/SilphCo9F.blk new file mode 100644 index 00000000..47d080dd --- /dev/null +++ b/maps/SilphCo9F.blk @@ -0,0 +1 @@ +@AAAABA}$|==>D/FFDZgAAB@cgYFDVGGFD4FDg@B D7FDZUV @cgBFPJCCDG{VFDCCCYZD/GFHIIIHJIHIIIIJ \ No newline at end of file diff --git a/maps/SilphCoElevator.blk b/maps/SilphCoElevator.blk new file mode 100644 index 00000000..824bc3de --- /dev/null +++ b/maps/SilphCoElevator.blk @@ -0,0 +1 @@ +*+() \ No newline at end of file diff --git a/maps/TradeCenter.blk b/maps/TradeCenter.blk new file mode 100644 index 00000000..638b48ef --- /dev/null +++ b/maps/TradeCenter.blk @@ -0,0 +1,4 @@ + + + !"# + diff --git a/maps/UndergroundPathNorthSouth.blk b/maps/UndergroundPathNorthSouth.blk new file mode 100644 index 00000000..6431328e --- /dev/null +++ b/maps/UndergroundPathNorthSouth.blk @@ -0,0 +1 @@ +                      \ No newline at end of file diff --git a/maps/UndergroundPathRoute5.blk b/maps/UndergroundPathRoute5.blk new file mode 100644 index 00000000..a17a7ed2 Binary files /dev/null and b/maps/UndergroundPathRoute5.blk differ diff --git a/maps/UndergroundPathRoute6.blk b/maps/UndergroundPathRoute6.blk new file mode 100644 index 00000000..a17a7ed2 Binary files /dev/null and b/maps/UndergroundPathRoute6.blk differ diff --git a/maps/UndergroundPathRoute7.blk b/maps/UndergroundPathRoute7.blk new file mode 100644 index 00000000..a17a7ed2 Binary files /dev/null and b/maps/UndergroundPathRoute7.blk differ diff --git a/maps/UndergroundPathRoute8.blk b/maps/UndergroundPathRoute8.blk new file mode 100644 index 00000000..a17a7ed2 Binary files /dev/null and b/maps/UndergroundPathRoute8.blk differ diff --git a/maps/UndergroundPathWestEast.blk b/maps/UndergroundPathWestEast.blk new file mode 100644 index 00000000..79ea699a --- /dev/null +++ b/maps/UndergroundPathWestEast.blk @@ -0,0 +1 @@ +     \ No newline at end of file diff --git a/maps/UnusedDiglettsCaveCopy.blk b/maps/UnusedDiglettsCaveCopy.blk new file mode 100755 index 00000000..ff81fc7d --- /dev/null +++ b/maps/UnusedDiglettsCaveCopy.blk @@ -0,0 +1 @@ +,+>++++> \ No newline at end of file diff --git a/maps/UnusedEmptyMap.blk b/maps/UnusedEmptyMap.blk new file mode 100755 index 00000000..21808bb7 --- /dev/null +++ b/maps/UnusedEmptyMap.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/UnusedPokecenterCopy.blk b/maps/UnusedPokecenterCopy.blk new file mode 100755 index 00000000..9641efe4 --- /dev/null +++ b/maps/UnusedPokecenterCopy.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/VermilionCity.blk b/maps/VermilionCity.blk new file mode 100644 index 00000000..6ba54a34 --- /dev/null +++ b/maps/VermilionCity.blk @@ -0,0 +1 @@ +CCC ! ! !1 !11111111Ckk|~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCCCCCTTTTTTTC-gCCCCCCCCTxxxxxxCCCkkkkkkkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTCCCCCCCCCC \ No newline at end of file diff --git a/maps/VermilionDock.blk b/maps/VermilionDock.blk new file mode 100644 index 00000000..f4a95739 --- /dev/null +++ b/maps/VermilionDock.blk @@ -0,0 +1,2 @@ +      +    \ No newline at end of file diff --git a/maps/VermilionGym.blk b/maps/VermilionGym.blk new file mode 100644 index 00000000..27bea181 --- /dev/null +++ b/maps/VermilionGym.blk @@ -0,0 +1 @@ +,%%&,,,*+*+''''''''''''''')( \ No newline at end of file diff --git a/maps/VermilionMart.blk b/maps/VermilionMart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/VermilionMart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/VermilionOldRodHouse.blk b/maps/VermilionOldRodHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/VermilionOldRodHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/VermilionPidgeyHouse.blk b/maps/VermilionPidgeyHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/VermilionPidgeyHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/VermilionPokecenter.blk b/maps/VermilionPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/VermilionPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/VermilionTradeHouse.blk b/maps/VermilionTradeHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/VermilionTradeHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/VictoryRoad1F.blk b/maps/VictoryRoad1F.blk new file mode 100644 index 00000000..4afaf65d --- /dev/null +++ b/maps/VictoryRoad1F.blk @@ -0,0 +1,2 @@ +b}}Nmt }Mz} + z}-+,-}j[oL MpOr f% lt ^}S$}Q}} \ No newline at end of file diff --git a/maps/VictoryRoad2F.blk b/maps/VictoryRoad2F.blk new file mode 100644 index 00000000..f4226ccf --- /dev/null +++ b/maps/VictoryRoad2F.blk @@ -0,0 +1 @@ +b```````````````````````````````````>bc#`7`````g`T1W12````M````&````--%a`e }e`````````` \ No newline at end of file diff --git a/maps/VictoryRoad3F.blk b/maps/VictoryRoad3F.blk new file mode 100644 index 00000000..53aa23eb --- /dev/null +++ b/maps/VictoryRoad3F.blk @@ -0,0 +1,2 @@ +M#t``````````` ```` l `,-``jkko`````( f+p`` '`%`````````````````````i( + \ No newline at end of file diff --git a/maps/ViridianCity.blk b/maps/ViridianCity.blk new file mode 100644 index 00000000..af1bd662 --- /dev/null +++ b/maps/ViridianCity.blk @@ -0,0 +1,60 @@ +,,),,)111111,,) +RRR4111 1,,)M111,,)M,,)M1WW%Mwwwwwwww + + +M1 +llllww + ! +?;tt +|s +,)o + + + +,) +4tt +t !t + +,) + + +|r + +tW%eCd// +Mt + + + + + +tttt +Mwwwwwwwwwwwwwww + + + + + +M + +MN + +N + + + + + + + + + + +M + +MN + +N + + + + diff --git a/maps/ViridianForest.blk b/maps/ViridianForest.blk new file mode 100644 index 00000000..358ea01d --- /dev/null +++ b/maps/ViridianForest.blk @@ -0,0 +1 @@ +7999999999999I7;))55555);7;);7;7;7;);7;7;7;77);7);7;7;7!);7;7;7;7;7;7;)!);77X; \ No newline at end of file diff --git a/maps/ViridianForestNorthGate.blk b/maps/ViridianForestNorthGate.blk new file mode 100644 index 00000000..19af9540 Binary files /dev/null and b/maps/ViridianForestNorthGate.blk differ diff --git a/maps/ViridianForestSouthGate.blk b/maps/ViridianForestSouthGate.blk new file mode 100644 index 00000000..19af9540 Binary files /dev/null and b/maps/ViridianForestSouthGate.blk differ diff --git a/maps/ViridianGym.blk b/maps/ViridianGym.blk new file mode 100644 index 00000000..4396d338 --- /dev/null +++ b/maps/ViridianGym.blk @@ -0,0 +1 @@ +IJ_]KQdVcFF^\RFNSTULa`LUHH[L@DLLML,ULQ`G,XHHHZbCEWFFFY21@AB \ No newline at end of file diff --git a/maps/ViridianMart.blk b/maps/ViridianMart.blk new file mode 100644 index 00000000..1da8fffc --- /dev/null +++ b/maps/ViridianMart.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/ViridianNicknameHouse.blk b/maps/ViridianNicknameHouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/ViridianNicknameHouse.blk @@ -0,0 +1 @@ +    \ No newline at end of file diff --git a/maps/ViridianPokecenter.blk b/maps/ViridianPokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/ViridianPokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/maps/ViridianSchoolHouse.blk b/maps/ViridianSchoolHouse.blk new file mode 100644 index 00000000..51bf8401 --- /dev/null +++ b/maps/ViridianSchoolHouse.blk @@ -0,0 +1 @@ +   \ No newline at end of file diff --git a/maps/WardensHouse.blk b/maps/WardensHouse.blk new file mode 100644 index 00000000..1ad21f96 --- /dev/null +++ b/maps/WardensHouse.blk @@ -0,0 +1 @@ +)    \ No newline at end of file diff --git a/maps/agatha.blk b/maps/agatha.blk deleted file mode 100644 index 4167fdc5..00000000 --- a/maps/agatha.blk +++ /dev/null @@ -1 +0,0 @@ -GG6GGg66NeRN6eReg6eeRK6eRgR6hh \ No newline at end of file diff --git a/maps/bikeshop.blk b/maps/bikeshop.blk deleted file mode 100644 index 925be45c..00000000 --- a/maps/bikeshop.blk +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/maps/billshouse.blk b/maps/billshouse.blk deleted file mode 100644 index 112a2e81..00000000 --- a/maps/billshouse.blk +++ /dev/null @@ -1,2 +0,0 @@ - -   \ No newline at end of file diff --git a/maps/blueshouse.blk b/maps/blueshouse.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/blueshouse.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/bruno.blk b/maps/bruno.blk deleted file mode 100644 index 2ecc677e..00000000 --- a/maps/bruno.blk +++ /dev/null @@ -1,4 +0,0 @@ - -  -    - \ No newline at end of file diff --git a/maps/celadoncity.blk b/maps/celadoncity.blk deleted file mode 100644 index f1fce6bc..00000000 --- a/maps/celadoncity.blk +++ /dev/null @@ -1,28 +0,0 @@ -lllllllllllllllllllllll - - - - - - - - -oo -ooo -oooooo -n !UUUU !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! ! -n7~7~7~UU7~|~|~7~|~ -nUUUUUyUU !UUUUUUUUUUUU -n/7~UUUUUUUUUUUU -n - - - - - - - - - -llllll26llll -nooooooooooooooooo6ooooo \ No newline at end of file diff --git a/maps/celadondiner.blk b/maps/celadondiner.blk deleted file mode 100644 index 4ef657b9..00000000 --- a/maps/celadondiner.blk +++ /dev/null @@ -1 +0,0 @@ -,*.20 ! - ! 1() \ No newline at end of file diff --git a/maps/celadongamecorner.blk b/maps/celadongamecorner.blk deleted file mode 100644 index 82fd0b61..00000000 --- a/maps/celadongamecorner.blk +++ /dev/null @@ -1,5 +0,0 @@ - - - - -4***C*///3 : : : :9!9!9!99!9!9!98!8!8!8 () \ No newline at end of file diff --git a/maps/celadongym.blk b/maps/celadongym.blk deleted file mode 100644 index dcecc50c..00000000 --- a/maps/celadongym.blk +++ /dev/null @@ -1 +0,0 @@ -38:933<3=33;?>3344356344321 \ No newline at end of file diff --git a/maps/celadonhotel.blk b/maps/celadonhotel.blk deleted file mode 100644 index 07a8b781..00000000 --- a/maps/celadonhotel.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/celadonhouse.blk b/maps/celadonhouse.blk deleted file mode 100644 index 4181d9de..00000000 --- a/maps/celadonhouse.blk +++ /dev/null @@ -1 +0,0 @@ -D@?D BC FG 6A 6 \ No newline at end of file diff --git a/maps/celadonmansion1.blk b/maps/celadonmansion1.blk deleted file mode 100644 index 97a1a91f..00000000 --- a/maps/celadonmansion1.blk +++ /dev/null @@ -1 +0,0 @@ -$*   > \ No newline at end of file diff --git a/maps/celadonmansion2.blk b/maps/celadonmansion2.blk deleted file mode 100644 index 920282c1..00000000 --- a/maps/celadonmansion2.blk +++ /dev/null @@ -1 +0,0 @@ -' +/  \ No newline at end of file diff --git a/maps/celadonmansion3.blk b/maps/celadonmansion3.blk deleted file mode 100644 index 5451ea7d..00000000 --- a/maps/celadonmansion3.blk +++ /dev/null @@ -1,2 +0,0 @@ -()#,- -   \ No newline at end of file diff --git a/maps/celadonmansion4.blk b/maps/celadonmansion4.blk deleted file mode 100644 index dafad3db..00000000 --- a/maps/celadonmansion4.blk +++ /dev/null @@ -1 +0,0 @@ -E;=!"%&3  \ No newline at end of file diff --git a/maps/celadonmansion5.blk b/maps/celadonmansion5.blk deleted file mode 100644 index 51bf8401..00000000 --- a/maps/celadonmansion5.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/celadonmart1.blk b/maps/celadonmart1.blk deleted file mode 100644 index 0c805e4c..00000000 --- a/maps/celadonmart1.blk +++ /dev/null @@ -1 +0,0 @@ - %    &   \ No newline at end of file diff --git a/maps/celadonmart2.blk b/maps/celadonmart2.blk deleted file mode 100644 index 4ddd4f4b..00000000 --- a/maps/celadonmart2.blk +++ /dev/null @@ -1,4 +0,0 @@ - %       - - - diff --git a/maps/celadonmart3.blk b/maps/celadonmart3.blk deleted file mode 100644 index 3be70750..00000000 --- a/maps/celadonmart3.blk +++ /dev/null @@ -1,2 +0,0 @@ - $$$$%      - diff --git a/maps/celadonmart4.blk b/maps/celadonmart4.blk deleted file mode 100644 index 2066e69e..00000000 --- a/maps/celadonmart4.blk +++ /dev/null @@ -1,4 +0,0 @@ - %     ' - - - \ No newline at end of file diff --git a/maps/celadonmart5.blk b/maps/celadonmart5.blk deleted file mode 100644 index 8558b3de..00000000 --- a/maps/celadonmart5.blk +++ /dev/null @@ -1,4 +0,0 @@ - %       - - - diff --git a/maps/celadonmartelevator.blk b/maps/celadonmartelevator.blk deleted file mode 100644 index 824bc3de..00000000 --- a/maps/celadonmartelevator.blk +++ /dev/null @@ -1 +0,0 @@ -*+() \ No newline at end of file diff --git a/maps/celadonmartroof.blk b/maps/celadonmartroof.blk deleted file mode 100644 index 520407ba..00000000 --- a/maps/celadonmartroof.blk +++ /dev/null @@ -1 +0,0 @@ -6;??A6! >>>> = \ No newline at end of file diff --git a/maps/ceruleancity.blk b/maps/ceruleancity.blk deleted file mode 100644 index d7abfd3d..00000000 --- a/maps/ceruleancity.blk +++ /dev/null @@ -1,25 +0,0 @@ -,,,,,,)CCTN -CCCCCC,,+WWW%CCTPCCCCCC,,)CCCCCC -N -CCCCCC,,)lllll6 -mnllllm,,)UUUUUn -mnUUUUmWWp 0  0 111 - - - - - -N\  ! -Pkkk - - - -|r  - -/\bQQN -tttttt111_NttN ! !ttt_NttN -V|~0 |s0 _NttN_Nttbllll6V2llllllllNttNNttPRRm]nN]MRRRRNtttttm'n - - - -N'Mttttt \ No newline at end of file diff --git a/maps/ceruleangym.blk b/maps/ceruleangym.blk deleted file mode 100644 index c5a3eab2..00000000 --- a/maps/ceruleangym.blk +++ /dev/null @@ -1 +0,0 @@ -!#"#  \ No newline at end of file diff --git a/maps/ceruleanhouse1.blk b/maps/ceruleanhouse1.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/ceruleanhouse1.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/ceruleanhouse2.blk b/maps/ceruleanhouse2.blk deleted file mode 100644 index 35443909..00000000 --- a/maps/ceruleanhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -= ==  ,  5 \ No newline at end of file diff --git a/maps/ceruleanhousetrashed.blk b/maps/ceruleanhousetrashed.blk deleted file mode 100644 index cbc77e74..00000000 --- a/maps/ceruleanhousetrashed.blk +++ /dev/null @@ -1 +0,0 @@ - ! " \ No newline at end of file diff --git a/maps/ceruleanmart.blk b/maps/ceruleanmart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/ceruleanmart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/ceruleanpokecenter.blk b/maps/ceruleanpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/ceruleanpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/cinnabargym.blk b/maps/cinnabargym.blk deleted file mode 100644 index ab8de94a..00000000 --- a/maps/cinnabargym.blk +++ /dev/null @@ -1 +0,0 @@ -@aa@@aAAAADDDYDDDDkcDkckcDDDDDDDPXkcDkcDEDHUDDD, \ No newline at end of file diff --git a/maps/cinnabarisland.blk b/maps/cinnabarisland.blk deleted file mode 100644 index 1a7922c9..00000000 --- a/maps/cinnabarisland.blk +++ /dev/null @@ -1 +0,0 @@ -d !{{ d7:~{yd{{y{{{{{d !{{{{{d7:~ ! !{d{{y|r|s{-{{{{{{{C-kkkkkkkkk \ No newline at end of file diff --git a/maps/cinnabarmart.blk b/maps/cinnabarmart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/cinnabarmart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/cinnabarpokecenter.blk b/maps/cinnabarpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/cinnabarpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/colosseum.blk b/maps/colosseum.blk deleted file mode 100644 index d05a5b43..00000000 --- a/maps/colosseum.blk +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maps/copycatshouse1f.blk b/maps/copycatshouse1f.blk deleted file mode 100644 index 1b7d4f07..00000000 --- a/maps/copycatshouse1f.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/copycatshouse2f.blk b/maps/copycatshouse2f.blk deleted file mode 100644 index dd9d1ea4..00000000 --- a/maps/copycatshouse2f.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/daycarem.blk b/maps/daycarem.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/daycarem.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/diglettscave.blk b/maps/diglettscave.blk deleted file mode 100644 index ff81fc7d..00000000 --- a/maps/diglettscave.blk +++ /dev/null @@ -1 +0,0 @@ -,+>++++> \ No newline at end of file diff --git a/maps/diglettscaveentranceroute11.blk b/maps/diglettscaveentranceroute11.blk deleted file mode 100644 index 5282c7dd..00000000 --- a/maps/diglettscaveentranceroute11.blk +++ /dev/null @@ -1,2 +0,0 @@ -}}}}}'} -$} \ No newline at end of file diff --git a/maps/diglettscaveroute2.blk b/maps/diglettscaveroute2.blk deleted file mode 100644 index 5282c7dd..00000000 --- a/maps/diglettscaveroute2.blk +++ /dev/null @@ -1,2 +0,0 @@ -}}}}}'} -$} \ No newline at end of file diff --git a/maps/fanclub.blk b/maps/fanclub.blk deleted file mode 100644 index 2622e175..00000000 --- a/maps/fanclub.blk +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/maps/fightingdojo.blk b/maps/fightingdojo.blk deleted file mode 100644 index 3b13cc90..00000000 --- a/maps/fightingdojo.blk +++ /dev/null @@ -1 +0,0 @@ -IJgIJKQPLKLKLK21LRFFo \ No newline at end of file diff --git a/maps/fuchsiacity.blk b/maps/fuchsiacity.blk deleted file mode 100644 index e57addb1..00000000 --- a/maps/fuchsiacity.blk +++ /dev/null @@ -1,4 +0,0 @@ - !zoooooz7:~zooooooznttmVUwnmnwVwVmzoo`wVwVwmzzzzzzznzzzzzzzzzzz !oooo`z !nlllmzz|szzzzzz7:~`wVwmzoooooyzznVUVzzzzzogmzznUlllll11NkkkPRR`Uwwww11NU_tnN>?????????;_t - - -nN$ !WWWW !%_8989nNX|~0|rY1<=<=1nNX11111111Y_Vw1wnNZ\ooo\[11nPRRRR>?;ttttPRRRRRn11111(,)1111>?; \ No newline at end of file diff --git a/maps/fuchsiagym.blk b/maps/fuchsiagym.blk deleted file mode 100644 index dd4f5019..00000000 --- a/maps/fuchsiagym.blk +++ /dev/null @@ -1 +0,0 @@ --.0-/0/-/--/./0---21 \ No newline at end of file diff --git a/maps/fuchsiahouse1.blk b/maps/fuchsiahouse1.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/fuchsiahouse1.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/fuchsiahouse2.blk b/maps/fuchsiahouse2.blk deleted file mode 100644 index 1ad21f96..00000000 --- a/maps/fuchsiahouse2.blk +++ /dev/null @@ -1 +0,0 @@ -)    \ No newline at end of file diff --git a/maps/fuchsiahouse3.blk b/maps/fuchsiahouse3.blk deleted file mode 100644 index 35443909..00000000 --- a/maps/fuchsiahouse3.blk +++ /dev/null @@ -1 +0,0 @@ -= ==  ,  5 \ No newline at end of file diff --git a/maps/fuchsiamart.blk b/maps/fuchsiamart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/fuchsiamart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/fuchsiameetingroom.blk b/maps/fuchsiameetingroom.blk deleted file mode 100644 index a1c8d921..00000000 --- a/maps/fuchsiameetingroom.blk +++ /dev/null @@ -1 +0,0 @@ -589467777   \ No newline at end of file diff --git a/maps/fuchsiapokecenter.blk b/maps/fuchsiapokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/fuchsiapokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/gary.blk b/maps/gary.blk deleted file mode 100644 index 8e5d10d0..00000000 --- a/maps/gary.blk +++ /dev/null @@ -1 +0,0 @@ -I12JKLKLR12o \ No newline at end of file diff --git a/maps/halloffameroom.blk b/maps/halloffameroom.blk deleted file mode 100644 index f1aa64a4..00000000 --- a/maps/halloffameroom.blk +++ /dev/null @@ -1 +0,0 @@ -e7l \ No newline at end of file diff --git a/maps/indigoplateau.blk b/maps/indigoplateau.blk deleted file mode 100644 index a850b3c6..00000000 --- a/maps/indigoplateau.blk +++ /dev/null @@ -1 +0,0 @@ -!"'')))CB***,,,(CB(+++)))CB***,,,(CB(+++)))CB***,,,(CB(+++ \ No newline at end of file diff --git a/maps/indigoplateaulobby.blk b/maps/indigoplateaulobby.blk deleted file mode 100644 index 38561b84..00000000 Binary files a/maps/indigoplateaulobby.blk and /dev/null differ diff --git a/maps/lab1.blk b/maps/lab1.blk deleted file mode 100644 index 7a6502a2..00000000 --- a/maps/lab1.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/lab2.blk b/maps/lab2.blk deleted file mode 100644 index ef77b656..00000000 --- a/maps/lab2.blk +++ /dev/null @@ -1,2 +0,0 @@ -  -  \ No newline at end of file diff --git a/maps/lab3.blk b/maps/lab3.blk deleted file mode 100644 index 822db175..00000000 --- a/maps/lab3.blk +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/maps/lab4.blk b/maps/lab4.blk deleted file mode 100644 index d9a64a5d..00000000 --- a/maps/lab4.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/lance.blk b/maps/lance.blk deleted file mode 100644 index b05f1c35..00000000 --- a/maps/lance.blk +++ /dev/null @@ -1 +0,0 @@ -I12JI12JK21LKLK21LKLK21LR12oK21LK21LRVrsNoKLIJKLKpKLKSFFoKLKLKUHHH[LRFFFFFFFo \ No newline at end of file diff --git a/maps/lavenderhouse1.blk b/maps/lavenderhouse1.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/lavenderhouse1.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/lavenderhouse2.blk b/maps/lavenderhouse2.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/lavenderhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/lavendermart.blk b/maps/lavendermart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/lavendermart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/lavenderpokecenter.blk b/maps/lavenderpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/lavenderpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/lavendertown.blk b/maps/lavendertown.blk deleted file mode 100644 index d094f3b9..00000000 --- a/maps/lavendertown.blk +++ /dev/null @@ -1 +0,0 @@ -WW%{{(hi,{ !{y(7}~,{|r{{$WW*{{{{{{{{y({{yy{{{({{{{{{{ !({{{|s({{{{{{{{{(???;{>???, \ No newline at end of file diff --git a/maps/lorelei.blk b/maps/lorelei.blk deleted file mode 100644 index 8df8e929..00000000 --- a/maps/lorelei.blk +++ /dev/null @@ -1 +0,0 @@ -!!$!!  DD \ No newline at end of file diff --git a/maps/mansion1.blk b/maps/mansion1.blk deleted file mode 100644 index afcb8e7e..00000000 --- a/maps/mansion1.blk +++ /dev/null @@ -1,9 +0,0 @@ -@AAAAAAAAAAAAAB\S]\wGF@c]DCFSXWXUFPIIXF8G]D:; -FCC181]D?; -SJIIIXWQD?; -F]D?; -FHXWQD?; -F R]D?; -FDFD?; -F NDFD?; -FFHX?;WJIIIIII \ No newline at end of file diff --git a/maps/mansion2.blk b/maps/mansion2.blk deleted file mode 100644 index 37896766..00000000 --- a/maps/mansion2.blk +++ /dev/null @@ -1 +0,0 @@ -heejBAABAAA@aei\VFGp]\VXW8FDCCZ1FPIIIJ `cgAeiDwon d8FDZ8SIX8WQka*]8FnFD1FlOkaaBFlDVVlDGGSlDZFlHIIJIJm \ No newline at end of file diff --git a/maps/mansion3.blk b/maps/mansion3.blk deleted file mode 100644 index 1a86bc71..00000000 --- a/maps/mansion3.blk +++ /dev/null @@ -1 +0,0 @@ -@AAsAeeBaaa@DVU\81wG1\Z18F\8gi VIIIQDo] 8FDG1]ItWRWIQ\]DoFHIIHIIJ \ No newline at end of file diff --git a/maps/mansion4.blk b/maps/mansion4.blk deleted file mode 100644 index 9ced2192..00000000 --- a/maps/mansion4.blk +++ /dev/null @@ -1 +0,0 @@ -`aaaBaaaabAAAABdFfwCCCFDGVXWIJIXWQDF@cgBAAAAAAABFD  FFFDFFFD  FFFPIIIJZaaYVQDFDFDVGDFDDnFDZwDFHIIIIIJIIIHIIIJ \ No newline at end of file diff --git a/maps/mtmoon1.blk b/maps/mtmoon1.blk deleted file mode 100644 index 04edbba7..00000000 --- a/maps/mtmoon1.blk +++ /dev/null @@ -1 +0,0 @@ - !!!!!!!!!!!!!!!!!"( " " "(( !" !!"* " !!"$ !!!!!!!!" \ No newline at end of file diff --git a/maps/mtmoon2.blk b/maps/mtmoon2.blk deleted file mode 100644 index ee1aa030..00000000 --- a/maps/mtmoon2.blk +++ /dev/null @@ -1 +0,0 @@ -??????<==??????=<?????????=<???????< \ No newline at end of file diff --git a/maps/mtmoon3.blk b/maps/mtmoon3.blk deleted file mode 100644 index 216fe705..00000000 --- a/maps/mtmoon3.blk +++ /dev/null @@ -1 +0,0 @@ -..................//......../fED/AB.@AB../=/)/333)+/> .....//../3333/0...../D))E/=HI333/33JGGGGK/....@AB./../)///,/=/88888888889999999999 \ No newline at end of file diff --git a/maps/mtmoonpokecenter.blk b/maps/mtmoonpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/mtmoonpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/museum1f.blk b/maps/museum1f.blk deleted file mode 100644 index a96771ba..00000000 Binary files a/maps/museum1f.blk and /dev/null differ diff --git a/maps/museum2f.blk b/maps/museum2f.blk deleted file mode 100644 index 355e5d80..00000000 Binary files a/maps/museum2f.blk and /dev/null differ diff --git a/maps/namerater.blk b/maps/namerater.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/namerater.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/oakslab.blk b/maps/oakslab.blk deleted file mode 100644 index 64d2d6a2..00000000 --- a/maps/oakslab.blk +++ /dev/null @@ -1 +0,0 @@ -efghhkkijmnhhhh \ No newline at end of file diff --git a/maps/pallettown.blk b/maps/pallettown.blk deleted file mode 100644 index 64e5b9cc..00000000 Binary files a/maps/pallettown.blk and /dev/null differ diff --git a/maps/pewtercity.blk b/maps/pewtercity.blk deleted file mode 100644 index b199480b..00000000 --- a/maps/pewtercity.blk +++ /dev/null @@ -1,57 +0,0 @@ - - -RRRRRRRRRRRRRRRooo?;tt  !oo -ttn,)ttuqqv|}~ -4 -ttn,)/7}:~B/B,) - - - - - - -n,)tttttt>??,) - - - -(,,,) - -  !$WW,) - - -|s - - -,),)ooooo - - - - - ->??,) !1wVww1(,,,) - - -|rtnttttm$WW,)nttttmM - -+%t - - -n/mM - -)M - -%QQQQQQQQQQ - - - - - - - - - - - - - - diff --git a/maps/pewtergym.blk b/maps/pewtergym.blk deleted file mode 100644 index e7fc2212..00000000 --- a/maps/pewtergym.blk +++ /dev/null @@ -1,4 +0,0 @@ - - - -       \ No newline at end of file diff --git a/maps/pewterhouse1.blk b/maps/pewterhouse1.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/pewterhouse1.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/pewterhouse2.blk b/maps/pewterhouse2.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/pewterhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/pewtermart.blk b/maps/pewtermart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/pewtermart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/pewterpokecenter.blk b/maps/pewterpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/pewterpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/pokemontower1.blk b/maps/pokemontower1.blk deleted file mode 100644 index 25afe15f..00000000 --- a/maps/pokemontower1.blk +++ /dev/null @@ -1,3 +0,0 @@ - - 9  -9 %?? %  \ No newline at end of file diff --git a/maps/pokemontower2.blk b/maps/pokemontower2.blk deleted file mode 100644 index c8acf99d..00000000 --- a/maps/pokemontower2.blk +++ /dev/null @@ -1,2 +0,0 @@ -`[a[Q ^L666_  -6RLL6RRRR6R6 WRRROX 666 SVT \ No newline at end of file diff --git a/maps/pokemontower3.blk b/maps/pokemontower3.blk deleted file mode 100644 index 26d28b79..00000000 --- a/maps/pokemontower3.blk +++ /dev/null @@ -1,3 +0,0 @@ - -[Q 9OOOOX  -PPRQPQ 9NLLML VV SVT \ No newline at end of file diff --git a/maps/pokemontower4.blk b/maps/pokemontower4.blk deleted file mode 100644 index 2df4ab1a..00000000 --- a/maps/pokemontower4.blk +++ /dev/null @@ -1,3 +0,0 @@ - - [Q ^QOL_  -fONMOOMOgNOg 9f NO SU \ No newline at end of file diff --git a/maps/pokemontower5.blk b/maps/pokemontower5.blk deleted file mode 100644 index a05a575c..00000000 --- a/maps/pokemontower5.blk +++ /dev/null @@ -1,2 +0,0 @@ - -[e66 WiL6LjX :66OO66PR636RQP66OL6 ^gOOh_ 666  \ No newline at end of file diff --git a/maps/pokemontower6.blk b/maps/pokemontower6.blk deleted file mode 100644 index 7256a841..00000000 --- a/maps/pokemontower6.blk +++ /dev/null @@ -1,2 +0,0 @@ -`[a]66 ^NL6R6_  -6666R6LZRPOOL66O6LLOO W6O6OQX O6R 0 \ No newline at end of file diff --git a/maps/pokemontower7.blk b/maps/pokemontower7.blk deleted file mode 100644 index 4598f336..00000000 --- a/maps/pokemontower7.blk +++ /dev/null @@ -1 +0,0 @@ -lm 9  9 9 59    1 \ No newline at end of file diff --git a/maps/powerplant.blk b/maps/powerplant.blk deleted file mode 100644 index 7f2d7eeb..00000000 --- a/maps/powerplant.blk +++ /dev/null @@ -1 +0,0 @@ -@aaaheeieeeeieeeeeeiDp1]F55]Dh*gic+aYF815]@cg\81]cDF81]D\1]1DF8]p\8qDF81]heeA@Aeic+aDVIXWIIQ\p1]IIIHIIIIIXRF\R]DF`a*\8]5555DFdDqDFD1aa*+abIIIIIIIIIIUFD8f81]hcghe*V11]\8k11]\1k*gaaeaa@c+aaeiD1\D FHX,WHIIIIIIIHIIIIIIJ \ No newline at end of file diff --git a/maps/redshouse1f.blk b/maps/redshouse1f.blk deleted file mode 100644 index 1b7d4f07..00000000 --- a/maps/redshouse1f.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/redshouse2f.blk b/maps/redshouse2f.blk deleted file mode 100644 index dd9d1ea4..00000000 --- a/maps/redshouse2f.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/rockethideout1.blk b/maps/rockethideout1.blk deleted file mode 100644 index 18b02211..00000000 --- a/maps/rockethideout1.blk +++ /dev/null @@ -1 +0,0 @@ -.........@AAB...........DnoF......@AAAAcgAB....DF....@*+B  @*+B....DF  DF....DGGF  DGGF....F  F....@AAAAAABgB....444F,WJ....666F.......666F.......777oF.......HIIIIIIJ... \ No newline at end of file diff --git a/maps/rockethideout2.blk b/maps/rockethideout2.blk deleted file mode 100644 index b8fc41f8..00000000 --- a/maps/rockethideout2.blk +++ /dev/null @@ -1,3 +0,0 @@ -.............................................@AAzAAAAA@ABAABD -UoF nFy9&F FD - 'V Fy5YFD5)@AAAABD)US,WJD ) F...D  YnF...D)& DF...HI3333333HIJ... \ No newline at end of file diff --git a/maps/rockethideout3.blk b/maps/rockethideout3.blk deleted file mode 100644 index 23b45286..00000000 --- a/maps/rockethideout3.blk +++ /dev/null @@ -1,2 +0,0 @@ -..................................@AAAAAAAAAB....DnF....@AAAAcZIXF....y&FF....y&5WIQ....D5 &FF....D')F....D5oFIIIJ....y -`*qb.......D)df.......@A*gpF.......HIIIIIIJ... \ No newline at end of file diff --git a/maps/rockethideout4.blk b/maps/rockethideout4.blk deleted file mode 100644 index 389c1c7c..00000000 --- a/maps/rockethideout4.blk +++ /dev/null @@ -1 +0,0 @@ -....`aaa@ABaaaB....dpFF....DGGRFGGF....PIIIDF F....D DF f....DG DnFXWQ....DGgpSJF....DFS,WJ....`aaaacF.......dF.......DGG F.......HIIIIIIJ... \ No newline at end of file diff --git a/maps/rockethideoutelevator.blk b/maps/rockethideoutelevator.blk deleted file mode 100644 index 0c296a34..00000000 --- a/maps/rockethideoutelevator.blk +++ /dev/null @@ -1 +0,0 @@ -DMGJLKJ KHFI \ No newline at end of file diff --git a/maps/rocktunnel1.blk b/maps/rocktunnel1.blk deleted file mode 100644 index bbd18ce6..00000000 --- a/maps/rocktunnel1.blk +++ /dev/null @@ -1 +0,0 @@ - " "(>( " " "( " " " "( " " " " "*>NQRMN \ No newline at end of file diff --git a/maps/rocktunnel2.blk b/maps/rocktunnel2.blk deleted file mode 100644 index a579831b..00000000 --- a/maps/rocktunnel2.blk +++ /dev/null @@ -1 +0,0 @@ - " " " " " " " " ">>> " " " " " " " "> " " " " " " " " " " " " " " \ No newline at end of file diff --git a/maps/rocktunnelpokecenter.blk b/maps/rocktunnelpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/rocktunnelpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/route1.blk b/maps/route1.blk deleted file mode 100644 index 56a9e4a3..00000000 --- a/maps/route1.blk +++ /dev/null @@ -1,38 +0,0 @@ - -MRRO1PRRN -M - - -1 - -tN -MB11N -nttn m -nB m -n -tt -111m -noo m -M - -tt1 N -M -1111ttN -M//N -M -111111N -Moooo N -M - -tt 1N -M1N -n - 1 - m -n t1 tm -nQQc bQQm -n - -M N - -m \ No newline at end of file diff --git a/maps/route10.blk b/maps/route10.blk deleted file mode 100644 index aed525c5..00000000 --- a/maps/route10.blk +++ /dev/null @@ -1,43 +0,0 @@ -WWWWWWWWW*CCCCCCCCC(aaaaaaae( - Me( - Me(;/Oe() - - - - - -Me(,???; - -Me(+WWWp !Me()1wV5|rMe() - - -5UUMe()UUU5 - -Me()UUU5 - -Me()UUU - - -Me() - - - - - -Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{(){e(){{{{$%{e(){{{{{{{e().(,????????,,,,,,,+WW*+WWWW% -L()11111 - -()1111>;/()>??,) - -()z$WWW%/() - - - - - - -z(,???; - - - -(,,+W%/ (,,)zzzuqv(,,)z1>hi, \ No newline at end of file diff --git a/maps/route11.blk b/maps/route11.blk deleted file mode 100644 index c026d913..00000000 --- a/maps/route11.blk +++ /dev/null @@ -1,34 +0,0 @@ -1111mI#####H I####H - - - - -1>?;m' ' ' ^ - - - - -V$%m' ' ' -L - - -11111" I##" &##H oo !m' ' ' ' ' 7}}~ -CCCdmD##E D###" ' ]ll - - -CCCdm ' ' ' - - - - -m] &##" ' - - - - -D#########E D###E - - - - - \ No newline at end of file diff --git a/maps/route11gate.blk b/maps/route11gate.blk deleted file mode 100644 index d1a18368..00000000 Binary files a/maps/route11gate.blk and /dev/null differ diff --git a/maps/route11gateupstairs.blk b/maps/route11gateupstairs.blk deleted file mode 100644 index f90c7db9..00000000 Binary files a/maps/route11gateupstairs.blk and /dev/null differ diff --git a/maps/route12.blk b/maps/route12.blk deleted file mode 100644 index d79f59e3..00000000 --- a/maps/route12.blk +++ /dev/null @@ -1,21 +0,0 @@ -,,,)1(,,,,,+W%1$WWWW,)CCTCCCC,)CCTCCkk,)CCTCCCC,)TTzTCCC,)TxxTyTT,)TCCTxxx,)TC !CC,)xChiCC,)kk7:~kk,)CCCTCCC,)CCCTCCC,)TTTzTTC,)xxxxxTC,)TCCTTTC,)TCCTxxC,)zTTTCTCW%TxxxCTCTCCCCxCzTzTTTCTxTxxxCxCTTTCCCCxxzTCTTTCTxCTxTCTTCTCTTzTCTCxxxxCTTTzTTCxxxTxxC66kkkTCCCLLaaayCCCxxxTCCCCCCTCCCCCCTCCCCCCTCCC -nCCCTTTC -nCCCxxTC -nT111C -nTwwwwwC -nTxxxxxC -nTTTzTCC -nxxxTxCC -nl6CTCCC -n -5TTCCC -nl -xzTTC -nTTTTxxC -nxxxTTTC -nCCCxxTC -nll3TzTC -n nxTxC -n nCTCC -n nTzCC -n nTxCC \ No newline at end of file diff --git a/maps/route12gate.blk b/maps/route12gate.blk deleted file mode 100644 index 5c626eaf..00000000 Binary files a/maps/route12gate.blk and /dev/null differ diff --git a/maps/route12gateupstairs.blk b/maps/route12gateupstairs.blk deleted file mode 100644 index f90c7db9..00000000 Binary files a/maps/route12gateupstairs.blk and /dev/null differ diff --git a/maps/route12house.blk b/maps/route12house.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/route12house.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/route13.blk b/maps/route13.blk deleted file mode 100644 index 9d607b6d..00000000 --- a/maps/route13.blk +++ /dev/null @@ -1,2 +0,0 @@ -11111111111111111TCCCwwwwwwwwwwwwwwwwwllllllTCCCwwwwww1wwww1wwV4 - nTCCCwwwww1wwwwwwwwwm nTCCCww1wwwwwwwww1woooooTCCCwww1wwwwww1wwVw1TTTTTTTTCCCww1wwwVwwwwwwwwwxxxxxxxxCCCQQQQQQQjCCCCCCCCCCCCCCCCCCCkkkkkkkkkkk \ No newline at end of file diff --git a/maps/route14.blk b/maps/route14.blk deleted file mode 100644 index 38cae243..00000000 --- a/maps/route14.blk +++ /dev/null @@ -1,74 +0,0 @@ - -M11111111 -Mwwwwwwww -M1wwwwwww -Mwwwww1ww -Mw1wwwwww -Mwwww1www -M111 -U -w -M111 -UM -M -UM -M mUM -M mUM -M mUMCC -MnmUMCC -M5 -UmUMCC -M - -UmU -cC -M - -UmU -MC -M - -U5U -MC -M - -UmU -MC - -UmU -MC - -UmU -MCUnUUU -U -MC5 - - - -U -MC - - - - - -U -MCUUUUUUU -MC - - - - - - - -MCQQQQQQQQQC - - - - - - - - -C \ No newline at end of file diff --git a/maps/route15.blk b/maps/route15.blk deleted file mode 100644 index 77a33889..00000000 --- a/maps/route15.blk +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -oL - - - - -RRRRRRRRRRRRRRRRRRRRR - - - - -NUUUUUUUUUUUUUUUUUUUUUURR !P11117}~UU ttt 11tt t tQQ - - -NUUUUUUUUUUUUUUUUUUUUUU - - - - -N1111111111111111111111l - - - - - -QQQQQQQQQQQQQQQQQQQQQQQ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maps/route15gate.blk b/maps/route15gate.blk deleted file mode 100644 index d1a18368..00000000 Binary files a/maps/route15gate.blk and /dev/null differ diff --git a/maps/route15gateupstairs.blk b/maps/route15gateupstairs.blk deleted file mode 100755 index f90c7db9..00000000 Binary files a/maps/route15gateupstairs.blk and /dev/null differ diff --git a/maps/route16.blk b/maps/route16.blk deleted file mode 100644 index d3a7d5e5..00000000 --- a/maps/route16.blk +++ /dev/null @@ -1,22 +0,0 @@ -RRRRRRRRRRRRRRRRRRN - - - - - - - - ! - - N7}~ N - - - ! -Pwwwwwwwwhiooooo`N1 - -111117}~wVwwwwwwN1 - -11111111N1 - -11bQQQQQN111 -N \ No newline at end of file diff --git a/maps/route16gate.blk b/maps/route16gate.blk deleted file mode 100644 index 9cd90e33..00000000 Binary files a/maps/route16gate.blk and /dev/null differ diff --git a/maps/route16gateupstairs.blk b/maps/route16gateupstairs.blk deleted file mode 100644 index f90c7db9..00000000 Binary files a/maps/route16gateupstairs.blk and /dev/null differ diff --git a/maps/route16house.blk b/maps/route16house.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/route16house.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/route17.blk b/maps/route17.blk deleted file mode 100644 index 2a27af66..00000000 --- a/maps/route17.blk +++ /dev/null @@ -1 +0,0 @@ -N]tt]tNeCCN'tt'tNeCCN'tt'tQQQcN'tt'ttttMN'tt't MN'tt't MN'tt't MN'tt't MN'tt't MN'tt't MN'tt'ttttMN'tt'ttttMN'tt'ttttMN'tt']tMN'tt'ed'tMN'tt'ed'tMN'tt'ed'tMN'tt'ed'tMN'tt^ed'tMN'1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'eded'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'eded'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'eded'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN'ed1ed'tMN't1ed'tMN't.d'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'teCCd'tMN'1111'1MN'1'1MN'1eCCd'1MN'1eCCd'1MN'11111'1MN^11111^1MNww1ww1wwMg]11]jCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd'11'eCCd^1^eCCd\eC \ No newline at end of file diff --git a/maps/route18.blk b/maps/route18.blk deleted file mode 100644 index aeb83516..00000000 --- a/maps/route18.blk +++ /dev/null @@ -1 +0,0 @@ -Cd1111eCCk1111111111111Cd1tt1eCCCd1111111111111Cd1tt1eCCCdwwwwV !11111Cd1tt1tttttttttthiwVwwwCd111111111111117}~C-bQQ@MQQcCCCCCCCCCCCCCCCCN MttMCCCCCCCCCCCCCCCCN MttMkkkkkkkkkkkkkkkkPRRRORRO \ No newline at end of file diff --git a/maps/route18gate.blk b/maps/route18gate.blk deleted file mode 100644 index d1a18368..00000000 Binary files a/maps/route18gate.blk and /dev/null differ diff --git a/maps/route18gateupstairs.blk b/maps/route18gateupstairs.blk deleted file mode 100644 index f90c7db9..00000000 Binary files a/maps/route18gateupstairs.blk and /dev/null differ diff --git a/maps/route19-yellow.blk b/maps/route19-yellow.blk deleted file mode 100644 index 3fc58494..00000000 --- a/maps/route19-yellow.blk +++ /dev/null @@ -1 +0,0 @@ -(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/maps/route19.blk b/maps/route19.blk deleted file mode 100644 index 0bd469e7..00000000 --- a/maps/route19.blk +++ /dev/null @@ -1 +0,0 @@ -(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/maps/route2.blk b/maps/route2.blk deleted file mode 100644 index dd6227fd..00000000 --- a/maps/route2.blk +++ /dev/null @@ -1,54 +0,0 @@ - 1111 1111 >??;111111$W%1lm2ll1tt - - ! - -11111R|~RRRR - -1UUUU - -11  1112ll - - -/ - -t/ - -tR -R !lm2ll|}~ - ! - - - - -R|~RR/UUUUUn - - - -n - -ttt n/t n - - - -t -ooo4 - - -tnm - - -t -lllmt - -t111 -mtt -/4/tt -1 -m - - -111 -mtt -tt1 -mtt -o4ooo \ No newline at end of file diff --git a/maps/route20.blk b/maps/route20.blk deleted file mode 100644 index aae6a458..00000000 --- a/maps/route20.blk +++ /dev/null @@ -1 +0,0 @@ -kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkeCCCCCCCCCCCCCCCCCCCCd>?;zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCd$%zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCdzTzz>?;eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCTTCCCdzTzzz$%eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCxxCCC-CjTzCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCkkkkkCCCCCCCCCCCCCCCCCCC.CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk \ No newline at end of file diff --git a/maps/route21.blk b/maps/route21.blk deleted file mode 100644 index fa1f5b79..00000000 --- a/maps/route21.blk +++ /dev/null @@ -1,10 +0,0 @@ -QcedQQQbQQ -Med -ttN - -tMed Nt -tMed N - -tMed N - -tMe-gROeCCCCCCg.CCCCkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkCCCCCCCCCCCCTCCC \ No newline at end of file diff --git a/maps/route22.blk b/maps/route22.blk deleted file mode 100644 index 231c6838..00000000 --- a/maps/route22.blk +++ /dev/null @@ -1,3 +0,0 @@ - !(,,,,,,+WWW*,;hi$WWWWWW%/(,)7}}:}~UUUUUUUUUU$W)UUUUUU>;/b - -)/ ed() N)11Vwww UU() N>)$%/()UUUUUUUUUUUUUUUUUU(,??????????????????, \ No newline at end of file diff --git a/maps/route22gate.blk b/maps/route22gate.blk deleted file mode 100644 index 9cdf5b28..00000000 Binary files a/maps/route22gate.blk and /dev/null differ diff --git a/maps/route23.blk b/maps/route23.blk deleted file mode 100644 index 1ecf1d1a..00000000 --- a/maps/route23.blk +++ /dev/null @@ -1,57 +0,0 @@ -566CB556566CB55656++CB,,5656ACBAAA5656BAACCC5656CACBAB5656ACCCBA5656CBBBBA56,+BACBAB,+AACCCBBBAAAAAAAAAAAA)*A56A56AA''56A -H - -AAA - - - -56 - - - -* - - - -566 - - - -D -E -,(+((+ -@ -,(+ - -)* - - - - - - -D -E - -E -56 -56((+ -56@@ - -56@ -56@@5656@ -56@ -,(+ - - -@@@56 - - -D -E,(+,(+FFGFG,((565656,+A5687FG56,((+,(+FGFG - - -,(((+ - - -,+AAAAAAAAA)*)*AA,((+,((+AAAAA)*A)**A,((+A,(+(+AAAAAA))**A)*A,(,(+(+A,+AAAAAAA)*AA)*AA,(+AA,(((+:<<<<;>====? \ No newline at end of file diff --git a/maps/route24.blk b/maps/route24.blk deleted file mode 100644 index 21de9390..00000000 --- a/maps/route24.blk +++ /dev/null @@ -1,13 +0,0 @@ -,,,,,,,,,,,+WWWWWWWW,)1111G1X -,)\K1Z,)11111111,) - - -1bQQQ,)tt -1N ->?,)tt -1N -(,,) -jTN -(,,) eTN -(,,) eTN -$W,) eTNMCC,) eTNMCC,) eTNMCC,) eTNMCC,) eTNMCC,).TNMCC,)CCTNMCC \ No newline at end of file diff --git a/maps/route25.blk b/maps/route25.blk deleted file mode 100644 index 49c98815..00000000 --- a/maps/route25.blk +++ /dev/null @@ -1,19 +0,0 @@ -,,,,+WWWWWWWWWWWWWWWW%89$WWWW%WWWW%n -n - -n - -`ttttMwwV<=wwwRCC - - -LLL -nlnttntttttUUUU - -MCCLlL -mln -ttottttttUUUU - -MCC11111ml -mL - -ttmttttTTMCCQQQQQQQQQQQQQQQQQQQeCCTTCCdMCC?????????????????;RRRRRRRRROCC,,,,,,,,,,,,,,,,,)CC,,,,,,,,,,,,,,,,,)CCCCCCCCCCCC \ No newline at end of file diff --git a/maps/route2gate.blk b/maps/route2gate.blk deleted file mode 100644 index 19af9540..00000000 Binary files a/maps/route2gate.blk and /dev/null differ diff --git a/maps/route2house.blk b/maps/route2house.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/route2house.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/route3.blk b/maps/route3.blk deleted file mode 100644 index a5284350..00000000 --- a/maps/route3.blk +++ /dev/null @@ -1,55 +0,0 @@ -,,,,,,,,,,,,,,,,,,,,,,,,,,,)m(,,,,,,+WWWWWWWWW*,+WWWWWWWW*,) -(,,,,,,) - - - - - - - -t(,) - - - - - - - -(,) ->?,,,WWWW%/BB/$W%/>?;/(,)/$WW*, -@ - - - - -n - -n - - - - - - -(,) - - -$W% -V (, -A -n/BB (,)tt - - - - - (,????; - - - - - -n (,)ttt - - - - (,,,,,)>??????;(,)>??????????,,WWWW%(,,,,,,)(,)(,,,,,,,,,,,, \ No newline at end of file diff --git a/maps/route4.blk b/maps/route4.blk deleted file mode 100644 index cb6a6a74..00000000 --- a/maps/route4.blk +++ /dev/null @@ -1,64 +0,0 @@ -,,,,+WW*,,,,,,,,,+WWWWWWWWWWWWWWWWWWWWWW*,,,,,+WW% !$*,,,,,,,,) -X -YY - -X -X - -X - - - - -1111$WWWW,)|r$*+WWWW% -Z/[Y - -X -X - -Zaaaaa,)()11 - - - - - - -Y - -X -Z/g,)()/[ - -Z/okkkk,)() - - - - - - - - - - - - - - - - - - -m n1111111,)(,????????;//m n/bQQQQ,,;(,,,,,,,,,)ttt - - - - - - -m - - -N - - - -,,)>??,,,,,,,,,,,?????????????????????;tt \ No newline at end of file diff --git a/maps/route5.blk b/maps/route5.blk deleted file mode 100644 index 224a5b4b..00000000 --- a/maps/route5.blk +++ /dev/null @@ -1,9 +0,0 @@ -m'n - - - -N'Mm'nN'Mm'n N'Mm'nN'Mm'n N'Mm'nN'Mm'n N'Mm'nN'Mm'_1111'Mm'_1 1'Mm^_11^Mm_Mm !m|~m_Mm !Mnww7}:~wwmntt - - - -ttm \ No newline at end of file diff --git a/maps/route5gate.blk b/maps/route5gate.blk deleted file mode 100644 index f69dfa87..00000000 --- a/maps/route5gate.blk +++ /dev/null @@ -1 +0,0 @@ -kj li \ No newline at end of file diff --git a/maps/route6.blk b/maps/route6.blk deleted file mode 100644 index b488b37b..00000000 --- a/maps/route6.blk +++ /dev/null @@ -1,21 +0,0 @@ -ttt -MM -tttQQQQ !QQQttt -hittt/7:~/ - - - - - - - - - -/ !11111111|~ 1 11 1 1 1111111 1  1 eCCCCCd 1 Qc - -11111 -MRR1 - j1bQQQQCCC1N - - - diff --git a/maps/route6gate.blk b/maps/route6gate.blk deleted file mode 100644 index f69dfa87..00000000 --- a/maps/route6gate.blk +++ /dev/null @@ -1 +0,0 @@ -kj li \ No newline at end of file diff --git a/maps/route7.blk b/maps/route7.blk deleted file mode 100644 index 1e58b2f8..00000000 --- a/maps/route7.blk +++ /dev/null @@ -1 +0,0 @@ -111G _{11G t_{\Kt111_{1111_ ! !\7}~w|~1111_{1111111_{ \ No newline at end of file diff --git a/maps/route7gate.blk b/maps/route7gate.blk deleted file mode 100644 index 79911bdc..00000000 --- a/maps/route7gate.blk +++ /dev/null @@ -1 +0,0 @@ -p!on%m \ No newline at end of file diff --git a/maps/route8.blk b/maps/route8.blk deleted file mode 100644 index 8a9da3d9..00000000 --- a/maps/route8.blk +++ /dev/null @@ -1,45 +0,0 @@ -(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%N - - - - - - - - - - -M()NM11N -I#######H -Mbtt()NtttMN -' -RRRRR -' -MN - -$% !QQtM11N -'Mt tN' -MN -www7}~wMaa - -'Mt t5' -MN -]>;N - - - -] - - - - -'5t tN' - - - - -'()N - - - -D#####EMtttttND#####E()>?????????????????????????,, \ No newline at end of file diff --git a/maps/route8gate.blk b/maps/route8gate.blk deleted file mode 100644 index 79911bdc..00000000 --- a/maps/route8gate.blk +++ /dev/null @@ -1 +0,0 @@ -p!on%m \ No newline at end of file diff --git a/maps/route9.blk b/maps/route9.blk deleted file mode 100644 index e1ebe7cb..00000000 --- a/maps/route9.blk +++ /dev/null @@ -1,29 +0,0 @@ -$WWWWWWWWWWWWWWWW*+WWWWWWW*,,+ttM - - - - ->; () - - - - - - -(,,)ttM >;/()/$%/>;(,,)RROL()11$%11111111$%1$WW% - -51111>,)/>;1>;1>;1111111QQc>;$W%1111 -$%$%/()>;>??ttM()/>;/$%$%(,,ttM()1111111() - - - - - - - - - - - - -(,,ttM(,???????,,?????????????,,, \ No newline at end of file diff --git a/maps/safarizonecenter.blk b/maps/safarizonecenter.blk deleted file mode 100644 index f4814712..00000000 --- a/maps/safarizonecenter.blk +++ /dev/null @@ -1 +0,0 @@ -~}}}}}X}}}}}}#",~#"#")~#"~)#"~%$~%$%$,~$#\QQQQQR|||VZ].U[.W.%Z^QQQO["~,||'&'&%"~}}"~#",#$~,%$!#$,~)%$!,,#$~~'&&X''& \ No newline at end of file diff --git a/maps/safarizoneeast.blk b/maps/safarizoneeast.blk deleted file mode 100644 index 564fa502..00000000 --- a/maps/safarizoneeast.blk +++ /dev/null @@ -1 +0,0 @@ -H}}}}IL||%$#V!<===>%H}}}}DGESF%%$$~#((",),)~( PQQQR!~((U<===>%(($PQQOD?CGFL||,T----@B,~,<====JB~}}},DGEEEGF"~V,3L||||%$~||||||||M \ No newline at end of file diff --git a/maps/safarizoneentrance.blk b/maps/safarizoneentrance.blk deleted file mode 100644 index f69dfa87..00000000 --- a/maps/safarizoneentrance.blk +++ /dev/null @@ -1 +0,0 @@ -kj li \ No newline at end of file diff --git a/maps/safarizonenorth.blk b/maps/safarizonenorth.blk deleted file mode 100644 index a5f4251c..00000000 --- a/maps/safarizonenorth.blk +++ /dev/null @@ -1 +0,0 @@ -}}}}}}}}}}}}}}#"#"#$~%$~}}}}}}!~#"~%"~%$%\R%"~),Z["5555555%~,Z["))<==>)\R($DG?BZ[%$%,)@B,Z[,,@B)~)<====>)@B~##"@ACEGF@B\R@AB"<====JB~Z[$DGFDGEEEEF~%Z[~%!)~3~,")))W,~,~3$%$IYHIYH999IYH}}}}}}}} \ No newline at end of file diff --git a/maps/safarizoneresthouse1.blk b/maps/safarizoneresthouse1.blk deleted file mode 100644 index 625b41b6..00000000 Binary files a/maps/safarizoneresthouse1.blk and /dev/null differ diff --git a/maps/safarizoneresthouse2.blk b/maps/safarizoneresthouse2.blk deleted file mode 100644 index 625b41b6..00000000 Binary files a/maps/safarizoneresthouse2.blk and /dev/null differ diff --git a/maps/safarizoneresthouse3.blk b/maps/safarizoneresthouse3.blk deleted file mode 100644 index 625b41b6..00000000 Binary files a/maps/safarizoneresthouse3.blk and /dev/null differ diff --git a/maps/safarizoneresthouse4.blk b/maps/safarizoneresthouse4.blk deleted file mode 100644 index 625b41b6..00000000 Binary files a/maps/safarizoneresthouse4.blk and /dev/null differ diff --git a/maps/safarizonesecrethouse.blk b/maps/safarizonesecrethouse.blk deleted file mode 100644 index d5dbe9e1..00000000 --- a/maps/safarizonesecrethouse.blk +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/maps/safarizonewest.blk b/maps/safarizonewest.blk deleted file mode 100644 index 88c8460c..00000000 --- a/maps/safarizonewest.blk +++ /dev/null @@ -1 +0,0 @@ -|||||XX+*3)~+*.)!~+<==>))~+.DE?B))~~\QQR@B~~Z--[!@B)~@K==>~<====JCESF,~#DGEEEEF~,,~%$%$!W}}}}|||}||}}}} \ No newline at end of file diff --git a/maps/saffroncity.blk b/maps/saffroncity.blk deleted file mode 100644 index e0c2b224..00000000 Binary files a/maps/saffroncity.blk and /dev/null differ diff --git a/maps/saffrongym.blk b/maps/saffrongym.blk deleted file mode 100644 index 44a24aad..00000000 --- a/maps/saffrongym.blk +++ /dev/null @@ -1 +0,0 @@ -AAA@AABAAA//D//F////D//F//AAA@AABAAA//DF////D/F//AAA@AABAAA//DE/F////D,F// \ No newline at end of file diff --git a/maps/saffronhouse1.blk b/maps/saffronhouse1.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/saffronhouse1.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/saffronhouse2.blk b/maps/saffronhouse2.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/saffronhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/saffronmart.blk b/maps/saffronmart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/saffronmart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/saffronpokecenter.blk b/maps/saffronpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/saffronpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/school.blk b/maps/school.blk deleted file mode 100644 index 51bf8401..00000000 --- a/maps/school.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/seafoamislands1.blk b/maps/seafoamislands1.blk deleted file mode 100644 index 3cd6e5c7..00000000 --- a/maps/seafoamislands1.blk +++ /dev/null @@ -1 +0,0 @@ -................(..<,-..xmw..m..)L^^^..m..m(...$..........$. \ No newline at end of file diff --git a/maps/seafoamislands2.blk b/maps/seafoamislands2.blk deleted file mode 100644 index 61402221..00000000 --- a/maps/seafoamislands2.blk +++ /dev/null @@ -1 +0,0 @@ -...........',->..|m..,<wmx..fL^^^..(..f-..m(m>................ \ No newline at end of file diff --git a/maps/seafoamislands3.blk b/maps/seafoamislands3.blk deleted file mode 100644 index cc037328..00000000 --- a/maps/seafoamislands3.blk +++ /dev/null @@ -1 +0,0 @@ -................><..-..=xRw....)+|..(-..>y................ \ No newline at end of file diff --git a/maps/seafoamislands4.blk b/maps/seafoamislands4.blk deleted file mode 100644 index 956a1053..00000000 --- a/maps/seafoamislands4.blk +++ /dev/null @@ -1 +0,0 @@ -vvvvvv=,)vy',-vvvv-+,+vvvvvav )vaxwzvm \ No newline at end of file diff --git a/maps/seafoamislands5.blk b/maps/seafoamislands5.blk deleted file mode 100644 index a118fe57..00000000 --- a/maps/seafoamislands5.blk +++ /dev/null @@ -1 +0,0 @@ -.vvu..v-v..vvvvvv,-a..vv|vvvvv..vv,vvvvv..vvf+vvvvvv..vvvvvvvvvvv..vvuvvvv..vvL. \ No newline at end of file diff --git a/maps/silphco1.blk b/maps/silphco1.blk deleted file mode 100644 index 3bf7c8f0..00000000 --- a/maps/silphco1.blk +++ /dev/null @@ -1 +0,0 @@ -<========|==}>~""# FD[[FD  [[[[[[9 FD[[FD  FDFD  FHIIIX,WIIIIIIIJ \ No newline at end of file diff --git a/maps/silphco10.blk b/maps/silphco10.blk deleted file mode 100644 index 88669221..00000000 --- a/maps/silphco10.blk +++ /dev/null @@ -1,2 +0,0 @@ -<===$}|>DFDZcgBDF /F@*+BcgBD5F/{FD5F{7FD -F7/FHIIJIIIJ \ No newline at end of file diff --git a/maps/silphco11.blk b/maps/silphco11.blk deleted file mode 100644 index 9bd21b04..00000000 --- a/maps/silphco11.blk +++ /dev/null @@ -1 +0,0 @@ -!"!"""#$921114($35($$*($$*($$*($768*($$*(%&&&%&.&' \ No newline at end of file diff --git a/maps/silphco2.blk b/maps/silphco2.blk deleted file mode 100644 index 33003175..00000000 --- a/maps/silphco2.blk +++ /dev/null @@ -1 +0,0 @@ -@aaaaB====|=$}>D/F/F@cgaaaaaaAcgBDFD{{ @aab@cgAB66 UfD{ F66FD7/F77YG/FHIIIIJIIIIIHIIJ \ No newline at end of file diff --git a/maps/silphco3.blk b/maps/silphco3.blk deleted file mode 100644 index 15dcaf1f..00000000 --- a/maps/silphco3.blk +++ /dev/null @@ -1 +0,0 @@ -<=========|=}$>D//F`aaABaAaBZaaabd4VVVfD6GGFD/7Z/ZZ/CCFPIIIJIIIJVIIIQD//FHIIIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/silphco4.blk b/maps/silphco4.blk deleted file mode 100644 index 4e6c32f8..00000000 --- a/maps/silphco4.blk +++ /dev/null @@ -1 +0,0 @@ -<===>aaaa<|=$}>D55F/DFD555FGGD@cgBD55F/DD 4 FD5FcgaDD6FDF/DD 6 F@cgAcgApD6FD/D 7 FHIIIIIIIIIHIIIJ \ No newline at end of file diff --git a/maps/silphco5.blk b/maps/silphco5.blk deleted file mode 100644 index 1fa92a59..00000000 --- a/maps/silphco5.blk +++ /dev/null @@ -1 +0,0 @@ -@aaB======|=}$>DV /FD/ZAAcgBFDZ`aBGG{FFPIIQdV6FFDVD6FFD5DZGGGFFD/5Z/HIJIIIIIJFHIIJIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/silphco6.blk b/maps/silphco6.blk deleted file mode 100644 index 02d5b56e..00000000 --- a/maps/silphco6.blk +++ /dev/null @@ -1 +0,0 @@ -`aB====$}|==>d/V/FD`aAAcgBF d44444FF@ABD67776FFDV64446FFD77777FFDZgcgAAAcFHIJIIIIIIIIIJ \ No newline at end of file diff --git a/maps/silphco7.blk b/maps/silphco7.blk deleted file mode 100644 index a8dd509a..00000000 --- a/maps/silphco7.blk +++ /dev/null @@ -1 +0,0 @@ -@Aa`AAB}|=$>D/d""#qFDGD ZcgBD/@cgBF 4F@aaD44FF 6FDD66FF 7FD D77FFcgBDHIIIJF/FHIIIIIIIJWIIJ \ No newline at end of file diff --git a/maps/silphco8.blk b/maps/silphco8.blk deleted file mode 100644 index 5df4ebd8..00000000 --- a/maps/silphco8.blk +++ /dev/null @@ -1 +0,0 @@ -@AABaab$}|==>D44FfFD66F/F@AAABD66VWQDCC FD76/FDFD/7ZGFDG FPIIJWJHXWQ/FHIIIIIIIIIIIJ \ No newline at end of file diff --git a/maps/silphco9.blk b/maps/silphco9.blk deleted file mode 100644 index 47d080dd..00000000 --- a/maps/silphco9.blk +++ /dev/null @@ -1 +0,0 @@ -@AAAABA}$|==>D/FFDZgAAB@cgYFDVGGFD4FDg@B D7FDZUV @cgBFPJCCDG{VFDCCCYZD/GFHIIIHJIHIIIIJ \ No newline at end of file diff --git a/maps/silphcoelevator.blk b/maps/silphcoelevator.blk deleted file mode 100644 index 824bc3de..00000000 --- a/maps/silphcoelevator.blk +++ /dev/null @@ -1 +0,0 @@ -*+() \ No newline at end of file diff --git a/maps/ssanne1.blk b/maps/ssanne1.blk deleted file mode 100644 index fd236973..00000000 --- a/maps/ssanne1.blk +++ /dev/null @@ -1 +0,0 @@ -           :  \ No newline at end of file diff --git a/maps/ssanne10.blk b/maps/ssanne10.blk deleted file mode 100644 index b6666f9a..00000000 --- a/maps/ssanne10.blk +++ /dev/null @@ -1 +0,0 @@ -78 78 78;9 ;9 ;9    78 78 78;9 ;9 ;9    \ No newline at end of file diff --git a/maps/ssanne2.blk b/maps/ssanne2.blk deleted file mode 100644 index db2ae854..00000000 --- a/maps/ssanne2.blk +++ /dev/null @@ -1 +0,0 @@ -           \ No newline at end of file diff --git a/maps/ssanne3.blk b/maps/ssanne3.blk deleted file mode 100644 index 6e4b42f4..00000000 --- a/maps/ssanne3.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/ssanne4.blk b/maps/ssanne4.blk deleted file mode 100644 index f22fb770..00000000 --- a/maps/ssanne4.blk +++ /dev/null @@ -1 +0,0 @@ - 4  \ No newline at end of file diff --git a/maps/ssanne5.blk b/maps/ssanne5.blk deleted file mode 100644 index e97bab53..00000000 --- a/maps/ssanne5.blk +++ /dev/null @@ -1 +0,0 @@ -##&&&&&&&&#$$$ )' )$ !"' (!" #(%%%%%%%% \ No newline at end of file diff --git a/maps/ssanne6.blk b/maps/ssanne6.blk deleted file mode 100644 index 2a417ad2..00000000 --- a/maps/ssanne6.blk +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -   5 * * *5 * * *5 , , , +-+-+-+ \ No newline at end of file diff --git a/maps/ssanne7.blk b/maps/ssanne7.blk deleted file mode 100644 index b5359f38..00000000 --- a/maps/ssanne7.blk +++ /dev/null @@ -1 +0,0 @@ -01/23 . \ No newline at end of file diff --git a/maps/ssanne8.blk b/maps/ssanne8.blk deleted file mode 100644 index 1749e638..00000000 --- a/maps/ssanne8.blk +++ /dev/null @@ -1,7 +0,0 @@ - - - - 6 6 6 - - - 6 6 6 \ No newline at end of file diff --git a/maps/ssanne9.blk b/maps/ssanne9.blk deleted file mode 100644 index b6666f9a..00000000 --- a/maps/ssanne9.blk +++ /dev/null @@ -1 +0,0 @@ -78 78 78;9 ;9 ;9    78 78 78;9 ;9 ;9    \ No newline at end of file diff --git a/maps/tradecenter.blk b/maps/tradecenter.blk deleted file mode 100644 index 638b48ef..00000000 --- a/maps/tradecenter.blk +++ /dev/null @@ -1,4 +0,0 @@ - - - !"# - diff --git a/maps/undergroundpathentranceroute5.blk b/maps/undergroundpathentranceroute5.blk deleted file mode 100644 index a17a7ed2..00000000 Binary files a/maps/undergroundpathentranceroute5.blk and /dev/null differ diff --git a/maps/undergroundpathentranceroute6.blk b/maps/undergroundpathentranceroute6.blk deleted file mode 100644 index a17a7ed2..00000000 Binary files a/maps/undergroundpathentranceroute6.blk and /dev/null differ diff --git a/maps/undergroundpathentranceroute7.blk b/maps/undergroundpathentranceroute7.blk deleted file mode 100644 index a17a7ed2..00000000 Binary files a/maps/undergroundpathentranceroute7.blk and /dev/null differ diff --git a/maps/undergroundpathentranceroute8.blk b/maps/undergroundpathentranceroute8.blk deleted file mode 100644 index a17a7ed2..00000000 Binary files a/maps/undergroundpathentranceroute8.blk and /dev/null differ diff --git a/maps/undergroundpathns.blk b/maps/undergroundpathns.blk deleted file mode 100644 index 6431328e..00000000 --- a/maps/undergroundpathns.blk +++ /dev/null @@ -1 +0,0 @@ -                      \ No newline at end of file diff --git a/maps/undergroundpathwe.blk b/maps/undergroundpathwe.blk deleted file mode 100644 index 79ea699a..00000000 --- a/maps/undergroundpathwe.blk +++ /dev/null @@ -1 +0,0 @@ -     \ No newline at end of file diff --git a/maps/unknowndungeon1.blk b/maps/unknowndungeon1.blk deleted file mode 100644 index 574613af..00000000 --- a/maps/unknowndungeon1.blk +++ /dev/null @@ -1,2 +0,0 @@ - "||b -}f N_vvvvvvvv#vvvvr}|qvv,-Xv=,vtfvvvfvf+}_ "vv- - } "$ \ No newline at end of file diff --git a/maps/unknowndungeon2.blk b/maps/unknowndungeon2.blk deleted file mode 100644 index 6eb27eee..00000000 --- a/maps/unknowndungeon2.blk +++ /dev/null @@ -1,3 +0,0 @@ -}( ((   -  -}( #  (      }    \ No newline at end of file diff --git a/maps/unknowndungeon3.blk b/maps/unknowndungeon3.blk deleted file mode 100644 index 858f0529..00000000 --- a/maps/unknowndungeon3.blk +++ /dev/null @@ -1 +0,0 @@ -,--Nr02a}f D+,v "pfvvv} fXfvv^tvvtvv)   "vvvSvvvv \ No newline at end of file diff --git a/maps/unusedblocks58d7d.blk b/maps/unusedblocks58d7d.blk deleted file mode 100755 index 9641efe4..00000000 --- a/maps/unusedblocks58d7d.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/unusedblocks60258.blk b/maps/unusedblocks60258.blk deleted file mode 100755 index ff81fc7d..00000000 --- a/maps/unusedblocks60258.blk +++ /dev/null @@ -1 +0,0 @@ -,+>++++> \ No newline at end of file diff --git a/maps/unusedblocks60cef.blk b/maps/unusedblocks60cef.blk deleted file mode 100755 index 21808bb7..00000000 --- a/maps/unusedblocks60cef.blk +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/maps/vermilioncity.blk b/maps/vermilioncity.blk deleted file mode 100644 index 6ba54a34..00000000 --- a/maps/vermilioncity.blk +++ /dev/null @@ -1 +0,0 @@ -CCC ! ! !1 !11111111Ckk|~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCCCCCTTTTTTTC-gCCCCCCCCTxxxxxxCCCkkkkkkkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTCCCCCCCCCC \ No newline at end of file diff --git a/maps/vermiliondock.blk b/maps/vermiliondock.blk deleted file mode 100644 index f4a95739..00000000 --- a/maps/vermiliondock.blk +++ /dev/null @@ -1,2 +0,0 @@ -      -    \ No newline at end of file diff --git a/maps/vermiliongym.blk b/maps/vermiliongym.blk deleted file mode 100644 index 27bea181..00000000 --- a/maps/vermiliongym.blk +++ /dev/null @@ -1 +0,0 @@ -,%%&,,,*+*+''''''''''''''')( \ No newline at end of file diff --git a/maps/vermilionhouse1.blk b/maps/vermilionhouse1.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/vermilionhouse1.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/vermilionhouse2.blk b/maps/vermilionhouse2.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/vermilionhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/vermilionhouse3.blk b/maps/vermilionhouse3.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/vermilionhouse3.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/vermilionmart.blk b/maps/vermilionmart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/vermilionmart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/vermilionpokecenter.blk b/maps/vermilionpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/vermilionpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/maps/victoryroad1.blk b/maps/victoryroad1.blk deleted file mode 100644 index 4afaf65d..00000000 --- a/maps/victoryroad1.blk +++ /dev/null @@ -1,2 +0,0 @@ -b}}Nmt }Mz} - z}-+,-}j[oL MpOr f% lt ^}S$}Q}} \ No newline at end of file diff --git a/maps/victoryroad2.blk b/maps/victoryroad2.blk deleted file mode 100644 index f4226ccf..00000000 --- a/maps/victoryroad2.blk +++ /dev/null @@ -1 +0,0 @@ -b```````````````````````````````````>bc#`7`````g`T1W12````M````&````--%a`e }e`````````` \ No newline at end of file diff --git a/maps/victoryroad3.blk b/maps/victoryroad3.blk deleted file mode 100644 index 53aa23eb..00000000 --- a/maps/victoryroad3.blk +++ /dev/null @@ -1,2 +0,0 @@ -M#t``````````` ```` l `,-``jkko`````( f+p`` '`%`````````````````````i( - \ No newline at end of file diff --git a/maps/viridiancity.blk b/maps/viridiancity.blk deleted file mode 100644 index af1bd662..00000000 --- a/maps/viridiancity.blk +++ /dev/null @@ -1,60 +0,0 @@ -,,),,)111111,,) -RRR4111 1,,)M111,,)M,,)M1WW%Mwwwwwwww - - -M1 -llllww - ! -?;tt -|s -,)o - - - -,) -4tt -t !t - -,) - - -|r - -tW%eCd// -Mt - - - - - -tttt -Mwwwwwwwwwwwwwww - - - - - -M - -MN - -N - - - - - - - - - - -M - -MN - -N - - - - diff --git a/maps/viridianforest.blk b/maps/viridianforest.blk deleted file mode 100644 index 358ea01d..00000000 --- a/maps/viridianforest.blk +++ /dev/null @@ -1 +0,0 @@ -7999999999999I7;))55555);7;);7;7;7;);7;7;7;77);7);7;7;7!);7;7;7;7;7;7;)!);77X; \ No newline at end of file diff --git a/maps/viridianforestentrance.blk b/maps/viridianforestentrance.blk deleted file mode 100644 index 19af9540..00000000 Binary files a/maps/viridianforestentrance.blk and /dev/null differ diff --git a/maps/viridianforestexit.blk b/maps/viridianforestexit.blk deleted file mode 100644 index 19af9540..00000000 Binary files a/maps/viridianforestexit.blk and /dev/null differ diff --git a/maps/viridiangym.blk b/maps/viridiangym.blk deleted file mode 100644 index 4396d338..00000000 --- a/maps/viridiangym.blk +++ /dev/null @@ -1 +0,0 @@ -IJ_]KQdVcFF^\RFNSTULa`LUHH[L@DLLML,ULQ`G,XHHHZbCEWFFFY21@AB \ No newline at end of file diff --git a/maps/viridianhouse.blk b/maps/viridianhouse.blk deleted file mode 100644 index 823e6053..00000000 --- a/maps/viridianhouse.blk +++ /dev/null @@ -1 +0,0 @@ -    \ No newline at end of file diff --git a/maps/viridianmart.blk b/maps/viridianmart.blk deleted file mode 100644 index 1da8fffc..00000000 --- a/maps/viridianmart.blk +++ /dev/null @@ -1 +0,0 @@ -   \ No newline at end of file diff --git a/maps/viridianpokecenter.blk b/maps/viridianpokecenter.blk deleted file mode 100644 index 9641efe4..00000000 --- a/maps/viridianpokecenter.blk +++ /dev/null @@ -1,2 +0,0 @@ -  !"# -  \ No newline at end of file diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm new file mode 100755 index 00000000..a1dba196 --- /dev/null +++ b/scripts/AgathasRoom.asm @@ -0,0 +1,154 @@ +AgathasRoom_Script: + call AgathaShowOrHideExitBlock + call EnableAutoTextBoxDrawing + ld hl, AgathaTrainerHeader0 + ld de, AgathasRoom_ScriptPointers + ld a, [wAgathasRoomCurScript] + call ExecuteCurMapScriptInTable + ld [wAgathasRoomCurScript], a + ret + +AgathaShowOrHideExitBlock: +; Blocks or clears the exit to the next room. + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 + jr z, .blockExitToNextRoom + ld a, $e + jp .setExitBlock +.blockExitToNextRoom + ld a, $3b +.setExitBlock: + ld [wNewTileBlockID], a + lb bc, 0, 2 + predef_jump ReplaceTileBlock + +ResetAgathaScript: + xor a + ld [wAgathasRoomCurScript], a + ret + +AgathasRoom_ScriptPointers: + dw AgathaScript0 + dw DisplayEnemyTrainerTextAndStartBattle + dw AgathaScript2 + dw AgathaScript3 + dw AgathaScript4 + +AgathaScript4: + ret + +AgathaScriptWalkIntoRoom: +; Walk six steps upward. + ld hl, wSimulatedJoypadStatesEnd + ld a, D_UP + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld a, $6 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wAgathasRoomCurScript], a + ld [wCurMapScript], a + ret + +AgathaScript0: + ld hl, AgathaEntranceCoords + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyPressed], a + ld [hJoyHeld], a + ld [wSimulatedJoypadStatesEnd], a + ld [wSimulatedJoypadStatesIndex], a + ld a, [wCoordIndex] + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving + CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM + jr z, AgathaScriptWalkIntoRoom +.stopPlayerFromLeaving + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID ; "Don't run away!" + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wAgathasRoomCurScript], a + ld [wCurMapScript], a + ret + +AgathaEntranceCoords: + db $0A,$04 + db $0A,$05 + db $0B,$04 + db $0B,$05 + db $FF + +AgathaScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wAgathasRoomCurScript], a + ld [wCurMapScript], a + ret + +AgathaScript2: + call EndTrainerBattle + ld a, [wIsInBattle] + cp $ff + jp z, ResetAgathaScript + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $1 + ld [wChampionsRoomCurScript], a + ret + +AgathasRoom_TextPointers: + dw AgathaText1 + dw AgathaDontRunAwayText + +AgathaTrainerHeader0: + dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 + dw AgathaBeforeBattleText ; TextBeforeBattle + dw AgathaAfterBattleText ; TextAfterBattle + dw AgathaEndBattleText ; TextEndBattle + dw AgathaEndBattleText ; TextEndBattle + + db $ff + +AgathaText1: + TX_ASM + ld hl, AgathaTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +AgathaBeforeBattleText: + TX_FAR _AgathaBeforeBattleText + db "@" + +AgathaEndBattleText: + TX_FAR _AgathaEndBattleText + db "@" + +AgathaAfterBattleText: + TX_FAR _AgathaAfterBattleText + db "@" + +AgathaDontRunAwayText: + TX_FAR _AgathaDontRunAwayText + db "@" diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm new file mode 100755 index 00000000..71149759 --- /dev/null +++ b/scripts/BikeShop.asm @@ -0,0 +1,147 @@ +BikeShop_Script: + jp EnableAutoTextBoxDrawing + +BikeShop_TextPointers: + dw BikeShopText1 + dw BikeShopText2 + dw BikeShopText3 + +BikeShopText1: + TX_ASM + CheckEvent EVENT_GOT_BICYCLE + jr z, .asm_260d4 + ld hl, BikeShopText_1d82f + call PrintText + jp .Done +.asm_260d4 + ld b, BIKE_VOUCHER + call IsItemInBag + jr z, .asm_41190 + ld hl, BikeShopText_1d81f + call PrintText + lb bc, BICYCLE, 1 + call GiveItem + jr nc, .BagFull + ld a, BIKE_VOUCHER + ld [$ffdb], a + callba RemoveItemByID + SetEvent EVENT_GOT_BICYCLE + ld hl, BikeShopText_1d824 + call PrintText + jr .Done +.BagFull + ld hl, BikeShopText_1d834 + call PrintText + jr .Done +.asm_41190 + ld hl, BikeShopText_1d810 + call PrintText + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $1 + ld [wMaxMenuItem], a + ld a, $2 + ld [wTopMenuItemY], a + ld a, $1 + ld [wTopMenuItemX], a + ld hl, wd730 + set 6, [hl] + coord hl, 0, 0 + ld b, $4 + ld c, $f + call TextBoxBorder + call UpdateSprites + coord hl, 2, 2 + ld de, BikeShopMenuText + call PlaceString + coord hl, 8, 3 + ld de, BikeShopMenuPrice + call PlaceString + ld hl, BikeShopText_1d815 + call PrintText + call HandleMenuInput + bit 1, a + jr nz, .cancel + ld hl, wd730 + res 6, [hl] + ld a, [wCurrentMenuItem] + and a + jr nz, .cancel + ld hl, BikeShopCantAffordText + call PrintText +.cancel + ld hl, BikeShopComeAgainText + call PrintText +.Done + jp TextScriptEnd + +BikeShopMenuText: + db "BICYCLE" + next "CANCEL@" + +BikeShopMenuPrice: + db "¥1000000@" + +BikeShopText_1d810: + TX_FAR _BikeShopText_1d810 + db "@" + +BikeShopText_1d815: + TX_FAR _BikeShopText_1d815 + db "@" + +BikeShopCantAffordText: + TX_FAR _BikeShopCantAffordText + db "@" + +BikeShopText_1d81f: + TX_FAR _BikeShopText_1d81f + db "@" + +BikeShopText_1d824: + TX_FAR _BikeShopText_1d824 + TX_SFX_KEY_ITEM + db "@" + +BikeShopComeAgainText: + TX_FAR _BikeShopComeAgainText + db "@" + +BikeShopText_1d82f: + TX_FAR _BikeShopText_1d82f + db "@" + +BikeShopText_1d834: + TX_FAR _BikeShopText_1d834 + db "@" + +BikeShopText2: + TX_ASM + ld hl, BikeShopText_1d843 + call PrintText + jp TextScriptEnd + +BikeShopText_1d843: + TX_FAR _BikeShopText_1d843 + db "@" + +BikeShopText3: + TX_ASM + CheckEvent EVENT_GOT_BICYCLE + ld hl, BikeShopText_1d861 + jr nz, .asm_34d2d + ld hl, BikeShopText_1d85c +.asm_34d2d + call PrintText + jp TextScriptEnd + +BikeShopText_1d85c: + TX_FAR _BikeShopText_1d85c + db "@" + +BikeShopText_1d861: + TX_FAR _BikeShopText_1d861 + db "@" diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm new file mode 100755 index 00000000..74efc960 --- /dev/null +++ b/scripts/BillsHouse.asm @@ -0,0 +1,214 @@ +BillsHouse_Script: + call EnableAutoTextBoxDrawing + ld a, [wBillsHouseCurScript] + ld hl, BillsHouse_ScriptPointers + jp CallFunctionInTable + +BillsHouse_ScriptPointers: + dw BillsHouseScript0 + dw BillsHouseScript1 + dw BillsHouseScript2 + dw BillsHouseScript3 + dw BillsHouseScript4 + dw BillsHouseScript5 + +BillsHouseScript0: + ret + +BillsHouseScript1: + ld a, [wSpriteStateData1 + 9] + and a ; cp SPRITE_FACING_DOWN + ld de, MovementData_1e79c + jr nz, .notDown + ld de, MovementData_1e7a0 +.notDown + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $2 + ld [wBillsHouseCurScript], a + ret + +MovementData_1e79c: + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db $FF + +; make Bill walk around the player +MovementData_1e7a0: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_UP + db $FF + +BillsHouseScript2: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_BILL_POKEMON + ld [wMissableObjectIndex], a + predef HideObject + SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR + xor a + ld [wJoyIgnore], a + ld a, $3 + ld [wBillsHouseCurScript], a + ret + +BillsHouseScript3: + CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL + ret z + ld a, $f0 + ld [wJoyIgnore], a + ld a, $2 + ld [wSpriteIndex], a + ld a, $c + ld [$ffeb], a + ld a, $40 + ld [$ffec], a + ld a, $6 + ld [$ffed], a + ld a, $5 + ld [$ffee], a + call SetSpritePosition1 + ld a, HS_BILL_1 + ld [wMissableObjectIndex], a + predef ShowObject + ld c, 8 + call DelayFrames + ld a, $2 + ld [H_SPRITEINDEX], a + ld de, MovementData_1e807 + call MoveSprite + ld a, $4 + ld [wBillsHouseCurScript], a + ret + +MovementData_1e807: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db $FF + +BillsHouseScript4: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + SetEvent EVENT_MET_BILL_2 ; this event seems redundant + SetEvent EVENT_MET_BILL + ld a, $0 + ld [wBillsHouseCurScript], a + ret + +BillsHouseScript5: + ld a, $4 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $0 + ld [wBillsHouseCurScript], a + ret + +BillsHouse_TextPointers: + dw BillsHouseText1 + dw BillsHouseText2 + dw BillsHouseText3 + dw BillsHouseText4 + +BillsHouseText4: + TX_BILLS_PC + +BillsHouseText1: + TX_ASM + ld hl, BillsHouseText_1e865 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_1e85a +.asm_1e84d + ld hl, BillsHouseText_1e86a + call PrintText + ld a, $1 + ld [wBillsHouseCurScript], a + jr .asm_1e862 +.asm_1e85a + ld hl, BillsHouseText_1e86f + call PrintText + jr .asm_1e84d +.asm_1e862 + jp TextScriptEnd + +BillsHouseText_1e865: + TX_FAR _BillsHouseText_1e865 + db "@" + +BillsHouseText_1e86a: + TX_FAR _BillsHouseText_1e86a + db "@" + +BillsHouseText_1e86f: + TX_FAR _BillsHouseText_1e86f + db "@" + +BillsHouseText2: + TX_ASM + CheckEvent EVENT_GOT_SS_TICKET + jr nz, .asm_1e8a9 + ld hl, BillThankYouText + call PrintText + lb bc, S_S_TICKET, 1 + call GiveItem + jr nc, .BagFull + ld hl, SSTicketReceivedText + call PrintText + SetEvent EVENT_GOT_SS_TICKET + ld a, HS_CERULEAN_GUARD_1 + ld [wMissableObjectIndex], a + predef ShowObject + ld a, HS_CERULEAN_GUARD_2 + ld [wMissableObjectIndex], a + predef HideObject +.asm_1e8a9 + ld hl, BillsHouseText_1e8cb + call PrintText + jr .asm_1e8b7 +.BagFull + ld hl, SSTicketNoRoomText + call PrintText +.asm_1e8b7 + jp TextScriptEnd + +BillThankYouText: + TX_FAR _BillThankYouText + db "@" + +SSTicketReceivedText: + TX_FAR _SSTicketReceivedText + TX_SFX_KEY_ITEM + TX_BLINK + db "@" + +SSTicketNoRoomText: + TX_FAR _SSTicketNoRoomText + db "@" + +BillsHouseText_1e8cb: + TX_FAR _BillsHouseText_1e8cb + db "@" + +BillsHouseText3: + TX_ASM + ld hl, BillsHouseText_1e8da + call PrintText + jp TextScriptEnd + +BillsHouseText_1e8da: + TX_FAR _BillsHouseText_1e8da + db "@" diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm new file mode 100755 index 00000000..f325049f --- /dev/null +++ b/scripts/BluesHouse.asm @@ -0,0 +1,89 @@ +BluesHouse_Script: + call EnableAutoTextBoxDrawing + ld hl, BluesHouse_ScriptPointers + ld a, [wBluesHouseCurScript] + jp CallFunctionInTable + +BluesHouse_ScriptPointers: + dw BluesHouseScript0 + dw BluesHouseScript1 + +BluesHouseScript0: + SetEvent EVENT_ENTERED_BLUES_HOUSE + + ; trigger the next script + ld a, 1 + ld [wBluesHouseCurScript], a + ret + +BluesHouseScript1: + ret + +BluesHouse_TextPointers: + dw BluesHouseText1 + dw BluesHouseText2 + dw BluesHouseText3 + +BluesHouseText1: + TX_ASM + CheckEvent EVENT_GOT_TOWN_MAP + jr nz, .GotMap + CheckEvent EVENT_GOT_POKEDEX + jr nz, .GiveMap + ld hl, DaisyInitialText + call PrintText + jr .done + +.GiveMap + ld hl, DaisyOfferMapText + call PrintText + lb bc, TOWN_MAP, 1 + call GiveItem + jr nc, .BagFull + ld a, HS_TOWN_MAP + ld [wMissableObjectIndex], a + predef HideObject ; hide table map object + ld hl, GotMapText + call PrintText + SetEvent EVENT_GOT_TOWN_MAP + jr .done + +.GotMap + ld hl, DaisyUseMapText + call PrintText + jr .done + +.BagFull + ld hl, DaisyBagFullText + call PrintText +.done + jp TextScriptEnd + +DaisyInitialText: + TX_FAR _DaisyInitialText + db "@" + +DaisyOfferMapText: + TX_FAR _DaisyOfferMapText + db "@" + +GotMapText: + TX_FAR _GotMapText + TX_SFX_KEY_ITEM + db "@" + +DaisyBagFullText: + TX_FAR _DaisyBagFullText + db "@" + +DaisyUseMapText: + TX_FAR _DaisyUseMapText + db "@" + +BluesHouseText2: ; Daisy, walking around + TX_FAR _BluesHouseText2 + db "@" + +BluesHouseText3: ; map on table + TX_FAR _BluesHouseText3 + db "@" diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm new file mode 100755 index 00000000..3b6385b7 --- /dev/null +++ b/scripts/BrunosRoom.asm @@ -0,0 +1,151 @@ +BrunosRoom_Script: + call BrunoShowOrHideExitBlock + call EnableAutoTextBoxDrawing + ld hl, BrunoTrainerHeader0 + ld de, BrunosRoom_ScriptPointers + ld a, [wBrunosRoomCurScript] + call ExecuteCurMapScriptInTable + ld [wBrunosRoomCurScript], a + ret + +BrunoShowOrHideExitBlock: +; Blocks or clears the exit to the next room. + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 + jr z, .blockExitToNextRoom + ld a, $5 + jp .setExitBlock +.blockExitToNextRoom + ld a, $24 +.setExitBlock + ld [wNewTileBlockID], a + lb bc, 0, 2 + predef_jump ReplaceTileBlock + +ResetBrunoScript: + xor a + ld [wBrunosRoomCurScript], a + ret + +BrunosRoom_ScriptPointers: + dw BrunoScript0 + dw DisplayEnemyTrainerTextAndStartBattle + dw BrunoScript2 + dw BrunoScript3 + dw BrunoScript4 + +BrunoScript4: + ret + +BrunoScriptWalkIntoRoom: +; Walk six steps upward. + ld hl, wSimulatedJoypadStatesEnd + ld a, D_UP + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld a, $6 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wBrunosRoomCurScript], a + ld [wCurMapScript], a + ret + +BrunoScript0: + ld hl, BrunoEntranceCoords + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyPressed], a + ld [hJoyHeld], a + ld [wSimulatedJoypadStatesEnd], a + ld [wSimulatedJoypadStatesIndex], a + ld a, [wCoordIndex] + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving + CheckAndSetEvent EVENT_AUTOWALKED_INTO_BRUNOS_ROOM + jr z, BrunoScriptWalkIntoRoom +.stopPlayerFromLeaving + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID ; "Don't run away!" + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wBrunosRoomCurScript], a + ld [wCurMapScript], a + ret + +BrunoEntranceCoords: + db $0A,$04 + db $0A,$05 + db $0B,$04 + db $0B,$05 + db $FF + +BrunoScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wBrunosRoomCurScript], a + ld [wCurMapScript], a + ret + +BrunoScript2: + call EndTrainerBattle + ld a, [wIsInBattle] + cp $ff + jp z, ResetBrunoScript + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +BrunosRoom_TextPointers: + dw BrunoText1 + dw BrunoDontRunAwayText + +BrunoTrainerHeader0: + dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 + dw BrunoBeforeBattleText ; TextBeforeBattle + dw BrunoAfterBattleText ; TextAfterBattle + dw BrunoEndBattleText ; TextEndBattle + dw BrunoEndBattleText ; TextEndBattle + + db $ff + +BrunoText1: + TX_ASM + ld hl, BrunoTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +BrunoBeforeBattleText: + TX_FAR _BrunoBeforeBattleText + db "@" + +BrunoEndBattleText: + TX_FAR _BrunoEndBattleText + db "@" + +BrunoAfterBattleText: + TX_FAR _BrunoAfterBattleText + db "@" + +BrunoDontRunAwayText: + TX_FAR _BrunoDontRunAwayText + db "@" diff --git a/scripts/CeladonChiefHouse.asm b/scripts/CeladonChiefHouse.asm new file mode 100755 index 00000000..fc37bd4d --- /dev/null +++ b/scripts/CeladonChiefHouse.asm @@ -0,0 +1,20 @@ +CeladonChiefHouse_Script: + call EnableAutoTextBoxDrawing + ret + +CeladonChiefHouse_TextPointers: + dw CeladonHouseText1 + dw CeladonHouseText2 + dw CeladonHouseText3 + +CeladonHouseText1: + TX_FAR _CeladonHouseText1 + db "@" + +CeladonHouseText2: + TX_FAR _CeladonHouseText2 + db "@" + +CeladonHouseText3: + TX_FAR _CeladonHouseText3 + db "@" diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm new file mode 100755 index 00000000..e2d7d371 --- /dev/null +++ b/scripts/CeladonCity.asm @@ -0,0 +1,132 @@ +CeladonCity_Script: + call EnableAutoTextBoxDrawing + ResetEvents EVENT_1B8, EVENT_1BF + ResetEvent EVENT_67F + ret + +CeladonCity_TextPointers: + dw CeladonCityText1 + dw CeladonCityText2 + dw CeladonCityText3 + dw CeladonCityText4 + dw CeladonCityText5 + dw CeladonCityText6 + dw CeladonCityText7 + dw CeladonCityText8 + dw CeladonCityText9 + dw CeladonCityText10 + dw CeladonCityText11 + dw PokeCenterSignText + dw CeladonCityText13 + dw CeladonCityText14 + dw CeladonCityText15 + dw CeladonCityText16 + dw CeladonCityText17 + dw CeladonCityText18 + +CeladonCityText1: + TX_FAR _CeladonCityText1 + db "@" + +CeladonCityText2: + TX_FAR _CeladonCityText2 + db "@" + +CeladonCityText3: + TX_FAR _CeladonCityText3 + db "@" + +CeladonCityText4: + TX_FAR _CeladonCityText4 + db "@" + +CeladonCityText5: + TX_ASM + CheckEvent EVENT_GOT_TM41 + jr nz, .asm_7053f + ld hl, TM41PreText + call PrintText + lb bc, TM_41, 1 + call GiveItem + jr c, .Success + ld hl, TM41NoRoomText + call PrintText + jr .Done +.Success + ld hl, ReceivedTM41Text + call PrintText + SetEvent EVENT_GOT_TM41 + jr .Done +.asm_7053f + ld hl, TM41ExplanationText + call PrintText +.Done + jp TextScriptEnd + +TM41PreText: + TX_FAR _TM41PreText + db "@" + +ReceivedTM41Text: + TX_FAR _ReceivedTM41Text + TX_SFX_ITEM_1 + db "@" + +TM41ExplanationText: + TX_FAR _TM41ExplanationText + db "@" + +TM41NoRoomText: + TX_FAR _TM41NoRoomText + db "@" + +CeladonCityText6: + TX_FAR _CeladonCityText6 + db "@" + +CeladonCityText7: + TX_FAR _CeladonCityText7 + TX_ASM + ld a, POLIWRATH + call PlayCry + jp TextScriptEnd + +CeladonCityText8: + TX_FAR _CeladonCityText8 + db "@" + +CeladonCityText9: + TX_FAR _CeladonCityText9 + db "@" + +CeladonCityText10: + TX_FAR _CeladonCityText10 + db "@" + +CeladonCityText11: + TX_FAR _CeladonCityText11 + db "@" + +CeladonCityText13: + TX_FAR _CeladonCityText13 + db "@" + +CeladonCityText14: + TX_FAR _CeladonCityText14 + db "@" + +CeladonCityText15: + TX_FAR _CeladonCityText15 + db "@" + +CeladonCityText16: + TX_FAR _CeladonCityText16 + db "@" + +CeladonCityText17: + TX_FAR _CeladonCityText17 + db "@" + +CeladonCityText18: + TX_FAR _CeladonCityText18 + db "@" diff --git a/scripts/CeladonDiner.asm b/scripts/CeladonDiner.asm new file mode 100755 index 00000000..371205de --- /dev/null +++ b/scripts/CeladonDiner.asm @@ -0,0 +1,66 @@ +CeladonDiner_Script: + call EnableAutoTextBoxDrawing + ret + +CeladonDiner_TextPointers: + dw CeladonDinerText1 + dw CeladonDinerText2 + dw CeladonDinerText3 + dw CeladonDinerText4 + dw CeladonDinerText5 + +CeladonDinerText1: + TX_FAR _CeladonDinerText1 + db "@" + +CeladonDinerText2: + TX_FAR _CeladonDinerText2 + db "@" + +CeladonDinerText3: + TX_FAR _CeladonDinerText3 + db "@" + +CeladonDinerText4: + TX_FAR _CeladonDinerText4 + db "@" + +CeladonDinerText5: + TX_ASM + CheckEvent EVENT_GOT_COIN_CASE + jr nz, .asm_eb14d + ld hl, CeladonDinerText_491a7 + call PrintText + lb bc, COIN_CASE, 1 + call GiveItem + jr nc, .BagFull + SetEvent EVENT_GOT_COIN_CASE + ld hl, ReceivedCoinCaseText + call PrintText + jr .asm_68b61 +.BagFull + ld hl, CoinCaseNoRoomText + call PrintText + jr .asm_68b61 +.asm_eb14d + ld hl, CeladonDinerText_491b7 + call PrintText +.asm_68b61 + jp TextScriptEnd + +CeladonDinerText_491a7: + TX_FAR _CeladonDinerText_491a7 + db "@" + +ReceivedCoinCaseText: + TX_FAR _ReceivedCoinCaseText + TX_SFX_KEY_ITEM + db "@" + +CoinCaseNoRoomText: + TX_FAR _CoinCaseNoRoomText + db "@" + +CeladonDinerText_491b7: + TX_FAR _CeladonDinerText_491b7 + db "@" diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm new file mode 100755 index 00000000..8ceb36ee --- /dev/null +++ b/scripts/CeladonGym.asm @@ -0,0 +1,335 @@ +CeladonGym_Script: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + call nz, CeladonGymScript_48927 + call EnableAutoTextBoxDrawing + ld hl, CeladonGymTrainerHeader0 + ld de, CeladonGym_ScriptPointers + ld a, [wCeladonGymCurScript] + call ExecuteCurMapScriptInTable + ld [wCeladonGymCurScript], a + ret + +CeladonGymScript_48927: + ld hl, Gym4CityName + ld de, Gym4LeaderName + jp LoadGymLeaderAndCityName + +Gym4CityName: + db "CELADON CITY@" + +Gym4LeaderName: + db "ERIKA@" + +CeladonGymText_48943: + xor a + ld [wJoyIgnore], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a + ret + +CeladonGym_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw CeladonGymScript3 + +CeladonGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, CeladonGymText_48943 + ld a, $f0 + ld [wJoyIgnore], a + +CeladonGymText_48963: + ld a, $9 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_ERIKA + lb bc, TM_21, 1 + call GiveItem + jr nc, .BagFull + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM21 + jr .asm_4898c +.BagFull + ld a, $b + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_4898c + ld hl, wObtainedBadges + set 3, [hl] + ld hl, wBeatGymFlags + set 3, [hl] + + ; deactivate gym trainers + SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 + + jp CeladonGymText_48943 + +CeladonGym_TextPointers: + dw CeladonGymText1 + dw CeladonGymText2 + dw CeladonGymText3 + dw CeladonGymText4 + dw CeladonGymText5 + dw CeladonGymText6 + dw CeladonGymText7 + dw CeladonGymText8 + dw CeladonGymText9 + dw TM21Text + dw TM21NoRoomText + +CeladonGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_0 + dw CeladonGymBattleText2 ; TextBeforeBattle + dw CeladonGymAfterBattleText2 ; TextAfterBattle + dw CeladonGymEndBattleText2 ; TextEndBattle + dw CeladonGymEndBattleText2 ; TextEndBattle + +CeladonGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1 + dw CeladonGymBattleText3 ; TextBeforeBattle + dw CeladonGymAfterBattleText3 ; TextAfterBattle + dw CeladonGymEndBattleText3 ; TextEndBattle + dw CeladonGymEndBattleText3 ; TextEndBattle + +CeladonGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 + dw CeladonGymBattleText4 ; TextBeforeBattle + dw CeladonGymAfterBattleText4 ; TextAfterBattle + dw CeladonGymEndBattleText4 ; TextEndBattle + dw CeladonGymEndBattleText4 ; TextEndBattle + +CeladonGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 + dw CeladonGymBattleText5 ; TextBeforeBattle + dw CeladonGymAfterBattleText5 ; TextAfterBattle + dw CeladonGymEndBattleText5 ; TextEndBattle + dw CeladonGymEndBattleText5 ; TextEndBattle + +CeladonGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 + dw CeladonGymBattleText6 ; TextBeforeBattle + dw CeladonGymAfterBattleText6 ; TextAfterBattle + dw CeladonGymEndBattleText6 ; TextEndBattle + dw CeladonGymEndBattleText6 ; TextEndBattle + +CeladonGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 + dw CeladonGymBattleText7 ; TextBeforeBattle + dw CeladonGymAfterBattleText7 ; TextAfterBattle + dw CeladonGymEndBattleText7 ; TextEndBattle + dw CeladonGymEndBattleText7 ; TextEndBattle + +CeladonGymTrainerHeader6: + dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 + dw CeladonGymBattleText8 ; TextBeforeBattle + dw CeladonGymAfterBattleText8 ; TextAfterBattle + dw CeladonGymEndBattleText8 ; TextEndBattle + dw CeladonGymEndBattleText8 ; TextEndBattle + + db $ff + +CeladonGymText1: + TX_ASM + CheckEvent EVENT_BEAT_ERIKA + jr z, .asm_48a2d + CheckEventReuseA EVENT_GOT_TM21 + jr nz, .asm_48a25 + call z, CeladonGymText_48963 + call DisableWaitingAfterTextDisplay + jr .asm_48a5b +.asm_48a25 + ld hl, CeladonGymText_48a68 + call PrintText + jr .asm_48a5b +.asm_48a2d + ld hl, CeladonGymText_48a5e + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, CeladonGymText_48a63 + ld de, CeladonGymText_48a63 + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $4 + ld [wGymLeaderNo], a + ld a, $3 + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a +.asm_48a5b + jp TextScriptEnd + +CeladonGymText_48a5e: + TX_FAR _CeladonGymText_48a5e + db "@" + +CeladonGymText_48a63: + TX_FAR _CeladonGymText_48a63 + db "@" + +CeladonGymText_48a68: + TX_FAR _CeladonGymText_48a68 + db "@" + +CeladonGymText9: + TX_FAR _CeladonGymText9 + db "@" + +TM21Text: + TX_FAR _ReceivedTM21Text + TX_SFX_ITEM_1 + TX_FAR _TM21ExplanationText + db "@" + +TM21NoRoomText: + TX_FAR _TM21NoRoomText + db "@" + +CeladonGymText2: + TX_ASM + ld hl, CeladonGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText2: + TX_FAR _CeladonGymBattleText2 + db "@" + +CeladonGymEndBattleText2: + TX_FAR _CeladonGymEndBattleText2 + db "@" + +CeladonGymAfterBattleText2: + TX_FAR _CeladonGymAfterBattleText2 + db "@" + +CeladonGymText3: + TX_ASM + ld hl, CeladonGymTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText3: + TX_FAR _CeladonGymBattleText3 + db "@" + +CeladonGymEndBattleText3: + TX_FAR _CeladonGymEndBattleText3 + db "@" + +CeladonGymAfterBattleText3: + TX_FAR _CeladonGymAfterBattleText3 + db "@" + +CeladonGymText4: + TX_ASM + ld hl, CeladonGymTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText4: + TX_FAR _CeladonGymBattleText4 + db "@" + +CeladonGymEndBattleText4: + TX_FAR _CeladonGymEndBattleText4 + db "@" + +CeladonGymAfterBattleText4: + TX_FAR _CeladonGymAfterBattleText4 + db "@" + +CeladonGymText5: + TX_ASM + ld hl, CeladonGymTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText5: + TX_FAR _CeladonGymBattleText5 + db "@" + +CeladonGymEndBattleText5: + TX_FAR _CeladonGymEndBattleText5 + db "@" + +CeladonGymAfterBattleText5: + TX_FAR _CeladonGymAfterBattleText5 + db "@" + +CeladonGymText6: + TX_ASM + ld hl, CeladonGymTrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText6: + TX_FAR _CeladonGymBattleText6 + db "@" + +CeladonGymEndBattleText6: + TX_FAR _CeladonGymEndBattleText6 + db "@" + +CeladonGymAfterBattleText6: + TX_FAR _CeladonGymAfterBattleText6 + db "@" + +CeladonGymText7: + TX_ASM + ld hl, CeladonGymTrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText7: + TX_FAR _CeladonGymBattleText7 + db "@" + +CeladonGymEndBattleText7: + TX_FAR _CeladonGymEndBattleText7 + db "@" + +CeladonGymAfterBattleText7: + TX_FAR _CeladonGymAfterBattleText7 + db "@" + +CeladonGymText8: + TX_ASM + ld hl, CeladonGymTrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +CeladonGymBattleText8: + TX_FAR _CeladonGymBattleText8 + db "@" + +CeladonGymEndBattleText8: + TX_FAR _CeladonGymEndBattleText8 + db "@" + +CeladonGymAfterBattleText8: + TX_FAR _CeladonGymAfterBattleText8 + db "@" diff --git a/scripts/CeladonHotel.asm b/scripts/CeladonHotel.asm new file mode 100755 index 00000000..ee4e140c --- /dev/null +++ b/scripts/CeladonHotel.asm @@ -0,0 +1,19 @@ +CeladonHotel_Script: + jp EnableAutoTextBoxDrawing + +CeladonHotel_TextPointers: + dw CeladonHotelText1 + dw CeladonHotelText2 + dw CeladonHotelText3 + +CeladonHotelText1: + TX_FAR _CeladonHotelText1 + db "@" + +CeladonHotelText2: + TX_FAR _CeladonHotelText2 + db "@" + +CeladonHotelText3: + TX_FAR _CeladonHotelText3 + db "@" diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm new file mode 100755 index 00000000..41524983 --- /dev/null +++ b/scripts/CeladonMansion1F.asm @@ -0,0 +1,39 @@ +CeladonMansion1F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMansion1F_TextPointers: + dw CeladonMansion1Text1 + dw CeladonMansion1Text2 + dw CeladonMansion1Text3 + dw CeladonMansion1Text4 + dw CeladonMansion1Text5 + +CeladonMansion1_486a1: + call PlayCry + jp TextScriptEnd + +CeladonMansion1Text1: + TX_FAR _CeladonMansion1Text1 + TX_ASM + ld a, MEOWTH + jp CeladonMansion1_486a1 + +CeladonMansion1Text2: + TX_FAR _CeladonMansion1Text2 + db "@" + +CeladonMansion1Text3: + TX_FAR _CeladonMansion1Text3 + TX_ASM + ld a, CLEFAIRY + jp CeladonMansion1_486a1 + +CeladonMansion1Text4: + TX_FAR _CeladonMansion1Text4 + TX_ASM + ld a, NIDORAN_F + jp CeladonMansion1_486a1 + +CeladonMansion1Text5: + TX_FAR _CeladonMansion1Text5 + db "@" diff --git a/scripts/CeladonMansion2F.asm b/scripts/CeladonMansion2F.asm new file mode 100755 index 00000000..9deb606d --- /dev/null +++ b/scripts/CeladonMansion2F.asm @@ -0,0 +1,10 @@ +CeladonMansion2F_Script: + call EnableAutoTextBoxDrawing + ret + +CeladonMansion2F_TextPointers: + dw CeladonMansion2Text1 + +CeladonMansion2Text1: + TX_FAR _CeladonMansion2Text1 + db "@" diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm new file mode 100755 index 00000000..43832f63 --- /dev/null +++ b/scripts/CeladonMansion3F.asm @@ -0,0 +1,71 @@ +CeladonMansion3F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMansion3F_TextPointers: + dw ProgrammerText + dw GraphicArtistText + dw WriterText + dw DirectorText + dw GameFreakPCText1 + dw GameFreakPCText2 + dw GameFreakPCText3 + dw GameFreakSignText + +ProgrammerText: + TX_FAR _ProgrammerText + db "@" + +GraphicArtistText: + TX_FAR _GraphicArtistText + db "@" + +WriterText: + TX_FAR _WriterText + db "@" + +DirectorText: + TX_ASM + + ; check pokédex + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned + call CountSetBits + ld a, [wNumSetBits] + cp 150 + jr nc, .CompletedDex + ld hl, .GameDesigner + jr .done +.CompletedDex + ld hl, .CompletedDexText +.done + call PrintText + jp TextScriptEnd + +.GameDesigner + TX_FAR _GameDesignerText + db "@" + +.CompletedDexText + TX_FAR _CompletedDexText + TX_BLINK + TX_ASM + callab DisplayDiploma + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + jp TextScriptEnd + +GameFreakPCText1: + TX_FAR _CeladonMansion3Text5 + db "@" + +GameFreakPCText2: + TX_FAR _CeladonMansion3Text6 + db "@" + +GameFreakPCText3: + TX_FAR _CeladonMansion3Text7 + db "@" + +GameFreakSignText: + TX_FAR _CeladonMansion3Text8 + db "@" diff --git a/scripts/CeladonMansionRoof.asm b/scripts/CeladonMansionRoof.asm new file mode 100755 index 00000000..d5028537 --- /dev/null +++ b/scripts/CeladonMansionRoof.asm @@ -0,0 +1,9 @@ +CeladonMansionRoof_Script: + jp EnableAutoTextBoxDrawing + +CeladonMansionRoof_TextPointers: + dw CeladonMansion4Text1 + +CeladonMansion4Text1: + TX_FAR _CeladonMansion4Text1 + db "@" diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..e519d506 --- /dev/null +++ b/scripts/CeladonMansionRoofHouse.asm @@ -0,0 +1,21 @@ +CeladonMansionRoofHouse_Script: + jp EnableAutoTextBoxDrawing + +CeladonMansionRoofHouse_TextPointers: + dw CeladonMansion5Text1 + dw CeladonMansion5Text2 + +CeladonMansion5Text1: + TX_FAR _CeladonMansion5Text1 + db "@" + +CeladonMansion5Text2: + TX_ASM + lb bc, EEVEE, 25 + call GivePokemon + jr nc, .asm_24365 + ld a, HS_CELADON_MANSION_EEVEE_GIFT + ld [wMissableObjectIndex], a + predef HideObject +.asm_24365 + jp TextScriptEnd diff --git a/scripts/CeladonMart1F.asm b/scripts/CeladonMart1F.asm new file mode 100755 index 00000000..8afd805a --- /dev/null +++ b/scripts/CeladonMart1F.asm @@ -0,0 +1,19 @@ +CeladonMart1F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMart1F_TextPointers: + dw CeladonMart1Text1 + dw CeladonMart1Text2 + dw CeladonMart1Text3 + +CeladonMart1Text1: + TX_FAR _CeladonMart1Text1 + db "@" + +CeladonMart1Text2: + TX_FAR _CeladonMart1Text2 + db "@" + +CeladonMart1Text3: + TX_FAR _CeladonMart1Text3 + db "@" diff --git a/scripts/CeladonMart2F.asm b/scripts/CeladonMart2F.asm new file mode 100755 index 00000000..787c186e --- /dev/null +++ b/scripts/CeladonMart2F.asm @@ -0,0 +1,21 @@ +CeladonMart2F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMart2F_TextPointers: + dw CeladonMart2Clerk1Text + dw CeladonMart2Clerk2Text + dw CeladonMart2Text3 + dw CeladonMart2Text4 + dw CeladonMart2Text5 + +CeladonMart2Text3: + TX_FAR _CeladonMart2Text3 + db "@" + +CeladonMart2Text4: + TX_FAR _CeladonMart2Text4 + db "@" + +CeladonMart2Text5: + TX_FAR _CeladonMart2Text5 + db "@" diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm new file mode 100755 index 00000000..e7e216d9 --- /dev/null +++ b/scripts/CeladonMart3F.asm @@ -0,0 +1,108 @@ +CeladonMart3F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMart3F_TextPointers: + dw CeladonMart3Text1 + dw CeladonMart3Text2 + dw CeladonMart3Text3 + dw CeladonMart3Text4 + dw CeladonMart3Text5 + dw CeladonMart3Text6 + dw CeladonMart3Text7 + dw CeladonMart3Text8 + dw CeladonMart3Text9 + dw CeladonMart3Text10 + dw CeladonMart3Text11 + dw CeladonMart3Text12 + dw CeladonMart3Text13 + dw CeladonMart3Text14 + dw CeladonMart3Text15 + dw CeladonMart3Text16 + dw CeladonMart3Text17 + +CeladonMart3Text1: + TX_ASM + CheckEvent EVENT_GOT_TM18 + jr nz, .asm_a5463 + ld hl, TM18PreReceiveText + call PrintText + lb bc, TM_18, 1 + call GiveItem + jr nc, .BagFull + SetEvent EVENT_GOT_TM18 + ld hl, ReceivedTM18Text + jr .asm_81359 +.BagFull + ld hl, TM18NoRoomText + jr .asm_81359 +.asm_a5463 + ld hl, TM18ExplanationText +.asm_81359 + call PrintText + jp TextScriptEnd + +TM18PreReceiveText: + TX_FAR _TM18PreReceiveText + db "@" + +ReceivedTM18Text: + TX_FAR _ReceivedTM18Text + TX_SFX_ITEM_1 + db "@" + +TM18ExplanationText: + TX_FAR _TM18ExplanationText + db "@" + +TM18NoRoomText: + TX_FAR _TM18NoRoomText + db "@" + +CeladonMart3Text2: + TX_FAR _CeladonMart3Text2 + db "@" + +CeladonMart3Text3: + TX_FAR _CeladonMart3Text3 + db "@" + +CeladonMart3Text4: + TX_FAR _CeladonMart3Text4 + db "@" + +CeladonMart3Text5: + TX_FAR _CeladonMart3Text5 + db "@" + +CeladonMart3Text12 +CeladonMart3Text10: +CeladonMart3Text8: +CeladonMart3Text6: + TX_FAR _CeladonMart3Text6 + db "@" + +CeladonMart3Text7: + TX_FAR _CeladonMart3Text7 + db "@" + +CeladonMart3Text9: + TX_FAR _CeladonMart3Text9 + db "@" + +CeladonMart3Text11: + TX_FAR _CeladonMart3Text11 + db "@" + +CeladonMart3Text13: + TX_FAR _CeladonMart3Text13 + db "@" + +CeladonMart3Text14: + TX_FAR _CeladonMart3Text14 + db "@" + +CeladonMart3Text17: +CeladonMart3Text16: +CeladonMart3Text15: + TX_FAR _CeladonMart3Text15 + db "@" diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm new file mode 100755 index 00000000..20f817e9 --- /dev/null +++ b/scripts/CeladonMart4F.asm @@ -0,0 +1,20 @@ +CeladonMart4F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMart4F_TextPointers: + dw CeladonMart4ClerkText + dw CeladonMart4Text2 + dw CeladonMart4Text3 + dw CeladonMart4Text4 + +CeladonMart4Text2: + TX_FAR _CeladonMart4Text2 + db "@" + +CeladonMart4Text3: + TX_FAR _CeladonMart4Text3 + db "@" + +CeladonMart4Text4: + TX_FAR _CeladonMart4Text4 + db "@" diff --git a/scripts/CeladonMart5F.asm b/scripts/CeladonMart5F.asm new file mode 100755 index 00000000..9f52f866 --- /dev/null +++ b/scripts/CeladonMart5F.asm @@ -0,0 +1,21 @@ +CeladonMart5F_Script: + jp EnableAutoTextBoxDrawing + +CeladonMart5F_TextPointers: + dw CeladonMart5Text1 + dw CeladonMart5Text2 + dw CeladonMart5Clerk1Text + dw CeladonMart5Clerk2Text + dw CeladonMart5Text5 + +CeladonMart5Text1: + TX_FAR _CeladonMart5Text1 + db "@" + +CeladonMart5Text2: + TX_FAR _CeladonMart5Text2 + db "@" + +CeladonMart5Text5: + TX_FAR _CeladonMart5Text5 + db "@" diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm new file mode 100755 index 00000000..34b923f9 --- /dev/null +++ b/scripts/CeladonMartElevator.asm @@ -0,0 +1,73 @@ +CeladonMartElevator_Script: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + push hl + call nz, CeladonMartElevatorScript_4861c + pop hl + bit 7, [hl] + res 7, [hl] + call nz, CeladonMartElevatorScript_48654 + xor a + ld [wAutoTextBoxDrawingControl], a + inc a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret + +CeladonMartElevatorScript_4861c: + ld hl, wWarpEntries + ld a, [wWarpedFromWhichWarp] + ld b, a + ld a, [wWarpedFromWhichMap] + ld c, a + call CeladonMartElevatorScript_4862a + +CeladonMartElevatorScript_4862a: + inc hl + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ret + +CeladonMartElevatorScript_48631: + ld hl, CeladonMartElevatorFloors + call LoadItemList + ld hl, CeladonMartElevatorWarpMaps + ld de, wElevatorWarpMaps + ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps + jp CopyData + +CeladonMartElevatorFloors: + db 5 ; number of elements in list + db FLOOR_1F + db FLOOR_2F + db FLOOR_3F + db FLOOR_4F + db FLOOR_5F + db $FF + +CeladonMartElevatorWarpMaps: +; first byte is warp number +; second byte is map number +; These specify where the player goes after getting out of the elevator. + db $05, CELADON_MART_1F + db $02, CELADON_MART_2F + db $02, CELADON_MART_3F + db $02, CELADON_MART_4F + db $02, CELADON_MART_5F +CeladonMartElevatorWarpMapsEnd: + +CeladonMartElevatorScript_48654: + jpba ShakeElevator + +CeladonMartElevator_TextPointers: + dw CeladonMartElevatorText1 + +CeladonMartElevatorText1: + TX_ASM + call CeladonMartElevatorScript_48631 + ld hl, CeladonMartElevatorWarpMaps + predef DisplayElevatorFloorMenu + jp TextScriptEnd diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm new file mode 100755 index 00000000..35c740b2 --- /dev/null +++ b/scripts/CeladonMartRoof.asm @@ -0,0 +1,255 @@ +CeladonMartRoof_Script: + jp EnableAutoTextBoxDrawing + +CeladonMartRoofScript_GetDrinksInBag: +; construct a list of all drinks in the player's bag + xor a + ld [wFilteredBagItemsCount], a + ld de, wFilteredBagItems + ld hl, CeladonMartRoofDrinkList +.loop + ld a, [hli] + and a + jr z, .done + push hl + push de + ld [wd11e], a + ld b, a + predef GetQuantityOfItemInBag + pop de + pop hl + ld a, b + and a + jr z, .loop ; if the item isn't in the bag + ld a, [wd11e] + ld [de], a + inc de + push hl + ld hl, wFilteredBagItemsCount + inc [hl] + pop hl + jr .loop +.done + ld a, $ff + ld [de], a + ret + +CeladonMartRoofDrinkList: + db FRESH_WATER + db SODA_POP + db LEMONADE + db $00 + +CeladonMartRoofScript_GiveDrinkToGirl: + ld hl, wd730 + set 6, [hl] + ld hl, CeladonMartRoofText_484ee + call PrintText + xor a + ld [wCurrentMenuItem], a + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, [wFilteredBagItemsCount] + dec a + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 1 + ld [wTopMenuItemX], a + ld a, [wFilteredBagItemsCount] + dec a + ld bc, 2 + ld hl, 3 + call AddNTimes + dec l + ld b, l + ld c, 12 + coord hl, 0, 0 + call TextBoxBorder + call UpdateSprites + call CeladonMartRoofScript_PrintDrinksInBag + ld hl, wd730 + res 6, [hl] + call HandleMenuInput + bit 1, a ; pressed b + ret nz + ld hl, wFilteredBagItems + ld a, [wCurrentMenuItem] + ld d, 0 + ld e, a + add hl, de + ld a, [hl] + ld [hItemToRemoveID], a + cp FRESH_WATER + jr z, .gaveFreshWater + cp SODA_POP + jr z, .gaveSodaPop +; gave Lemonade + CheckEvent EVENT_GOT_TM49 + jr nz, .alreadyGaveDrink + ld hl, CeladonMartRoofText_48515 + call PrintText + call RemoveItemByIDBank12 + lb bc, TM_49, 1 + call GiveItem + jr nc, .bagFull + ld hl, ReceivedTM49Text + call PrintText + SetEvent EVENT_GOT_TM49 + ret +.gaveSodaPop + CheckEvent EVENT_GOT_TM48 + jr nz, .alreadyGaveDrink + ld hl, CeladonMartRoofText_48504 + call PrintText + call RemoveItemByIDBank12 + lb bc, TM_48, 1 + call GiveItem + jr nc, .bagFull + ld hl, CeladonMartRoofText_4850a + call PrintText + SetEvent EVENT_GOT_TM48 + ret +.gaveFreshWater + CheckEvent EVENT_GOT_TM13 + jr nz, .alreadyGaveDrink + ld hl, CeladonMartRoofText_484f3 + call PrintText + call RemoveItemByIDBank12 + lb bc, TM_13, 1 + call GiveItem + jr nc, .bagFull + ld hl, CeladonMartRoofText_484f9 + call PrintText + SetEvent EVENT_GOT_TM13 + ret +.bagFull + ld hl, CeladonMartRoofText_48526 + jp PrintText +.alreadyGaveDrink + ld hl, CeladonMartRoofText_4852c + jp PrintText + +RemoveItemByIDBank12: + jpba RemoveItemByID + +CeladonMartRoofText_484ee: + TX_FAR _CeladonMartRoofText_484ee + db "@" + +CeladonMartRoofText_484f3: + TX_FAR _CeladonMartRoofText_484f3 + TX_WAIT + db "@" + +CeladonMartRoofText_484f9: + TX_FAR _CeladonMartRoofText_484f9 + TX_SFX_ITEM_1 + TX_FAR _CeladonMartRoofText_484fe + TX_WAIT + db "@" + +CeladonMartRoofText_48504: + TX_FAR _CeladonMartRoofText_48504 + TX_WAIT + db "@" + +CeladonMartRoofText_4850a: + TX_FAR _CeladonMartRoofText_4850a + TX_SFX_ITEM_1 + TX_FAR _CeladonMartRoofText_4850f + TX_WAIT + db "@" + +CeladonMartRoofText_48515: + TX_FAR _CeladonMartRoofText_48515 + TX_WAIT + db "@" + +ReceivedTM49Text: + TX_FAR _ReceivedTM49Text + TX_SFX_ITEM_1 + TX_FAR _CeladonMartRoofText_48520 + TX_WAIT + db "@" + +CeladonMartRoofText_48526: + TX_FAR _CeladonMartRoofText_48526 + TX_WAIT + db "@" + +CeladonMartRoofText_4852c: + TX_FAR _CeladonMartRoofText_4852c + TX_WAIT + db "@" + +CeladonMartRoofScript_PrintDrinksInBag: + ld hl, wFilteredBagItems + xor a + ld [hItemCounter], a +.loop + ld a, [hli] + cp $ff + ret z + push hl + ld [wd11e], a + call GetItemName + coord hl, 2, 2 + ld a, [hItemCounter] + ld bc, SCREEN_WIDTH * 2 + call AddNTimes + ld de, wcd6d + call PlaceString + ld hl, hItemCounter + inc [hl] + pop hl + jr .loop + +CeladonMartRoof_TextPointers: + dw CeladonMartRoofText1 + dw CeladonMartRoofText2 + dw CeladonMartRoofText5 + dw CeladonMartRoofText5 + dw CeladonMartRoofText5 + dw CeladonMartRoofText6 + +CeladonMartRoofText1: + TX_FAR _CeladonMartRoofText1 + db "@" + +CeladonMartRoofText2: + TX_ASM + call CeladonMartRoofScript_GetDrinksInBag + ld a, [wFilteredBagItemsCount] + and a + jr z, .noDrinksInBag + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, CeladonMartRoofText4 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .done + call CeladonMartRoofScript_GiveDrinkToGirl + jr .done +.noDrinksInBag + ld hl, CeladonMartRoofText3 + call PrintText +.done + jp TextScriptEnd + +CeladonMartRoofText3: + TX_FAR _CeladonMartRoofText_48598 + db "@" + +CeladonMartRoofText4: + TX_FAR _CeladonMartRoofText4 + db "@" + +CeladonMartRoofText5: + TX_VENDING_MACHINE + +CeladonMartRoofText6: + TX_FAR _CeladonMartRoofText6 + db "@" diff --git a/scripts/CeladonPokecenter.asm b/scripts/CeladonPokecenter.asm new file mode 100755 index 00000000..b5efb7d5 --- /dev/null +++ b/scripts/CeladonPokecenter.asm @@ -0,0 +1,23 @@ +CeladonPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +CeladonPokecenter_TextPointers: + dw CeladonHealNurseText + dw CeladonPokecenterText2 + dw CeladonPokecenterText3 + dw CeladonTradeNurseText + +CeladonTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST + +CeladonHealNurseText: + TX_POKECENTER_NURSE + +CeladonPokecenterText2: + TX_FAR _CeladonPokecenterText2 + db "@" + +CeladonPokecenterText3: + TX_FAR _CeladonPokecenterText3 + db "@" diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm new file mode 100755 index 00000000..cab2bf23 --- /dev/null +++ b/scripts/CeruleanBadgeHouse.asm @@ -0,0 +1,109 @@ +CeruleanBadgeHouse_Script: + ld a, $1 + ld [wAutoTextBoxDrawingControl], a + dec a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret + +CeruleanBadgeHouse_TextPointers: + dw CeruleanHouse2Text1 + +CeruleanHouse2Text1: + TX_ASM + ld hl, CeruleanHouse2Text_74e77 + call PrintText + xor a + ld [wCurrentMenuItem], a + ld [wListScrollOffset], a +.asm_74e23 + ld hl, CeruleanHouse2Text_74e7c + call PrintText + ld hl, BadgeItemList + call LoadItemList + ld hl, wItemList + ld a, l + ld [wListPointer], a + ld a, h + ld [wListPointer + 1], a + xor a + ld [wPrintItemPrices], a + ld [wMenuItemToSwap], a + ld a, SPECIALLISTMENU + ld [wListMenuID], a + call DisplayListMenuID + jr c, .asm_74e60 + ld hl, TextPointers_74e86 + ld a, [wcf91] + sub $15 + add a + ld d, $0 + ld e, a + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText + jr .asm_74e23 +.asm_74e60 + xor a + ld [wListScrollOffset], a + ld hl, CeruleanHouse2Text_74e81 + call PrintText + jp TextScriptEnd + +BadgeItemList: + db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF + +CeruleanHouse2Text_74e77: + TX_FAR _CeruleanHouse2Text_74e77 + db "@" + +CeruleanHouse2Text_74e7c: + TX_FAR _CeruleanHouse2Text_74e7c + db "@" + +CeruleanHouse2Text_74e81: + TX_FAR _CeruleanHouse2Text_74e81 + db "@" + +TextPointers_74e86: + dw CeruleanHouse2Text_74e96 + dw CeruleanHouse2Text_74e9b + dw CeruleanHouse2Text_74ea0 + dw CeruleanHouse2Text_74ea5 + dw CeruleanHouse2Text_74eaa + dw CeruleanHouse2Text_74eaf + dw CeruleanHouse2Text_74eb4 + dw CeruleanHouse2Text_74eb9 + +CeruleanHouse2Text_74e96: + TX_FAR _CeruleanHouse2Text_74e96 + db "@" + +CeruleanHouse2Text_74e9b: + TX_FAR _CeruleanHouse2Text_74e9b + db "@" + +CeruleanHouse2Text_74ea0: + TX_FAR _CeruleanHouse2Text_74ea0 + db "@" + +CeruleanHouse2Text_74ea5: + TX_FAR _CeruleanHouse2Text_74ea5 + db "@" + +CeruleanHouse2Text_74eaa: + TX_FAR _CeruleanHouse2Text_74eaa + db "@" + +CeruleanHouse2Text_74eaf: + TX_FAR _CeruleanHouse2Text_74eaf + db "@" + +CeruleanHouse2Text_74eb4: + TX_FAR _CeruleanHouse2Text_74eb4 + db "@" + +CeruleanHouse2Text_74eb9: + TX_FAR _CeruleanHouse2Text_74eb9 + db "@" diff --git a/scripts/CeruleanCave1F.asm b/scripts/CeruleanCave1F.asm new file mode 100755 index 00000000..6f5c7b13 --- /dev/null +++ b/scripts/CeruleanCave1F.asm @@ -0,0 +1,7 @@ +CeruleanCave1F_Script: + jp EnableAutoTextBoxDrawing + +CeruleanCave1F_TextPointers: + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText diff --git a/scripts/CeruleanCave2F.asm b/scripts/CeruleanCave2F.asm new file mode 100755 index 00000000..1bc8457b --- /dev/null +++ b/scripts/CeruleanCave2F.asm @@ -0,0 +1,7 @@ +CeruleanCave2F_Script: + jp EnableAutoTextBoxDrawing + +CeruleanCave2F_TextPointers: + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm new file mode 100755 index 00000000..a570ab18 --- /dev/null +++ b/scripts/CeruleanCaveB1F.asm @@ -0,0 +1,43 @@ +CeruleanCaveB1F_Script: + call EnableAutoTextBoxDrawing + ld hl, MewtwoTrainerHeader + ld de, CeruleanCaveB1F_ScriptPointers + ld a, [wCeruleanCaveB1FCurScript] + call ExecuteCurMapScriptInTable + ld [wCeruleanCaveB1FCurScript], a + ret + +CeruleanCaveB1F_ScriptPointers + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +CeruleanCaveB1F_TextPointers: + dw MewtwoText + dw PickUpItemText + dw PickUpItemText + +MewtwoTrainerHeader: + dbEventFlagBit EVENT_BEAT_MEWTWO + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MEWTWO + dw MewtwoBattleText ; TextBeforeBattle + dw MewtwoBattleText ; TextAfterBattle + dw MewtwoBattleText ; TextEndBattle + dw MewtwoBattleText ; TextEndBattle + + db $ff + +MewtwoText: + TX_ASM + ld hl, MewtwoTrainerHeader + call TalkToTrainer + jp TextScriptEnd + +MewtwoBattleText: + TX_FAR _MewtwoBattleText + TX_ASM + ld a, MEWTWO + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm new file mode 100755 index 00000000..117ec4da --- /dev/null +++ b/scripts/CeruleanCity.asm @@ -0,0 +1,453 @@ +CeruleanCity_Script: + call EnableAutoTextBoxDrawing + ld hl, CeruleanCity_ScriptPointers + ld a, [wCeruleanCityCurScript] + jp CallFunctionInTable + +CeruleanCityScript_1948c: + xor a + ld [wJoyIgnore], a + ld [wCeruleanCityCurScript], a + ld a, HS_CERULEAN_RIVAL + ld [wMissableObjectIndex], a + predef_jump HideObject + +CeruleanCity_ScriptPointers: + dw CeruleanCityScript0 + dw CeruleanCityScript1 + dw CeruleanCityScript2 + dw CeruleanCityScript3 + dw CeruleanCityScript4 + +CeruleanCityScript4: + ld a, [wIsInBattle] + cp $ff + jp z, CeruleanCityScript_1948c + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wJoyIgnore], a + ld [wCeruleanCityCurScript], a + ret + +CeruleanCityScript0: + CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF + jr nz, .asm_194f7 + ld hl, CeruleanCityCoords1 + call ArePlayerCoordsInArray + jr nc, .asm_194f7 + ld a, [wCoordIndex] + cp $1 + ld a, PLAYER_DIR_UP + ld b, SPRITE_FACING_DOWN + jr nz, .asm_194e6 + ld a, PLAYER_DIR_DOWN + ld b, SPRITE_FACING_UP +.asm_194e6 + ld [wPlayerMovingDirection], a + ld a, b + ld [wSpriteStateData1 + 2 * $10 + $9], a + call Delay3 + ld a, $2 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID +.asm_194f7 + CheckEvent EVENT_BEAT_CERULEAN_RIVAL + ret nz + ld hl, CeruleanCityCoords2 + call ArePlayerCoordsInArray + ret nc + ld a, [wWalkBikeSurfState] + and a + jr z, .asm_19512 + ld a, $ff + ld [wNewSoundID], a + call PlaySound +.asm_19512 + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + xor a + ld [hJoyHeld], a + ld a, $f0 + ld [wJoyIgnore], a + ld a, [wXCoord] + cp $14 + jr z, .asm_19535 + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, $5 + ld [H_SPRITEDATAOFFSET], a + call GetPointerWithinSpriteStateData2 + ld [hl], $19 +.asm_19535 + ld a, HS_CERULEAN_RIVAL + ld [wMissableObjectIndex], a + predef ShowObject + ld de, CeruleanCityMovement1 + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $1 + ld [wCeruleanCityCurScript], a + ret + +CeruleanCityCoords1: + db $07,$1e + db $09,$1e + db $ff + +CeruleanCityCoords2: + db $06,$14 + db $06,$15 + db $ff + +CeruleanCityMovement1: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +CeruleanCityScript_1955d: + ld a, 1 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + jp SetSpriteFacingDirectionAndDelay ; face object + +CeruleanCityScript1: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, CeruleanCityText_1966d + ld de, CeruleanCityText_19672 + call SaveEndBattleTextPointers + ld a, OPP_SONY1 + ld [wCurOpponent], a + + ; select which team to use during the encounter + ld a, [wRivalStarter] + cp STARTER2 + jr nz, .NotSquirtle + ld a, $7 + jr .done +.NotSquirtle + cp STARTER3 + jr nz, .Charmander + ld a, $8 + jr .done +.Charmander + ld a, $9 +.done + ld [wTrainerNo], a + + xor a + ld [hJoyHeld], a + call CeruleanCityScript_1955d + ld a, $2 + ld [wCeruleanCityCurScript], a + ret + +CeruleanCityScript2: + ld a, [wIsInBattle] + cp $ff + jp z, CeruleanCityScript_1948c + call CeruleanCityScript_1955d + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_CERULEAN_RIVAL + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld a, [wXCoord] + cp $14 + jr nz, .asm_195f0 + ld de, CeruleanCityMovement4 + jr .asm_195f3 +.asm_195f0 + ld de, CeruleanCityMovement3 +.asm_195f3 + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $3 + ld [wCeruleanCityCurScript], a + ret + +CeruleanCityMovement3: + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +CeruleanCityMovement4: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +CeruleanCityScript3: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_CERULEAN_RIVAL + ld [wMissableObjectIndex], a + predef HideObject + xor a + ld [wJoyIgnore], a + call PlayDefaultMusic + ld a, $0 + ld [wCeruleanCityCurScript], a + ret + +CeruleanCity_TextPointers: + dw CeruleanCityText1 + dw CeruleanCityText2 + dw CeruleanCityText3 + dw CeruleanCityText4 + dw CeruleanCityText5 + dw CeruleanCityText6 + dw CeruleanCityText7 + dw CeruleanCityText8 + dw CeruleanCityText9 + dw CeruleanCityText10 + dw CeruleanCityText11 + dw CeruleanCityText12 + dw CeruleanCityText13 + dw MartSignText + dw PokeCenterSignText + dw CeruleanCityText16 + dw CeruleanCityText17 + +CeruleanCityText1: + TX_ASM + CheckEvent EVENT_BEAT_CERULEAN_RIVAL + ; do pre-battle text + jr z, .PreBattleText + ; or talk about bill + ld hl, CeruleanCityText_19677 + call PrintText + jr .end +.PreBattleText + ld hl, CeruleanCityText_19668 + call PrintText +.end + jp TextScriptEnd + +CeruleanCityText_19668: + TX_FAR _CeruleanCityText_19668 + db "@" + +CeruleanCityText_1966d: + TX_FAR _CeruleanCityText_1966d + db "@" + +CeruleanCityText_19672: + TX_FAR _CeruleanCityText_19672 + db "@" + +CeruleanCityText_19677: + TX_FAR _CeruleanCityText_19677 + db "@" + +CeruleanCityText2: + TX_ASM + CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF + jr nz, .asm_4ca20 + ld hl, CeruleanCityText_196d9 + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, CeruleanCityText_196ee + ld de, CeruleanCityText_196ee + call SaveEndBattleTextPointers + ld a, [hSpriteIndexOrTextID] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $4 + ld [wCeruleanCityCurScript], a + jp TextScriptEnd +.asm_4ca20 + ld hl, CeruleanCityText_196f3 + call PrintText + lb bc, TM_28, 1 + call GiveItem + jr c, .Success + ld hl, TM28NoRoomText + call PrintText + jr .Done +.Success + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, ReceivedTM28Text + call PrintText + callba CeruleanHideRocket +.Done + jp TextScriptEnd + +CeruleanCityText_196d9: + TX_FAR _CeruleanCityText_196d9 + db "@" + +ReceivedTM28Text: + TX_FAR _ReceivedTM28Text + TX_SFX_ITEM_1 + TX_FAR _ReceivedTM28Text2 + TX_WAIT + db "@" + +TM28NoRoomText: + TX_FAR _TM28NoRoomText + db "@" + +CeruleanCityText_196ee: + TX_FAR _CeruleanCityText_196ee + db "@" + +CeruleanCityText_196f3: + TX_FAR _CeruleanCityText_196f3 + db "@" + +CeruleanCityText3: + TX_FAR _CeruleanCityText3 + db "@" + +CeruleanCityText4: + TX_FAR _CeruleanCityText4 + db "@" + +CeruleanCityText5: + TX_FAR _CeruleanCityText5 + db "@" + +CeruleanCityText11: +CeruleanCityText6: + TX_FAR _CeruleanCityText6 + db "@" + +CeruleanCityText7: + TX_ASM + ld a, [hRandomAdd] + cp 180 + jr c, .asm_e9fc9 + ld hl, CeruleanCityText_19730 + call PrintText + jr .asm_d486e +.asm_e9fc9 + cp 100 + jr c, .asm_df99b + ld hl, CeruleanCityText_19735 + call PrintText + jr .asm_d486e +.asm_df99b + ld hl, CeruleanCityText_1973a + call PrintText +.asm_d486e + jp TextScriptEnd + +CeruleanCityText_19730: + TX_FAR _CeruleanCityText_19730 + db "@" + +CeruleanCityText_19735: + TX_FAR _CeruleanCityText_19735 + db "@" + +CeruleanCityText_1973a: + TX_FAR _CeruleanCityText_1973a + db "@" + +CeruleanCityText8: + TX_ASM + ld a, [hRandomAdd] + cp 180 + jr c, .asm_e28da + ld hl, CeruleanCityText_1976f + call PrintText + jr .asm_f2f38 +.asm_e28da + cp 120 + jr c, .asm_15d08 + ld hl, CeruleanCityText_19774 + call PrintText + jr .asm_f2f38 +.asm_15d08 + cp 60 + jr c, .asm_d7fea + ld hl, CeruleanCityText_19779 + call PrintText + jr .asm_f2f38 +.asm_d7fea + ld hl, CeruleanCityText_1977e + call PrintText +.asm_f2f38 + jp TextScriptEnd + +CeruleanCityText_1976f: + TX_FAR _CeruleanCityText_1976f + db "@" + +CeruleanCityText_19774: + TX_FAR _CeruleanCityText_19774 + db "@" + +CeruleanCityText_19779: + TX_FAR _CeruleanCityText_19779 + db "@" + +CeruleanCityText_1977e: + TX_FAR _CeruleanCityText_1977e + db "@" + +CeruleanCityText9: + TX_FAR _CeruleanCityText9 + db "@" + +CeruleanCityText10: + TX_FAR _CeruleanCityText10 + db "@" + +CeruleanCityText12: + TX_FAR _CeruleanCityText12 + db "@" + +CeruleanCityText13: + TX_FAR _CeruleanCityText13 + db "@" + +CeruleanCityText16: + TX_FAR _CeruleanCityText16 + db "@" + +CeruleanCityText17: + TX_FAR _CeruleanCityText17 + db "@" diff --git a/scripts/CeruleanCity_2.asm b/scripts/CeruleanCity_2.asm new file mode 100755 index 00000000..53ace5c8 --- /dev/null +++ b/scripts/CeruleanCity_2.asm @@ -0,0 +1,16 @@ +CeruleanHideRocket: +; code similar to this appears in a lot of banks; this particular +; one is called after you beat the Rocket that gives you TM28 DIG. +; the screen then fades out, he disappears, and fades back in + call GBFadeOutToBlack + ld a, HS_CERULEAN_GUARD_1 + ld [wMissableObjectIndex], a + predef ShowObject + ld a, HS_CERULEAN_GUARD_2 + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_CERULEAN_ROCKET + ld [wMissableObjectIndex], a + predef HideObject + call GBFadeInFromBlack + ret diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm new file mode 100755 index 00000000..7d152b4f --- /dev/null +++ b/scripts/CeruleanGym.asm @@ -0,0 +1,219 @@ +CeruleanGym_Script: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + call nz, CeruleanGymScript_5c6d0 + call EnableAutoTextBoxDrawing + ld hl, CeruleanGymTrainerHeader0 + ld de, CeruleanGym_ScriptPointers + ld a, [wCeruleanGymCurScript] + call ExecuteCurMapScriptInTable + ld [wCeruleanGymCurScript], a + ret + +CeruleanGymScript_5c6d0: + ld hl, Gym2CityName + ld de, Gym2LeaderName + jp LoadGymLeaderAndCityName + +Gym2CityName: + db "CERULEAN CITY@" + +Gym2LeaderName: + db "MISTY@" + +CeruleanGymScript_5c6ed: + xor a + ld [wJoyIgnore], a + ld [wCeruleanGymCurScript], a + ld [wCurMapScript], a + ret + +CeruleanGym_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw CeruleanGymScript3 + +CeruleanGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, CeruleanGymScript_5c6ed + ld a, $f0 + ld [wJoyIgnore], a + +CeruleanGymScript_5c70d: + ld a, $5 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_MISTY + lb bc, TM_11, 1 + call GiveItem + jr nc, .BagFull + ld a, $6 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM11 + jr .asm_5c736 +.BagFull + ld a, $7 + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_5c736 + ld hl, wObtainedBadges + set 1, [hl] + ld hl, wBeatGymFlags + set 1, [hl] + + ; deactivate gym trainers + SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1 + + jp CeruleanGymScript_5c6ed + +CeruleanGym_TextPointers: + dw CeruleanGymText1 + dw CeruleanGymText2 + dw CeruleanGymText3 + dw CeruleanGymText4 + dw CeruleanGymText5 + dw CeruleanGymText6 + dw CeruleanGymText7 + +CeruleanGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0 + dw CeruleanGymBattleText1 ; TextBeforeBattle + dw CeruleanGymAfterBattleText1 ; TextAfterBattle + dw CeruleanGymEndBattleText1 ; TextEndBattle + dw CeruleanGymEndBattleText1 ; TextEndBattle + +CeruleanGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1 + dw CeruleanGymBattleText2 ; TextBeforeBattle + dw CeruleanGymAfterBattleText2 ; TextAfterBattle + dw CeruleanGymEndBattleText2 ; TextEndBattle + dw CeruleanGymEndBattleText2 ; TextEndBattle + + db $ff + +CeruleanGymText1: + TX_ASM + CheckEvent EVENT_BEAT_MISTY + jr z, .asm_5c78d + CheckEventReuseA EVENT_GOT_TM11 + jr nz, .asm_5c785 + call z, CeruleanGymScript_5c70d + call DisableWaitingAfterTextDisplay + jr .asm_5c7bb +.asm_5c785 + ld hl, CeruleanGymText_5c7c3 + call PrintText + jr .asm_5c7bb +.asm_5c78d + ld hl, CeruleanGymText_5c7be + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, CeruleanGymText_5c7d8 + ld de, CeruleanGymText_5c7d8 + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $2 + ld [wGymLeaderNo], a + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wCeruleanGymCurScript], a +.asm_5c7bb + jp TextScriptEnd + +CeruleanGymText_5c7be: + TX_FAR _CeruleanGymText_5c7be + db "@" + +CeruleanGymText_5c7c3: + TX_FAR _CeruleanGymText_5c7c3 + db "@" + +CeruleanGymText5: + TX_FAR _CeruleanGymText_5c7c8 + db "@" + +CeruleanGymText6: + TX_FAR _ReceivedTM11Text + TX_SFX_ITEM_1 + db "@" + +CeruleanGymText7: + TX_FAR _CeruleanGymText_5c7d3 + db "@" + +CeruleanGymText_5c7d8: + TX_FAR _CeruleanGymText_5c7d8 + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK + db "@" + +CeruleanGymText2: + TX_ASM + ld hl, CeruleanGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +CeruleanGymBattleText1: + TX_FAR _CeruleanGymBattleText1 + db "@" + +CeruleanGymEndBattleText1: + TX_FAR _CeruleanGymEndBattleText1 + db "@" + +CeruleanGymAfterBattleText1: + TX_FAR _CeruleanGymAfterBattleText1 + db "@" + +CeruleanGymText3: + TX_ASM + ld hl, CeruleanGymTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +CeruleanGymBattleText2: + TX_FAR _CeruleanGymBattleText2 + db "@" + +CeruleanGymEndBattleText2: + TX_FAR _CeruleanGymEndBattleText2 + db "@" + +CeruleanGymAfterBattleText2: + TX_FAR _CeruleanGymAfterBattleText2 + db "@" + +CeruleanGymText4: + TX_ASM + CheckEvent EVENT_BEAT_MISTY + jr nz, .asm_5c821 + ld hl, CeruleanGymText_5c82a + call PrintText + jr .asm_5c827 +.asm_5c821 + ld hl, CeruleanGymText_5c82f + call PrintText +.asm_5c827 + jp TextScriptEnd + +CeruleanGymText_5c82a: + TX_FAR _CeruleanGymText_5c82a + db "@" + +CeruleanGymText_5c82f: + TX_FAR _CeruleanGymText_5c82f + db "@" diff --git a/scripts/CeruleanMart.asm b/scripts/CeruleanMart.asm new file mode 100755 index 00000000..f812aadd --- /dev/null +++ b/scripts/CeruleanMart.asm @@ -0,0 +1,15 @@ +CeruleanMart_Script: + jp EnableAutoTextBoxDrawing + +CeruleanMart_TextPointers: + dw CeruleanCashierText + dw CeruleanMartText2 + dw CeruleanMartText3 + +CeruleanMartText2: + TX_FAR _CeruleanMartText2 + db "@" + +CeruleanMartText3: + TX_FAR _CeruleanMartText3 + db "@" diff --git a/scripts/CeruleanPokecenter.asm b/scripts/CeruleanPokecenter.asm new file mode 100755 index 00000000..82bd04f3 --- /dev/null +++ b/scripts/CeruleanPokecenter.asm @@ -0,0 +1,23 @@ +CeruleanPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +CeruleanPokecenter_TextPointers: + dw CeruleanHealNurseText + dw CeruleanPokecenterText2 + dw CeruleanPokecenterText3 + dw CeruleanTradeNurseText + +CeruleanTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST + +CeruleanHealNurseText: + TX_POKECENTER_NURSE + +CeruleanPokecenterText2: + TX_FAR _CeruleanPokecenterText2 + db "@" + +CeruleanPokecenterText3: + TX_FAR _CeruleanPokecenterText3 + db "@" diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanTradeHouse.asm new file mode 100755 index 00000000..f80da19a --- /dev/null +++ b/scripts/CeruleanTradeHouse.asm @@ -0,0 +1,17 @@ +CeruleanTradeHouse_Script: + jp EnableAutoTextBoxDrawing + +CeruleanTradeHouse_TextPointers: + dw CeruleanHouse1Text1 + dw CeruleanHouse1Text2 + +CeruleanHouse1Text1: + TX_FAR _CeruleanHouse1Text1 + db "@" + +CeruleanHouse1Text2: + TX_ASM + ld a, $6 + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd diff --git a/scripts/CeruleanTrashedHouse.asm b/scripts/CeruleanTrashedHouse.asm new file mode 100755 index 00000000..f249ef01 --- /dev/null +++ b/scripts/CeruleanTrashedHouse.asm @@ -0,0 +1,39 @@ +CeruleanTrashedHouse_Script: + call EnableAutoTextBoxDrawing + ret + +CeruleanTrashedHouse_TextPointers: + dw CeruleanHouseTrashedText1 + dw CeruleanHouseTrashedText2 + dw CeruleanHouseTrashedText3 + +CeruleanHouseTrashedText1: + TX_ASM + ld b, $e4 + predef GetQuantityOfItemInBag + and b + jr z, .asm_f8734 + ld hl, CeruleanHouseTrashedText_1d6b0 + call PrintText + jr .asm_8dfe9 +.asm_f8734 + ld hl, CeruleanHouseTrashedText_1d6ab + call PrintText +.asm_8dfe9 + jp TextScriptEnd + +CeruleanHouseTrashedText_1d6ab: + TX_FAR _CeruleanTrashedText_1d6ab + db "@" + +CeruleanHouseTrashedText_1d6b0: + TX_FAR _CeruleanTrashedText_1d6b0 + db "@" + +CeruleanHouseTrashedText2: + TX_FAR _CeruleanHouseTrashedText2 + db "@" + +CeruleanHouseTrashedText3: + TX_FAR _CeruleanHouseTrashedText3 + db "@" diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm new file mode 100755 index 00000000..e3cdc6d2 --- /dev/null +++ b/scripts/ChampionsRoom.asm @@ -0,0 +1,298 @@ +ChampionsRoom_Script: + call EnableAutoTextBoxDrawing + ld hl, ChampionsRoom_ScriptPointers + ld a, [wChampionsRoomCurScript] + jp CallFunctionInTable + +ResetGaryScript: + xor a + ld [wJoyIgnore], a + ld [wChampionsRoomCurScript], a + ret + +ChampionsRoom_ScriptPointers: + dw GaryScript0 + dw GaryScript1 + dw GaryScript2 + dw GaryScript3 + dw GaryScript4 + dw GaryScript5 + dw GaryScript6 + dw GaryScript7 + dw GaryScript8 + dw GaryScript9 + dw GaryScript10 + +GaryScript0: + ret + +GaryScript1: + ld a, $ff + ld [wJoyIgnore], a + ld hl, wSimulatedJoypadStatesEnd + ld de, GaryEntrance_RLEMovement + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $2 + ld [wChampionsRoomCurScript], a + ret + +GaryEntrance_RLEMovement: + db D_UP,1 + db D_RIGHT,1 + db D_UP,3 + db $ff + +GaryScript2: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld hl, wOptions + res 7, [hl] ; Turn on battle animations to make the battle feel more epic. + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, GaryDefeatedText + ld de, GaryVictoryText + call SaveEndBattleTextPointers + ld a, OPP_SONY3 + ld [wCurOpponent], a + + ; select which team to use during the encounter + ld a, [wRivalStarter] + cp STARTER2 + jr nz, .NotStarter2 + ld a, $1 + jr .saveTrainerId +.NotStarter2 + cp STARTER3 + jr nz, .NotStarter3 + ld a, $2 + jr .saveTrainerId +.NotStarter3 + ld a, $3 +.saveTrainerId + ld [wTrainerNo], a + + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wChampionsRoomCurScript], a + ret + +GaryScript3: + ld a, [wIsInBattle] + cp $ff + jp z, ResetGaryScript + call UpdateSprites + SetEvent EVENT_BEAT_CHAMPION_RIVAL + ld a, $f0 + ld [wJoyIgnore], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + call GaryScript_760c8 + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld a, $4 + ld [wChampionsRoomCurScript], a + ret + +GaryScript4: + callba Music_Cities1AlternateTempo + ld a, $2 + ld [hSpriteIndexOrTextID], a + call GaryScript_760c8 + ld a, $2 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld de, OakEntranceAfterVictoryMovement + ld a, $2 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, HS_CHAMPIONS_ROOM_OAK + ld [wMissableObjectIndex], a + predef ShowObject + ld a, $5 + ld [wChampionsRoomCurScript], a + ret + +OakEntranceAfterVictoryMovement: + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db $FF + +GaryScript5: + ld a, [wd730] + bit 0, a + ret nz + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_LEFT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $2 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $3 + ld [hSpriteIndexOrTextID], a + call GaryScript_760c8 + ld a, $6 + ld [wChampionsRoomCurScript], a + ret + +GaryScript6: + ld a, $2 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_RIGHT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $4 + ld [hSpriteIndexOrTextID], a + call GaryScript_760c8 + ld a, $7 + ld [wChampionsRoomCurScript], a + ret + +GaryScript7: + ld a, $2 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $5 + ld [hSpriteIndexOrTextID], a + call GaryScript_760c8 + ld de, OakExitGaryRoomMovement + ld a, $2 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $8 + ld [wChampionsRoomCurScript], a + ret + +OakExitGaryRoomMovement: + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db $FF + +GaryScript8: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_CHAMPIONS_ROOM_OAK + ld [wMissableObjectIndex], a + predef HideObject + ld a, $9 + ld [wChampionsRoomCurScript], a + ret + +GaryScript9: + ld a, $ff + ld [wJoyIgnore], a + ld hl, wSimulatedJoypadStatesEnd + ld de, WalkToHallOfFame_RLEMovment + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $a + ld [wChampionsRoomCurScript], a + ret + +WalkToHallOfFame_RLEMovment: + db D_UP,4 + db D_LEFT,1 + db $ff + +GaryScript10: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wChampionsRoomCurScript], a + ret + +GaryScript_760c8: + ld a, $f0 + ld [wJoyIgnore], a + call DisplayTextID + ld a, $ff + ld [wJoyIgnore], a + ret + +ChampionsRoom_TextPointers: + dw GaryText1 + dw GaryText2 + dw GaryText3 + dw GaryText4 + dw GaryText5 + +GaryText1: + TX_ASM + CheckEvent EVENT_BEAT_CHAMPION_RIVAL + ld hl, GaryChampionIntroText + jr z, .printText + ld hl, GaryText_76103 +.printText + call PrintText + jp TextScriptEnd + +GaryChampionIntroText: + TX_FAR _GaryChampionIntroText + db "@" + +GaryDefeatedText: + TX_FAR _GaryDefeatedText + db "@" + +GaryVictoryText: + TX_FAR _GaryVictoryText + db "@" + +GaryText_76103: + TX_FAR _GaryText_76103 + db "@" + +GaryText2: + TX_FAR _GaryText2 + db "@" + +GaryText3: + TX_ASM + ld a, [wPlayerStarter] + ld [wd11e], a + call GetMonName + ld hl, GaryText_76120 + call PrintText + jp TextScriptEnd + +GaryText_76120: + TX_FAR _GaryText_76120 + db "@" + +GaryText4: + TX_FAR _GaryText_76125 + db "@" + +GaryText5: + TX_FAR _GaryText_7612a + db "@" diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm new file mode 100755 index 00000000..295bd63d --- /dev/null +++ b/scripts/CinnabarGym.asm @@ -0,0 +1,472 @@ +CinnabarGym_Script: + call CinnabarGymScript_75759 + call EnableAutoTextBoxDrawing + ld hl, CinnabarGym_ScriptPointers + ld a, [wCinnabarGymCurScript] + jp CallFunctionInTable + +CinnabarGymScript_75759: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + push hl + call nz, CinnabarGymScript_75772 + pop hl + bit 5, [hl] + res 5, [hl] + call nz, UpdateCinnabarGymGateTileBlocks + ResetEvent EVENT_2A7 + ret +CinnabarGymScript_75772: + ld hl, Gym7CityName + ld de, Gym7LeaderName + jp LoadGymLeaderAndCityName + +Gym7CityName: + db "CINNABAR ISLAND@" +Gym7LeaderName: + db "BLAINE@" + +CinnabarGymScript_75792: + xor a + ld [wJoyIgnore], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a + ld [wOpponentAfterWrongAnswer], a + ret + +CinnabarGymScript_757a0: + ld a, [hSpriteIndexOrTextID] + ld [wTrainerHeaderFlagBit], a + ret + +CinnabarGym_ScriptPointers: + dw CinnabarGymScript0 + dw CinnabarGymScript1 + dw CinnabarGymScript2 + dw CinnabarGymScript3 + +CinnabarGymScript0: + ld a, [wOpponentAfterWrongAnswer] + and a + ret z + ld [H_SPRITEINDEX], a + cp $4 + jr nz, .asm_757c3 + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld de, MovementData_757d7 + jr .asm_757cb +.asm_757c3 + ld de, MovementData_757da + ld a, PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a +.asm_757cb + call MoveSprite + ld a, $1 + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a + ret + +MovementData_757d7: + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_UP + db $FF + +MovementData_757da: + db NPC_MOVEMENT_LEFT + db $FF + +CinnabarGymScript1: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, [wOpponentAfterWrongAnswer] + ld [wTrainerHeaderFlagBit], a + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +CinnabarGymFlagAction: + predef_jump FlagActionPredef + +CinnabarGymScript2: + ld a, [wIsInBattle] + cp $ff + jp z, CinnabarGymScript_75792 + ld a, [wTrainerHeaderFlagBit] + ld [$ffdb], a + AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 + ld c, a + ld b, FLAG_TEST + EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0 + call CinnabarGymFlagAction + ld a, c + and a + jr nz, .asm_7581b + call WaitForSoundToFinish + ld a, SFX_GO_INSIDE + call PlaySound + call WaitForSoundToFinish +.asm_7581b + ld a, [wTrainerHeaderFlagBit] + ld [$ffdb], a + AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 + ld c, a + ld b, FLAG_SET + EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0 + call CinnabarGymFlagAction + ld a, [wTrainerHeaderFlagBit] + sub $2 + AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 + ld c, a + ld b, FLAG_SET + EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED + call CinnabarGymFlagAction + call UpdateCinnabarGymGateTileBlocks + xor a + ld [wJoyIgnore], a + ld [wOpponentAfterWrongAnswer], a + ld a, $0 + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a + ret + +CinnabarGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, CinnabarGymScript_75792 + ld a, $f0 + ld [wJoyIgnore], a +CinnabarGymScript3_75857: + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_BLAINE + lb bc, TM_38, 1 + call GiveItem + jr nc, .BagFull + ld a, $b + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM38 + jr .asm_75880 +.BagFull + ld a, $c + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_75880 + ld hl, wObtainedBadges + set 6, [hl] + ld hl, wBeatGymFlags + set 6, [hl] + + ; deactivate gym trainers + SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 + + ld hl, wCurrentMapScriptFlags + set 5, [hl] + + jp CinnabarGymScript_75792 + +CinnabarGym_TextPointers: + dw CinnabarGymText1 + dw CinnabarGymText2 + dw CinnabarGymText3 + dw CinnabarGymText4 + dw CinnabarGymText5 + dw CinnabarGymText6 + dw CinnabarGymText7 + dw CinnabarGymText8 + dw CinnabarGymText9 + dw BlaineBadgeText + dw ReceivedTM38Text + dw TM38NoRoomText + +CinnabarGymScript_758b7: + ld a, [hSpriteIndexOrTextID] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld a, [wSpriteIndex] + cp $1 + jr z, .asm_758d4 + ld a, $2 + jr .asm_758d6 +.asm_758d4 + ld a, $3 +.asm_758d6 + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a + jp TextScriptEnd + +CinnabarGymText1: + TX_ASM + CheckEvent EVENT_BEAT_BLAINE + jr z, .asm_d9332 + CheckEventReuseA EVENT_GOT_TM38 + jr nz, .asm_3012f + call z, CinnabarGymScript3_75857 + call DisableWaitingAfterTextDisplay + jp TextScriptEnd +.asm_3012f + ld hl, BlaineFireBlastText + call PrintText + jp TextScriptEnd +.asm_d9332 + ld hl, BlaineBattleText + call PrintText + ld hl, BlaineEndBattleText + ld de, BlaineEndBattleText + call SaveEndBattleTextPointers + ld a, $7 + ld [wGymLeaderNo], a + jp CinnabarGymScript_758b7 + +BlaineBattleText: + TX_FAR _BlaineBattleText + db "@" + +BlaineEndBattleText: + TX_FAR _BlaineEndBattleText + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_WAIT + db "@" + +BlaineFireBlastText: + TX_FAR _BlaineFireBlastText + db "@" + +BlaineBadgeText: + TX_FAR _BlaineBadgeText + db "@" + +ReceivedTM38Text: + TX_FAR _ReceivedTM38Text + TX_SFX_ITEM_1 + TX_FAR _TM38ExplanationText + db "@" + +TM38NoRoomText: + TX_FAR _TM38NoRoomText + db "@" + +CinnabarGymText2: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 + jr nz, .asm_46bb4 + ld hl, CinnabarGymText_7595f + call PrintText + ld hl, CinnabarGymText_75964 + ld de, CinnabarGymText_75964 + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_46bb4 + ld hl, CinnabarGymText_75969 + call PrintText + jp TextScriptEnd + +CinnabarGymText_7595f: + TX_FAR _CinnabarGymText_7595f + db "@" + +CinnabarGymText_75964: + TX_FAR _CinnabarGymText_75964 + db "@" + +CinnabarGymText_75969: + TX_FAR _CinnabarGymText_75969 + db "@" + +CinnabarGymText3: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 + jr nz, .asm_4b406 + ld hl, CinnabarGymText_75994 + call PrintText + ld hl, CinnabarGymText_75999 + ld de, CinnabarGymText_75999 + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_4b406 + ld hl, CinnabarGymText_7599e + call PrintText + jp TextScriptEnd + +CinnabarGymText_75994: + TX_FAR _CinnabarGymText_75994 + db "@" + +CinnabarGymText_75999: + TX_FAR _CinnabarGymText_75999 + db "@" + +CinnabarGymText_7599e: + TX_FAR _CinnabarGymText_7599e + db "@" + +CinnabarGymText4: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 + jr nz, .asm_c0673 + ld hl, CinnabarGymText_759c9 + call PrintText + ld hl, CinnabarGymText_759ce + ld de, CinnabarGymText_759ce + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_c0673 + ld hl, CinnabarGymText_759d3 + call PrintText + jp TextScriptEnd + +CinnabarGymText_759c9: + TX_FAR _CinnabarGymText_759c9 + db "@" + +CinnabarGymText_759ce: + TX_FAR _CinnabarGymText_759ce + db "@" + +CinnabarGymText_759d3: + TX_FAR _CinnabarGymText_759d3 + db "@" + +CinnabarGymText5: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 + jr nz, .asm_5cfd7 + ld hl, CinnabarGymText_759fe + call PrintText + ld hl, CinnabarGymText_75a03 + ld de, CinnabarGymText_75a03 + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_5cfd7 + ld hl, CinnabarGymText_75a08 + call PrintText + jp TextScriptEnd + +CinnabarGymText_759fe: + TX_FAR _CinnabarGymText_759fe + db "@" + +CinnabarGymText_75a03: + TX_FAR _CinnabarGymText_75a03 + db "@" + +CinnabarGymText_75a08: + TX_FAR _CinnabarGymText_75a08 + db "@" + +CinnabarGymText6: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 + jr nz, .asm_776b4 + ld hl, CinnabarGymText_75a33 + call PrintText + ld hl, CinnabarGymText_75a38 + ld de, CinnabarGymText_75a38 + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_776b4 + ld hl, CinnabarGymText_75a3d + call PrintText + jp TextScriptEnd + +CinnabarGymText_75a33: + TX_FAR _CinnabarGymText_75a33 + db "@" + +CinnabarGymText_75a38: + TX_FAR _CinnabarGymText_75a38 + db "@" + +CinnabarGymText_75a3d: + TX_FAR _CinnabarGymText_75a3d + db "@" + +CinnabarGymText7: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 + jr nz, .asm_2f755 + ld hl, CinnabarGymText_75a68 + call PrintText + ld hl, CinnabarGymText_75a6d + ld de, CinnabarGymText_75a6d + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_2f755 + ld hl, CinnabarGymText_75a72 + call PrintText + jp TextScriptEnd + +CinnabarGymText_75a68: + TX_FAR _CinnabarGymText_75a68 + db "@" + +CinnabarGymText_75a6d: + TX_FAR _CinnabarGymText_75a6d + db "@" + +CinnabarGymText_75a72: + TX_FAR _CinnabarGymText_75a72 + db "@" + +CinnabarGymText8: + TX_ASM + call CinnabarGymScript_757a0 + CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 + jr nz, .asm_d87be + ld hl, CinnabarGymText_75a9d + call PrintText + ld hl, CinnabarGymText_75aa2 + ld de, CinnabarGymText_75aa2 + call SaveEndBattleTextPointers + jp CinnabarGymScript_758b7 +.asm_d87be + ld hl, CinnabarGymText_75aa7 + call PrintText + jp TextScriptEnd + +CinnabarGymText_75a9d: + TX_FAR _CinnabarGymText_75a9d + db "@" + +CinnabarGymText_75aa2: + TX_FAR _CinnabarGymText_75aa2 + db "@" + +CinnabarGymText_75aa7: + TX_FAR _CinnabarGymText_75aa7 + db "@" + +CinnabarGymText9: + TX_ASM + CheckEvent EVENT_BEAT_BLAINE + jr nz, .asm_627d9 + ld hl, CinnabarGymText_75ac2 + jr .asm_0b11d +.asm_627d9 + ld hl, CinnabarGymText_75ac7 +.asm_0b11d + call PrintText + jp TextScriptEnd + +CinnabarGymText_75ac2: + TX_FAR _CinnabarGymText_75ac2 + db "@" + +CinnabarGymText_75ac7: + TX_FAR _CinnabarGymText_75ac7 + db "@" diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm new file mode 100755 index 00000000..b6346a9c --- /dev/null +++ b/scripts/CinnabarIsland.asm @@ -0,0 +1,85 @@ +CinnabarIsland_Script: + call EnableAutoTextBoxDrawing + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ResetEvent EVENT_MANSION_SWITCH_ON + ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL + ld hl, CinnabarIsland_ScriptPointers + ld a, [wCinnabarIslandCurScript] + jp CallFunctionInTable + +CinnabarIsland_ScriptPointers: + dw CinnabarIslandScript0 + dw CinnabarIslandScript1 + +CinnabarIslandScript0: + ld b, SECRET_KEY + call IsItemInBag + ret nz + ld a, [wYCoord] + cp $4 + ret nz + ld a, [wXCoord] + cp $12 + ret nz + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + ld a, $8 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [hJoyHeld], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + xor a + ld [wSpriteStateData1 + 9], a + ld [wJoyIgnore], a + ld a, $1 + ld [wCinnabarIslandCurScript], a + ret + +CinnabarIslandScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + ld a, $0 + ld [wCinnabarIslandCurScript], a + ret + +CinnabarIsland_TextPointers: + dw CinnabarIslandText1 + dw CinnabarIslandText2 + dw CinnabarIslandText3 + dw MartSignText + dw PokeCenterSignText + dw CinnabarIslandText6 + dw CinnabarIslandText7 + dw CinnabarIslandText8 + +CinnabarIslandText8: + TX_FAR _CinnabarIslandText8 + db "@" + +CinnabarIslandText1: + TX_FAR _CinnabarIslandText1 + db "@" + +CinnabarIslandText2: + TX_FAR _CinnabarIslandText2 + db "@" + +CinnabarIslandText3: + TX_FAR _CinnabarIslandText3 + db "@" + +CinnabarIslandText6: + TX_FAR _CinnabarIslandText6 + db "@" + +CinnabarIslandText7: + TX_FAR _CinnabarIslandText7 + db "@" diff --git a/scripts/CinnabarLab.asm b/scripts/CinnabarLab.asm new file mode 100755 index 00000000..aab3324b --- /dev/null +++ b/scripts/CinnabarLab.asm @@ -0,0 +1,30 @@ +CinnabarLab_Script: + call EnableAutoTextBoxDrawing + ret + +CinnabarLab_TextPointers: + dw Lab1Text1 + dw Lab1Text2 + dw Lab1Text3 + dw Lab1Text4 + dw Lab1Text5 + +Lab1Text1: + TX_FAR _Lab1Text1 + db "@" + +Lab1Text2: + TX_FAR _Lab1Text2 + db "@" + +Lab1Text3: + TX_FAR _Lab1Text3 + db "@" + +Lab1Text4: + TX_FAR _Lab1Text4 + db "@" + +Lab1Text5: + TX_FAR _Lab1Text5 + db "@" diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..f5f03a19 --- /dev/null +++ b/scripts/CinnabarLabFossilRoom.asm @@ -0,0 +1,109 @@ +CinnabarLabFossilRoom_Script: + jp EnableAutoTextBoxDrawing + +CinnabarLabFossilRoom_TextPointers: + dw Lab4Text1 + dw Lab4Text2 + +Lab4Script_GetFossilsInBag: +; construct a list of all fossils in the player's bag + xor a + ld [wFilteredBagItemsCount], a + ld de, wFilteredBagItems + ld hl, FossilsList +.loop + ld a, [hli] + and a + jr z, .done + push hl + push de + ld [wd11e], a + ld b, a + predef GetQuantityOfItemInBag + pop de + pop hl + ld a, b + and a + jr z, .loop + + ; A fossil's in the bag + ld a, [wd11e] + ld [de], a + inc de + push hl + ld hl, wFilteredBagItemsCount + inc [hl] + pop hl + jr .loop +.done + ld a, $ff + ld [de], a + ret + +FossilsList: + db DOME_FOSSIL + db HELIX_FOSSIL + db OLD_AMBER + db $00 + +Lab4Text1: + TX_ASM + CheckEvent EVENT_GAVE_FOSSIL_TO_LAB + jr nz, .asm_75d96 + ld hl, Lab4Text_75dc6 + call PrintText + call Lab4Script_GetFossilsInBag + ld a, [wFilteredBagItemsCount] + and a + jr z, .asm_75d8d + callba GiveFossilToCinnabarLab + jr .asm_75d93 +.asm_75d8d + ld hl, Lab4Text_75dcb + call PrintText +.asm_75d93 + jp TextScriptEnd +.asm_75d96 + CheckEventAfterBranchReuseA EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_GAVE_FOSSIL_TO_LAB + jr z, .asm_75da2 + ld hl, Lab4Text_75dd0 + call PrintText + jr .asm_75d93 +.asm_75da2 + call LoadFossilItemAndMonNameBank1D + ld hl, Lab4Text_75dd5 + call PrintText + SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON + ld a, [wFossilMon] + ld b, a + ld c, 30 + call GivePokemon + jr nc, .asm_75d93 + ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON + jr .asm_75d93 + +Lab4Text_75dc6: + TX_FAR _Lab4Text_75dc6 + db "@" + +Lab4Text_75dcb: + TX_FAR _Lab4Text_75dcb + db "@" + +Lab4Text_75dd0: + TX_FAR _Lab4Text_75dd0 + db "@" + +Lab4Text_75dd5: + TX_FAR _Lab4Text_75dd5 + db "@" + +Lab4Text2: + TX_ASM + ld a, $3 + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd + +LoadFossilItemAndMonNameBank1D: + jpba LoadFossilItemAndMonName diff --git a/scripts/CinnabarLabMetronomeRoom.asm b/scripts/CinnabarLabMetronomeRoom.asm new file mode 100755 index 00000000..6eddceae --- /dev/null +++ b/scripts/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,62 @@ +CinnabarLabMetronomeRoom_Script: + jp EnableAutoTextBoxDrawing + +CinnabarLabMetronomeRoom_TextPointers: + dw Lab3Text1 + dw Lab3Text2 + dw Lab3Text3 + dw Lab3Text4 + dw Lab3Text5 + +Lab3Text1: + TX_ASM + CheckEvent EVENT_GOT_TM35 + jr nz, .asm_e551a + ld hl, TM35PreReceiveText + call PrintText + lb bc, TM_35, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedTM35Text + call PrintText + SetEvent EVENT_GOT_TM35 + jr .asm_eb896 +.BagFull + ld hl, TM35NoRoomText + call PrintText + jr .asm_eb896 +.asm_e551a + ld hl, TM35ExplanationText + call PrintText +.asm_eb896 + jp TextScriptEnd + +TM35PreReceiveText: + TX_FAR _TM35PreReceiveText + db "@" + +ReceivedTM35Text: + TX_FAR _ReceivedTM35Text + TX_SFX_ITEM_1 + db "@" + +TM35ExplanationText: + TX_FAR _TM35ExplanationText + db "@" + +TM35NoRoomText: + TX_FAR _TM35NoRoomText + db "@" + +Lab3Text2: + TX_FAR _Lab3Text2 + db "@" + +Lab3Text4: +Lab3Text3: + TX_FAR _Lab3Text3 + db "@" + +Lab3Text5: + TX_FAR _Lab3Text5 + db "@" diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm new file mode 100755 index 00000000..6093ae14 --- /dev/null +++ b/scripts/CinnabarLabTradeRoom.asm @@ -0,0 +1,25 @@ +CinnabarLabTradeRoom_Script: + jp EnableAutoTextBoxDrawing + +CinnabarLabTradeRoom_TextPointers: + dw Lab2Text1 + dw Lab2Text2 + dw Lab2Text3 + +Lab2Text1: + TX_FAR _Lab2Text1 + db "@" + +Lab2Text2: + TX_ASM + ld a, $7 + ld [wWhichTrade], a + jr Lab2DoTrade + +Lab2Text3: + TX_ASM + ld a, $8 + ld [wWhichTrade], a +Lab2DoTrade: + predef DoInGameTradeDialogue + jp TextScriptEnd diff --git a/scripts/CinnabarMart.asm b/scripts/CinnabarMart.asm new file mode 100755 index 00000000..898948c7 --- /dev/null +++ b/scripts/CinnabarMart.asm @@ -0,0 +1,15 @@ +CinnabarMart_Script: + jp EnableAutoTextBoxDrawing + +CinnabarMart_TextPointers: + dw CinnabarCashierText + dw CinnabarMartText2 + dw CinnabarMartText3 + +CinnabarMartText2: + TX_FAR _CinnabarMartText2 + db "@" + +CinnabarMartText3: + TX_FAR _CinnabarMartText3 + db "@" diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm new file mode 100755 index 00000000..a6184bb0 --- /dev/null +++ b/scripts/CinnabarPokecenter.asm @@ -0,0 +1,23 @@ +CinnabarPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +CinnabarPokecenter_TextPointers: + dw CinnabarHealNurseText + dw CinnabarPokecenterText2 + dw CinnabarPokecenterText3 + dw CinnabarTradeNurseText + +CinnabarHealNurseText: + TX_POKECENTER_NURSE + +CinnabarPokecenterText2: + TX_FAR _CinnabarPokecenterText2 + db "@" + +CinnabarPokecenterText3: + TX_FAR _CinnabarPokecenterText3 + db "@" + +CinnabarTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/Colosseum.asm b/scripts/Colosseum.asm new file mode 100755 index 00000000..8cc6b056 --- /dev/null +++ b/scripts/Colosseum.asm @@ -0,0 +1,9 @@ +Colosseum_Script: + jp TradeCenter_Script + +Colosseum_TextPointers: + dw ColosseumText1 + +ColosseumText1: + TX_FAR _ColosseumText1 + db "@" diff --git a/scripts/CopycatsHouse1F.asm b/scripts/CopycatsHouse1F.asm new file mode 100755 index 00000000..a86625fc --- /dev/null +++ b/scripts/CopycatsHouse1F.asm @@ -0,0 +1,22 @@ +CopycatsHouse1F_Script: + jp EnableAutoTextBoxDrawing + +CopycatsHouse1F_TextPointers: + dw CopycatsHouse1FText1 + dw CopycatsHouse1FText2 + dw CopycatsHouse1FText3 + +CopycatsHouse1FText1: + TX_FAR _CopycatsHouse1FText1 + db "@" + +CopycatsHouse1FText2: + TX_FAR _CopycatsHouse1FText2 + db "@" + +CopycatsHouse1FText3: + TX_FAR _CopycatsHouse1FText3 + TX_ASM + ld a, CHANSEY + call PlayCry + jp TextScriptEnd diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm new file mode 100755 index 00000000..b43234c3 --- /dev/null +++ b/scripts/CopycatsHouse2F.asm @@ -0,0 +1,102 @@ +CopycatsHouse2F_Script: + jp EnableAutoTextBoxDrawing + +CopycatsHouse2F_TextPointers: + dw CopycatsHouse2FText1 + dw CopycatsHouse2FText2 + dw CopycatsHouse2FText3 + dw CopycatsHouse2FText4 + dw CopycatsHouse2FText5 + dw CopycatsHouse2FText6 + dw CopycatsHouse2FText7 + +CopycatsHouse2FText1: + TX_ASM + CheckEvent EVENT_GOT_TM31 + jr nz, .asm_7ccf3 + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, CopycatsHouse2FText_5ccd4 + call PrintText + ld b, POKE_DOLL + call IsItemInBag + jr z, .asm_62ecd + ld hl, TM31PreReceiveText + call PrintText + lb bc, TM_31, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedTM31Text + call PrintText + ld a, POKE_DOLL + ld [$ffdb], a + callba RemoveItemByID + SetEvent EVENT_GOT_TM31 + jr .asm_62ecd +.BagFull + ld hl, TM31NoRoomText + call PrintText + jr .asm_62ecd +.asm_7ccf3 + ld hl, TM31ExplanationText2 + call PrintText +.asm_62ecd + jp TextScriptEnd + +CopycatsHouse2FText_5ccd4: + TX_FAR _CopycatsHouse2FText_5ccd4 + db "@" + +TM31PreReceiveText: + TX_FAR _TM31PreReceiveText + db "@" + +ReceivedTM31Text: + TX_FAR _ReceivedTM31Text + TX_SFX_ITEM_1 +TM31ExplanationText1: + TX_FAR _TM31ExplanationText1 + TX_WAIT + db "@" + +TM31ExplanationText2: + TX_FAR _TM31ExplanationText2 + db "@" + +TM31NoRoomText: + TX_FAR _TM31NoRoomText + TX_WAIT + db "@" + +CopycatsHouse2FText2: + TX_FAR _CopycatsHouse2FText2 + db "@" + +CopycatsHouse2FText5: +CopycatsHouse2FText4: +CopycatsHouse2FText3: + TX_FAR _CopycatsHouse2FText3 + db "@" + +CopycatsHouse2FText6: + TX_FAR _CopycatsHouse2FText6 + db "@" + +CopycatsHouse2FText7: + TX_ASM + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + ld hl, CopycatsHouse2FText_5cd1c + jr nz, .notUp + ld hl, CopycatsHouse2FText_5cd17 +.notUp + call PrintText + jp TextScriptEnd + +CopycatsHouse2FText_5cd17: + TX_FAR _CopycatsHouse2FText_5cd17 + db "@" + +CopycatsHouse2FText_5cd1c: + TX_FAR _CopycatsHouse2FText_5cd1c + db "@" diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm new file mode 100755 index 00000000..81cf5534 --- /dev/null +++ b/scripts/Daycare.asm @@ -0,0 +1,269 @@ +Daycare_Script: + jp EnableAutoTextBoxDrawing + +Daycare_TextPointers: + dw DayCareMText1 + +DayCareMText1: + TX_ASM + call SaveScreenTilesToBuffer2 + ld a, [wDayCareInUse] + and a + jp nz, .daycareInUse + ld hl, DayCareIntroText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ld hl, DayCareComeAgainText + jp nz, .done + ld a, [wPartyCount] + dec a + ld hl, DayCareOnlyHaveOneMonText + jp z, .done + ld hl, DayCareWhichMonText + call PrintText + xor a + ld [wUpdateSpritesEnabled], a + ld [wPartyMenuTypeOrMessageID], a + ld [wMenuItemToSwap], a + call DisplayPartyMenu + push af + call GBPalWhiteOutWithDelay3 + call RestoreScreenTilesAndReloadTilePatterns + call LoadGBPal + pop af + ld hl, DayCareAllRightThenText + jp c, .done + callab KnowsHMMove + ld hl, DayCareCantAcceptMonWithHMText + jp c, .done + xor a + ld [wPartyAndBillsPCSavedMenuItem], a + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks + call GetPartyMonName + ld hl, DayCareWillLookAfterMonText + call PrintText + ld a, 1 + ld [wDayCareInUse], a + ld a, PARTY_TO_DAYCARE + ld [wMoveMonType], a + call MoveMon + xor a + ld [wRemoveMonFromBox], a + call RemovePokemon + ld a, [wcf91] + call PlayCry + ld hl, DayCareComeSeeMeInAWhileText + jp .done + +.daycareInUse + xor a + ld hl, wDayCareMonName + call GetPartyMonName + ld a, DAYCARE_DATA + ld [wMonDataLocation], a + call LoadMonData + callab CalcLevelFromExperience + ld a, d + cp MAX_LEVEL + jr c, .skipCalcExp + + ld d, MAX_LEVEL + callab CalcExperience + ld hl, wDayCareMonExp + ld a, [hExperience] + ld [hli], a + ld a, [hExperience + 1] + ld [hli], a + ld a, [hExperience + 2] + ld [hl], a + ld d, MAX_LEVEL + +.skipCalcExp + xor a + ld [wDayCareNumLevelsGrown], a + ld hl, wDayCareMonBoxLevel + ld a, [hl] + ld [wDayCareStartLevel], a + cp d + ld [hl], d + ld hl, DayCareMonNeedsMoreTimeText + jr z, .next + ld a, [wDayCareStartLevel] + ld b, a + ld a, d + sub b + ld [wDayCareNumLevelsGrown], a + ld hl, DayCareMonHasGrownText + +.next + call PrintText + ld a, [wPartyCount] + cp PARTY_LENGTH + ld hl, DayCareNoRoomForMonText + jp z, .leaveMonInDayCare + ld de, wDayCareTotalCost + xor a + ld [de], a + inc de + ld [de], a + ld hl, wDayCarePerLevelCost + ld a, $1 + ld [hli], a + ld [hl], $0 + ld a, [wDayCareNumLevelsGrown] + inc a + ld b, a + ld c, 2 +.calcPriceLoop + push hl + push de + push bc + predef AddBCDPredef + pop bc + pop de + pop hl + dec b + jr nz, .calcPriceLoop + ld hl, DayCareOweMoneyText + call PrintText + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + call YesNoChoice + ld hl, DayCareAllRightThenText + ld a, [wCurrentMenuItem] + and a + jp nz, .leaveMonInDayCare + ld hl, wDayCareTotalCost + ld [hMoney], a + ld a, [hli] + ld [hMoney + 1], a + ld a, [hl] + ld [hMoney + 2], a + call HasEnoughMoney + jr nc, .enoughMoney + ld hl, DayCareNotEnoughMoneyText + jp .leaveMonInDayCare + +.enoughMoney + xor a + ld [wDayCareInUse], a + ld hl, wDayCareNumLevelsGrown + ld [hli], a + inc hl + ld de, wPlayerMoney + 2 + ld c, $3 + predef SubBCDPredef + ld a, SFX_PURCHASE + call PlaySoundWaitForCurrent + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + ld hl, DayCareHeresYourMonText + call PrintText + ld a, DAYCARE_TO_PARTY + ld [wMoveMonType], a + call MoveMon + ld a, [wDayCareMonSpecies] + ld [wcf91], a + ld a, [wPartyCount] + dec a + push af + ld bc, wPartyMon2 - wPartyMon1 + push bc + ld hl, wPartyMon1Moves + call AddNTimes + ld d, h + ld e, l + ld a, 1 + ld [wLearningMovesFromDayCare], a + predef WriteMonMoves + pop bc + pop af + +; set mon's HP to max + ld hl, wPartyMon1HP + call AddNTimes + ld d, h + ld e, l + ld bc, wPartyMon1MaxHP - wPartyMon1HP + add hl, bc + ld a, [hli] + ld [de], a + inc de + ld a, [hl] + ld [de], a + + ld a, [wcf91] + call PlayCry + ld hl, DayCareGotMonBackText + jr .done + +.leaveMonInDayCare + ld a, [wDayCareStartLevel] + ld [wDayCareMonBoxLevel], a + +.done + call PrintText + jp TextScriptEnd + +DayCareIntroText: + TX_FAR _DayCareIntroText + db "@" + +DayCareWhichMonText: + TX_FAR _DayCareWhichMonText + db "@" + +DayCareWillLookAfterMonText: + TX_FAR _DayCareWillLookAfterMonText + db "@" + +DayCareComeSeeMeInAWhileText: + TX_FAR _DayCareComeSeeMeInAWhileText + db "@" + +DayCareMonHasGrownText: + TX_FAR _DayCareMonHasGrownText + db "@" + +DayCareOweMoneyText: + TX_FAR _DayCareOweMoneyText + db "@" + +DayCareGotMonBackText: + TX_FAR _DayCareGotMonBackText + db "@" + +DayCareMonNeedsMoreTimeText: + TX_FAR _DayCareMonNeedsMoreTimeText + db "@" + +DayCareAllRightThenText: + TX_FAR _DayCareAllRightThenText +DayCareComeAgainText: + TX_FAR _DayCareComeAgainText + db "@" + +DayCareNoRoomForMonText: + TX_FAR _DayCareNoRoomForMonText + db "@" + +DayCareOnlyHaveOneMonText: + TX_FAR _DayCareOnlyHaveOneMonText + db "@" + +DayCareCantAcceptMonWithHMText: + TX_FAR _DayCareCantAcceptMonWithHMText + db "@" + +DayCareHeresYourMonText: + TX_FAR _DayCareHeresYourMonText + db "@" + +DayCareNotEnoughMoneyText: + TX_FAR _DayCareNotEnoughMoneyText + db "@" diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm new file mode 100755 index 00000000..1d7b23f9 --- /dev/null +++ b/scripts/DiglettsCave.asm @@ -0,0 +1,5 @@ +DiglettsCave_Script: + jp EnableAutoTextBoxDrawing + +DiglettsCave_TextPointers: + db "@" diff --git a/scripts/DiglettsCaveRoute11.asm b/scripts/DiglettsCaveRoute11.asm new file mode 100755 index 00000000..54c3112e --- /dev/null +++ b/scripts/DiglettsCaveRoute11.asm @@ -0,0 +1,12 @@ +DiglettsCaveRoute11_Script: + call EnableAutoTextBoxDrawing + ld a, ROUTE_11 + ld [wLastMap], a + ret + +DiglettsCaveRoute11_TextPointers: + dw DiglettsCaveEntranceRoute11Text1 + +DiglettsCaveEntranceRoute11Text1: + TX_FAR _DiglettsCaveEntRoute11Text1 + db "@" diff --git a/scripts/DiglettsCaveRoute2.asm b/scripts/DiglettsCaveRoute2.asm new file mode 100755 index 00000000..5fe7777c --- /dev/null +++ b/scripts/DiglettsCaveRoute2.asm @@ -0,0 +1,11 @@ +DiglettsCaveRoute2_Script: + ld a, ROUTE_2 + ld [wLastMap], a + jp EnableAutoTextBoxDrawing + +DiglettsCaveRoute2_TextPointers: + dw DiglettsCaveRoute2Text1 + +DiglettsCaveRoute2Text1: + TX_FAR _DiglettsCaveRoute2Text1 + db "@" diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm new file mode 100755 index 00000000..fc691dba --- /dev/null +++ b/scripts/FightingDojo.asm @@ -0,0 +1,323 @@ +FightingDojo_Script: + call EnableAutoTextBoxDrawing + ld hl, FightingDojoTrainerHeader0 + ld de, FightingDojo_ScriptPointers + ld a, [wFightingDojoCurScript] + call ExecuteCurMapScriptInTable + ld [wFightingDojoCurScript], a + ret + +FightingDojoScript_5cd70: + xor a + ld [wJoyIgnore], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a + ret + +FightingDojo_ScriptPointers: + dw FightingDojoScript1 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw FightingDojoScript3 + +FightingDojoScript1: + CheckEvent EVENT_DEFEATED_FIGHTING_DOJO + ret nz + call CheckFightingMapTrainers + ld a, [wTrainerHeaderFlagBit] + and a + ret nz + CheckEvent EVENT_BEAT_KARATE_MASTER + ret nz + xor a + ld [hJoyHeld], a + ld [wcf0d], a + ld a, [wYCoord] + cp $3 + ret nz + ld a, [wXCoord] + cp $4 + ret nz + ld a, $1 + ld [wcf0d], a + ld a, PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_LEFT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ret + +FightingDojoScript3: + ld a, [wIsInBattle] + cp $ff + jp z, FightingDojoScript_5cd70 + ld a, [wcf0d] + and a + jr z, .asm_5cde4 + ld a, PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_LEFT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + +.asm_5cde4 + ld a, $f0 + ld [wJoyIgnore], a + SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 + ld a, $8 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wJoyIgnore], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a + ret + +FightingDojo_TextPointers: + dw FightingDojoText1 + dw FightingDojoText2 + dw FightingDojoText3 + dw FightingDojoText4 + dw FightingDojoText5 + dw FightingDojoText6 + dw FightingDojoText7 + dw FightingDojoText8 + +FightingDojoTrainerHeader0: + dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 + dw FightingDojoBattleText1 ; TextBeforeBattle + dw FightingDojoAfterBattleText1 ; TextAfterBattle + dw FightingDojoEndBattleText1 ; TextEndBattle + dw FightingDojoEndBattleText1 ; TextEndBattle + +FightingDojoTrainerHeader1: + dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 + dw FightingDojoBattleText2 ; TextBeforeBattle + dw FightingDojoAfterBattleText2 ; TextAfterBattle + dw FightingDojoEndBattleText2 ; TextEndBattle + dw FightingDojoEndBattleText2 ; TextEndBattle + +FightingDojoTrainerHeader2: + dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 + dw FightingDojoBattleText3 ; TextBeforeBattle + dw FightingDojoAfterBattleText3 ; TextAfterBattle + dw FightingDojoEndBattleText3 ; TextEndBattle + dw FightingDojoEndBattleText3 ; TextEndBattle + +FightingDojoTrainerHeader3: + dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 + dw FightingDojoBattleText4 ; TextBeforeBattle + dw FightingDojoAfterBattleText4 ; TextAfterBattle + dw FightingDojoEndBattleText4 ; TextEndBattle + dw FightingDojoEndBattleText4 ; TextEndBattle + + db $ff + +FightingDojoText1: + TX_ASM + CheckEvent EVENT_DEFEATED_FIGHTING_DOJO + jp nz, .continue1 + CheckEventReuseA EVENT_BEAT_KARATE_MASTER + jp nz, .continue2 + ld hl, FightingDojoText_5ce8e + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, FightingDojoText_5ce93 + ld de, FightingDojoText_5ce93 + call SaveEndBattleTextPointers + ld a, [hSpriteIndexOrTextID] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $3 + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a + jr .asm_9dba4 +.continue1 + ld hl, FightingDojoText_5ce9d + call PrintText + jr .asm_9dba4 +.continue2 + ld hl, FightingDojoText8 + call PrintText +.asm_9dba4 + jp TextScriptEnd + +FightingDojoText_5ce8e: + TX_FAR _FightingDojoText_5ce8e + db "@" + +FightingDojoText_5ce93: + TX_FAR _FightingDojoText_5ce93 + db "@" + +FightingDojoText8: + TX_FAR _FightingDojoText_5ce98 + db "@" + +FightingDojoText_5ce9d: + TX_FAR _FightingDojoText_5ce9d + db "@" + +FightingDojoText2: + TX_ASM + ld hl, FightingDojoTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +FightingDojoBattleText1: + TX_FAR _FightingDojoBattleText1 + db "@" + +FightingDojoEndBattleText1: + TX_FAR _FightingDojoEndBattleText1 + db "@" + +FightingDojoAfterBattleText1: + TX_FAR _FightingDojoAfterBattleText1 + db "@" + +FightingDojoText3: + TX_ASM + ld hl, FightingDojoTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +FightingDojoBattleText2: + TX_FAR _FightingDojoBattleText2 + db "@" + +FightingDojoEndBattleText2: + TX_FAR _FightingDojoEndBattleText2 + db "@" + +FightingDojoAfterBattleText2: + TX_FAR _FightingDojoAfterBattleText2 + db "@" + +FightingDojoText4: + TX_ASM + ld hl, FightingDojoTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +FightingDojoBattleText3: + TX_FAR _FightingDojoBattleText3 + db "@" + +FightingDojoEndBattleText3: + TX_FAR _FightingDojoEndBattleText3 + db "@" + +FightingDojoAfterBattleText3: + TX_FAR _FightingDojoAfterBattleText3 + db "@" + +FightingDojoText5: + TX_ASM + ld hl, FightingDojoTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +FightingDojoBattleText4: + TX_FAR _FightingDojoBattleText4 + db "@" + +FightingDojoEndBattleText4: + TX_FAR _FightingDojoEndBattleText4 + db "@" + +FightingDojoAfterBattleText4: + TX_FAR _FightingDojoAfterBattleText4 + db "@" + +FightingDojoText6: +; Hitmonlee Poké Ball + TX_ASM + CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN + jr z, .GetMon + ld hl, OtherHitmonText + call PrintText + jr .done +.GetMon + ld a, HITMONLEE + call DisplayPokedex + ld hl, WantHitmonleeText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .done + ld a, [wcf91] + ld b, a + ld c, 30 + call GivePokemon + jr nc, .done + + ; once Poké Ball is taken, hide sprite + ld a, HS_FIGHTING_DOJO_GIFT_1 + ld [wMissableObjectIndex], a + predef HideObject + SetEvents EVENT_GOT_HITMONLEE, EVENT_DEFEATED_FIGHTING_DOJO +.done + jp TextScriptEnd + +WantHitmonleeText: + TX_FAR _WantHitmonleeText + db "@" + +FightingDojoText7: +; Hitmonchan Poké Ball + TX_ASM + CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN + jr z, .GetMon + ld hl, OtherHitmonText + call PrintText + jr .done +.GetMon + ld a, HITMONCHAN + call DisplayPokedex + ld hl, WantHitmonchanText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .done + ld a, [wcf91] + ld b, a + ld c, 30 + call GivePokemon + jr nc, .done + SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO + + ; once Poké Ball is taken, hide sprite + ld a, HS_FIGHTING_DOJO_GIFT_2 + ld [wMissableObjectIndex], a + predef HideObject +.done + jp TextScriptEnd + +WantHitmonchanText: + TX_FAR _WantHitmonchanText + db "@" + +OtherHitmonText: + TX_FAR _OtherHitmonText + db "@" diff --git a/scripts/FuchsiaBillsGrandpasHouse.asm b/scripts/FuchsiaBillsGrandpasHouse.asm new file mode 100755 index 00000000..ca5f2c16 --- /dev/null +++ b/scripts/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,20 @@ +FuchsiaBillsGrandpasHouse_Script: + call EnableAutoTextBoxDrawing + ret + +FuchsiaBillsGrandpasHouse_TextPointers: + dw FuchsiaHouse1Text1 + dw FuchsiaHouse1Text2 + dw FuchsiaHouse1Text3 + +FuchsiaHouse1Text1: + TX_FAR _FuchsiaHouse1Text1 + db "@" + +FuchsiaHouse1Text2: + TX_FAR _FuchsiaHouse1Text2 + db "@" + +FuchsiaHouse1Text3: + TX_FAR _FuchsiaHouse1Text3 + db "@" diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm new file mode 100755 index 00000000..d3f0ce32 --- /dev/null +++ b/scripts/FuchsiaCity.asm @@ -0,0 +1,169 @@ +FuchsiaCity_Script: + jp EnableAutoTextBoxDrawing + +FuchsiaCity_TextPointers: + dw FuchsiaCityText1 + dw FuchsiaCityText2 + dw FuchsiaCityText3 + dw FuchsiaCityText4 + dw FuchsiaCityText5 + dw FuchsiaCityText6 + dw FuchsiaCityText7 + dw FuchsiaCityText8 + dw FuchsiaCityText9 + dw FuchsiaCityText10 + dw FuchsiaCityText11 + dw FuchsiaCityText12 + dw FuchsiaCityText13 + dw MartSignText + dw PokeCenterSignText + dw FuchsiaCityText16 + dw FuchsiaCityText17 + dw FuchsiaCityText18 + dw FuchsiaCityText19 + dw FuchsiaCityText20 + dw FuchsiaCityText21 + dw FuchsiaCityText22 + dw FuchsiaCityText23 + dw FuchsiaCityText24 + +FuchsiaCityText1: + TX_FAR _FuchsiaCityText1 + db "@" + +FuchsiaCityText2: + TX_FAR _FuchsiaCityText2 + db "@" + +FuchsiaCityText3: + TX_FAR _FuchsiaCityText3 + db "@" + +FuchsiaCityText4: + TX_FAR _FuchsiaCityText4 + db "@" + +FuchsiaCityText5: +FuchsiaCityText6: +FuchsiaCityText7: +FuchsiaCityText8: +FuchsiaCityText9: +FuchsiaCityText10: + TX_FAR _FuchsiaCityText5 + db "@" + +FuchsiaCityText12: +FuchsiaCityText11: + TX_FAR _FuchsiaCityText11 + db "@" + +FuchsiaCityText13: + TX_FAR _FuchsiaCityText13 + db "@" + +FuchsiaCityText16: + TX_FAR _FuchsiaCityText16 + db "@" + +FuchsiaCityText17: + TX_FAR _FuchsiaCityText17 + db "@" + +FuchsiaCityText18: + TX_FAR _FuchsiaCityText18 + db "@" + +FuchsiaCityText19: + TX_ASM + ld hl, FuchsiaCityChanseyText + call PrintText + ld a, CHANSEY + call DisplayPokedex + jp TextScriptEnd + +FuchsiaCityChanseyText: + TX_FAR _FuchsiaCityChanseyText + db "@" + +FuchsiaCityText20: + TX_ASM + ld hl, FuchsiaCityVoltorbText + call PrintText + ld a, VOLTORB + call DisplayPokedex + jp TextScriptEnd + +FuchsiaCityVoltorbText: + TX_FAR _FuchsiaCityVoltorbText + db "@" + +FuchsiaCityText21: + TX_ASM + ld hl, FuchsiaCityKangaskhanText + call PrintText + ld a, KANGASKHAN + call DisplayPokedex + jp TextScriptEnd + +FuchsiaCityKangaskhanText: + TX_FAR _FuchsiaCityKangaskhanText + db "@" + +FuchsiaCityText22: + TX_ASM + ld hl, FuchsiaCitySlowpokeText + call PrintText + ld a, SLOWPOKE + call DisplayPokedex + jp TextScriptEnd + +FuchsiaCitySlowpokeText: + TX_FAR _FuchsiaCitySlowpokeText + db "@" + +FuchsiaCityText23: + TX_ASM + ld hl, FuchsiaCityLaprasText + call PrintText + ld a, LAPRAS + call DisplayPokedex + jp TextScriptEnd + +FuchsiaCityLaprasText: + TX_FAR _FuchsiaCityLaprasText + db "@" + +FuchsiaCityText24: + TX_ASM + CheckEvent EVENT_GOT_DOME_FOSSIL + jr nz, .asm_3b4e8 + CheckEventReuseA EVENT_GOT_HELIX_FOSSIL + jr nz, .asm_667d5 + ld hl, FuchsiaCityText_19b2a + call PrintText + jr .asm_4343f +.asm_3b4e8 + ld hl, FuchsiaCityOmanyteText + call PrintText + ld a, OMANYTE + jr .asm_81556 +.asm_667d5 + ld hl, FuchsiaCityKabutoText + call PrintText + ld a, KABUTO +.asm_81556 + call DisplayPokedex +.asm_4343f + jp TextScriptEnd + +FuchsiaCityOmanyteText: + TX_FAR _FuchsiaCityOmanyteText + db "@" + +FuchsiaCityKabutoText: + TX_FAR _FuchsiaCityKabutoText + db "@" + +FuchsiaCityText_19b2a: + TX_FAR _FuchsiaCityText_19b2a + db "@" diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm new file mode 100755 index 00000000..93a20e80 --- /dev/null +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -0,0 +1,75 @@ +FuchsiaGoodRodHouse_Script: + jp EnableAutoTextBoxDrawing + +FuchsiaGoodRodHouse_TextPointers: + dw FuchsiaHouse3Text1 + +FuchsiaHouse3Text1: + TX_ASM + ld a, [wd728] + bit 4, a + jr nz, .after + + ld hl, FuchsiaHouse3Text_561bd + call PrintText + + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .refused + + lb bc, GOOD_ROD, 1 + call GiveItem + jr nc, .full + + ld hl, wd728 + set 4, [hl] + + ld hl, FuchsiaHouse3Text_561c2 + jr .talk + +.full + ld hl, FuchsiaHouse3Text_5621c + jr .talk + +.refused + ld hl, FuchsiaHouse3Text_56212 + jr .talk + +.after + ld hl, FuchsiaHouse3Text_56217 + +.talk + call PrintText + jp TextScriptEnd + +FuchsiaHouse3Text_561bd: + TX_FAR _FuchsiaHouse3Text_561bd + db "@" + +FuchsiaHouse3Text_561c2: + TX_FAR _FuchsiaHouse3Text_561c2 + TX_SFX_ITEM_1 + db "@" + +UnusedText_561c8: + para "つり こそ" + line "おとこの ロマン だ!" + + para "へぼいつりざおは" + line "コイキングしか つれ なんだが" + line "この いいつりざおなら" + line "もっと いいもんが つれるんじゃ!" + done + +FuchsiaHouse3Text_56212: + TX_FAR _FuchsiaHouse3Text_56212 + db "@" + +FuchsiaHouse3Text_56217: + TX_FAR _FuchsiaHouse3Text_56217 + db "@" + +FuchsiaHouse3Text_5621c: + TX_FAR _FuchsiaHouse3Text_5621c + db "@" diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm new file mode 100755 index 00000000..c856c93b --- /dev/null +++ b/scripts/FuchsiaGym.asm @@ -0,0 +1,329 @@ +FuchsiaGym_Script: + call FuchsiaGymScript_75453 + call EnableAutoTextBoxDrawing + ld hl, FuchsiaGymTrainerHeader0 + ld de, FuchsiaGym_ScriptPointers + ld a, [wFuchsiaGymCurScript] + call ExecuteCurMapScriptInTable + ld [wFuchsiaGymCurScript], a + ret + +FuchsiaGymScript_75453: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + ret z + ld hl, Gym5CityName + ld de, Gym5LeaderName + call LoadGymLeaderAndCityName + ret + +Gym5CityName: + db "FUCHSIA CITY@" +Gym5LeaderName: + db "KOGA@" + +FuchsiaGymScript_75477: + xor a + ld [wJoyIgnore], a + ld [wFuchsiaGymCurScript], a + ld [wCurMapScript], a + ret + +FuchsiaGym_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw FuchsiaGymScript3 + +FuchsiaGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, FuchsiaGymScript_75477 + ld a, $f0 + ld [wJoyIgnore], a +FuchsiaGymScript3_75497: + ld a, $9 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_KOGA + lb bc, TM_06, 1 + call GiveItem + jr nc, .BagFull + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM06 + jr .asm_754c0 +.BagFull + ld a, $b + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_754c0 + ld hl, wObtainedBadges + set 4, [hl] + ld hl, wBeatGymFlags + set 4, [hl] + + ; deactivate gym trainers + SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 + + jp FuchsiaGymScript_75477 + +FuchsiaGym_TextPointers: + dw FuchsiaGymText1 + dw FuchsiaGymText2 + dw FuchsiaGymText3 + dw FuchsiaGymText4 + dw FuchsiaGymText5 + dw FuchsiaGymText6 + dw FuchsiaGymText7 + dw FuchsiaGymText8 + dw FuchsiaGymText9 + dw FuchsiaGymText10 + dw FuchsiaGymText11 + +FuchsiaGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 + dw FuchsiaGymBattleText1 ; TextBeforeBattle + dw FuchsiaGymAfterBattleText1 ; TextAfterBattle + dw FuchsiaGymEndBattleText1 ; TextEndBattle + dw FuchsiaGymEndBattleText1 ; TextEndBattle + +FuchsiaGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 + dw FuchsiaGymBattleText2 ; TextBeforeBattle + dw FuchsiaGymAfterBattleText2 ; TextAfterBattle + dw FuchsiaGymEndBattleText2 ; TextEndBattle + dw FuchsiaGymEndBattleText2 ; TextEndBattle + +FuchsiaGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 + dw FuchsiaGymBattleText3 ; TextBeforeBattle + dw FuchsiaGymAfterBattleText3 ; TextAfterBattle + dw FuchsiaGymEndBattleText3 ; TextEndBattle + dw FuchsiaGymEndBattleText3 ; TextEndBattle + +FuchsiaGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 + dw FuchsiaGymBattleText4 ; TextBeforeBattle + dw FuchsiaGymAfterBattleText4 ; TextAfterBattle + dw FuchsiaGymEndBattleText4 ; TextEndBattle + dw FuchsiaGymEndBattleText4 ; TextEndBattle + +FuchsiaGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 + dw FuchsiaGymBattleText5 ; TextBeforeBattle + dw FuchsiaGymAfterBattleText5 ; TextAfterBattle + dw FuchsiaGymEndBattleText5 ; TextEndBattle + dw FuchsiaGymEndBattleText5 ; TextEndBattle + +FuchsiaGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 + dw FuchsiaGymBattleText6 ; TextBeforeBattle + dw FuchsiaGymAfterBattleText6 ; TextAfterBattle + dw FuchsiaGymEndBattleText6 ; TextEndBattle + dw FuchsiaGymEndBattleText6 ; TextEndBattle + + db $ff + +FuchsiaGymText1: + TX_ASM + CheckEvent EVENT_BEAT_KOGA + jr z, .asm_181b6 + CheckEventReuseA EVENT_GOT_TM06 + jr nz, .asm_adc3b + call z, FuchsiaGymScript3_75497 + call DisableWaitingAfterTextDisplay + jr .asm_e84c6 +.asm_adc3b + ld hl, KogaExplainToxicText + call PrintText + jr .asm_e84c6 +.asm_181b6 + ld hl, KogaBeforeBattleText + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, KogaAfterBattleText + ld de, KogaAfterBattleText + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $5 + ld [wGymLeaderNo], a + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wFuchsiaGymCurScript], a +.asm_e84c6 + jp TextScriptEnd + +KogaBeforeBattleText: + TX_FAR _KogaBeforeBattleText + db "@" + +KogaAfterBattleText: + TX_FAR _KogaAfterBattleText + db "@" + +KogaExplainToxicText: + TX_FAR _KogaExplainToxicText + db "@" + +FuchsiaGymText9: + TX_FAR _FuchsiaGymText9 + db "@" + +FuchsiaGymText10: + TX_FAR _ReceivedTM06Text + TX_SFX_KEY_ITEM + +TM06ExplanationText: + TX_FAR _TM06ExplanationText + db "@" + +FuchsiaGymText11: + TX_FAR _TM06NoRoomText + db "@" + +FuchsiaGymText2: + TX_ASM + ld hl, FuchsiaGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +FuchsiaGymBattleText1: + TX_FAR _FuchsiaGymBattleText1 + db "@" + +FuchsiaGymEndBattleText1: + TX_FAR _FuchsiaGymEndBattleText1 + db "@" + +FuchsiaGymAfterBattleText1: + TX_FAR _FuchsiaGymAfterBattleText1 + db "@" + +FuchsiaGymText3: + TX_ASM + ld hl, FuchsiaGymTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +FuchsiaGymBattleText2: + TX_FAR _FuchsiaGymBattleText2 + db "@" + +FuchsiaGymEndBattleText2: + TX_FAR _FuchsiaGymEndBattleText2 + db "@" + +FuchsiaGymAfterBattleText2: + TX_FAR _FuchsiaGymAfterBattleText2 + db "@" + +FuchsiaGymText4: + TX_ASM + ld hl, FuchsiaGymTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +FuchsiaGymBattleText3: + TX_FAR _FuchsiaGymBattleText3 + db "@" + +FuchsiaGymEndBattleText3: + TX_FAR _FuchsiaGymEndBattleText3 + db "@" + +FuchsiaGymAfterBattleText3: + TX_FAR _FuchsiaGymAfterBattleText3 + db "@" + +FuchsiaGymText5: + TX_ASM + ld hl, FuchsiaGymTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +FuchsiaGymBattleText4: + TX_FAR _FuchsiaGymBattleText4 + db "@" + +FuchsiaGymEndBattleText4: + TX_FAR _FuchsiaGymEndBattleText4 + db "@" + +FuchsiaGymAfterBattleText4: + TX_FAR _FuchsiaGymAfterBattleText4 + db "@" + +FuchsiaGymText6: + TX_ASM + ld hl, FuchsiaGymTrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +FuchsiaGymBattleText5: + TX_FAR _FuchsiaGymBattleText5 + db "@" + +FuchsiaGymEndBattleText5: + TX_FAR _FuchsiaGymEndBattleText5 + db "@" + +FuchsiaGymAfterBattleText5: + TX_FAR _FuchsiaGymAfterBattleText5 + db "@" + +FuchsiaGymText7: + TX_ASM + ld hl, FuchsiaGymTrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +FuchsiaGymBattleText6: + TX_FAR _FuchsiaGymBattleText6 + db "@" + +FuchsiaGymEndBattleText6: + TX_FAR _FuchsiaGymEndBattleText6 + db "@" + +FuchsiaGymAfterBattleText6: + TX_FAR _FuchsiaGymAfterBattleText6 + db "@" + +FuchsiaGymText8: + TX_ASM + CheckEvent EVENT_BEAT_KOGA + ld hl, FuchsiaGymText_75653 + jr nz, .asm_50671 + ld hl, FuchsiaGymText_7564e +.asm_50671 + call PrintText + jp TextScriptEnd + +FuchsiaGymText_7564e: + TX_FAR _FuchsiaGymText_7564e + db "@" + +FuchsiaGymText_75653: + TX_FAR _FuchsiaGymText_75653 + db "@" diff --git a/scripts/FuchsiaMart.asm b/scripts/FuchsiaMart.asm new file mode 100755 index 00000000..f17cac49 --- /dev/null +++ b/scripts/FuchsiaMart.asm @@ -0,0 +1,15 @@ +FuchsiaMart_Script: + jp EnableAutoTextBoxDrawing + +FuchsiaMart_TextPointers: + dw FuchsiaCashierText + dw FuchsiaMartText2 + dw FuchsiaMartText3 + +FuchsiaMartText2: + TX_FAR _FuchsiaMartText2 + db "@" + +FuchsiaMartText3: + TX_FAR _FuchsiaMartText3 + db "@" diff --git a/scripts/FuchsiaMeetingRoom.asm b/scripts/FuchsiaMeetingRoom.asm new file mode 100755 index 00000000..95ac12fa --- /dev/null +++ b/scripts/FuchsiaMeetingRoom.asm @@ -0,0 +1,20 @@ +FuchsiaMeetingRoom_Script: + call EnableAutoTextBoxDrawing + ret + +FuchsiaMeetingRoom_TextPointers: + dw FuchsiaMeetingRoomText1 + dw FuchsiaMeetingRoomText2 + dw FuchsiaMeetingRoomText3 + +FuchsiaMeetingRoomText1: + TX_FAR _FuchsiaMeetingRoomText1 + db "@" + +FuchsiaMeetingRoomText2: + TX_FAR _FuchsiaMeetingRoomText2 + db "@" + +FuchsiaMeetingRoomText3: + TX_FAR _FuchsiaMeetingRoomText3 + db "@" diff --git a/scripts/FuchsiaPokecenter.asm b/scripts/FuchsiaPokecenter.asm new file mode 100755 index 00000000..182ec8c3 --- /dev/null +++ b/scripts/FuchsiaPokecenter.asm @@ -0,0 +1,23 @@ +FuchsiaPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +FuchsiaPokecenter_TextPointers: + dw FuchsiaHealNurseText + dw FuchsiaPokecenterText2 + dw FuchsiaPokecenterText3 + dw FuchsiaTradeNurseText + +FuchsiaHealNurseText: + TX_POKECENTER_NURSE + +FuchsiaPokecenterText2: + TX_FAR _FuchsiaPokecenterText1 + db "@" + +FuchsiaPokecenterText3: + TX_FAR _FuchsiaPokecenterText3 + db "@" + +FuchsiaTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm new file mode 100755 index 00000000..265508e0 --- /dev/null +++ b/scripts/GameCorner.asm @@ -0,0 +1,527 @@ +GameCorner_Script: + call CeladonGameCornerScript_48bcf + call CeladonGameCornerScript_48bec + call EnableAutoTextBoxDrawing + ld hl, GameCorner_ScriptPointers + ld a, [wGameCornerCurScript] + jp CallFunctionInTable + +CeladonGameCornerScript_48bcf: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + ret z + call Random + ld a, [hRandomAdd] + cp $7 + jr nc, .asm_48be2 + ld a, $8 +.asm_48be2 + srl a + srl a + srl a + ld [wLuckySlotHiddenObjectIndex], a + ret + +CeladonGameCornerScript_48bec: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_FOUND_ROCKET_HIDEOUT + ret nz + ld a, $2a + ld [wNewTileBlockID], a + lb bc, 2, 8 + predef_jump ReplaceTileBlock + +CeladonGameCornerScript_48c07: + xor a + ld [wJoyIgnore], a + ld [wGameCornerCurScript], a + ld [wCurMapScript], a + ret + +GameCorner_ScriptPointers: + dw CeladonGameCornerScript0 + dw CeladonGameCornerScript1 + dw CeladonGameCornerScript2 + +CeladonGameCornerScript0: + ret + +CeladonGameCornerScript1: + ld a, [wIsInBattle] + cp $ff + jp z, CeladonGameCornerScript_48c07 + ld a, $f0 + ld [wJoyIgnore], a + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $b + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld de, MovementData_48c5a + ld a, [wYCoord] + cp $6 + jr nz, .asm_48c43 + ld de, MovementData_48c63 + jr .asm_48c4d +.asm_48c43 + ld a, [wXCoord] + cp $8 + jr nz, .asm_48c4d + ld de, MovementData_48c63 +.asm_48c4d + ld a, $b + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $2 + ld [wGameCornerCurScript], a + ret + +MovementData_48c5a: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +MovementData_48c63: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +CeladonGameCornerScript2: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, HS_GAME_CORNER_ROCKET + ld [wMissableObjectIndex], a + predef HideObject + ld hl, wCurrentMapScriptFlags + set 5, [hl] + set 6, [hl] + ld a, $0 + ld [wGameCornerCurScript], a + ret + +GameCorner_TextPointers: + dw CeladonGameCornerText1 + dw CeladonGameCornerText2 + dw CeladonGameCornerText3 + dw CeladonGameCornerText4 + dw CeladonGameCornerText5 + dw CeladonGameCornerText6 + dw CeladonGameCornerText7 + dw CeladonGameCornerText8 + dw CeladonGameCornerText9 + dw CeladonGameCornerText10 + dw CeladonGameCornerText11 + dw CeladonGameCornerText12 + dw CeladonGameCornerText13 + +CeladonGameCornerText1: + TX_FAR _CeladonGameCornerText1 + db "@" + +CeladonGameCornerText2: + TX_ASM + call CeladonGameCornerScript_48f1e + ld hl, CeladonGameCornerText_48d22 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_48d0f + ld b, COIN_CASE + call IsItemInBag + jr z, .asm_48d19 + call Has9990Coins + jr nc, .asm_48d14 + xor a + ld [hMoney], a + ld [hMoney + 2], a + ld a, $10 + ld [hMoney + 1], a + call HasEnoughMoney + jr nc, .asm_48cdb + ld hl, CeladonGameCornerText_48d31 + jr .asm_48d1c +.asm_48cdb + xor a + ld [hMoney], a + ld [hMoney + 2], a + ld a, $10 + ld [hMoney + 1], a + ld hl, hMoney + 2 + ld de, wPlayerMoney + 2 + ld c, $3 + predef SubBCDPredef + xor a + ld [hUnusedCoinsByte], a + ld [hCoins], a + ld a, $50 + ld [hCoins + 1], a + ld de, wPlayerCoins + 1 + ld hl, hCoins + 1 + ld c, $2 + predef AddBCDPredef + call CeladonGameCornerScript_48f1e + ld hl, CeladonGameCornerText_48d27 + jr .asm_48d1c +.asm_48d0f + ld hl, CeladonGameCornerText_48d2c + jr .asm_48d1c +.asm_48d14 + ld hl, CeladonGameCornerText_48d36 + jr .asm_48d1c +.asm_48d19 + ld hl, CeladonGameCornerText_48d3b +.asm_48d1c + call PrintText + jp TextScriptEnd + +CeladonGameCornerText_48d22: + TX_FAR _CeladonGameCornerText_48d22 + db "@" + +CeladonGameCornerText_48d27: + TX_FAR _CeladonGameCornerText_48d27 + db "@" + +CeladonGameCornerText_48d2c: + TX_FAR _CeladonGameCornerText_48d2c + db "@" + +CeladonGameCornerText_48d31: + TX_FAR _CeladonGameCornerText_48d31 + db "@" + +CeladonGameCornerText_48d36: + TX_FAR _CeladonGameCornerText_48d36 + db "@" + +CeladonGameCornerText_48d3b: + TX_FAR _CeladonGameCornerText_48d3b + db "@" + +CeladonGameCornerText3: + TX_FAR _CeladonGameCornerText3 + db "@" + +CeladonGameCornerText4: + TX_FAR _CeladonGameCornerText4 + db "@" + +CeladonGameCornerText5: + TX_ASM + CheckEvent EVENT_GOT_10_COINS + jr nz, .asm_48d89 + ld hl, CeladonGameCornerText_48d9c + call PrintText + ld b, COIN_CASE + call IsItemInBag + jr z, .asm_48d93 + call Has9990Coins + jr nc, .asm_48d8e + xor a + ld [hUnusedCoinsByte], a + ld [hCoins], a + ld a, $10 + ld [hCoins + 1], a + ld de, wPlayerCoins + 1 + ld hl, hCoins + 1 + ld c, $2 + predef AddBCDPredef + SetEvent EVENT_GOT_10_COINS + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, Received10CoinsText + jr .asm_48d96 +.asm_48d89 + ld hl, CeladonGameCornerText_48dac + jr .asm_48d96 +.asm_48d8e + ld hl, CeladonGameCornerText_48da7 + jr .asm_48d96 +.asm_48d93 + ld hl, CeladonGameCornerText_48f19 +.asm_48d96 + call PrintText + jp TextScriptEnd + +CeladonGameCornerText_48d9c: + TX_FAR _CeladonGameCornerText_48d9c + db "@" + +Received10CoinsText: + TX_FAR _Received10CoinsText + TX_SFX_ITEM_1 + db "@" + +CeladonGameCornerText_48da7: + TX_FAR _CeladonGameCornerText_48da7 + db "@" + +CeladonGameCornerText_48dac: + TX_FAR _CeladonGameCornerText_48dac + db "@" + +CeladonGameCornerText6: + TX_FAR _CeladonGameCornerText6 + db "@" + +CeladonGameCornerText7: + TX_ASM + CheckEvent EVENT_BEAT_ERIKA + ld hl, CeladonGameCornerText_48dca + jr z, .asm_48dc4 + ld hl, CeladonGameCornerText_48dcf +.asm_48dc4 + call PrintText + jp TextScriptEnd + +CeladonGameCornerText_48dca: + TX_FAR _CeladonGameCornerText_48dca + db "@" + +CeladonGameCornerText_48dcf: + TX_FAR _CeladonGameCornerText_48dcf + db "@" + +CeladonGameCornerText8: + TX_FAR _CeladonGameCornerText8 + db "@" + +CeladonGameCornerText9: + TX_ASM + CheckEvent EVENT_GOT_20_COINS_2 + jr nz, .asm_48e13 + ld hl, CeladonGameCornerText_48e26 + call PrintText + ld b, COIN_CASE + call IsItemInBag + jr z, .asm_48e1d + call Has9990Coins + jr nc, .asm_48e18 + xor a + ld [hUnusedCoinsByte], a + ld [hCoins], a + ld a, $20 + ld [hCoins + 1], a + ld de, wPlayerCoins + 1 + ld hl, hCoins + 1 + ld c, $2 + predef AddBCDPredef + SetEvent EVENT_GOT_20_COINS_2 + ld hl, Received20CoinsText + jr .asm_48e20 +.asm_48e13 + ld hl, CeladonGameCornerText_48e36 + jr .asm_48e20 +.asm_48e18 + ld hl, CeladonGameCornerText_48e31 + jr .asm_48e20 +.asm_48e1d + ld hl, CeladonGameCornerText_48f19 +.asm_48e20 + call PrintText + jp TextScriptEnd + +CeladonGameCornerText_48e26: + TX_FAR _CeladonGameCornerText_48e26 + db "@" + +Received20CoinsText: + TX_FAR _Received20CoinsText + TX_SFX_ITEM_1 + db "@" + +CeladonGameCornerText_48e31: + TX_FAR _CeladonGameCornerText_48e31 + db "@" + +CeladonGameCornerText_48e36: + TX_FAR _CeladonGameCornerText_48e36 + db "@" + +CeladonGameCornerText10: + TX_ASM + CheckEvent EVENT_GOT_20_COINS + jr nz, .asm_48e75 + ld hl, CeladonGameCornerText_48e88 + call PrintText + ld b, COIN_CASE + call IsItemInBag + jr z, .asm_48e7f + call Has9990Coins + jr z, .asm_48e7a + xor a + ld [hUnusedCoinsByte], a + ld [hCoins], a + ld a, $20 + ld [hCoins + 1], a + ld de, wPlayerCoins + 1 + ld hl, hCoins + 1 + ld c, $2 + predef AddBCDPredef + SetEvent EVENT_GOT_20_COINS + ld hl, CeladonGameCornerText_48e8d + jr .asm_48e82 +.asm_48e75 + ld hl, CeladonGameCornerText_48e98 + jr .asm_48e82 +.asm_48e7a + ld hl, CeladonGameCornerText_48e93 + jr .asm_48e82 +.asm_48e7f + ld hl, CeladonGameCornerText_48f19 +.asm_48e82 + call PrintText + jp TextScriptEnd + +CeladonGameCornerText_48e88: + TX_FAR _CeladonGameCornerText_48e88 + db "@" + +CeladonGameCornerText_48e8d: + TX_FAR _CeladonGameCornerText_48e8d + TX_SFX_ITEM_1 + db "@" + +CeladonGameCornerText_48e93: + TX_FAR _CeladonGameCornerText_48e93 + db "@" + +CeladonGameCornerText_48e98: + TX_FAR _CeladonGameCornerText_48e98 + db "@" + +CeladonGameCornerText11: + TX_ASM + ld hl, CeladonGameCornerText_48ece + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, CeladonGameCornerText_48ed3 + ld de, CeladonGameCornerText_48ed3 + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + xor a + ld [hJoyHeld], a + ld [hJoyPressed], a + ld [hJoyReleased], a + ld a, $1 + ld [wGameCornerCurScript], a + jp TextScriptEnd + +CeladonGameCornerText_48ece: + TX_FAR _CeladonGameCornerText_48ece + db "@" + +CeladonGameCornerText_48ed3: + TX_FAR _CeladonGameCornerText_48ed3 + db "@" + +CeladonGameCornerText13: + TX_FAR _CeladonGameCornerText_48ed8 + db "@" + +CeladonGameCornerText12: + TX_ASM + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, CeladonGameCornerText_48f09 + call PrintText + call WaitForSoundToFinish + ld a, SFX_GO_INSIDE + call PlaySound + call WaitForSoundToFinish + SetEvent EVENT_FOUND_ROCKET_HIDEOUT + ld a, $43 + ld [wNewTileBlockID], a + lb bc, 2, 8 + predef ReplaceTileBlock + jp TextScriptEnd + +CeladonGameCornerText_48f09: + TX_FAR _CeladonGameCornerText_48f09 + TX_ASM + ld a, SFX_SWITCH + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + +CeladonGameCornerText_48f19: + TX_FAR _CeladonGameCornerText_48f19 + db "@" + +CeladonGameCornerScript_48f1e: + ld hl, wd730 + set 6, [hl] + coord hl, 11, 0 + ld b, $5 + ld c, $7 + call TextBoxBorder + call UpdateSprites + coord hl, 12, 1 + ld b, 4 + ld c, 7 + call ClearScreenArea + coord hl, 12, 2 + ld de, GameCornerMoneyText + call PlaceString + coord hl, 12, 3 + ld de, GameCornerBlankText1 + call PlaceString + coord hl, 12, 3 + ld de, wPlayerMoney + ld c, $a3 + call PrintBCDNumber + coord hl, 12, 4 + ld de, GameCornerCoinText + call PlaceString + coord hl, 12, 5 + ld de, GameCornerBlankText2 + call PlaceString + coord hl, 15, 5 + ld de, wPlayerCoins + ld c, $82 + call PrintBCDNumber + ld hl, wd730 + res 6, [hl] + ret + +GameCornerMoneyText: + db "MONEY@" + +GameCornerCoinText: + db "COIN@" + +GameCornerBlankText1: + db " @" + +GameCornerBlankText2: + db " @" + +Has9990Coins: + ld a, $99 + ld [hCoins], a + ld a, $90 + ld [hCoins + 1], a + jp HasEnoughCoins diff --git a/scripts/GameCornerPrizeRoom.asm b/scripts/GameCornerPrizeRoom.asm new file mode 100755 index 00000000..e6cf6f0d --- /dev/null +++ b/scripts/GameCornerPrizeRoom.asm @@ -0,0 +1,20 @@ +GameCornerPrizeRoom_Script: + jp EnableAutoTextBoxDrawing + +GameCornerPrizeRoom_TextPointers: + dw CeladonPrizeRoomText1 + dw CeladonPrizeRoomText2 + dw CeladonPrizeRoomText3 + dw CeladonPrizeRoomText3 + dw CeladonPrizeRoomText3 + +CeladonPrizeRoomText1: + TX_FAR _CeladonPrizeRoomText1 + db "@" + +CeladonPrizeRoomText2: + TX_FAR _CeladonPrizeRoomText2 + db "@" + +CeladonPrizeRoomText3: + TX_PRIZE_VENDOR diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm new file mode 100755 index 00000000..511c9754 --- /dev/null +++ b/scripts/HallOfFame.asm @@ -0,0 +1,109 @@ +HallOfFame_Script: + call EnableAutoTextBoxDrawing + ld hl, HallOfFame_ScriptPointers + ld a, [wHallOfFameCurScript] + jp CallFunctionInTable + +HallofFameRoomScript_5a4aa: + xor a + ld [wJoyIgnore], a + ld [wHallOfFameCurScript], a + ret + +HallOfFame_ScriptPointers: + dw HallofFameRoomScript0 + dw HallofFameRoomScript1 + dw HallofFameRoomScript2 + dw HallofFameRoomScript3 + +HallofFameRoomScript3: + ret + +HallofFameRoomScript2: + call Delay3 + ld a, [wLetterPrintingDelayFlags] + push af + xor a + ld [wJoyIgnore], a + predef HallOfFamePC + pop af + ld [wLetterPrintingDelayFlags], a + ld hl, wFlags_D733 + res 1, [hl] + inc hl + set 0, [hl] + xor a + ld hl, wLoreleisRoomCurScript + ld [hli], a ; wLoreleisRoomCurScript + ld [hli], a ; wBrunosRoomCurScript + ld [hl], a ; wAgathasRoomCurScript + ld [wLancesRoomCurScript], a + ld [wHallOfFameCurScript], a + ; Elite 4 events + ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 + xor a + ld [wHallOfFameCurScript], a + ld a, PALLET_TOWN + ld [wLastBlackoutMap], a + callba SaveSAVtoSRAM + ld b, 5 +.delayLoop + ld c, 600 / 5 + call DelayFrames + dec b + jr nz, .delayLoop + call WaitForTextScrollButtonPress + jp Init + +HallofFameRoomScript0: + ld a, $ff + ld [wJoyIgnore], a + ld hl, wSimulatedJoypadStatesEnd + ld de, RLEMovement5a528 + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $1 + ld [wHallOfFameCurScript], a + ret + +RLEMovement5a528: + db D_UP,$5 + db $ff + +HallofFameRoomScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld a, PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld a, SPRITE_FACING_LEFT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + call Delay3 + xor a + ld [wJoyIgnore], a + inc a ; PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wJoyIgnore], a + ld a, HS_UNKNOWN_DUNGEON_GUY + ld [wMissableObjectIndex], a + predef HideObject + ld a, $2 + ld [wHallOfFameCurScript], a + ret + +HallOfFame_TextPointers: + dw HallofFameRoomText1 + +HallofFameRoomText1: + TX_FAR _HallofFameRoomText1 + db "@" diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm new file mode 100755 index 00000000..86f38b2a --- /dev/null +++ b/scripts/IndigoPlateau.asm @@ -0,0 +1,4 @@ +IndigoPlateau_Script: + ret + +IndigoPlateau_TextPointers: diff --git a/scripts/IndigoPlateauLobby.asm b/scripts/IndigoPlateauLobby.asm new file mode 100755 index 00000000..f83c0ba4 --- /dev/null +++ b/scripts/IndigoPlateauLobby.asm @@ -0,0 +1,36 @@ +IndigoPlateauLobby_Script: + call Serial_TryEstablishingExternallyClockedConnection + call EnableAutoTextBoxDrawing + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + ret z + ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH + ld hl, wBeatLorelei + bit 1, [hl] + res 1, [hl] + ret z + ; Elite 4 events + ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR + ret + +IndigoPlateauLobby_TextPointers: + dw IndigoHealNurseText + dw IndigoPlateauLobbyText2 + dw IndigoPlateauLobbyText3 + dw IndigoCashierText + dw IndigoTradeNurseText + +IndigoHealNurseText: + TX_POKECENTER_NURSE + +IndigoPlateauLobbyText2: + TX_FAR _IndigoPlateauLobbyText2 + db "@" + +IndigoPlateauLobbyText3: + TX_FAR _IndigoPlateauLobbyText3 + db "@" + +IndigoTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm new file mode 100755 index 00000000..5e19ea7d --- /dev/null +++ b/scripts/LancesRoom.asm @@ -0,0 +1,162 @@ +LancesRoom_Script: + call LanceShowOrHideEntranceBlocks + call EnableAutoTextBoxDrawing + ld hl, LanceTrainerHeader0 + ld de, LancesRoom_ScriptPointers + ld a, [wLancesRoomCurScript] + call ExecuteCurMapScriptInTable + ld [wLancesRoomCurScript], a + ret + +LanceShowOrHideEntranceBlocks: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_LANCES_ROOM_LOCK_DOOR + jr nz, .closeEntrance + ; open entrance + ld a, $31 + ld b, $32 + jp LanceSetEntranceBlocks +.closeEntrance + ld a, $72 + ld b, $73 + +LanceSetEntranceBlocks: +; Replaces the tile blocks so the player can't leave. + push bc + ld [wNewTileBlockID], a + lb bc, 6, 2 + call LanceSetEntranceBlock + pop bc + ld a, b + ld [wNewTileBlockID], a + lb bc, 6, 3 + +LanceSetEntranceBlock: + predef_jump ReplaceTileBlock + +ResetLanceScript: + xor a + ld [wLancesRoomCurScript], a + ret + +LancesRoom_ScriptPointers: + dw LanceScript0 + dw DisplayEnemyTrainerTextAndStartBattle + dw LanceScript2 + dw LanceScript3 + dw LanceScript4 + +LanceScript4: + ret + +LanceScript0: + CheckEvent EVENT_BEAT_LANCE + ret nz + ld hl, LanceTriggerMovementCoords + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyHeld], a + ld a, [wCoordIndex] + cp $3 ; Is player standing next to Lance's sprite? + jr nc, .notStandingNextToLance + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID +.notStandingNextToLance + cp $5 ; Is player standing on the entrance staircase? + jr z, WalkToLance + CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR + ret nz + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ld a, SFX_GO_INSIDE + call PlaySound + jp LanceShowOrHideEntranceBlocks + +LanceTriggerMovementCoords: + db $01,$05 + db $02,$06 + db $0B,$05 + db $0B,$06 + db $10,$18 + db $FF + +LanceScript2: + call EndTrainerBattle + ld a, [wIsInBattle] + cp $ff + jp z, ResetLanceScript + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +WalkToLance: +; Moves the player down the hallway to Lance's room. + ld a, $ff + ld [wJoyIgnore], a + ld hl, wSimulatedJoypadStatesEnd + ld de, WalkToLance_RLEList + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wLancesRoomCurScript], a + ld [wCurMapScript], a + ret + +WalkToLance_RLEList: + db D_UP, $0C + db D_LEFT, $0C + db D_DOWN, $07 + db D_LEFT, $06 + db $FF + +LanceScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wLancesRoomCurScript], a + ld [wCurMapScript], a + ret + +LancesRoom_TextPointers: + dw LanceText1 + +LanceTrainerHeader0: + dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0 + dw LanceBeforeBattleText ; TextBeforeBattle + dw LanceAfterBattleText ; TextAfterBattle + dw LanceEndBattleText ; TextEndBattle + dw LanceEndBattleText ; TextEndBattle + + db $ff + +LanceText1: + TX_ASM + ld hl, LanceTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +LanceBeforeBattleText: + TX_FAR _LanceBeforeBattleText + db "@" + +LanceEndBattleText: + TX_FAR _LanceEndBattleText + db "@" + +LanceAfterBattleText: + TX_FAR _LanceAfterBattleText + TX_ASM + SetEvent EVENT_BEAT_LANCE + jp TextScriptEnd diff --git a/scripts/LavenderCuboneHouse.asm b/scripts/LavenderCuboneHouse.asm new file mode 100755 index 00000000..ff5aa732 --- /dev/null +++ b/scripts/LavenderCuboneHouse.asm @@ -0,0 +1,35 @@ +LavenderCuboneHouse_Script: + call EnableAutoTextBoxDrawing + ret + +LavenderCuboneHouse_TextPointers: + dw LavenderHouse2Text1 + dw LavenderHouse2Text2 + +LavenderHouse2Text1: + TX_FAR _LavenderHouse2Text1 + TX_ASM + ld a, CUBONE + call PlayCry + jp TextScriptEnd + +LavenderHouse2Text2: + TX_ASM + CheckEvent EVENT_RESCUED_MR_FUJI + jr nz, .asm_65711 + ld hl, LavenderHouse2Text_1d9dc + call PrintText + jr .asm_64be1 +.asm_65711 + ld hl, LavenderHouse2Text_1d9e1 + call PrintText +.asm_64be1 + jp TextScriptEnd + +LavenderHouse2Text_1d9dc: + TX_FAR _LavenderHouse2Text_1d9dc + db "@" + +LavenderHouse2Text_1d9e1: + TX_FAR _LavenderHouse2Text_1d9e1 + db "@" diff --git a/scripts/LavenderMart.asm b/scripts/LavenderMart.asm new file mode 100755 index 00000000..47330e5d --- /dev/null +++ b/scripts/LavenderMart.asm @@ -0,0 +1,32 @@ +LavenderMart_Script: + jp EnableAutoTextBoxDrawing + +LavenderMart_TextPointers: + dw LavenderCashierText + dw LavenderMartText2 + dw LavenderMartText3 + +LavenderMartText2: + TX_FAR _LavenderMartText2 + db "@" + +LavenderMartText3: + TX_ASM + CheckEvent EVENT_RESCUED_MR_FUJI + jr nz, .Nugget + ld hl, .ReviveText + call PrintText + jr .done +.Nugget + ld hl, .NuggetText + call PrintText +.done + jp TextScriptEnd + +.ReviveText + TX_FAR _LavenderMartReviveText + db "@" + +.NuggetText + TX_FAR _LavenderMartNuggetText + db "@" diff --git a/scripts/LavenderPokecenter.asm b/scripts/LavenderPokecenter.asm new file mode 100755 index 00000000..10482fef --- /dev/null +++ b/scripts/LavenderPokecenter.asm @@ -0,0 +1,23 @@ +LavenderPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +LavenderPokecenter_TextPointers: + dw LavenderHealNurseText + dw LavenderPokecenterText2 + dw LavenderPokecenterText3 + dw LavenderTradeNurseText + +LavenderTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST + +LavenderHealNurseText: + TX_POKECENTER_NURSE + +LavenderPokecenterText2: + TX_FAR _LavenderPokecenterText2 + db "@" + +LavenderPokecenterText3: + TX_FAR _LavenderPokecenterText3 + db "@" diff --git a/scripts/LavenderTown.asm b/scripts/LavenderTown.asm new file mode 100755 index 00000000..c23996e9 --- /dev/null +++ b/scripts/LavenderTown.asm @@ -0,0 +1,63 @@ +LavenderTown_Script: + jp EnableAutoTextBoxDrawing + +LavenderTown_TextPointers: + dw LavenderTownText1 + dw LavenderTownText2 + dw LavenderTownText3 + dw LavenderTownText4 + dw LavenderTownText5 + dw MartSignText + dw PokeCenterSignText + dw LavenderTownText8 + dw LavenderTownText9 + +LavenderTownText1: + TX_ASM + ld hl, LavenderTownText_4413c + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ld hl, LavenderTownText_44146 + jr nz, .asm_40831 + ld hl, LavenderTownText_44141 +.asm_40831 + call PrintText + jp TextScriptEnd + +LavenderTownText_4413c: + TX_FAR _LavenderTownText_4413c + db "@" + +LavenderTownText_44141: + TX_FAR _LavenderTownText_44141 + db "@" + +LavenderTownText_44146: + TX_FAR _LavenderTownText_44146 + db "@" + +LavenderTownText2: + TX_FAR _LavenderTownText2 + db "@" + +LavenderTownText3: + TX_FAR _LavenderTownText3 + db "@" + +LavenderTownText4: + TX_FAR _LavenderTownText4 + db "@" + +LavenderTownText5: + TX_FAR _LavenderTownText5 + db "@" + +LavenderTownText8: + TX_FAR _LavenderTownText8 + db "@" + +LavenderTownText9: + TX_FAR _LavenderTownText9 + db "@" diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm new file mode 100755 index 00000000..81142377 --- /dev/null +++ b/scripts/LoreleisRoom.asm @@ -0,0 +1,153 @@ +LoreleisRoom_Script: + call LoreleiShowOrHideExitBlock + call EnableAutoTextBoxDrawing + ld hl, LoreleiTrainerHeader0 + ld de, LoreleisRoom_ScriptPointers + ld a, [wLoreleisRoomCurScript] + call ExecuteCurMapScriptInTable + ld [wLoreleisRoomCurScript], a + ret + +LoreleiShowOrHideExitBlock: +; Blocks or clears the exit to the next room. + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, wBeatLorelei + set 1, [hl] + CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 + jr z, .blockExitToNextRoom + ld a, $5 + jr .setExitBlock +.blockExitToNextRoom + ld a, $24 +.setExitBlock + ld [wNewTileBlockID], a + lb bc, 0, 2 + predef_jump ReplaceTileBlock + +ResetLoreleiScript: + xor a + ld [wLoreleisRoomCurScript], a + ret + +LoreleisRoom_ScriptPointers: + dw LoreleiScript0 + dw DisplayEnemyTrainerTextAndStartBattle + dw LoreleiScript2 + dw LoreleiScript3 + dw LoreleiScript4 + +LoreleiScript4: + ret + +LoreleiScriptWalkIntoRoom: +; Walk six steps upward. + ld hl, wSimulatedJoypadStatesEnd + ld a, D_UP + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld a, $6 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wLoreleisRoomCurScript], a + ld [wCurMapScript], a + ret + +LoreleiScript0: + ld hl, LoreleiEntranceCoords + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyPressed], a + ld [hJoyHeld], a + ld [wSimulatedJoypadStatesEnd], a + ld [wSimulatedJoypadStatesIndex], a + ld a, [wCoordIndex] + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving + CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM + jr z, LoreleiScriptWalkIntoRoom +.stopPlayerFromLeaving + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID ; "Don't run away!" + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wLoreleisRoomCurScript], a + ld [wCurMapScript], a + ret + +LoreleiEntranceCoords: + db $0A,$04 + db $0A,$05 + db $0B,$04 + db $0B,$05 + db $FF + +LoreleiScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wLoreleisRoomCurScript], a + ld [wCurMapScript], a + ret + +LoreleiScript2: + call EndTrainerBattle + ld a, [wIsInBattle] + cp $ff + jp z, ResetLoreleiScript + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +LoreleisRoom_TextPointers: + dw LoreleiText1 + dw LoreleiDontRunAwayText + +LoreleiTrainerHeader0: + dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 + dw LoreleiBeforeBattleText ; TextBeforeBattle + dw LoreleiAfterBattleText ; TextAfterBattle + dw LoreleiEndBattleText ; TextEndBattle + dw LoreleiEndBattleText ; TextEndBattle + + db $ff + +LoreleiText1: + TX_ASM + ld hl, LoreleiTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +LoreleiBeforeBattleText: + TX_FAR _LoreleiBeforeBattleText + db "@" + +LoreleiEndBattleText: + TX_FAR _LoreleiEndBattleText + db "@" + +LoreleiAfterBattleText: + TX_FAR _LoreleiAfterBattleText + db "@" + +LoreleiDontRunAwayText: + TX_FAR _LoreleiDontRunAwayText + db "@" diff --git a/scripts/MrFujisHouse.asm b/scripts/MrFujisHouse.asm new file mode 100755 index 00000000..98190cd8 --- /dev/null +++ b/scripts/MrFujisHouse.asm @@ -0,0 +1,112 @@ +MrFujisHouse_Script: + call EnableAutoTextBoxDrawing + ret + +MrFujisHouse_TextPointers: + dw LavenderHouse1Text1 + dw LavenderHouse1Text2 + dw LavenderHouse1Text3 + dw LavenderHouse1Text4 + dw LavenderHouse1Text5 + dw LavenderHouse1Text6 + +LavenderHouse1Text1: + TX_ASM + CheckEvent EVENT_RESCUED_MR_FUJI + jr nz, .asm_72e5d + ld hl, LavenderHouse1Text_1d8d1 + call PrintText + jr .asm_6957f +.asm_72e5d + ld hl, LavenderHouse1Text_1d8d6 + call PrintText +.asm_6957f + jp TextScriptEnd + +LavenderHouse1Text_1d8d1: + TX_FAR _LavenderHouse1Text_1d8d1 + db "@" + +LavenderHouse1Text_1d8d6: + TX_FAR _LavenderHouse1Text_1d8d6 + db "@" + +LavenderHouse1Text2: + TX_ASM + CheckEvent EVENT_RESCUED_MR_FUJI + jr nz, .asm_06470 + ld hl, LavenderHouse1Text_1d8f4 + call PrintText + jr .asm_3d208 +.asm_06470 + ld hl, LavenderHouse1Text_1d8f9 + call PrintText +.asm_3d208 + jp TextScriptEnd + +LavenderHouse1Text_1d8f4: + TX_FAR _LavenderHouse1Text_1d8f4 + db "@" + +LavenderHouse1Text_1d8f9: + TX_FAR _LavenderHouse1Text_1d8f9 + db "@" + +LavenderHouse1Text3: + TX_FAR _LavenderHouse1Text3 + TX_ASM + ld a, PSYDUCK + call PlayCry + jp TextScriptEnd + +LavenderHouse1Text4: + TX_FAR _LavenderHouse1Text4 + TX_ASM + ld a, NIDORINO + call PlayCry + jp TextScriptEnd + +LavenderHouse1Text5: + TX_ASM + CheckEvent EVENT_GOT_POKE_FLUTE + jr nz, .asm_15ac2 + ld hl, LavenderHouse1Text_1d94c + call PrintText + lb bc, POKE_FLUTE, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedFluteText + call PrintText + SetEvent EVENT_GOT_POKE_FLUTE + jr .asm_da749 +.BagFull + ld hl, FluteNoRoomText + call PrintText + jr .asm_da749 +.asm_15ac2 + ld hl, MrFujiAfterFluteText + call PrintText +.asm_da749 + jp TextScriptEnd + +LavenderHouse1Text_1d94c: + TX_FAR _LavenderHouse1Text_1d94c + db "@" + +ReceivedFluteText: + TX_FAR _ReceivedFluteText + TX_SFX_KEY_ITEM + TX_FAR _FluteExplanationText + db "@" + +FluteNoRoomText: + TX_FAR _FluteNoRoomText + db "@" + +MrFujiAfterFluteText: + TX_FAR _MrFujiAfterFluteText + db "@" + +LavenderHouse1Text6: + TX_FAR _LavenderHouse1Text6 + db "@" diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm new file mode 100755 index 00000000..7d4f54c0 --- /dev/null +++ b/scripts/MrPsychicsHouse.asm @@ -0,0 +1,45 @@ +MrPsychicsHouse_Script: + jp EnableAutoTextBoxDrawing + +MrPsychicsHouse_TextPointers: + dw SaffronHouse2Text1 + +SaffronHouse2Text1: + TX_ASM + CheckEvent EVENT_GOT_TM29 + jr nz, .asm_9e72b + ld hl, TM29PreReceiveText + call PrintText + lb bc, TM_29, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedTM29Text + call PrintText + SetEvent EVENT_GOT_TM29 + jr .asm_fe4e1 +.BagFull + ld hl, TM29NoRoomText + call PrintText + jr .asm_fe4e1 +.asm_9e72b + ld hl, TM29ExplanationText + call PrintText +.asm_fe4e1 + jp TextScriptEnd + +TM29PreReceiveText: + TX_FAR _TM29PreReceiveText + db "@" + +ReceivedTM29Text: + TX_FAR _ReceivedTM29Text + TX_SFX_ITEM_1 + db "@" + +TM29ExplanationText: + TX_FAR _TM29ExplanationText + db "@" + +TM29NoRoomText: + TX_FAR _TM29NoRoomText + db "@" diff --git a/scripts/MtMoon1F.asm b/scripts/MtMoon1F.asm new file mode 100755 index 00000000..b05b3f60 --- /dev/null +++ b/scripts/MtMoon1F.asm @@ -0,0 +1,224 @@ +MtMoon1F_Script: + call EnableAutoTextBoxDrawing + ld hl, MtMoon1TrainerHeader0 + ld de, MtMoon1F_ScriptPointers + ld a, [wMtMoon1FCurScript] + call ExecuteCurMapScriptInTable + ld [wMtMoon1FCurScript], a + ret + +MtMoon1F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +MtMoon1F_TextPointers: + dw MtMoon1Text1 + dw MtMoon1Text2 + dw MtMoon1Text3 + dw MtMoon1Text4 + dw MtMoon1Text5 + dw MtMoon1Text6 + dw MtMoon1Text7 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw MtMoon1Text14 + +MtMoon1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_0 + dw MtMoon1BattleText2 ; TextBeforeBattle + dw MtMoon1AfterBattleText2 ; TextAfterBattle + dw MtMoon1EndBattleText2 ; TextEndBattle + dw MtMoon1EndBattleText2 ; TextEndBattle + +MtMoon1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1 + dw MtMoon1BattleText3 ; TextBeforeBattle + dw MtMoon1AfterBattleText3 ; TextAfterBattle + dw MtMoon1EndBattleText3 ; TextEndBattle + dw MtMoon1EndBattleText3 ; TextEndBattle + +MtMoon1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 + dw MtMoon1BattleText4 ; TextBeforeBattle + dw MtMoon1AfterBattleText4 ; TextAfterBattle + dw MtMoon1EndBattleText4 ; TextEndBattle + dw MtMoon1EndBattleText4 ; TextEndBattle + +MtMoon1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 + dw MtMoon1BattleText5 ; TextBeforeBattle + dw MtMoon1AfterBattleText5 ; TextAfterBattle + dw MtMoon1EndBattleText5 ; TextEndBattle + dw MtMoon1EndBattleText5 ; TextEndBattle + +MtMoon1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 + dw MtMoon1BattleText6 ; TextBeforeBattle + dw MtMoon1AfterBattleText6 ; TextAfterBattle + dw MtMoon1EndBattleText6 ; TextEndBattle + dw MtMoon1EndBattleText6 ; TextEndBattle + +MtMoon1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 + dw MtMoon1BattleText7 ; TextBeforeBattle + dw MtMoon1AfterBattleText7 ; TextAfterBattle + dw MtMoon1EndBattleText7 ; TextEndBattle + dw MtMoon1EndBattleText7 ; TextEndBattle + +MtMoon1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 + dw MtMoon1BattleText8 ; TextBeforeBattle + dw MtMoon1AfterBattleText8 ; TextAfterBattle + dw MtMoon1EndBattleText8 ; TextEndBattle + dw MtMoon1EndBattleText8 ; TextEndBattle + + db $ff + +MtMoon1Text1: + TX_ASM + ld hl, MtMoon1TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1Text2: + TX_ASM + ld hl, MtMoon1TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1Text3: + TX_ASM + ld hl, MtMoon1TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1Text4: + TX_ASM + ld hl, MtMoon1TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1Text5: + TX_ASM + ld hl, MtMoon1TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1Text6: + TX_ASM + ld hl, MtMoon1TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1Text7: + TX_ASM + ld hl, MtMoon1TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +MtMoon1BattleText2: + TX_FAR _MtMoon1BattleText2 + db "@" + +MtMoon1EndBattleText2: + TX_FAR _MtMoon1EndBattleText2 + db "@" + +MtMoon1AfterBattleText2: + TX_FAR _MtMoon1AfterBattleText2 + db "@" + +MtMoon1BattleText3: + TX_FAR _MtMoon1BattleText3 + db "@" + +MtMoon1EndBattleText3: + TX_FAR _MtMoon1EndBattleText3 + db "@" + +MtMoon1AfterBattleText3: + TX_FAR _MtMoon1AfterBattleText3 + db "@" + +MtMoon1BattleText4: + TX_FAR _MtMoon1BattleText4 + db "@" + +MtMoon1EndBattleText4: + TX_FAR _MtMoon1EndBattleText4 + db "@" + +MtMoon1AfterBattleText4: + TX_FAR _MtMoon1AfterBattleText4 + db "@" + +MtMoon1BattleText5: + TX_FAR _MtMoon1BattleText5 + db "@" + +MtMoon1EndBattleText5: + TX_FAR _MtMoon1EndBattleText5 + db "@" + +MtMoon1AfterBattleText5: + TX_FAR _MtMoon1AfterBattleText5 + db "@" + +MtMoon1BattleText6: + TX_FAR _MtMoon1BattleText6 + db "@" + +MtMoon1EndBattleText6: + TX_FAR _MtMoon1EndBattleText6 + db "@" + +MtMoon1AfterBattleText6: + TX_FAR _MtMoon1AfterBattleText6 + db "@" + +MtMoon1BattleText7: + TX_FAR _MtMoon1BattleText7 + db "@" + +MtMoon1EndBattleText7: + TX_FAR _MtMoon1EndBattleText7 + db "@" + +MtMoon1AfterBattleText7: + TX_FAR _MtMoon1AfterBattleText7 + db "@" + +MtMoon1BattleText8: + TX_FAR _MtMoon1BattleText8 + db "@" + +MtMoon1EndBattleText8: + TX_FAR _MtMoon1EndBattleText8 + db "@" + +MtMoon1AfterBattleText8: + TX_FAR _MtMoon1AfterBattleText8 + db "@" + +MtMoon1Text14: + TX_FAR _MtMoon1Text14 + db "@" diff --git a/scripts/MtMoonB1F.asm b/scripts/MtMoonB1F.asm new file mode 100755 index 00000000..779812c3 --- /dev/null +++ b/scripts/MtMoonB1F.asm @@ -0,0 +1,10 @@ +MtMoonB1F_Script: + call EnableAutoTextBoxDrawing + ret + +MtMoonB1F_TextPointers: + dw MtMoonText1 + +MtMoonText1: + TX_FAR _MtMoonText1 + db "@" diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm new file mode 100755 index 00000000..863d9d22 --- /dev/null +++ b/scripts/MtMoonB2F.asm @@ -0,0 +1,406 @@ +MtMoonB2F_Script: + call EnableAutoTextBoxDrawing + ld hl, MtMoon3TrainerHeader0 + ld de, MtMoonB2F_ScriptPointers + ld a, [wMtMoonB2FCurScript] + call ExecuteCurMapScriptInTable + ld [wMtMoonB2FCurScript], a + CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD + ret z + ld hl, CoordsData_49d37 + call ArePlayerCoordsInArray + jr nc, .asm_49d31 + ld hl, wd72e + set 4, [hl] + ret +.asm_49d31 + ld hl, wd72e + res 4, [hl] + ret + +CoordsData_49d37: + db $05,$0B + db $05,$0C + db $05,$0D + db $05,$0E + db $06,$0B + db $06,$0C + db $06,$0D + db $06,$0E + db $07,$0B + db $07,$0C + db $07,$0D + db $07,$0E + db $08,$0B + db $08,$0C + db $08,$0D + db $08,$0E + db $FF + +MtMoon3Script_49d58: + xor a + ld [wJoyIgnore], a + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a + ret + +MtMoonB2F_ScriptPointers: + dw MtMoon3Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw MtMoon3Script3 + dw MtMoon3Script4 + dw MtMoon3Script5 + +MtMoon3Script0: + CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD + jp nz, MtMoon3Script_49d91 + ld a, [wYCoord] + cp $8 + jp nz, MtMoon3Script_49d91 + ld a, [wXCoord] + cp $d + jp nz, MtMoon3Script_49d91 + xor a + ld [hJoyHeld], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +MtMoon3Script_49d91: + CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL + jp z, CheckFightingMapTrainers + ret + +MtMoon3Script3: + ld a, [wIsInBattle] + cp $ff + jp z, MtMoon3Script_49d58 + call UpdateSprites + call Delay3 + SetEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a + ret + +MtMoon3Script4: + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld hl, CoordsData_49dea + call ArePlayerCoordsInArray + jr c, .asm_49dd7 + ld hl, CoordsData_49df1 + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + ld de, MovementData_49df9 + jr .asm_49dda +.asm_49dd7 + ld de, MovementData_49df8 +.asm_49dda + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $5 + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a + ret + +CoordsData_49dea: + db $07,$0C + db $06,$0B + db $05,$0C + db $FF + +CoordsData_49df1: + db $07,$0D + db $06,$0E + db $05,$0E + db $FF + +MovementData_49df8: + db NPC_MOVEMENT_RIGHT + +MovementData_49df9: + db NPC_MOVEMENT_UP,$FF + +MtMoon3Script5: + ld a, [wd730] + bit 0, a + ret nz + ld a, $f0 + ld [wJoyIgnore], a + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + CheckEvent EVENT_GOT_DOME_FOSSIL + jr z, .asm_49e1d + ld a, HS_MT_MOON_B2F_FOSSIL_2 + jr .asm_49e1f +.asm_49e1d + ld a, HS_MT_MOON_B2F_FOSSIL_1 +.asm_49e1f + ld [wMissableObjectIndex], a + predef HideObject + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a + ret + +MtMoonB2F_TextPointers: + dw MtMoon3Text1 + dw MtMoon3Text2 + dw MtMoon3Text3 + dw MtMoon3Text4 + dw MtMoon3Text5 + dw MtMoon3Text6 + dw MtMoon3Text7 + dw PickUpItemText + dw PickUpItemText + dw MtMoon3Text_49f99 + +MtMoon3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_0 + dw MtMoon3BattleText2 ; TextBeforeBattle + dw MtMoon3AfterBattleText2 ; TextAfterBattle + dw MtMoon3EndBattleText2 ; TextEndBattle + dw MtMoon3EndBattleText2 ; TextEndBattle + +MtMoon3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1 + dw MtMoon3BattleText3 ; TextBeforeBattle + dw MtMoon3AfterBattleText3 ; TextAfterBattle + dw MtMoon3EndBattleText3 ; TextEndBattle + dw MtMoon3EndBattleText3 ; TextEndBattle + +MtMoon3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 + dw MtMoon3BattleText4 ; TextBeforeBattle + dw MtMoon3AfterBattleText4 ; TextAfterBattle + dw MtMoon3EndBattleText4 ; TextEndBattle + dw MtMoon3EndBattleText4 ; TextEndBattle + +MtMoon3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 + dw MtMoon3BattleText5 ; TextBeforeBattle + dw MtMoon3AfterBattleText5 ; TextAfterBattle + dw MtMoon3EndBattleText5 ; TextEndBattle + dw MtMoon3EndBattleText5 ; TextEndBattle + + db $ff + +MtMoon3Text1: + TX_ASM + CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD + jr z, .asm_49e8d + and $c0 + jr nz, .asm_49eb8 + ld hl, MtMoon3Text_49f8f + call PrintText + jr .asm_49ebe +.asm_49e8d + ld hl, MtMoon3Text_49f85 + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, MtMoon3Text_49f8a + ld de, MtMoon3Text_49f8a + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $3 + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a + jr .asm_49ebe +.asm_49eb8 + ld hl, MtMoon3Text_49f94 + call PrintText +.asm_49ebe + jp TextScriptEnd + +MtMoon3Text2: + TX_ASM + ld hl, MtMoon3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +MtMoon3Text3: + TX_ASM + ld hl, MtMoon3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +MtMoon3Text4: + TX_ASM + ld hl, MtMoon3TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +MtMoon3Text5: + TX_ASM + ld hl, MtMoon3TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +MtMoon3Text6: + TX_ASM + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, MtMoon3Text_49f24 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_49f21 + lb bc, DOME_FOSSIL, 1 + call GiveItem + jp nc, MtMoon3Script_49f76 + call MtMoon3Script_49f69 + ld a, HS_MT_MOON_B2F_FOSSIL_1 + ld [wMissableObjectIndex], a + predef HideObject + SetEvent EVENT_GOT_DOME_FOSSIL + ld a, $4 + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a +.asm_49f21 + jp TextScriptEnd + +MtMoon3Text_49f24: + TX_FAR _MtMoon3Text_49f24 + db "@" + +MtMoon3Text7: + TX_ASM + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, MtMoon3Text_49f64 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_49f61 + lb bc, HELIX_FOSSIL, 1 + call GiveItem + jp nc, MtMoon3Script_49f76 + call MtMoon3Script_49f69 + ld a, HS_MT_MOON_B2F_FOSSIL_2 + ld [wMissableObjectIndex], a + predef HideObject + SetEvent EVENT_GOT_HELIX_FOSSIL + ld a, $4 + ld [wMtMoonB2FCurScript], a + ld [wCurMapScript], a +.asm_49f61 + jp TextScriptEnd + +MtMoon3Text_49f64: + TX_FAR _MtMoon3Text_49f64 + db "@" + +MtMoon3Script_49f69: + ld hl, MtMoon3Text_49f6f + jp PrintText + +MtMoon3Text_49f6f: + TX_FAR _MtMoon3Text_49f6f + TX_SFX_KEY_ITEM + TX_WAIT + db "@" + +MtMoon3Script_49f76: + ld hl, MtMoon3Text_49f7f + call PrintText + jp TextScriptEnd + +MtMoon3Text_49f7f: + TX_FAR _MtMoon3Text_49f7f + TX_WAIT + db "@" + +MtMoon3Text_49f85: + TX_FAR _MtMoon3Text_49f85 + db "@" + +MtMoon3Text_49f8a: + TX_FAR _MtMoon3Text_49f8a + db "@" + +MtMoon3Text_49f8f: + TX_FAR _MtMoon3Text_49f8f + db "@" + +MtMoon3Text_49f94: + TX_FAR _MtMoon3Text_49f94 + db "@" + +MtMoon3Text_49f99: + TX_FAR _MtMoon3Text_49f99 + TX_SFX_KEY_ITEM + db "@" + +MtMoon3BattleText2: + TX_FAR _MtMoon3BattleText2 + db "@" + +MtMoon3EndBattleText2: + TX_FAR _MtMoon3EndBattleText2 + db "@" + +MtMoon3AfterBattleText2: + TX_FAR _MtMoon3AfterBattleText2 + db "@" + +MtMoon3BattleText3: + TX_FAR _MtMoon3BattleText3 + db "@" + +MtMoon3EndBattleText3: + TX_FAR _MtMoon3EndBattleText3 + db "@" + +MtMoon3AfterBattleText3: + TX_FAR _MtMoon3AfterBattleText3 + db "@" + +MtMoon3BattleText4: + TX_FAR _MtMoon3BattleText4 + db "@" + +MtMoon3EndBattleText4: + TX_FAR _MtMoon3EndBattleText4 + db "@" + +MtMoon3AfterBattleText4: + TX_FAR _MtMoon3AfterBattleText4 + db "@" + +MtMoon3BattleText5: + TX_FAR _MtMoon3BattleText5 + db "@" + +MtMoon3EndBattleText5: + TX_FAR _MtMoon3EndBattleText5 + db "@" + +MtMoon3AfterBattleText5: + TX_FAR _MtMoon3AfterBattleText5 + db "@" diff --git a/scripts/MtMoonPokecenter.asm b/scripts/MtMoonPokecenter.asm new file mode 100755 index 00000000..969031db --- /dev/null +++ b/scripts/MtMoonPokecenter.asm @@ -0,0 +1,94 @@ +MtMoonPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +MtMoonPokecenter_TextPointers: + dw MtMoonHealNurseText + dw MtMoonPokecenterText2 + dw MtMoonPokecenterText3 + dw MagikarpSalesmanText + dw MtMoonPokecenterText5 + dw MtMoonTradeNurseText + +MtMoonHealNurseText: + db $ff + +MtMoonPokecenterText2: + TX_FAR _MtMoonPokecenterText1 + db "@" + +MtMoonPokecenterText3: + TX_FAR _MtMoonPokecenterText3 + db "@" + +MagikarpSalesmanText: + TX_ASM + CheckEvent EVENT_BOUGHT_MAGIKARP, 1 + jp c, .alreadyBoughtMagikarp + ld hl, .Text1 + call PrintText + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jp nz, .choseNo + ld [hMoney], a + ld [hMoney + 2], a + ld a, $5 + ld [hMoney + 1], a + call HasEnoughMoney + jr nc, .enoughMoney + ld hl, .NoMoneyText + jr .printText +.enoughMoney + lb bc, MAGIKARP, 5 + call GivePokemon + jr nc, .done + xor a + ld [wPriceTemp], a + ld [wPriceTemp + 2], a + ld a, $5 + ld [wPriceTemp + 1], a + ld hl, wPriceTemp + 2 + ld de, wPlayerMoney + 2 + ld c, $3 + predef SubBCDPredef + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + SetEvent EVENT_BOUGHT_MAGIKARP + jr .done +.choseNo + ld hl, .RefuseText + jr .printText +.alreadyBoughtMagikarp + ld hl, .Text2 +.printText + call PrintText +.done + jp TextScriptEnd + +.Text1 + TX_FAR _MagikarpSalesmanText1 + db "@" + +.RefuseText + TX_FAR _MagikarpSalesmanNoText + db "@" + +.NoMoneyText + TX_FAR _MagikarpSalesmanNoMoneyText + db "@" + +.Text2 + TX_FAR _MagikarpSalesmanText2 + db "@" + +MtMoonPokecenterText5: + TX_FAR _MtMoonPokecenterText5 + db "@" + +MtMoonTradeNurseText: + db $f6 diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm new file mode 100755 index 00000000..712f1fc4 --- /dev/null +++ b/scripts/Museum1F.asm @@ -0,0 +1,247 @@ +Museum1F_Script: + ld a, $1 + ld [wAutoTextBoxDrawingControl], a + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, Museum1F_ScriptPointers + ld a, [wMuseum1FCurScript] + jp CallFunctionInTable + +Museum1F_ScriptPointers: + dw Museum1FScript0 + dw Museum1FScript1 + +Museum1FScript0: + ld a, [wYCoord] + cp $4 + ret nz + ld a, [wXCoord] + cp $9 + jr z, .asm_5c120 + ld a, [wXCoord] + cp $a + ret nz +.asm_5c120 + xor a + ld [hJoyHeld], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +Museum1FScript1: + ret + +Museum1F_TextPointers: + dw Museum1FText1 + dw Museum1FText2 + dw Museum1FText3 + dw Museum1FText4 + dw Museum1FText5 + +Museum1FText1: + TX_ASM + ld a, [wYCoord] + cp $4 + jr nz, .asm_8774b + ld a, [wXCoord] + cp $d + jp z, Museum1FScript_5c1f9 + jr .asm_b8709 +.asm_8774b + cp $3 + jr nz, .asm_d49e7 + ld a, [wXCoord] + cp $c + jp z, Museum1FScript_5c1f9 +.asm_d49e7 + CheckEvent EVENT_BOUGHT_MUSEUM_TICKET + jr nz, .asm_31a16 + ld hl, Museum1FText_5c23d + call PrintText + jp Museum1FScriptEnd +.asm_b8709 + CheckEvent EVENT_BOUGHT_MUSEUM_TICKET + jr z, .asm_3ded4 +.asm_31a16 + ld hl, Museum1FText_5c242 + call PrintText + jp Museum1FScriptEnd +.asm_3ded4 + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + xor a + ld [hJoyHeld], a + ld hl, Museum1FText_5c21f + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_de133 + xor a + ld [hMoney], a + ld [hMoney + 1], a + ld a, $50 + ld [hMoney + 2], a + call HasEnoughMoney + jr nc, .asm_0f3e3 + ld hl, Museum1FText_5c229 + call PrintText + jp .asm_de133 +.asm_0f3e3 + ld hl, Museum1FText_5c224 + call PrintText + SetEvent EVENT_BOUGHT_MUSEUM_TICKET + xor a + ld [wPriceTemp], a + ld [wPriceTemp + 1], a + ld a, $50 + ld [wPriceTemp + 2], a + ld hl, wPriceTemp + 2 + ld de, wPlayerMoney + 2 + ld c, $3 + predef SubBCDPredef + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + ld a, SFX_PURCHASE + call PlaySoundWaitForCurrent + call WaitForSoundToFinish + jr .asm_0b094 +.asm_de133 + ld hl, Museum1FText_5c21a + call PrintText + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + call UpdateSprites + jr Museum1FScriptEnd +.asm_0b094 + ld a, $1 + ld [wMuseum1FCurScript], a + jr Museum1FScriptEnd + +Museum1FScript_5c1f9: + ld hl, Museum1FText_5c22e + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + cp $0 + jr nz, .asm_d1144 + ld hl, Museum1FText_5c233 + call PrintText + jr Museum1FScriptEnd +.asm_d1144 + ld hl, Museum1FText_5c238 + call PrintText +Museum1FScriptEnd: + jp TextScriptEnd + +Museum1FText_5c21a: + TX_FAR _Museum1FText_5c21a + db "@" + +Museum1FText_5c21f: + TX_FAR _Museum1FText_5c21f + db "@" + +Museum1FText_5c224: + TX_FAR _Museum1FText_5c224 + db "@" + +Museum1FText_5c229: + TX_FAR _Museum1FText_5c229 + db "@" + +Museum1FText_5c22e: + TX_FAR _Museum1FText_5c22e + db "@" + +Museum1FText_5c233: + TX_FAR _Museum1FText_5c233 + db "@" + +Museum1FText_5c238: + TX_FAR _Museum1FText_5c238 + db "@" + +Museum1FText_5c23d: + TX_FAR _Museum1FText_5c23d + db "@" + +Museum1FText_5c242: + TX_FAR _Museum1FText_5c242 + db "@" + +Museum1FText2: + TX_ASM + ld hl, Museum1FText_5c251 + call PrintText + jp TextScriptEnd + +Museum1FText_5c251: + TX_FAR _Museum1FText_5c251 + db "@" + +Museum1FText3: + TX_ASM + CheckEvent EVENT_GOT_OLD_AMBER + jr nz, .asm_5c285 + ld hl, Museum1FText_5c28e + call PrintText + lb bc, OLD_AMBER, 1 + call GiveItem + jr nc, .BagFull + SetEvent EVENT_GOT_OLD_AMBER + ld a, HS_OLD_AMBER + ld [wMissableObjectIndex], a + predef HideObject + ld hl, ReceivedOldAmberText + jr .asm_5c288 +.BagFull + ld hl, Museum1FText_5c29e + jr .asm_5c288 +.asm_5c285 + ld hl, Museum1FText_5c299 +.asm_5c288 + call PrintText + jp TextScriptEnd + +Museum1FText_5c28e: + TX_FAR _Museum1FText_5c28e + db "@" + +ReceivedOldAmberText: + TX_FAR _ReceivedOldAmberText + TX_SFX_ITEM_1 + db "@" + +Museum1FText_5c299: + TX_FAR _Museum1FText_5c299 + db "@" + +Museum1FText_5c29e: + TX_FAR _Museum1FText_5c29e + db "@" + +Museum1FText4: + TX_ASM + ld hl, Museum1FText_5c2ad + call PrintText + jp TextScriptEnd + +Museum1FText_5c2ad: + TX_FAR _Museum1FText_5c2ad + db "@" + +Museum1FText5: + TX_ASM + ld hl, Museum1FText_5c2bc + call PrintText + jp TextScriptEnd + +Museum1FText_5c2bc: + TX_FAR _Museum1FText_5c2bc + db "@" diff --git a/scripts/Museum2F.asm b/scripts/Museum2F.asm new file mode 100755 index 00000000..ce4d3d81 --- /dev/null +++ b/scripts/Museum2F.asm @@ -0,0 +1,39 @@ +Museum2F_Script: + jp EnableAutoTextBoxDrawing + +Museum2F_TextPointers: + dw Museum2FText1 + dw Museum2FText2 + dw Museum2FText3 + dw Museum2FText4 + dw Museum2FText5 + dw Museum2FText6 + dw Museum2FText7 + +Museum2FText1: + TX_FAR _Museum2FText1 + db "@" + +Museum2FText2: + TX_FAR _Museum2FText2 + db "@" + +Museum2FText3: + TX_FAR _Museum2FText3 + db "@" + +Museum2FText4: + TX_FAR _Museum2FText4 + db "@" + +Museum2FText5: + TX_FAR _Museum2FText5 + db "@" + +Museum2FText6: + TX_FAR _Museum2FText6 + db "@" + +Museum2FText7: + TX_FAR _Museum2FText7 + db "@" diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm new file mode 100755 index 00000000..323cb360 --- /dev/null +++ b/scripts/NameRatersHouse.asm @@ -0,0 +1,107 @@ +NameRatersHouse_Script: + jp EnableAutoTextBoxDrawing + +NameRaterScript_1da15: + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ret + +NameRaterScript_1da20: + ld hl, wPartyMonOT + ld bc, NAME_LENGTH + ld a, [wWhichPokemon] + call AddNTimes + ld de, wPlayerName + ld c, NAME_LENGTH + call .asm_1da47 + jr c, .asm_1da52 + ld hl, wPartyMon1OTID + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wWhichPokemon] + call AddNTimes + ld de, wPlayerID + ld c, $2 +.asm_1da47 + ld a, [de] + cp [hl] + jr nz, .asm_1da52 + inc hl + inc de + dec c + jr nz, .asm_1da47 + and a + ret +.asm_1da52 + scf + ret + +NameRatersHouse_TextPointers: + dw NameRaterText1 + +NameRaterText1: + TX_ASM + call SaveScreenTilesToBuffer2 + ld hl, NameRaterText_1dab3 + call NameRaterScript_1da15 + jr nz, .asm_1daae + ld hl, NameRaterText_1dab8 + call PrintText + xor a + ld [wPartyMenuTypeOrMessageID], a + ld [wUpdateSpritesEnabled], a + ld [wMenuItemToSwap], a + call DisplayPartyMenu + push af + call GBPalWhiteOutWithDelay3 + call RestoreScreenTilesAndReloadTilePatterns + call LoadGBPal + pop af + jr c, .asm_1daae + call GetPartyMonName2 + call NameRaterScript_1da20 + ld hl, NameRaterText_1dad1 + jr c, .asm_1daa8 + ld hl, NameRaterText_1dabd + call NameRaterScript_1da15 + jr nz, .asm_1daae + ld hl, NameRaterText_1dac2 + call PrintText + callba DisplayNameRaterScreen + jr c, .asm_1daae + ld hl, NameRaterText_1dac7 +.asm_1daa8 + call PrintText + jp TextScriptEnd +.asm_1daae + ld hl, NameRaterText_1dacc + jr .asm_1daa8 + +NameRaterText_1dab3: + TX_FAR _NameRaterText_1dab3 + db "@" + +NameRaterText_1dab8: + TX_FAR _NameRaterText_1dab8 + db "@" + +NameRaterText_1dabd: + TX_FAR _NameRaterText_1dabd + db "@" + +NameRaterText_1dac2: + TX_FAR _NameRaterText_1dac2 + db "@" + +NameRaterText_1dac7: + TX_FAR _NameRaterText_1dac7 + db "@" + +NameRaterText_1dacc: + TX_FAR _NameRaterText_1dacc + db "@" + +NameRaterText_1dad1: + TX_FAR _NameRaterText_1dad1 + db "@" diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm new file mode 100755 index 00000000..364b157b --- /dev/null +++ b/scripts/OaksLab.asm @@ -0,0 +1,1233 @@ +OaksLab_Script: + CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 + call nz, OaksLabScript_1d076 + ld a, $1 + ld [wAutoTextBoxDrawingControl], a + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, OaksLab_ScriptPointers + ld a, [wOaksLabCurScript] + jp CallFunctionInTable + +OaksLab_ScriptPointers: + dw OaksLabScript0 + dw OaksLabScript1 + dw OaksLabScript2 + dw OaksLabScript3 + dw OaksLabScript4 + dw OaksLabScript5 + dw OaksLabScript6 + dw OaksLabScript7 + dw OaksLabScript8 + dw OaksLabScript9 + dw OaksLabScript10 + dw OaksLabScript11 + dw OaksLabScript12 + dw OaksLabScript13 + dw OaksLabScript14 + dw OaksLabScript15 + dw OaksLabScript16 + dw OaksLabScript17 + dw OaksLabScript18 + +OaksLabScript0: + CheckEvent EVENT_OAK_APPEARED_IN_PALLET + ret z + ld a, [wNPCMovementScriptFunctionNum] + and a + ret nz + ld a, HS_OAKS_LAB_OAK_2 + ld [wMissableObjectIndex], a + predef ShowObject + ld hl, wd72e + res 4, [hl] + + ld a, $1 + ld [wOaksLabCurScript], a + ret + +OaksLabScript1: + ld a, $8 + ld [H_SPRITEINDEX], a + ld de, OakEntryMovement + call MoveSprite + + ld a, $2 + ld [wOaksLabCurScript], a + ret + +OakEntryMovement: + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db $FF + +OaksLabScript2: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_OAKS_LAB_OAK_2 + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_OAKS_LAB_OAK_1 + ld [wMissableObjectIndex], a + predef ShowObject + + ld a, $3 + ld [wOaksLabCurScript], a + ret + +OaksLabScript3: + call Delay3 + ld hl, wSimulatedJoypadStatesEnd + ld de, PlayerEntryMovementRLE + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $1 + ld [H_SPRITEINDEX], a + xor a + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $5 + ld [H_SPRITEINDEX], a + xor a + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + + ld a, $4 + ld [wOaksLabCurScript], a + ret + +PlayerEntryMovementRLE: + db D_UP,$8 + db $ff + +OaksLabScript4: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + SetEvent EVENT_FOLLOWED_OAK_INTO_LAB + SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + call UpdateSprites + ld hl, wFlags_D733 + res 1, [hl] + call PlayDefaultMusic + + ld a, $5 + ld [wOaksLabCurScript], a + ret + +OaksLabScript5: + ld a, $fc + ld [wJoyIgnore], a + ld a, $11 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld a, $12 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld a, $13 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld a, $14 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON + xor a + ld [wJoyIgnore], a + + ld a, $6 + ld [wOaksLabCurScript], a + ret + +OaksLabScript6: + ld a, [wYCoord] + cp $6 + ret nz + ld a, $5 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $1 + ld [H_SPRITEINDEX], a + xor a + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + call UpdateSprites + ld a, $c + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + + ld a, $7 + ld [wOaksLabCurScript], a + ret + +OaksLabScript7: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + + ld a, $6 + ld [wOaksLabCurScript], a + ret + +OaksLabScript8: + ld a, [wPlayerStarter] + cp STARTER1 + jr z, .Charmander + cp STARTER2 + jr z, .Squirtle + jr .Bulbasaur +.Charmander + ld de, .MiddleBallMovement1 + ld a, [wYCoord] + cp $4 ; is the player standing below the table? + jr z, .asm_1ccf3 + ld de, .MiddleBallMovement2 + jr .asm_1ccf3 + +.MiddleBallMovement1 + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_UP + db $FF + +.MiddleBallMovement2 + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +.Squirtle + ld de, .RightBallMovement1 + ld a, [wYCoord] + cp $4 ; is the player standing below the table? + jr z, .asm_1ccf3 + ld de, .RightBallMovement2 + jr .asm_1ccf3 + +.RightBallMovement1 + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_UP + db $FF + +.RightBallMovement2 + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +.Bulbasaur + ld de, .LeftBallMovement1 + ld a, [wXCoord] + cp $9 ; is the player standing to the right of the table? + jr nz, .asm_1ccf3 + push hl + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, $4 + ld [H_SPRITEDATAOFFSET], a + call GetPointerWithinSpriteStateData1 + push hl + ld [hl], $4c + inc hl + inc hl + ld [hl], $0 + pop hl + inc h + ld [hl], $8 + inc hl + ld [hl], $9 + ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that + pop hl + jr .asm_1ccf3 + +.LeftBallMovement1 + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT ; not yet terminated! +.LeftBallMovement2 + db NPC_MOVEMENT_RIGHT + db $FF + +.asm_1ccf3 + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + + ld a, $9 + ld [wOaksLabCurScript], a + ret + +OaksLabScript9: + ld a, [wd730] + bit 0, a + ret nz + ld a, $fc + ld [wJoyIgnore], a + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, [wRivalStarterBallSpriteIndex] + cp $2 + jr nz, .asm_1cd28 + ld a, HS_STARTER_BALL_1 + jr .asm_1cd32 +.asm_1cd28 + cp $3 + jr nz, .asm_1cd30 + ld a, HS_STARTER_BALL_2 + jr .asm_1cd32 +.asm_1cd30 + ld a, HS_STARTER_BALL_3 +.asm_1cd32 + ld [wMissableObjectIndex], a + predef HideObject + call Delay3 + ld a, [wRivalStarterTemp] + ld [wRivalStarter], a + ld [wcf91], a + ld [wd11e], a + call GetMonName + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $e + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_STARTER + xor a + ld [wJoyIgnore], a + + ld a, $a + ld [wOaksLabCurScript], a + ret + +OaksLabScript10: + ld a, [wYCoord] + cp $6 + ret nz + ld a, $1 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ld a, $f + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $1 + ld [hNPCPlayerRelativePosPerspective], a + ld a, $1 + swap a + ld [hNPCSpriteOffset], a + predef CalcPositionOfPlayerRelativeToNPC + ld a, [hNPCPlayerYDistance] + dec a + ld [hNPCPlayerYDistance], a + predef FindPathToPlayer + ld de, wNPCMovementDirections2 + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + + ld a, $b + ld [wOaksLabCurScript], a + ret + +OaksLabScript11: + ld a, [wd730] + bit 0, a + ret nz + + ; define which team rival uses, and fight it + ld a, OPP_SONY1 + ld [wCurOpponent], a + ld a, [wRivalStarter] + cp STARTER2 + jr nz, .NotSquirtle + ld a, $1 + jr .done +.NotSquirtle + cp STARTER3 + jr nz, .Charmander + ld a, $2 + jr .done +.Charmander + ld a, $3 +.done + ld [wTrainerNo], a + ld a, $1 + ld [wSpriteIndex], a + call GetSpritePosition1 + ld hl, OaksLabText_1d3be + ld de, OaksLabText_1d3c3 + call SaveEndBattleTextPointers + ld hl, wd72d + set 6, [hl] + set 7, [hl] + xor a + ld [wJoyIgnore], a + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + ld a, $c + ld [wOaksLabCurScript], a + ret + +OaksLabScript12: + ld a, $f0 + ld [wJoyIgnore], a + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + call UpdateSprites + ld a, $1 + ld [wSpriteIndex], a + call SetSpritePosition1 + ld a, $1 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + predef HealParty + SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB + + ld a, $d + ld [wOaksLabCurScript], a + ret + +OaksLabScript13: + ld c, 20 + call DelayFrames + ld a, $10 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + callba Music_RivalAlternateStart + ld a, $1 + ld [H_SPRITEINDEX], a + ld de, .RivalExitMovement + call MoveSprite + ld a, [wXCoord] + cp $4 + ; move left or right depending on where the player is standing + jr nz, .moveLeft + ld a, NPC_MOVEMENT_RIGHT + jr .next +.moveLeft + ld a, NPC_MOVEMENT_LEFT +.next + ld [wNPCMovementDirections], a + + ld a, $e + ld [wOaksLabCurScript], a + ret + +.RivalExitMovement + db $E0 ; change sprite facing direction + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +OaksLabScript14: + ld a, [wd730] + bit 0, a + jr nz, .asm_1ce8c + ld a, HS_OAKS_LAB_RIVAL + ld [wMissableObjectIndex], a + predef HideObject + xor a + ld [wJoyIgnore], a + call PlayDefaultMusic ; reset to map music + ld a, $12 + ld [wOaksLabCurScript], a + jr .done +; make the player keep facing the rival as he walks away +.asm_1ce8c + ld a, [wNPCNumScriptedSteps] + cp $5 + jr nz, .asm_1cea8 + ld a, [wXCoord] + cp $4 + jr nz, .asm_1cea1 + ld a, SPRITE_FACING_RIGHT + ld [wSpriteStateData1 + 9], a + jr .done +.asm_1cea1 + ld a, SPRITE_FACING_LEFT + ld [wSpriteStateData1 + 9], a + jr .done +.asm_1cea8 + cp $4 + ret nz + xor a ; ld a, SPRITE_FACING_DOWN + ld [wSpriteStateData1 + 9], a +.done + ret + +OaksLabScript15: + xor a + ld [hJoyHeld], a + call EnableAutoTextBoxDrawing + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld a, $15 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call OaksLabScript_1d02b + ld a, HS_OAKS_LAB_RIVAL + ld [wMissableObjectIndex], a + predef ShowObject + ld a, [wNPCMovementDirections2Index] + ld [wSavedNPCMovementDirections2Index], a + ld b, 0 + ld c, a + ld hl, wNPCMovementDirections2 + ld a, NPC_MOVEMENT_UP + call FillMemory + ld [hl], $ff + ld a, $1 + ld [H_SPRITEINDEX], a + ld de, wNPCMovementDirections2 + call MoveSprite + + ld a, $10 + ld [wOaksLabCurScript], a + ret + +OaksLabScript_1cefd: + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $8 + ld [H_SPRITEINDEX], a + xor a ; SPRITE_FACING_DOWN + ld [hSpriteFacingDirection], a + jp SetSpriteFacingDirectionAndDelay + +OaksLabScript16: + ld a, [wd730] + bit 0, a + ret nz + call EnableAutoTextBoxDrawing + call PlayDefaultMusic + ld a, $fc + ld [wJoyIgnore], a + call OaksLabScript_1cefd + ld a, $16 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call DelayFrame + call OaksLabScript_1cefd + ld a, $17 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call DelayFrame + call OaksLabScript_1cefd + ld a, $18 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call DelayFrame + ld a, $19 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld a, HS_POKEDEX_1 + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_POKEDEX_2 + ld [wMissableObjectIndex], a + predef HideObject + call OaksLabScript_1cefd + ld a, $1a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_RIGHT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + call Delay3 + ld a, $1b + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_POKEDEX + SetEvent EVENT_OAK_GOT_PARCEL + ld a, HS_LYING_OLD_MAN + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_OLD_MAN + ld [wMissableObjectIndex], a + predef ShowObject + ld a, [wSavedNPCMovementDirections2Index] + ld b, 0 + ld c, a + ld hl, wNPCMovementDirections2 + xor a ; NPC_MOVEMENT_DOWN + call FillMemory + ld [hl], $ff + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld a, $1 + ld [H_SPRITEINDEX], a + ld de, wNPCMovementDirections2 + call MoveSprite + + ld a, $11 + ld [wOaksLabCurScript], a + ret + +OaksLabScript17: + ld a, [wd730] + bit 0, a + ret nz + call PlayDefaultMusic + ld a, HS_OAKS_LAB_RIVAL + ld [wMissableObjectIndex], a + predef HideObject + SetEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE + ResetEventReuseHL EVENT_2ND_ROUTE22_RIVAL_BATTLE + SetEventReuseHL EVENT_ROUTE22_RIVAL_WANTS_BATTLE + ld a, HS_ROUTE_22_RIVAL_1 + ld [wMissableObjectIndex], a + predef ShowObject + ld a, $5 + ld [wPalletTownCurScript], a + xor a + ld [wJoyIgnore], a + + ld a, $12 + ld [wOaksLabCurScript], a + ret + +OaksLabScript18: + ret + +OaksLabScript_RemoveParcel: + ld hl, wBagItems + ld bc, $0000 +.loop + ld a, [hli] + cp $ff + ret z + cp OAKS_PARCEL + jr z, .foundParcel + inc hl + inc c + jr .loop +.foundParcel + ld hl, wNumBagItems + ld a, c + ld [wWhichPokemon], a + ld a, $1 + ld [wItemQuantity], a + jp RemoveItemFromInventory + +OaksLabScript_1d02b: + ld a, $7c + ld [$ffeb], a + ld a, $8 + ld [$ffee], a + ld a, [wYCoord] + cp $3 + jr nz, .asm_1d045 + ld a, $4 + ld [wNPCMovementDirections2Index], a + ld a, $30 + ld b, $b + jr .asm_1d068 +.asm_1d045 + cp $1 + jr nz, .asm_1d054 + ld a, $2 + ld [wNPCMovementDirections2Index], a + ld a, $30 + ld b, $9 + jr .asm_1d068 +.asm_1d054 + ld a, $3 + ld [wNPCMovementDirections2Index], a + ld b, $a + ld a, [wXCoord] + cp $4 + jr nz, .asm_1d066 + ld a, $40 + jr .asm_1d068 +.asm_1d066 + ld a, $20 +.asm_1d068 + ld [$ffec], a + ld a, b + ld [$ffed], a + ld a, $1 + ld [wSpriteIndex], a + call SetSpritePosition1 + ret + +OaksLabScript_1d076: + ld hl, OaksLab_TextPointers2 + ld a, l + ld [wMapTextPtr], a + ld a, h + ld [wMapTextPtr+1], a + ret + +OaksLab_TextPointers: + dw OaksLabText1 + dw OaksLabText2 + dw OaksLabText3 + dw OaksLabText4 + dw OaksLabText5 + dw OaksLabText6 + dw OaksLabText7 + dw OaksLabText8 + dw OaksLabText9 + dw OaksLabText10 + dw OaksLabText11 + dw OaksLabText12 + dw OaksLabText13 + dw OaksLabText14 + dw OaksLabText15 + dw OaksLabText16 + dw OaksLabText17 + dw OaksLabText18 + dw OaksLabText19 + dw OaksLabText20 + dw OaksLabText21 + dw OaksLabText22 + dw OaksLabText23 + dw OaksLabText24 + dw OaksLabText25 + dw OaksLabText26 + dw OaksLabText27 + +OaksLab_TextPointers2: + dw OaksLabText1 + dw OaksLabText2 + dw OaksLabText3 + dw OaksLabText4 + dw OaksLabText5 + dw OaksLabText6 + dw OaksLabText7 + dw OaksLabText8 + dw OaksLabText9 + dw OaksLabText10 + dw OaksLabText11 + +OaksLabText1: + TX_ASM + CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 + jr nz, .asm_1d0de + ld hl, OaksLabGaryText1 + call PrintText + jr .asm_1d0f0 +.asm_1d0de + bit 2, a + jr nz, .asm_1d0ea + ld hl, OaksLabText40 + call PrintText + jr .asm_1d0f0 +.asm_1d0ea + ld hl, OaksLabText41 + call PrintText +.asm_1d0f0 + jp TextScriptEnd + +OaksLabGaryText1: + TX_FAR _OaksLabGaryText1 + db "@" + +OaksLabText40: + TX_FAR _OaksLabText40 + db "@" + +OaksLabText41: + TX_FAR _OaksLabText41 + db "@" + +OaksLabText2: + TX_ASM + ld a, STARTER2 + ld [wRivalStarterTemp], a + ld a, $3 + ld [wRivalStarterBallSpriteIndex], a + ld a, STARTER1 + ld b, $2 + jr OaksLabScript_1d133 + +OaksLabText3: + TX_ASM + ld a, STARTER3 + ld [wRivalStarterTemp], a + ld a, $4 + ld [wRivalStarterBallSpriteIndex], a + ld a, STARTER2 + ld b, $3 + jr OaksLabScript_1d133 + +OaksLabText4: + TX_ASM + ld a, STARTER1 + ld [wRivalStarterTemp], a + ld a, $2 + ld [wRivalStarterBallSpriteIndex], a + ld a, STARTER3 + ld b, $4 + +OaksLabScript_1d133: + ld [wcf91], a + ld [wd11e], a + ld a, b + ld [wSpriteIndex], a + CheckEvent EVENT_GOT_STARTER + jp nz, OaksLabScript_1d22d + CheckEventReuseA EVENT_OAK_ASKED_TO_CHOOSE_MON + jr nz, OaksLabScript_1d157 + ld hl, OaksLabText39 + call PrintText + jp TextScriptEnd + +OaksLabText39: + TX_FAR _OaksLabText39 + db "@" + +OaksLabScript_1d157: + ld a, $5 + ld [H_SPRITEINDEX], a + ld a, $9 + ld [H_SPRITEDATAOFFSET], a + call GetPointerWithinSpriteStateData1 + ld [hl], SPRITE_FACING_DOWN + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, $9 + ld [H_SPRITEDATAOFFSET], a + call GetPointerWithinSpriteStateData1 + ld [hl], SPRITE_FACING_RIGHT + ld hl, wd730 + set 6, [hl] + predef StarterDex + ld hl, wd730 + res 6, [hl] + call ReloadMapData + ld c, 10 + call DelayFrames + ld a, [wSpriteIndex] + cp $2 + jr z, OaksLabLookAtCharmander + cp $3 + jr z, OaksLabLookAtSquirtle + jr OaksLabLookAtBulbasaur + +OaksLabLookAtCharmander: + ld hl, OaksLabCharmanderText + jr OaksLabMonChoiceMenu +OaksLabCharmanderText: + TX_FAR _OaksLabCharmanderText + db "@" + +OaksLabLookAtSquirtle: + ld hl, OaksLabSquirtleText + jr OaksLabMonChoiceMenu +OaksLabSquirtleText: + TX_FAR _OaksLabSquirtleText + db "@" + +OaksLabLookAtBulbasaur: + ld hl, OaksLabBulbasaurText + jr OaksLabMonChoiceMenu +OaksLabBulbasaurText: + TX_FAR _OaksLabBulbasaurText + db "@" + +OaksLabMonChoiceMenu: + call PrintText + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + call YesNoChoice ; yes/no menu + ld a, [wCurrentMenuItem] + and a + jr nz, OaksLabMonChoiceEnd + ld a, [wcf91] + ld [wPlayerStarter], a + ld [wd11e], a + call GetMonName + ld a, [wSpriteIndex] + cp $2 + jr nz, .asm_1d1db + ld a, HS_STARTER_BALL_1 + jr .asm_1d1e5 +.asm_1d1db + cp $3 + jr nz, .asm_1d1e3 + ld a, HS_STARTER_BALL_2 + jr .asm_1d1e5 +.asm_1d1e3 + ld a, HS_STARTER_BALL_3 +.asm_1d1e5 + ld [wMissableObjectIndex], a + predef HideObject + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, OaksLabMonEnergeticText + call PrintText + ld hl, OaksLabReceivedMonText + call PrintText + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + ld a, 5 + ld [wCurEnemyLVL], a + ld a, [wcf91] + ld [wd11e], a + call AddPartyMon + ld hl, wd72e + set 3, [hl] + ld a, $fc + ld [wJoyIgnore], a + ld a, $8 + ld [wOaksLabCurScript], a +OaksLabMonChoiceEnd: + jp TextScriptEnd + +OaksLabMonEnergeticText: + TX_FAR _OaksLabMonEnergeticText + db "@" + +OaksLabReceivedMonText: + TX_FAR _OaksLabReceivedMonText + TX_SFX_KEY_ITEM + db "@" + +OaksLabScript_1d22d: + ld a, $5 + ld [H_SPRITEINDEX], a + ld a, $9 + ld [H_SPRITEDATAOFFSET], a + call GetPointerWithinSpriteStateData1 + ld [hl], $0 + ld hl, OaksLabLastMonText + call PrintText + jp TextScriptEnd + +OaksLabLastMonText: + TX_FAR _OaksLabLastMonText + db "@" + +OaksLabText32: +OaksLabText5: + TX_ASM + CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS + jr nz, .asm_1d266 + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned + call CountSetBits + ld a, [wNumSetBits] + cp 2 + jr c, .asm_1d279 + CheckEvent EVENT_GOT_POKEDEX + jr z, .asm_1d279 +.asm_1d266 + ld hl, OaksLabText_1d31d + call PrintText + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + predef DisplayDexRating + jp .asm_1d2ed +.asm_1d279 + ld b, POKE_BALL + call IsItemInBag + jr nz, .asm_1d2e7 + CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE + jr nz, .asm_1d2d0 + CheckEvent EVENT_GOT_POKEDEX + jr nz, .asm_1d2c8 + CheckEventReuseA EVENT_BATTLED_RIVAL_IN_OAKS_LAB + jr nz, .asm_1d2a9 + ld a, [wd72e] + bit 3, a + jr nz, .asm_1d2a1 + ld hl, OaksLabText_1d2f0 + call PrintText + jr .asm_1d2ed +.asm_1d2a1 + ld hl, OaksLabText_1d2f5 + call PrintText + jr .asm_1d2ed +.asm_1d2a9 + ld b, OAKS_PARCEL + call IsItemInBag + jr nz, .asm_1d2b8 + ld hl, OaksLabText_1d2fa + call PrintText + jr .asm_1d2ed +.asm_1d2b8 + ld hl, OaksLabDeliverParcelText + call PrintText + call OaksLabScript_RemoveParcel + ld a, $f + ld [wOaksLabCurScript], a + jr .asm_1d2ed +.asm_1d2c8 + ld hl, OaksLabAroundWorldText + call PrintText + jr .asm_1d2ed +.asm_1d2d0 + CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK + jr nz, .asm_1d2e7 + lb bc, POKE_BALL, 5 + call GiveItem + ld hl, OaksLabGivePokeballsText + call PrintText + jr .asm_1d2ed +.asm_1d2e7 + ld hl, OaksLabPleaseVisitText + call PrintText +.asm_1d2ed + jp TextScriptEnd + +OaksLabText_1d2f0: + TX_FAR _OaksLabText_1d2f0 + db "@" + +OaksLabText_1d2f5: + TX_FAR _OaksLabText_1d2f5 + db "@" + +OaksLabText_1d2fa: + TX_FAR _OaksLabText_1d2fa + db "@" + +OaksLabDeliverParcelText: + TX_FAR _OaksLabDeliverParcelText1 + TX_SFX_KEY_ITEM + TX_FAR _OaksLabDeliverParcelText2 + db "@" + +OaksLabAroundWorldText: + TX_FAR _OaksLabAroundWorldText + db "@" + +OaksLabGivePokeballsText: + TX_FAR _OaksLabGivePokeballsText1 + TX_SFX_KEY_ITEM + TX_FAR _OaksLabGivePokeballsText2 + db "@" + +OaksLabPleaseVisitText: + TX_FAR _OaksLabPleaseVisitText + db "@" + +OaksLabText_1d31d: + TX_FAR _OaksLabText_1d31d + db "@" + +OaksLabText7: +OaksLabText6: + TX_ASM + ld hl, OaksLabText_1d32c + call PrintText + jp TextScriptEnd + +OaksLabText_1d32c: + TX_FAR _OaksLabText_1d32c + db "@" + +OaksLabText8: + TX_FAR _OaksLabText8 + db "@" + +OaksLabText9: + TX_ASM + ld hl, OaksLabText_1d340 + call PrintText + jp TextScriptEnd + +OaksLabText_1d340: + TX_FAR _OaksLabText_1d340 + db "@" + +OaksLabText17: + TX_ASM + ld hl, OaksLabRivalWaitingText + call PrintText + jp TextScriptEnd + +OaksLabRivalWaitingText: + TX_FAR _OaksLabRivalWaitingText + db "@" + +OaksLabText18: + TX_ASM + ld hl, OaksLabChooseMonText + call PrintText + jp TextScriptEnd + +OaksLabChooseMonText: + TX_FAR _OaksLabChooseMonText + db "@" + +OaksLabText19: + TX_ASM + ld hl, OaksLabRivalInterjectionText + call PrintText + jp TextScriptEnd + +OaksLabRivalInterjectionText: + TX_FAR _OaksLabRivalInterjectionText + db "@" + +OaksLabText20: + TX_ASM + ld hl, OaksLabBePatientText + call PrintText + jp TextScriptEnd + +OaksLabBePatientText: + TX_FAR _OaksLabBePatientText + db "@" + +OaksLabText12: + TX_ASM + ld hl, OaksLabLeavingText + call PrintText + jp TextScriptEnd + +OaksLabLeavingText: + TX_FAR _OaksLabLeavingText + db "@" + +OaksLabText13: + TX_ASM + ld hl, OaksLabRivalPickingMonText + call PrintText + jp TextScriptEnd + +OaksLabRivalPickingMonText: + TX_FAR _OaksLabRivalPickingMonText + db "@" + +OaksLabText14: + TX_ASM + ld hl, OaksLabRivalReceivedMonText + call PrintText + jp TextScriptEnd + +OaksLabRivalReceivedMonText: + TX_FAR _OaksLabRivalReceivedMonText + TX_SFX_KEY_ITEM + db "@" + +OaksLabText15: + TX_ASM + ld hl, OaksLabRivalChallengeText + call PrintText + jp TextScriptEnd + +OaksLabRivalChallengeText: + TX_FAR _OaksLabRivalChallengeText + db "@" + +OaksLabText_1d3be: + TX_FAR _OaksLabText_1d3be + db "@" + +OaksLabText_1d3c3: + TX_FAR _OaksLabText_1d3c3 + db "@" + +OaksLabText16: + TX_ASM + ld hl, OaksLabRivalToughenUpText + call PrintText + jp TextScriptEnd + +OaksLabRivalToughenUpText: + TX_FAR _OaksLabRivalToughenUpText + db "@" + +OaksLabText21: + TX_FAR _OaksLabText21 + db "@" + +OaksLabText22: + TX_FAR _OaksLabText22 + db "@" + +OaksLabText23: + TX_FAR _OaksLabText23 + db "@" + +OaksLabText24: + TX_FAR _OaksLabText24 + db "@" + +OaksLabText25: + TX_FAR _OaksLabText25 + TX_SFX_KEY_ITEM + db "@" + +OaksLabText26: + TX_FAR _OaksLabText26 + db "@" + +OaksLabText27: + TX_FAR _OaksLabText27 + db "@" + +OaksLabText11: +OaksLabText10: + TX_ASM + ld hl, OaksLabText_1d405 + call PrintText + jp TextScriptEnd + +OaksLabText_1d405: + TX_FAR _OaksLabText_1d405 + db "@" diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm new file mode 100755 index 00000000..5ad7d40f --- /dev/null +++ b/scripts/PalletTown.asm @@ -0,0 +1,214 @@ +PalletTown_Script: + CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK + jr z, .next + SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS +.next + call EnableAutoTextBoxDrawing + ld hl, PalletTown_ScriptPointers + ld a, [wPalletTownCurScript] + jp CallFunctionInTable + +PalletTown_ScriptPointers: + dw PalletTownScript0 + dw PalletTownScript1 + dw PalletTownScript2 + dw PalletTownScript3 + dw PalletTownScript4 + dw PalletTownScript5 + dw PalletTownScript6 + +PalletTownScript0: + CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB + ret nz + ld a, [wYCoord] + cp 1 ; is player near north exit? + ret nz + xor a + ld [hJoyHeld], a + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, $FF + call PlaySound ; stop music + ld a, BANK(Music_MeetProfOak) + ld c, a + ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music + call PlayMusic + ld a, $FC + ld [wJoyIgnore], a + SetEvent EVENT_OAK_APPEARED_IN_PALLET + + ; trigger the next script + ld a, 1 + ld [wPalletTownCurScript], a + ret + +PalletTownScript1: + xor a + ld [wcf0d], a + ld a, 1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $FF + ld [wJoyIgnore], a + ld a, HS_PALLET_TOWN_OAK + ld [wMissableObjectIndex], a + predef ShowObject + + ; trigger the next script + ld a, 2 + ld [wPalletTownCurScript], a + ret + +PalletTownScript2: + ld a, 1 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + call Delay3 + ld a, 1 + ld [wYCoord], a + ld a, 1 + ld [hNPCPlayerRelativePosPerspective], a + ld a, 1 + swap a + ld [hNPCSpriteOffset], a + predef CalcPositionOfPlayerRelativeToNPC + ld hl, hNPCPlayerYDistance + dec [hl] + predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2 + ld de, wNPCMovementDirections2 + ld a, 1 ; oak + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $FF + ld [wJoyIgnore], a + + ; trigger the next script + ld a, 3 + ld [wPalletTownCurScript], a + ret + +PalletTownScript3: + ld a, [wd730] + bit 0, a + ret nz + xor a ; ld a, SPRITE_FACING_DOWN + ld [wSpriteStateData1 + 9], a + ld a, 1 + ld [wcf0d], a + ld a, $FC + ld [wJoyIgnore], a + ld a, 1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID +; set up movement script that causes the player to follow Oak to his lab + ld a, $FF + ld [wJoyIgnore], a + ld a, 1 + ld [wSpriteIndex], a + xor a + ld [wNPCMovementScriptFunctionNum], a + ld a, 1 + ld [wNPCMovementScriptPointerTableNum], a + ld a, [H_LOADEDROMBANK] + ld [wNPCMovementScriptBank], a + + ; trigger the next script + ld a, 4 + ld [wPalletTownCurScript], a + ret + +PalletTownScript4: + ld a, [wNPCMovementScriptPointerTableNum] + and a ; is the movement script over? + ret nz + + ; trigger the next script + ld a, 5 + ld [wPalletTownCurScript], a + ret + +PalletTownScript5: + CheckEvent EVENT_DAISY_WALKING + jr nz, .next + CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1 + jr nz, .next + SetEvent EVENT_DAISY_WALKING + ld a, HS_DAISY_SITTING + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_DAISY_WALKING + ld [wMissableObjectIndex], a + predef_jump ShowObject +.next + CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK + ret z + SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 +PalletTownScript6: + ret + +PalletTown_TextPointers: + dw PalletTownText1 + dw PalletTownText2 + dw PalletTownText3 + dw PalletTownText4 + dw PalletTownText5 + dw PalletTownText6 + dw PalletTownText7 + +PalletTownText1: + TX_ASM + ld a, [wcf0d] + and a + jr nz, .next + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, OakAppearsText + jr .done +.next + ld hl, OakWalksUpText +.done + call PrintText + jp TextScriptEnd + +OakAppearsText: + TX_FAR _OakAppearsText + TX_ASM + ld c, 10 + call DelayFrames + xor a + ld [wEmotionBubbleSpriteIndex], a ; player's sprite + ld [wWhichEmotionBubble], a ; EXCLAMATION_BUBBLE + predef EmotionBubble + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + jp TextScriptEnd + +OakWalksUpText: + TX_FAR _OakWalksUpText + db "@" + +PalletTownText2: ; girl + TX_FAR _PalletTownText2 + db "@" + +PalletTownText3: ; fat man + TX_FAR _PalletTownText3 + db "@" + +PalletTownText4: ; sign by lab + TX_FAR _PalletTownText4 + db "@" + +PalletTownText5: ; sign by fence + TX_FAR _PalletTownText5 + db "@" + +PalletTownText6: ; sign by Red’s house + TX_FAR _PalletTownText6 + db "@" + +PalletTownText7: ; sign by Blue’s house + TX_FAR _PalletTownText7 + db "@" diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm new file mode 100755 index 00000000..dcc449c1 --- /dev/null +++ b/scripts/PewterCity.asm @@ -0,0 +1,322 @@ +PewterCity_Script: + call EnableAutoTextBoxDrawing + ld hl, PewterCity_ScriptPointers + ld a, [wPewterCityCurScript] + jp CallFunctionInTable + +PewterCity_ScriptPointers: + dw PewterCityScript0 + dw PewterCityScript1 + dw PewterCityScript2 + dw PewterCityScript3 + dw PewterCityScript4 + dw PewterCityScript5 + dw PewterCityScript6 + +PewterCityScript0: + xor a + ld [wMuseum1FCurScript], a + ResetEvent EVENT_BOUGHT_MUSEUM_TICKET + call PewterCityScript_1925e + ret + +PewterCityScript_1925e: + CheckEvent EVENT_BEAT_BROCK + ret nz + ld hl, CoordsData_19277 + call ArePlayerCoordsInArray + ret nc + ld a, $f0 + ld [wJoyIgnore], a + ld a, $5 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +CoordsData_19277: + db $11,$23 + db $11,$24 + db $12,$25 + db $13,$25 + db $ff + +PewterCityScript1: + ld a, [wNPCMovementScriptPointerTableNum] + and a + ret nz + ld a, $3 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, ($3 << 4) | SPRITE_FACING_UP + ld [hSpriteImageIndex], a + call SetSpriteImageIndexAfterSettingFacingDirection + call PlayDefaultMusic + ld hl, wFlags_0xcd60 + set 4, [hl] + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $3c + ld [$ffeb], a + ld a, $30 + ld [$ffec], a + ld a, $c + ld [$ffed], a + ld a, $11 + ld [$ffee], a + ld a, $3 + ld [wSpriteIndex], a + call SetSpritePosition1 + ld a, $3 + ld [H_SPRITEINDEX], a + ld de, MovementData_PewterMuseumGuyExit + call MoveSprite + ld a, $2 + ld [wPewterCityCurScript], a + ret + +MovementData_PewterMuseumGuyExit: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +PewterCityScript2: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_MUSEUM_GUY + ld [wMissableObjectIndex], a + predef HideObject + ld a, $3 + ld [wPewterCityCurScript], a + ret + +PewterCityScript3: + ld a, $3 + ld [wSpriteIndex], a + call SetSpritePosition2 + ld a, HS_MUSEUM_GUY + ld [wMissableObjectIndex], a + predef ShowObject + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wPewterCityCurScript], a + ret + +PewterCityScript4: + ld a, [wNPCMovementScriptPointerTableNum] + and a + ret nz + ld a, $5 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_LEFT + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, ($1 << 4) | SPRITE_FACING_LEFT + ld [hSpriteImageIndex], a + call SetSpriteImageIndexAfterSettingFacingDirection + call PlayDefaultMusic + ld hl, wFlags_0xcd60 + set 4, [hl] + ld a, $e + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $3c + ld [$ffeb], a + ld a, $40 + ld [$ffec], a + ld a, $16 + ld [$ffed], a + ld a, $10 + ld [$ffee], a + ld a, $5 + ld [wSpriteIndex], a + call SetSpritePosition1 + ld a, $5 + ld [H_SPRITEINDEX], a + ld de, MovementData_PewterGymGuyExit + call MoveSprite + ld a, $5 + ld [wPewterCityCurScript], a + ret + +MovementData_PewterGymGuyExit: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +PewterCityScript5: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_GYM_GUY + ld [wMissableObjectIndex], a + predef HideObject + ld a, $6 + ld [wPewterCityCurScript], a + ret + +PewterCityScript6: + ld a, $5 + ld [wSpriteIndex], a + call SetSpritePosition2 + ld a, HS_GYM_GUY + ld [wMissableObjectIndex], a + predef ShowObject + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wPewterCityCurScript], a + ret + +PewterCity_TextPointers: + dw PewterCityText1 + dw PewterCityText2 + dw PewterCityText3 + dw PewterCityText4 + dw PewterCityText5 + dw PewterCityText6 + dw PewterCityText7 + dw MartSignText + dw PokeCenterSignText + dw PewterCityText10 + dw PewterCityText11 + dw PewterCityText12 + dw PewterCityText13 + dw PewterCityText14 + +PewterCityText1: + TX_FAR _PewterCityText1 + db "@" + +PewterCityText2: + TX_FAR _PewterCityText2 + db "@" + +PewterCityText3: + TX_ASM + ld hl, PewterCityText_193f1 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_193c9 + ld hl, PewterCityText_193f6 + call PrintText + jr .asm_193ee +.asm_193c9 + ld hl, PewterCityText_193fb + call PrintText + xor a + ld [hJoyPressed], a + ld [hJoyHeld], a + ld [wNPCMovementScriptFunctionNum], a + ld a, $2 + ld [wNPCMovementScriptPointerTableNum], a + ld a, [H_LOADEDROMBANK] + ld [wNPCMovementScriptBank], a + ld a, $3 + ld [wSpriteIndex], a + call GetSpritePosition2 + ld a, $1 + ld [wPewterCityCurScript], a +.asm_193ee + jp TextScriptEnd + +PewterCityText_193f1: + TX_FAR _PewterCityText_193f1 + db "@" + +PewterCityText_193f6: + TX_FAR _PewterCityText_193f6 + db "@" + +PewterCityText_193fb: + TX_FAR _PewterCityText_193fb + db "@" + +PewterCityText13: + TX_FAR _PewterCityText13 + db "@" + +PewterCityText4: + TX_ASM + ld hl, PewterCityText_19427 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + cp $0 + jr nz, .asm_1941e + ld hl, PewterCityText_1942c + call PrintText + jr .asm_19424 +.asm_1941e + ld hl, PewterCityText_19431 + call PrintText +.asm_19424 + jp TextScriptEnd + +PewterCityText_19427: + TX_FAR _PewterCityText_19427 + db "@" + +PewterCityText_1942c: + TX_FAR _PewterCityText_1942c + db "@" + +PewterCityText_19431: + TX_FAR _PewterCityText_19431 + db "@" + +PewterCityText5: + TX_ASM + ld hl, PewterCityText_1945d + call PrintText + xor a + ld [hJoyHeld], a + ld [wNPCMovementScriptFunctionNum], a + ld a, $3 + ld [wNPCMovementScriptPointerTableNum], a + ld a, [H_LOADEDROMBANK] + ld [wNPCMovementScriptBank], a + ld a, $5 + ld [wSpriteIndex], a + call GetSpritePosition2 + ld a, $4 + ld [wPewterCityCurScript], a + jp TextScriptEnd + +PewterCityText_1945d: + TX_FAR _PewterCityText_1945d + db "@" + +PewterCityText14: + TX_FAR _PewterCityText14 + db "@" + +PewterCityText6: + TX_FAR _PewterCityText6 + db "@" + +PewterCityText7: + TX_FAR _PewterCityText7 + db "@" + +PewterCityText10: + TX_FAR _PewterCityText10 + db "@" + +PewterCityText11: + TX_FAR _PewterCityText11 + db "@" + +PewterCityText12: + TX_FAR _PewterCityText12 + db "@" diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm new file mode 100755 index 00000000..6dd24b08 --- /dev/null +++ b/scripts/PewterGym.asm @@ -0,0 +1,228 @@ +PewterGym_Script: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + call nz, PewterGymScript_5c3a4 + call EnableAutoTextBoxDrawing + ld hl, PewterGymTrainerHeader0 + ld de, PewterGym_ScriptPointers + ld a, [wPewterGymCurScript] + call ExecuteCurMapScriptInTable + ld [wPewterGymCurScript], a + ret + +PewterGymScript_5c3a4: + ld hl, Gym1CityName + ld de, Gym1LeaderName + jp LoadGymLeaderAndCityName + +Gym1CityName: + db "PEWTER CITY@" + +Gym1LeaderName: + db "BROCK@" + +PewterGymScript_5c3bf: + xor a + ld [wJoyIgnore], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a + ret + +PewterGym_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw PewterGymScript3 + +PewterGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, PewterGymScript_5c3bf + ld a, $f0 + ld [wJoyIgnore], a + +PewterGymScript_5c3df: + ld a, $4 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_BROCK + lb bc, TM_34, 1 + call GiveItem + jr nc, .BagFull + ld a, $5 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM34 + jr .asm_5c408 +.BagFull + ld a, $6 + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_5c408 + ld hl, wObtainedBadges + set 0, [hl] + ld hl, wBeatGymFlags + set 0, [hl] + + ld a, HS_GYM_GUY + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_ROUTE_22_RIVAL_1 + ld [wMissableObjectIndex], a + predef HideObject + + ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE + + ; deactivate gym trainers + SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0 + + jp PewterGymScript_5c3bf + +PewterGym_TextPointers: + dw PewterGymText1 + dw PewterGymText2 + dw PewterGymText3 + dw PewterGymText4 + dw PewterGymText5 + dw PewterGymText6 + +PewterGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 + db ($5 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_PEWTER_GYM_TRAINER_0 + dw PewterGymBattleText1 ; TextBeforeBattle + dw PewterGymAfterBattleText1 ; TextAfterBattle + dw PewterGymEndBattleText1 ; TextEndBattle + dw PewterGymEndBattleText1 ; TextEndBattle + + db $ff + +PewterGymText1: + TX_ASM + CheckEvent EVENT_BEAT_BROCK + jr z, .asm_5c46a + CheckEventReuseA EVENT_GOT_TM34 + jr nz, .asm_5c462 + call z, PewterGymScript_5c3df + call DisableWaitingAfterTextDisplay + jr .asm_5c49b +.asm_5c462 + ld hl, PewterGymText_5c4a3 + call PrintText + jr .asm_5c49b +.asm_5c46a + ld hl, PewterGymText_5c49e + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, PewterGymText_5c4bc + ld de, PewterGymText_5c4bc + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $1 + ld [wGymLeaderNo], a + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wPewterGymCurScript], a + ld [wCurMapScript], a +.asm_5c49b + jp TextScriptEnd + +PewterGymText_5c49e: + TX_FAR _PewterGymText_5c49e + db "@" + +PewterGymText_5c4a3: + TX_FAR _PewterGymText_5c4a3 + db "@" + +PewterGymText4: + TX_FAR _TM34PreReceiveText + db "@" + +PewterGymText5: + TX_FAR _ReceivedTM34Text + TX_SFX_ITEM_1 + TX_FAR _TM34ExplanationText + db "@" + +PewterGymText6: + TX_FAR _TM34NoRoomText + db "@" + +PewterGymText_5c4bc: + TX_FAR _PewterGymText_5c4bc + TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + TX_FAR _PewterGymText_5c4c1 + db "@" + +PewterGymText2: + TX_ASM + ld hl, PewterGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +PewterGymBattleText1: + TX_FAR _PewterGymBattleText1 + db "@" + +PewterGymEndBattleText1: + TX_FAR _PewterGymEndBattleText1 + db "@" + +PewterGymAfterBattleText1: + TX_FAR _PewterGymAfterBattleText1 + db "@" + +PewterGymText3: + TX_ASM + ld a, [wBeatGymFlags] + bit 0, a + jr nz, .asm_5c50c + ld hl, PewterGymText_5c515 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_5c4fe + ld hl, PewterGymText_5c51a + call PrintText + jr .asm_5c504 +.asm_5c4fe + ld hl, PewterGymText_5c524 + call PrintText +.asm_5c504 + ld hl, PewterGymText_5c51f + call PrintText + jr .asm_5c512 +.asm_5c50c + ld hl, PewterGymText_5c529 + call PrintText +.asm_5c512 + jp TextScriptEnd + +PewterGymText_5c515: + TX_FAR _PewterGymText_5c515 + db "@" + +PewterGymText_5c51a: + TX_FAR _PewterGymText_5c51a + db "@" + +PewterGymText_5c51f: + TX_FAR _PewterGymText_5c51f + db "@" + +PewterGymText_5c524: + TX_FAR _PewterGymText_5c524 + db "@" + +PewterGymText_5c529: + TX_FAR _PewterGymText_5c529 + db "@" diff --git a/scripts/PewterMart.asm b/scripts/PewterMart.asm new file mode 100755 index 00000000..c71f8413 --- /dev/null +++ b/scripts/PewterMart.asm @@ -0,0 +1,28 @@ +PewterMart_Script: + call EnableAutoTextBoxDrawing + ld a, $1 + ld [wAutoTextBoxDrawingControl], a + ret + +PewterMart_TextPointers: + dw PewterCashierText + dw PewterMartText2 + dw PewterMartText3 + +PewterMartText2: + TX_ASM + ld hl, .Text + call PrintText + jp TextScriptEnd +.Text + TX_FAR _PewterMartText2 + db "@" + +PewterMartText3: + TX_ASM + ld hl, .Text + call PrintText + jp TextScriptEnd +.Text + TX_FAR _PewterMartText3 + db "@" diff --git a/scripts/PewterNidoranHouse.asm b/scripts/PewterNidoranHouse.asm new file mode 100755 index 00000000..a4e85e08 --- /dev/null +++ b/scripts/PewterNidoranHouse.asm @@ -0,0 +1,23 @@ +PewterNidoranHouse_Script: + jp EnableAutoTextBoxDrawing + +PewterNidoranHouse_TextPointers: + dw PewterHouse1Text1 + dw PewterHouse1Text2 + dw PewterHouse1Text3 + +PewterHouse1Text1: + TX_FAR _PewterHouse1Text1 + TX_ASM + ld a, NIDORAN_M + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +PewterHouse1Text2: + TX_FAR _PewterHouse1Text2 + db "@" + +PewterHouse1Text3: + TX_FAR _PewterHouse1Text3 + db "@" diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm new file mode 100755 index 00000000..68115050 --- /dev/null +++ b/scripts/PewterPokecenter.asm @@ -0,0 +1,84 @@ +PewterPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +PewterPokecenter_TextPointers: + dw PewterHealNurseText + dw PewterPokecenterText2 + dw PewterJigglypuffText + dw PewterTradeNurseText + +PewterHealNurseText: + TX_POKECENTER_NURSE + +PewterPokecenterText2: + TX_FAR _PewterPokecenterText2 + db "@" + +PewterJigglypuffText: + TX_ASM + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, .Text + call PrintText + StopAllMusic + ld c, 32 + call DelayFrames + ld hl, JigglypuffFacingDirections + ld de, wJigglypuffFacingDirections + ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections + call CopyData + + ld a, [wSprite03StateData1ImageIndex] + ld hl, wJigglypuffFacingDirections +.findMatchingFacingDirectionLoop + cp [hl] + inc hl + jr nz, .findMatchingFacingDirectionLoop + dec hl + push hl + ld c, BANK(Music_JigglypuffSong) + ld a, MUSIC_JIGGLYPUFF_SONG + call PlayMusic + pop hl +.loop + ld a, [hl] + ld [wSprite03StateData1ImageIndex], a + +; rotate the array + push hl + ld hl, wJigglypuffFacingDirections + ld de, wJigglypuffFacingDirections - 1 + ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections + call CopyData + ld a, [wJigglypuffFacingDirections - 1] + ld [wJigglypuffFacingDirections + 3], a + pop hl + + ld c, 24 + call DelayFrames + + ld a, [wChannelSoundIDs] + ld b, a + ld a, [wChannelSoundIDs + Ch1] + or b + jr nz, .loop + + ld c, 48 + call DelayFrames + call PlayDefaultMusic + jp TextScriptEnd + +.Text + TX_FAR _PewterJigglypuffText + db "@" + +JigglypuffFacingDirections: + db $30 | SPRITE_FACING_DOWN + db $30 | SPRITE_FACING_LEFT + db $30 | SPRITE_FACING_UP + db $30 | SPRITE_FACING_RIGHT +JigglypuffFacingDirectionsEnd: + +PewterTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/PewterSpeechHouse.asm b/scripts/PewterSpeechHouse.asm new file mode 100755 index 00000000..943e1759 --- /dev/null +++ b/scripts/PewterSpeechHouse.asm @@ -0,0 +1,14 @@ +PewterSpeechHouse_Script: + jp EnableAutoTextBoxDrawing + +PewterSpeechHouse_TextPointers: + dw PewterHouse2Text1 + dw PewterHouse2Text2 + +PewterHouse2Text1: + TX_FAR _PewterHouse2Text1 + db "@" + +PewterHouse2Text2: + TX_FAR _PewterHouse2Text2 + db "@" diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm new file mode 100755 index 00000000..673d6011 --- /dev/null +++ b/scripts/PokemonFanClub.asm @@ -0,0 +1,173 @@ +PokemonFanClub_Script: + jp EnableAutoTextBoxDrawing + +FanClubBikeInBag: +; check if any bike paraphernalia in bag + CheckEvent EVENT_GOT_BIKE_VOUCHER + ret nz + ld b, BICYCLE + call IsItemInBag + ret nz + ld b, BIKE_VOUCHER + jp IsItemInBag + +PokemonFanClub_TextPointers: + dw FanClubText1 + dw FanClubText2 + dw FanClubText3 + dw FanClubText4 + dw FanClubText5 + dw FanClubText6 + dw FanClubText7 + dw FanClubText8 + +FanClubText1: +; pikachu fan + TX_ASM + CheckEvent EVENT_PIKACHU_FAN_BOAST + jr nz, .mineisbetter + ld hl, .normaltext + call PrintText + SetEvent EVENT_SEEL_FAN_BOAST + jr .done +.mineisbetter + ld hl, .bettertext + call PrintText + ResetEvent EVENT_PIKACHU_FAN_BOAST +.done + jp TextScriptEnd + +.normaltext + TX_FAR PikachuFanText + db "@" + +.bettertext + TX_FAR PikachuFanBetterText + db "@" + +FanClubText2: +; seel fan + TX_ASM + CheckEvent EVENT_SEEL_FAN_BOAST + jr nz, .mineisbetter + ld hl, .normaltext + call PrintText + SetEvent EVENT_PIKACHU_FAN_BOAST + jr .done +.mineisbetter + ld hl, .bettertext + call PrintText + ResetEvent EVENT_SEEL_FAN_BOAST +.done + jp TextScriptEnd + +.normaltext + TX_FAR SeelFanText + db "@" + +.bettertext + TX_FAR SeelFanBetterText + db "@" + +FanClubText3: +; pikachu + TX_ASM + ld hl, .text + call PrintText + ld a, PIKACHU + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +.text + TX_FAR FanClubPikachuText + db "@" + +FanClubText4: +; seel + TX_ASM + ld hl, .text + call PrintText + ld a, SEEL + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +.text + TX_FAR FanClubSeelText + db "@" + +FanClubText5: +; chair + TX_ASM + call FanClubBikeInBag + jr nz, .nothingleft + + ld hl, .meetchairtext + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .nothanks + + ; tell the story + ld hl, .storytext + call PrintText + lb bc, BIKE_VOUCHER, 1 + call GiveItem + jr nc, .BagFull + ld hl, .receivedvouchertext + call PrintText + SetEvent EVENT_GOT_BIKE_VOUCHER + jr .done +.BagFull + ld hl, .bagfulltext + call PrintText + jr .done +.nothanks + ld hl, .nostorytext + call PrintText + jr .done +.nothingleft + ld hl, .finaltext + call PrintText +.done + jp TextScriptEnd + +.meetchairtext + TX_FAR FanClubMeetChairText + db "@" + +.storytext + TX_FAR FanClubChairStoryText + db "@" + +.receivedvouchertext + TX_FAR ReceivedBikeVoucherText + TX_SFX_KEY_ITEM + TX_FAR ExplainBikeVoucherText + db "@" + +.nostorytext + TX_FAR FanClubNoStoryText + db "@" + +.finaltext + TX_FAR FanClubChairFinalText + db "@" + +.bagfulltext + TX_FAR FanClubBagFullText + db "@" + +FanClubText6: + TX_FAR _FanClubText6 + db "@" + +FanClubText7: + TX_FAR _FanClubText7 + db "@" + +FanClubText8: + TX_FAR _FanClubText8 + db "@" diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm new file mode 100755 index 00000000..41f40635 --- /dev/null +++ b/scripts/PokemonMansion1F.asm @@ -0,0 +1,134 @@ +PokemonMansion1F_Script: + call Mansion1Subscript1 + call EnableAutoTextBoxDrawing + ld hl, Mansion1TrainerHeader0 + ld de, PokemonMansion1F_ScriptPointers + ld a, [wPokemonMansion1FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonMansion1FCurScript], a + ret + +Mansion1Subscript1: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_MANSION_SWITCH_ON + jr nz, .asm_442ec + lb bc, 6, 12 + call Mansion1Script_4430b + lb bc, 3, 8 + call Mansion1Script_44304 + lb bc, 8, 10 + call Mansion1Script_44304 + lb bc, 13, 13 + jp Mansion1Script_44304 +.asm_442ec + lb bc, 6, 12 + call Mansion1Script_44304 + lb bc, 3, 8 + call Mansion1Script_4430b + lb bc, 8, 10 + call Mansion1Script_4430b + lb bc, 13, 13 + jp Mansion1Script_4430b + +Mansion1Script_44304: + ld a, $2d + ld [wNewTileBlockID], a + jr Mansion1ReplaceBlock + +Mansion1Script_4430b: + ld a, $e + ld [wNewTileBlockID], a +Mansion1ReplaceBlock: + predef ReplaceTileBlock + ret + +Mansion1Script_Switches: + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + ret nz + xor a + ld [hJoyHeld], a + ld a, $4 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +PokemonMansion1F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PokemonMansion1F_TextPointers: + dw Mansion1Text1 + dw PickUpItemText + dw PickUpItemText + dw Mansion1Text4 + +Mansion1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0 + dw Mansion1BattleText2 ; TextBeforeBattle + dw Mansion1AfterBattleText2 ; TextAfterBattle + dw Mansion1EndBattleText2 ; TextEndBattle + dw Mansion1EndBattleText2 ; TextEndBattle + + db $ff + +Mansion1Text1: + TX_ASM + ld hl, Mansion1TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Mansion1BattleText2: + TX_FAR _Mansion1BattleText2 + db "@" + +Mansion1EndBattleText2: + TX_FAR _Mansion1EndBattleText2 + db "@" + +Mansion1AfterBattleText2: + TX_FAR _Mansion1AfterBattleText2 + db "@" + +Mansion1Text4: + TX_ASM + ld hl, MansionSwitchText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_4438c + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ld hl, MansionSwitchPressedText + call PrintText + ld a, SFX_GO_INSIDE + call PlaySound + CheckAndSetEvent EVENT_MANSION_SWITCH_ON + jr z, .asm_44392 + ResetEventReuseHL EVENT_MANSION_SWITCH_ON + jr .asm_44392 +.asm_4438c + ld hl, MansionSwitchNotPressedText + call PrintText +.asm_44392 + jp TextScriptEnd + +MansionSwitchText: + TX_FAR _MansionSwitchText + db "@" + +MansionSwitchPressedText: + TX_FAR _MansionSwitchPressedText + db "@" + +MansionSwitchNotPressedText: + TX_FAR _MansionSwitchNotPressedText + db "@" diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm new file mode 100755 index 00000000..a7b90bcd --- /dev/null +++ b/scripts/PokemonMansion2F.asm @@ -0,0 +1,140 @@ +PokemonMansion2F_Script: + call Mansion2Script_51fee + call EnableAutoTextBoxDrawing + ld hl, Mansion2TrainerHeader0 + ld de, PokemonMansion2F_ScriptPointers + ld a, [wPokemonMansion2FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonMansion2FCurScript], a + ret + +Mansion2Script_51fee: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_MANSION_SWITCH_ON + jr nz, .asm_52016 + ld a, $e + lb bc, 2, 4 + call Mansion2Script_5202f + ld a, $54 + lb bc, 4, 9 + call Mansion2Script_5202f + ld a, $5f + lb bc, 11, 3 + call Mansion2Script_5202f + ret +.asm_52016 + ld a, $5f + lb bc, 2, 4 + call Mansion2Script_5202f + ld a, $e + lb bc, 4, 9 + call Mansion2Script_5202f + ld a, $e + lb bc, 11, 3 + call Mansion2Script_5202f + ret + +Mansion2Script_5202f: + ld [wNewTileBlockID], a + predef_jump ReplaceTileBlock + +Mansion2Script_Switches: + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + ret nz + xor a + ld [hJoyHeld], a + ld a, $5 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +PokemonMansion2F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PokemonMansion2F_TextPointers: + dw Mansion2Text1 + dw PickUpItemText + dw Mansion2Text3 + dw Mansion2Text4 + dw Mansion2Text5 + +Mansion2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0 + dw Mansion2BattleText1 ; TextBeforeBattle + dw Mansion2AfterBattleText1 ; TextAfterBattle + dw Mansion2EndBattleText1 ; TextEndBattle + dw Mansion2EndBattleText1 ; TextEndBattle + + db $ff + +Mansion2Text1: + TX_ASM + ld hl, Mansion2TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Mansion2BattleText1: + TX_FAR _Mansion2BattleText1 + db "@" + +Mansion2EndBattleText1: + TX_FAR _Mansion2EndBattleText1 + db "@" + +Mansion2AfterBattleText1: + TX_FAR _Mansion2AfterBattleText1 + db "@" + +Mansion2Text3: + TX_FAR _Mansion2Text3 + db "@" + +Mansion2Text4: + TX_FAR _Mansion2Text4 + db "@" + +Mansion3Text6: +Mansion2Text5: + TX_ASM + ld hl, Mansion2Text_520c2 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_520b9 + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ld hl, Mansion2Text_520c7 + call PrintText + ld a, SFX_GO_INSIDE + call PlaySound + CheckAndSetEvent EVENT_MANSION_SWITCH_ON + jr z, .asm_520bf + ResetEventReuseHL EVENT_MANSION_SWITCH_ON + jr .asm_520bf +.asm_520b9 + ld hl, Mansion2Text_520cc + call PrintText +.asm_520bf + jp TextScriptEnd + +Mansion2Text_520c2: + TX_FAR _Mansion2Text_520c2 + db "@" + +Mansion2Text_520c7: + TX_FAR _Mansion2Text_520c7 + db "@" + +Mansion2Text_520cc: + TX_FAR _Mansion2Text_520cc + db "@" diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm new file mode 100755 index 00000000..3edc7bfd --- /dev/null +++ b/scripts/PokemonMansion3F.asm @@ -0,0 +1,151 @@ +PokemonMansion3F_Script: + call Mansion3Script_52204 + call EnableAutoTextBoxDrawing + ld hl, Mansion3TrainerHeader0 + ld de, PokemonMansion3F_ScriptPointers + ld a, [wPokemonMansion3FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonMansion3FCurScript], a + ret + +Mansion3Script_52204: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_MANSION_SWITCH_ON + jr nz, .asm_52224 + ld a, $e + ld bc, $207 + call Mansion2Script_5202f + ld a, $5f + ld bc, $507 + call Mansion2Script_5202f + ret +.asm_52224 + ld a, $5f + ld bc, $207 + call Mansion2Script_5202f + ld a, $e + ld bc, $507 + call Mansion2Script_5202f + ret + +PokemonMansion3F_ScriptPointers: + dw Mansion3Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Mansion3Script0: + ld hl, CoordsData_52254 + call Mansion3Script_5225b + ld a, [wWhichDungeonWarp] + and a + jp z, CheckFightingMapTrainers + cp $3 + ld a, $a5 + jr nz, .asm_52250 + ld a, $d6 +.asm_52250 + ld [wDungeonWarpDestinationMap], a + ret + +CoordsData_52254: + db $0E,$10 + db $0E,$11 + db $0E,$13 + db $FF + +Mansion3Script_5225b: + xor a + ld [wWhichDungeonWarp], a + ld a, [wd72d] + bit 4, a + ret nz + call ArePlayerCoordsInArray + ret nc + ld a, [wCoordIndex] + ld [wWhichDungeonWarp], a + ld hl, wd72d + set 4, [hl] + ld hl, wd732 + set 4, [hl] + ret + +Mansion3Script_Switches: + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + ret nz + xor a + ld [hJoyHeld], a + ld a, $6 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +PokemonMansion3F_TextPointers: + dw Mansion3Text1 + dw Mansion3Text2 + dw PickUpItemText + dw PickUpItemText + dw Mansion3Text5 + dw Mansion3Text6 + +Mansion3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_0 + dw Mansion3BattleText1 ; TextBeforeBattle + dw Mansion3AfterBattleText1 ; TextAfterBattle + dw Mansion3EndBattleText1 ; TextEndBattle + dw Mansion3EndBattleText1 ; TextEndBattle + +Mansion3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 + dw Mansion3BattleText2 ; TextBeforeBattle + dw Mansion3AfterBattleText2 ; TextAfterBattle + dw Mansion3EndBattleText2 ; TextEndBattle + dw Mansion3EndBattleText2 ; TextEndBattle + + db $ff + +Mansion3Text1: + TX_ASM + ld hl, Mansion3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Mansion3Text2: + TX_ASM + ld hl, Mansion3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Mansion3BattleText1: + TX_FAR _Mansion3BattleText1 + db "@" + +Mansion3EndBattleText1: + TX_FAR _Mansion3EndBattleText1 + db "@" + +Mansion3AfterBattleText1: + TX_FAR _Mansion3AfterBattleText1 + db "@" + +Mansion3BattleText2: + TX_FAR _Mansion3BattleText2 + db "@" + +Mansion3EndBattleText2: + TX_FAR _Mansion3EndBattleText2 + db "@" + +Mansion3AfterBattleText2: + TX_FAR _Mansion3AfterBattleText2 + db "@" + +Mansion3Text5: + TX_FAR _Mansion3Text5 + db "@" diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm new file mode 100755 index 00000000..887b4762 --- /dev/null +++ b/scripts/PokemonMansionB1F.asm @@ -0,0 +1,130 @@ +PokemonMansionB1F_Script: + call Mansion4Script_523cf + call EnableAutoTextBoxDrawing + ld hl, Mansion4TrainerHeader0 + ld de, PokemonMansionB1F_ScriptPointers + ld a, [wPokemonMansionB1FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonMansionB1FCurScript], a + ret + +Mansion4Script_523cf: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_MANSION_SWITCH_ON + jr nz, .asm_523ff + ld a, $e + ld bc, $80d + call Mansion2Script_5202f + ld a, $e + ld bc, $b06 + call Mansion2Script_5202f + ld a, $5f + ld bc, $304 + call Mansion2Script_5202f + ld a, $54 + ld bc, $808 + call Mansion2Script_5202f + ret +.asm_523ff + ld a, $2d + ld bc, $80d + call Mansion2Script_5202f + ld a, $5f + ld bc, $b06 + call Mansion2Script_5202f + ld a, $e + ld bc, $304 + call Mansion2Script_5202f + ld a, $e + ld bc, $808 + call Mansion2Script_5202f + ret + +Mansion4Script_Switches: + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + ret nz + xor a + ld [hJoyHeld], a + ld a, $9 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +PokemonMansionB1F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PokemonMansionB1F_TextPointers: + dw Mansion4Text1 + dw Mansion4Text2 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw Mansion4Text7 + dw PickUpItemText + dw Mansion3Text6 + +Mansion4TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_0 + dw Mansion4BattleText1 ; TextBeforeBattle + dw Mansion4AfterBattleText1 ; TextAfterBattle + dw Mansion4EndBattleText1 ; TextEndBattle + dw Mansion4EndBattleText1 ; TextEndBattle + +Mansion4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 + dw Mansion4BattleText2 ; TextBeforeBattle + dw Mansion4AfterBattleText2 ; TextAfterBattle + dw Mansion4EndBattleText2 ; TextEndBattle + dw Mansion4EndBattleText2 ; TextEndBattle + + db $ff + +Mansion4Text1: + TX_ASM + ld hl, Mansion4TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Mansion4Text2: + TX_ASM + ld hl, Mansion4TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Mansion4BattleText1: + TX_FAR _Mansion4BattleText1 + db "@" + +Mansion4EndBattleText1: + TX_FAR _Mansion4EndBattleText1 + db "@" + +Mansion4AfterBattleText1: + TX_FAR _Mansion4AfterBattleText1 + db "@" + +Mansion4BattleText2: + TX_FAR _Mansion4BattleText2 + db "@" + +Mansion4EndBattleText2: + TX_FAR _Mansion4EndBattleText2 + db "@" + +Mansion4AfterBattleText2: + TX_FAR _Mansion4AfterBattleText2 + db "@" + +Mansion4Text7: + TX_FAR _Mansion4Text7 + db "@" diff --git a/scripts/PokemonTower1F.asm b/scripts/PokemonTower1F.asm new file mode 100755 index 00000000..66b5505c --- /dev/null +++ b/scripts/PokemonTower1F.asm @@ -0,0 +1,29 @@ +PokemonTower1F_Script: + jp EnableAutoTextBoxDrawing + +PokemonTower1F_TextPointers: + dw PokemonTower1Text1 + dw PokemonTower1Text2 + dw PokemonTower1Text3 + dw PokemonTower1Text4 + dw PokemonTower1Text5 + +PokemonTower1Text1: + TX_FAR _PokemonTower1Text1 + db "@" + +PokemonTower1Text2: + TX_FAR _PokemonTower1Text2 + db "@" + +PokemonTower1Text3: + TX_FAR _PokemonTower1Text3 + db "@" + +PokemonTower1Text4: + TX_FAR _PokemonTower1Text4 + db "@" + +PokemonTower1Text5: + TX_FAR _PokemonTower1Text5 + db "@" diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm new file mode 100755 index 00000000..81f4c0b3 --- /dev/null +++ b/scripts/PokemonTower2F.asm @@ -0,0 +1,188 @@ +PokemonTower2F_Script: + call EnableAutoTextBoxDrawing + ld hl, PokemonTower2F_ScriptPointers + ld a, [wPokemonTower2FCurScript] + jp CallFunctionInTable + +PokemonTower2Script_604fe: + xor a + ld [wJoyIgnore], a + ld [wPokemonTower2FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower2F_ScriptPointers: + dw PokemonTower2Script0 + dw PokemonTower2Script1 + dw PokemonTower2Script2 + +PokemonTower2Script0: + CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL + ret nz + ld hl, CoordsData_6055e + call ArePlayerCoordsInArray + ret nc + ld a, $ff + ld [wNewSoundID], a + call PlaySound + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT + ld a, [wCoordIndex] + cp $1 + ld a, PLAYER_DIR_UP + ld b, SPRITE_FACING_DOWN + jr nz, .asm_60544 +; the rival is on the left side and the player is on the right side + SetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT + ld a, PLAYER_DIR_LEFT + ld b, SPRITE_FACING_RIGHT +.asm_60544 + ld [wPlayerMovingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + ld a, b + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [hJoyHeld], a + ld [hJoyPressed], a + ret + +CoordsData_6055e: + db $05,$0F + db $06,$0E + db $0F ; isn't this supposed to end in $ff? + +PokemonTower2Script1: + ld a, [wIsInBattle] + cp $ff + jp z, PokemonTower2Script_604fe + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld de, MovementData_605b2 + CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT + jr nz, .asm_60589 + ld de, MovementData_605a9 +.asm_60589 + ld a, $1 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld a, $2 + ld [wPokemonTower2FCurScript], a + ld [wCurMapScript], a + ret + +MovementData_605a9: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +MovementData_605b2: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +PokemonTower2Script2: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_POKEMON_TOWER_2F_RIVAL + ld [wMissableObjectIndex], a + predef HideObject + xor a + ld [wJoyIgnore], a + call PlayDefaultMusic + ld a, $0 + ld [wPokemonTower2FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower2F_TextPointers: + dw PokemonTower2Text1 + dw PokemonTower2Text2 + +PokemonTower2Text1: + TX_ASM + CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL + jr z, .asm_16f24 + ld hl, PokemonTower2Text_6063c + call PrintText + jr .asm_41852 +.asm_16f24 + ld hl, PokemonTower2Text_6062d + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, PokemonTower2Text_60632 + ld de, PokemonTower2Text_60637 + call SaveEndBattleTextPointers + ld a, OPP_SONY2 + ld [wCurOpponent], a + + ; select which team to use during the encounter + ld a, [wRivalStarter] + cp STARTER2 + jr nz, .NotSquirtle + ld a, $4 + jr .done +.NotSquirtle + cp STARTER3 + jr nz, .Charmander + ld a, $5 + jr .done +.Charmander + ld a, $6 +.done + ld [wTrainerNo], a + + ld a, $1 + ld [wPokemonTower2FCurScript], a + ld [wCurMapScript], a +.asm_41852 + jp TextScriptEnd + +PokemonTower2Text_6062d: + TX_FAR _PokemonTower2Text_6062d + db "@" + +PokemonTower2Text_60632: + TX_FAR _PokemonTower2Text_60632 + db "@" + +PokemonTower2Text_60637: + TX_FAR _PokemonTower2Text_60637 + db "@" + +PokemonTower2Text_6063c: + TX_FAR _PokemonTower2Text_6063c + db "@" + +PokemonTower2Text2: + TX_FAR _PokemonTower2Text2 + db "@" diff --git a/scripts/PokemonTower3F.asm b/scripts/PokemonTower3F.asm new file mode 100755 index 00000000..7d8f63e9 --- /dev/null +++ b/scripts/PokemonTower3F.asm @@ -0,0 +1,101 @@ +PokemonTower3F_Script: + call EnableAutoTextBoxDrawing + ld hl, PokemonTower3TrainerHeader0 + ld de, PokemonTower3F_ScriptPointers + ld a, [wPokemonTower3FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonTower3FCurScript], a + ret + +PokemonTower3F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PokemonTower3F_TextPointers: + dw PokemonTower3Text1 + dw PokemonTower3Text2 + dw PokemonTower3Text3 + dw PickUpItemText + +PokemonTower3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 + dw PokemonTower3BattleText1 ; TextBeforeBattle + dw PokemonTower3AfterBattleText1 ; TextAfterBattle + dw PokemonTower3EndBattleText1 ; TextEndBattle + dw PokemonTower3EndBattleText1 ; TextEndBattle + +PokemonTower3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 + dw PokemonTower3BattleText2 ; TextBeforeBattle + dw PokemonTower3AfterBattleText2 ; TextAfterBattle + dw PokemonTower3EndBattleText2 ; TextEndBattle + dw PokemonTower3EndBattleText2 ; TextEndBattle + +PokemonTower3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 + dw PokemonTower3BattleText3 ; TextBeforeBattle + dw PokemonTower3AfterBattleText3 ; TextAfterBattle + dw PokemonTower3EndBattleText3 ; TextEndBattle + dw PokemonTower3EndBattleText3 ; TextEndBattle + db $ff + +PokemonTower3Text1: + TX_ASM + ld hl, PokemonTower3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower3Text2: + TX_ASM + ld hl, PokemonTower3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower3Text3: + TX_ASM + ld hl, PokemonTower3TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower3BattleText1: + TX_FAR _PokemonTower3BattleText1 + db "@" + +PokemonTower3EndBattleText1: + TX_FAR _PokemonTower3EndBattleText1 + db "@" + +PokemonTower3AfterBattleText1: + TX_FAR _PokemonTower3AfterBattleText1 + db "@" + +PokemonTower3BattleText2: + TX_FAR _PokemonTower3BattleText2 + db "@" + +PokemonTower3EndBattleText2: + TX_FAR _PokemonTower3EndBattleText2 + db "@" + +PokemonTower3AfterBattleText2: + TX_FAR _PokemonTower3AfterBattleText2 + db "@" + +PokemonTower3BattleText3: + TX_FAR _PokemonTower3BattleText3 + db "@" + +PokemonTower3EndBattleText3: + TX_FAR _PokemonTower3EndBattleText3 + db "@" + +PokemonTower3AfterBattleText3: + TX_FAR _PokemonTower3AfterBattleText3 + db "@" diff --git a/scripts/PokemonTower4F.asm b/scripts/PokemonTower4F.asm new file mode 100755 index 00000000..b8e0d772 --- /dev/null +++ b/scripts/PokemonTower4F.asm @@ -0,0 +1,104 @@ +PokemonTower4F_Script: + call EnableAutoTextBoxDrawing + ld hl, PokemonTower4TrainerHeader0 + ld de, PokemonTower4F_ScriptPointers + ld a, [wPokemonTower4FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonTower4FCurScript], a + ret + +PokemonTower4F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PokemonTower4F_TextPointers: + dw PokemonTower4Text1 + dw PokemonTower4Text2 + dw PokemonTower4Text3 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +PokemonTower4TrainerHeader0: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 + dw PokemonTower4BattleText1 ; TextBeforeBattle + dw PokemonTower4AfterBattleText1 ; TextAfterBattle + dw PokemonTower4EndBattleText1 ; TextEndBattle + dw PokemonTower4EndBattleText1 ; TextEndBattle + +PokemonTower4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 + dw PokemonTower4BattleText2 ; TextBeforeBattle + dw PokemonTower4AfterBattleText2 ; TextAfterBattle + dw PokemonTower4EndBattleText2 ; TextEndBattle + dw PokemonTower4EndBattleText2 ; TextEndBattle + +PokemonTower4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 + dw PokemonTower4BattleText3 ; TextBeforeBattle + dw PokemonTower4AfterBattleText3 ; TextAfterBattle + dw PokemonTower4EndBattleText3 ; TextEndBattle + dw PokemonTower4EndBattleText3 ; TextEndBattle + + db $ff + +PokemonTower4Text1: + TX_ASM + ld hl, PokemonTower4TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower4Text2: + TX_ASM + ld hl, PokemonTower4TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower4Text3: + TX_ASM + ld hl, PokemonTower4TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower4BattleText1: + TX_FAR _PokemonTower4BattleText1 + db "@" + +PokemonTower4EndBattleText1: + TX_FAR _PokemonTower4EndBattleText1 + db "@" + +PokemonTower4AfterBattleText1: + TX_FAR _PokemonTower4AfterBattleText1 + db "@" + +PokemonTower4BattleText2: + TX_FAR _PokemonTower4BattleText2 + db "@" + +PokemonTower4EndBattleText2: + TX_FAR _PokemonTower4EndBattleText2 + db "@" + +PokemonTower4AfterBattleText2: + TX_FAR _PokemonTower4AfterBattleText2 + db "@" + +PokemonTower4BattleText3: + TX_FAR _PokemonTower4BattleText3 + db "@" + +PokemonTower4EndBattleText3: + TX_FAR _PokemonTower4EndBattleText3 + db "@" + +PokemonTower4AfterBattleText3: + TX_FAR _PokemonTower4AfterBattleText3 + db "@" diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm new file mode 100755 index 00000000..299261e9 --- /dev/null +++ b/scripts/PokemonTower5F.asm @@ -0,0 +1,176 @@ +PokemonTower5F_Script: + call EnableAutoTextBoxDrawing + ld hl, PokemonTower5TrainerHeader0 + ld de, PokemonTower5F_ScriptPointers + ld a, [wPokemonTower5FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonTower5FCurScript], a + ret + +PokemonTower5F_ScriptPointers: + dw PokemonTower5Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PokemonTower5Script0: + ld hl, CoordsData_60992 + call ArePlayerCoordsInArray + jr c, .asm_60960 + ld hl, wd72e + res 4, [hl] + ResetEvent EVENT_IN_PURIFIED_ZONE + jp CheckFightingMapTrainers +.asm_60960 + CheckAndSetEvent EVENT_IN_PURIFIED_ZONE + ret nz + xor a + ld [hJoyHeld], a + ld a, $f0 + ld [wJoyIgnore], a + ld hl, wd72e + set 4, [hl] + predef HealParty + call GBFadeOutToWhite + call Delay3 + call Delay3 + call GBFadeInFromWhite + ld a, $7 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wJoyIgnore], a + ret + +CoordsData_60992: + db $08,$0A + db $08,$0B + db $09,$0A + db $09,$0B + db $FF + +PokemonTower5F_TextPointers: + dw PokemonTower5Text1 + dw PokemonTower5Text2 + dw PokemonTower5Text3 + dw PokemonTower5Text4 + dw PokemonTower5Text5 + dw PickUpItemText + dw PokemonTower5Text7 + +PokemonTower5TrainerHeader0: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 + dw PokemonTower5BattleText1 ; TextBeforeBattle + dw PokemonTower5AfterBattleText1 ; TextAfterBattle + dw PokemonTower5EndBattleText1 ; TextEndBattle + dw PokemonTower5EndBattleText1 ; TextEndBattle + +PokemonTower5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 + dw PokemonTower5BattleText2 ; TextBeforeBattle + dw PokemonTower5AfterBattleText2 ; TextAfterBattle + dw PokemonTower5EndBattleText2 ; TextEndBattle + dw PokemonTower5EndBattleText2 ; TextEndBattle + +PokemonTower5TrainerHeader2: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 + dw PokemonTower5BattleText3 ; TextBeforeBattle + dw PokemonTower5AfterBattleText3 ; TextAfterBattle + dw PokemonTower5EndBattleText3 ; TextEndBattle + dw PokemonTower5EndBattleText3 ; TextEndBattle + +PokemonTower5TrainerHeader3: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 + dw PokemonTower5BattleText4 ; TextBeforeBattle + dw PokemonTower5AfterBattleText4 ; TextAfterBattle + dw PokemonTower5EndBattleText4 ; TextEndBattle + dw PokemonTower5EndBattleText4 ; TextEndBattle + + db $ff + +PokemonTower5Text1: + TX_FAR _PokemonTower5Text1 + db "@" + +PokemonTower5Text2: + TX_ASM + ld hl, PokemonTower5TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower5BattleText1: + TX_FAR _PokemonTower5BattleText1 + db "@" + +PokemonTower5EndBattleText1: + TX_FAR _PokemonTower5EndBattleText1 + db "@" + +PokemonTower5AfterBattleText1: + TX_FAR _PokemonTower5AfterBattleText1 + db "@" + +PokemonTower5Text3: + TX_ASM + ld hl, PokemonTower5TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower5BattleText2: + TX_FAR _PokemonTower5BattleText2 + db "@" + +PokemonTower5EndBattleText2: + TX_FAR _PokemonTower5EndBattleText2 + db "@" + +PokemonTower5AfterBattleText2: + TX_FAR _PokemonTower5AfterBattleText2 + db "@" + +PokemonTower5Text4: + TX_ASM + ld hl, PokemonTower5TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower5BattleText3: + TX_FAR _PokemonTower5BattleText3 + db "@" + +PokemonTower5EndBattleText3: + TX_FAR _PokemonTower5EndBattleText3 + db "@" + +PokemonTower5AfterBattleText3: + TX_FAR _PokemonTower5AfterBattleText3 + db "@" + +PokemonTower5Text5: + TX_ASM + ld hl, PokemonTower5TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower5BattleText4: + TX_FAR _PokemonTower5BattleText4 + db "@" + +PokemonTower5EndBattleText4: + TX_FAR _PokemonTower5EndBattleText4 + db "@" + +PokemonTower5AfterBattleText4: + TX_FAR _PokemonTower5AfterBattleText4 + db "@" + +PokemonTower5Text7: + TX_FAR _PokemonTower5Text7 + db "@" diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm new file mode 100755 index 00000000..14c07c48 --- /dev/null +++ b/scripts/PokemonTower6F.asm @@ -0,0 +1,212 @@ +PokemonTower6F_Script: + call EnableAutoTextBoxDrawing + ld hl, PokemonTower6TrainerHeader0 + ld de, PokemonTower6F_ScriptPointers + ld a, [wPokemonTower6FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonTower6FCurScript], a + ret + +PokemonTower6Script_60b02: + xor a + ld [wJoyIgnore], a + ld [wPokemonTower6FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower6F_ScriptPointers: + dw PokemonTower6Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw PokemonTower6Script3 + dw PokemonTower6Script4 + +PokemonTower6Script0: + CheckEvent EVENT_BEAT_GHOST_MAROWAK + jp nz, CheckFightingMapTrainers + ld hl, CoordsData_60b45 + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyHeld], a + ld a, $6 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, MAROWAK + ld [wCurOpponent], a + ld a, 30 + ld [wCurEnemyLVL], a + ld a, $4 + ld [wPokemonTower6FCurScript], a + ld [wCurMapScript], a + ret + +CoordsData_60b45: + db $10,$0A,$FF + +PokemonTower6Script4: + ld a, [wIsInBattle] + cp $ff + jp z, PokemonTower6Script_60b02 + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd72d] + bit 6, a + ret nz + call UpdateSprites + ld a, $f0 + ld [wJoyIgnore], a + ld a, [wBattleResult] + and a + jr nz, .asm_60b82 + SetEvent EVENT_BEAT_GHOST_MAROWAK + ld a, $7 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wPokemonTower6FCurScript], a + ld [wCurMapScript], a + ret +.asm_60b82 + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, $10 + ld [wSimulatedJoypadStatesEnd], a + xor a + ld [wSpriteStateData2 + $06], a + ld [wOverrideSimulatedJoypadStatesMask], a + ld hl, wd730 + set 7, [hl] + ld a, $3 + ld [wPokemonTower6FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower6Script3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wPokemonTower6FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower6F_TextPointers: + dw PokemonTower6Text1 + dw PokemonTower6Text2 + dw PokemonTower6Text3 + dw PickUpItemText + dw PickUpItemText + dw PokemonTower6Text6 + dw PokemonTower6Text7 + +PokemonTower6TrainerHeader0: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 + dw PokemonTower6BattleText1 ; TextBeforeBattle + dw PokemonTower6AfterBattleText1 ; TextAfterBattle + dw PokemonTower6EndBattleText1 ; TextEndBattle + dw PokemonTower6EndBattleText1 ; TextEndBattle + +PokemonTower6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 + dw PokemonTower6BattleText2 ; TextBeforeBattle + dw PokemonTower6AfterBattleText2 ; TextAfterBattle + dw PokemonTower6EndBattleText2 ; TextEndBattle + dw PokemonTower6EndBattleText2 ; TextEndBattle + +PokemonTower6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 + dw PokemonTower6BattleText3 ; TextBeforeBattle + dw PokemonTower6AfterBattleText3 ; TextAfterBattle + dw PokemonTower6EndBattleText3 ; TextEndBattle + dw PokemonTower6EndBattleText3 ; TextEndBattle + + db $ff + +PokemonTower6Text1: + TX_ASM + ld hl, PokemonTower6TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower6Text2: + TX_ASM + ld hl, PokemonTower6TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower6Text3: + TX_ASM + ld hl, PokemonTower6TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower6Text7: + TX_ASM + ld hl, PokemonTower2Text_60c1f + call PrintText + ld a, MAROWAK + call PlayCry + call WaitForSoundToFinish + ld c, 30 + call DelayFrames + ld hl, PokemonTower2Text_60c24 + call PrintText + jp TextScriptEnd + +PokemonTower2Text_60c1f: + TX_FAR _PokemonTower2Text_60c1f + db "@" + +PokemonTower2Text_60c24: + TX_FAR _PokemonTower2Text_60c24 + db "@" + +PokemonTower6BattleText1: + TX_FAR _PokemonTower6BattleText1 + db "@" + +PokemonTower6EndBattleText1: + TX_FAR _PokemonTower6EndBattleText1 + db "@" + +PokemonTower6AfterBattleText1: + TX_FAR _PokemonTower6AfterBattleText1 + db "@" + +PokemonTower6BattleText2: + TX_FAR _PokemonTower6BattleText2 + db "@" + +PokemonTower6EndBattleText2: + TX_FAR _PokemonTower6EndBattleText2 + db "@" + +PokemonTower6AfterBattleText2: + TX_FAR _PokemonTower6AfterBattleText2 + db "@" + +PokemonTower6BattleText3: + TX_FAR _PokemonTower6BattleText3 + db "@" + +PokemonTower6EndBattleText3: + TX_FAR _PokemonTower6EndBattleText3 + db "@" + +PokemonTower6AfterBattleText3: + TX_FAR _PokemonTower6AfterBattleText3 + db "@" + +PokemonTower6Text6: + TX_FAR _PokemonTower6Text6 + db "@" diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm new file mode 100755 index 00000000..4b2a1827 --- /dev/null +++ b/scripts/PokemonTower7F.asm @@ -0,0 +1,312 @@ +PokemonTower7F_Script: + call EnableAutoTextBoxDrawing + ld hl, PokemonTower7TrainerHeader0 + ld de, PokemonTower7F_ScriptPointers + ld a, [wPokemonTower7FCurScript] + call ExecuteCurMapScriptInTable + ld [wPokemonTower7FCurScript], a + ret + +PokemonTower7Script_60d18: + xor a + ld [wJoyIgnore], a + ld [wPokemonTower7FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower7F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw PokemonTower7Script2 + dw PokemonTower7Script3 + dw PokemonTower7Script4 + +PokemonTower7Script2: + ld hl, wFlags_0xcd60 + res 0, [hl] + ld a, [wIsInBattle] + cp $ff + jp z, PokemonTower7Script_60d18 + call EndTrainerBattle + ld a, $f0 + ld [wJoyIgnore], a + ld a, [wSpriteIndex] + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call PokemonTower7Script_60db6 + ld a, $3 + ld [wPokemonTower7FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower7Script3: + ld a, [wd730] + bit 0, a + ret nz + ld hl, wMissableObjectList + ld a, [wSpriteIndex] + ld b, a +.missableObjectsListLoop + ld a, [hli] + cp b ; search for sprite ID in missing objects list + ld a, [hli] + jr nz, .missableObjectsListLoop + ld [wMissableObjectIndex], a ; remove missable object + predef HideObject + xor a + ld [wJoyIgnore], a + ld [wSpriteIndex], a + ld [wTrainerHeaderFlagBit], a + ld [wUnusedDA38], a + ld a, $0 + ld [wPokemonTower7FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower7Script4: + ld a, $ff + ld [wJoyIgnore], a + ld a, HS_POKEMON_TOWER_7F_MR_FUJI + ld [wMissableObjectIndex], a + predef HideObject + ld a, SPRITE_FACING_UP + ld [wSpriteStateData1 + 9], a + ld a, MR_FUJIS_HOUSE + ld [hWarpDestinationMap], a + ld a, $1 + ld [wDestinationWarpID], a + ld a, LAVENDER_TOWN + ld [wLastMap], a + ld hl, wd72d + set 3, [hl] + ld a, $0 + ld [wPokemonTower7FCurScript], a + ld [wCurMapScript], a + ret + +PokemonTower7Script_60db6: + ld hl, CoordsData_60de3 + ld a, [wSpriteIndex] + dec a + swap a + ld d, $0 + ld e, a + add hl, de + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a +.asm_60dcb + ld a, [hli] + cp b + jr nz, .asm_60dde + ld a, [hli] + cp c + jr nz, .asm_60ddf + ld a, [hli] + ld d, [hl] + ld e, a + ld a, [wSpriteIndex] + ld [H_SPRITEINDEX], a + jp MoveSprite +.asm_60dde + inc hl +.asm_60ddf + inc hl + inc hl + jr .asm_60dcb + +CoordsData_60de3: + db $0C,$09 + dw MovementData_60e13 + db $0B,$0A + dw MovementData_60e1b + db $0B,$0B + dw MovementData_60e22 + db $0B,$0C + dw MovementData_60e22 + db $0A,$0C + dw MovementData_60e28 + db $09,$0B + dw MovementData_60e30 + db $09,$0A + dw MovementData_60e22 + db $09,$09 + dw MovementData_60e22 + db $08,$09 + dw MovementData_60e37 + db $07,$0A + dw MovementData_60e22 + db $07,$0B + dw MovementData_60e22 + db $07,$0C + dw MovementData_60e22 + +MovementData_60e13: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_LEFT + db $FF + +MovementData_60e1b: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +MovementData_60e22: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +MovementData_60e28: + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +MovementData_60e30: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +MovementData_60e37: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +PokemonTower7F_TextPointers: + dw PokemonTower7Text1 + dw PokemonTower7Text2 + dw PokemonTower7Text3 + dw PokemonTower7FujiText + +PokemonTower7TrainerHeader0: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 + dw PokemonTower7BattleText1 ; TextBeforeBattle + dw PokemonTower7AfterBattleText1 ; TextAfterBattle + dw PokemonTower7EndBattleText1 ; TextEndBattle + dw PokemonTower7EndBattleText1 ; TextEndBattle + +PokemonTower7TrainerHeader1: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 + dw PokemonTower7BattleText2 ; TextBeforeBattle + dw PokemonTower7AfterBattleText2 ; TextAfterBattle + dw PokemonTower7EndBattleText2 ; TextEndBattle + dw PokemonTower7EndBattleText2 ; TextEndBattle + +PokemonTower7TrainerHeader2: + dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 + dw PokemonTower7BattleText3 ; TextBeforeBattle + dw PokemonTower7AfterBattleText3 ; TextAfterBattle + dw PokemonTower7EndBattleText3 ; TextEndBattle + dw PokemonTower7EndBattleText3 ; TextEndBattle + + db $ff + +PokemonTower7Text1: + TX_ASM + ld hl, PokemonTower7TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower7Text2: + TX_ASM + ld hl, PokemonTower7TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower7Text3: + TX_ASM + ld hl, PokemonTower7TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +PokemonTower7FujiText: + TX_ASM + ld hl, TowerRescueFujiText + call PrintText + SetEvent EVENT_RESCUED_MR_FUJI + SetEvent EVENT_RESCUED_MR_FUJI_2 + ld a, HS_MR_FUJIS_HOUSE_MR_FUJI + ld [wMissableObjectIndex], a + predef ShowObject + ld a, HS_SAFFRON_CITY_E + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_SAFFRON_CITY_F + ld [wMissableObjectIndex], a + predef ShowObject + ld a, $4 + ld [wPokemonTower7FCurScript], a + ld [wCurMapScript], a + jp TextScriptEnd + +TowerRescueFujiText: + TX_FAR _TowerRescueFujiText + db "@" + +PokemonTower7BattleText1: + TX_FAR _PokemonTower7BattleText1 + db "@" + +PokemonTower7EndBattleText1: + TX_FAR _PokemonTower7EndBattleText1 + db "@" + +PokemonTower7AfterBattleText1: + TX_FAR _PokemonTower7AfterBattleText1 + db "@" + +PokemonTower7BattleText2: + TX_FAR _PokemonTower7BattleText2 + db "@" + +PokemonTower7EndBattleText2: + TX_FAR _PokemonTower7EndBattleText2 + db "@" + +PokemonTower7AfterBattleText2: + TX_FAR _PokemonTower7AfterBattleText2 + db "@" + +PokemonTower7BattleText3: + TX_FAR _PokemonTower7BattleText3 + db "@" + +PokemonTower7EndBattleText3: + TX_FAR _PokemonTower7EndBattleText3 + db "@" + +PokemonTower7AfterBattleText3: + TX_FAR _PokemonTower7AfterBattleText3 + db "@" diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm new file mode 100755 index 00000000..35b4893f --- /dev/null +++ b/scripts/PowerPlant.asm @@ -0,0 +1,175 @@ +PowerPlant_Script: + call EnableAutoTextBoxDrawing + ld hl, Voltorb0TrainerHeader + ld de, PowerPlant_ScriptPointers + ld a, [wPowerPlantCurScript] + call ExecuteCurMapScriptInTable + ld [wPowerPlantCurScript], a + ret + +PowerPlant_ScriptPointers + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +PowerPlant_TextPointers: + dw Voltorb0Text + dw Voltorb1Text + dw Voltorb2Text + dw Voltorb3Text + dw Voltorb4Text + dw Voltorb5Text + dw Voltorb6Text + dw Voltorb7Text + dw ZapdosText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +Voltorb0TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb1TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb2TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb3TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb4TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb5TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb6TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +Voltorb7TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 + dw VoltorbBattleText ; TextBeforeBattle + dw VoltorbBattleText ; TextAfterBattle + dw VoltorbBattleText ; TextEndBattle + dw VoltorbBattleText ; TextEndBattle + +ZapdosTrainerHeader: + dbEventFlagBit EVENT_BEAT_ZAPDOS, 1 + db 0 ; view range + dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1 + dw ZapdosBattleText ; TextBeforeBattle + dw ZapdosBattleText ; TextAfterBattle + dw ZapdosBattleText ; TextEndBattle + dw ZapdosBattleText ; TextEndBattle + + db $ff + +InitVoltorbBattle: + call TalkToTrainer + ld a, [wCurMapScript] + ld [wPowerPlantCurScript], a + jp TextScriptEnd + +Voltorb0Text: + TX_ASM + ld hl, Voltorb0TrainerHeader + jr InitVoltorbBattle + +Voltorb1Text: + TX_ASM + ld hl, Voltorb1TrainerHeader + jr InitVoltorbBattle + +Voltorb2Text: + TX_ASM + ld hl, Voltorb2TrainerHeader + jr InitVoltorbBattle + +Voltorb3Text: + TX_ASM + ld hl, Voltorb3TrainerHeader + jr InitVoltorbBattle + +Voltorb4Text: + TX_ASM + ld hl, Voltorb4TrainerHeader + jr InitVoltorbBattle + +Voltorb5Text: + TX_ASM + ld hl, Voltorb5TrainerHeader + jr InitVoltorbBattle + +Voltorb6Text: + TX_ASM + ld hl, Voltorb6TrainerHeader + jr InitVoltorbBattle + +Voltorb7Text: + TX_ASM + ld hl, Voltorb7TrainerHeader + jr InitVoltorbBattle + +ZapdosText: + TX_ASM + ld hl, ZapdosTrainerHeader + jr InitVoltorbBattle + +VoltorbBattleText: + TX_FAR _VoltorbBattleText + db "@" + +ZapdosBattleText: + TX_FAR _ZapdosBattleText + TX_ASM + ld a, ZAPDOS + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm new file mode 100755 index 00000000..b982d71c --- /dev/null +++ b/scripts/RedsHouse1F.asm @@ -0,0 +1,69 @@ +RedsHouse1F_Script: + jp EnableAutoTextBoxDrawing + +RedsHouse1F_TextPointers: + dw RedsHouse1FText1 + dw RedsHouse1FText2 + +RedsHouse1FText1: ; Mom + TX_ASM + ld a, [wd72e] + bit 3, a + jr nz, .heal ; if player has received a Pokémon from Oak, heal team + ld hl, MomWakeUpText + call PrintText + jr .done +.heal + call MomHealPokemon +.done + jp TextScriptEnd + +MomWakeUpText: + TX_FAR _MomWakeUpText + db "@" + +MomHealPokemon: + ld hl, MomHealText1 + call PrintText + call GBFadeOutToWhite + call ReloadMapData + predef HealParty + ld a, MUSIC_PKMN_HEALED + ld [wNewSoundID], a + call PlaySound +.next + ld a, [wChannelSoundIDs] + cp MUSIC_PKMN_HEALED + jr z, .next + ld a, [wMapMusicSoundID] + ld [wNewSoundID], a + call PlaySound + call GBFadeInFromWhite + ld hl, MomHealText2 + jp PrintText + +MomHealText1: + TX_FAR _MomHealText1 + db "@" +MomHealText2: + TX_FAR _MomHealText2 + db "@" + +RedsHouse1FText2: ; TV + TX_ASM + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + ld hl, TVWrongSideText + jr nz, .notUp + ld hl, StandByMeText +.notUp + call PrintText + jp TextScriptEnd + +StandByMeText: + TX_FAR _StandByMeText + db "@" + +TVWrongSideText: + TX_FAR _TVWrongSideText + db "@" diff --git a/scripts/RedsHouse2F.asm b/scripts/RedsHouse2F.asm new file mode 100755 index 00000000..5ec86678 --- /dev/null +++ b/scripts/RedsHouse2F.asm @@ -0,0 +1,24 @@ +RedsHouse2F_Script: + call EnableAutoTextBoxDrawing + ld hl, RedsHouse2F_ScriptPointers + ld a, [wRedsHouse2FCurScript] + jp CallFunctionInTable + +RedsHouse2F_ScriptPointers: + dw RedsHouse2FScript0 + dw RedsHouse2FScript1 + +RedsHouse2FScript0: + xor a + ld [hJoyHeld], a + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + ld a, 1 + ld [wRedsHouse2FCurScript], a + ret + +RedsHouse2FScript1: + ret + +RedsHouse2F_TextPointers: + db "@" diff --git a/scripts/RockTunnel1F.asm b/scripts/RockTunnel1F.asm new file mode 100755 index 00000000..94620d96 --- /dev/null +++ b/scripts/RockTunnel1F.asm @@ -0,0 +1,213 @@ +RockTunnel1F_Script: + call EnableAutoTextBoxDrawing + ld hl, RockTunnel1TrainerHeader0 + ld de, RockTunnel1F_ScriptPointers + ld a, [wRockTunnel1FCurScript] + call ExecuteCurMapScriptInTable + ld [wRockTunnel1FCurScript], a + ret + +RockTunnel1F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +RockTunnel1F_TextPointers: + dw RockTunnel1Text1 + dw RockTunnel1Text2 + dw RockTunnel1Text3 + dw RockTunnel1Text4 + dw RockTunnel1Text5 + dw RockTunnel1Text6 + dw RockTunnel1Text7 + dw RockTunnel1Text8 + +RockTunnel1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 + dw RockTunnel1BattleText1 ; TextBeforeBattle + dw RockTunnel1AfterBattleText1 ; TextAfterBattle + dw RockTunnel1EndBattleText1 ; TextEndBattle + dw RockTunnel1EndBattleText1 ; TextEndBattle + +RockTunnel1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 + dw RockTunnel1BattleText2 ; TextBeforeBattle + dw RockTunnel1AfterBattleText2 ; TextAfterBattle + dw RockTunnel1EndBattleText2 ; TextEndBattle + dw RockTunnel1EndBattleText2 ; TextEndBattle + +RockTunnel1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 + dw RockTunnel1BattleText3 ; TextBeforeBattle + dw RockTunnel1AfterBattleText3 ; TextAfterBattle + dw RockTunnel1EndBattleText3 ; TextEndBattle + dw RockTunnel1EndBattleText3 ; TextEndBattle + +RockTunnel1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 + dw RockTunnel1BattleText4 ; TextBeforeBattle + dw RockTunnel1AfterBattleText4 ; TextAfterBattle + dw RockTunnel1EndBattleText4 ; TextEndBattle + dw RockTunnel1EndBattleText4 ; TextEndBattle + +RockTunnel1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 + dw RockTunnel1BattleText5 ; TextBeforeBattle + dw RockTunnel1AfterBattleText5 ; TextAfterBattle + dw RockTunnel1EndBattleText5 ; TextEndBattle + dw RockTunnel1EndBattleText5 ; TextEndBattle + +RockTunnel1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 + dw RockTunnel1BattleText6 ; TextBeforeBattle + dw RockTunnel1AfterBattleText6 ; TextAfterBattle + dw RockTunnel1EndBattleText6 ; TextEndBattle + dw RockTunnel1EndBattleText6 ; TextEndBattle + +RockTunnel1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 + dw RockTunnel1BattleText7 ; TextBeforeBattle + dw RockTunnel1AfterBattleText7 ; TextAfterBattle + dw RockTunnel1EndBattleText7 ; TextEndBattle + dw RockTunnel1EndBattleText7 ; TextEndBattle + + db $ff + +RockTunnel1Text1: + TX_ASM + ld hl, RockTunnel1TrainerHeader0 + jr RockTunnel1TalkToTrainer + +RockTunnel1Text2: + TX_ASM + ld hl, RockTunnel1TrainerHeader1 + jr RockTunnel1TalkToTrainer + +RockTunnel1Text3: + TX_ASM + ld hl, RockTunnel1TrainerHeader2 + jr RockTunnel1TalkToTrainer + +RockTunnel1Text4: + TX_ASM + ld hl, RockTunnel1TrainerHeader3 + jr RockTunnel1TalkToTrainer + +RockTunnel1Text5: + TX_ASM + ld hl, RockTunnel1TrainerHeader4 + jr RockTunnel1TalkToTrainer + +RockTunnel1Text6: + TX_ASM + ld hl, RockTunnel1TrainerHeader5 + jr RockTunnel1TalkToTrainer + +RockTunnel1Text7: + TX_ASM + ld hl, RockTunnel1TrainerHeader6 +RockTunnel1TalkToTrainer: + call TalkToTrainer + jp TextScriptEnd + +RockTunnel1BattleText1: + TX_FAR _RockTunnel1BattleText1 + db "@" + +RockTunnel1EndBattleText1: + TX_FAR _RockTunnel1EndBattleText1 + db "@" + +RockTunnel1AfterBattleText1: + TX_FAR _RockTunnel1AfterBattleText1 + db "@" + +RockTunnel1BattleText2: + TX_FAR _RockTunnel1BattleText2 + db "@" + +RockTunnel1EndBattleText2: + TX_FAR _RockTunnel1EndBattleText2 + db "@" + +RockTunnel1AfterBattleText2: + TX_FAR _RockTunnel1AfterBattleText2 + db "@" + +RockTunnel1BattleText3: + TX_FAR _RockTunnel1BattleText3 + db "@" + +RockTunnel1EndBattleText3: + TX_FAR _RockTunnel1EndBattleText3 + db "@" + +RockTunnel1AfterBattleText3: + TX_FAR _RockTunnel1AfterBattleText3 + db "@" + +RockTunnel1BattleText4: + TX_FAR _RockTunnel1BattleText4 + db "@" + +RockTunnel1EndBattleText4: + TX_FAR _RockTunnel1EndBattleText4 + db "@" + +RockTunnel1AfterBattleText4: + TX_FAR _RockTunnel1AfterBattleText4 + db "@" + +RockTunnel1BattleText5: + TX_FAR _RockTunnel1BattleText5 + db "@" + +RockTunnel1EndBattleText5: + TX_FAR _RockTunnel1EndBattleText5 + db "@" + +RockTunnel1AfterBattleText5: + TX_FAR _RockTunnel1AfterBattleText5 + db "@" + +RockTunnel1BattleText6: + TX_FAR _RockTunnel1BattleText6 + db "@" + +RockTunnel1EndBattleText6: + TX_FAR _RockTunnel1EndBattleText6 + db "@" + +RockTunnel1AfterBattleText6: + TX_FAR _RockTunnel1AfterBattleText6 + db "@" + +RockTunnel1BattleText7: + TX_FAR _RockTunnel1BattleText7 + db "@" + +RockTunnel1EndBattleText7: + TX_FAR _RockTunnel1EndBattleText7 + db "@" + +RockTunnel1AfterBattleText7: + TX_FAR _RockTunnel1AfterBattleText7 + db "@" + +RockTunnel1Text8: + TX_FAR _RockTunnel1Text8 + db "@" diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm new file mode 100755 index 00000000..7e6fcc8b --- /dev/null +++ b/scripts/RockTunnelB1F.asm @@ -0,0 +1,241 @@ +RockTunnelB1F_Script: + call EnableAutoTextBoxDrawing + ld hl, RockTunnel2TrainerHeader0 + ld de, RockTunnelB1F_ScriptPointers + ld a, [wRockTunnelB1FCurScript] + call ExecuteCurMapScriptInTable + ld [wRockTunnelB1FCurScript], a + ret + +RockTunnelB1F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +RockTunnelB1F_TextPointers: + dw RockTunnel2Text1 + dw RockTunnel2Text2 + dw RockTunnel2Text3 + dw RockTunnel2Text4 + dw RockTunnel2Text5 + dw RockTunnel2Text6 + dw RockTunnel2Text7 + dw RockTunnel2Text8 + +RockTunnel2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 + dw RockTunnel2BattleText2 ; TextBeforeBattle + dw RockTunnel2AfterBattleText2 ; TextAfterBattle + dw RockTunnel2EndBattleText2 ; TextEndBattle + dw RockTunnel2EndBattleText2 ; TextEndBattle + +RockTunnel2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 + dw RockTunnel2BattleText3 ; TextBeforeBattle + dw RockTunnel2AfterBattleText3 ; TextAfterBattle + dw RockTunnel2EndBattleText3 ; TextEndBattle + dw RockTunnel2EndBattleText3 ; TextEndBattle + +RockTunnel2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 + dw RockTunnel2BattleText4 ; TextBeforeBattle + dw RockTunnel2AfterBattleText4 ; TextAfterBattle + dw RockTunnel2EndBattleText4 ; TextEndBattle + dw RockTunnel2EndBattleText4 ; TextEndBattle + +RockTunnel2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 + dw RockTunnel2BattleText5 ; TextBeforeBattle + dw RockTunnel2AfterBattleText5 ; TextAfterBattle + dw RockTunnel2EndBattleText5 ; TextEndBattle + dw RockTunnel2EndBattleText5 ; TextEndBattle + +RockTunnel2TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 + dw RockTunnel2BattleText6 ; TextBeforeBattle + dw RockTunnel2AfterBattleText6 ; TextAfterBattle + dw RockTunnel2EndBattleText6 ; TextEndBattle + dw RockTunnel2EndBattleText6 ; TextEndBattle + +RockTunnel2TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 + dw RockTunnel2BattleText7 ; TextBeforeBattle + dw RockTunnel2AfterBattleText7 ; TextAfterBattle + dw RockTunnel2EndBattleText7 ; TextEndBattle + dw RockTunnel2EndBattleText7 ; TextEndBattle + +RockTunnel2TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 + dw RockTunnel2BattleText8 ; TextBeforeBattle + dw RockTunnel2AfterBattleText8 ; TextAfterBattle + dw RockTunnel2EndBattleText8 ; TextEndBattle + dw RockTunnel2EndBattleText8 ; TextEndBattle + +RockTunnel2TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 + dw RockTunnel2BattleText9 ; TextBeforeBattle + dw RockTunnel2AfterBattleText9 ; TextAfterBattle + dw RockTunnel2EndBattleText9 ; TextEndBattle + dw RockTunnel2EndBattleText9 ; TextEndBattle + + db $ff + +RockTunnel2Text1: + TX_ASM + ld hl, RockTunnel2TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text2: + TX_ASM + ld hl, RockTunnel2TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text3: + TX_ASM + ld hl, RockTunnel2TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text4: + TX_ASM + ld hl, RockTunnel2TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text5: + TX_ASM + ld hl, RockTunnel2TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text6: + TX_ASM + ld hl, RockTunnel2TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text7: + TX_ASM + ld hl, RockTunnel2TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2Text8: + TX_ASM + ld hl, RockTunnel2TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +RockTunnel2BattleText2: + TX_FAR _RockTunnel2BattleText2 + db "@" + +RockTunnel2EndBattleText2: + TX_FAR _RockTunnel2EndBattleText2 + db "@" + +RockTunnel2AfterBattleText2: + TX_FAR _RockTunnel2AfterBattleText2 + db "@" + +RockTunnel2BattleText3: + TX_FAR _RockTunnel2BattleText3 + db "@" + +RockTunnel2EndBattleText3: + TX_FAR _RockTunnel2EndBattleText3 + db "@" + +RockTunnel2AfterBattleText3: + TX_FAR _RockTunnel2AfterBattleText3 + db "@" + +RockTunnel2BattleText4: + TX_FAR _RockTunnel2BattleText4 + db "@" + +RockTunnel2EndBattleText4: + TX_FAR _RockTunnel2EndBattleText4 + db "@" + +RockTunnel2AfterBattleText4: + TX_FAR _RockTunnel2AfterBattleText4 + db "@" + +RockTunnel2BattleText5: + TX_FAR _RockTunnel2BattleText5 + db "@" + +RockTunnel2EndBattleText5: + TX_FAR _RockTunnel2EndBattleText5 + db "@" + +RockTunnel2AfterBattleText5: + TX_FAR _RockTunnel2AfterBattleText5 + db "@" + +RockTunnel2BattleText6: + TX_FAR _RockTunnel2BattleText6 + db "@" + +RockTunnel2EndBattleText6: + TX_FAR _RockTunnel2EndBattleText6 + db "@" + +RockTunnel2AfterBattleText6: + TX_FAR _RockTunnel2AfterBattleText6 + db "@" + +RockTunnel2BattleText7: + TX_FAR _RockTunnel2BattleText7 + db "@" + +RockTunnel2EndBattleText7: + TX_FAR _RockTunnel2EndBattleText7 + db "@" + +RockTunnel2AfterBattleText7: + TX_FAR _RockTunnel2AfterBattleText7 + db "@" + +RockTunnel2BattleText8: + TX_FAR _RockTunnel2BattleText8 + db "@" + +RockTunnel2EndBattleText8: + TX_FAR _RockTunnel2EndBattleText8 + db "@" + +RockTunnel2AfterBattleText8: + TX_FAR _RockTunnel2AfterBattleText8 + db "@" + +RockTunnel2BattleText9: + TX_FAR _RockTunnel2BattleText9 + db "@" + +RockTunnel2EndBattleText9: + TX_FAR _RockTunnel2EndBattleText9 + db "@" + +RockTunnel2AfterBattleText9: + TX_FAR _RockTunnel2AfterBattleText9 + db "@" diff --git a/scripts/RockTunnelPokecenter.asm b/scripts/RockTunnelPokecenter.asm new file mode 100755 index 00000000..cbcd6318 --- /dev/null +++ b/scripts/RockTunnelPokecenter.asm @@ -0,0 +1,23 @@ +RockTunnelPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +RockTunnelPokecenter_TextPointers: + dw RockTunnelHealNurseText + dw RockTunnelPokecenterText2 + dw RockTunnelPokecenterText3 + dw RockTunnelTradeNurseText + +RockTunnelHealNurseText: + db $ff + +RockTunnelPokecenterText2: + TX_FAR _RockTunnelPokecenterText2 + db "@" + +RockTunnelPokecenterText3: + TX_FAR _RockTunnelPokecenterText3 + db "@" + +RockTunnelTradeNurseText: + db $f6 diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm new file mode 100755 index 00000000..0cbddb49 --- /dev/null +++ b/scripts/RocketHideoutB1F.asm @@ -0,0 +1,189 @@ +RocketHideoutB1F_Script: + call RocketHideout1Script_44be0 + call EnableAutoTextBoxDrawing + ld hl, RocketHideout1TrainerHeader0 + ld de, RocketHideoutB1F_ScriptPointers + ld a, [wRocketHideoutB1FCurScript] + call ExecuteCurMapScriptInTable + ld [wRocketHideoutB1FCurScript], a + ret + +RocketHideout1Script_44be0: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_677 + jr nz, .asm_44c01 + CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + jr nz, .asm_44bf7 + ld a, $54 + jr .asm_44c03 +.asm_44bf7 + ld a, SFX_GO_INSIDE + call PlaySound + CheckEventHL EVENT_677 +.asm_44c01 + ld a, $e +.asm_44c03 + ld [wNewTileBlockID], a + lb bc, 8, 12 + predef_jump ReplaceTileBlock + +RocketHideoutB1F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +RocketHideoutB1F_TextPointers: + dw RocketHideout1Text1 + dw RocketHideout1Text2 + dw RocketHideout1Text3 + dw RocketHideout1Text4 + dw RocketHideout1Text5 + dw PickUpItemText + dw PickUpItemText + +RocketHideout1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 + dw RocketHideout1BattleText2 ; TextBeforeBattle + dw RocketHideout1AfterBattleTxt2 ; TextAfterBattle + dw RocketHideout1EndBattleText2 ; TextEndBattle + dw RocketHideout1EndBattleText2 ; TextEndBattle + +RocketHideout1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 + dw RocketHideout1BattleText3 ; TextBeforeBattle + dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle + dw RocketHideout1EndBattleText3 ; TextEndBattle + dw RocketHideout1EndBattleText3 ; TextEndBattle + +RocketHideout1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 + dw RocketHideout1BattleText4 ; TextBeforeBattle + dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle + dw RocketHideout1EndBattleText4 ; TextEndBattle + dw RocketHideout1EndBattleText4 ; TextEndBattle + +RocketHideout1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 + dw RocketHideout1BattleText5 ; TextBeforeBattle + dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle + dw RocketHideout1EndBattleText5 ; TextEndBattle + dw RocketHideout1EndBattleText5 ; TextEndBattle + +RocketHideout1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + dw RocketHideout1BattleText6 ; TextBeforeBattle + dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle + dw RocketHideout1EndBattleText6 ; TextEndBattle + dw RocketHideout1EndBattleText6 ; TextEndBattle + + db $ff + +RocketHideout1Text1: + TX_ASM + ld hl, RocketHideout1TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout1Text2: + TX_ASM + ld hl, RocketHideout1TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout1Text3: + TX_ASM + ld hl, RocketHideout1TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout1Text4: + TX_ASM + ld hl, RocketHideout1TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout1Text5: + TX_ASM + ld hl, RocketHideout1TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout1EndBattleText6: + TX_FAR _RocketHideout1EndBattleText6 + TX_ASM + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + ld hl, RocketHideout1Text_44c9f + ret + +RocketHideout1Text_44c9f: + TX_BLINK + db "@" + +RocketHideout1BattleText2: + TX_FAR _RocketHideout1BattleText2 + db "@" + +RocketHideout1EndBattleText2: + TX_FAR _RocketHideout1EndBattleText2 + db "@" + +RocketHideout1AfterBattleTxt2: + TX_FAR _RocketHideout1AfterBattleTxt2 + db "@" + +RocketHideout1BattleText3: + TX_FAR _RocketHideout1BattleText3 + db "@" + +RocketHideout1EndBattleText3: + TX_FAR _RocketHideout1EndBattleText3 + db "@" + +RocketHideout1AfterBattleTxt3: + TX_FAR _RocketHideout1AfterBattleTxt3 + db "@" + +RocketHideout1BattleText4: + TX_FAR _RocketHideout1BattleText4 + db "@" + +RocketHideout1EndBattleText4: + TX_FAR _RocketHideout1EndBattleText4 + db "@" + +RocketHideout1AfterBattleTxt4: + TX_FAR _RocketHideout1AfterBattleTxt4 + db "@" + +RocketHideout1BattleText5: + TX_FAR _RocketHideout1BattleText5 + db "@" + +RocketHideout1EndBattleText5: + TX_FAR _RocketHideout1EndBattleText5 + db "@" + +RocketHideout1AfterBattleTxt5: + TX_FAR _RocketHideout1AfterBattleTxt5 + db "@" + +RocketHideout1BattleText6: + TX_FAR _RocketHideout1BattleText6 + db "@" + +RocketHideout1AfterBattleTxt6: + TX_FAR _RocketHideout1AfterBattleTxt6 + db "@" diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm new file mode 100755 index 00000000..1b487df2 --- /dev/null +++ b/scripts/RocketHideoutB2F.asm @@ -0,0 +1,450 @@ +RocketHideoutB2F_Script: + call EnableAutoTextBoxDrawing + ld hl, RocketHideout2TrainerHeader0 + ld de, RocketHideoutB2F_ScriptPointers + ld a, [wRocketHideoutB2FCurScript] + call ExecuteCurMapScriptInTable + ld [wRocketHideoutB2FCurScript], a + ret + +RocketHideoutB2F_ScriptPointers: + dw RocketHideout2Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw RocketHideout2Script3 + +RocketHideout2Script0: + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a + ld hl, RocketHideout2ArrowTilePlayerMovement + call DecodeArrowMovementRLE + cp $ff + jp z, CheckFightingMapTrainers + ld hl, wd736 + set 7, [hl] + call StartSimulatingJoypadStates + ld a, SFX_ARROW_TILES + call PlaySound + ld a, $ff + ld [wJoyIgnore], a + ld a, $3 + ld [wCurMapScript], a + ret + +;format: +;db y,x +;dw pointer to movement +RocketHideout2ArrowTilePlayerMovement: + db $9,$4 + dw RocketHideout2ArrowMovement1 + db $b,$4 + dw RocketHideout2ArrowMovement2 + db $f,$4 + dw RocketHideout2ArrowMovement3 + db $10,$4 + dw RocketHideout2ArrowMovement4 + db $13,$4 + dw RocketHideout2ArrowMovement1 + db $16,$4 + dw RocketHideout2ArrowMovement5 + db $e,$5 + dw RocketHideout2ArrowMovement6 + db $16,$6 + dw RocketHideout2ArrowMovement7 + db $18,$6 + dw RocketHideout2ArrowMovement8 + db $9,$8 + dw RocketHideout2ArrowMovement9 + db $c,$8 + dw RocketHideout2ArrowMovement10 + db $f,$8 + dw RocketHideout2ArrowMovement8 + db $13,$8 + dw RocketHideout2ArrowMovement9 + db $17,$8 + dw RocketHideout2ArrowMovement11 + db $e,$9 + dw RocketHideout2ArrowMovement12 + db $16,$9 + dw RocketHideout2ArrowMovement12 + db $9,$a + dw RocketHideout2ArrowMovement13 + db $a,$a + dw RocketHideout2ArrowMovement14 + db $f,$a + dw RocketHideout2ArrowMovement15 + db $11,$a + dw RocketHideout2ArrowMovement16 + db $13,$a + dw RocketHideout2ArrowMovement17 + db $19,$a + dw RocketHideout2ArrowMovement2 + db $e,$b + dw RocketHideout2ArrowMovement18 + db $10,$b + dw RocketHideout2ArrowMovement19 + db $12,$b + dw RocketHideout2ArrowMovement12 + db $9,$c + dw RocketHideout2ArrowMovement20 + db $b,$c + dw RocketHideout2ArrowMovement21 + db $d,$c + dw RocketHideout2ArrowMovement22 + db $11,$c + dw RocketHideout2ArrowMovement23 + db $a,$d + dw RocketHideout2ArrowMovement24 + db $c,$d + dw RocketHideout2ArrowMovement25 + db $10,$d + dw RocketHideout2ArrowMovement26 + db $12,$d + dw RocketHideout2ArrowMovement27 + db $13,$d + dw RocketHideout2ArrowMovement28 + db $16,$d + dw RocketHideout2ArrowMovement29 + db $17,$d + dw RocketHideout2ArrowMovement30 + db $11,$e + dw RocketHideout2ArrowMovement31 + db $10,$f + dw RocketHideout2ArrowMovement12 + db $e,$10 + dw RocketHideout2ArrowMovement32 + db $10,$10 + dw RocketHideout2ArrowMovement33 + db $12,$10 + dw RocketHideout2ArrowMovement34 + db $a,$11 + dw RocketHideout2ArrowMovement35 + db $b,$11 + dw RocketHideout2ArrowMovement36 + db $FF + +;format: direction, count +;each list is read starting from the $FF and working backwards +RocketHideout2ArrowMovement1: + db D_LEFT,$02 + db $FF + +RocketHideout2ArrowMovement2: + db D_RIGHT,$04 + db $FF + +RocketHideout2ArrowMovement3: + db D_UP,$04 + db D_RIGHT,$04 + db $FF + +RocketHideout2ArrowMovement4: + db D_UP,$04 + db D_RIGHT,$04 + db D_UP,$01 + db $FF + +RocketHideout2ArrowMovement5: + db D_LEFT,$02 + db D_UP,$03 + db $FF + +RocketHideout2ArrowMovement6: + db D_DOWN,$02 + db D_RIGHT,$04 + db $FF + +RocketHideout2ArrowMovement7: + db D_UP,$02 + db $FF + +RocketHideout2ArrowMovement8: + db D_UP,$04 + db $FF + +RocketHideout2ArrowMovement9: + db D_LEFT,$06 + db $FF + +RocketHideout2ArrowMovement10: + db D_UP,$01 + db $FF + +RocketHideout2ArrowMovement11: + db D_LEFT,$06 + db D_UP,$04 + db $FF + +RocketHideout2ArrowMovement12: + db D_DOWN,$02 + db $FF + +RocketHideout2ArrowMovement13: + db D_LEFT,$08 + db $FF + +RocketHideout2ArrowMovement14: + db D_LEFT,$08 + db D_UP,$01 + db $FF + +RocketHideout2ArrowMovement15: + db D_LEFT,$08 + db D_UP,$06 + db $FF + +RocketHideout2ArrowMovement16: + db D_UP,$02 + db D_RIGHT,$04 + db $FF + +RocketHideout2ArrowMovement17: + db D_UP,$02 + db D_RIGHT,$04 + db D_UP,$02 + db $FF + +RocketHideout2ArrowMovement18: + db D_DOWN,$02 + db D_RIGHT,$04 + db D_DOWN,$02 + db $FF + +RocketHideout2ArrowMovement19: + db D_DOWN,$02 + db D_RIGHT,$04 + db $FF + +RocketHideout2ArrowMovement20: + db D_LEFT,$0A + db $FF + +RocketHideout2ArrowMovement21: + db D_LEFT,$0A + db D_UP,$02 + db $FF + +RocketHideout2ArrowMovement22: + db D_LEFT,$0A + db D_UP,$04 + db $FF + +RocketHideout2ArrowMovement23: + db D_UP,$02 + db D_RIGHT,$02 + db $FF + +RocketHideout2ArrowMovement24: + db D_RIGHT,$01 + db D_DOWN,$02 + db $FF + +RocketHideout2ArrowMovement25: + db D_RIGHT,$01 + db $FF + +RocketHideout2ArrowMovement26: + db D_DOWN,$02 + db D_RIGHT,$02 + db $FF + +RocketHideout2ArrowMovement27: + db D_DOWN,$02 + db D_LEFT,$02 + db $FF + +RocketHideout2ArrowMovement28: + db D_UP,$02 + db D_RIGHT,$04 + db D_UP,$02 + db D_LEFT,$03 + db $FF + +RocketHideout2ArrowMovement29: + db D_DOWN,$02 + db D_LEFT,$04 + db $FF + +RocketHideout2ArrowMovement30: + db D_LEFT,$06 + db D_UP,$04 + db D_LEFT,$05 + db $FF + +RocketHideout2ArrowMovement31: + db D_UP,$02 + db $FF + +RocketHideout2ArrowMovement32: + db D_UP,$01 + db $FF + +RocketHideout2ArrowMovement33: + db D_UP,$03 + db $FF + +RocketHideout2ArrowMovement34: + db D_UP,$05 + db $FF + +RocketHideout2ArrowMovement35: + db D_RIGHT,$01 + db D_DOWN,$02 + db D_LEFT,$04 + db $FF + +RocketHideout2ArrowMovement36: + db D_LEFT,$0A + db D_UP,$02 + db D_LEFT,$05 + db $FF + +RocketHideout2Script3: + ld a, [wSimulatedJoypadStatesIndex] + and a + jr nz, LoadSpinnerArrowTiles + xor a + ld [wJoyIgnore], a + ld hl, wd736 + res 7, [hl] + ld a, $0 + ld [wCurMapScript], a + ret + +LoadSpinnerArrowTiles: + ld a, [wSpriteStateData1 + 2] + srl a + srl a + ld hl, SpinnerPlayerFacingDirections + ld c, a + ld b, $0 + add hl, bc + ld a, [hl] + ld [wSpriteStateData1 + 2], a + ld a, [wCurMapTileset] + cp FACILITY + ld hl, FacilitySpinnerArrows + jr z, .asm_44ff6 + ld hl, GymSpinnerArrows +.asm_44ff6 + ld a, [wSimulatedJoypadStatesIndex] + bit 0, a + jr nz, .asm_45001 + ld de, $18 + add hl, de +.asm_45001 + ld a, $4 + ld bc, $0 +.asm_45006 + push af + push hl + push bc + add hl, bc + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld h, [hl] + ld l, a + call CopyVideoData + pop bc + ld a, $6 + add c + ld c, a + pop hl + pop af + dec a + jr nz, .asm_45006 + ret + +spinner: MACRO +; \1: source +; \2: offset (BANK() chokes on literals) +; \3: length +; \4: dest + dw \1 + \2 + db \3, BANK(\1) + dw \4 +ENDM + +FacilitySpinnerArrows: +FACILITY_SPINNER EQU $20 * $10 +vFacilitySpinner EQU vTileset + FACILITY_SPINNER + + spinner SpinnerArrowAnimTiles, $00, 1, vFacilitySpinner + spinner SpinnerArrowAnimTiles, $10, 1, vFacilitySpinner + $10 + spinner SpinnerArrowAnimTiles, $20, 1, vFacilitySpinner + $100 + spinner SpinnerArrowAnimTiles, $30, 1, vFacilitySpinner + $110 + spinner Facility_GFX, FACILITY_SPINNER + $000, 1, vFacilitySpinner + spinner Facility_GFX, FACILITY_SPINNER + $010, 1, vFacilitySpinner + $10 + spinner Facility_GFX, FACILITY_SPINNER + $100, 1, vFacilitySpinner + $100 + spinner Facility_GFX, FACILITY_SPINNER + $110, 1, vFacilitySpinner + $110 + +GymSpinnerArrows: +GYM_SPINNER EQU $3c * $10 +vGymSpinner EQU vTileset + GYM_SPINNER + + spinner SpinnerArrowAnimTiles, $10, 1, vGymSpinner + spinner SpinnerArrowAnimTiles, $30, 1, vGymSpinner + $10 + spinner SpinnerArrowAnimTiles, $00, 1, vGymSpinner + $100 + spinner SpinnerArrowAnimTiles, $20, 1, vGymSpinner + $110 + spinner Gym_GFX, GYM_SPINNER + $000, 1, vGymSpinner + spinner Gym_GFX, GYM_SPINNER + $010, 1, vGymSpinner + $10 + spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100 + spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110 + +SpinnerPlayerFacingDirections: +; This isn't the order of the facing directions. Rather, it's a list of +; the facing directions that come next. For example, when the player is +; facing down (00), the next facing direction is left (08). + db $08 ; down -> left + db $0C ; up -> right + db $04 ; left -> up + db $00 ; right -> down + +; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ +SpinnerArrowAnimTiles: + INCBIN "gfx/spinner_arrow.2bpp" + +RocketHideoutB2F_TextPointers: + dw RocketHideout2Text1 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +RocketHideout2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 + dw RocketHideout2BattleText2 ; TextBeforeBattle + dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle + dw RocketHideout2EndBattleText2 ; TextEndBattle + dw RocketHideout2EndBattleText2 ; TextEndBattle + + db $ff + +RocketHideout2Text1: + TX_ASM + ld hl, RocketHideout2TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout2BattleText2: + TX_FAR _RocketHideout2BattleText2 + db "@" + +RocketHideout2EndBattleText2: + TX_FAR _RocketHideout2EndBattleText2 + db "@" + +RocketHideout2AfterBattleTxt2: + TX_FAR _RocketHideout2AfterBattleTxt2 + db "@" diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm new file mode 100755 index 00000000..4dd537b3 --- /dev/null +++ b/scripts/RocketHideoutB3F.asm @@ -0,0 +1,206 @@ +RocketHideoutB3F_Script: + call EnableAutoTextBoxDrawing + ld hl, RocketHideout3TrainerHeader0 + ld de, RocketHideoutB3F_ScriptPointers + ld a, [wRocketHideoutB3FCurScript] + call ExecuteCurMapScriptInTable + ld [wRocketHideoutB3FCurScript], a + ret + +RocketHideoutB3F_ScriptPointers: + dw RocketHideout3Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw RocketHideout3Script3 + +RocketHideout3Script0: + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a + ld hl, RocketHideout3ArrowTilePlayerMovement + call DecodeArrowMovementRLE + cp $ff + jp z, CheckFightingMapTrainers + ld hl, wd736 + set 7, [hl] + call StartSimulatingJoypadStates + ld a, SFX_ARROW_TILES + call PlaySound + ld a, $ff + ld [wJoyIgnore], a + ld a, $3 + ld [wCurMapScript], a + ret + +;format: +;db y,x +;dw pointer to movement +RocketHideout3ArrowTilePlayerMovement: + db $d,$a + dw RocketHideout3ArrowMovement6 + db $13,$a + dw RocketHideout3ArrowMovement1 + db $12,$b + dw RocketHideout3ArrowMovement2 + db $b,$c + dw RocketHideout3ArrowMovement3 + db $11,$c + dw RocketHideout3ArrowMovement4 + db $14,$c + dw RocketHideout3ArrowMovement5 + db $10,$d + dw RocketHideout3ArrowMovement6 + db $b,$e + dw RocketHideout3ArrowMovement7 + db $f,$e + dw RocketHideout3ArrowMovement6 + db $11,$e + dw RocketHideout3ArrowMovement8 + db $13,$e + dw RocketHideout3ArrowMovement9 + db $10,$f + dw RocketHideout3ArrowMovement7 + db $12,$f + dw RocketHideout3ArrowMovement10 + db $d,$10 + dw RocketHideout3ArrowMovement11 + db $c,$11 + dw RocketHideout3ArrowMovement10 + db $10,$12 + dw RocketHideout3ArrowMovement12 + db $FF + +;format: direction, count +;each list is read starting from the $FF and working backwards +RocketHideout3ArrowMovement1: + db D_RIGHT,$04 + db D_UP,$04 + db D_RIGHT,$04 + db $FF + +RocketHideout3ArrowMovement2: + db D_DOWN,$04 + db D_RIGHT,$04 + db $FF + +RocketHideout3ArrowMovement3: + db D_LEFT,$02 + db $FF + +RocketHideout3ArrowMovement4: + db D_RIGHT,$04 + db D_UP,$02 + db D_RIGHT,$02 + db $FF + +RocketHideout3ArrowMovement5: + db D_RIGHT,$04 + db D_UP,$02 + db D_RIGHT,$02 + db D_UP,$03 + db $FF + +RocketHideout3ArrowMovement6: + db D_RIGHT,$04 + db $FF + +RocketHideout3ArrowMovement7: + db D_RIGHT,$02 + db $FF + +RocketHideout3ArrowMovement8: + db D_RIGHT,$04 + db D_UP,$02 + db $FF + +RocketHideout3ArrowMovement9: + db D_RIGHT,$04 + db D_UP,$04 + db $FF + +RocketHideout3ArrowMovement10: + db D_DOWN,$04 + db $FF + +RocketHideout3ArrowMovement11: + db D_UP,$02 + db $FF + +RocketHideout3ArrowMovement12: + db D_UP,$01 + db $FF + +RocketHideout3Script3: + ld a, [wSimulatedJoypadStatesIndex] + and a + jp nz, LoadSpinnerArrowTiles + xor a + ld [wJoyIgnore], a + ld hl, wd736 + res 7, [hl] + ld a, $0 + ld [wCurMapScript], a + ret + +RocketHideoutB3F_TextPointers: + dw RocketHideout3Text1 + dw RocketHideout3Text2 + dw PickUpItemText + dw PickUpItemText + +RocketHideout3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 + dw RocketHideout3BattleText2 ; TextBeforeBattle + dw RocketHideout3AfterBattleTxt2 ; TextAfterBattle + dw RocketHideout3EndBattleText2 ; TextEndBattle + dw RocketHideout3EndBattleText2 ; TextEndBattle + +RocketHideout3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 + dw RocketHideout3BattleTxt ; TextBeforeBattle + dw RocketHideout3AfterBattleText3 ; TextAfterBattle + dw RocketHideout3EndBattleText3 ; TextEndBattle + dw RocketHideout3EndBattleText3 ; TextEndBattle + + db $ff + +RocketHideout3Text1: + TX_ASM + ld hl, RocketHideout3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout3BattleText2: + TX_FAR _RocketHideout3BattleText2 + db "@" + +RocketHideout3EndBattleText2: + TX_FAR _RocketHideout3EndBattleText2 + db "@" + +RocketHideout3AfterBattleTxt2: + TX_FAR _RocketHideout3AfterBattleTxt2 + db "@" + +RocketHideout3Text2: + TX_ASM + ld hl, RocketHideout3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout3BattleTxt: + TX_FAR _RocketHideout3BattleTxt + db "@" + +RocketHideout3EndBattleText3: + TX_FAR _RocketHideout3EndBattleText3 + db "@" + +RocketHideout3AfterBattleText3: + TX_FAR _RocketHide3AfterBattleText3 + db "@" diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm new file mode 100755 index 00000000..b2ce21f4 --- /dev/null +++ b/scripts/RocketHideoutB4F.asm @@ -0,0 +1,220 @@ +RocketHideoutB4F_Script: + call RocketHideout4Script_45473 + call EnableAutoTextBoxDrawing + ld hl, RocketHideout4TrainerHeader0 + ld de, RocketHideoutB4F_ScriptPointers + ld a, [wRocketHideoutB4FCurScript] + call ExecuteCurMapScriptInTable + ld [wRocketHideoutB4FCurScript], a + ret + +RocketHideout4Script_45473: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED + jr nz, .asm_45496 + CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1 + jr z, .asm_4548c + ld a, $2d + jr .asm_45498 +.asm_4548c + ld a, SFX_GO_INSIDE + call PlaySound + SetEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED +.asm_45496 + ld a, $e +.asm_45498 + ld [wNewTileBlockID], a + lb bc, 5, 12 + predef_jump ReplaceTileBlock + +RocketHideout4Script_454a3: + xor a + ld [wJoyIgnore], a + ld [wRocketHideoutB4FCurScript], a + ld [wCurMapScript], a + ret + +RocketHideoutB4F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw RocketHideout4Script3 + +RocketHideout4Script3: + ld a, [wIsInBattle] + cp $ff + jp z, RocketHideout4Script_454a3 + call UpdateSprites + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call GBFadeOutToBlack + ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4 + ld [wMissableObjectIndex], a + predef ShowObject + call UpdateSprites + call GBFadeInFromBlack + xor a + ld [wJoyIgnore], a + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ld a, $0 + ld [wRocketHideoutB4FCurScript], a + ld [wCurMapScript], a + ret + +RocketHideoutB4F_TextPointers: + dw RocketHideout4Text1 + dw RocketHideout4Text2 + dw RocketHideout4Text3 + dw RocketHideout4Text4 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw RocketHideout4Text10 + +RocketHideout4TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 + dw RocketHideout4BattleText2 ; TextBeforeBattle + dw RocketHideout4AfterBattleText2 ; TextAfterBattle + dw RocketHideout4EndBattleText2 ; TextEndBattle + dw RocketHideout4EndBattleText2 ; TextEndBattle + +RocketHideout4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 + dw RocketHideout4BattleText3 ; TextBeforeBattle + dw RocketHideout4AfterBattleText3 ; TextAfterBattle + dw RocketHideout4EndBattleText3 ; TextEndBattle + dw RocketHideout4EndBattleText3 ; TextEndBattle + +RocketHideout4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + dw RocketHideout4BattleText4 ; TextBeforeBattle + dw RocketHideout4AfterBattleText4 ; TextAfterBattle + dw RocketHideout4EndBattleText4 ; TextEndBattle + dw RocketHideout4EndBattleText4 ; TextEndBattle + + db $ff + +RocketHideout4Text1: + TX_ASM + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI + jp nz, .asm_545571 + ld hl, RocketHideout4Text_4557a + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, RocketHideout4Text_4557f + ld de, RocketHideout4Text_4557f + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wRocketHideoutB4FCurScript], a + ld [wCurMapScript], a + jr .asm_209f0 +.asm_545571 + ld hl, RocketHideout4Text10 + call PrintText +.asm_209f0 + jp TextScriptEnd + +RocketHideout4Text_4557a: + TX_FAR _RocketHideout4Text_4557a + db "@" + +RocketHideout4Text_4557f: + TX_FAR _RocketHideout4Text_4557f + db "@" + +RocketHideout4Text10: + TX_FAR _RocketHideout4Text_45584 + db "@" + +RocketHideout4Text2: + TX_ASM + ld hl, RocketHideout4TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout4BattleText2: + TX_FAR _RocketHideout4BattleText2 + db "@" + +RocketHideout4EndBattleText2: + TX_FAR _RocketHideout4EndBattleText2 + db "@" + +RocketHideout4AfterBattleText2: + TX_FAR _RocketHide4AfterBattleText2 + db "@" + +RocketHideout4Text3: + TX_ASM + ld hl, RocketHideout4TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout4BattleText3: + TX_FAR _RocketHideout4BattleText3 + db "@" + +RocketHideout4EndBattleText3: + TX_FAR _RocketHideout4EndBattleText3 + db "@" + +RocketHideout4AfterBattleText3: + TX_FAR _RocketHide4AfterBattleText3 + db "@" + +RocketHideout4Text4: + TX_ASM + ld hl, RocketHideout4TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +RocketHideout4BattleText4: + TX_FAR _RocketHideout4BattleText4 + db "@" + +RocketHideout4EndBattleText4: + TX_FAR _RocketHideout4EndBattleText4 + db "@" + +RocketHideout4AfterBattleText4: + TX_ASM + ld hl, RocketHideout4Text_455ec + call PrintText + CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY + jr nz, .asm_455e9 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5 + ld [wMissableObjectIndex], a + predef ShowObject +.asm_455e9 + jp TextScriptEnd + +RocketHideout4Text_455ec: + TX_FAR _RocketHideout4Text_455ec + db "@" diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm new file mode 100755 index 00000000..9525db3a --- /dev/null +++ b/scripts/RocketHideoutElevator.asm @@ -0,0 +1,85 @@ +RocketHideoutElevator_Script: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + push hl + call nz, RocketHideoutElevatorScript_4572c + pop hl + bit 7, [hl] + res 7, [hl] + call nz, RocketHideoutElevatorScript_4575f + xor a + ld [wAutoTextBoxDrawingControl], a + inc a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret + +RocketHideoutElevatorScript_4572c: + ld hl, wWarpEntries + ld a, [wWarpedFromWhichWarp] + ld b, a + ld a, [wWarpedFromWhichMap] + ld c, a + call RocketHideoutElevatorScript_4573a + +RocketHideoutElevatorScript_4573a: + inc hl + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ret + +RocketHideoutElevatorScript_45741: + ld hl, RocketHideoutElavatorFloors + call LoadItemList + ld hl, RocketHideoutElevatorWarpMaps + ld de, wElevatorWarpMaps + ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps + call CopyData + ret + +RocketHideoutElavatorFloors: + db $03 ; num elements in list + db FLOOR_B1F + db FLOOR_B2F + db FLOOR_B4F + db $FF ; terminator + +RocketHideoutElevatorWarpMaps: +; first byte is warp number +; second byte is map number +; These specify where the player goes after getting out of the elevator. + db $04, ROCKET_HIDEOUT_B1F + db $04, ROCKET_HIDEOUT_B2F + db $02, ROCKET_HIDEOUT_B4F +RocketHideoutElevatorWarpMapsEnd: + +RocketHideoutElevatorScript_4575f: + call Delay3 + callba ShakeElevator + ret + +RocketHideoutElevator_TextPointers: + dw RocketHideoutElevatorText1 + +RocketHideoutElevatorText1: + TX_ASM + ld b, LIFT_KEY + call IsItemInBag + jr z, .asm_45782 + call RocketHideoutElevatorScript_45741 + ld hl, RocketHideoutElevatorWarpMaps + predef DisplayElevatorFloorMenu + jr .asm_45788 +.asm_45782 + ld hl, RocketHideoutElevatorText_4578b + call PrintText +.asm_45788 + jp TextScriptEnd + +RocketHideoutElevatorText_4578b: + TX_FAR _RocketElevatorText_4578b + TX_WAIT + db "@" diff --git a/scripts/Route1.asm b/scripts/Route1.asm new file mode 100755 index 00000000..e733b54d --- /dev/null +++ b/scripts/Route1.asm @@ -0,0 +1,52 @@ +Route1_Script: + jp EnableAutoTextBoxDrawing + +Route1_TextPointers: + dw Route1Text1 + dw Route1Text2 + dw Route1Text3 + +Route1Text1: + TX_ASM + CheckAndSetEvent EVENT_GOT_POTION_SAMPLE + jr nz, .asm_1cada + ld hl, Route1ViridianMartSampleText + call PrintText + lb bc, POTION, 1 + call GiveItem + jr nc, .BagFull + ld hl, Route1Text_1cae8 + jr .asm_1cadd +.BagFull + ld hl, Route1Text_1caf3 + jr .asm_1cadd +.asm_1cada + ld hl, Route1Text_1caee +.asm_1cadd + call PrintText + jp TextScriptEnd + +Route1ViridianMartSampleText: + TX_FAR _Route1ViridianMartSampleText + db "@" + +Route1Text_1cae8: + TX_FAR _Route1Text_1cae8 + TX_SFX_ITEM_1 + db "@" + +Route1Text_1caee: + TX_FAR _Route1Text_1caee + db "@" + +Route1Text_1caf3: + TX_FAR _Route1Text_1caf3 + db "@" + +Route1Text2: + TX_FAR _Route1Text2 + db "@" + +Route1Text3: + TX_FAR _Route1Text3 + db "@" diff --git a/scripts/Route10.asm b/scripts/Route10.asm new file mode 100755 index 00000000..3fffa2c0 --- /dev/null +++ b/scripts/Route10.asm @@ -0,0 +1,198 @@ +Route10_Script: + call EnableAutoTextBoxDrawing + ld hl, Route10TrainerHeader0 + ld de, Route10_ScriptPointers + ld a, [wRoute10CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute10CurScript], a + ret + +Route10_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route10_TextPointers: + dw Route10Text1 + dw Route10Text2 + dw Route10Text3 + dw Route10Text4 + dw Route10Text5 + dw Route10Text6 + dw Route10Text7 + dw PokeCenterSignText + dw Route10Text9 + dw Route10Text10 + +Route10TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0 + dw Route10BattleText1 ; TextBeforeBattle + dw Route10AfterBattleText1 ; TextAfterBattle + dw Route10EndBattleText1 ; TextEndBattle + dw Route10EndBattleText1 ; TextEndBattle + +Route10TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1 + dw Route10BattleText2 ; TextBeforeBattle + dw Route10AfterBattleText2 ; TextAfterBattle + dw Route10EndBattleText2 ; TextEndBattle + dw Route10EndBattleText2 ; TextEndBattle + +Route10TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2 + dw Route10BattleText3 ; TextBeforeBattle + dw Route10AfterBattleText3 ; TextAfterBattle + dw Route10EndBattleText3 ; TextEndBattle + dw Route10EndBattleText3 ; TextEndBattle + +Route10TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3 + dw Route10BattleText4 ; TextBeforeBattle + dw Route10AfterBattleText4 ; TextAfterBattle + dw Route10EndBattleText4 ; TextEndBattle + dw Route10EndBattleText4 ; TextEndBattle + +Route10TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4 + dw Route10BattleText5 ; TextBeforeBattle + dw Route10AfterBattleText5 ; TextAfterBattle + dw Route10EndBattleText5 ; TextEndBattle + dw Route10EndBattleText5 ; TextEndBattle + +Route10TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5 + dw Route10BattleText6 ; TextBeforeBattle + dw Route10AfterBattleText6 ; TextAfterBattle + dw Route10EndBattleText6 ; TextEndBattle + dw Route10EndBattleText6 ; TextEndBattle + + db $ff + +Route10Text1: + TX_ASM + ld hl, Route10TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route10BattleText1: + TX_FAR _Route10BattleText1 + db "@" + +Route10EndBattleText1: + TX_FAR _Route10EndBattleText1 + db "@" + +Route10AfterBattleText1: + TX_FAR _Route10AfterBattleText1 + db "@" + +Route10Text2: + TX_ASM + ld hl, Route10TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route10BattleText2: + TX_FAR _Route10BattleText2 + db "@" + +Route10EndBattleText2: + TX_FAR _Route10EndBattleText2 + db "@" + +Route10AfterBattleText2: + TX_FAR _Route10AfterBattleText2 + db "@" + +Route10Text3: + TX_ASM + ld hl, Route10TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route10BattleText3: + TX_FAR _Route10BattleText3 + db "@" + +Route10EndBattleText3: + TX_FAR _Route10EndBattleText3 + db "@" + +Route10AfterBattleText3: + TX_FAR _Route10AfterBattleText3 + db "@" + +Route10Text4: + TX_ASM + ld hl, Route10TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route10BattleText4: + TX_FAR _Route10BattleText4 + db "@" + +Route10EndBattleText4: + TX_FAR _Route10EndBattleText4 + db "@" + +Route10AfterBattleText4: + TX_FAR _Route10AfterBattleText4 + db "@" + +Route10Text5: + TX_ASM + ld hl, Route10TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route10BattleText5: + TX_FAR _Route10BattleText5 + db "@" + +Route10EndBattleText5: + TX_FAR _Route10EndBattleText5 + db "@" + +Route10AfterBattleText5: + TX_FAR _Route10AfterBattleText5 + db "@" + +Route10Text6: + TX_ASM + ld hl, Route10TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route10BattleText6: + TX_FAR _Route10BattleText6 + db "@" + +Route10EndBattleText6: + TX_FAR _Route10EndBattleText6 + db "@" + +Route10AfterBattleText6: + TX_FAR _Route10AfterBattleText6 + db "@" + +Route10Text9: +Route10Text7: + TX_FAR _Route10Text7 ; _Route10Text9 + db "@" + +Route10Text10: + TX_FAR _Route10Text10 + db "@" diff --git a/scripts/Route11.asm b/scripts/Route11.asm new file mode 100755 index 00000000..891237cc --- /dev/null +++ b/scripts/Route11.asm @@ -0,0 +1,302 @@ +Route11_Script: + call EnableAutoTextBoxDrawing + ld hl, Route11TrainerHeader0 + ld de, Route11_ScriptPointers + ld a, [wRoute11CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute11CurScript], a + ret + +Route11_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route11_TextPointers: + dw Route11Text1 + dw Route11Text2 + dw Route11Text3 + dw Route11Text4 + dw Route11Text5 + dw Route11Text6 + dw Route11Text7 + dw Route11Text8 + dw Route11Text9 + dw Route11Text10 + dw Route11Text11 + +Route11TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_0 + dw Route11BattleText1 ; TextBeforeBattle + dw Route11AfterBattleText1 ; TextAfterBattle + dw Route11EndBattleText1 ; TextEndBattle + dw Route11EndBattleText1 ; TextEndBattle + +Route11TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_1 + dw Route11BattleText2 ; TextBeforeBattle + dw Route11AfterBattleText2 ; TextAfterBattle + dw Route11EndBattleText2 ; TextEndBattle + dw Route11EndBattleText2 ; TextEndBattle + +Route11TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_2 + dw Route11BattleText3 ; TextBeforeBattle + dw Route11AfterBattleText3 ; TextAfterBattle + dw Route11EndBattleText3 ; TextEndBattle + dw Route11EndBattleText3 ; TextEndBattle + +Route11TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_3 + dw Route11BattleText4 ; TextBeforeBattle + dw Route11AfterBattleText4 ; TextAfterBattle + dw Route11EndBattleText4 ; TextEndBattle + dw Route11EndBattleText4 ; TextEndBattle + +Route11TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_4 + dw Route11BattleText5 ; TextBeforeBattle + dw Route11AfterBattleText5 ; TextAfterBattle + dw Route11EndBattleText5 ; TextEndBattle + dw Route11EndBattleText5 ; TextEndBattle + +Route11TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_5 + dw Route11BattleText6 ; TextBeforeBattle + dw Route11AfterBattleText6 ; TextAfterBattle + dw Route11EndBattleText6 ; TextEndBattle + dw Route11EndBattleText6 ; TextEndBattle + +Route11TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_6 + dw Route11BattleText7 ; TextBeforeBattle + dw Route11AfterBattleText7 ; TextAfterBattle + dw Route11EndBattleText7 ; TextEndBattle + dw Route11EndBattleText7 ; TextEndBattle + +Route11TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_7, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_7, 1 + dw Route11BattleText8 ; TextBeforeBattle + dw Route11AfterBattleText8 ; TextAfterBattle + dw Route11EndBattleText8 ; TextEndBattle + dw Route11EndBattleText8 ; TextEndBattle + +Route11TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_8, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_8, 1 + dw Route11BattleText9 ; TextBeforeBattle + dw Route11AfterBattleText9 ; TextAfterBattle + dw Route11EndBattleText9 ; TextEndBattle + dw Route11EndBattleText9 ; TextEndBattle + +Route11TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_9, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_9, 1 + dw Route11BattleText10 ; TextBeforeBattle + dw Route11AfterBattleText10 ; TextAfterBattle + dw Route11EndBattleText10 ; TextEndBattle + dw Route11EndBattleText10 ; TextEndBattle + + db $ff + +Route11Text1: + TX_ASM + ld hl, Route11TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText1: + TX_FAR _Route11BattleText1 + db "@" + +Route11EndBattleText1: + TX_FAR _Route11EndBattleText1 + db "@" + +Route11AfterBattleText1: + TX_FAR _Route11AfterBattleText1 + db "@" + +Route11Text2: + TX_ASM + ld hl, Route11TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText2: + TX_FAR _Route11BattleText2 + db "@" + +Route11EndBattleText2: + TX_FAR _Route11EndBattleText2 + db "@" + +Route11AfterBattleText2: + TX_FAR _Route11AfterBattleText2 + db "@" + +Route11Text3: + TX_ASM + ld hl, Route11TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText3: + TX_FAR _Route11BattleText3 + db "@" + +Route11EndBattleText3: + TX_FAR _Route11EndBattleText3 + db "@" + +Route11AfterBattleText3: + TX_FAR _Route11AfterBattleText3 + db "@" + +Route11Text4: + TX_ASM + ld hl, Route11TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText4: + TX_FAR _Route11BattleText4 + db "@" + +Route11EndBattleText4: + TX_FAR _Route11EndBattleText4 + db "@" + +Route11AfterBattleText4: + TX_FAR _Route11AfterBattleText4 + db "@" + +Route11Text5: + TX_ASM + ld hl, Route11TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText5: + TX_FAR _Route11BattleText5 + db "@" + +Route11EndBattleText5: + TX_FAR _Route11EndBattleText5 + db "@" + +Route11AfterBattleText5: + TX_FAR _Route11AfterBattleText5 + db "@" + +Route11Text6: + TX_ASM + ld hl, Route11TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText6: + TX_FAR _Route11BattleText6 + db "@" + +Route11EndBattleText6: + TX_FAR _Route11EndBattleText6 + db "@" + +Route11AfterBattleText6: + TX_FAR _Route11AfterBattleText6 + db "@" + +Route11Text7: + TX_ASM + ld hl, Route11TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText7: + TX_FAR _Route11BattleText7 + db "@" + +Route11EndBattleText7: + TX_FAR _Route11EndBattleText7 + db "@" + +Route11AfterBattleText7: + TX_FAR _Route11AfterBattleText7 + db "@" + +Route11Text8: + TX_ASM + ld hl, Route11TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText8: + TX_FAR _Route11BattleText8 + db "@" + +Route11EndBattleText8: + TX_FAR _Route11EndBattleText8 + db "@" + +Route11AfterBattleText8: + TX_FAR _Route11AfterBattleText8 + db "@" + +Route11Text9: + TX_ASM + ld hl, Route11TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText9: + TX_FAR _Route11BattleText9 + db "@" + +Route11EndBattleText9: + TX_FAR _Route11EndBattleText9 + db "@" + +Route11AfterBattleText9: + TX_FAR _Route11AfterBattleText9 + db "@" + +Route11Text10: + TX_ASM + ld hl, Route11TrainerHeader9 + call TalkToTrainer + jp TextScriptEnd + +Route11BattleText10: + TX_FAR _Route11BattleText10 + db "@" + +Route11EndBattleText10: + TX_FAR _Route11EndBattleText10 + db "@" + +Route11AfterBattleText10: + TX_FAR _Route11AfterBattleText10 + db "@" + +Route11Text11: + TX_FAR _Route11Text11 + db "@" diff --git a/scripts/Route11Gate1F.asm b/scripts/Route11Gate1F.asm new file mode 100755 index 00000000..8e5f6c03 --- /dev/null +++ b/scripts/Route11Gate1F.asm @@ -0,0 +1,9 @@ +Route11Gate1F_Script: + jp EnableAutoTextBoxDrawing + +Route11Gate1F_TextPointers: + dw Route11GateText1 + +Route11GateText1: + TX_FAR _Route11GateText1 + db "@" diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm new file mode 100755 index 00000000..c140937d --- /dev/null +++ b/scripts/Route11Gate2F.asm @@ -0,0 +1,76 @@ +Route11Gate2F_Script: + jp DisableAutoTextBoxDrawing + +Route11Gate2F_TextPointers: + dw Route11GateUpstairsText1 + dw Route11GateUpstairsText2 + dw Route11GateUpstairsText3 + dw Route11GateUpstairsText4 + +Route11GateUpstairsText1: + TX_ASM + xor a + ld [wWhichTrade], a + predef DoInGameTradeDialogue +Route11GateUpstairsScriptEnd: + jp TextScriptEnd + +Route11GateUpstairsText2: + TX_ASM + CheckEvent EVENT_GOT_ITEMFINDER, 1 + jr c, .asm_4949b + ld a, 30 ; pokemon needed + ld [hOaksAideRequirement], a + ld a, ITEMFINDER ; oak's aide reward + ld [hOaksAideRewardItem], a + ld [wd11e], a + call GetItemName + ld h, d + ld l, e + ld de, wOaksAideRewardItemName + ld bc, ITEM_NAME_LENGTH + call CopyData + predef OaksAideScript + ld a, [hOaksAideResult] + dec a + jr nz, .asm_494a1 + SetEvent EVENT_GOT_ITEMFINDER +.asm_4949b + ld hl, Route11GateUpstairsText_494a3 + call PrintText +.asm_494a1 + jr Route11GateUpstairsScriptEnd + +Route11GateUpstairsText_494a3: + TX_FAR _Route11GateUpstairsText_494a3 + db "@" + +Route11GateUpstairsText3: + TX_ASM + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + jp nz, GateUpstairsScript_PrintIfFacingUp + CheckEvent EVENT_BEAT_ROUTE12_SNORLAX + ld hl, BinocularsSnorlaxText + jr z, .print + ld hl, BinocularsNoSnorlaxText +.print + call PrintText + jp TextScriptEnd + +BinocularsSnorlaxText: + TX_FAR _BinocularsSnorlaxText + db "@" + +BinocularsNoSnorlaxText: + TX_FAR _BinocularsNoSnorlaxText + db "@" + +Route11GateUpstairsText4: + TX_ASM + ld hl, Route11GateUpstairsText_494d5 + jp GateUpstairsScript_PrintIfFacingUp + +Route11GateUpstairsText_494d5: + TX_FAR _Route11GateUpstairsText_494d5 + db "@" diff --git a/scripts/Route12.asm b/scripts/Route12.asm new file mode 100755 index 00000000..510e7727 --- /dev/null +++ b/scripts/Route12.asm @@ -0,0 +1,288 @@ +Route12_Script: + call EnableAutoTextBoxDrawing + ld hl, Route12TrainerHeader0 + ld de, Route12_ScriptPointers + ld a, [wRoute12CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute12CurScript], a + ret + +Route12Script_59606: + xor a + ld [wJoyIgnore], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a + ret + +Route12_ScriptPointers: + dw Route12Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw Route12Script3 + +Route12Script0: + CheckEventHL EVENT_BEAT_ROUTE12_SNORLAX + jp nz, CheckFightingMapTrainers + CheckEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX + ResetEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX + jp z, CheckFightingMapTrainers + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, SNORLAX + ld [wCurOpponent], a + ld a, 30 + ld [wCurEnemyLVL], a + ld a, HS_ROUTE_12_SNORLAX + ld [wMissableObjectIndex], a + predef HideObject + ld a, $3 + ld [wRoute12CurScript], a + ld [wCurMapScript], a + ret + +Route12Script3: + ld a, [wIsInBattle] + cp $ff + jr z, Route12Script_59606 + call UpdateSprites + ld a, [wBattleResult] + cp $2 + jr z, .asm_59664 + ld a, $e + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_59664 + SetEvent EVENT_BEAT_ROUTE12_SNORLAX + call Delay3 + ld a, $0 + ld [wRoute12CurScript], a + ld [wCurMapScript], a + ret + +Route12_TextPointers: + dw Route12Text1 + dw Route12Text2 + dw Route12Text3 + dw Route12Text4 + dw Route12Text5 + dw Route12Text6 + dw Route12Text7 + dw Route12Text8 + dw PickUpItemText + dw PickUpItemText + dw Route12Text11 + dw Route12Text12 + dw Route12Text13 + dw Route12Text14 + +Route12TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_0 + dw Route12BattleText1 ; TextBeforeBattle + dw Route12AfterBattleText1 ; TextAfterBattle + dw Route12EndBattleText1 ; TextEndBattle + dw Route12EndBattleText1 ; TextEndBattle + +Route12TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_1 + dw Route12BattleText2 ; TextBeforeBattle + dw Route12AfterBattleText2 ; TextAfterBattle + dw Route12EndBattleText2 ; TextEndBattle + dw Route12EndBattleText2 ; TextEndBattle + +Route12TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_2 + dw Route12BattleText3 ; TextBeforeBattle + dw Route12AfterBattleText3 ; TextAfterBattle + dw Route12EndBattleText3 ; TextEndBattle + dw Route12EndBattleText3 ; TextEndBattle + +Route12TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_3 + dw Route12BattleText4 ; TextBeforeBattle + dw Route12AfterBattleText4 ; TextAfterBattle + dw Route12EndBattleText4 ; TextEndBattle + dw Route12EndBattleText4 ; TextEndBattle + +Route12TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_4 + dw Route12BattleText5 ; TextBeforeBattle + dw Route12AfterBattleText5 ; TextAfterBattle + dw Route12EndBattleText5 ; TextEndBattle + dw Route12EndBattleText5 ; TextEndBattle + +Route12TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_5 + dw Route12BattleText6 ; TextBeforeBattle + dw Route12AfterBattleText6 ; TextAfterBattle + dw Route12EndBattleText6 ; TextEndBattle + dw Route12EndBattleText6 ; TextEndBattle + +Route12TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_6, 1 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_6, 1 + dw Route12BattleText7 ; TextBeforeBattle + dw Route12AfterBattleText7 ; TextAfterBattle + dw Route12EndBattleText7 ; TextEndBattle + dw Route12EndBattleText7 ; TextEndBattle + + db $ff + +Route12Text1: + TX_FAR _Route12Text1 + db "@" + +Route12Text13: + TX_FAR _Route12Text13 + db "@" + +Route12Text14: + TX_FAR _Route12Text14 + db "@" + +Route12Text2: + TX_ASM + ld hl, Route12TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText1: + TX_FAR _Route12BattleText1 + db "@" + +Route12EndBattleText1: + TX_FAR _Route12EndBattleText1 + db "@" + +Route12AfterBattleText1: + TX_FAR _Route12AfterBattleText1 + db "@" + +Route12Text3: + TX_ASM + ld hl, Route12TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText2: + TX_FAR _Route12BattleText2 + db "@" + +Route12EndBattleText2: + TX_FAR _Route12EndBattleText2 + db "@" + +Route12AfterBattleText2: + TX_FAR _Route12AfterBattleText2 + db "@" + +Route12Text4: + TX_ASM + ld hl, Route12TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText3: + TX_FAR _Route12BattleText3 + db "@" + +Route12EndBattleText3: + TX_FAR _Route12EndBattleText3 + db "@" + +Route12AfterBattleText3: + TX_FAR _Route12AfterBattleText3 + db "@" + +Route12Text5: + TX_ASM + ld hl, Route12TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText4: + TX_FAR _Route12BattleText4 + db "@" + +Route12EndBattleText4: + TX_FAR _Route12EndBattleText4 + db "@" + +Route12AfterBattleText4: + TX_FAR _Route12AfterBattleText4 + db "@" + +Route12Text6: + TX_ASM + ld hl, Route12TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText5: + TX_FAR _Route12BattleText5 + db "@" + +Route12EndBattleText5: + TX_FAR _Route12EndBattleText5 + db "@" + +Route12AfterBattleText5: + TX_FAR _Route12AfterBattleText5 + db "@" + +Route12Text7: + TX_ASM + ld hl, Route12TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText6: + TX_FAR _Route12BattleText6 + db "@" + +Route12EndBattleText6: + TX_FAR _Route12EndBattleText6 + db "@" + +Route12AfterBattleText6: + TX_FAR _Route12AfterBattleText6 + db "@" + +Route12Text8: + TX_ASM + ld hl, Route12TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route12BattleText7: + TX_FAR _Route12BattleText7 + db "@" + +Route12EndBattleText7: + TX_FAR _Route12EndBattleText7 + db "@" + +Route12AfterBattleText7: + TX_FAR _Route12AfterBattleText7 + db "@" + +Route12Text11: + TX_FAR _Route12Text11 + db "@" + +Route12Text12: + TX_FAR _Route12Text12 + db "@" diff --git a/scripts/Route12Gate1F.asm b/scripts/Route12Gate1F.asm new file mode 100755 index 00000000..52d427ee --- /dev/null +++ b/scripts/Route12Gate1F.asm @@ -0,0 +1,9 @@ +Route12Gate1F_Script: + jp EnableAutoTextBoxDrawing + +Route12Gate1F_TextPointers: + dw Route12GateText1 + +Route12GateText1: + TX_FAR _Route12GateText1 + db "@" diff --git a/scripts/Route12Gate2F.asm b/scripts/Route12Gate2F.asm new file mode 100755 index 00000000..0cc2768b --- /dev/null +++ b/scripts/Route12Gate2F.asm @@ -0,0 +1,78 @@ +Route12Gate2F_Script: + jp DisableAutoTextBoxDrawing + +Route12Gate2F_TextPointers: + dw Route12GateUpstairsText1 + dw Route12GateUpstairsText2 + dw Route12GateUpstairsText3 + +Route12GateUpstairsText1: + TX_ASM + CheckEvent EVENT_GOT_TM39, 1 + jr c, .asm_0ad3c + ld hl, TM39PreReceiveText + call PrintText + lb bc, TM_39, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedTM39Text + call PrintText + SetEvent EVENT_GOT_TM39 + jr .asm_4ba56 +.BagFull + ld hl, TM39NoRoomText + call PrintText + jr .asm_4ba56 +.asm_0ad3c + ld hl, TM39ExplanationText + call PrintText +.asm_4ba56 + jp TextScriptEnd + +TM39PreReceiveText: + TX_FAR _TM39PreReceiveText + db "@" + +ReceivedTM39Text: + TX_FAR _ReceivedTM39Text + TX_SFX_ITEM_1 + db "@" + +TM39ExplanationText: + TX_FAR _TM39ExplanationText + db "@" + +TM39NoRoomText: + TX_FAR _TM39NoRoomText + db "@" + +Route12GateUpstairsText2: + TX_ASM + ld hl, Route12GateUpstairsText_495b8 + jp GateUpstairsScript_PrintIfFacingUp + +Route12GateUpstairsText_495b8: + TX_FAR _Route12GateUpstairsText_495b8 + db "@" + +Route12GateUpstairsText3: + TX_ASM + ld hl, Route12GateUpstairsText_495c4 + jp GateUpstairsScript_PrintIfFacingUp + +Route12GateUpstairsText_495c4: + TX_FAR _Route12GateUpstairsText_495c4 + db "@" + +GateUpstairsScript_PrintIfFacingUp: + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_UP + jr z, .up + ld a, $1 + jr .done +.up + call PrintText + xor a +.done + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + jp TextScriptEnd diff --git a/scripts/Route12SuperRodHouse.asm b/scripts/Route12SuperRodHouse.asm new file mode 100755 index 00000000..de8ed8f0 --- /dev/null +++ b/scripts/Route12SuperRodHouse.asm @@ -0,0 +1,57 @@ +Route12SuperRodHouse_Script: + jp EnableAutoTextBoxDrawing + +Route12SuperRodHouse_TextPointers: + dw Route12HouseText1 + +Route12HouseText1: + TX_ASM + ld a, [wd728] + bit 5, a + jr nz, .asm_b4cad + ld hl, Route12HouseText_564c0 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_a2d76 + lb bc, SUPER_ROD, 1 + call GiveItem + jr nc, .BagFull + ld hl, wd728 + set 5, [hl] + ld hl, Route12HouseText_564c5 + jr .asm_df984 +.BagFull + ld hl, Route12HouseText_564d9 + jr .asm_df984 +.asm_a2d76 + ld hl, Route12HouseText_564cf + jr .asm_df984 +.asm_b4cad + ld hl, Route12HouseText_564d4 +.asm_df984 + call PrintText + jp TextScriptEnd + +Route12HouseText_564c0: + TX_FAR _Route12HouseText_564c0 + db "@" + +Route12HouseText_564c5: + TX_FAR _Route12HouseText_564c5 + TX_SFX_ITEM_1 + TX_FAR _Route12HouseText_564ca + db "@" + +Route12HouseText_564cf: + TX_FAR _Route12HouseText_564cf + db "@" + +Route12HouseText_564d4: + TX_FAR _Route12HouseText_564d4 + db "@" + +Route12HouseText_564d9: + TX_FAR _Route12HouseText_564d9 + db "@" diff --git a/scripts/Route13.asm b/scripts/Route13.asm new file mode 100755 index 00000000..8f92147e --- /dev/null +++ b/scripts/Route13.asm @@ -0,0 +1,312 @@ +Route13_Script: + call EnableAutoTextBoxDrawing + ld hl, Route13TrainerHeader0 + ld de, Route13_ScriptPointers + ld a, [wRoute13CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute13CurScript], a + ret + +Route13_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route13_TextPointers: + dw Route13Text1 + dw Route13Text2 + dw Route13Text3 + dw Route13Text4 + dw Route13Text5 + dw Route13Text6 + dw Route13Text7 + dw Route13Text8 + dw Route13Text9 + dw Route13Text10 + dw Route13Text11 + dw Route13Text12 + dw Route13Text13 + +Route13TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_0 + dw Route13BattleText2 ; TextBeforeBattle + dw Route13AfterBattleText2 ; TextAfterBattle + dw Route13EndBattleText2 ; TextEndBattle + dw Route13EndBattleText2 ; TextEndBattle + +Route13TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1 + dw Route13BattleText3 ; TextBeforeBattle + dw Route13AfterBattleText3 ; TextAfterBattle + dw Route13EndBattleText3 ; TextEndBattle + dw Route13EndBattleText3 ; TextEndBattle + +Route13TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 + dw Route13BattleText4 ; TextBeforeBattle + dw Route13AfterBattleText4 ; TextAfterBattle + dw Route13EndBattleText4 ; TextEndBattle + dw Route13EndBattleText4 ; TextEndBattle + +Route13TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 + dw Route13BattleText5 ; TextBeforeBattle + dw Route13AfterBattleText5 ; TextAfterBattle + dw Route13EndBattleText5 ; TextEndBattle + dw Route13EndBattleText5 ; TextEndBattle + +Route13TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 + dw Route13BattleText6 ; TextBeforeBattle + dw Route13AfterBattleText6 ; TextAfterBattle + dw Route13EndBattleText6 ; TextEndBattle + dw Route13EndBattleText6 ; TextEndBattle + +Route13TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 + dw Route13BattleText7 ; TextBeforeBattle + dw Route13AfterBattleText7 ; TextAfterBattle + dw Route13EndBattleText7 ; TextEndBattle + dw Route13EndBattleText7 ; TextEndBattle + +Route13TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 + dw Route13BattleText8 ; TextBeforeBattle + dw Route13AfterBattleText8 ; TextAfterBattle + dw Route13EndBattleText8 ; TextEndBattle + dw Route13EndBattleText8 ; TextEndBattle + +Route13TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1 + dw Route13BattleText9 ; TextBeforeBattle + dw Route13AfterBattleText9 ; TextAfterBattle + dw Route13EndBattleText9 ; TextEndBattle + dw Route13EndBattleText9 ; TextEndBattle + +Route13TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 + dw Route13BattleText10 ; TextBeforeBattle + dw Route13AfterBattleText10 ; TextAfterBattle + dw Route13EndBattleText10 ; TextEndBattle + dw Route13EndBattleText10 ; TextEndBattle + +Route13TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 + dw Route13BattleText11 ; TextBeforeBattle + dw Route13AfterBattleText11 ; TextAfterBattle + dw Route13EndBattleText11 ; TextEndBattle + dw Route13EndBattleText11 ; TextEndBattle + + db $ff + +Route13Text1: + TX_ASM + ld hl, Route13TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText2: + TX_FAR _Route13BattleText2 + db "@" + +Route13EndBattleText2: + TX_FAR _Route13EndBattleText2 + db "@" + +Route13AfterBattleText2: + TX_FAR _Route13AfterBattleText2 + db "@" + +Route13Text2: + TX_ASM + ld hl, Route13TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText3: + TX_FAR _Route13BattleText3 + db "@" + +Route13EndBattleText3: + TX_FAR _Route13EndBattleText3 + db "@" + +Route13AfterBattleText3: + TX_FAR _Route13AfterBattleText3 + db "@" + +Route13Text3: + TX_ASM + ld hl, Route13TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText4: + TX_FAR _Route13BattleText4 + db "@" + +Route13EndBattleText4: + TX_FAR _Route13EndBattleText4 + db "@" + +Route13AfterBattleText4: + TX_FAR _Route13AfterBattleText4 + db "@" + +Route13Text4: + TX_ASM + ld hl, Route13TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText5: + TX_FAR _Route13BattleText5 + db "@" + +Route13EndBattleText5: + TX_FAR _Route13EndBattleText5 + db "@" + +Route13AfterBattleText5: + TX_FAR _Route13AfterBattleText5 + db "@" + +Route13Text5: + TX_ASM + ld hl, Route13TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText6: + TX_FAR _Route13BattleText6 + db "@" + +Route13EndBattleText6: + TX_FAR _Route13EndBattleText6 + db "@" + +Route13AfterBattleText6: + TX_FAR _Route13AfterBattleText6 + db "@" + +Route13Text6: + TX_ASM + ld hl, Route13TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText7: + TX_FAR _Route13BattleText7 + db "@" + +Route13EndBattleText7: + TX_FAR _Route13EndBattleText7 + db "@" + +Route13AfterBattleText7: + TX_FAR _Route13AfterBattleText7 + db "@" + +Route13Text7: + TX_ASM + ld hl, Route13TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText8: + TX_FAR _Route13BattleText8 + db "@" + +Route13EndBattleText8: + TX_FAR _Route13EndBattleText8 + db "@" + +Route13AfterBattleText8: + TX_FAR _Route13AfterBattleText8 + db "@" + +Route13Text8: + TX_ASM + ld hl, Route13TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText9: + TX_FAR _Route13BattleText9 + db "@" + +Route13EndBattleText9: + TX_FAR _Route13EndBattleText9 + db "@" + +Route13AfterBattleText9: + TX_FAR _Route13AfterBattleText9 + db "@" + +Route13Text9: + TX_ASM + ld hl, Route13TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText10: + TX_FAR _Route13BattleText10 + db "@" + +Route13EndBattleText10: + TX_FAR _Route13EndBattleText10 + db "@" + +Route13AfterBattleText10: + TX_FAR _Route13AfterBattleText10 + db "@" + +Route13Text10: + TX_ASM + ld hl, Route13TrainerHeader9 + call TalkToTrainer + jp TextScriptEnd + +Route13BattleText11: + TX_FAR _Route13BattleText11 + db "@" + +Route13EndBattleText11: + TX_FAR _Route13EndBattleText11 + db "@" + +Route13AfterBattleText11: + TX_FAR _Route13AfterBattleText11 + db "@" + +Route13Text11: + TX_FAR _Route13Text11 + db "@" + +Route13Text12: + TX_FAR _Route13Text12 + db "@" + +Route13Text13: + TX_FAR _Route13Text13 + db "@" diff --git a/scripts/Route14.asm b/scripts/Route14.asm new file mode 100755 index 00000000..fdc84d74 --- /dev/null +++ b/scripts/Route14.asm @@ -0,0 +1,302 @@ +Route14_Script: + call EnableAutoTextBoxDrawing + ld hl, Route14TrainerHeader0 + ld de, Route14_ScriptPointers + ld a, [wRoute14CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute14CurScript], a + ret + +Route14_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route14_TextPointers: + dw Route14Text1 + dw Route14Text2 + dw Route14Text3 + dw Route14Text4 + dw Route14Text5 + dw Route14Text6 + dw Route14Text7 + dw Route14Text8 + dw Route14Text9 + dw Route14Text10 + dw Route14Text11 + +Route14TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_0 + dw Route14BattleText1 ; TextBeforeBattle + dw Route14AfterBattleText1 ; TextAfterBattle + dw Route14EndBattleText1 ; TextEndBattle + dw Route14EndBattleText1 ; TextEndBattle + +Route14TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_1 + dw Route14BattleText2 ; TextBeforeBattle + dw Route14AfterBattleText2 ; TextAfterBattle + dw Route14EndBattleText2 ; TextEndBattle + dw Route14EndBattleText2 ; TextEndBattle + +Route14TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_2 + dw Route14BattleText3 ; TextBeforeBattle + dw Route14AfterBattleText3 ; TextAfterBattle + dw Route14EndBattleText3 ; TextEndBattle + dw Route14EndBattleText3 ; TextEndBattle + +Route14TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_3 + dw Route14BattleText4 ; TextBeforeBattle + dw Route14AfterBattleText4 ; TextAfterBattle + dw Route14EndBattleText4 ; TextEndBattle + dw Route14EndBattleText4 ; TextEndBattle + +Route14TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_4 + dw Route14BattleText5 ; TextBeforeBattle + dw Route14AfterBattleText5 ; TextAfterBattle + dw Route14EndBattleText5 ; TextEndBattle + dw Route14EndBattleText5 ; TextEndBattle + +Route14TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_5 + dw Route14BattleText6 ; TextBeforeBattle + dw Route14AfterBattleText6 ; TextAfterBattle + dw Route14EndBattleText6 ; TextEndBattle + dw Route14EndBattleText6 ; TextEndBattle + +Route14TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_6 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_6 + dw Route14BattleText7 ; TextBeforeBattle + dw Route14AfterBattleText7 ; TextAfterBattle + dw Route14EndBattleText7 ; TextEndBattle + dw Route14EndBattleText7 ; TextEndBattle + +Route14TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_7, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_7, 1 + dw Route14BattleText8 ; TextBeforeBattle + dw Route14AfterBattleText8 ; TextAfterBattle + dw Route14EndBattleText8 ; TextEndBattle + dw Route14EndBattleText8 ; TextEndBattle + +Route14TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_8, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_8, 1 + dw Route14BattleText9 ; TextBeforeBattle + dw Route14AfterBattleText9 ; TextAfterBattle + dw Route14EndBattleText9 ; TextEndBattle + dw Route14EndBattleText9 ; TextEndBattle + +Route14TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_9, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_9, 1 + dw Route14BattleText10 ; TextBeforeBattle + dw Route14AfterBattleText10 ; TextAfterBattle + dw Route14EndBattleText10 ; TextEndBattle + dw Route14EndBattleText10 ; TextEndBattle + + db $ff + +Route14Text1: + TX_ASM + ld hl, Route14TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText1: + TX_FAR _Route14BattleText1 + db "@" + +Route14EndBattleText1: + TX_FAR _Route14EndBattleText1 + db "@" + +Route14AfterBattleText1: + TX_FAR _Route14AfterBattleText1 + db "@" + +Route14Text2: + TX_ASM + ld hl, Route14TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText2: + TX_FAR _Route14BattleText2 + db "@" + +Route14EndBattleText2: + TX_FAR _Route14EndBattleText2 + db "@" + +Route14AfterBattleText2: + TX_FAR _Route14AfterBattleText2 + db "@" + +Route14Text3: + TX_ASM + ld hl, Route14TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText3: + TX_FAR _Route14BattleText3 + db "@" + +Route14EndBattleText3: + TX_FAR _Route14EndBattleText3 + db "@" + +Route14AfterBattleText3: + TX_FAR _Route14AfterBattleText3 + db "@" + +Route14Text4: + TX_ASM + ld hl, Route14TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText4: + TX_FAR _Route14BattleText4 + db "@" + +Route14EndBattleText4: + TX_FAR _Route14EndBattleText4 + db "@" + +Route14AfterBattleText4: + TX_FAR _Route14AfterBattleText4 + db "@" + +Route14Text5: + TX_ASM + ld hl, Route14TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText5: + TX_FAR _Route14BattleText5 + db "@" + +Route14EndBattleText5: + TX_FAR _Route14EndBattleText5 + db "@" + +Route14AfterBattleText5: + TX_FAR _Route14AfterBattleText5 + db "@" + +Route14Text6: + TX_ASM + ld hl, Route14TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText6: + TX_FAR _Route14BattleText6 + db "@" + +Route14EndBattleText6: + TX_FAR _Route14EndBattleText6 + db "@" + +Route14AfterBattleText6: + TX_FAR _Route14AfterBattleText6 + db "@" + +Route14Text7: + TX_ASM + ld hl, Route14TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText7: + TX_FAR _Route14BattleText7 + db "@" + +Route14EndBattleText7: + TX_FAR _Route14EndBattleText7 + db "@" + +Route14AfterBattleText7: + TX_FAR _Route14AfterBattleText7 + db "@" + +Route14Text8: + TX_ASM + ld hl, Route14TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText8: + TX_FAR _Route14BattleText8 + db "@" + +Route14EndBattleText8: + TX_FAR _Route14EndBattleText8 + db "@" + +Route14AfterBattleText8: + TX_FAR _Route14AfterBattleText8 + db "@" + +Route14Text9: + TX_ASM + ld hl, Route14TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText9: + TX_FAR _Route14BattleText9 + db "@" + +Route14EndBattleText9: + TX_FAR _Route14EndBattleText9 + db "@" + +Route14AfterBattleText9: + TX_FAR _Route14AfterBattleText9 + db "@" + +Route14Text10: + TX_ASM + ld hl, Route14TrainerHeader9 + call TalkToTrainer + jp TextScriptEnd + +Route14BattleText10: + TX_FAR _Route14BattleText10 + db "@" + +Route14EndBattleText10: + TX_FAR _Route14EndBattleText10 + db "@" + +Route14AfterBattleText10: + TX_FAR _Route14AfterBattleText10 + db "@" + +Route14Text11: + TX_FAR _Route14Text11 + db "@" diff --git a/scripts/Route15.asm b/scripts/Route15.asm new file mode 100755 index 00000000..d973eb9c --- /dev/null +++ b/scripts/Route15.asm @@ -0,0 +1,295 @@ +Route15_Script: + call EnableAutoTextBoxDrawing + ld hl, Route15TrainerHeader0 + ld de, Route15_ScriptPointers + ld a, [wRoute15CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute15CurScript], a + ret + +Route15_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route15_TextPointers: + dw Route15Text1 + dw Route15Text2 + dw Route15Text3 + dw Route15Text4 + dw Route15Text5 + dw Route15Text6 + dw Route15Text7 + dw Route15Text8 + dw Route15Text9 + dw Route15Text10 + dw PickUpItemText + dw Route15Text12 + +Route15TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_0 + dw Route15BattleText1 ; TextBeforeBattle + dw Route15AfterBattleText1 ; TextAfterBattle + dw Route15EndBattleText1 ; TextEndBattle + dw Route15EndBattleText1 ; TextEndBattle + +Route15TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_1 + dw Route15BattleText2 ; TextBeforeBattle + dw Route15AfterBattleText2 ; TextAfterBattle + dw Route15EndBattleText2 ; TextEndBattle + dw Route15EndBattleText2 ; TextEndBattle + +Route15TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_2 + dw Route15BattleText3 ; TextBeforeBattle + dw Route15AfterBattleText3 ; TextAfterBattle + dw Route15EndBattleText3 ; TextEndBattle + dw Route15EndBattleText3 ; TextEndBattle + +Route15TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_3 + dw Route15BattleText4 ; TextBeforeBattle + dw Route15AfterBattleText4 ; TextAfterBattle + dw Route15EndBattleText4 ; TextEndBattle + dw Route15EndBattleText4 ; TextEndBattle + +Route15TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_4 + dw Route15BattleText5 ; TextBeforeBattle + dw Route15AfterBattleText5 ; TextAfterBattle + dw Route15EndBattleText5 ; TextEndBattle + dw Route15EndBattleText5 ; TextEndBattle + +Route15TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_5 + dw Route15BattleText6 ; TextBeforeBattle + dw Route15AfterBattleText6 ; TextAfterBattle + dw Route15EndBattleText6 ; TextEndBattle + dw Route15EndBattleText6 ; TextEndBattle + +Route15TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_6 + dw Route15BattleText7 ; TextBeforeBattle + dw Route15AfterBattleText7 ; TextAfterBattle + dw Route15EndBattleText7 ; TextEndBattle + dw Route15EndBattleText7 ; TextEndBattle + +Route15TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_7, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_7, 1 + dw Route15BattleText8 ; TextBeforeBattle + dw Route15AfterBattleText8 ; TextAfterBattle + dw Route15EndBattleText8 ; TextEndBattle + dw Route15EndBattleText8 ; TextEndBattle + +Route15TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_8, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_8, 1 + dw Route15BattleText9 ; TextBeforeBattle + dw Route15AfterBattleText9 ; TextAfterBattle + dw Route15EndBattleText9 ; TextEndBattle + dw Route15EndBattleText9 ; TextEndBattle + +Route15TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_9, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_9, 1 + dw Route15BattleText10 ; TextBeforeBattle + dw Route15AfterBattleText10 ; TextAfterBattle + dw Route15EndBattleText10 ; TextEndBattle + dw Route15EndBattleText10 ; TextEndBattle + + db $ff + +Route15Text1: + TX_ASM + ld hl, Route15TrainerHeader0 + jr Route15TalkToTrainer + +Route15Text2: + TX_ASM + ld hl, Route15TrainerHeader1 + jr Route15TalkToTrainer + +Route15Text3: + TX_ASM + ld hl, Route15TrainerHeader2 + jr Route15TalkToTrainer + +Route15Text4: + TX_ASM + ld hl, Route15TrainerHeader3 + jr Route15TalkToTrainer + +Route15Text5: + TX_ASM + ld hl, Route15TrainerHeader4 + jr Route15TalkToTrainer + +Route15Text6: + TX_ASM + ld hl, Route15TrainerHeader5 + jr Route15TalkToTrainer + +Route15Text7: + TX_ASM + ld hl, Route15TrainerHeader6 + jr Route15TalkToTrainer + +Route15Text8: + TX_ASM + ld hl, Route15TrainerHeader7 + jr Route15TalkToTrainer + +Route15Text9: + TX_ASM + ld hl, Route15TrainerHeader8 + jr Route15TalkToTrainer + +Route15Text10: + TX_ASM + ld hl, Route15TrainerHeader9 +Route15TalkToTrainer: + call TalkToTrainer + jp TextScriptEnd + +Route15BattleText1: + TX_FAR _Route15BattleText1 + db "@" + +Route15EndBattleText1: + TX_FAR _Route15EndBattleText1 + db "@" + +Route15AfterBattleText1: + TX_FAR _Route15AfterBattleText1 + db "@" + +Route15BattleText2: + TX_FAR _Route15BattleText2 + db "@" + +Route15EndBattleText2: + TX_FAR _Route15EndBattleText2 + db "@" + +Route15AfterBattleText2: + TX_FAR _Route15AfterBattleText2 + db "@" + +Route15BattleText3: + TX_FAR _Route15BattleText3 + db "@" + +Route15EndBattleText3: + TX_FAR _Route15EndBattleText3 + db "@" + +Route15AfterBattleText3: + TX_FAR _Route15AfterBattleText3 + db "@" + +Route15BattleText4: + TX_FAR _Route15BattleText4 + db "@" + +Route15EndBattleText4: + TX_FAR _Route15EndBattleText4 + db "@" + +Route15AfterBattleText4: + TX_FAR _Route15AfterBattleText4 + db "@" + +Route15BattleText5: + TX_FAR _Route15BattleText5 + db "@" + +Route15EndBattleText5: + TX_FAR _Route15EndBattleText5 + db "@" + +Route15AfterBattleText5: + TX_FAR _Route15AfterBattleText5 + db "@" + +Route15BattleText6: + TX_FAR _Route15BattleText6 + db "@" + +Route15EndBattleText6: + TX_FAR _Route15EndBattleText6 + db "@" + +Route15AfterBattleText6: + TX_FAR _Route15AfterBattleText6 + db "@" + +Route15BattleText7: + TX_FAR _Route15BattleText7 + db "@" + +Route15EndBattleText7: + TX_FAR _Route15EndBattleText7 + db "@" + +Route15AfterBattleText7: + TX_FAR _Route15AfterBattleText7 + db "@" + +Route15BattleText8: + TX_FAR _Route15BattleText8 + db "@" + +Route15EndBattleText8: + TX_FAR _Route15EndBattleText8 + db "@" + +Route15AfterBattleText8: + TX_FAR _Route15AfterBattleText8 + db "@" + +Route15BattleText9: + TX_FAR _Route15BattleText9 + db "@" + +Route15EndBattleText9: + TX_FAR _Route15EndBattleText9 + db "@" + +Route15AfterBattleText9: + TX_FAR _Route15AfterBattleText9 + db "@" + +Route15BattleText10: + TX_FAR _Route15BattleText10 + db "@" + +Route15EndBattleText10: + TX_FAR _Route15EndBattleText10 + db "@" + +Route15AfterBattleText10: + TX_FAR _Route15AfterBattleText10 + db "@" + +Route15Text12: + TX_FAR _Route15Text12 + db "@" diff --git a/scripts/Route15Gate1F.asm b/scripts/Route15Gate1F.asm new file mode 100755 index 00000000..910eb2a5 --- /dev/null +++ b/scripts/Route15Gate1F.asm @@ -0,0 +1,9 @@ +Route15Gate1F_Script: + jp EnableAutoTextBoxDrawing + +Route15Gate1F_TextPointers: + dw Route15GateText1 + +Route15GateText1: + TX_FAR _Route15GateText1 + db "@" diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm new file mode 100755 index 00000000..83763762 --- /dev/null +++ b/scripts/Route15Gate2F.asm @@ -0,0 +1,44 @@ +Route15Gate2F_Script: + jp DisableAutoTextBoxDrawing + +Route15Gate2F_TextPointers: + dw Route15GateUpstairsText1 + dw Route15GateUpstairsText2 + +Route15GateUpstairsText1: + TX_ASM + CheckEvent EVENT_GOT_EXP_ALL + jr nz, .asm_49683 + ld a, 50 ; pokemon needed + ld [hOaksAideRequirement], a + ld a, EXP_ALL ; oak's aide reward + ld [hOaksAideRewardItem], a + ld [wd11e], a + call GetItemName + ld hl, wcd6d + ld de, wOaksAideRewardItemName + ld bc, ITEM_NAME_LENGTH + call CopyData + predef OaksAideScript + ld a, [hOaksAideResult] + cp $1 + jr nz, .asm_49689 + SetEvent EVENT_GOT_EXP_ALL +.asm_49683 + ld hl, Route15GateUpstairsText_4968c + call PrintText +.asm_49689 + jp TextScriptEnd + +Route15GateUpstairsText_4968c: + TX_FAR _Route15GateUpstairsText_4968c + db "@" + +Route15GateUpstairsText2: + TX_ASM + ld hl, Route15GateUpstairsText_49698 + jp GateUpstairsScript_PrintIfFacingUp + +Route15GateUpstairsText_49698: + TX_FAR _Route15GateUpstairsText_49698 + db "@" diff --git a/scripts/Route16.asm b/scripts/Route16.asm new file mode 100755 index 00000000..54f83380 --- /dev/null +++ b/scripts/Route16.asm @@ -0,0 +1,259 @@ +Route16_Script: + call EnableAutoTextBoxDrawing + ld hl, Route16TrainerHeader0 + ld de, Route16_ScriptPointers + ld a, [wRoute16CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute16CurScript], a + ret + +Route16Script_59946: + xor a + ld [wJoyIgnore], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a + ret + +Route16_ScriptPointers: + dw Route16Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw Route16Script3 + +Route16Script0: + CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX + jp nz, CheckFightingMapTrainers + CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX + ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX + jp z, CheckFightingMapTrainers + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, SNORLAX + ld [wCurOpponent], a + ld a, 30 + ld [wCurEnemyLVL], a + ld a, HS_ROUTE_16_SNORLAX + ld [wMissableObjectIndex], a + predef HideObject + call UpdateSprites + ld a, $3 + ld [wRoute16CurScript], a + ld [wCurMapScript], a + ret + +Route16Script3: + ld a, [wIsInBattle] + cp $ff + jp z, Route16Script_59946 + call UpdateSprites + ld a, [wBattleResult] + cp $2 + jr z, .asm_599a8 + ld a, $b + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_599a8 + SetEvent EVENT_BEAT_ROUTE16_SNORLAX + call Delay3 + ld a, $0 + ld [wRoute16CurScript], a + ld [wCurMapScript], a + ret + +Route16_TextPointers: + dw Route16Text1 + dw Route16Text2 + dw Route16Text3 + dw Route16Text4 + dw Route16Text5 + dw Route16Text6 + dw Route16Text7 + dw Route16Text8 + dw Route16Text9 + dw Route16Text10 + dw Route16Text11 + +Route16TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_0 + dw Route16BattleText1 ; TextBeforeBattle + dw Route16AfterBattleText1 ; TextAfterBattle + dw Route16EndBattleText1 ; TextEndBattle + dw Route16EndBattleText1 ; TextEndBattle + +Route16TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_1 + dw Route16BattleText2 ; TextBeforeBattle + dw Route16AfterBattleText2 ; TextAfterBattle + dw Route16EndBattleText2 ; TextEndBattle + dw Route16EndBattleText2 ; TextEndBattle + +Route16TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_2 + dw Route16BattleText3 ; TextBeforeBattle + dw Route16AfterBattleText3 ; TextAfterBattle + dw Route16EndBattleText3 ; TextEndBattle + dw Route16EndBattleText3 ; TextEndBattle + +Route16TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_3 + dw Route16BattleText4 ; TextBeforeBattle + dw Route16AfterBattleText4 ; TextAfterBattle + dw Route16EndBattleText4 ; TextEndBattle + dw Route16EndBattleText4 ; TextEndBattle + +Route16TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_4 + dw Route16BattleText5 ; TextBeforeBattle + dw Route16AfterBattleText5 ; TextAfterBattle + dw Route16EndBattleText5 ; TextEndBattle + dw Route16EndBattleText5 ; TextEndBattle + +Route16TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_5 + dw Route16BattleText6 ; TextBeforeBattle + dw Route16AfterBattleText6 ; TextAfterBattle + dw Route16EndBattleText6 ; TextEndBattle + dw Route16EndBattleText6 ; TextEndBattle + + db $ff + +Route16Text1: + TX_ASM + ld hl, Route16TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route16BattleText1: + TX_FAR _Route16BattleText1 + db "@" + +Route16EndBattleText1: + TX_FAR _Route16EndBattleText1 + db "@" + +Route16AfterBattleText1: + TX_FAR _Route16AfterBattleText1 + db "@" + +Route16Text2: + TX_ASM + ld hl, Route16TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route16BattleText2: + TX_FAR _Route16BattleText2 + db "@" + +Route16EndBattleText2: + TX_FAR _Route16EndBattleText2 + db "@" + +Route16AfterBattleText2: + TX_FAR _Route16AfterBattleText2 + db "@" + +Route16Text3: + TX_ASM + ld hl, Route16TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route16BattleText3: + TX_FAR _Route16BattleText3 + db "@" + +Route16EndBattleText3: + TX_FAR _Route16EndBattleText3 + db "@" + +Route16AfterBattleText3: + TX_FAR _Route16AfterBattleText3 + db "@" + +Route16Text4: + TX_ASM + ld hl, Route16TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route16BattleText4: + TX_FAR _Route16BattleText4 + db "@" + +Route16EndBattleText4: + TX_FAR _Route16EndBattleText4 + db "@" + +Route16AfterBattleText4: + TX_FAR _Route16AfterBattleText4 + db "@" + +Route16Text5: + TX_ASM + ld hl, Route16TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route16BattleText5: + TX_FAR _Route16BattleText5 + db "@" + +Route16EndBattleText5: + TX_FAR _Route16EndBattleText5 + db "@" + +Route16AfterBattleText5: + TX_FAR _Route16AfterBattleText5 + db "@" + +Route16Text6: + TX_ASM + ld hl, Route16TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route16BattleText6: + TX_FAR _Route16BattleText6 + db "@" + +Route16EndBattleText6: + TX_FAR _Route16EndBattleText6 + db "@" + +Route16AfterBattleText6: + TX_FAR _Route16AfterBattleText6 + db "@" + +Route16Text7: + TX_FAR _Route16Text7 + db "@" + +Route16Text10: + TX_FAR _Route16Text10 + db "@" + +Route16Text11: + TX_FAR _Route16Text11 + db "@" + +Route16Text8: + TX_FAR _Route16Text8 + db "@" + +Route16Text9: + TX_FAR _Route16Text9 + db "@" diff --git a/scripts/Route16FlyHouse.asm b/scripts/Route16FlyHouse.asm new file mode 100755 index 00000000..1d74ac80 --- /dev/null +++ b/scripts/Route16FlyHouse.asm @@ -0,0 +1,55 @@ +Route16FlyHouse_Script: + jp EnableAutoTextBoxDrawing + +Route16FlyHouse_TextPointers: + dw Route16HouseText1 + dw Route16HouseText2 + +Route16HouseText1: + TX_ASM + CheckEvent EVENT_GOT_HM02 + ld hl, HM02ExplanationText + jr nz, .asm_13616 + ld hl, Route16HouseText3 + call PrintText + lb bc, HM_02, 1 + call GiveItem + jr nc, .BagFull + SetEvent EVENT_GOT_HM02 + ld hl, ReceivedHM02Text + jr .asm_13616 +.BagFull + ld hl, HM02NoRoomText +.asm_13616 + call PrintText + jp TextScriptEnd + +Route16HouseText3: + TX_FAR _Route16HouseText3 + db "@" + +ReceivedHM02Text: + TX_FAR _ReceivedHM02Text + TX_SFX_KEY_ITEM + db "@" + +HM02ExplanationText: + TX_FAR _HM02ExplanationText + db "@" + +HM02NoRoomText: + TX_FAR _HM02NoRoomText + db "@" + +Route16HouseText2: + TX_ASM + ld hl, Route16HouseText_1e652 + call PrintText + ld a, FEAROW + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +Route16HouseText_1e652: + TX_FAR _Route16HouseText_1e652 + db "@" diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm new file mode 100755 index 00000000..f814d209 --- /dev/null +++ b/scripts/Route16Gate1F.asm @@ -0,0 +1,121 @@ +Route16Gate1F_Script: + ld hl, wd732 + res 5, [hl] + call EnableAutoTextBoxDrawing + ld a, [wRoute16Gate1FCurScript] + ld hl, Route16Gate1F_ScriptPointers + jp CallFunctionInTable + +Route16Gate1F_ScriptPointers: + dw Route16GateScript0 + dw Route16GateScript1 + dw Route16GateScript2 + dw Route16GateScript3 + +Route16GateScript0: + call Route16GateScript_49755 + ret nz + ld hl, CoordsData_49714 + call ArePlayerCoordsInArray + ret nc + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [hJoyHeld], a + ld a, [wCoordIndex] + cp $1 + jr z, .asm_4970e + ld a, [wCoordIndex] + dec a + ld [wSimulatedJoypadStatesIndex], a + ld b, $0 + ld c, a + ld a, D_UP + ld hl, wSimulatedJoypadStatesEnd + call FillMemory + call StartSimulatingJoypadStates + ld a, $1 + ld [wRoute16Gate1FCurScript], a + ret +.asm_4970e + ld a, $2 + ld [wRoute16Gate1FCurScript], a + ret + +CoordsData_49714: + db $07,$04 + db $08,$04 + db $09,$04 + db $0A,$04 + db $FF + +Route16GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld a, $f0 + ld [wJoyIgnore], a + +Route16GateScript2: + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_RIGHT + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wRoute16Gate1FCurScript], a + ret + +Route16GateScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + xor a + ld [wJoyIgnore], a + ld hl, wd730 + res 7, [hl] + ld a, $0 + ld [wRoute16Gate1FCurScript], a + ret + +Route16GateScript_49755: + ld b, BICYCLE + jp IsItemInBag + +Route16Gate1F_TextPointers: + dw Route16GateText1 + dw Route16GateText2 + dw Route16GateText3 + +Route16GateText1: + TX_ASM + call Route16GateScript_49755 + jr z, .asm_0bdf3 + ld hl, Route16GateText_4977c + call PrintText + jr .asm_56c9d +.asm_0bdf3 + ld hl, Route16GateText_49777 + call PrintText +.asm_56c9d + jp TextScriptEnd + +Route16GateText_49777: + TX_FAR _Route16GateText_49777 + db "@" + +Route16GateText_4977c: + TX_FAR _Route16GateText_4977c + db "@" + +Route16GateText3: + TX_FAR _Route16GateText_49781 + db "@" + +Route16GateText2: + TX_FAR _Route16GateText2 + db "@" diff --git a/scripts/Route16Gate2F.asm b/scripts/Route16Gate2F.asm new file mode 100755 index 00000000..643a5ec7 --- /dev/null +++ b/scripts/Route16Gate2F.asm @@ -0,0 +1,46 @@ +Route16Gate2F_Script: + jp DisableAutoTextBoxDrawing + +Route16Gate2F_TextPointers: + dw Route16GateUpstairsText1 + dw Route16GateUpstairsText2 + dw Route16GateUpstairsText3 + dw Route16GateUpstairsText4 + +Route16GateUpstairsText1: + TX_ASM + ld hl, Route16GateUpstairsText_49820 + call PrintText + jp TextScriptEnd + +Route16GateUpstairsText_49820: + TX_FAR _Route16GateUpstairsText_49820 + db "@" + +Route16GateUpstairsText2: + TX_ASM + ld hl, Route16GateUpstairsText_4982f + call PrintText + jp TextScriptEnd + +Route16GateUpstairsText_4982f: + TX_FAR _Route16GateUpstairsText_4982f + db "@" + +Route16GateUpstairsText3: + TX_ASM + ld hl, Route16GateUpstairsText_4983b + jp GateUpstairsScript_PrintIfFacingUp + +Route16GateUpstairsText_4983b: + TX_FAR _Route16GateUpstairsText_4983b + db "@" + +Route16GateUpstairsText4: + TX_ASM + ld hl, Route16GateUpstairsText_49847 + jp GateUpstairsScript_PrintIfFacingUp + +Route16GateUpstairsText_49847: + TX_FAR _Route16GateUpstairsText_49847 + db "@" diff --git a/scripts/Route17.asm b/scripts/Route17.asm new file mode 100755 index 00000000..dd92ac44 --- /dev/null +++ b/scripts/Route17.asm @@ -0,0 +1,327 @@ +Route17_Script: + call EnableAutoTextBoxDrawing + ld hl, Route17TrainerHeader0 + ld de, Route17_ScriptPointers + ld a, [wRoute17CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute17CurScript], a + ret + +Route17_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route17_TextPointers: + dw Route17Text1 + dw Route17Text2 + dw Route17Text3 + dw Route17Text4 + dw Route17Text5 + dw Route17Text6 + dw Route17Text7 + dw Route17Text8 + dw Route17Text9 + dw Route17Text10 + dw Route17Text11 + dw Route17Text12 + dw Route17Text13 + dw Route17Text14 + dw Route17Text15 + dw Route17Text16 + +Route17TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0 + dw Route17BattleText1 ; TextBeforeBattle + dw Route17AfterBattleText1 ; TextAfterBattle + dw Route17EndBattleText1 ; TextEndBattle + dw Route17EndBattleText1 ; TextEndBattle + +Route17TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1 + dw Route17BattleText2 ; TextBeforeBattle + dw Route17AfterBattleText2 ; TextAfterBattle + dw Route17EndBattleText2 ; TextEndBattle + dw Route17EndBattleText2 ; TextEndBattle + +Route17TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2 + dw Route17BattleText3 ; TextBeforeBattle + dw Route17AfterBattleText3 ; TextAfterBattle + dw Route17EndBattleText3 ; TextEndBattle + dw Route17EndBattleText3 ; TextEndBattle + +Route17TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3 + dw Route17BattleText4 ; TextBeforeBattle + dw Route17AfterBattleText4 ; TextAfterBattle + dw Route17EndBattleText4 ; TextEndBattle + dw Route17EndBattleText4 ; TextEndBattle + +Route17TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4 + dw Route17BattleText5 ; TextBeforeBattle + dw Route17AfterBattleText5 ; TextAfterBattle + dw Route17EndBattleText5 ; TextEndBattle + dw Route17EndBattleText5 ; TextEndBattle + +Route17TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5 + dw Route17BattleText6 ; TextBeforeBattle + dw Route17AfterBattleText6 ; TextAfterBattle + dw Route17EndBattleText6 ; TextEndBattle + dw Route17EndBattleText6 ; TextEndBattle + +Route17TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6 + dw Route17BattleText7 ; TextBeforeBattle + dw Route17AfterBattleText7 ; TextAfterBattle + dw Route17EndBattleText7 ; TextEndBattle + dw Route17EndBattleText7 ; TextEndBattle + +Route17TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1 + dw Route17BattleText8 ; TextBeforeBattle + dw Route17AfterBattleText8 ; TextAfterBattle + dw Route17EndBattleText8 ; TextEndBattle + dw Route17EndBattleText8 ; TextEndBattle + +Route17TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1 + dw Route17BattleText9 ; TextBeforeBattle + dw Route17AfterBattleText9 ; TextAfterBattle + dw Route17EndBattleText9 ; TextEndBattle + dw Route17EndBattleText9 ; TextEndBattle + +Route17TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1 + dw Route17BattleText10 ; TextBeforeBattle + dw Route17AfterBattleText10 ; TextAfterBattle + dw Route17EndBattleText10 ; TextEndBattle + dw Route17EndBattleText10 ; TextEndBattle + + db $ff + +Route17Text1: + TX_ASM + ld hl, Route17TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText1: + TX_FAR _Route17BattleText1 + db "@" + +Route17EndBattleText1: + TX_FAR _Route17EndBattleText1 + db "@" + +Route17AfterBattleText1: + TX_FAR _Route17AfterBattleText1 + db "@" + +Route17Text2: + TX_ASM + ld hl, Route17TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText2: + TX_FAR _Route17BattleText2 + db "@" + +Route17EndBattleText2: + TX_FAR _Route17EndBattleText2 + db "@" + +Route17AfterBattleText2: + TX_FAR _Route17AfterBattleText2 + db "@" + +Route17Text3: + TX_ASM + ld hl, Route17TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText3: + TX_FAR _Route17BattleText3 + db "@" + +Route17EndBattleText3: + TX_FAR _Route17EndBattleText3 + db "@" + +Route17AfterBattleText3: + TX_FAR _Route17AfterBattleText3 + db "@" + +Route17Text4: + TX_ASM + ld hl, Route17TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText4: + TX_FAR _Route17BattleText4 + db "@" + +Route17EndBattleText4: + TX_FAR _Route17EndBattleText4 + db "@" + +Route17AfterBattleText4: + TX_FAR _Route17AfterBattleText4 + db "@" + +Route17Text5: + TX_ASM + ld hl, Route17TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText5: + TX_FAR _Route17BattleText5 + db "@" + +Route17EndBattleText5: + TX_FAR _Route17EndBattleText5 + db "@" + +Route17AfterBattleText5: + TX_FAR _Route17AfterBattleText5 + db "@" + +Route17Text6: + TX_ASM + ld hl, Route17TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText6: + TX_FAR _Route17BattleText6 + db "@" + +Route17EndBattleText6: + TX_FAR _Route17EndBattleText6 + db "@" + +Route17AfterBattleText6: + TX_FAR _Route17AfterBattleText6 + db "@" + +Route17Text7: + TX_ASM + ld hl, Route17TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText7: + TX_FAR _Route17BattleText7 + db "@" + +Route17EndBattleText7: + TX_FAR _Route17EndBattleText7 + db "@" + +Route17AfterBattleText7: + TX_FAR _Route17AfterBattleText7 + db "@" + +Route17Text8: + TX_ASM + ld hl, Route17TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText8: + TX_FAR _Route17BattleText8 + db "@" + +Route17EndBattleText8: + TX_FAR _Route17EndBattleText8 + db "@" + +Route17AfterBattleText8: + TX_FAR _Route17AfterBattleText8 + db "@" + +Route17Text9: + TX_ASM + ld hl, Route17TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText9: + TX_FAR _Route17BattleText9 + db "@" + +Route17EndBattleText9: + TX_FAR _Route17EndBattleText9 + db "@" + +Route17AfterBattleText9: + TX_FAR _Route17AfterBattleText9 + db "@" + +Route17Text10: + TX_ASM + ld hl, Route17TrainerHeader9 + call TalkToTrainer + jp TextScriptEnd + +Route17BattleText10: + TX_FAR _Route17BattleText10 + db "@" + +Route17EndBattleText10: + TX_FAR _Route17EndBattleText10 + db "@" + +Route17AfterBattleText10: + TX_FAR _Route17AfterBattleText10 + db "@" + +Route17Text11: + TX_FAR _Route17Text11 + db "@" + +Route17Text12: + TX_FAR _Route17Text12 + db "@" + +Route17Text13: + TX_FAR _Route17Text13 + db "@" + +Route17Text14: + TX_FAR _Route17Text14 + db "@" + +Route17Text15: + TX_FAR _Route17Text15 + db "@" + +Route17Text16: + TX_FAR _Route17Text16 + db "@" diff --git a/scripts/Route18.asm b/scripts/Route18.asm new file mode 100755 index 00000000..022d41be --- /dev/null +++ b/scripts/Route18.asm @@ -0,0 +1,111 @@ +Route18_Script: + call EnableAutoTextBoxDrawing + ld hl, Route18TrainerHeader0 + ld de, Route18_ScriptPointers + ld a, [wRoute18CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute18CurScript], a + ret + +Route18_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route18_TextPointers: + dw Route18Text1 + dw Route18Text2 + dw Route18Text3 + dw Route18Text4 + dw Route18Text5 + +Route18TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0 + dw Route18BattleText1 ; TextBeforeBattle + dw Route18AfterBattleText1 ; TextAfterBattle + dw Route18EndBattleText1 ; TextEndBattle + dw Route18EndBattleText1 ; TextEndBattle + +Route18TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1 + dw Route18BattleText2 ; TextBeforeBattle + dw Route18AfterBattleText2 ; TextAfterBattle + dw Route18EndBattleText2 ; TextEndBattle + dw Route18EndBattleText2 ; TextEndBattle + +Route18TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2 + dw Route18BattleText3 ; TextBeforeBattle + dw Route18AfterBattleText3 ; TextAfterBattle + dw Route18EndBattleText3 ; TextEndBattle + dw Route18EndBattleText3 ; TextEndBattle + + db $ff + +Route18Text1: + TX_ASM + ld hl, Route18TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route18BattleText1: + TX_FAR _Route18BattleText1 + db "@" + +Route18EndBattleText1: + TX_FAR _Route18EndBattleText1 + db "@" + +Route18AfterBattleText1: + TX_FAR _Route18AfterBattleText1 + db "@" + +Route18Text2: + TX_ASM + ld hl, Route18TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route18BattleText2: + TX_FAR _Route18BattleText2 + db "@" + +Route18EndBattleText2: + TX_FAR _Route18EndBattleText2 + db "@" + +Route18AfterBattleText2: + TX_FAR _Route18AfterBattleText2 + db "@" + +Route18Text3: + TX_ASM + ld hl, Route18TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route18BattleText3: + TX_FAR _Route18BattleText3 + db "@" + +Route18EndBattleText3: + TX_FAR _Route18EndBattleText3 + db "@" + +Route18AfterBattleText3: + TX_FAR _Route18AfterBattleText3 + db "@" + +Route18Text4: + TX_FAR _Route18Text4 + db "@" + +Route18Text5: + TX_FAR _Route18Text5 + db "@" diff --git a/scripts/Route18Gate1F.asm b/scripts/Route18Gate1F.asm new file mode 100755 index 00000000..812cb3e0 --- /dev/null +++ b/scripts/Route18Gate1F.asm @@ -0,0 +1,112 @@ +Route18Gate1F_Script: + ld hl, wd732 + res 5, [hl] + call EnableAutoTextBoxDrawing + ld a, [wRoute18Gate1FCurScript] + ld hl, Route18Gate1F_ScriptPointers + jp CallFunctionInTable + +Route18Gate1F_ScriptPointers: + dw Route18GateScript0 + dw Route18GateScript1 + dw Route18GateScript2 + dw Route18GateScript3 + +Route18GateScript0: + call Route16GateScript_49755 + ret nz + ld hl, CoordsData_498cc + call ArePlayerCoordsInArray + ret nc + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [hJoyHeld], a + ld a, [wCoordIndex] + cp $1 + jr z, .asm_498c6 + ld a, [wCoordIndex] + dec a + ld [wSimulatedJoypadStatesIndex], a + ld b, 0 + ld c, a + ld a, D_UP + ld hl, wSimulatedJoypadStatesEnd + call FillMemory + call StartSimulatingJoypadStates + ld a, $1 + ld [wRoute18Gate1FCurScript], a + ret +.asm_498c6 + ld a, $2 + ld [wRoute18Gate1FCurScript], a + ret + +CoordsData_498cc: + db $03,$04 + db $04,$04 + db $05,$04 + db $06,$04 + db $FF + +Route18GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld a, $f0 + ld [wJoyIgnore], a + +Route18GateScript2: + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_RIGHT + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wRoute18Gate1FCurScript], a + ret + +Route18GateScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + xor a + ld [wJoyIgnore], a + ld hl, wd730 + res 7, [hl] + ld a, $0 + ld [wRoute18Gate1FCurScript], a + ret + +Route18Gate1F_TextPointers: + dw Route18GateText1 + dw Route18GateText2 + +Route18GateText1: + TX_ASM + call Route16GateScript_49755 + jr z, .asm_3c84d + ld hl, Route18GateText_4992d + call PrintText + jr .asm_a8410 +.asm_3c84d + ld hl, Route18GateText_49928 + call PrintText +.asm_a8410 + jp TextScriptEnd + +Route18GateText_49928: + TX_FAR _Route18GateText_49928 + db "@" + +Route18GateText_4992d: + TX_FAR _Route18GateText_4992d + db "@" + +Route18GateText2: + TX_FAR _Route18GateText_49932 + db "@" diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm new file mode 100755 index 00000000..6987a099 --- /dev/null +++ b/scripts/Route18Gate2F.asm @@ -0,0 +1,32 @@ +Route18Gate2F_Script: + jp DisableAutoTextBoxDrawing + +Route18Gate2F_TextPointers: + dw Route18GateUpstairsText1 + dw Route18GateUpstairsText2 + dw Route18GateUpstairsText3 + +Route18GateUpstairsText1: + TX_ASM + ld a, $5 + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd + +Route18GateUpstairsText2: + TX_ASM + ld hl, Route18GateUpstairsText_49993 + jp GateUpstairsScript_PrintIfFacingUp + +Route18GateUpstairsText_49993: + TX_FAR _Route18GateUpstairsText_49993 + db "@" + +Route18GateUpstairsText3: + TX_ASM + ld hl, Route18GateUpstairsText_4999f + jp GateUpstairsScript_PrintIfFacingUp + +Route18GateUpstairsText_4999f: + TX_FAR _Route18GateUpstairsText_4999f + db "@" diff --git a/scripts/Route19.asm b/scripts/Route19.asm new file mode 100755 index 00000000..6f603e05 --- /dev/null +++ b/scripts/Route19.asm @@ -0,0 +1,302 @@ +Route19_Script: + call EnableAutoTextBoxDrawing + ld hl, Route19TrainerHeader0 + ld de, Route19_ScriptPointers + ld a, [wRoute19CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute19CurScript], a + ret + +Route19_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route19_TextPointers: + dw Route19Text1 + dw Route19Text2 + dw Route19Text3 + dw Route19Text4 + dw Route19Text5 + dw Route19Text6 + dw Route19Text7 + dw Route19Text8 + dw Route19Text9 + dw Route19Text10 + dw Route19Text11 + +Route19TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_0 + dw Route19BattleText1 ; TextBeforeBattle + dw Route19AfterBattleText1 ; TextAfterBattle + dw Route19EndBattleText1 ; TextEndBattle + dw Route19EndBattleText1 ; TextEndBattle + +Route19TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1 + dw Route19BattleText2 ; TextBeforeBattle + dw Route19AfterBattleText2 ; TextAfterBattle + dw Route19EndBattleText2 ; TextEndBattle + dw Route19EndBattleText2 ; TextEndBattle + +Route19TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_2 + dw Route19BattleText3 ; TextBeforeBattle + dw Route19AfterBattleText3 ; TextAfterBattle + dw Route19EndBattleText3 ; TextEndBattle + dw Route19EndBattleText3 ; TextEndBattle + +Route19TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_3 + dw Route19BattleText4 ; TextBeforeBattle + dw Route19AfterBattleText4 ; TextAfterBattle + dw Route19EndBattleText4 ; TextEndBattle + dw Route19EndBattleText4 ; TextEndBattle + +Route19TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_4 + dw Route19BattleText5 ; TextBeforeBattle + dw Route19AfterBattleText5 ; TextAfterBattle + dw Route19EndBattleText5 ; TextEndBattle + dw Route19EndBattleText5 ; TextEndBattle + +Route19TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_5 + dw Route19BattleText6 ; TextBeforeBattle + dw Route19AfterBattleText6 ; TextAfterBattle + dw Route19EndBattleText6 ; TextEndBattle + dw Route19EndBattleText6 ; TextEndBattle + +Route19TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_6 + dw Route19BattleText7 ; TextBeforeBattle + dw Route19AfterBattleText7 ; TextAfterBattle + dw Route19EndBattleText7 ; TextEndBattle + dw Route19EndBattleText7 ; TextEndBattle + +Route19TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_7, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_7, 1 + dw Route19BattleText8 ; TextBeforeBattle + dw Route19AfterBattleText8 ; TextAfterBattle + dw Route19EndBattleText8 ; TextEndBattle + dw Route19EndBattleText8 ; TextEndBattle + +Route19TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_8, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_8, 1 + dw Route19BattleText9 ; TextBeforeBattle + dw Route19AfterBattleText9 ; TextAfterBattle + dw Route19EndBattleText9 ; TextEndBattle + dw Route19EndBattleText9 ; TextEndBattle + +Route19TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_9, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_9, 1 + dw Route19BattleText10 ; TextBeforeBattle + dw Route19AfterBattleText10 ; TextAfterBattle + dw Route19EndBattleText10 ; TextEndBattle + dw Route19EndBattleText10 ; TextEndBattle + + db $ff + +Route19Text1: + TX_ASM + ld hl, Route19TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route19Text2: + TX_ASM + ld hl, Route19TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route19Text3: + TX_ASM + ld hl, Route19TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route19Text4: + TX_ASM + ld hl, Route19TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route19Text5: + TX_ASM + ld hl, Route19TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route19Text6: + TX_ASM + ld hl, Route19TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route19Text7: + TX_ASM + ld hl, Route19TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route19Text8: + TX_ASM + ld hl, Route19TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route19Text9: + TX_ASM + ld hl, Route19TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route19Text10: + TX_ASM + ld hl, Route19TrainerHeader9 + call TalkToTrainer + jp TextScriptEnd + +Route19BattleText1: + TX_FAR _Route19BattleText1 + db "@" + +Route19EndBattleText1: + TX_FAR _Route19EndBattleText1 + db "@" + +Route19AfterBattleText1: + TX_FAR _Route19AfterBattleText1 + db "@" + +Route19BattleText2: + TX_FAR _Route19BattleText2 + db "@" + +Route19EndBattleText2: + TX_FAR _Route19EndBattleText2 + db "@" + +Route19AfterBattleText2: + TX_FAR _Route19AfterBattleText2 + db "@" + +Route19BattleText3: + TX_FAR _Route19BattleText3 + db "@" + +Route19EndBattleText3: + TX_FAR _Route19EndBattleText3 + db "@" + +Route19AfterBattleText3: + TX_FAR _Route19AfterBattleText3 + db "@" + +Route19BattleText4: + TX_FAR _Route19BattleText4 + db "@" + +Route19EndBattleText4: + TX_FAR _Route19EndBattleText4 + db "@" + +Route19AfterBattleText4: + TX_FAR _Route19AfterBattleText4 + db "@" + +Route19BattleText5: + TX_FAR _Route19BattleText5 + db "@" + +Route19EndBattleText5: + TX_FAR _Route19EndBattleText5 + db "@" + +Route19AfterBattleText5: + TX_FAR _Route19AfterBattleText5 + db "@" + +Route19BattleText6: + TX_FAR _Route19BattleText6 + db "@" + +Route19EndBattleText6: + TX_FAR _Route19EndBattleText6 + db "@" + +Route19AfterBattleText6: + TX_FAR _Route19AfterBattleText6 + db "@" + +Route19BattleText7: + TX_FAR _Route19BattleText7 + db "@" + +Route19EndBattleText7: + TX_FAR _Route19EndBattleText7 + db "@" + +Route19AfterBattleText7: + TX_FAR _Route19AfterBattleText7 + db "@" + +Route19BattleText8: + TX_FAR _Route19BattleText8 + db "@" + +Route19EndBattleText8: + TX_FAR _Route19EndBattleText8 + db "@" + +Route19AfterBattleText8: + TX_FAR _Route19AfterBattleText8 + db "@" + +Route19BattleText9: + TX_FAR _Route19BattleText9 + db "@" + +Route19EndBattleText9: + TX_FAR _Route19EndBattleText9 + db "@" + +Route19AfterBattleText9: + TX_FAR _Route19AfterBattleText9 + db "@" + +Route19BattleText10: + TX_FAR _Route19BattleText10 + db "@" + +Route19EndBattleText10: + TX_FAR _Route19EndBattleText10 + db "@" + +Route19AfterBattleText10: + TX_FAR _Route19AfterBattleText10 + db "@" + +Route19Text11: + TX_FAR _Route19Text11 + db "@" diff --git a/scripts/Route2.asm b/scripts/Route2.asm new file mode 100755 index 00000000..f4b1c8c4 --- /dev/null +++ b/scripts/Route2.asm @@ -0,0 +1,16 @@ +Route2_Script: + jp EnableAutoTextBoxDrawing + +Route2_TextPointers: + dw PickUpItemText + dw PickUpItemText + dw Route2Text3 + dw Route2Text4 + +Route2Text3: + TX_FAR _Route2Text3 + db "@" + +Route2Text4: + TX_FAR _Route2Text4 + db "@" diff --git a/scripts/Route20.asm b/scripts/Route20.asm new file mode 100755 index 00000000..081a723e --- /dev/null +++ b/scripts/Route20.asm @@ -0,0 +1,353 @@ +Route20_Script: + CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS + call nz, Route20Script_50cc6 + call EnableAutoTextBoxDrawing + ld hl, Route20TrainerHeader0 + ld de, Route20_ScriptPointers + ld a, [wRoute20CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute20CurScript], a + ret + +Route20Script_50cc6: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE + jr z, .asm_50cef + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 + call Route20Script_50d0c + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 + call Route20Script_50d0c + ld hl, .MissableObjectIDs +.asm_50cdc + ld a, [hli] + cp $ff + jr z, .asm_50cef + push hl + call Route20Script_50d14 + pop hl + jr .asm_50cdc + +.MissableObjectIDs: + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 + db $FF + +.asm_50cef + CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE + ret z + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 + call Route20Script_50d0c + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 + call Route20Script_50d0c + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 + call Route20Script_50d14 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 + call Route20Script_50d14 + ret + +Route20Script_50d0c: + ld [wMissableObjectIndex], a + predef_jump ShowObject + +Route20Script_50d14: + ld [wMissableObjectIndex], a + predef_jump HideObject + +Route20_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route20_TextPointers: + dw Route20Text1 + dw Route20Text2 + dw Route20Text3 + dw Route20Text4 + dw Route20Text5 + dw Route20Text6 + dw Route20Text7 + dw Route20Text8 + dw Route20Text9 + dw Route20Text10 + dw Route20Text11 + dw Route20Text12 + +Route20TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_0 + dw Route20BattleText1 ; TextBeforeBattle + dw Route20AfterBattleText1 ; TextAfterBattle + dw Route20EndBattleText1 ; TextEndBattle + dw Route20EndBattleText1 ; TextEndBattle + +Route20TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1 + dw Route20BattleText2 ; TextBeforeBattle + dw Route20AfterBattleText2 ; TextAfterBattle + dw Route20EndBattleText2 ; TextEndBattle + dw Route20EndBattleText2 ; TextEndBattle + +Route20TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 + dw Route20BattleText3 ; TextBeforeBattle + dw Route20AfterBattleText3 ; TextAfterBattle + dw Route20EndBattleText3 ; TextEndBattle + dw Route20EndBattleText3 ; TextEndBattle + +Route20TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 + dw Route20BattleText4 ; TextBeforeBattle + dw Route20AfterBattleText4 ; TextAfterBattle + dw Route20EndBattleText4 ; TextEndBattle + dw Route20EndBattleText4 ; TextEndBattle + +Route20TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 + dw Route20BattleText5 ; TextBeforeBattle + dw Route20AfterBattleText5 ; TextAfterBattle + dw Route20EndBattleText5 ; TextEndBattle + dw Route20EndBattleText5 ; TextEndBattle + +Route20TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 + dw Route20BattleText6 ; TextBeforeBattle + dw Route20AfterBattleText6 ; TextAfterBattle + dw Route20EndBattleText6 ; TextEndBattle + dw Route20EndBattleText6 ; TextEndBattle + +Route20TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 + dw Route20BattleText7 ; TextBeforeBattle + dw Route20AfterBattleText7 ; TextAfterBattle + dw Route20EndBattleText7 ; TextEndBattle + dw Route20EndBattleText7 ; TextEndBattle + +Route20TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1 + dw Route20BattleText8 ; TextBeforeBattle + dw Route20AfterBattleText8 ; TextAfterBattle + dw Route20EndBattleText8 ; TextEndBattle + dw Route20EndBattleText8 ; TextEndBattle + +Route20TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 + dw Route20BattleText9 ; TextBeforeBattle + dw Route20AfterBattleText9 ; TextAfterBattle + dw Route20EndBattleText9 ; TextEndBattle + dw Route20EndBattleText9 ; TextEndBattle + +Route20TrainerHeader9: + dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 + dw Route20BattleText10 ; TextBeforeBattle + dw Route20AfterBattleText10 ; TextAfterBattle + dw Route20EndBattleText10 ; TextEndBattle + dw Route20EndBattleText10 ; TextEndBattle + + db $ff + +Route20Text1: + TX_ASM + ld hl, Route20TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route20Text2: + TX_ASM + ld hl, Route20TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route20Text3: + TX_ASM + ld hl, Route20TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route20Text4: + TX_ASM + ld hl, Route20TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route20Text5: + TX_ASM + ld hl, Route20TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route20Text6: + TX_ASM + ld hl, Route20TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route20Text7: + TX_ASM + ld hl, Route20TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route20Text8: + TX_ASM + ld hl, Route20TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route20Text9: + TX_ASM + ld hl, Route20TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route20Text10: + TX_ASM + ld hl, Route20TrainerHeader9 + call TalkToTrainer + jp TextScriptEnd + +Route20BattleText1: + TX_FAR _Route20BattleText1 + db "@" + +Route20EndBattleText1: + TX_FAR _Route20EndBattleText1 + db "@" + +Route20AfterBattleText1: + TX_FAR _Route20AfterBattleText1 + db "@" + +Route20BattleText2: + TX_FAR _Route20BattleText2 + db "@" + +Route20EndBattleText2: + TX_FAR _Route20EndBattleText2 + db "@" + +Route20AfterBattleText2: + TX_FAR _Route20AfterBattleText2 + db "@" + +Route20BattleText3: + TX_FAR _Route20BattleText3 + db "@" + +Route20EndBattleText3: + TX_FAR _Route20EndBattleText3 + db "@" + +Route20AfterBattleText3: + TX_FAR _Route20AfterBattleText3 + db "@" + +Route20BattleText4: + TX_FAR _Route20BattleText4 + db "@" + +Route20EndBattleText4: + TX_FAR _Route20EndBattleText4 + db "@" + +Route20AfterBattleText4: + TX_FAR _Route20AfterBattleText4 + db "@" + +Route20BattleText5: + TX_FAR _Route20BattleText5 + db "@" + +Route20EndBattleText5: + TX_FAR _Route20EndBattleText5 + db "@" + +Route20AfterBattleText5: + TX_FAR _Route20AfterBattleText5 + db "@" + +Route20BattleText6: + TX_FAR _Route20BattleText6 + db "@" + +Route20EndBattleText6: + TX_FAR _Route20EndBattleText6 + db "@" + +Route20AfterBattleText6: + TX_FAR _Route20AfterBattleText6 + db "@" + +Route20BattleText7: + TX_FAR _Route20BattleText7 + db "@" + +Route20EndBattleText7: + TX_FAR _Route20EndBattleText7 + db "@" + +Route20AfterBattleText7: + TX_FAR _Route20AfterBattleText7 + db "@" + +Route20BattleText8: + TX_FAR _Route20BattleText8 + db "@" + +Route20EndBattleText8: + TX_FAR _Route20EndBattleText8 + db "@" + +Route20AfterBattleText8: + TX_FAR _Route20AfterBattleText8 + db "@" + +Route20BattleText9: + TX_FAR _Route20BattleText9 + db "@" + +Route20EndBattleText9: + TX_FAR _Route20EndBattleText9 + db "@" + +Route20AfterBattleText9: + TX_FAR _Route20AfterBattleText9 + db "@" + +Route20BattleText10: + TX_FAR _Route20BattleText10 + db "@" + +Route20EndBattleText10: + TX_FAR _Route20EndBattleText10 + db "@" + +Route20AfterBattleText10: + TX_FAR _Route20AfterBattleText10 + db "@" + +Route20Text12: +Route20Text11: + TX_FAR _Route20Text11 + db "@" diff --git a/scripts/Route21.asm b/scripts/Route21.asm new file mode 100755 index 00000000..15dacd5d --- /dev/null +++ b/scripts/Route21.asm @@ -0,0 +1,269 @@ +Route21_Script: + call EnableAutoTextBoxDrawing + ld hl, Route21TrainerHeader0 + ld de, Route21_ScriptPointers + ld a, [wRoute21CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute21CurScript], a + ret + +Route21_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route21_TextPointers: + dw Route21Text1 + dw Route21Text2 + dw Route21Text3 + dw Route21Text4 + dw Route21Text5 + dw Route21Text6 + dw Route21Text7 + dw Route21Text8 + dw Route21Text9 + +Route21TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0 + dw Route21BattleText1 ; TextBeforeBattle + dw Route21AfterBattleText1 ; TextAfterBattle + dw Route21EndBattleText1 ; TextEndBattle + dw Route21EndBattleText1 ; TextEndBattle + +Route21TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1 + dw Route21BattleText2 ; TextBeforeBattle + dw Route21AfterBattleText2 ; TextAfterBattle + dw Route21EndBattleText2 ; TextEndBattle + dw Route21EndBattleText2 ; TextEndBattle + +Route21TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2 + dw Route21BattleText3 ; TextBeforeBattle + dw Route21AfterBattleText3 ; TextAfterBattle + dw Route21EndBattleText3 ; TextEndBattle + dw Route21EndBattleText3 ; TextEndBattle + +Route21TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3 + dw Route21BattleText4 ; TextBeforeBattle + dw Route21AfterBattleText4 ; TextAfterBattle + dw Route21EndBattleText4 ; TextEndBattle + dw Route21EndBattleText4 ; TextEndBattle + +Route21TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4 + dw Route21BattleText5 ; TextBeforeBattle + dw Route21AfterBattleText5 ; TextAfterBattle + dw Route21EndBattleText5 ; TextEndBattle + dw Route21EndBattleText5 ; TextEndBattle + +Route21TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5 + dw Route21BattleText6 ; TextBeforeBattle + dw Route21AfterBattleText6 ; TextAfterBattle + dw Route21EndBattleText6 ; TextEndBattle + dw Route21EndBattleText6 ; TextEndBattle + +Route21TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6 + dw Route21BattleText7 ; TextBeforeBattle + dw Route21AfterBattleText7 ; TextAfterBattle + dw Route21EndBattleText7 ; TextEndBattle + dw Route21EndBattleText7 ; TextEndBattle + +Route21TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1 + dw Route21BattleText8 ; TextBeforeBattle + dw Route21AfterBattleText8 ; TextAfterBattle + dw Route21EndBattleText8 ; TextEndBattle + dw Route21EndBattleText8 ; TextEndBattle + +Route21TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1 + dw Route21BattleText9 ; TextBeforeBattle + dw Route21AfterBattleText9 ; TextAfterBattle + dw Route21EndBattleText9 ; TextEndBattle + dw Route21EndBattleText9 ; TextEndBattle + + db $ff + +Route21Text1: + TX_ASM + ld hl, Route21TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route21Text2: + TX_ASM + ld hl, Route21TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route21Text3: + TX_ASM + ld hl, Route21TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route21Text4: + TX_ASM + ld hl, Route21TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route21Text5: + TX_ASM + ld hl, Route21TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route21Text6: + TX_ASM + ld hl, Route21TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route21Text7: + TX_ASM + ld hl, Route21TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route21Text8: + TX_ASM + ld hl, Route21TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route21Text9: + TX_ASM + ld hl, Route21TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route21BattleText1: + TX_FAR _Route21BattleText1 + db "@" + +Route21EndBattleText1: + TX_FAR _Route21EndBattleText1 + db "@" + +Route21AfterBattleText1: + TX_FAR _Route21AfterBattleText1 + db "@" + +Route21BattleText2: + TX_FAR _Route21BattleText2 + db "@" + +Route21EndBattleText2: + TX_FAR _Route21EndBattleText2 + db "@" + +Route21AfterBattleText2: + TX_FAR _Route21AfterBattleText2 + db "@" + +Route21BattleText3: + TX_FAR _Route21BattleText3 + db "@" + +Route21EndBattleText3: + TX_FAR _Route21EndBattleText3 + db "@" + +Route21AfterBattleText3: + TX_FAR _Route21AfterBattleText3 + db "@" + +Route21BattleText4: + TX_FAR _Route21BattleText4 + db "@" + +Route21EndBattleText4: + TX_FAR _Route21EndBattleText4 + db "@" + +Route21AfterBattleText4: + TX_FAR _Route21AfterBattleText4 + db "@" + +Route21BattleText5: + TX_FAR _Route21BattleText5 + db "@" + +Route21EndBattleText5: + TX_FAR _Route21EndBattleText5 + db "@" + +Route21AfterBattleText5: + TX_FAR _Route21AfterBattleText5 + db "@" + +Route21BattleText6: + TX_FAR _Route21BattleText6 + db "@" + +Route21EndBattleText6: + TX_FAR _Route21EndBattleText6 + db "@" + +Route21AfterBattleText6: + TX_FAR _Route21AfterBattleText6 + db "@" + +Route21BattleText7: + TX_FAR _Route21BattleText7 + db "@" + +Route21EndBattleText7: + TX_FAR _Route21EndBattleText7 + db "@" + +Route21AfterBattleText7: + TX_FAR _Route21AfterBattleText7 + db "@" + +Route21BattleText8: + TX_FAR _Route21BattleText8 + db "@" + +Route21EndBattleText8: + TX_FAR _Route21EndBattleText8 + db "@" + +Route21AfterBattleText8: + TX_FAR _Route21AfterBattleText8 + db "@" + +Route21BattleText9: + TX_FAR _Route21BattleText9 + db "@" + +Route21EndBattleText9: + TX_FAR _Route21EndBattleText9 + db "@" + +Route21AfterBattleText9: + TX_FAR _Route21AfterBattleText9 + db "@" diff --git a/scripts/Route22.asm b/scripts/Route22.asm new file mode 100755 index 00000000..7226e509 --- /dev/null +++ b/scripts/Route22.asm @@ -0,0 +1,445 @@ +Route22_Script: + call EnableAutoTextBoxDrawing + ld hl, Route22_ScriptPointers + ld a, [wRoute22CurScript] + jp CallFunctionInTable + +Route22_ScriptPointers: + dw Route22Script0 + dw Route22Script1 + dw Route22Script2 + dw Route22Script3 + dw Route22Script4 + dw Route22Script5 + dw Route22Script6 + dw Route22Script7 + +Route22Script_50ece: + xor a + ld [wJoyIgnore], a + ld [wRoute22CurScript], a +Route22Script7: + ret + +Route22Script_50ed6: + ld a, [wRivalStarter] + ld b, a +.asm_50eda + ld a, [hli] + cp b + jr z, .asm_50ee1 + inc hl + jr .asm_50eda +.asm_50ee1 + ld a, [hl] + ld [wTrainerNo], a + ret + +Route22MoveRivalSprite: + ld de, Route22RivalMovementData + ld a, [wcf0d] + cp $1 + jr z, .asm_50ef1 + inc de +.asm_50ef1 + call MoveSprite + ld a, SPRITE_FACING_RIGHT + ld [hSpriteFacingDirection], a + jp SetSpriteFacingDirectionAndDelay + +Route22RivalMovementData: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +Route22Script0: + CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE + ret z + ld hl, .Route22RivalBattleCoords + call ArePlayerCoordsInArray + ret nc + ld a, [wCoordIndex] + ld [wcf0d], a + xor a + ld [hJoyHeld], a + ld a, $f0 + ld [wJoyIgnore], a + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + CheckEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE + jr nz, .firstRivalBattle + CheckEventReuseA EVENT_2ND_ROUTE22_RIVAL_BATTLE ; is this the rival at the end of the game? + jp nz, Route22Script_5104e + ret + +.Route22RivalBattleCoords + db $04, $1D + db $05, $1D + db $FF + +.firstRivalBattle + ld a, $1 + ld [wEmotionBubbleSpriteIndex], a + xor a ; EXCLAMATION_BUBBLE + ld [wWhichEmotionBubble], a + predef EmotionBubble + ld a, [wWalkBikeSurfState] + and a + jr z, .asm_50f4e + ld a, $ff + ld [wNewSoundID], a + call PlaySound +.asm_50f4e + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ld a, $1 + ld [H_SPRITEINDEX], a + call Route22MoveRivalSprite + ld a, $1 + ld [wRoute22CurScript], a + ret + +Route22Script1: + ld a, [wd730] + bit 0, a + ret nz + ld a, [wcf0d] + cp $1 + jr nz, .asm_50f78 + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, SPRITE_FACING_UP + jr .asm_50f7a +.asm_50f78 + ld a, SPRITE_FACING_RIGHT +.asm_50f7a + ld [hSpriteFacingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteFacingDirectionAndDelay + xor a + ld [wJoyIgnore], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, Route22RivalDefeatedText1 + ld de, Route22Text_511bc + call SaveEndBattleTextPointers + ld a, OPP_SONY1 + ld [wCurOpponent], a + ld hl, StarterMons_50faf + call Route22Script_50ed6 + ld a, $2 + ld [wRoute22CurScript], a + ret + +StarterMons_50faf: +; starter the rival picked, rival trainer number + db STARTER2,$04 + db STARTER3,$05 + db STARTER1,$06 + +Route22Script2: + ld a, [wIsInBattle] + cp $ff + jp z, Route22Script_50ece + ld a, [wSpriteStateData1 + 9] + and a ; cp SPRITE_FACING_DOWN + jr nz, .notDown + ld a, SPRITE_FACING_UP + jr .done +.notDown + ld a, SPRITE_FACING_RIGHT +.done + ld [hSpriteFacingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteFacingDirectionAndDelay + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld a, [wcf0d] + cp $1 + jr nz, .asm_50fff + call Route22Script_51008 + jr .asm_51002 +.asm_50fff + call Route22Script_5100d +.asm_51002 + ld a, $3 + ld [wRoute22CurScript], a + ret + +Route22Script_51008: + ld de, Route22RivalExitMovementData1 + jr Route22MoveRival1 + +Route22Script_5100d: + ld de, Route22RivalExitMovementData2 +Route22MoveRival1: + ld a, $1 + ld [H_SPRITEINDEX], a + jp MoveSprite + +Route22RivalExitMovementData1: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +Route22RivalExitMovementData2: + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +Route22Script3: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, HS_ROUTE_22_RIVAL_1 + ld [wMissableObjectIndex], a + predef HideObject + call PlayDefaultMusic + ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE + ld a, $0 + ld [wRoute22CurScript], a + ret + +Route22Script_5104e: + ld a, $2 + ld [wEmotionBubbleSpriteIndex], a + xor a ; EXCLAMATION_BUBBLE + ld [wWhichEmotionBubble], a + predef EmotionBubble + ld a, [wWalkBikeSurfState] + and a + jr z, .skipYVisibilityTesta + ld a, $ff + ld [wNewSoundID], a + call PlaySound +.skipYVisibilityTesta + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateTempo + ld a, $2 + ld [H_SPRITEINDEX], a + call Route22MoveRivalSprite + ld a, $4 + ld [wRoute22CurScript], a + ret + +Route22Script4: + ld a, [wd730] + bit 0, a + ret nz + ld a, $2 + ld [H_SPRITEINDEX], a + ld a, [wcf0d] + cp $1 + jr nz, .asm_510a1 + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, SPRITE_FACING_UP + jr .asm_510a8 +.asm_510a1 + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + ld a, SPRITE_FACING_RIGHT +.asm_510a8 + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + xor a + ld [wJoyIgnore], a + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, Route22RivalDefeatedText2 + ld de, Route22Text_511d0 + call SaveEndBattleTextPointers + ld a, OPP_SONY2 + ld [wCurOpponent], a + ld hl, StarterMons_510d9 + call Route22Script_50ed6 + ld a, $5 + ld [wRoute22CurScript], a + ret + +StarterMons_510d9: + db STARTER2,$0a + db STARTER3,$0b + db STARTER1,$0c + +Route22Script5: + ld a, [wIsInBattle] + cp $ff + jp z, Route22Script_50ece + ld a, $2 + ld [H_SPRITEINDEX], a + ld a, [wcf0d] + cp $1 + jr nz, .asm_510fb + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, SPRITE_FACING_UP + jr .asm_51102 +.asm_510fb + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + ld a, SPRITE_FACING_RIGHT +.asm_51102 + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStartAndTempo + ld a, [wcf0d] + cp $1 + jr nz, .asm_51134 + call Route22Script_5113d + jr .asm_51137 +.asm_51134 + call Route22Script_51142 +.asm_51137 + ld a, $6 + ld [wRoute22CurScript], a + ret + +Route22Script_5113d: + ld de, MovementData_5114c + jr Route22MoveRival2 + +Route22Script_51142: + ld de, MovementData_5114d +Route22MoveRival2: + ld a, $2 + ld [H_SPRITEINDEX], a + jp MoveSprite + +MovementData_5114c: + db NPC_MOVEMENT_LEFT + +MovementData_5114d: + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_LEFT + db $FF + +Route22Script6: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, HS_ROUTE_22_RIVAL_2 + ld [wMissableObjectIndex], a + predef HideObject + call PlayDefaultMusic + ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE + ld a, $7 + ld [wRoute22CurScript], a + ret + +Route22_TextPointers: + dw Route22Text1 + dw Route22Text2 + dw Route22FrontGateText + +Route22Text1: + TX_ASM + CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE + jr z, .asm_5118b + ld hl, Route22RivalAfterBattleText1 + call PrintText + jr .asm_51191 +.asm_5118b + ld hl, Route22RivalBeforeBattleText1 + call PrintText +.asm_51191 + jp TextScriptEnd + +Route22Text2: + TX_ASM + CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE + jr z, .asm_511a4 + ld hl, Route22RivalAfterBattleText2 + call PrintText + jr .asm_511aa +.asm_511a4 + ld hl, Route22RivalBeforeBattleText2 + call PrintText +.asm_511aa + jp TextScriptEnd + +Route22RivalBeforeBattleText1: + TX_FAR _Route22RivalBeforeBattleText1 + db "@" + +Route22RivalAfterBattleText1: + TX_FAR _Route22RivalAfterBattleText1 + db "@" + +Route22RivalDefeatedText1: + TX_FAR _Route22RivalDefeatedText1 + db "@" + +Route22Text_511bc: + TX_FAR _Route22Text_511bc + db "@" + +Route22RivalBeforeBattleText2: + TX_FAR _Route22RivalBeforeBattleText2 + db "@" + +Route22RivalAfterBattleText2: + TX_FAR _Route22RivalAfterBattleText2 + db "@" + +Route22RivalDefeatedText2: + TX_FAR _Route22RivalDefeatedText2 + db "@" + +Route22Text_511d0: + TX_FAR _Route22Text_511d0 + db "@" + +Route22FrontGateText: + TX_FAR _Route22FrontGateText + db "@" diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm new file mode 100755 index 00000000..86b1220d --- /dev/null +++ b/scripts/Route22Gate.asm @@ -0,0 +1,93 @@ +Route22Gate_Script: + call EnableAutoTextBoxDrawing + ld hl, Route22Gate_ScriptPointers + ld a, [wRoute22GateCurScript] + call CallFunctionInTable + ld a, [wYCoord] + cp $4 + ld a, ROUTE_23 + jr c, .asm_1e69a + ld a, ROUTE_22 +.asm_1e69a + ld [wLastMap], a + ret + +Route22Gate_ScriptPointers: + dw Route22GateScript0 + dw Route22GateScript1 + dw Route22GateScript2 + +Route22GateScript0: + ld hl, Route22GateScriptCoords + call ArePlayerCoordsInArray + ret nc + xor a + ld [hJoyHeld], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +Route22GateScriptCoords: + db 2,4 + db 2,5 + db $ff + +Route22GateScript_1e6ba: + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + ld [wSpriteStateData1 + 9], a + ld [wJoyIgnore], a + jp StartSimulatingJoypadStates + +Route22GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + xor a + ld [wJoyIgnore], a + call Delay3 + ld a, $0 + ld [wRoute22GateCurScript], a +Route22GateScript2: + ret + +Route22Gate_TextPointers: + dw Route22GateText1 + +Route22GateText1: + TX_ASM + ld a, [wObtainedBadges] + bit 0, a + jr nz, .asm_1e6f6 + ld hl, Route22GateText_1e704 + call PrintText + call Route22GateScript_1e6ba + ld a, $1 + jr .asm_1e6fe +.asm_1e6f6 + ld hl, Route22GateText_1e71a + call PrintText + ld a, $2 +.asm_1e6fe + ld [wRoute22GateCurScript], a + jp TextScriptEnd + +Route22GateText_1e704: + TX_FAR _Route22GateText_1e704 + TX_ASM + ld a, SFX_DENIED + call PlaySoundWaitForCurrent + call WaitForSoundToFinish + ld hl, Route22GateText_1e715 + ret + +Route22GateText_1e715: + TX_FAR _Route22GateText_1e715 + db "@" + +Route22GateText_1e71a: + TX_FAR _Route22GateText_1e71a + TX_SFX_ITEM_1 + db "@" diff --git a/scripts/Route23.asm b/scripts/Route23.asm new file mode 100755 index 00000000..e91e2c98 --- /dev/null +++ b/scripts/Route23.asm @@ -0,0 +1,236 @@ +Route23_Script: + call Route23Script_511e9 + call EnableAutoTextBoxDrawing + ld hl, Route23_ScriptPointers + ld a, [wRoute23CurScript] + jp CallFunctionInTable + +Route23Script_511e9: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + ret z + ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 + ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 + ld a, HS_VICTORY_ROAD_3F_BOULDER + ld [wMissableObjectIndex], a + predef ShowObject + ld a, HS_VICTORY_ROAD_2F_BOULDER + ld [wMissableObjectIndex], a + predef_jump HideObject + +Route23_ScriptPointers: + dw Route23Script0 + dw Route23Script1 + dw Route23Script2 + +Route23Script0: + ld hl, YCoordsData_51255 + ld a, [wYCoord] + ld b, a + ld e, $0 + EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK +.asm_51224 + ld a, [hli] + cp $ff + ret z + inc e + dec c + cp b + jr nz, .asm_51224 + cp $23 + jr nz, .asm_51237 + ld a, [wXCoord] + cp $e + ret nc +.asm_51237 + ld a, e + ld [hSpriteIndexOrTextID], a + ld a, c + ld [wWhichBadge], a + ld b, FLAG_TEST + EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK + predef FlagActionPredef + ld a, c + and a + ret nz + call Route23Script_5125d + call DisplayTextID + xor a + ld [hJoyHeld], a + ret + +YCoordsData_51255: + db $23,$38,$55,$60,$69,$77,$88,$FF + +Route23Script_5125d: + ld hl, BadgeTextPointers + ld a, [wWhichBadge] + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wcd6d +.copyTextLoop + ld a, [hli] + ld [de], a + inc de + cp "@" + jr nz, .copyTextLoop + ret + +BadgeTextPointers: + dw CascadeBadgeText + dw ThunderBadgeText + dw RainbowBadgeText + dw SoulBadgeText + dw MarshBadgeText + dw VolcanoBadgeText + dw EarthBadgeText + +EarthBadgeText: + db "EARTHBADGE@" + +VolcanoBadgeText: + db "VOLCANOBADGE@" + +MarshBadgeText: + db "MARSHBADGE@" + +SoulBadgeText: + db "SOULBADGE@" + +RainbowBadgeText: + db "RAINBOWBADGE@" + +ThunderBadgeText: + db "THUNDERBADGE@" + +CascadeBadgeText: + db "CASCADEBADGE@" + +Route23Script_512d8: + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + xor a + ld [wSpriteStateData1 + 9], a + ld [wJoyIgnore], a + jp StartSimulatingJoypadStates + +Route23Script1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz +Route23Script2: + ld a, $0 + ld [wRoute23CurScript], a + ret + +Route23_TextPointers: + dw Route23Text1 + dw Route23Text2 + dw Route23Text3 + dw Route23Text4 + dw Route23Text5 + dw Route23Text6 + dw Route23Text7 + dw Route23Text8 + +Route23Text1: + TX_ASM + EventFlagBit a, EVENT_PASSED_EARTHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Text2: + TX_ASM + EventFlagBit a, EVENT_PASSED_VOLCANOBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Text3: + TX_ASM + EventFlagBit a, EVENT_PASSED_MARSHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Text4: + TX_ASM + EventFlagBit a, EVENT_PASSED_SOULBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Text5: + TX_ASM + EventFlagBit a, EVENT_PASSED_RAINBOWBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Text6: + TX_ASM + EventFlagBit a, EVENT_PASSED_THUNDERBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Text7: + TX_ASM + EventFlagBit a, EVENT_PASSED_CASCADEBADGE_CHECK + call Route23Script_51346 + jp TextScriptEnd + +Route23Script_51346: + ld [wWhichBadge], a + call Route23Script_5125d + ld a, [wWhichBadge] + inc a + ld c, a + ld b, FLAG_TEST + ld hl, wObtainedBadges + predef FlagActionPredef + ld a, c + and a + jr nz, .asm_5136e + ld hl, VictoryRoadGuardText1 + call PrintText + call Route23Script_512d8 + ld a, $1 + ld [wRoute23CurScript], a + ret +.asm_5136e + ld hl, VictoryRoadGuardText2 + call PrintText + ld a, [wWhichBadge] + ld c, a + ld b, FLAG_SET + EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK + predef FlagActionPredef + ld a, $2 + ld [wRoute23CurScript], a + ret + +Route23Script_51388: + ld hl, VictoryRoadGuardText2 + jp PrintText + +VictoryRoadGuardText1: + TX_FAR _VictoryRoadGuardText1 + TX_ASM + ld a, SFX_DENIED + call PlaySoundWaitForCurrent + call WaitForSoundToFinish + jp TextScriptEnd + +VictoryRoadGuardText2: + TX_FAR _VictoryRoadGuardText2 + TX_SFX_ITEM_1 + TX_FAR _VictoryRoadGuardText_513a3 + db "@" + +Route23Text8: + TX_FAR _Route23Text8 + db "@" diff --git a/scripts/Route24.asm b/scripts/Route24.asm new file mode 100755 index 00000000..a8e16e7d --- /dev/null +++ b/scripts/Route24.asm @@ -0,0 +1,319 @@ +Route24_Script: + call EnableAutoTextBoxDrawing + ld hl, Route24TrainerHeader0 + ld de, Route24_ScriptPointers + ld a, [wRoute24CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute24CurScript], a + ret + +Route24Script_513c0: + xor a + ld [wJoyIgnore], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a + ret + +Route24_ScriptPointers: + dw Route24Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw Route24Script3 + dw Route24Script4 + +Route24Script0: + CheckEvent EVENT_GOT_NUGGET + jp nz, CheckFightingMapTrainers + ld hl, CoordsData_5140e + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyHeld], a + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE + ret z + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $4 + ld [wRoute24CurScript], a + ld [wCurMapScript], a + ret + +CoordsData_5140e: + db $0F,$0A,$FF + +Route24Script4: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + ld a, $0 + ld [wRoute24CurScript], a + ld [wCurMapScript], a + ret + +Route24Script3: + ld a, [wIsInBattle] + cp $ff + jp z, Route24Script_513c0 + call UpdateSprites + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_ROUTE24_ROCKET + ld a, $1 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wRoute24CurScript], a + ld [wCurMapScript], a + ret + +Route24_TextPointers: + dw Route24Text1 + dw Route24Text2 + dw Route24Text3 + dw Route24Text4 + dw Route24Text5 + dw Route24Text6 + dw Route24Text7 + dw PickUpItemText + +Route24TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_0 + dw Route24BattleText1 ; TextBeforeBattle + dw Route24AfterBattleText1 ; TextAfterBattle + dw Route24EndBattleText1 ; TextEndBattle + dw Route24EndBattleText1 ; TextEndBattle + +Route24TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1 + dw Route24BattleText2 ; TextBeforeBattle + dw Route24AfterBattleText2 ; TextAfterBattle + dw Route24EndBattleText2 ; TextEndBattle + dw Route24EndBattleText2 ; TextEndBattle + +Route24TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 + dw Route24BattleText3 ; TextBeforeBattle + dw Route24AfterBattleText3 ; TextAfterBattle + dw Route24EndBattleText3 ; TextEndBattle + dw Route24EndBattleText3 ; TextEndBattle + +Route24TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 + dw Route24BattleText4 ; TextBeforeBattle + dw Route24AfterBattleText4 ; TextAfterBattle + dw Route24EndBattleText4 ; TextEndBattle + dw Route24EndBattleText4 ; TextEndBattle + +Route24TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 + dw Route24BattleText5 ; TextBeforeBattle + dw Route24AfterBattleText5 ; TextAfterBattle + dw Route24EndBattleText5 ; TextEndBattle + dw Route24EndBattleText5 ; TextEndBattle + +Route24TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 + dw Route24BattleText6 ; TextBeforeBattle + dw Route24AfterBattleText6 ; TextAfterBattle + dw Route24EndBattleText6 ; TextEndBattle + dw Route24EndBattleText6 ; TextEndBattle + + db $ff + +Route24Text1: + TX_ASM + ResetEvent EVENT_NUGGET_REWARD_AVAILABLE + CheckEvent EVENT_GOT_NUGGET + jr nz, .asm_514f9 + ld hl, Route24Text_51510 + call PrintText + lb bc, NUGGET, 1 + call GiveItem + jr nc, .BagFull + SetEvent EVENT_GOT_NUGGET + ld hl, Route24Text_5151a + call PrintText + ld hl, Route24Text_51526 + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, Route24Text_5152b + ld de, Route24Text_5152b + call SaveEndBattleTextPointers + ld a, [hSpriteIndexOrTextID] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wRoute24CurScript], a + ld [wCurMapScript], a + jp TextScriptEnd +.asm_514f9 + ld hl, Route24Text_51530 + call PrintText + jp TextScriptEnd +.BagFull + ld hl, Route24Text_51521 + call PrintText + SetEvent EVENT_NUGGET_REWARD_AVAILABLE + jp TextScriptEnd + +Route24Text_51510: + TX_FAR _Route24Text_51510 + TX_SFX_ITEM_1 + TX_FAR _Route24Text_51515 + db "@" + +Route24Text_5151a: + TX_FAR _Route24Text_5151a + TX_SFX_ITEM_1 + TX_BLINK + db "@" + +Route24Text_51521: + TX_FAR _Route24Text_51521 + db "@" + +Route24Text_51526: + TX_FAR _Route24Text_51526 + db "@" + +Route24Text_5152b: + TX_FAR _Route24Text_5152b + db "@" + +Route24Text_51530: + TX_FAR _Route24Text_51530 + db "@" + +Route24Text2: + TX_ASM + ld hl, Route24TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route24Text3: + TX_ASM + ld hl, Route24TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route24Text4: + TX_ASM + ld hl, Route24TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route24Text5: + TX_ASM + ld hl, Route24TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route24Text6: + TX_ASM + ld hl, Route24TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route24Text7: + TX_ASM + ld hl, Route24TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route24BattleText1: + TX_FAR _Route24BattleText1 + db "@" + +Route24EndBattleText1: + TX_FAR _Route24EndBattleText1 + db "@" + +Route24AfterBattleText1: + TX_FAR _Route24AfterBattleText1 + db "@" + +Route24BattleText2: + TX_FAR _Route24BattleText2 + db "@" + +Route24EndBattleText2: + TX_FAR _Route24EndBattleText2 + db "@" + +Route24AfterBattleText2: + TX_FAR _Route24AfterBattleText2 + db "@" + +Route24BattleText3: + TX_FAR _Route24BattleText3 + db "@" + +Route24EndBattleText3: + TX_FAR _Route24EndBattleText3 + db "@" + +Route24AfterBattleText3: + TX_FAR _Route24AfterBattleText3 + db "@" + +Route24BattleText4: + TX_FAR _Route24BattleText4 + db "@" + +Route24EndBattleText4: + TX_FAR _Route24EndBattleText4 + db "@" + +Route24AfterBattleText4: + TX_FAR _Route24AfterBattleText4 + db "@" + +Route24BattleText5: + TX_FAR _Route24BattleText5 + db "@" + +Route24EndBattleText5: + TX_FAR _Route24EndBattleText5 + db "@" + +Route24AfterBattleText5: + TX_FAR _Route24AfterBattleText5 + db "@" + +Route24BattleText6: + TX_FAR _Route24BattleText6 + db "@" + +Route24EndBattleText6: + TX_FAR _Route24EndBattleText6 + db "@" + +Route24AfterBattleText6: + TX_FAR _Route24AfterBattleText6 + db "@" diff --git a/scripts/Route25.asm b/scripts/Route25.asm new file mode 100755 index 00000000..7166919d --- /dev/null +++ b/scripts/Route25.asm @@ -0,0 +1,303 @@ +Route25_Script: + call Route25Script_515e1 + call EnableAutoTextBoxDrawing + ld hl, Route25TrainerHeader0 + ld de, Route25_ScriptPointers + ld a, [wRoute25CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute25CurScript], a + ret + +Route25Script_515e1: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + ret z + CheckEventHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING + ret nz + CheckEventReuseHL EVENT_MET_BILL_2 + jr nz, .asm_515ff + ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR + ld a, HS_BILL_POKEMON + ld [wMissableObjectIndex], a + predef_jump ShowObject +.asm_515ff + CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 + ret z + SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING + ld a, HS_NUGGET_BRIDGE_GUY + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_BILL_1 + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_BILL_2 + ld [wMissableObjectIndex], a + predef_jump ShowObject + +Route25_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route25_TextPointers: + dw Route25Text1 + dw Route25Text2 + dw Route25Text3 + dw Route25Text4 + dw Route25Text5 + dw Route25Text6 + dw Route25Text7 + dw Route25Text8 + dw Route25Text9 + dw PickUpItemText + dw Route25Text11 + +Route25TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_0 + dw Route25BattleText1 ; TextBeforeBattle + dw Route25AfterBattleText1 ; TextAfterBattle + dw Route25EndBattleText1 ; TextEndBattle + dw Route25EndBattleText1 ; TextEndBattle + +Route25TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1 + dw Route25BattleText2 ; TextBeforeBattle + dw Route25AfterBattleText2 ; TextAfterBattle + dw Route25EndBattleText2 ; TextEndBattle + dw Route25EndBattleText2 ; TextEndBattle + +Route25TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 + dw Route25BattleText3 ; TextBeforeBattle + dw Route25AfterBattleText3 ; TextAfterBattle + dw Route25EndBattleText3 ; TextEndBattle + dw Route25EndBattleText3 ; TextEndBattle + +Route25TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 + dw Route25BattleText4 ; TextBeforeBattle + dw Route25AfterBattleText4 ; TextAfterBattle + dw Route25EndBattleText4 ; TextEndBattle + dw Route25EndBattleText4 ; TextEndBattle + +Route25TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 + dw Route25BattleText5 ; TextBeforeBattle + dw Route25AfterBattleText5 ; TextAfterBattle + dw Route25EndBattleText5 ; TextEndBattle + dw Route25EndBattleText5 ; TextEndBattle + +Route25TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 + dw Route25BattleText6 ; TextBeforeBattle + dw Route25AfterBattleText6 ; TextAfterBattle + dw Route25EndBattleText6 ; TextEndBattle + dw Route25EndBattleText6 ; TextEndBattle + +Route25TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 + dw Route25BattleText7 ; TextBeforeBattle + dw Route25AfterBattleText7 ; TextAfterBattle + dw Route25EndBattleText7 ; TextEndBattle + dw Route25EndBattleText7 ; TextEndBattle + +Route25TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1 + dw Route25BattleText8 ; TextBeforeBattle + dw Route25AfterBattleText8 ; TextAfterBattle + dw Route25EndBattleText8 ; TextEndBattle + dw Route25EndBattleText8 ; TextEndBattle + +Route25TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 + dw Route25BattleText9 ; TextBeforeBattle + dw Route25AfterBattleText9 ; TextAfterBattle + dw Route25EndBattleText9 ; TextEndBattle + dw Route25EndBattleText9 ; TextEndBattle + + db $ff + +Route25Text1: + TX_ASM + ld hl, Route25TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route25Text2: + TX_ASM + ld hl, Route25TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route25Text3: + TX_ASM + ld hl, Route25TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route25Text4: + TX_ASM + ld hl, Route25TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route25Text5: + TX_ASM + ld hl, Route25TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route25Text6: + TX_ASM + ld hl, Route25TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route25Text7: + TX_ASM + ld hl, Route25TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route25Text8: + TX_ASM + ld hl, Route25TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route25Text9: + TX_ASM + ld hl, Route25TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route25BattleText1: + TX_FAR _Route25BattleText1 + db "@" + +Route25EndBattleText1: + TX_FAR _Route25EndBattleText1 + db "@" + +Route25AfterBattleText1: + TX_FAR _Route25AfterBattleText1 + db "@" + +Route25BattleText2: + TX_FAR _Route25BattleText2 + db "@" + +Route25EndBattleText2: + TX_FAR _Route25EndBattleText2 + db "@" + +Route25AfterBattleText2: + TX_FAR _Route25AfterBattleText2 + db "@" + +Route25BattleText3: + TX_FAR _Route25BattleText3 + db "@" + +Route25EndBattleText3: + TX_FAR _Route25EndBattleText3 + db "@" + +Route25AfterBattleText3: + TX_FAR _Route25AfterBattleText3 + db "@" + +Route25BattleText4: + TX_FAR _Route25BattleText4 + db "@" + +Route25EndBattleText4: + TX_FAR _Route25EndBattleText4 + db "@" + +Route25AfterBattleText4: + TX_FAR _Route25AfterBattleText4 + db "@" + +Route25BattleText5: + TX_FAR _Route25BattleText5 + db "@" + +Route25EndBattleText5: + TX_FAR _Route25EndBattleText5 + db "@" + +Route25AfterBattleText5: + TX_FAR _Route25AfterBattleText5 + db "@" + +Route25BattleText6: + TX_FAR _Route25BattleText6 + db "@" + +Route25EndBattleText6: + TX_FAR _Route25EndBattleText6 + db "@" + +Route25AfterBattleText6: + TX_FAR _Route25AfterBattleText6 + db "@" + +Route25BattleText7: + TX_FAR _Route25BattleText7 + db "@" + +Route25EndBattleText7: + TX_FAR _Route25EndBattleText7 + db "@" + +Route25AfterBattleText7: + TX_FAR _Route25AfterBattleText7 + db "@" + +Route25BattleText8: + TX_FAR _Route25BattleText8 + db "@" + +Route25EndBattleText8: + TX_FAR _Route25EndBattleText8 + db "@" + +Route25AfterBattleText8: + TX_FAR _Route25AfterBattleText8 + db "@" + +Route25BattleText9: + TX_FAR _Route25BattleText9 + db "@" + +Route25EndBattleText9: + TX_FAR _Route25EndBattleText9 + db "@" + +Route25AfterBattleText9: + TX_FAR _Route25AfterBattleText9 + db "@" + +Route25Text11: + TX_FAR _Route25Text11 + db "@" diff --git a/scripts/Route2Gate.asm b/scripts/Route2Gate.asm new file mode 100755 index 00000000..70d93814 --- /dev/null +++ b/scripts/Route2Gate.asm @@ -0,0 +1,39 @@ +Route2Gate_Script: + jp EnableAutoTextBoxDrawing + +Route2Gate_TextPointers: + dw Route2GateText1 + dw Route2GateText2 + +Route2GateText1: + TX_ASM + CheckEvent EVENT_GOT_HM05 + jr nz, .asm_5d60d + ld a, 10 ; pokemon needed + ld [hOaksAideRequirement], a + ld a, HM_05 ; oak's aide reward + ld [hOaksAideRewardItem], a + ld [wd11e], a + call GetItemName + ld hl, wcd6d + ld de, wOaksAideRewardItemName + ld bc, ITEM_NAME_LENGTH + call CopyData + predef OaksAideScript + ld a, [hOaksAideResult] + cp $1 + jr nz, .asm_5d613 + SetEvent EVENT_GOT_HM05 +.asm_5d60d + ld hl, Route2GateText_5d616 + call PrintText +.asm_5d613 + jp TextScriptEnd + +Route2GateText_5d616: + TX_FAR _Route2GateText_5d616 + db "@" + +Route2GateText2: + TX_FAR _Route2GateText2 + db "@" diff --git a/scripts/Route2TradeHouse.asm b/scripts/Route2TradeHouse.asm new file mode 100755 index 00000000..a89e2fe9 --- /dev/null +++ b/scripts/Route2TradeHouse.asm @@ -0,0 +1,17 @@ +Route2TradeHouse_Script: + jp EnableAutoTextBoxDrawing + +Route2TradeHouse_TextPointers: + dw Route2HouseText1 + dw Route2HouseText2 + +Route2HouseText1: + TX_FAR _Route2HouseText1 + db "@" + +Route2HouseText2: + TX_ASM + ld a, $1 + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd diff --git a/scripts/Route3.asm b/scripts/Route3.asm new file mode 100755 index 00000000..d55831bf --- /dev/null +++ b/scripts/Route3.asm @@ -0,0 +1,251 @@ +Route3_Script: + call EnableAutoTextBoxDrawing + ld hl, Route3TrainerHeader0 + ld de, Route3_ScriptPointers + ld a, [wRoute3CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute3CurScript], a + ret + +Route3_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route3_TextPointers: + dw Route3Text1 + dw Route3Text2 + dw Route3Text3 + dw Route3Text4 + dw Route3Text5 + dw Route3Text6 + dw Route3Text7 + dw Route3Text8 + dw Route3Text9 + dw Route3Text10 + +Route3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_0 + dw Route3BattleText1 ; TextBeforeBattle + dw Route3AfterBattleText1 ; TextAfterBattle + dw Route3EndBattleText1 ; TextEndBattle + dw Route3EndBattleText1 ; TextEndBattle + +Route3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1 + dw Route3BattleText2 ; TextBeforeBattle + dw Route3AfterBattleText2 ; TextAfterBattle + dw Route3EndBattleText2 ; TextEndBattle + dw Route3EndBattleText2 ; TextEndBattle + +Route3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 + dw Route3BattleText3 ; TextBeforeBattle + dw Route3AfterBattleText3 ; TextAfterBattle + dw Route3EndBattleText3 ; TextEndBattle + dw Route3EndBattleText3 ; TextEndBattle + +Route3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 + dw Route3BattleText4 ; TextBeforeBattle + dw Route3AfterBattleText4 ; TextAfterBattle + dw Route3EndBattleText4 ; TextEndBattle + dw Route3EndBattleText4 ; TextEndBattle + +Route3TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 + dw Route3BattleText5 ; TextBeforeBattle + dw Route3AfterBattleText5 ; TextAfterBattle + dw Route3EndBattleText5 ; TextEndBattle + dw Route3EndBattleText5 ; TextEndBattle + +Route3TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 + dw Route3BattleText6 ; TextBeforeBattle + dw Route3AfterBattleText6 ; TextAfterBattle + dw Route3EndBattleText6 ; TextEndBattle + dw Route3EndBattleText6 ; TextEndBattle + +Route3TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1 + dw Route3BattleText7 ; TextBeforeBattle + dw Route3AfterBattleText7 ; TextAfterBattle + dw Route3EndBattleText7 ; TextEndBattle + dw Route3EndBattleText7 ; TextEndBattle + +Route3TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 + dw Route3BattleText8 ; TextBeforeBattle + dw Route3AfterBattleText8 ; TextAfterBattle + dw Route3EndBattleText8 ; TextEndBattle + dw Route3EndBattleText8 ; TextEndBattle + + db $ff + +Route3Text1: + TX_FAR _Route3Text1 + db "@" + +Route3Text2: + TX_ASM + ld hl, Route3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText1: + TX_FAR _Route3BattleText1 + db "@" + +Route3EndBattleText1: + TX_FAR _Route3EndBattleText1 + db "@" + +Route3AfterBattleText1: + TX_FAR _Route3AfterBattleText1 + db "@" + +Route3Text3: + TX_ASM + ld hl, Route3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText2: + TX_FAR _Route3BattleText2 + db "@" + +Route3EndBattleText2: + TX_FAR _Route3EndBattleText2 + db "@" + +Route3AfterBattleText2: + TX_FAR _Route3AfterBattleText2 + db "@" + +Route3Text4: + TX_ASM + ld hl, Route3TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText3: + TX_FAR _Route3BattleText3 + db "@" + +Route3EndBattleText3: + TX_FAR _Route3EndBattleText3 + db "@" + +Route3AfterBattleText3: + TX_FAR _Route3AfterBattleText3 + db "@" + +Route3Text5: + TX_ASM + ld hl, Route3TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText4: + TX_FAR _Route3BattleText4 + db "@" + +Route3EndBattleText4: + TX_FAR _Route3EndBattleText4 + db "@" + +Route3AfterBattleText4: + TX_FAR _Route3AfterBattleText4 + db "@" + +Route3Text6: + TX_ASM + ld hl, Route3TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText5: + TX_FAR _Route3BattleText5 + db "@" + +Route3EndBattleText5: + TX_FAR _Route3EndBattleText5 + db "@" + +Route3AfterBattleText5: + TX_FAR _Route3AfterBattleText5 + db "@" + +Route3Text7: + TX_ASM + ld hl, Route3TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText6: + TX_FAR _Route3BattleText6 + db "@" + +Route3EndBattleText6: + TX_FAR _Route3EndBattleText6 + db "@" + +Route3AfterBattleText6: + TX_FAR _Route3AfterBattleText6 + db "@" + +Route3Text8: + TX_ASM + ld hl, Route3TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText7: + TX_FAR _Route3BattleText7 + db "@" + +Route3EndBattleText7: + TX_FAR _Route3EndBattleText7 + db "@" + +Route3AfterBattleText7: + TX_FAR _Route3AfterBattleText7 + db "@" + +Route3Text9: + TX_ASM + ld hl, Route3TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route3BattleText8: + TX_FAR _Route3BattleText8 + db "@" + +Route3EndBattleText8: + TX_FAR _Route3EndBattleText8 + db "@" + +Route3AfterBattleText8: + TX_FAR _Route3AfterBattleText8 + db "@" + +Route3Text10: + TX_FAR _Route3Text10 + db "@" diff --git a/scripts/Route4.asm b/scripts/Route4.asm new file mode 100755 index 00000000..9b04a47a --- /dev/null +++ b/scripts/Route4.asm @@ -0,0 +1,62 @@ +Route4_Script: + call EnableAutoTextBoxDrawing + ld hl, Route4TrainerHeader0 + ld de, Route4_ScriptPointers + ld a, [wRoute4CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute4CurScript], a + ret + +Route4_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route4_TextPointers: + dw Route4Text1 + dw Route4Text2 + dw PickUpItemText + dw PokeCenterSignText + dw Route4Text5 + dw Route4Text6 + +Route4TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_4_TRAINER_0 + dw Route4BattleText1 ; TextBeforeBattle + dw Route4AfterBattleText1 ; TextAfterBattle + dw Route4EndBattleText1 ; TextEndBattle + dw Route4EndBattleText1 ; TextEndBattle + + db $ff + +Route4Text1: + TX_FAR _Route4Text1 + db "@" + +Route4Text2: + TX_ASM + ld hl, Route4TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route4BattleText1: + TX_FAR _Route4BattleText1 + db "@" + +Route4EndBattleText1: + TX_FAR _Route4EndBattleText1 + db "@" + +Route4AfterBattleText1: + TX_FAR _Route4AfterBattleText1 + db "@" + +Route4Text5: + TX_FAR _Route4Text5 + db "@" + +Route4Text6: + TX_FAR _Route4Text6 + db "@" diff --git a/scripts/Route5.asm b/scripts/Route5.asm new file mode 100755 index 00000000..1b2bd242 --- /dev/null +++ b/scripts/Route5.asm @@ -0,0 +1,9 @@ +Route5_Script: + jp EnableAutoTextBoxDrawing + +Route5_TextPointers: + dw Route5Text1 + +Route5Text1: + TX_FAR _Route5Text1 + db "@" diff --git a/scripts/Route5Gate.asm b/scripts/Route5Gate.asm new file mode 100755 index 00000000..bc763dfd --- /dev/null +++ b/scripts/Route5Gate.asm @@ -0,0 +1,117 @@ +Route5Gate_Script: + call EnableAutoTextBoxDrawing + ld a, [wRoute5GateCurScript] + ld hl, Route5Gate_ScriptPointers + jp CallFunctionInTable + +Route5Gate_ScriptPointers: + dw Route5GateScript0 + dw Route5GateScript1 + +Route5GateScript_1df43: + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + jp StartSimulatingJoypadStates + +Route5GateScript0: + ld a, [wd728] + bit 6, a + ret nz + ld hl, CoordsData_1df8f + call ArePlayerCoordsInArray + ret nc + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + xor a + ld [hJoyHeld], a + callba RemoveGuardDrink + ld a, [$ffdb] + and a + jr nz, .asm_1df82 + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Route5GateScript_1df43 + ld a, $1 + ld [wRoute5GateCurScript], a + ret +.asm_1df82 + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wd728 + set 6, [hl] + ret + +CoordsData_1df8f: + db 3,3 + db 3,4 + db $ff + +Route5GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wRoute5GateCurScript], a + ret + +Route5Gate_TextPointers: + dw Route5GateText1 + dw Route5GateText2 + dw Route5GateText3 + +Route8GateText1: +Route7GateText1: +Route6GateText1: +Route5GateText1: + TX_ASM + ld a, [wd728] + bit 6, a + jr nz, .asm_88856 + callba RemoveGuardDrink + ld a, [$ffdb] + and a + jr nz, .asm_768a2 + ld hl, Route5GateText2 + call PrintText + call Route5GateScript_1df43 + ld a, $1 + ld [wRoute5GateCurScript], a + jp TextScriptEnd +.asm_768a2 + ld hl, Route5GateText3 + call PrintText + ld hl, wd728 + set 6, [hl] + jp TextScriptEnd +.asm_88856 + ld hl, SaffronGateText_1dff6 + call PrintText + jp TextScriptEnd + +Route8GateText2: +Route7GateText2: +Route6GateText2: +Route5GateText2: + TX_FAR _SaffronGateText_1dfe7 + db "@" + +Route8GateText3: +Route7GateText3: +Route6GateText3: +Route5GateText3: + TX_FAR _SaffronGateText_8aaa9 + TX_SFX_KEY_ITEM + TX_FAR _SaffronGateText_1dff1 + db "@" + +SaffronGateText_1dff6: + TX_FAR _SaffronGateText_1dff6 + db "@" + + diff --git a/scripts/Route6.asm b/scripts/Route6.asm new file mode 100755 index 00000000..9f43b800 --- /dev/null +++ b/scripts/Route6.asm @@ -0,0 +1,186 @@ +Route6_Script: + call EnableAutoTextBoxDrawing + ld hl, Route6TrainerHeader0 + ld de, Route6_ScriptPointers + ld a, [wRoute6CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute6CurScript], a + ret + +Route6_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route6_TextPointers: + dw Route6Text1 + dw Route6Text2 + dw Route6Text3 + dw Route6Text4 + dw Route6Text5 + dw Route6Text6 + dw Route6Text7 + +Route6TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_0 + dw Route6BattleText1 ; TextBeforeBattle + dw Route6AfterBattleText1 ; TextAfterBattle + dw Route6EndBattleText1 ; TextEndBattle + dw Route6EndBattleText1 ; TextEndBattle + +Route6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_1 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1 + dw Route6BattleText2 ; TextBeforeBattle + dw Route6AfterBattleText1 ; TextAfterBattle + dw Route6EndBattleText2 ; TextEndBattle + dw Route6EndBattleText2 ; TextEndBattle + +Route6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_2 + dw Route6BattleText3 ; TextBeforeBattle + dw Route6AfterBattleText3 ; TextAfterBattle + dw Route6EndBattleText3 ; TextEndBattle + dw Route6EndBattleText3 ; TextEndBattle + +Route6TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_3 + dw Route6BattleText4 ; TextBeforeBattle + dw Route6AfterBattleText4 ; TextAfterBattle + dw Route6EndBattleText4 ; TextEndBattle + dw Route6EndBattleText4 ; TextEndBattle + +Route6TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_4 + dw Route6BattleText5 ; TextBeforeBattle + dw Route6AfterBattleText5 ; TextAfterBattle + dw Route6EndBattleText5 ; TextEndBattle + dw Route6EndBattleText5 ; TextEndBattle + +Route6TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_5 + dw Route6BattleText6 ; TextBeforeBattle + dw Route6AfterBattleText6 ; TextAfterBattle + dw Route6EndBattleText6 ; TextEndBattle + dw Route6EndBattleText6 ; TextEndBattle + + db $ff + +Route6Text1: + TX_ASM + ld hl, Route6TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route6BattleText1: + TX_FAR _Route6BattleText1 + db "@" + +Route6EndBattleText1: + TX_FAR _Route6EndBattleText1 + db "@" + +Route6AfterBattleText1: + TX_FAR _Route6AfterBattleText1 + db "@" + +Route6Text2: + TX_ASM + ld hl, Route6TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route6BattleText2: + TX_FAR _Route6BattleText2 + db "@" + +Route6EndBattleText2: + TX_FAR _Route6EndBattleText2 + db "@" + +Route6Text3: + TX_ASM + ld hl, Route6TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route6BattleText3: + TX_FAR _Route6BattleText3 + db "@" + +Route6EndBattleText3: + TX_FAR _Route6EndBattleText3 + db "@" + +Route6AfterBattleText3: + TX_FAR _Route6AfterBattleText3 + db "@" + +Route6Text4: + TX_ASM + ld hl, Route6TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route6BattleText4: + TX_FAR _Route6BattleText4 + db "@" + +Route6EndBattleText4: + TX_FAR _Route6EndBattleText4 + db "@" + +Route6AfterBattleText4: + TX_FAR _Route6AfterBattleText4 + db "@" + +Route6Text5: + TX_ASM + ld hl, Route6TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route6BattleText5: + TX_FAR _Route6BattleText5 + db "@" + +Route6EndBattleText5: + TX_FAR _Route6EndBattleText5 + db "@" + +Route6AfterBattleText5: + TX_FAR _Route6AfterBattleText5 + db "@" + +Route6Text6: + TX_ASM + ld hl, Route6TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route6BattleText6: + TX_FAR _Route6BattleText6 + db "@" + +Route6EndBattleText6: + TX_FAR _Route6EndBattleText6 + db "@" + +Route6AfterBattleText6: + TX_FAR _Route6AfterBattleText6 + db "@" + +Route6Text7: + TX_FAR _Route6Text7 + db "@" diff --git a/scripts/Route6Gate.asm b/scripts/Route6Gate.asm new file mode 100755 index 00000000..348f61ac --- /dev/null +++ b/scripts/Route6Gate.asm @@ -0,0 +1,70 @@ +Route6Gate_Script: + call EnableAutoTextBoxDrawing + ld hl, Route6Gate_ScriptPointers + ld a, [wRoute6GateCurScript] + call CallFunctionInTable + ret + +Route6Gate_ScriptPointers: + dw Route6GateScript0 + dw Route6GateScript1 + +Route6GateScript0: + ld a, [wd728] + bit 6, a + ret nz + ld hl, CoordsData_1e08c + call ArePlayerCoordsInArray + ret nc + ld a, PLAYER_DIR_RIGHT + ld [wPlayerMovingDirection], a + xor a + ld [hJoyHeld], a + callba RemoveGuardDrink + ld a, [$ffdb] + and a + jr nz, .asm_1e080 + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Route6GateScript_1e0a1 + ld a, $1 + ld [wRoute6GateCurScript], a + ret +.asm_1e080 + ld hl, wd728 + set 6, [hl] + ld a, $3 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +CoordsData_1e08c: + db $02,$03 + db $02,$04,$FF + +Route6GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wRoute6GateCurScript], a + ret + +Route6GateScript_1e0a1: + ld hl, wd730 + set 7, [hl] + ld a, $80 + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + xor a + ld [wSpriteStateData2 + $06], a + ld [wOverrideSimulatedJoypadStatesMask], a + ret + +Route6Gate_TextPointers: + dw Route6GateText1 + dw Route6GateText2 + dw Route6GateText3 diff --git a/scripts/Route7.asm b/scripts/Route7.asm new file mode 100755 index 00000000..55774553 --- /dev/null +++ b/scripts/Route7.asm @@ -0,0 +1,9 @@ +Route7_Script: + jp EnableAutoTextBoxDrawing + +Route7_TextPointers: + dw Route7Text1 + +Route7Text1: + TX_FAR _Route7Text1 + db "@" diff --git a/scripts/Route7Gate.asm b/scripts/Route7Gate.asm new file mode 100755 index 00000000..724172c5 --- /dev/null +++ b/scripts/Route7Gate.asm @@ -0,0 +1,73 @@ +Route7Gate_Script: + call EnableAutoTextBoxDrawing + ld a, [wRoute7GateCurScript] + ld hl, Route7Gate_ScriptPointers + call CallFunctionInTable + ret + +Route7Gate_ScriptPointers: + dw Route7GateScript0 + dw Route7GateScript1 + +Route7GateScript_1e111: + ld hl, wd730 + set 7, [hl] + ld a, $20 + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + xor a + ld [wSpriteStateData2 + $06], a + ld [wOverrideSimulatedJoypadStatesMask], a + ret + +Route7GateScript0: + ld a, [wd728] + bit 6, a + ret nz + ld hl, CoordsData_1e167 + call ArePlayerCoordsInArray + ret nc + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + xor a + ld [hJoyHeld], a + callba RemoveGuardDrink + ld a, [$ffdb] + and a + jr nz, .asm_1e15a + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Route7GateScript_1e111 + ld a, $1 + ld [wRoute7GateCurScript], a + ret +.asm_1e15a + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wd728 + set 6, [hl] + ret + +CoordsData_1e167: + db 3,3 + db 4,3 + db $ff + +Route7GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wRoute7GateCurScript], a + ld [wCurMapScript], a + ret + +Route7Gate_TextPointers: + dw Route7GateText1 + dw Route7GateText2 + dw Route7GateText3 diff --git a/scripts/Route8.asm b/scripts/Route8.asm new file mode 100755 index 00000000..f3388505 --- /dev/null +++ b/scripts/Route8.asm @@ -0,0 +1,274 @@ +Route8_Script: + call EnableAutoTextBoxDrawing + ld hl, Route8TrainerHeader0 + ld de, Route8_ScriptPointers + ld a, [wRoute8CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute8CurScript], a + ret + +Route8_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route8_TextPointers: + dw Route8Text1 + dw Route8Text2 + dw Route8Text3 + dw Route8Text4 + dw Route8Text5 + dw Route8Text6 + dw Route8Text7 + dw Route8Text8 + dw Route8Text9 + dw Route8Text10 + +Route8TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_0 + dw Route8BattleText1 ; TextBeforeBattle + dw Route8AfterBattleText1 ; TextAfterBattle + dw Route8EndBattleText1 ; TextEndBattle + dw Route8EndBattleText1 ; TextEndBattle + +Route8TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_1 + dw Route8BattleText2 ; TextBeforeBattle + dw Route8AfterBattleText2 ; TextAfterBattle + dw Route8EndBattleText2 ; TextEndBattle + dw Route8EndBattleText2 ; TextEndBattle + +Route8TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_2 + dw Route8BattleText3 ; TextBeforeBattle + dw Route8AfterBattleText3 ; TextAfterBattle + dw Route8EndBattleText3 ; TextEndBattle + dw Route8EndBattleText3 ; TextEndBattle + +Route8TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_3 + dw Route8BattleText4 ; TextBeforeBattle + dw Route8AfterBattleText4 ; TextAfterBattle + dw Route8EndBattleText4 ; TextEndBattle + dw Route8EndBattleText4 ; TextEndBattle + +Route8TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_4 + dw Route8BattleText5 ; TextBeforeBattle + dw Route8AfterBattleText5 ; TextAfterBattle + dw Route8EndBattleText5 ; TextEndBattle + dw Route8EndBattleText5 ; TextEndBattle + +Route8TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_5 + dw Route8BattleText6 ; TextBeforeBattle + dw Route8AfterBattleText6 ; TextAfterBattle + dw Route8EndBattleText6 ; TextEndBattle + dw Route8EndBattleText6 ; TextEndBattle + +Route8TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_6 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_6 + dw Route8BattleText7 ; TextBeforeBattle + dw Route8AfterBattleText7 ; TextAfterBattle + dw Route8EndBattleText7 ; TextEndBattle + dw Route8EndBattleText7 ; TextEndBattle + +Route8TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_7, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_7, 1 + dw Route8BattleText8 ; TextBeforeBattle + dw Route8AfterBattleText8 ; TextAfterBattle + dw Route8EndBattleText8 ; TextEndBattle + dw Route8EndBattleText8 ; TextEndBattle + +Route8TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_8, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1 + dw Route8BattleText9 ; TextBeforeBattle + dw Route8AfterBattleText9 ; TextAfterBattle + dw Route8EndBattleText9 ; TextEndBattle + dw Route8EndBattleText9 ; TextEndBattle + + db $ff + +Route8Text1: + TX_ASM + ld hl, Route8TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText1: + TX_FAR _Route8BattleText1 + db "@" + +Route8EndBattleText1: + TX_FAR _Route8EndBattleText1 + db "@" + +Route8AfterBattleText1: + TX_FAR _Route8AfterBattleText1 + db "@" + +Route8Text2: + TX_ASM + ld hl, Route8TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText2: + TX_FAR _Route8BattleText2 + db "@" + +Route8EndBattleText2: + TX_FAR _Route8EndBattleText2 + db "@" + +Route8AfterBattleText2: + TX_FAR _Route8AfterBattleText2 + db "@" + +Route8Text3: + TX_ASM + ld hl, Route8TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText3: + TX_FAR _Route8BattleText3 + db "@" + +Route8EndBattleText3: + TX_FAR _Route8EndBattleText3 + db "@" + +Route8AfterBattleText3: + TX_FAR _Route8AfterBattleText3 + db "@" + +Route8Text4: + TX_ASM + ld hl, Route8TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText4: + TX_FAR _Route8BattleText4 + db "@" + +Route8EndBattleText4: + TX_FAR _Route8EndBattleText4 + db "@" + +Route8AfterBattleText4: + TX_FAR _Route8AfterBattleText4 + db "@" + +Route8Text5: + TX_ASM + ld hl, Route8TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText5: + TX_FAR _Route8BattleText5 + db "@" + +Route8EndBattleText5: + TX_FAR _Route8EndBattleText5 + db "@" + +Route8AfterBattleText5: + TX_FAR _Route8AfterBattleText5 + db "@" + +Route8Text6: + TX_ASM + ld hl, Route8TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText6: + TX_FAR _Route8BattleText6 + db "@" + +Route8EndBattleText6: + TX_FAR _Route8EndBattleText6 + db "@" + +Route8AfterBattleText6: + TX_FAR _Route8AfterBattleText6 + db "@" + +Route8Text7: + TX_ASM + ld hl, Route8TrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText7: + TX_FAR _Route8BattleText7 + db "@" + +Route8EndBattleText7: + TX_FAR _Route8EndBattleText7 + db "@" + +Route8AfterBattleText7: + TX_FAR _Route8AfterBattleText7 + db "@" + +Route8Text8: + TX_ASM + ld hl, Route8TrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText8: + TX_FAR _Route8BattleText8 + db "@" + +Route8EndBattleText8: + TX_FAR _Route8EndBattleText8 + db "@" + +Route8AfterBattleText8: + TX_FAR _Route8AfterBattleText8 + db "@" + +Route8Text9: + TX_ASM + ld hl, Route8TrainerHeader8 + call TalkToTrainer + jp TextScriptEnd + +Route8BattleText9: + TX_FAR _Route8BattleText9 + db "@" + +Route8EndBattleText9: + TX_FAR _Route8EndBattleText9 + db "@" + +Route8AfterBattleText9: + TX_FAR _Route8AfterBattleText9 + db "@" + +Route8Text10: + TX_FAR _Route8Text10 + db "@" diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm new file mode 100755 index 00000000..8ecea68e --- /dev/null +++ b/scripts/Route8Gate.asm @@ -0,0 +1,70 @@ +Route8Gate_Script: + call EnableAutoTextBoxDrawing + ld hl, Route8Gate_ScriptPointers + ld a, [wRoute8GateCurScript] + jp CallFunctionInTable + +Route8Gate_ScriptPointers: + dw Route8GateScript0 + dw Route8GateScript1 + +Route8GateScript_1e1d7: + ld hl, wd730 + set 7, [hl] + ld a, $10 + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + xor a + ld [wSpriteStateData2 + $06], a + ld [wOverrideSimulatedJoypadStatesMask], a + ret + +Route8GateScript0: + ld a, [wd728] + bit 6, a + ret nz + ld hl, CoordsData_1e22c + call ArePlayerCoordsInArray + ret nc + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + xor a + ld [hJoyHeld], a + callba RemoveGuardDrink + ld a, [$ffdb] + and a + jr nz, .asm_1e220 + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Route8GateScript_1e1d7 + ld a, $1 + ld [wRoute8GateCurScript], a + ret +.asm_1e220 + ld hl, wd728 + set 6, [hl] + ld a, $3 + ld [hSpriteIndexOrTextID], a + jp DisplayTextID + +CoordsData_1e22c: + db 3,2 + db 4,2 + db $ff + +Route8GateScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + xor a + ld [wJoyIgnore], a + ld [wRoute8GateCurScript], a + ret + +Route8Gate_TextPointers: + dw Route8GateText1 + dw Route8GateText2 + dw Route8GateText3 diff --git a/scripts/Route9.asm b/scripts/Route9.asm new file mode 100755 index 00000000..a18096f0 --- /dev/null +++ b/scripts/Route9.asm @@ -0,0 +1,268 @@ +Route9_Script: + call EnableAutoTextBoxDrawing + ld hl, Route9TrainerHeader0 + ld de, Route9_ScriptPointers + ld a, [wRoute9CurScript] + call ExecuteCurMapScriptInTable + ld [wRoute9CurScript], a + ret + +Route9_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +Route9_TextPointers: + dw Route9Text1 + dw Route9Text2 + dw Route9Text3 + dw Route9Text4 + dw Route9Text5 + dw Route9Text6 + dw Route9Text7 + dw Route9Text8 + dw Route9Text9 + dw PickUpItemText + dw Route9Text11 + +Route9TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0 + dw Route9BattleText1 ; TextBeforeBattle + dw Route9AfterBattleText1 ; TextAfterBattle + dw Route9EndBattleText1 ; TextEndBattle + dw Route9EndBattleText1 ; TextEndBattle + +Route9TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1 + dw Route9BattleText2 ; TextBeforeBattle + dw Route9AfterBattleText2 ; TextAfterBattle + dw Route9EndBattleText2 ; TextEndBattle + dw Route9EndBattleText2 ; TextEndBattle + +Route9TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 + dw Route9BattleText3 ; TextBeforeBattle + dw Route9AfterBattleText3 ; TextAfterBattle + dw Route9EndBattleText3 ; TextEndBattle + dw Route9EndBattleText3 ; TextEndBattle + +Route9TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 + dw Route9BattleText4 ; TextBeforeBattle + dw Route9AfterBattleText4 ; TextAfterBattle + dw Route9EndBattleText4 ; TextEndBattle + dw Route9EndBattleText4 ; TextEndBattle + +Route9TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 + dw Route9BattleText5 ; TextBeforeBattle + dw Route9AfterBattleText5 ; TextAfterBattle + dw Route9EndBattleText5 ; TextEndBattle + dw Route9EndBattleText5 ; TextEndBattle + +Route9TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 + dw Route9BattleText6 ; TextBeforeBattle + dw Route9AfterBattleText6 ; TextAfterBattle + dw Route9EndBattleText6 ; TextEndBattle + dw Route9EndBattleText6 ; TextEndBattle + +Route9TrainerHeader6: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 + dw Route9BattleText7 ; TextBeforeBattle + dw Route9AfterBattleText7 ; TextAfterBattle + dw Route9EndBattleText7 ; TextEndBattle + dw Route9EndBattleText7 ; TextEndBattle + +Route9TrainerHeader7: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1 + dw Route9BattleText8 ; TextBeforeBattle + dw Route9AfterBattleText8 ; TextAfterBattle + dw Route9EndBattleText8 ; TextEndBattle + dw Route9EndBattleText8 ; TextEndBattle + +Route9TrainerHeader8: + dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 + dw Route9BattleText9 ; TextBeforeBattle + dw Route9AfterBattleText9 ; TextAfterBattle + dw Route9EndBattleText9 ; TextEndBattle + dw Route9EndBattleText9 ; TextEndBattle + + db $ff + +Route9Text1: + TX_ASM + ld hl, Route9TrainerHeader0 + jr Route9TalkToTrainer + +Route9Text2: + TX_ASM + ld hl, Route9TrainerHeader1 + jr Route9TalkToTrainer + +Route9Text3: + TX_ASM + ld hl, Route9TrainerHeader2 + jr Route9TalkToTrainer + +Route9Text4: + TX_ASM + ld hl, Route9TrainerHeader3 + jr Route9TalkToTrainer + +Route9Text5: + TX_ASM + ld hl, Route9TrainerHeader4 + jr Route9TalkToTrainer + +Route9Text6: + TX_ASM + ld hl, Route9TrainerHeader5 + jr Route9TalkToTrainer + +Route9Text7: + TX_ASM + ld hl, Route9TrainerHeader6 + jr Route9TalkToTrainer + +Route9Text8: + TX_ASM + ld hl, Route9TrainerHeader7 + jr Route9TalkToTrainer + +Route9Text9: + TX_ASM + ld hl, Route9TrainerHeader8 +Route9TalkToTrainer: + call TalkToTrainer + jp TextScriptEnd + +Route9BattleText1: + TX_FAR _Route9BattleText1 + db "@" + +Route9EndBattleText1: + TX_FAR _Route9EndBattleText1 + db "@" + +Route9AfterBattleText1: + TX_FAR _Route9AfterBattleText1 + db "@" + +Route9BattleText2: + TX_FAR _Route9BattleText2 + db "@" + +Route9EndBattleText2: + TX_FAR _Route9EndBattleText2 + db "@" + +Route9AfterBattleText2: + TX_FAR _Route9AfterBattleText2 + db "@" + +Route9BattleText3: + TX_FAR _Route9BattleText3 + db "@" + +Route9EndBattleText3: + TX_FAR _Route9EndBattleText3 + db "@" + +Route9AfterBattleText3: + TX_FAR _Route9AfterBattleText3 + db "@" + +Route9BattleText4: + TX_FAR _Route9BattleText4 + db "@" + +Route9EndBattleText4: + TX_FAR _Route9EndBattleText4 + db "@" + +Route9AfterBattleText4: + TX_FAR _Route9AfterBattleText4 + db "@" + +Route9BattleText5: + TX_FAR _Route9BattleText5 + db "@" + +Route9EndBattleText5: + TX_FAR _Route9EndBattleText5 + db "@" + +Route9AfterBattleText5: + TX_FAR _Route9AfterBattleText5 + db "@" + +Route9BattleText6: + TX_FAR _Route9BattleText6 + db "@" + +Route9EndBattleText6: + TX_FAR _Route9EndBattleText6 + db "@" + +Route9AfterBattleText6: + TX_FAR _Route9AfterBattleText6 + db "@" + +Route9BattleText7: + TX_FAR _Route9BattleText7 + db "@" + +Route9EndBattleText7: + TX_FAR _Route9EndBattleText7 + db "@" + +Route9AfterBattleText7: + TX_FAR _Route9AfterBattleText7 + db "@" + +Route9BattleText8: + TX_FAR _Route9BattleText8 + db "@" + +Route9EndBattleText8: + TX_FAR _Route9EndBattleText8 + db "@" + +Route9AfterBattleText8: + TX_FAR _Route9AfterBattleText8 + db "@" + +Route9BattleText9: + TX_FAR _Route9BattleText9 + db "@" + +Route9EndBattleText9: + TX_FAR _Route9EndBattleText9 + db "@" + +Route9AfterBattleText9: + TX_FAR _Route9AfterBattleText9 + db "@" + +Route9Text11: + TX_FAR _Route9Text11 + db "@" diff --git a/scripts/SSAnne1F.asm b/scripts/SSAnne1F.asm new file mode 100755 index 00000000..5cace6ee --- /dev/null +++ b/scripts/SSAnne1F.asm @@ -0,0 +1,15 @@ +SSAnne1F_Script: + call EnableAutoTextBoxDrawing + ret + +SSAnne1F_TextPointers: + dw SSAnne1Text1 + dw SSAnne1Text2 + +SSAnne1Text1: + TX_FAR _SSAnne1Text1 + db "@" + +SSAnne1Text2: + TX_FAR _SSAnne1Text2 + db "@" diff --git a/scripts/SSAnne1FRooms.asm b/scripts/SSAnne1FRooms.asm new file mode 100755 index 00000000..2371f286 --- /dev/null +++ b/scripts/SSAnne1FRooms.asm @@ -0,0 +1,163 @@ +SSAnne1FRooms_Script: + call EnableAutoTextBoxDrawing + ld hl, SSAnne8TrainerHeader0 + ld de, SSAnne1FRooms_ScriptPointers + ld a, [wSSAnne1FRoomsCurScript] + call ExecuteCurMapScriptInTable + ld [wSSAnne1FRoomsCurScript], a + ret + +SSAnne1FRooms_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SSAnne1FRooms_TextPointers: + dw SSAnne8Text1 + dw SSAnne8Text2 + dw SSAnne8Text3 + dw SSAnne8Text4 + dw SSAnne8Text5 + dw SSAnne8Text6 + dw SSAnne8Text7 + dw SSAnne8Text8 + dw SSAnne8Text9 + dw PickUpItemText + dw SSAnne8Text11 + +SSAnne8TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_0 + dw SSAnne8BattleText1 ; TextBeforeBattle + dw SSAnne8AfterBattleText1 ; TextAfterBattle + dw SSAnne8EndBattleText1 ; TextEndBattle + dw SSAnne8EndBattleText1 ; TextEndBattle + +SSAnne8TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_1 + dw SSAnne8BattleText2 ; TextBeforeBattle + dw SSAnne8AfterBattleText2 ; TextAfterBattle + dw SSAnne8EndBattleText2 ; TextEndBattle + dw SSAnne8EndBattleText2 ; TextEndBattle + +SSAnne8TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_2 + dw SSAnne8BattleText3 ; TextBeforeBattle + dw SSAnne8AfterBattleText3 ; TextAfterBattle + dw SSAnne8EndBattleText3 ; TextEndBattle + dw SSAnne8EndBattleText3 ; TextEndBattle + +SSAnne8TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_3 + dw SSAnne8BattleText4 ; TextBeforeBattle + dw SSAnne8AfterBattleText4 ; TextAfterBattle + dw SSAnne8EndBattleText4 ; TextEndBattle + dw SSAnne8EndBattleText4 ; TextEndBattle + + db $ff + +SSAnne8Text1: + TX_ASM + ld hl, SSAnne8TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SSAnne8Text2: + TX_ASM + ld hl, SSAnne8TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SSAnne8Text3: + TX_ASM + ld hl, SSAnne8TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SSAnne8Text4: + TX_ASM + ld hl, SSAnne8TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SSAnne8Text8: + TX_FAR _SSAnne8Text8 + TX_ASM + ld a, WIGGLYTUFF + call PlayCry + jp TextScriptEnd + +SSAnne8BattleText1: + TX_FAR _SSAnne8BattleText1 + db "@" + +SSAnne8EndBattleText1: + TX_FAR _SSAnne8EndBattleText1 + db "@" + +SSAnne8AfterBattleText1: + TX_FAR _SSAnne8AfterBattleText1 + db "@" + +SSAnne8BattleText2: + TX_FAR _SSAnne8BattleText2 + db "@" + +SSAnne8EndBattleText2: + TX_FAR _SSAnne8EndBattleText2 + db "@" + +SSAnne8AfterBattleText2: + TX_FAR _SSAnne8AfterBattleText2 + db "@" + +SSAnne8BattleText3: + TX_FAR _SSAnne8BattleText3 + db "@" + +SSAnne8EndBattleText3: + TX_FAR _SSAnne8EndBattleText3 + db "@" + +SSAnne8AfterBattleText3: + TX_FAR _SSAnne8AfterBattleText3 + db "@" + +SSAnne8BattleText4: + TX_FAR _SSAnne8BattleText4 + db "@" + +SSAnne8EndBattleText4: + TX_FAR _SSAnne8EndBattleText4 + db "@" + +SSAnne8AfterBattleText4: + TX_FAR _SSAnne8AfterBattleText4 + db "@" + +SSAnne8Text5: + TX_FAR _SSAnne8Text5 + db "@" + +SSAnne8Text6: + TX_FAR _SSAnne8Text6 + db "@" + +SSAnne8Text7: + TX_FAR _SSAnne8Text7 + db "@" + +SSAnne8Text9: + TX_FAR _SSAnne8Text9 + db "@" + +SSAnne8Text11: + TX_FAR _SSAnne8Text11 + db "@" diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm new file mode 100755 index 00000000..ba900748 --- /dev/null +++ b/scripts/SSAnne2F.asm @@ -0,0 +1,216 @@ +SSAnne2F_Script: + call EnableAutoTextBoxDrawing + ld hl, SSAnne2F_ScriptPointers + ld a, [wSSAnne2FCurScript] + jp CallFunctionInTable + +SSAnne2Script_613ab: + xor a + ld [wJoyIgnore], a + ld [wSSAnne2FCurScript], a + ret + +SSAnne2F_ScriptPointers: + dw SSAnne2Script0 + dw SSAnne2Script1 + dw SSAnne2Script2 + dw SSAnne2Script3 + dw SSAnne2Script4 + +SSAnne2Script4: + ret + +SSAnne2Script0: + ld hl, CoordsData_61411 + call ArePlayerCoordsInArray + ret nc + ld a, $ff + ld [wNewSoundID], a + call PlaySound + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ld a, [wCoordIndex] + ld [$ffdb], a + ld a, HS_SS_ANNE_2F_RIVAL + ld [wMissableObjectIndex], a + predef ShowObject + call Delay3 + ld a, $2 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + xor a + ld [hJoyHeld], a + ld a, $f0 + ld [wJoyIgnore], a + ld a, [$ffdb] + cp $2 + jr nz, .asm_61400 + ld de, MovementData_6140c + jr .asm_61403 +.asm_61400 + ld de, MovementData_6140d +.asm_61403 + call MoveSprite + ld a, $1 + ld [wSSAnne2FCurScript], a + ret + +MovementData_6140c: + db NPC_MOVEMENT_DOWN + +MovementData_6140d: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +CoordsData_61411: + db $08,$24 + db $08,$25 + db $FF + +SSAnne2Script_61416: + ld a, [wXCoord] + cp $25 + jr nz, .asm_61426 + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + ld a, SPRITE_FACING_RIGHT + jr .asm_61427 +.asm_61426 + xor a ; SPRITE_FACING_DOWN +.asm_61427 + ld [hSpriteFacingDirection], a + ld a, $2 + ld [H_SPRITEINDEX], a + jp SetSpriteFacingDirectionAndDelay + +SSAnne2Script1: + ld a, [wd730] + bit 0, a + ret nz + call SSAnne2Script_61416 + xor a + ld [wJoyIgnore], a + ld a, $2 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld a, OPP_SONY2 + ld [wCurOpponent], a + + ; select which team to use during the encounter + ld a, [wRivalStarter] + cp STARTER2 + jr nz, .NotSquirtle + ld a, $1 + jr .done +.NotSquirtle + cp STARTER3 + jr nz, .Charmander + ld a, $2 + jr .done +.Charmander + ld a, $3 +.done + ld [wTrainerNo], a + + call SSAnne2Script_61416 + ld a, $2 + ld [wSSAnne2FCurScript], a + ret + +SSAnne2Script2: + ld a, [wIsInBattle] + cp $ff + jp z, SSAnne2Script_613ab + call SSAnne2Script_61416 + ld a, $f0 + ld [wJoyIgnore], a + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $2 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld a, [wXCoord] + cp $25 + jr nz, .asm_61497 + ld de, MovementData_614b9 + jr .asm_6149a +.asm_61497 + ld de, MovementData_614b7 +.asm_6149a + ld a, $2 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld a, $3 + ld [wSSAnne2FCurScript], a + ret + +MovementData_614b7: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + +MovementData_614b9: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +SSAnne2Script3: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, HS_SS_ANNE_2F_RIVAL + ld [wMissableObjectIndex], a + predef HideObject + call PlayDefaultMusic + ld a, $4 + ld [wSSAnne2FCurScript], a + ret + +SSAnne2F_TextPointers: + dw SSAnne2Text1 + dw SSAnne2Text2 + dw SSAnne2Text3 + +SSAnne2Text1: + TX_FAR _SSAnne2Text1 + db "@" + +SSAnne2Text2: + TX_ASM + ld hl, SSAnneRivalBeforeBattleText + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, SSAnneRivalDefeatedText + ld de, SSAnneRivalWonText + call SaveEndBattleTextPointers + jp TextScriptEnd + +SSAnneRivalBeforeBattleText: + TX_FAR _SSAnneRivalBeforeBattleText + db "@" + +SSAnneRivalDefeatedText: + TX_FAR _SSAnneRivalDefeatedText + db "@" + +SSAnneRivalWonText: + TX_FAR _SSAnneRivalWonText + db "@" + +SSAnne2Text3: + TX_FAR _SSAnneRivalCaptainText + db "@" diff --git a/scripts/SSAnne2FRooms.asm b/scripts/SSAnne2FRooms.asm new file mode 100755 index 00000000..a79e1be8 --- /dev/null +++ b/scripts/SSAnne2FRooms.asm @@ -0,0 +1,215 @@ +SSAnne2FRooms_Script: + ld a, $1 + ld [wAutoTextBoxDrawingControl], a + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, SSAnne9TrainerHeader0 + ld de, SSAnne2FRooms_ScriptPointers + ld a, [wSSAnne2FRoomsCurScript] + call ExecuteCurMapScriptInTable + ld [wSSAnne2FRoomsCurScript], a + ret + +SSAnne2FRooms_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SSAnne2FRooms_TextPointers: + dw SSAnne9Text1 + dw SSAnne9Text2 + dw SSAnne9Text3 + dw SSAnne9Text4 + dw SSAnne9Text5 + dw PickUpItemText + dw SSAnne9Text7 + dw SSAnne9Text8 + dw PickUpItemText + dw SSAnne9Text10 + dw SSAnne9Text11 + dw SSAnne9Text12 + dw SSAnne9Text13 + +SSAnne9TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0 + dw SSAnne9BattleText1 ; TextBeforeBattle + dw SSAnne9AfterBattleText1 ; TextAfterBattle + dw SSAnne9EndBattleText1 ; TextEndBattle + dw SSAnne9EndBattleText1 ; TextEndBattle + +SSAnne9TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1 + dw SSAnne9BattleText2 ; TextBeforeBattle + dw SSAnne9AfterBattleText2 ; TextAfterBattle + dw SSAnne9EndBattleText2 ; TextEndBattle + dw SSAnne9EndBattleText2 ; TextEndBattle + +SSAnne9TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2 + dw SSAnne9BattleText3 ; TextBeforeBattle + dw SSAnne9AfterBattleText3 ; TextAfterBattle + dw SSAnne9EndBattleText3 ; TextEndBattle + dw SSAnne9EndBattleText3 ; TextEndBattle + +SSAnne9TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3 + dw SSAnne9BattleText4 ; TextBeforeBattle + dw SSAnne9AfterBattleText4 ; TextAfterBattle + dw SSAnne9EndBattleText4 ; TextEndBattle + dw SSAnne9EndBattleText4 ; TextEndBattle + + db $ff + +SSAnne9Text1: + TX_ASM + ld hl, SSAnne9TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SSAnne9Text2: + TX_ASM + ld hl, SSAnne9TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SSAnne9Text3: + TX_ASM + ld hl, SSAnne9TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SSAnne9Text4: + TX_ASM + ld hl, SSAnne9TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SSAnne9Text5: + TX_ASM + call SaveScreenTilesToBuffer1 + ld hl, SSAnne9Text_61bf2 + call PrintText + call LoadScreenTilesFromBuffer1 + ld a, SNORLAX + call DisplayPokedex + jp TextScriptEnd + +SSAnne9Text_61bf2: + TX_FAR _SSAnne9Text_61bf2 + db "@" + +SSAnne9Text7: + TX_ASM + ld hl, SSAnne9Text_61c01 + call PrintText + jp TextScriptEnd + +SSAnne9Text_61c01: + TX_FAR _SSAnne9Text_61c01 + db "@" + +SSAnne9Text8: + TX_ASM + ld hl, SSAnne9Text_61c10 + call PrintText + jp TextScriptEnd + +SSAnne9Text_61c10: + TX_FAR _SSAnne9Text_61c10 + db "@" + +SSAnne9Text10: + TX_ASM + ld hl, SSAnne9Text_61c1f + call PrintText + jp TextScriptEnd + +SSAnne9Text_61c1f: + TX_FAR _SSAnne9Text_61c1f + db "@" + +SSAnne9Text11: + TX_ASM + ld hl, SSAnne9Text_61c2e + call PrintText + jp TextScriptEnd + +SSAnne9Text_61c2e: + TX_FAR _SSAnne9Text_61c2e + db "@" + +SSAnne9Text12: + TX_ASM + ld hl, SSAnne9Text_61c3d + call PrintText + jp TextScriptEnd + +SSAnne9Text_61c3d: + TX_FAR _SSAnne9Text_61c3d + db "@" + +SSAnne9Text13: + TX_ASM + ld hl, SSAnne9Text_61c4c + call PrintText + jp TextScriptEnd + +SSAnne9Text_61c4c: + TX_FAR _SSAnne9Text_61c4c + db "@" + +SSAnne9BattleText1: + TX_FAR _SSAnne9BattleText1 + db "@" + +SSAnne9EndBattleText1: + TX_FAR _SSAnne9EndBattleText1 + db "@" + +SSAnne9AfterBattleText1: + TX_FAR _SSAnne9AfterBattleText1 + db "@" + +SSAnne9BattleText2: + TX_FAR _SSAnne9BattleText2 + db "@" + +SSAnne9EndBattleText2: + TX_FAR _SSAnne9EndBattleText2 + db "@" + +SSAnne9AfterBattleText2: + TX_FAR _SSAnne9AfterBattleText2 + db "@" + +SSAnne9BattleText3: + TX_FAR _SSAnne9BattleText3 + db "@" + +SSAnne9EndBattleText3: + TX_FAR _SSAnne9EndBattleText3 + db "@" + +SSAnne9AfterBattleText3: + TX_FAR _SSAnne9AfterBattleText3 + db "@" + +SSAnne9BattleText4: + TX_FAR _SSAnne9BattleText4 + db "@" + +SSAnne9EndBattleText4: + TX_FAR _SSAnne9EndBattleText4 + db "@" + +SSAnne9AfterBattleText4: + TX_FAR _SSAnne9AfterBattleText4 + db "@" diff --git a/scripts/SSAnne3F.asm b/scripts/SSAnne3F.asm new file mode 100755 index 00000000..5da0e0c7 --- /dev/null +++ b/scripts/SSAnne3F.asm @@ -0,0 +1,9 @@ +SSAnne3F_Script: + jp EnableAutoTextBoxDrawing + +SSAnne3F_TextPointers: + dw SSAnne3Text1 + +SSAnne3Text1: + TX_FAR _SSAnne3Text1 + db "@" diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm new file mode 100755 index 00000000..25df076f --- /dev/null +++ b/scripts/SSAnneB1F.asm @@ -0,0 +1,5 @@ +SSAnneB1F_Script: + jp EnableAutoTextBoxDrawing + +SSAnneB1F_TextPointers: + db "@" diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm new file mode 100755 index 00000000..3777852c --- /dev/null +++ b/scripts/SSAnneB1FRooms.asm @@ -0,0 +1,201 @@ +SSAnneB1FRooms_Script: + call EnableAutoTextBoxDrawing + ld hl, SSAnne10TrainerHeader0 + ld de, SSAnneB1FRooms_ScriptPointers + ld a, [wSSAnneB1FRoomsCurScript] + call ExecuteCurMapScriptInTable + ld [wSSAnneB1FRoomsCurScript], a + ret + +SSAnneB1FRooms_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SSAnneB1FRooms_TextPointers: + dw SSAnne10Text1 + dw SSAnne10Text2 + dw SSAnne10Text3 + dw SSAnne10Text4 + dw SSAnne10Text5 + dw SSAnne10Text6 + dw SSAnne10Text7 + dw SSAnne10Text8 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +SSAnne10TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0 + dw SSAnne10BattleText1 ; TextBeforeBattle + dw SSAnne10AfterBattleText1 ; TextAfterBattle + dw SSAnne10EndBattleText1 ; TextEndBattle + dw SSAnne10EndBattleText1 ; TextEndBattle + +SSAnne10TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1 + dw SSAnne10BattleText2 ; TextBeforeBattle + dw SSAnne10AfterBattleText2 ; TextAfterBattle + dw SSAnne10EndBattleText2 ; TextEndBattle + dw SSAnne10EndBattleText2 ; TextEndBattle + +SSAnne10TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2 + dw SSAnne10BattleText3 ; TextBeforeBattle + dw SSAnne10AfterBattleText3 ; TextAfterBattle + dw SSAnne10EndBattleText3 ; TextEndBattle + dw SSAnne10EndBattleText3 ; TextEndBattle + +SSAnne10TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3 + dw SSAnne10BattleText4 ; TextBeforeBattle + dw SSAnne10AfterBattleText4 ; TextAfterBattle + dw SSAnne10EndBattleText4 ; TextEndBattle + dw SSAnne10EndBattleText4 ; TextEndBattle + +SSAnne10TrainerHeader4: + dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4 + dw SSAnne10BattleText5 ; TextBeforeBattle + dw SSAnne10AfterBattleText5 ; TextAfterBattle + dw SSAnne10EndBattleText5 ; TextEndBattle + dw SSAnne10EndBattleText5 ; TextEndBattle + +SSAnne10TrainerHeader5: + dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5 + dw SSAnne10BattleText6 ; TextBeforeBattle + dw SSAnne10AfterBattleText6 ; TextAfterBattle + dw SSAnne10EndBattleText6 ; TextEndBattle + dw SSAnne10EndBattleText6 ; TextEndBattle + + db $ff + +SSAnne10Text1: + TX_ASM + ld hl, SSAnne10TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SSAnne10Text2: + TX_ASM + ld hl, SSAnne10TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SSAnne10Text3: + TX_ASM + ld hl, SSAnne10TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SSAnne10Text4: + TX_ASM + ld hl, SSAnne10TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SSAnne10Text5: + TX_ASM + ld hl, SSAnne10TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +SSAnne10Text6: + TX_ASM + ld hl, SSAnne10TrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +SSAnne10Text8: + TX_FAR _SSAnne10Text8 + TX_ASM + ld a, MACHOKE + call PlayCry + jp TextScriptEnd + +SSAnne10BattleText1: + TX_FAR _SSAnne10BattleText1 + db "@" + +SSAnne10EndBattleText1: + TX_FAR _SSAnne10EndBattleText1 + db "@" + +SSAnne10AfterBattleText1: + TX_FAR _SSAnne10AfterBattleText1 + db "@" + +SSAnne10BattleText2: + TX_FAR _SSAnne10BattleText2 + db "@" + +SSAnne10EndBattleText2: + TX_FAR _SSAnne10EndBattleText2 + db "@" + +SSAnne10AfterBattleText2: + TX_FAR _SSAnne10AfterBattleText2 + db "@" + +SSAnne10BattleText3: + TX_FAR _SSAnne10BattleText3 + db "@" + +SSAnne10EndBattleText3: + TX_FAR _SSAnne10EndBattleText3 + db "@" + +SSAnne10AfterBattleText3: + TX_FAR _SSAnne10AfterBattleText3 + db "@" + +SSAnne10BattleText4: + TX_FAR _SSAnne10BattleText4 + db "@" + +SSAnne10EndBattleText4: + TX_FAR _SSAnne10EndBattleText4 + db "@" + +SSAnne10AfterBattleText4: + TX_FAR _SSAnne10AfterBattleText4 + db "@" + +SSAnne10BattleText5: + TX_FAR _SSAnne10BattleText5 + db "@" + +SSAnne10EndBattleText5: + TX_FAR _SSAnne10EndBattleText5 + db "@" + +SSAnne10AfterBattleText5: + TX_FAR _SSAnne10AfterBattleText5 + db "@" + +SSAnne10BattleText6: + TX_FAR _SSAnne10BattleText6 + db "@" + +SSAnne10EndBattleText6: + TX_FAR _SSAnne10EndBattleText6 + db "@" + +SSAnne10AfterBattleText6: + TX_FAR _SSAnne10AfterBattleText6 + db "@" + +SSAnne10Text7: + TX_FAR _SSAnne10Text7 + db "@" diff --git a/scripts/SSAnneBow.asm b/scripts/SSAnneBow.asm new file mode 100755 index 00000000..4569f0f8 --- /dev/null +++ b/scripts/SSAnneBow.asm @@ -0,0 +1,88 @@ +SSAnneBow_Script: + call EnableAutoTextBoxDrawing + ld hl, SSAnne5TrainerHeader0 + ld de, SSAnneBow_ScriptPointers + ld a, [wSSAnneBowCurScript] + call ExecuteCurMapScriptInTable + ld [wSSAnneBowCurScript], a + ret + +SSAnneBow_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SSAnneBow_TextPointers: + dw SSAnne5Text1 + dw SSAnne5Text2 + dw SSAnne5Text3 + dw SSAnne5Text4 + dw SSAnne5Text5 + +SSAnne5TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_0 + dw SSAnne5BattleText1 ; TextBeforeBattle + dw SSAnne5AfterBattleText1 ; TextAfterBattle + dw SSAnne5EndBattleText1 ; TextEndBattle + dw SSAnne5EndBattleText1 ; TextEndBattle + +SSAnne5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_1 + dw SSAnne5BattleText2 ; TextBeforeBattle + dw SSAnne5AfterBattleText2 ; TextAfterBattle + dw SSAnne5EndBattleText2 ; TextEndBattle + dw SSAnne5EndBattleText2 ; TextEndBattle + + db $ff + +SSAnne5Text1: + TX_FAR _SSAnne5Text1 + db "@" + +SSAnne5Text2: + TX_FAR _SSAnne5Text2 + db "@" + +SSAnne5Text3: + TX_FAR _SSAnne5Text3 + db "@" + +SSAnne5Text4: + TX_ASM + ld hl, SSAnne5TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SSAnne5BattleText1: + TX_FAR _SSAnne5BattleText1 + db "@" + +SSAnne5EndBattleText1: + TX_FAR _SSAnne5EndBattleText1 + db "@" + +SSAnne5AfterBattleText1: + TX_FAR _SSAnne5AfterBattleText1 + db "@" + +SSAnne5Text5: + TX_ASM + ld hl, SSAnne5TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SSAnne5BattleText2: + TX_FAR _SSAnne5BattleText2 + db "@" + +SSAnne5EndBattleText2: + TX_FAR _SSAnne5EndBattleText2 + db "@" + +SSAnne5AfterBattleText2: + TX_FAR _SSAnne5AfterBattleText2 + db "@" diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm new file mode 100755 index 00000000..de0272e4 --- /dev/null +++ b/scripts/SSAnneCaptainsRoom.asm @@ -0,0 +1,93 @@ +SSAnneCaptainsRoom_Script: + call SSAnne7Script_6189b + jp EnableAutoTextBoxDrawing + +SSAnne7Script_6189b: + CheckEvent EVENT_RUBBED_CAPTAINS_BACK + ret nz + ld hl, wd72d + set 5, [hl] + ret + +SSAnneCaptainsRoom_TextPointers: + dw SSAnne7Text1 + dw SSAnne7Text2 + dw SSAnne7Text3 + +SSAnne7Text1: + TX_ASM + CheckEvent EVENT_GOT_HM01 + jr nz, .asm_797c4 + ld hl, SSAnne7RubText + call PrintText + ld hl, ReceivingHM01Text + call PrintText + lb bc, HM_01, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedHM01Text + call PrintText + SetEvent EVENT_GOT_HM01 + jr .asm_0faf5 +.BagFull + ld hl, HM01NoRoomText + call PrintText + ld hl, wd72d + set 5, [hl] + jr .asm_0faf5 +.asm_797c4 + ld hl, SSAnne7Text_61932 + call PrintText +.asm_0faf5 + jp TextScriptEnd + +SSAnne7RubText: + TX_FAR _SSAnne7RubText + TX_ASM + ld a, [wAudioROMBank] + cp BANK(Audio3_UpdateMusic) + ld [wAudioSavedROMBank], a + jr nz, .asm_61908 + ld a, $ff + ld [wNewSoundID], a + call PlaySound + ld a, Bank(Music_PkmnHealed) + ld [wAudioROMBank], a +.asm_61908 + ld a, MUSIC_PKMN_HEALED + ld [wNewSoundID], a + call PlaySound +.asm_61910 + ld a, [wChannelSoundIDs] + cp MUSIC_PKMN_HEALED + jr z, .asm_61910 + call PlayDefaultMusic + SetEvent EVENT_RUBBED_CAPTAINS_BACK + ld hl, wd72d + res 5, [hl] + jp TextScriptEnd + +ReceivingHM01Text: + TX_FAR _ReceivingHM01Text + db "@" + +ReceivedHM01Text: + TX_FAR _ReceivedHM01Text + TX_SFX_KEY_ITEM + db "@" + +SSAnne7Text_61932: + TX_FAR _SSAnne7Text_61932 + db "@" + +HM01NoRoomText: + TX_FAR _HM01NoRoomText + db "@" + +SSAnne7Text2: + TX_FAR _SSAnne7Text2 + db "@" + +SSAnne7Text3: + TX_FAR _SSAnne7Text3 + db "@" diff --git a/scripts/SSAnneKitchen.asm b/scripts/SSAnneKitchen.asm new file mode 100755 index 00000000..137706a0 --- /dev/null +++ b/scripts/SSAnneKitchen.asm @@ -0,0 +1,72 @@ +SSAnneKitchen_Script: + call EnableAutoTextBoxDrawing + ret + +SSAnneKitchen_TextPointers: + dw SSAnne6Text1 + dw SSAnne6Text2 + dw SSAnne6Text3 + dw SSAnne6Text4 + dw SSAnne6Text5 + dw SSAnne6Text6 + dw SSAnne6Text7 + +SSAnne6Text1: + TX_FAR _SSAnne6Text1 + db "@" + +SSAnne6Text2: + TX_FAR _SSAnne6Text2 + db "@" + +SSAnne6Text3: + TX_FAR _SSAnne6Text3 + db "@" + +SSAnne6Text4: + TX_FAR _SSAnne6Text4 + db "@" + +SSAnne6Text5: + TX_FAR _SSAnne6Text5 + db "@" + +SSAnne6Text6: + TX_FAR _SSAnne6Text6 + db "@" + +SSAnne6Text7: + TX_ASM + ld hl, SSAnne6Text_61807 + call PrintText + ld a, [hRandomAdd] + bit 7, a + jr z, .asm_93eb1 + ld hl, SSAnne6Text_6180c + jr .asm_63292 +.asm_93eb1 + bit 4, a + jr z, .asm_7436c + ld hl, SSAnne6Text_61811 + jr .asm_63292 +.asm_7436c + ld hl, SSAnne6Text_61816 +.asm_63292 + call PrintText + jp TextScriptEnd + +SSAnne6Text_61807: + TX_FAR _SSAnne6Text_61807 + db "@" + +SSAnne6Text_6180c: + TX_FAR _SSAnne6Text_6180c + db "@" + +SSAnne6Text_61811: + TX_FAR _SSAnne6Text_61811 + db "@" + +SSAnne6Text_61816: + TX_FAR _SSAnne6Text_61816 + db "@" diff --git a/scripts/SafariZoneCenter.asm b/scripts/SafariZoneCenter.asm new file mode 100755 index 00000000..0a266887 --- /dev/null +++ b/scripts/SafariZoneCenter.asm @@ -0,0 +1,15 @@ +SafariZoneCenter_Script: + jp EnableAutoTextBoxDrawing + +SafariZoneCenter_TextPointers: + dw PickUpItemText + dw SafariZoneCenterText2 + dw SafariZoneCenterText3 + +SafariZoneCenterText2: + TX_FAR _SafariZoneCenterText2 + db "@" + +SafariZoneCenterText3: + TX_FAR _SafariZoneCenterText3 + db "@" diff --git a/scripts/SafariZoneCenterRestHouse.asm b/scripts/SafariZoneCenterRestHouse.asm new file mode 100755 index 00000000..a652644b --- /dev/null +++ b/scripts/SafariZoneCenterRestHouse.asm @@ -0,0 +1,14 @@ +SafariZoneCenterRestHouse_Script: + jp EnableAutoTextBoxDrawing + +SafariZoneCenterRestHouse_TextPointers: + dw SafariZoneRestHouse1Text1 + dw SafariZoneRestHouse1Text2 + +SafariZoneRestHouse1Text1: + TX_FAR _SafariZoneRestHouse1Text1 + db "@" + +SafariZoneRestHouse1Text2: + TX_FAR _SafariZoneRestHouse1Text2 + db "@" diff --git a/scripts/SafariZoneEast.asm b/scripts/SafariZoneEast.asm new file mode 100755 index 00000000..7f4a5543 --- /dev/null +++ b/scripts/SafariZoneEast.asm @@ -0,0 +1,23 @@ +SafariZoneEast_Script: + jp EnableAutoTextBoxDrawing + +SafariZoneEast_TextPointers: + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw SafariZoneEastText5 + dw SafariZoneEastText6 + dw SafariZoneEastText7 + +SafariZoneEastText5: + TX_FAR _SafariZoneEastText5 + db "@" + +SafariZoneEastText6: + TX_FAR _SafariZoneEastText6 + db "@" + +SafariZoneEastText7: + TX_FAR _SafariZoneEastText7 + db "@" diff --git a/scripts/SafariZoneEastRestHouse.asm b/scripts/SafariZoneEastRestHouse.asm new file mode 100755 index 00000000..24141459 --- /dev/null +++ b/scripts/SafariZoneEastRestHouse.asm @@ -0,0 +1,20 @@ +SafariZoneEastRestHouse_Script: + call EnableAutoTextBoxDrawing + ret + +SafariZoneEastRestHouse_TextPointers: + dw SafariZoneRestHouse3Text1 + dw SafariZoneRestHouse3Text2 + dw SafariZoneRestHouse3Text3 + +SafariZoneRestHouse3Text1: + TX_FAR _SafariZoneRestHouse3Text1 + db "@" + +SafariZoneRestHouse3Text2: + TX_FAR _SafariZoneRestHouse3Text2 + db "@" + +SafariZoneRestHouse3Text3: + TX_FAR _SafariZoneRestHouse3Text3 + db "@" diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm new file mode 100755 index 00000000..f3de556b --- /dev/null +++ b/scripts/SafariZoneGate.asm @@ -0,0 +1,293 @@ +SafariZoneGate_Script: + call EnableAutoTextBoxDrawing + ld hl, SafariZoneGate_ScriptPointers + ld a, [wSafariZoneGateCurScript] + jp CallFunctionInTable + +SafariZoneGate_ScriptPointers: + dw .SafariZoneEntranceScript0 + dw .SafariZoneEntranceScript1 + dw .SafariZoneEntranceScript2 + dw .SafariZoneEntranceScript3 + dw .SafariZoneEntranceScript4 + dw .SafariZoneEntranceScript5 + dw .SafariZoneEntranceScript6 + +.SafariZoneEntranceScript0 + ld hl, .CoordsData_75221 + call ArePlayerCoordsInArray + ret nc + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wJoyIgnore], a + xor a + ld [hJoyHeld], a + ld a, SPRITE_FACING_RIGHT + ld [wSpriteStateData1 + 9], a + ld a, [wCoordIndex] + cp $1 + jr z, .asm_7520f + ld a, $2 + ld [wSafariZoneGateCurScript], a + ret +.asm_7520f + ld a, D_RIGHT + ld c, $1 + call SafariZoneEntranceAutoWalk + ld a, $f0 + ld [wJoyIgnore], a + ld a, $1 + ld [wSafariZoneGateCurScript], a + ret + +.CoordsData_75221: + db $02,$03 + db $02,$04 + db $FF + +.SafariZoneEntranceScript1 + call SafariZoneEntranceScript_752b4 + ret nz +.SafariZoneEntranceScript2 + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + call UpdateSprites + ld a, $4 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wJoyIgnore], a + ret + +.SafariZoneEntranceScript3 + call SafariZoneEntranceScript_752b4 + ret nz + xor a + ld [wJoyIgnore], a + ld a, $5 + ld [wSafariZoneGateCurScript], a + ret + +.SafariZoneEntranceScript5 + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + CheckAndResetEvent EVENT_SAFARI_GAME_OVER + jr z, .asm_7527f + ResetEventReuseHL EVENT_IN_SAFARI_ZONE + call UpdateSprites + ld a, $f0 + ld [wJoyIgnore], a + ld a, $6 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wNumSafariBalls], a + ld a, D_DOWN + ld c, $3 + call SafariZoneEntranceAutoWalk + ld a, $4 + ld [wSafariZoneGateCurScript], a + jr .asm_75286 +.asm_7527f + ld a, $5 + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_75286 + ret + +.SafariZoneEntranceScript4 + call SafariZoneEntranceScript_752b4 + ret nz + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wSafariZoneGateCurScript], a + ret + +.SafariZoneEntranceScript6 + call SafariZoneEntranceScript_752b4 + ret nz + call Delay3 + ld a, [wcf0d] + ld [wSafariZoneGateCurScript], a + ret + +SafariZoneEntranceAutoWalk: + push af + ld b, 0 + ld a, c + ld [wSimulatedJoypadStatesIndex], a + ld hl, wSimulatedJoypadStatesEnd + pop af + call FillMemory + jp StartSimulatingJoypadStates + +SafariZoneEntranceScript_752b4: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret + +SafariZoneGate_TextPointers: + dw .SafariZoneEntranceText1 + dw .SafariZoneEntranceText2 + dw .SafariZoneEntranceText1 + dw .SafariZoneEntranceText4 + dw .SafariZoneEntranceText5 + dw .SafariZoneEntranceText6 + +.SafariZoneEntranceText1 + TX_FAR _SafariZoneEntranceText1 + db "@" + +.SafariZoneEntranceText4 + TX_FAR SafariZoneEntranceText_9e6e4 + TX_ASM + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jp nz, .PleaseComeAgain + xor a + ld [hMoney], a + ld a, $05 + ld [hMoney + 1], a + ld a, $00 + ld [hMoney + 2], a + call HasEnoughMoney + jr nc, .success + ld hl, .NotEnoughMoneyText + call PrintText + jr .CantPayWalkDown + +.success + xor a + ld [wPriceTemp], a + ld a, $05 + ld [wPriceTemp + 1], a + ld a, $00 + ld [wPriceTemp + 2], a + ld hl, wPriceTemp + 2 + ld de, wPlayerMoney + 2 + ld c, 3 + predef SubBCDPredef + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + ld hl, .MakePaymentText + call PrintText + ld a, 30 + ld [wNumSafariBalls], a + ld a, 502 / $100 + ld [wSafariSteps], a + ld a, 502 % $100 + ld [wSafariSteps + 1], a + ld a, D_UP + ld c, 3 + call SafariZoneEntranceAutoWalk + SetEvent EVENT_IN_SAFARI_ZONE + ResetEventReuseHL EVENT_SAFARI_GAME_OVER + ld a, 3 + ld [wSafariZoneGateCurScript], a + jr .done + +.PleaseComeAgain + ld hl, .PleaseComeAgainText + call PrintText +.CantPayWalkDown + ld a, D_DOWN + ld c, 1 + call SafariZoneEntranceAutoWalk + ld a, 4 + ld [wSafariZoneGateCurScript], a +.done + jp TextScriptEnd + +.MakePaymentText + TX_FAR SafariZoneEntranceText_9e747 + TX_SFX_ITEM_1 + TX_FAR _SafariZoneEntranceText_75360 + db "@" + +.PleaseComeAgainText + TX_FAR _SafariZoneEntranceText_75365 + db "@" + +.NotEnoughMoneyText + TX_FAR _SafariZoneEntranceText_7536a + db "@" + +.SafariZoneEntranceText5 + TX_FAR SafariZoneEntranceText_9e814 + TX_ASM + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_7539c + ld hl, .SafariZoneEntranceText_753bb + call PrintText + xor a + ld [wSpriteStateData1 + 9], a + ld a, D_DOWN + ld c, $3 + call SafariZoneEntranceAutoWalk + ResetEvents EVENT_SAFARI_GAME_OVER, EVENT_IN_SAFARI_ZONE + ld a, $0 + ld [wcf0d], a + jr .asm_753b3 +.asm_7539c + ld hl, .SafariZoneEntranceText_753c0 + call PrintText + ld a, SPRITE_FACING_UP + ld [wSpriteStateData1 + 9], a + ld a, D_UP + ld c, $1 + call SafariZoneEntranceAutoWalk + ld a, $5 + ld [wcf0d], a +.asm_753b3 + ld a, $6 + ld [wSafariZoneGateCurScript], a + jp TextScriptEnd + +.SafariZoneEntranceText_753bb + TX_FAR _SafariZoneEntranceText_753bb + db "@" + +.SafariZoneEntranceText_753c0 + TX_FAR _SafariZoneEntranceText_753c0 + db "@" + +.SafariZoneEntranceText6 + TX_FAR _SafariZoneEntranceText_753c5 + db "@" + +.SafariZoneEntranceText2 + TX_ASM + ld hl, .FirstTimeQuestionText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ld hl, .RegularText + jr nz, .Explanation + ld hl, .ExplanationText +.Explanation + call PrintText + jp TextScriptEnd + +.FirstTimeQuestionText + TX_FAR _SafariZoneEntranceText_753e6 + db "@" + +.ExplanationText + TX_FAR _SafariZoneEntranceText_753eb + db "@" + +.RegularText + TX_FAR _SafariZoneEntranceText_753f0 + db "@" diff --git a/scripts/SafariZoneNorth.asm b/scripts/SafariZoneNorth.asm new file mode 100755 index 00000000..734328b4 --- /dev/null +++ b/scripts/SafariZoneNorth.asm @@ -0,0 +1,31 @@ +SafariZoneNorth_Script: + jp EnableAutoTextBoxDrawing + +SafariZoneNorth_TextPointers: + dw PickUpItemText + dw PickUpItemText + dw SafariZoneNorthText3 + dw SafariZoneNorthText4 + dw SafariZoneNorthText5 + dw SafariZoneNorthText6 + dw SafariZoneNorthText7 + +SafariZoneNorthText3: + TX_FAR _SafariZoneNorthText3 + db "@" + +SafariZoneNorthText4: + TX_FAR _SafariZoneNorthText4 + db "@" + +SafariZoneNorthText5: + TX_FAR _SafariZoneNorthText5 + db "@" + +SafariZoneNorthText6: + TX_FAR _SafariZoneNorthText6 + db "@" + +SafariZoneNorthText7: + TX_FAR _SafariZoneNorthText7 + db "@" diff --git a/scripts/SafariZoneNorthRestHouse.asm b/scripts/SafariZoneNorthRestHouse.asm new file mode 100755 index 00000000..fdc438f4 --- /dev/null +++ b/scripts/SafariZoneNorthRestHouse.asm @@ -0,0 +1,20 @@ +SafariZoneNorthRestHouse_Script: + call EnableAutoTextBoxDrawing + ret + +SafariZoneNorthRestHouse_TextPointers: + dw SafariZoneRestHouse4Text1 + dw SafariZoneRestHouse4Text2 + dw SafariZoneRestHouse4Text3 + +SafariZoneRestHouse4Text1: + TX_FAR _SafariZoneRestHouse4Text1 + db "@" + +SafariZoneRestHouse4Text2: + TX_FAR _SafariZoneRestHouse4Text2 + db "@" + +SafariZoneRestHouse4Text3: + TX_FAR _SafariZoneRestHouse4Text3 + db "@" diff --git a/scripts/SafariZoneSecretHouse.asm b/scripts/SafariZoneSecretHouse.asm new file mode 100755 index 00000000..2d9b2305 --- /dev/null +++ b/scripts/SafariZoneSecretHouse.asm @@ -0,0 +1,45 @@ +SafariZoneSecretHouse_Script: + jp EnableAutoTextBoxDrawing + +SafariZoneSecretHouse_TextPointers: + dw SafariZoneSecretHouseText1 + +SafariZoneSecretHouseText1: + TX_ASM + CheckEvent EVENT_GOT_HM03 + jr nz, .asm_20a9b + ld hl, SafariZoneSecretHouseText_4a350 + call PrintText + lb bc, HM_03, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedHM03Text + call PrintText + SetEvent EVENT_GOT_HM03 + jr .asm_8f1fc +.BagFull + ld hl, HM03NoRoomText + call PrintText + jr .asm_8f1fc +.asm_20a9b + ld hl, HM03ExplanationText + call PrintText +.asm_8f1fc + jp TextScriptEnd + +SafariZoneSecretHouseText_4a350: + TX_FAR _SecretHouseText_4a350 + db "@" + +ReceivedHM03Text: + TX_FAR _ReceivedHM03Text + TX_SFX_ITEM_1 + db "@" + +HM03ExplanationText: + TX_FAR _HM03ExplanationText + db "@" + +HM03NoRoomText: + TX_FAR _HM03NoRoomText + db "@" diff --git a/scripts/SafariZoneWest.asm b/scripts/SafariZoneWest.asm new file mode 100755 index 00000000..483a92ee --- /dev/null +++ b/scripts/SafariZoneWest.asm @@ -0,0 +1,28 @@ +SafariZoneWest_Script: + jp EnableAutoTextBoxDrawing + +SafariZoneWest_TextPointers: + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw SafariZoneWestText5 + dw SafariZoneWestText6 + dw SafariZoneWestText7 + dw SafariZoneWestText8 + +SafariZoneWestText5: + TX_FAR _SafariZoneWestText5 + db "@" + +SafariZoneWestText6: + TX_FAR _SafariZoneWestText6 + db "@" + +SafariZoneWestText7: + TX_FAR _SafariZoneWestText7 + db "@" + +SafariZoneWestText8: + TX_FAR _SafariZoneWestText8 + db "@" diff --git a/scripts/SafariZoneWestRestHouse.asm b/scripts/SafariZoneWestRestHouse.asm new file mode 100755 index 00000000..371bd56c --- /dev/null +++ b/scripts/SafariZoneWestRestHouse.asm @@ -0,0 +1,20 @@ +SafariZoneWestRestHouse_Script: + call EnableAutoTextBoxDrawing + ret + +SafariZoneWestRestHouse_TextPointers: + dw SafariZoneRestHouse2Text1 + dw SafariZoneRestHouse2Text2 + dw SafariZoneRestHouse2Text3 + +SafariZoneRestHouse2Text1: + TX_FAR _SafariZoneRestHouse2Text1 + db "@" + +SafariZoneRestHouse2Text2: + TX_FAR _SafariZoneRestHouse2Text2 + db "@" + +SafariZoneRestHouse2Text3: + TX_FAR _SafariZoneRestHouse2Text3 + db "@" diff --git a/scripts/SaffronCity.asm b/scripts/SaffronCity.asm new file mode 100755 index 00000000..02e6e2bb --- /dev/null +++ b/scripts/SaffronCity.asm @@ -0,0 +1,122 @@ +SaffronCity_Script: + jp EnableAutoTextBoxDrawing + +SaffronCity_TextPointers: + dw SaffronCityText1 + dw SaffronCityText2 + dw SaffronCityText3 + dw SaffronCityText4 + dw SaffronCityText5 + dw SaffronCityText6 + dw SaffronCityText7 + dw SaffronCityText8 + dw SaffronCityText9 + dw SaffronCityText10 + dw SaffronCityText11 + dw SaffronCityText12 + dw SaffronCityText13 + dw SaffronCityText14 + dw SaffronCityText15 + dw SaffronCityText16 + dw SaffronCityText17 + dw SaffronCityText18 + dw MartSignText + dw SaffronCityText20 + dw SaffronCityText21 + dw SaffronCityText22 + dw PokeCenterSignText + dw SaffronCityText24 + dw SaffronCityText25 + +SaffronCityText1: + TX_FAR _SaffronCityText1 + db "@" + +SaffronCityText2: + TX_FAR _SaffronCityText2 + db "@" + +SaffronCityText3: + TX_FAR _SaffronCityText3 + db "@" + +SaffronCityText4: + TX_FAR _SaffronCityText4 + db "@" + +SaffronCityText5: + TX_FAR _SaffronCityText5 + db "@" + +SaffronCityText6: + TX_FAR _SaffronCityText6 + db "@" + +SaffronCityText7: + TX_FAR _SaffronCityText7 + db "@" + +SaffronCityText8: + TX_FAR _SaffronCityText8 + db "@" + +SaffronCityText9: + TX_FAR _SaffronCityText9 + db "@" + +SaffronCityText10: + TX_FAR _SaffronCityText10 + db "@" + +SaffronCityText11: + TX_FAR _SaffronCityText11 + db "@" + +SaffronCityText12: + TX_FAR _SaffronCityText12 + TX_CRY_PIDGEOT + db "@" + +SaffronCityText13: + TX_FAR _SaffronCityText13 + db "@" + +SaffronCityText14: + TX_FAR _SaffronCityText14 + db "@" + +SaffronCityText15: + TX_FAR _SaffronCityText15 + db "@" + +SaffronCityText16: + TX_FAR _SaffronCityText16 + db "@" + +SaffronCityText17: + TX_FAR _SaffronCityText17 + db "@" + +SaffronCityText18: + TX_FAR _SaffronCityText18 + db "@" + +SaffronCityText20: + TX_FAR _SaffronCityText20 + db "@" + +SaffronCityText21: + TX_FAR _SaffronCityText21 + db "@" + +SaffronCityText22: + TX_FAR _SaffronCityText22 + db "@" + +SaffronCityText24: + TX_FAR _SaffronCityText24 + db "@" + +SaffronCityText25: + TX_FAR _SaffronCityText25 + db "@" diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm new file mode 100755 index 00000000..e51763e5 --- /dev/null +++ b/scripts/SaffronGym.asm @@ -0,0 +1,358 @@ +SaffronGym_Script: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + call nz, .extra + call EnableAutoTextBoxDrawing + ld hl, SaffronGymTrainerHeader0 + ld de, SaffronGym_ScriptPointers + ld a, [wSaffronGymCurScript] + call ExecuteCurMapScriptInTable + ld [wSaffronGymCurScript], a + ret + +.extra + ld hl, Gym6CityName + ld de, Gym6LeaderName + jp LoadGymLeaderAndCityName + +Gym6CityName: + db "SAFFRON CITY@" + +Gym6LeaderName: + db "SABRINA@" + +SaffronGymText_5d048: + xor a + ld [wJoyIgnore], a + ld [wSaffronGymCurScript], a + ld [wCurMapScript], a + ret + +SaffronGym_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw SaffronGymScript3 + +SaffronGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, SaffronGymText_5d048 + ld a, $f0 + ld [wJoyIgnore], a + +SaffronGymText_5d068: + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_SABRINA + lb bc, TM_46, 1 + call GiveItem + jr nc, .BagFull + ld a, $b + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM46 + jr .asm_5d091 +.BagFull + ld a, $c + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_5d091 + ld hl, wObtainedBadges + set 5, [hl] + ld hl, wBeatGymFlags + set 5, [hl] + + ; deactivate gym trainers + SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6 + + jp SaffronGymText_5d048 + +SaffronGym_TextPointers: + dw SaffronGymText1 + dw SaffronGymText2 + dw SaffronGymText3 + dw SaffronGymText4 + dw SaffronGymText5 + dw SaffronGymText6 + dw SaffronGymText7 + dw SaffronGymText8 + dw SaffronGymText9 + dw SaffronGymText10 + dw SaffronGymText11 + dw SaffronGymText12 + +SaffronGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_0 + dw SaffronGymBattleText1 ; TextBeforeBattle + dw SaffronGymAfterBattleText1 ; TextAfterBattle + dw SaffronGymEndBattleText1 ; TextEndBattle + dw SaffronGymEndBattleText1 ; TextEndBattle + +SaffronGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_1 + dw SaffronGymBattleText2 ; TextBeforeBattle + dw SaffronGymAfterBattleText2 ; TextAfterBattle + dw SaffronGymEndBattleText2 ; TextEndBattle + dw SaffronGymEndBattleText2 ; TextEndBattle + +SaffronGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_2 + dw SaffronGymBattleText3 ; TextBeforeBattle + dw SaffronGymAfterBattleText3 ; TextAfterBattle + dw SaffronGymEndBattleText3 ; TextEndBattle + dw SaffronGymEndBattleText3 ; TextEndBattle + +SaffronGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_3 + dw SaffronGymBattleText4 ; TextBeforeBattle + dw SaffronGymAfterBattleText4 ; TextAfterBattle + dw SaffronGymEndBattleText4 ; TextEndBattle + dw SaffronGymEndBattleText4 ; TextEndBattle + +SaffronGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_4 + dw SaffronGymBattleText5 ; TextBeforeBattle + dw SaffronGymAfterBattleText5 ; TextAfterBattle + dw SaffronGymEndBattleText5 ; TextEndBattle + dw SaffronGymEndBattleText5 ; TextEndBattle + +SaffronGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_5 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_5 + dw SaffronGymBattleText6 ; TextBeforeBattle + dw SaffronGymAfterBattleText6 ; TextAfterBattle + dw SaffronGymEndBattleText6 ; TextEndBattle + dw SaffronGymEndBattleText6 ; TextEndBattle + +SaffronGymTrainerHeader6: + dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 + dw SaffronGymBattleText7 ; TextBeforeBattle + dw SaffronGymAfterBattleText7 ; TextAfterBattle + dw SaffronGymEndBattleText7 ; TextEndBattle + dw SaffronGymEndBattleText7 ; TextEndBattle + + db $ff + +SaffronGymText1: + TX_ASM + CheckEvent EVENT_BEAT_SABRINA + jr z, .asm_5d134 + CheckEventReuseA EVENT_GOT_TM46 + jr nz, .asm_5d12c + call z, SaffronGymText_5d068 + call DisableWaitingAfterTextDisplay + jr .asm_5d15f +.asm_5d12c + ld hl, SaffronGymText_5d16e + call PrintText + jr .asm_5d15f +.asm_5d134 + ld hl, SaffronGymText_5d162 + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, SaffronGymText_5d167 + ld de, SaffronGymText_5d167 + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $6 + ld [wGymLeaderNo], a + ld a, $3 + ld [wSaffronGymCurScript], a +.asm_5d15f + jp TextScriptEnd + +SaffronGymText_5d162: + TX_FAR _SaffronGymText_5d162 + db "@" + +SaffronGymText_5d167: + TX_FAR _SaffronGymText_5d167 + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK + db "@" + +SaffronGymText_5d16e: + TX_FAR _SaffronGymText_5d16e + db "@" + +SaffronGymText10: + TX_FAR _SaffronGymText_5d173 + db "@" + +SaffronGymText11: + TX_FAR ReceivedTM46Text + TX_SFX_ITEM_1 + TX_FAR _TM46ExplanationText + db "@" + +SaffronGymText12: + TX_FAR _TM46NoRoomText + db "@" + +SaffronGymText2: + TX_ASM + ld hl, SaffronGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText3: + TX_ASM + ld hl, SaffronGymTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText4: + TX_ASM + ld hl, SaffronGymTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText5: + TX_ASM + ld hl, SaffronGymTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText6: + TX_ASM + ld hl, SaffronGymTrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText7: + TX_ASM + ld hl, SaffronGymTrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText8: + TX_ASM + ld hl, SaffronGymTrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +SaffronGymText9: + TX_ASM + CheckEvent EVENT_BEAT_SABRINA + jr nz, .asm_5d1dd + ld hl, SaffronGymText_5d1e6 + call PrintText + jr .asm_5d1e3 +.asm_5d1dd + ld hl, SaffronGymText_5d1eb + call PrintText +.asm_5d1e3 + jp TextScriptEnd + +SaffronGymText_5d1e6: + TX_FAR _SaffronGymText_5d1e6 + db "@" + +SaffronGymText_5d1eb: + TX_FAR _SaffronGymText_5d1eb + db "@" + +SaffronGymBattleText1: + TX_FAR _SaffronGymBattleText1 + db "@" + +SaffronGymEndBattleText1: + TX_FAR _SaffronGymEndBattleText1 + db "@" + +SaffronGymAfterBattleText1: + TX_FAR _SaffronGymAfterBattleText1 + db "@" + +SaffronGymBattleText2: + TX_FAR _SaffronGymBattleText2 + db "@" + +SaffronGymEndBattleText2: + TX_FAR _SaffronGymEndBattleText2 + db "@" + +SaffronGymAfterBattleText2: + TX_FAR _SaffronGymAfterBattleText2 + db "@" + +SaffronGymBattleText3: + TX_FAR _SaffronGymBattleText3 + db "@" + +SaffronGymEndBattleText3: + TX_FAR _SaffronGymEndBattleText3 + db "@" + +SaffronGymAfterBattleText3: + TX_FAR _SaffronGymAfterBattleText3 + db "@" + +SaffronGymBattleText4: + TX_FAR _SaffronGymBattleText4 + db "@" + +SaffronGymEndBattleText4: + TX_FAR _SaffronGymEndBattleText4 + db "@" + +SaffronGymAfterBattleText4: + TX_FAR _SaffronGymAfterBattleText4 + db "@" + +SaffronGymBattleText5: + TX_FAR _SaffronGymBattleText5 + db "@" + +SaffronGymEndBattleText5: + TX_FAR _SaffronGymEndBattleText5 + db "@" + +SaffronGymAfterBattleText5: + TX_FAR _SaffronGymAfterBattleText5 + db "@" + +SaffronGymBattleText6: + TX_FAR _SaffronGymBattleText6 + db "@" + +SaffronGymEndBattleText6: + TX_FAR _SaffronGymEndBattleText6 + db "@" + +SaffronGymAfterBattleText6: + TX_FAR _SaffronGymAfterBattleText6 + db "@" + +SaffronGymBattleText7: + TX_FAR _SaffronGymBattleText7 + db "@" + +SaffronGymEndBattleText7: + TX_FAR _SaffronGymEndBattleText7 + db "@" + +SaffronGymAfterBattleText7: + TX_FAR _SaffronGymAfterBattleText7 + db "@" diff --git a/scripts/SaffronMart.asm b/scripts/SaffronMart.asm new file mode 100755 index 00000000..ebb3cddf --- /dev/null +++ b/scripts/SaffronMart.asm @@ -0,0 +1,15 @@ +SaffronMart_Script: + jp EnableAutoTextBoxDrawing + +SaffronMart_TextPointers: + dw SaffronCashierText + dw SaffronMartText2 + dw SaffronMartText3 + +SaffronMartText2: + TX_FAR _SaffronMartText2 + db "@" + +SaffronMartText3: + TX_FAR _SaffronMartText3 + db "@" diff --git a/scripts/SaffronPidgeyHouse.asm b/scripts/SaffronPidgeyHouse.asm new file mode 100755 index 00000000..f38fbfdb --- /dev/null +++ b/scripts/SaffronPidgeyHouse.asm @@ -0,0 +1,27 @@ +SaffronPidgeyHouse_Script: + jp EnableAutoTextBoxDrawing + +SaffronPidgeyHouse_TextPointers: + dw SaffronHouse1Text1 + dw SaffronHouse1Text2 + dw SaffronHouse1Text3 + dw SaffronHouse1Text4 + +SaffronHouse1Text1: + TX_FAR _SaffronHouse1Text1 + db "@" + +SaffronHouse1Text2: + TX_FAR _SaffronHouse1Text2 + TX_ASM + ld a, PIDGEY + call PlayCry + jp TextScriptEnd + +SaffronHouse1Text3: + TX_FAR _SaffronHouse1Text3 + db "@" + +SaffronHouse1Text4: + TX_FAR _SaffronHouse1Text4 + db "@" diff --git a/scripts/SaffronPokecenter.asm b/scripts/SaffronPokecenter.asm new file mode 100755 index 00000000..a1d73628 --- /dev/null +++ b/scripts/SaffronPokecenter.asm @@ -0,0 +1,23 @@ +SaffronPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +SaffronPokecenter_TextPointers: + dw SaffronHealNurseText + dw SaffronPokecenterText2 + dw SaffronPokecenterText3 + dw SaffronTradeNurseText + +SaffronHealNurseText: + TX_POKECENTER_NURSE + +SaffronPokecenterText2: + TX_FAR _SaffronPokecenterText2 + db "@" + +SaffronPokecenterText3: + TX_FAR _SaffronPokecenterText3 + db "@" + +SaffronTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm new file mode 100755 index 00000000..dc3b8599 --- /dev/null +++ b/scripts/SeafoamIslands1F.asm @@ -0,0 +1,47 @@ +SeafoamIslands1F_Script: + call EnableAutoTextBoxDrawing + SetEvent EVENT_IN_SEAFOAM_ISLANDS + ld hl, wFlags_0xcd60 + bit 7, [hl] + res 7, [hl] + jr z, .asm_4483b + ld hl, Seafoam1HolesCoords + call CheckBoulderCoords + ret nc + EventFlagAddress hl, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_44819 + SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 + ld [wObjectToShow], a + jr .asm_44825 +.asm_44819 + SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 + ld [wObjectToShow], a +.asm_44825 + ld a, [wObjectToHide] + ld [wMissableObjectIndex], a + predef HideObject + ld a, [wObjectToShow] + ld [wMissableObjectIndex], a + predef_jump ShowObject +.asm_4483b + ld a, $9f + ld [wDungeonWarpDestinationMap], a + ld hl, Seafoam1HolesCoords + jp IsPlayerOnDungeonWarp + +Seafoam1HolesCoords: + db $06,$11 + db $06,$18 + db $ff + +SeafoamIslands1F_TextPointers: + dw BoulderText + dw BoulderText diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..876c0837 --- /dev/null +++ b/scripts/SeafoamIslandsB1F.asm @@ -0,0 +1,46 @@ +SeafoamIslandsB1F_Script: + call EnableAutoTextBoxDrawing + ld hl, wFlags_0xcd60 + bit 7, [hl] + res 7, [hl] + jr z, .asm_46362 + ld hl, Seafoam2HolesCoords + call CheckBoulderCoords + ret nc + EventFlagAddress hl, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_46340 + SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 + ld [wObjectToShow], a + jr .asm_4634c +.asm_46340 + SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 + ld [wObjectToShow], a +.asm_4634c + ld a, [wObjectToHide] + ld [wMissableObjectIndex], a + predef HideObject + ld a, [wObjectToShow] + ld [wMissableObjectIndex], a + predef_jump ShowObject +.asm_46362 + ld a, $a0 + ld [wDungeonWarpDestinationMap], a + ld hl, Seafoam2HolesCoords + jp IsPlayerOnDungeonWarp + +Seafoam2HolesCoords: + db $06,$12 + db $06,$17 + db $ff + +SeafoamIslandsB1F_TextPointers: + dw BoulderText + dw BoulderText diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..c0141a3e --- /dev/null +++ b/scripts/SeafoamIslandsB2F.asm @@ -0,0 +1,46 @@ +SeafoamIslandsB2F_Script: + call EnableAutoTextBoxDrawing + ld hl, wFlags_0xcd60 + bit 7, [hl] + res 7, [hl] + jr z, .asm_4649e + ld hl, Seafoam3HolesCoords + call CheckBoulderCoords + ret nc + EventFlagAddress hl, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_4647c + SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 + ld [wObjectToShow], a + jr .asm_46488 +.asm_4647c + SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 + ld [wObjectToShow], a +.asm_46488 + ld a, [wObjectToHide] + ld [wMissableObjectIndex], a + predef HideObject + ld a, [wObjectToShow] + ld [wMissableObjectIndex], a + predef_jump ShowObject +.asm_4649e + ld a, $a1 + ld [wDungeonWarpDestinationMap], a + ld hl, Seafoam3HolesCoords + jp IsPlayerOnDungeonWarp + +Seafoam3HolesCoords: + db $06,$13 + db $06,$16 + db $ff + +SeafoamIslandsB2F_TextPointers: + dw BoulderText + dw BoulderText diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..7343b17d --- /dev/null +++ b/scripts/SeafoamIslandsB3F.asm @@ -0,0 +1,149 @@ +SeafoamIslandsB3F_Script: + call EnableAutoTextBoxDrawing + ld hl, wFlags_0xcd60 + bit 7, [hl] + res 7, [hl] + jr z, .asm_465dc + ld hl, Seafoam4HolesCoords + call CheckBoulderCoords + ret nc + EventFlagAddress hl, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_465b8 + SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 + ld [wObjectToShow], a + jr .asm_465c4 +.asm_465b8 + SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 + ld [wObjectToHide], a + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 + ld [wObjectToShow], a +.asm_465c4 + ld a, [wObjectToHide] + ld [wMissableObjectIndex], a + predef HideObject + ld a, [wObjectToShow] + ld [wMissableObjectIndex], a + predef ShowObject + jr .asm_465ed +.asm_465dc + ld a, $a2 + ld [wDungeonWarpDestinationMap], a + ld hl, Seafoam4HolesCoords + call IsPlayerOnDungeonWarp + ld a, [wd732] + bit 4, a + ret nz +.asm_465ed + ld hl, SeafoamIslandsB3F_ScriptPointers + ld a, [wSeafoamIslandsB3FCurScript] + jp CallFunctionInTable + +Seafoam4HolesCoords: + db $10,$03 + db $10,$06 + db $ff + +SeafoamIslandsB3F_ScriptPointers: + dw SeafoamIslands4Script0 + dw SeafoamIslands4Script1 + dw SeafoamIslands4Script2 + dw SeafoamIslands4Script3 + +SeafoamIslands4Script0: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE + ret z + ld a, [wYCoord] + cp $8 + ret nz + ld a, [wXCoord] + cp $f + ret nz + ld hl, wSimulatedJoypadStatesEnd + ld de, RLEMovement46632 + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld hl, wFlags_D733 + set 2, [hl] + ld a, $1 + ld [wSeafoamIslandsB3FCurScript], a + ret + +RLEMovement46632: + db D_DOWN,6 + db D_RIGHT,5 + db D_DOWN,3 + db $ff + +SeafoamIslands4Script1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld a, $0 + ld [wSeafoamIslandsB3FCurScript], a + ret + +SeafoamIslands4Script2: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE + ret z + ld a, [wXCoord] + cp $12 + jr z, .asm_4665e + cp $13 + ld a, $0 + jr nz, .asm_4667b + ld de, RLEData_4667f + jr .asm_46661 +.asm_4665e + ld de, RLEData_46688 +.asm_46661 + ld hl, wSimulatedJoypadStatesEnd + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + xor a + ld [wSpriteStateData2 + $06], a + ld hl, wd730 + set 7, [hl] + ld hl, wFlags_D733 + set 2, [hl] + ld a, $3 +.asm_4667b + ld [wSeafoamIslandsB3FCurScript], a + ret + +RLEData_4667f: + db D_DOWN,$06 + db D_RIGHT,$02 + db D_DOWN,$04 + db D_LEFT,$01 + db $FF + +RLEData_46688: + db D_DOWN,$06 + db D_RIGHT,$02 + db D_DOWN,$04 + db $FF + +SeafoamIslands4Script3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld a, $0 + ld [wSeafoamIslandsB3FCurScript], a + ret + +SeafoamIslandsB3F_TextPointers: + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..d08628d0 --- /dev/null +++ b/scripts/SeafoamIslandsB4F.asm @@ -0,0 +1,173 @@ +SeafoamIslandsB4F_Script: + call EnableAutoTextBoxDrawing + ld a, [wSeafoamIslandsB4FCurScript] + ld hl, SeafoamIslandsB4F_ScriptPointers + jp CallFunctionInTable + +SeafoamIslands5Script_467a5: + xor a + ld [wSeafoamIslandsB4FCurScript], a + ld [wJoyIgnore], a + ret + +SeafoamIslandsB4F_ScriptPointers: + dw SeafoamIslands5Script0 + dw SeafoamIslands5Script1 + dw SeafoamIslands5Script2 + dw SeafoamIslands5Script3 + dw SeafoamIslands5Script4 + +SeafoamIslands5Script4: + ld a, [wIsInBattle] + cp $ff + jr z, SeafoamIslands5Script_467a5 + call EndTrainerBattle + ld a, $0 + ld [wSeafoamIslandsB4FCurScript], a + ret + +SeafoamIslands5Script0: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE + ret z + ld hl, .Coords + call ArePlayerCoordsInArray + ret nc + ld a, [wCoordIndex] + cp $3 + jr nc, .asm_467e6 + ld a, NPC_MOVEMENT_UP + ld [wSimulatedJoypadStatesEnd + 1], a + ld a, 2 + jr .asm_467e8 +.asm_467e6 + ld a, 1 +.asm_467e8 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + ld hl, wFlags_D733 + res 2, [hl] + ld a, $1 + ld [wSeafoamIslandsB4FCurScript], a + ret + +.Coords + db $11,$14 + db $11,$15 + db $10,$14 + db $10,$15 + db $FF + +SeafoamIslands5Script1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + xor a + ld [wJoyIgnore], a + ld a, $0 + ld [wSeafoamIslandsB4FCurScript], a + ret + +SeafoamIslands5Script2: + CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE + ld a, $0 + jr z, .asm_46849 + ld hl, .Coords + call ArePlayerCoordsInArray + ld a, $0 + jr nc, .asm_46849 + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_46837 + ld de, RLEMovementData_46859 + jr .asm_4683a +.asm_46837 + ld de, RLEMovementData_46852 +.asm_4683a + ld hl, wSimulatedJoypadStatesEnd + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 +.asm_46849 + ld [wSeafoamIslandsB4FCurScript], a + ret + +.Coords + db $0E,$04 + db $0E,$05 + db $FF + +RLEMovementData_46852: + db D_UP,$03 + db D_RIGHT,$02 + db D_UP,$01 + db $FF + +RLEMovementData_46859: + db D_UP,$03 + db D_RIGHT,$03 + db D_UP,$01 + db $FF + +SeafoamIslands5Script3: + ld a, [wSimulatedJoypadStatesIndex] + ld b, a + cp $1 + call z, SeaFoamIslands5Script_46872 + ld a, b + and a + ret nz + ld a, $0 + ld [wSeafoamIslandsB4FCurScript], a + ret + +SeaFoamIslands5Script_46872: + xor a + ld [wWalkBikeSurfState], a + ld [wWalkBikeSurfStateCopy], a + jp ForceBikeOrSurf + +SeafoamIslandsB4F_TextPointers: + dw BoulderText + dw BoulderText + dw ArticunoText + dw SeafoamIslands5Text4 + dw SeafoamIslands5Text5 + +ArticunoTrainerHeader: + dbEventFlagBit EVENT_BEAT_ARTICUNO + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_ARTICUNO + dw ArticunoBattleText ; TextBeforeBattle + dw ArticunoBattleText ; TextAfterBattle + dw ArticunoBattleText ; TextEndBattle + dw ArticunoBattleText ; TextEndBattle + + db $ff + +ArticunoText: + TX_ASM + ld hl, ArticunoTrainerHeader + call TalkToTrainer + ld a, $4 + ld [wSeafoamIslandsB4FCurScript], a + jp TextScriptEnd + +ArticunoBattleText: + TX_FAR _ArticunoBattleText + TX_ASM + ld a, ARTICUNO + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +SeafoamIslands5Text4: + TX_FAR _SeafoamIslands5Text4 + db "@" + +SeafoamIslands5Text5: + TX_FAR _SeafoamIslands5Text5 + db "@" diff --git a/scripts/SilphCo10F.asm b/scripts/SilphCo10F.asm new file mode 100755 index 00000000..40506682 --- /dev/null +++ b/scripts/SilphCo10F.asm @@ -0,0 +1,122 @@ +SilphCo10F_Script: + call SilphCo10Script_5a14f + call EnableAutoTextBoxDrawing + ld hl, SilphCo10TrainerHeader0 + ld de, SilphCo10F_ScriptPointers + ld a, [wSilphCo10FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo10FCurScript], a + ret + +SilphCo10Script_5a14f: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo10GateCoords + call SilphCo2Script_59d43 + call SilphCo10Text_5a176 + CheckEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR + ret nz + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 4, 5 + predef_jump ReplaceTileBlock + +SilphCo10GateCoords: + db $04,$05 + db $FF + +SilphCo10Text_5a176: + ld a, [$ffe0] + and a + ret z + SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR + ret + +SilphCo10F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo10F_TextPointers: + dw SilphCo10Text1 + dw SilphCo10Text2 + dw SilphCo10Text3 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +SilphCo10TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_0 + dw SilphCo10BattleText1 ; TextBeforeBattle + dw SilphCo10AfterBattleText1 ; TextAfterBattle + dw SilphCo10EndBattleText1 ; TextEndBattle + dw SilphCo10EndBattleText1 ; TextEndBattle + +SilphCo10TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_1 + dw SilphCo10BattleText2 ; TextBeforeBattle + dw SilphCo10AfterBattleText2 ; TextAfterBattle + dw SilphCo10EndBattleText2 ; TextEndBattle + dw SilphCo10EndBattleText2 ; TextEndBattle + + db $ff + +SilphCo10Text1: + TX_ASM + ld hl, SilphCo10TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo10Text2: + TX_ASM + ld hl, SilphCo10TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo10Text3: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + ld hl, SilphCo10Text_5a1d8 + jr nz, .asm_cf85f + ld hl, SilphCo10Text_5a1d3 +.asm_cf85f + call PrintText + jp TextScriptEnd + +SilphCo10Text_5a1d3: + TX_FAR _SilphCo10Text_5a1d3 + db "@" + +SilphCo10Text_5a1d8: + TX_FAR _SilphCo10Text_5a1d8 + db "@" + +SilphCo10BattleText1: + TX_FAR _SilphCo10BattleText1 + db "@" + +SilphCo10EndBattleText1: + TX_FAR _SilphCo10EndBattleText1 + db "@" + +SilphCo10AfterBattleText1: + TX_FAR _SilphCo10AfterBattleText1 + db "@" + +SilphCo10BattleText2: + TX_FAR _SilphCo10BattleText2 + db "@" + +SilphCo10EndBattleText2: + TX_FAR _SilphCo10EndBattleText2 + db "@" + +SilphCo10AfterBattleText2: + TX_FAR _SilphCo10AfterBattleText2 + db "@" diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm new file mode 100755 index 00000000..483082a1 --- /dev/null +++ b/scripts/SilphCo11F.asm @@ -0,0 +1,405 @@ +SilphCo11F_Script: + call SilphCo11Script_62110 + call EnableAutoTextBoxDrawing + ld hl, SilphCo11TrainerHeader0 + ld de, SilphCo11F_ScriptPointers + ld a, [wSilphCo11FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo11FCurScript], a + ret + +SilphCo11Script_62110: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo11GateCoords + call SilphCo11Script_62137 + call SilphCo11Script_62163 + CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR + ret nz + ld a, $20 + ld [wNewTileBlockID], a + lb bc, 6, 3 + predef_jump ReplaceTileBlock + +SilphCo11GateCoords: + db $06,$03 + db $FF + +SilphCo11Script_62137: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ld [$ffe0], a + pop hl +.asm_62143 + ld a, [hli] + cp $ff + jr z, .asm_6215f + push hl + ld hl, $ffe0 + inc [hl] + pop hl + cp b + jr z, .asm_62154 + inc hl + jr .asm_62143 +.asm_62154 + ld a, [hli] + cp c + jr nz, .asm_62143 + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_6215f + xor a + ld [$ffe0], a + ret + +SilphCo11Script_62163: + ld a, [$ffe0] + and a + ret z + SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR + ret + +SilphCo11Script_6216d: + ld hl, MissableObjectIDs_6219b +.asm_62170 + ld a, [hli] + cp $ff + jr z, .asm_62181 + push hl + ld [wMissableObjectIndex], a + predef HideObject + pop hl + jr .asm_62170 +.asm_62181 + ld hl, MissableObjectIDs_62194 +.asm_62184 + ld a, [hli] + cp $ff + ret z + push hl + ld [wMissableObjectIndex], a + predef ShowObject + pop hl + jr .asm_62184 + +MissableObjectIDs_62194: + db HS_SAFFRON_CITY_8 + db HS_SAFFRON_CITY_9 + db HS_SAFFRON_CITY_A + db HS_SAFFRON_CITY_B + db HS_SAFFRON_CITY_C + db HS_SAFFRON_CITY_D + db $FF + +MissableObjectIDs_6219b: + db HS_SAFFRON_CITY_1 + db HS_SAFFRON_CITY_2 + db HS_SAFFRON_CITY_3 + db HS_SAFFRON_CITY_4 + db HS_SAFFRON_CITY_5 + db HS_SAFFRON_CITY_6 + db HS_SAFFRON_CITY_7 + db HS_SAFFRON_CITY_E + db HS_SAFFRON_CITY_F + db HS_SILPH_CO_2F_2 + db HS_SILPH_CO_2F_3 + db HS_SILPH_CO_2F_4 + db HS_SILPH_CO_2F_5 + db HS_SILPH_CO_3F_1 + db HS_SILPH_CO_3F_2 + db HS_SILPH_CO_4F_1 + db HS_SILPH_CO_4F_2 + db HS_SILPH_CO_4F_3 + db HS_SILPH_CO_5F_1 + db HS_SILPH_CO_5F_2 + db HS_SILPH_CO_5F_3 + db HS_SILPH_CO_5F_4 + db HS_SILPH_CO_6F_1 + db HS_SILPH_CO_6F_2 + db HS_SILPH_CO_6F_3 + db HS_SILPH_CO_7F_1 + db HS_SILPH_CO_7F_2 + db HS_SILPH_CO_7F_3 + db HS_SILPH_CO_7F_4 + db HS_SILPH_CO_8F_1 + db HS_SILPH_CO_8F_2 + db HS_SILPH_CO_8F_3 + db HS_SILPH_CO_9F_1 + db HS_SILPH_CO_9F_2 + db HS_SILPH_CO_9F_3 + db HS_SILPH_CO_10F_1 + db HS_SILPH_CO_10F_2 + db HS_SILPH_CO_11F_1 + db HS_SILPH_CO_11F_2 + db HS_SILPH_CO_11F_3 + db $FF + +SilphCo11Script_621c4: + xor a + ld [wJoyIgnore], a + +SilphCo11Script_621c8: + ld [wSilphCo11FCurScript], a + ld [wCurMapScript], a + ret + +SilphCo11F_ScriptPointers: + dw SilphCo11Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw SilphCo11Script3 + dw SilphCo11Script4 + dw SilphCo11Script5 + +SilphCo11Script0: + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + ret nz + ld hl, CoordsData_62211 + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + ld a, [wCoordIndex] + ld [wcf0d], a + xor a + ld [hJoyHeld], a + ld a, $f0 + ld [wJoyIgnore], a + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $3 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld de, MovementData_62216 + call MoveSprite + ld a, $3 + jp SilphCo11Script_621c8 + +CoordsData_62211: + db $0D,$06 + db $0C,$07 + db $FF + +MovementData_62216: + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db NPC_MOVEMENT_DOWN + db $FF + +SilphCo11Script_6221a: + ld [wPlayerMovingDirection], a + ld a, $3 + ld [H_SPRITEINDEX], a + ld a, b + ld [hSpriteFacingDirection], a + jp SetSpriteFacingDirectionAndDelay + +SilphCo11Script5: + ld a, [wIsInBattle] + cp $ff + jp z, SilphCo11Script_621c4 + ld a, [wcf0d] + cp $1 + jr z, .asm_6223c + ld a, PLAYER_DIR_LEFT + ld b, SPRITE_FACING_RIGHT + jr .asm_62240 +.asm_6223c + ld a, PLAYER_DIR_UP + ld b, SPRITE_FACING_DOWN +.asm_62240 + call SilphCo11Script_6221a + ld a, $f0 + ld [wJoyIgnore], a + ld a, $6 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call GBFadeOutToBlack + call SilphCo11Script_6216d + call UpdateSprites + call Delay3 + call GBFadeInFromBlack + SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI + xor a + ld [wJoyIgnore], a + jp SilphCo11Script_621c8 + +SilphCo11Script3: + ld a, [wd730] + bit 0, a + ret nz + ld a, $3 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld a, [wcf0d] + cp $1 + jr z, .asm_62284 + ld a, PLAYER_DIR_LEFT + ld b, SPRITE_FACING_RIGHT + jr .asm_62288 +.asm_62284 + ld a, PLAYER_DIR_UP + ld b, SPRITE_FACING_DOWN +.asm_62288 + call SilphCo11Script_6221a + call Delay3 + ld a, $4 + jp SilphCo11Script_621c8 + +SilphCo11Script4: + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, SilphCo10Text_62330 + ld de, SilphCo10Text_62330 + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + xor a + ld [wJoyIgnore], a + ld a, $5 + jp SilphCo11Script_621c8 + +SilphCo11F_TextPointers: + dw SilphCo11Text1 + dw SilphCo11Text2 + dw SilphCo11Text3 + dw SilphCo11Text4 + dw SilphCo11Text5 + dw SilphCo11Text6 + +SilphCo11TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0 + dw SilphCo11BattleText1 ; TextBeforeBattle + dw SilphCo11AfterBattleText1 ; TextAfterBattle + dw SilphCo11EndBattleText1 ; TextEndBattle + dw SilphCo11EndBattleText1 ; TextEndBattle + +SilphCo11TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1 + dw SilphCo11BattleText2 ; TextBeforeBattle + dw SilphCo11AfterBattleText2 ; TextAfterBattle + dw SilphCo11EndBattleText2 ; TextEndBattle + dw SilphCo11EndBattleText2 ; TextEndBattle + + db $ff + +SilphCo11Text1: + TX_ASM + CheckEvent EVENT_GOT_MASTER_BALL + jp nz, .asm_62308 + ld hl, SilphCoPresidentText + call PrintText + lb bc, MASTER_BALL, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedSilphCoMasterBallText + call PrintText + SetEvent EVENT_GOT_MASTER_BALL + jr .asm_6230e +.BagFull + ld hl, SilphCoMasterBallNoRoomText + call PrintText + jr .asm_6230e +.asm_62308 + ld hl, SilphCo10Text_6231c + call PrintText +.asm_6230e + jp TextScriptEnd + +SilphCoPresidentText: + TX_FAR _SilphCoPresidentText + db "@" + +ReceivedSilphCoMasterBallText: + TX_FAR _ReceivedSilphCoMasterBallText + TX_SFX_KEY_ITEM + db "@" + +SilphCo10Text_6231c: + TX_FAR _SilphCo10Text_6231c + db "@" + +SilphCoMasterBallNoRoomText: + TX_FAR _SilphCoMasterBallNoRoomText + db "@" + +SilphCo11Text2: + TX_FAR _SilphCo11Text2 + db "@" + +SilphCo11Text3: + TX_FAR _SilphCo11Text3 + db "@" + +SilphCo10Text_62330: + TX_FAR _SilphCo10Text_62330 + db "@" + +SilphCo11Text6: + TX_FAR _SilphCo10Text_62335 + db "@" + +SilphCo11Text4: + TX_ASM + ld hl, SilphCo11TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo11BattleText1: + TX_FAR _SilphCo11BattleText1 + db "@" + +SilphCo11EndBattleText1: + TX_FAR _SilphCo11EndBattleText1 + db "@" + +SilphCo11AfterBattleText1: + TX_FAR _SilphCo11AfterBattleText1 + db "@" + +SilphCo11Text5: + TX_ASM + ld hl, SilphCo11TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo11BattleText2: + TX_FAR _SilphCo11BattleText2 + db "@" + +SilphCo11EndBattleText2: + TX_FAR _SilphCo11EndBattleText2 + db "@" + +SilphCo11AfterBattleText2: + TX_FAR _SilphCo11AfterBattleText2 + db "@" + +SilphCo10Text_6236c: + TX_ASM + ld hl, SilphCo10Text_6237b + call PrintText + ld a, PORYGON + call DisplayPokedex + jp TextScriptEnd + +SilphCo10Text_6237b: + TX_FAR _SilphCo10Text_6237b + db "@" diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm new file mode 100755 index 00000000..6ccaa29c --- /dev/null +++ b/scripts/SilphCo1F.asm @@ -0,0 +1,16 @@ +SilphCo1F_Script: + call EnableAutoTextBoxDrawing + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + ret z + CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK + ret nz + ld a, HS_SILPH_CO_1F_RECEPTIONIST + ld [wMissableObjectIndex], a + predef_jump ShowObject + +SilphCo1F_TextPointers: + dw SilphCo1Text1 + +SilphCo1Text1: + TX_FAR _SilphCo1Text1 + db "@" diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm new file mode 100755 index 00000000..5fd542cb --- /dev/null +++ b/scripts/SilphCo2F.asm @@ -0,0 +1,245 @@ +SilphCo2F_Script: + call SilphCo2Script_59d07 + call EnableAutoTextBoxDrawing + ld hl, SilphCo2TrainerHeader0 + ld de, SilphCo2F_ScriptPointers + ld a, [wSilphCo2FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo2FCurScript], a + ret + +SilphCo2Script_59d07: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo2GateCoords + call SilphCo2Script_59d43 + call SilphCo2Script_59d6f + CheckEvent EVENT_SILPH_CO_2_UNLOCKED_DOOR1 + jr nz, .asm_59d2e + push af + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 2, 2 + predef ReplaceTileBlock + pop af +.asm_59d2e + CheckEventAfterBranchReuseA EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 + ret nz + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 5, 2 + predef_jump ReplaceTileBlock + +SilphCo2GateCoords: + db $02,$02 + db $05,$02 + db $FF + +SilphCo2Script_59d43: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ld [$ffe0], a + pop hl +.asm_59d4f + ld a, [hli] + cp $ff + jr z, .asm_59d6b + push hl + ld hl, $ffe0 + inc [hl] + pop hl + cp b + jr z, .asm_59d60 + inc hl + jr .asm_59d4f +.asm_59d60 + ld a, [hli] + cp c + jr nz, .asm_59d4f + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_59d6b + xor a + ld [$ffe0], a + ret + +SilphCo2Script_59d6f: + EventFlagAddress hl, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 + ld a, [$ffe0] + and a + ret z + cp $1 + jr nz, .next + SetEventReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR1 + ret +.next + SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 + ret + +SilphCo2F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo2F_TextPointers: + dw SilphCo2Text1 + dw SilphCo2Text2 + dw SilphCo2Text3 + dw SilphCo2Text4 + dw SilphCo2Text5 + +SilphCo2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_0 + dw SilphCo2BattleText1 ; TextBeforeBattle + dw SilphCo2AfterBattleText1 ; TextAfterBattle + dw SilphCo2EndBattleText1 ; TextEndBattle + dw SilphCo2EndBattleText1 ; TextEndBattle + +SilphCo2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_1 + dw SilphCo2BattleText2 ; TextBeforeBattle + dw SilphCo2AfterBattleText2 ; TextAfterBattle + dw SilphCo2EndBattleText2 ; TextEndBattle + dw SilphCo2EndBattleText2 ; TextEndBattle + +SilphCo2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_2 + dw SilphCo2BattleText3 ; TextBeforeBattle + dw SilphCo2AfterBattleText3 ; TextAfterBattle + dw SilphCo2EndBattleText3 ; TextEndBattle + dw SilphCo2EndBattleText3 ; TextEndBattle + +SilphCo2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_3 + dw SilphCo2BattleText4 ; TextBeforeBattle + dw SilphCo2AfterBattleText4 ; TextAfterBattle + dw SilphCo2EndBattleText4 ; TextEndBattle + dw SilphCo2EndBattleText4 ; TextEndBattle + + db $ff + +SilphCo2Text1: + TX_ASM + CheckEvent EVENT_GOT_TM36 + jr nz, .asm_59de4 + ld hl, SilphCo2Text_59ded + call PrintText + lb bc, TM_36, 1 + call GiveItem + ld hl, TM36NoRoomText + jr nc, .asm_59de7 + SetEvent EVENT_GOT_TM36 + ld hl, ReceivedTM36Text + jr .asm_59de7 +.asm_59de4 + ld hl, TM36ExplanationText +.asm_59de7 + call PrintText + jp TextScriptEnd + +SilphCo2Text_59ded: + TX_FAR _SilphCo2Text_59ded + db "@" + +ReceivedTM36Text: + TX_FAR _ReceivedTM36Text + TX_SFX_ITEM_1 + db "@" + +TM36ExplanationText: + TX_FAR _TM36ExplanationText + db "@" + +TM36NoRoomText: + TX_FAR _TM36NoRoomText + db "@" + +SilphCo2Text2: + TX_ASM + ld hl, SilphCo2TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo2Text3: + TX_ASM + ld hl, SilphCo2TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo2Text4: + TX_ASM + ld hl, SilphCo2TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo2Text5: + TX_ASM + ld hl, SilphCo2TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SilphCo2BattleText1: + TX_FAR _SilphCo2BattleText1 + db "@" + +SilphCo2EndBattleText1: + TX_FAR _SilphCo2EndBattleText1 + db "@" + +SilphCo2AfterBattleText1: + TX_FAR _SilphCo2AfterBattleText1 + db "@" + +SilphCo2BattleText2: + TX_FAR _SilphCo2BattleText2 + db "@" + +SilphCo2EndBattleText2: + TX_FAR _SilphCo2EndBattleText2 + db "@" + +SilphCo2AfterBattleText2: + TX_FAR _SilphCo2AfterBattleText2 + db "@" + +SilphCo2BattleText3: + TX_FAR _SilphCo2BattleText3 + db "@" + +SilphCo2EndBattleText3: + TX_FAR _SilphCo2EndBattleText3 + db "@" + +SilphCo2AfterBattleText3: + TX_FAR _SilphCo2AfterBattleText3 + db "@" + +SilphCo2BattleText4: + TX_FAR _SilphCo2BattleText4 + db "@" + +SilphCo2EndBattleText4: + TX_FAR _SilphCo2EndBattleText4 + db "@" + +SilphCo2AfterBattleText4: + TX_FAR _SilphCo2AfterBattleText4 + db "@" diff --git a/scripts/SilphCo3F.asm b/scripts/SilphCo3F.asm new file mode 100755 index 00000000..42b5d611 --- /dev/null +++ b/scripts/SilphCo3F.asm @@ -0,0 +1,136 @@ +SilphCo3F_Script: + call SilphCo3Script_59f71 + call EnableAutoTextBoxDrawing + ld hl, SilphCo3TrainerHeader0 + ld de, SilphCo3F_ScriptPointers + ld a, [wSilphCo3FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo3FCurScript], a + ret + +SilphCo3Script_59f71: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo3GateCoords + call SilphCo2Script_59d43 + call SilphCo3Script_59fad + CheckEvent EVENT_SILPH_CO_3_UNLOCKED_DOOR1 + jr nz, .asm_59f98 + push af + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 4, 4 + predef ReplaceTileBlock + pop af +.asm_59f98 + CheckEventAfterBranchReuseA EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 + ret nz + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 4, 8 + predef_jump ReplaceTileBlock + +SilphCo3GateCoords: + db $04,$04 + db $04,$08 + db $FF + +SilphCo3Script_59fad: + EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 + ld a, [$ffe0] + and a + ret z + cp $1 + jr nz, .next + SetEventReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR1 + ret +.next + SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 + ret + +SilphCo3F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo3F_TextPointers: + dw SilphCo3Text1 + dw SilphCo3Text2 + dw SilphCo3Text3 + dw PickUpItemText + +SilphCo3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0 + dw SilphCo3BattleText1 ; TextBeforeBattle + dw SilphCo3AfterBattleText1 ; TextAfterBattle + dw SilphCo3EndBattleText1 ; TextEndBattle + dw SilphCo3EndBattleText1 ; TextEndBattle + +SilphCo3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1 + dw SilphCo3BattleText2 ; TextBeforeBattle + dw SilphCo3AfterBattleText2 ; TextAfterBattle + dw SilphCo3EndBattleText2 ; TextEndBattle + dw SilphCo3EndBattleText2 ; TextEndBattle + + db $ff + +SilphCo3Text1: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + ld hl, SilphCo3Text_59ffe + jr nz, .asm_59fee + ld hl, SilphCo3Text_59ff9 +.asm_59fee + call PrintText + jp TextScriptEnd + +SilphCo3Text_59ff9: + TX_FAR _SilphCo3Text_59ff9 + db "@" + +SilphCo3Text_59ffe: + TX_FAR _SilphCo3Text_59ffe + db "@" + +SilphCo3Text2: + TX_ASM + ld hl, SilphCo3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo3BattleText1: + TX_FAR _SilphCo3BattleText1 + db "@" + +SilphCo3EndBattleText1: + TX_FAR _SilphCo3EndBattleText1 + db "@" + +SilphCo3AfterBattleText1: + TX_FAR _SilphCo3AfterBattleText1 + db "@" + +SilphCo3Text3: + TX_ASM + ld hl, SilphCo3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo3BattleText2: + TX_FAR _SilphCo3BattleText2 + db "@" + +SilphCo3EndBattleText2: + TX_FAR _SilphCo3EndBattleText2 + db "@" + +SilphCo3AfterBattleText2: + TX_FAR _SilphCo3AfterBattleText2 + db "@" diff --git a/scripts/SilphCo4F.asm b/scripts/SilphCo4F.asm new file mode 100755 index 00000000..7d5072f6 --- /dev/null +++ b/scripts/SilphCo4F.asm @@ -0,0 +1,199 @@ +SilphCo4F_Script: + call SilphCo4Script_19d21 + call EnableAutoTextBoxDrawing + ld hl, SilphCo4TrainerHeader0 + ld de, SilphCo4F_ScriptPointers + ld a, [wSilphCo4FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo4FCurScript], a + ret + +SilphCo4Script_19d21: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo4GateCoords + call SilphCo4Script_19d5d + call SilphCo4Script_19d89 + CheckEvent EVENT_SILPH_CO_4_UNLOCKED_DOOR1 + jr nz, .asm_19d48 + push af + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 6, 2 + predef ReplaceTileBlock + pop af +.asm_19d48 + CheckEventAfterBranchReuseA EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 + ret nz + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 4, 6 + predef_jump ReplaceTileBlock + +SilphCo4GateCoords: + db $06,$02 + db $04,$06 + db $FF + +SilphCo4Script_19d5d: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ld [$ffe0], a + pop hl +.asm_19d69 + ld a, [hli] + cp $ff + jr z, .asm_19d85 + push hl + ld hl, $ffe0 + inc [hl] + pop hl + cp b + jr z, .asm_19d7a + inc hl + jr .asm_19d69 +.asm_19d7a + ld a, [hli] + cp c + jr nz, .asm_19d69 + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_19d85 + xor a + ld [$ffe0], a + ret + +SilphCo4Script_19d89: + EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 + ld a, [$ffe0] + and a + ret z + cp $1 + jr nz, .next + SetEventReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR1 + ret +.next + SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 + ret + +SilphCo4F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo4F_TextPointers: + dw SilphCo4Text1 + dw SilphCo4Text2 + dw SilphCo4Text3 + dw SilphCo4Text4 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +SilphCo4TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_0 + dw SilphCo4BattleText2 ; TextBeforeBattle + dw SilphCo4AfterBattleText2 ; TextAfterBattle + dw SilphCo4EndBattleText2 ; TextEndBattle + dw SilphCo4EndBattleText2 ; TextEndBattle + +SilphCo4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1 + dw SilphCo4BattleText3 ; TextBeforeBattle + dw SilphCo4AfterBattleText3 ; TextAfterBattle + dw SilphCo4EndBattleText3 ; TextEndBattle + dw SilphCo4EndBattleText3 ; TextEndBattle + +SilphCo4TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 + dw SilphCo4BattleText4 ; TextBeforeBattle + dw SilphCo4AfterBattleText4 ; TextAfterBattle + dw SilphCo4EndBattleText4 ; TextEndBattle + dw SilphCo4EndBattleText4 ; TextEndBattle + + db $ff + +SilphCo4Text1: + TX_ASM + ld hl, SilphCo4Text_19de0 + ld de, SilphCo4Text_19de5 + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo4Text_19de0: + TX_FAR _SilphCo4Text_19de0 + db "@" + +SilphCo4Text_19de5: + TX_FAR _SilphCo4Text_19de5 + db "@" + +SilphCo4Text2: + TX_ASM + ld hl, SilphCo4TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo4BattleText2: + TX_FAR _SilphCo4BattleText2 + db "@" + +SilphCo4EndBattleText2: + TX_FAR _SilphCo4EndBattleText2 + db "@" + +SilphCo4AfterBattleText2: + TX_FAR _SilphCo4AfterBattleText2 + db "@" + +SilphCo4Text3: + TX_ASM + ld hl, SilphCo4TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo4BattleText3: + TX_FAR _SilphCo4BattleText3 + db "@" + +SilphCo4EndBattleText3: + TX_FAR _SilphCo4EndBattleText3 + db "@" + +SilphCo4AfterBattleText3: + TX_FAR _SilphCo4AfterBattleText3 + db "@" + +SilphCo4Text4: + TX_ASM + ld hl, SilphCo4TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo4BattleText4: + TX_FAR _SilphCo4BattleText4 + db "@" + +SilphCo4EndBattleText4: + TX_FAR _SilphCo4EndBattleText4 + db "@" + +SilphCo4AfterBattleText4: + TX_FAR _SilphCo4AfterBattleText4 + db "@" diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm new file mode 100755 index 00000000..d9deda5b --- /dev/null +++ b/scripts/SilphCo5F.asm @@ -0,0 +1,221 @@ +SilphCo5F_Script: + call SilphCo5Script_19f4d + call EnableAutoTextBoxDrawing + ld hl, SilphCo5TrainerHeader0 + ld de, SilphCo5F_ScriptPointers + ld a, [wSilphCo5FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo5FCurScript], a + ret + +SilphCo5Script_19f4d: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo5GateCoords + call SilphCo4Script_19d5d + call SilphCo5Script_19f9e + CheckEvent EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + jr nz, .asm_19f74 + push af + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 2, 3 + predef ReplaceTileBlock + pop af +.asm_19f74 + CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + jr nz, .asm_19f87 + push af + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 6, 3 + predef ReplaceTileBlock + pop af +.asm_19f87 + CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR2 + ret nz + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 5, 7 + predef_jump ReplaceTileBlock + +SilphCo5GateCoords: + db $02,$03 + db $06,$03 + db $05,$07 + db $FF + +SilphCo5Script_19f9e: + EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + ld a, [$ffe0] + and a + ret z + cp $1 + jr nz, .next1 + SetEventReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + ret +.next1 + cp $2 + jr nz, .next2 + SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + ret +.next2 + SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + ret + +SilphCo5F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo5F_TextPointers: + dw SilphCo5Text1 + dw SilphCo5Text2 + dw SilphCo5Text3 + dw SilphCo5Text4 + dw SilphCo5Text5 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw SilphCo5Text9 + dw SilphCo5Text10 + dw SilphCo5Text11 + +SilphCo5TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 + dw SilphCo5BattleText2 ; TextBeforeBattle + dw SilphCo5AfterBattleText2 ; TextAfterBattle + dw SilphCo5EndBattleText2 ; TextEndBattle + dw SilphCo5EndBattleText2 ; TextEndBattle + +SilphCo5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 + dw SilphCo5BattleText3 ; TextBeforeBattle + dw SilphCo5AfterBattleText3 ; TextAfterBattle + dw SilphCo5EndBattleText3 ; TextEndBattle + dw SilphCo5EndBattleText3 ; TextEndBattle + +SilphCo5TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + dw SilphCo5BattleText4 ; TextBeforeBattle + dw SilphCo5AfterBattleText4 ; TextAfterBattle + dw SilphCo5EndBattleText4 ; TextEndBattle + dw SilphCo5EndBattleText4 ; TextEndBattle + +SilphCo5TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + dw SilphCo5BattleText5 ; TextBeforeBattle + dw SilphCo5AfterBattleText5 ; TextAfterBattle + dw SilphCo5EndBattleText5 ; TextEndBattle + dw SilphCo5EndBattleText5 ; TextEndBattle + + db $ff + +SilphCo5Text1: + TX_ASM + ld hl, SilphCo5Text_1a010 + ld de, SilphCo5Text_1a015 + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo5Text_1a010: + TX_FAR _SilphCo5Text_1a010 + db "@" + +SilphCo5Text_1a015: + TX_FAR _SilphCo5Text_1a015 + db "@" + +SilphCo5Text2: + TX_ASM + ld hl, SilphCo5TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo5BattleText2: + TX_FAR _SilphCo5BattleText2 + db "@" + +SilphCo5EndBattleText2: + TX_FAR _SilphCo5EndBattleText2 + db "@" + +SilphCo5AfterBattleText2: + TX_FAR _SilphCo5AfterBattleText2 + db "@" + +SilphCo5Text3: + TX_ASM + ld hl, SilphCo5TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo5BattleText3: + TX_FAR _SilphCo5BattleText3 + db "@" + +SilphCo5EndBattleText3: + TX_FAR _SilphCo5EndBattleText3 + db "@" + +SilphCo5AfterBattleText3: + TX_FAR _SilphCo5AfterBattleText3 + db "@" + +SilphCo5Text4: + TX_ASM + ld hl, SilphCo5TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo5BattleText4: + TX_FAR _SilphCo5BattleText4 + db "@" + +SilphCo5EndBattleText4: + TX_FAR _SilphCo5EndBattleText4 + db "@" + +SilphCo5AfterBattleText4: + TX_FAR _SilphCo5AfterBattleText4 + db "@" + +SilphCo5Text5: + TX_ASM + ld hl, SilphCo5TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SilphCo5BattleText5: + TX_FAR _SilphCo5BattleText5 + db "@" + +SilphCo5EndBattleText5: + TX_FAR _SilphCo5EndBattleText5 + db "@" + +SilphCo5AfterBattleText5: + TX_FAR _SilphCo5AfterBattleText5 + db "@" + +SilphCo5Text9: + TX_FAR _SilphCo5Text9 + db "@" + +SilphCo5Text10: + TX_FAR _SilphCo5Text10 + db "@" + +SilphCo5Text11: + TX_FAR _SilphCo5Text11 + db "@" diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm new file mode 100755 index 00000000..ddbcba79 --- /dev/null +++ b/scripts/SilphCo6F.asm @@ -0,0 +1,220 @@ +SilphCo6F_Script: + call SilphCo6Script_1a1bf + call EnableAutoTextBoxDrawing + ld hl, SilphCo6TrainerHeader0 + ld de, SilphCo6F_ScriptPointers + ld a, [wSilphCo6FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo6FCurScript], a + ret + +SilphCo6Script_1a1bf: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo6GateCoords + call SilphCo4Script_19d5d + call SilphCo6Script_1a1e6 + CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR + ret nz + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 6, 2 + predef_jump ReplaceTileBlock + +SilphCo6GateCoords: + db $06,$02 + db $FF + +SilphCo6Script_1a1e6: + ld a, [$ffe0] + and a + ret z + SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR + ret + +SilphCo6F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo6F_TextPointers: + dw SilphCo6Text1 + dw SilphCo6Text2 + dw SilphCo6Text3 + dw SilphCo6Text4 + dw SilphCo6Text5 + dw SilphCo6Text6 + dw SilphCo6Text7 + dw SilphCo6Text8 + dw PickUpItemText + dw PickUpItemText + +SilphCo6TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0 + dw SilphCo6BattleText2 ; TextBeforeBattle + dw SilphCo6AfterBattleText2 ; TextAfterBattle + dw SilphCo6EndBattleText2 ; TextEndBattle + dw SilphCo6EndBattleText2 ; TextEndBattle + +SilphCo6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 + dw SilphCo6BattleText3 ; TextBeforeBattle + dw SilphCo6AfterBattleText3 ; TextAfterBattle + dw SilphCo6EndBattleText3 ; TextEndBattle + dw SilphCo6EndBattleText3 ; TextEndBattle + +SilphCo6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 + dw SilphCo6BattleText4 ; TextBeforeBattle + dw SilphCo6AfterBattleText4 ; TextAfterBattle + dw SilphCo6EndBattleText4 ; TextEndBattle + dw SilphCo6EndBattleText4 ; TextEndBattle + + db $ff + +SilphCo6Script_1a22f: + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .asm_1a238 + jr .asm_1a23a +.asm_1a238 + ld h, d + ld l, e +.asm_1a23a + jp PrintText + +SilphCo6Text1: + TX_ASM + ld hl, SilphCo6Text_1a24a + ld de, SilphCo6Text_1a24f + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo6Text_1a24a: + TX_FAR _SilphCo6Text_1a24a + db "@" + +SilphCo6Text_1a24f: + TX_FAR _SilphCo6Text_1a24f + db "@" + +SilphCo6Text2: + TX_ASM + ld hl, SilphCo6Text_1a261 + ld de, SilphCo6Text_1a266 + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo6Text_1a261: + TX_FAR _SilphCo6Text_1a261 + db "@" + +SilphCo6Text_1a266: + TX_FAR _SilphCo6Text_1a266 + db "@" + +SilphCo6Text3: + TX_ASM + ld hl, SilphCo6Text_1a278 + ld de, SilphCo6Text_1a27d + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo6Text_1a278: + TX_FAR _SilphCo6Text_1a278 + db "@" + +SilphCo6Text_1a27d: + TX_FAR _SilphCo6Text_1a27d + db "@" + +SilphCo6Text4: + TX_ASM + ld hl, SilphCo6Text_1a28f + ld de, SilphCo6Text_1a294 + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo6Text_1a28f: + TX_FAR _SilphCo6Text_1a28f + db "@" + +SilphCo6Text_1a294: + TX_FAR _SilphCo6Text_1a294 + db "@" + +SilphCo6Text5: + TX_ASM + ld hl, SilphCo6Text_1a2a6 + ld de, SilphCo6Text_1a2ab + call SilphCo6Script_1a22f + jp TextScriptEnd + +SilphCo6Text_1a2a6: + TX_FAR _SilphCo6Text_1a2a6 + db "@" + +SilphCo6Text_1a2ab: + TX_FAR _SilphCo6Text_1a2ab + db "@" + +SilphCo6Text6: + TX_ASM + ld hl, SilphCo6TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo6BattleText2: + TX_FAR _SilphCo6BattleText2 + db "@" + +SilphCo6EndBattleText2: + TX_FAR _SilphCo6EndBattleText2 + db "@" + +SilphCo6AfterBattleText2: + TX_FAR _SilphCo6AfterBattleText2 + db "@" + +SilphCo6Text7: + TX_ASM + ld hl, SilphCo6TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo6BattleText3: + TX_FAR _SilphCo6BattleText3 + db "@" + +SilphCo6EndBattleText3: + TX_FAR _SilphCo6EndBattleText3 + db "@" + +SilphCo6AfterBattleText3: + TX_FAR _SilphCo6AfterBattleText3 + db "@" + +SilphCo6Text8: + TX_ASM + ld hl, SilphCo6TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo6BattleText4: + TX_FAR _SilphCo6BattleText4 + db "@" + +SilphCo6EndBattleText4: + TX_FAR _SilphCo6EndBattleText4 + db "@" + +SilphCo6AfterBattleText4: + TX_FAR _SilphCo6AfterBattleText4 + db "@" diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm new file mode 100755 index 00000000..e7594663 --- /dev/null +++ b/scripts/SilphCo7F.asm @@ -0,0 +1,527 @@ +SilphCo7F_Script: + call SilphCo7Script_51b77 + call EnableAutoTextBoxDrawing + ld hl, SilphCo7TrainerHeader0 + ld de, SilphCo7F_ScriptPointers + ld a, [wSilphCo7FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo7FCurScript], a + ret + +SilphCo7Script_51b77: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo7GateCoords + call SilphCo7Text_51bc8 + call SilphCo7Text_51bf4 + CheckEvent EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + jr nz, .asm_51b9e + push af + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 3, 5 + predef ReplaceTileBlock + pop af +.asm_51b9e + CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR2, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + jr nz, .asm_51bb1 + push af + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 2, 10 + predef ReplaceTileBlock + pop af +.asm_51bb1 + CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR2 + ret nz + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 6, 10 + predef_jump ReplaceTileBlock + +SilphCo7GateCoords: + db $03,$05 + db $02,$0A + db $06,$0A + db $FF + +SilphCo7Text_51bc8: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ld [$ffe0], a + pop hl +.asm_51bd4 + ld a, [hli] + cp $ff + jr z, .asm_51bf0 + push hl + ld hl, $ffe0 + inc [hl] + pop hl + cp b + jr z, .asm_51be5 + inc hl + jr .asm_51bd4 +.asm_51be5 + ld a, [hli] + cp c + jr nz, .asm_51bd4 + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_51bf0 + xor a + ld [$ffe0], a + ret + +SilphCo7Text_51bf4: + EventFlagAddress hl, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + ld a, [$ffe0] + and a + ret z + cp $1 + jr nz, .next1 + SetEventReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + ret +.next1 + cp $2 + jr nz, .next2 + SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR2, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + ret +.next2 + SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + ret + +SilphCo7Text_51c0c: + xor a + ld [wJoyIgnore], a + +SilphCo7Text_51c10: + ld [wSilphCo7FCurScript], a + ld [wCurMapScript], a + ret + +SilphCo7F_ScriptPointers: + dw SilphCo7Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw SilphCo7Script3 + dw SilphCo7Script4 + dw SilphCo7Script5 + +SilphCo7Script0: + CheckEvent EVENT_BEAT_SILPH_CO_RIVAL + jp nz, CheckFightingMapTrainers + ld hl, CoordsData_51c78 + call ArePlayerCoordsInArray + jp nc, CheckFightingMapTrainers + xor a + ld [hJoyHeld], a + ld a, $f0 + ld [wJoyIgnore], a + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, $ff + ld [wNewSoundID], a + call PlaySound + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ld a, $9 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $9 + ld [H_SPRITEINDEX], a + call SetSpriteMovementBytesToFF + ld de, MovementData_51c7d + ld a, [wCoordIndex] + ld [wcf0d], a + cp $1 + jr z, .asm_51c6c + inc de +.asm_51c6c + ld a, $9 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $3 + jp SilphCo7Text_51c10 + +CoordsData_51c78: + db $02,$03 + db $03,$03 + db $FF + +MovementData_51c7d: + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db $FF + +SilphCo7Script3: + ld a, [wd730] + bit 0, a + ret nz + xor a + ld [wJoyIgnore], a + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + call Delay3 + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, SilphCo7Text14 + ld de, SilphCo7Text_51ecd + call SaveEndBattleTextPointers + ld a, OPP_SONY2 + ld [wCurOpponent], a + ld a, [wRivalStarter] + cp STARTER2 + jr nz, .asm_51cb6 + ld a, $7 + jr .asm_51cc0 +.asm_51cb6 + cp STARTER3 + jr nz, .asm_51cbe + ld a, $8 + jr .asm_51cc0 +.asm_51cbe + ld a, $9 +.asm_51cc0 + ld [wTrainerNo], a + ld a, $4 + jp SilphCo7Text_51c10 + +SilphCo7Script4: + ld a, [wIsInBattle] + cp $ff + jp z, SilphCo7Text_51c0c + ld a, $f0 + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_SILPH_CO_RIVAL + ld a, PLAYER_DIR_DOWN + ld [wPlayerMovingDirection], a + ld a, $9 + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay + ld a, $f + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld a, $ff + ld [wNewSoundID], a + call PlaySound + callba Music_RivalAlternateStart + ld de, MovementData_51d1d + ld a, [wcf0d] + cp $1 + jr nz, .asm_51d0e + ld de, MovementData_51d1a +.asm_51d0e + ld a, $9 + ld [H_SPRITEINDEX], a + call MoveSprite + ld a, $5 + jp SilphCo7Text_51c10 + +MovementData_51d1a: + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db $FF + +MovementData_51d1d: + db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_UP + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN + db $FF + +SilphCo7Script5: + ld a, [wd730] + bit 0, a + ret nz + ld a, HS_SILPH_CO_7F_RIVAL + ld [wMissableObjectIndex], a + predef HideObject + call PlayDefaultMusic + xor a + ld [wJoyIgnore], a + jp SilphCo7Text_51c10 + +SilphCo7F_TextPointers: + dw SilphCo7Text1 + dw SilphCo7Text2 + dw SilphCo7Text3 + dw SilphCo7Text4 + dw SilphCo7Text5 + dw SilphCo7Text6 + dw SilphCo7Text7 + dw SilphCo7Text8 + dw SilphCo7Text9 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw SilphCo7Text13 + dw SilphCo7Text14 + dw SilphCo7Text15 + +SilphCo7TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_0 + dw SilphCo7BattleText1 ; TextBeforeBattle + dw SilphCo7AfterBattleText1 ; TextAfterBattle + dw SilphCo7EndBattleText1 ; TextEndBattle + dw SilphCo7EndBattleText1 ; TextEndBattle + +SilphCo7TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1 + dw SilphCo7BattleText2 ; TextBeforeBattle + dw SilphCo7AfterBattleText2 ; TextAfterBattle + dw SilphCo7EndBattleText2 ; TextEndBattle + dw SilphCo7EndBattleText2 ; TextEndBattle + +SilphCo7TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 + dw SilphCo7BattleText3 ; TextBeforeBattle + dw SilphCo7AfterBattleText3 ; TextAfterBattle + dw SilphCo7EndBattleText3 ; TextEndBattle + dw SilphCo7EndBattleText3 ; TextEndBattle + +SilphCo7TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 + dw SilphCo7BattleText4 ; TextBeforeBattle + dw SilphCo7AfterBattleText4 ; TextAfterBattle + dw SilphCo7EndBattleText4 ; TextEndBattle + dw SilphCo7EndBattleText4 ; TextEndBattle + + db $ff + +SilphCo7Text1: +; lapras guy + TX_ASM + ld a, [wd72e] + bit 0, a ; got lapras? + jr z, .givelapras + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .savedsilph + ld hl, .LaprasGuyText + call PrintText + jr .done +.givelapras + ld hl, .MeetLaprasGuyText + call PrintText + lb bc, LAPRAS, 15 + call GivePokemon + jr nc, .done + ld a, [wSimulatedJoypadStatesEnd] + and a + call z, WaitForTextScrollButtonPress + call EnableAutoTextBoxDrawing + ld hl, .HeresYourLaprasText + call PrintText + ld hl, wd72e + set 0, [hl] + jr .done +.savedsilph + ld hl, .LaprasGuySavedText + call PrintText +.done + jp TextScriptEnd + +.MeetLaprasGuyText + TX_FAR _MeetLaprasGuyText + db "@" + +.HeresYourLaprasText + TX_FAR _HeresYourLaprasText + db "@" + +.LaprasGuyText + TX_FAR _LaprasGuyText + db "@" + +.LaprasGuySavedText + TX_FAR _LaprasGuySavedText + db "@" + +SilphCo7Text2: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .savedsilph + ld hl, .rockettext + call PrintText + jr .done +.savedsilph + ld hl, .savedtext + call PrintText +.done + jp TextScriptEnd + +.rockettext + TX_FAR _SilphCo7Text_51e00 + db "@" + +.savedtext + TX_FAR _CanceledMasterBallText + db "@" + +SilphCo7Text3: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .savedsilph + ld hl, .rockettext + call PrintText + jr .done +.savedsilph + ld hl, .savedtext + call PrintText +.done + jp TextScriptEnd + +.rockettext + TX_FAR _SilphCo7Text_51e23 + db "@" + +.savedtext + TX_FAR _SilphCo7Text_51e28 + db "@" + +SilphCo7Text4: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .savedsilph + ld hl, .rockettext + call PrintText + jr .done +.savedsilph + ld hl, .savedtext + call PrintText +.done + jp TextScriptEnd + +.rockettext + TX_FAR _SilphCo7Text_51e46 + db "@" + +.savedtext + TX_FAR _SilphCo7Text_51e4b + db "@" + +SilphCo7Text5: + TX_ASM + ld hl, SilphCo7TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo7BattleText1: + TX_FAR _SilphCo7BattleText1 + db "@" + +SilphCo7EndBattleText1: + TX_FAR _SilphCo7EndBattleText1 + db "@" + +SilphCo7AfterBattleText1: + TX_FAR _SilphCo7AfterBattleText1 + db "@" + +SilphCo7Text6: + TX_ASM + ld hl, SilphCo7TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo7BattleText2: + TX_FAR _SilphCo7BattleText2 + db "@" + +SilphCo7EndBattleText2: + TX_FAR _SilphCo7EndBattleText2 + db "@" + +SilphCo7AfterBattleText2: + TX_FAR _SilphCo7AfterBattleText2 + db "@" + +SilphCo7Text7: + TX_ASM + ld hl, SilphCo7TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo7BattleText3: + TX_FAR _SilphCo7BattleText3 + db "@" + +SilphCo7EndBattleText3: + TX_FAR _SilphCo7EndBattleText3 + db "@" + +SilphCo7AfterBattleText3: + TX_FAR _SilphCo7AfterBattleText3 + db "@" + +SilphCo7Text8: + TX_ASM + ld hl, SilphCo7TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SilphCo7BattleText4: + TX_FAR _SilphCo7BattleText4 + db "@" + +SilphCo7EndBattleText4: + TX_FAR _SilphCo7EndBattleText4 + db "@" + +SilphCo7AfterBattleText4: + TX_FAR _SilphCo7AfterBattleText4 + db "@" + +SilphCo7Text9: + TX_ASM + ld hl, SilphCo7Text_51ebe + call PrintText + jp TextScriptEnd + +SilphCo7Text_51ebe: + TX_FAR _SilphCo7Text_51ebe + db "@" + +SilphCo7Text13: + TX_FAR _SilphCo7Text_51ec3 + db "@" + +SilphCo7Text14: + TX_FAR _SilphCo7Text_51ec8 + db "@" + +SilphCo7Text_51ecd: + TX_FAR _SilphCo7Text_51ecd + db "@" + +SilphCo7Text15: + TX_FAR _SilphCo7Text_51ed2 + db "@" diff --git a/scripts/SilphCo8F.asm b/scripts/SilphCo8F.asm new file mode 100755 index 00000000..ce6579f7 --- /dev/null +++ b/scripts/SilphCo8F.asm @@ -0,0 +1,183 @@ +SilphCo8F_Script: + call SilphCo8Script_5651a + call EnableAutoTextBoxDrawing + ld hl, SilphCo8TrainerHeader0 + ld de, SilphCo8F_ScriptPointers + ld a, [wSilphCo8FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo8FCurScript], a + ret + +SilphCo8Script_5651a: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo8GateCoords + call SilphCo8Script_56541 + call SilphCo8Script_5656d + CheckEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR + ret nz + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 4, 3 + predef_jump ReplaceTileBlock + +SilphCo8GateCoords: + db $04,$03 + db $FF + +SilphCo8Script_56541: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ld [$ffe0], a + pop hl +.asm_5654d + ld a, [hli] + cp $ff + jr z, .asm_56569 + push hl + ld hl, $ffe0 + inc [hl] + pop hl + cp b + jr z, .asm_5655e + inc hl + jr .asm_5654d +.asm_5655e + ld a, [hli] + cp c + jr nz, .asm_5654d + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_56569 + xor a + ld [$ffe0], a + ret + +SilphCo8Script_5656d: + ld a, [$ffe0] + and a + ret z + SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR + ret + +SilphCo8F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo8F_TextPointers: + dw SilphCo8Text1 + dw SilphCo8Text2 + dw SilphCo8Text3 + dw SilphCo8Text4 + +SilphCo8TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_0 + dw SilphCo8BattleText1 ; TextBeforeBattle + dw SilphCo8AfterBattleText1 ; TextAfterBattle + dw SilphCo8EndBattleText1 ; TextEndBattle + dw SilphCo8EndBattleText1 ; TextEndBattle + +SilphCo8TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_1 + dw SilphCo8BattleText2 ; TextBeforeBattle + dw SilphCo8AfterBattleText2 ; TextAfterBattle + dw SilphCo8EndBattleText2 ; TextEndBattle + dw SilphCo8EndBattleText2 ; TextEndBattle + +SilphCo8TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_2 + dw SilphCo8BattleText3 ; TextBeforeBattle + dw SilphCo8AfterBattleText3 ; TextAfterBattle + dw SilphCo8EndBattleText3 ; TextEndBattle + dw SilphCo8EndBattleText3 ; TextEndBattle + + db $ff + +SilphCo8Text1: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + ld hl, SilphCo8Text_565c3 + jr nz, .asm_565b8 + ld hl, SilphCo8Text_565be +.asm_565b8 + call PrintText + jp TextScriptEnd + +SilphCo8Text_565be: + TX_FAR _SilphCo8Text_565be + db "@" + +SilphCo8Text_565c3: + TX_FAR _SilphCo8Text_565c3 + db "@" + +SilphCo8Text2: + TX_ASM + ld hl, SilphCo8TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo8Text3: + TX_ASM + ld hl, SilphCo8TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo8Text4: + TX_ASM + ld hl, SilphCo8TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo8BattleText1: + TX_FAR _SilphCo8BattleText1 + db "@" + +SilphCo8EndBattleText1: + TX_FAR _SilphCo8EndBattleText1 + db "@" + +SilphCo8AfterBattleText1: + TX_FAR _SilphCo8AfterBattleText1 + db "@" + +SilphCo8BattleText2: + TX_FAR _SilphCo8BattleText2 + db "@" + +SilphCo8EndBattleText2: + TX_FAR _SilphCo8EndBattleText2 + db "@" + +SilphCo8AfterBattleText2: + TX_FAR _SilphCo8AfterBattleText2 + db "@" + +SilphCo8BattleText3: + TX_FAR _SilphCo8BattleText3 + db "@" + +SilphCo8EndBattleText3: + TX_FAR _SilphCo8EndBattleText3 + db "@" + +SilphCo8AfterBattleText3: + TX_FAR _SilphCo8AfterBattleText3 + db "@" diff --git a/scripts/SilphCo9F.asm b/scripts/SilphCo9F.asm new file mode 100755 index 00000000..66291e98 --- /dev/null +++ b/scripts/SilphCo9F.asm @@ -0,0 +1,244 @@ +SilphCo9F_Script: + call SilphCo9Script_5d7d1 + call EnableAutoTextBoxDrawing + ld hl, SilphCo9TrainerHeader0 + ld de, SilphCo9F_ScriptPointers + ld a, [wSilphCo9FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphCo9FCurScript], a + ret + +SilphCo9Script_5d7d1: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + ld hl, SilphCo9GateCoords + call SilphCo9Script_5d837 + call SilphCo9Script_5d863 + CheckEvent EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + jr nz, .asm_5d7f8 + push af + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 4, 1 + predef ReplaceTileBlock + pop af +.asm_5d7f8 + CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR2, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + jr nz, .asm_5d80b + push af + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 2, 9 + predef ReplaceTileBlock + pop af +.asm_5d80b + CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR3, EVENT_SILPH_CO_9_UNLOCKED_DOOR2 + jr nz, .asm_5d81e + push af + ld a, $54 + ld [wNewTileBlockID], a + lb bc, 5, 9 + predef ReplaceTileBlock + pop af +.asm_5d81e + CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR3 + ret nz + ld a, $5f + ld [wNewTileBlockID], a + lb bc, 6, 5 + predef_jump ReplaceTileBlock + +SilphCo9GateCoords: + db $04,$01 + db $02,$09 + db $05,$09 + db $06,$05 + db $FF + +SilphCo9Script_5d837: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ld [$ffe0], a + pop hl +.asm_5d843 + ld a, [hli] + cp $ff + jr z, .asm_5d85f + push hl + ld hl, $ffe0 + inc [hl] + pop hl + cp b + jr z, .asm_5d854 + inc hl + jr .asm_5d843 +.asm_5d854 + ld a, [hli] + cp c + jr nz, .asm_5d843 + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_5d85f + xor a + ld [$ffe0], a + ret + +SilphCo9Script_5d863: + EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + ld a, [$ffe0] + and a + ret z + cp $1 + jr nz, .next1 + SetEventReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + ret +.next1 + cp $2 + jr nz, .next2 + SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR2, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + ret +.next2 + cp $3 + jr nz, .next3 + SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR3, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + ret +.next3 + cp $4 + ret nz + SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + ret + +SilphCo9F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +SilphCo9F_TextPointers: + dw SilphCo9Text1 + dw SilphCo9Text2 + dw SilphCo9Text3 + dw SilphCo9Text4 + +SilphCo9TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_0 + dw SilphCo9BattleText1 ; TextBeforeBattle + dw SilphCo9AfterBattleText1 ; TextAfterBattle + dw SilphCo9EndBattleText1 ; TextEndBattle + dw SilphCo9EndBattleText1 ; TextEndBattle + +SilphCo9TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_1 + dw SilphCo9BattleText2 ; TextBeforeBattle + dw SilphCo9AfterBattleText2 ; TextAfterBattle + dw SilphCo9EndBattleText2 ; TextEndBattle + dw SilphCo9EndBattleText2 ; TextEndBattle + +SilphCo9TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_2 + dw SilphCo9BattleText3 ; TextBeforeBattle + dw SilphCo9AfterBattleText3 ; TextAfterBattle + dw SilphCo9EndBattleText3 ; TextEndBattle + dw SilphCo9EndBattleText3 ; TextEndBattle + + db $ff + +SilphCo9Text1: + TX_ASM + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .asm_5d8dc + ld hl, SilphCo9Text_5d8e5 + call PrintText + predef HealParty + call GBFadeOutToWhite + call Delay3 + call GBFadeInFromWhite + ld hl, SilphCo9Text_5d8ea + call PrintText + jr .asm_5d8e2 +.asm_5d8dc + ld hl, SilphCo9Text_5d8ef + call PrintText +.asm_5d8e2 + jp TextScriptEnd + +SilphCo9Text_5d8e5: + TX_FAR _SilphCo9Text_5d8e5 + db "@" + +SilphCo9Text_5d8ea: + TX_FAR _SilphCo9Text_5d8ea + db "@" + +SilphCo9Text_5d8ef: + TX_FAR _SilphCo9Text_5d8ef + db "@" + +SilphCo9Text2: + TX_ASM + ld hl, SilphCo9TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphCo9Text3: + TX_ASM + ld hl, SilphCo9TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphCo9Text4: + TX_ASM + ld hl, SilphCo9TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphCo9BattleText1: + TX_FAR _SilphCo9BattleText1 + db "@" + +SilphCo9EndBattleText1: + TX_FAR _SilphCo9EndBattleText1 + db "@" + +SilphCo9AfterBattleText1: + TX_FAR _SilphCo9AfterBattleText1 + db "@" + +SilphCo9BattleText2: + TX_FAR _SilphCo9BattleText2 + db "@" + +SilphCo9EndBattleText2: + TX_FAR _SilphCo9EndBattleText2 + db "@" + +SilphCo9AfterBattleText2: + TX_FAR _SilphCo9AfterBattleText2 + db "@" + +SilphCo9BattleText3: + TX_FAR _SilphCo9BattleText3 + db "@" + +SilphCo9EndBattleText3: + TX_FAR _SilphCo9EndBattleText3 + db "@" + +SilphCo9AfterBattleText3: + TX_FAR _SilphCo9AfterBattleText3 + db "@" diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm new file mode 100755 index 00000000..49de6b27 --- /dev/null +++ b/scripts/SilphCoElevator.asm @@ -0,0 +1,88 @@ +SilphCoElevator_Script: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + push hl + call nz, SilphCoElevatorScript_457dc + pop hl + bit 7, [hl] + res 7, [hl] + call nz, SilphCoElevatorScript_45827 + xor a + ld [wAutoTextBoxDrawingControl], a + inc a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret + +SilphCoElevatorScript_457dc: + ld hl, wWarpEntries + ld a, [wWarpedFromWhichWarp] + ld b, a + ld a, [wWarpedFromWhichMap] + ld c, a + call SilphCoElevatorScript_457ea + +SilphCoElevatorScript_457ea: + inc hl + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ret + +SilphCoElevatorScript_457f1: + ld hl, SilphCoElevatorFloors + call LoadItemList + ld hl, SilphCoElevatorWarpMaps + ld de, wElevatorWarpMaps + ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps + call CopyData + ret + +SilphCoElevatorFloors: + db $0B ; num elements in list + db FLOOR_1F + db FLOOR_2F + db FLOOR_3F + db FLOOR_4F + db FLOOR_5F + db FLOOR_6F + db FLOOR_7F + db FLOOR_8F + db FLOOR_9F + db FLOOR_10F + db FLOOR_11F + db $FF ; terminator + +SilphCoElevatorWarpMaps: +; first byte is warp number +; second byte is map number +; These specify where the player goes after getting out of the elevator. + db $03, SILPH_CO_1F + db $02, SILPH_CO_2F + db $02, SILPH_CO_3F + db $02, SILPH_CO_4F + db $02, SILPH_CO_5F + db $02, SILPH_CO_6F + db $02, SILPH_CO_7F + db $02, SILPH_CO_8F + db $02, SILPH_CO_9F + db $02, SILPH_CO_10F + db $01, SILPH_CO_11F +SilphCoElevatorWarpMapsEnd: + +SilphCoElevatorScript_45827: + call Delay3 + callba ShakeElevator + ret + +SilphCoElevator_TextPointers: + dw SilphCoElevatorText1 + +SilphCoElevatorText1: + TX_ASM + call SilphCoElevatorScript_457f1 + ld hl, SilphCoElevatorWarpMaps + predef DisplayElevatorFloorMenu + jp TextScriptEnd diff --git a/scripts/TradeCenter.asm b/scripts/TradeCenter.asm new file mode 100755 index 00000000..ddb3061e --- /dev/null +++ b/scripts/TradeCenter.asm @@ -0,0 +1,38 @@ +TradeCenter_Script: + call EnableAutoTextBoxDrawing + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK + ld a, SPRITE_FACING_LEFT + jr z, .next + ld a, SPRITE_FACING_RIGHT +.next + ld [hSpriteFacingDirection], a + ld a, $1 + ld [H_SPRITEINDEX], a + call SetSpriteFacingDirection + ld hl, wd72d + bit 0, [hl] + set 0, [hl] + ret nz + ld hl, wSpriteStateData2 + $14 + ld a, $8 + ld [hli], a + ld a, $a + ld [hl], a + ld a, SPRITE_FACING_LEFT + ld [wSpriteStateData1 + $19], a + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK + ret z + ld a, $7 + ld [wSpriteStateData2 + $15], a + ld a, SPRITE_FACING_RIGHT + ld [wSpriteStateData1 + $19], a + ret + +TradeCenter_TextPointers: + dw TradeCenterText1 + +TradeCenterText1: + TX_FAR _TradeCenterText1 + db "@" diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..52b3d8bf --- /dev/null +++ b/scripts/UndergroundPathNorthSouth.asm @@ -0,0 +1,5 @@ +UndergroundPathNorthSouth_Script: + jp EnableAutoTextBoxDrawing + +UndergroundPathNorthSouth_TextPointers: + db "@" diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm new file mode 100755 index 00000000..23d72569 --- /dev/null +++ b/scripts/UndergroundPathRoute5.asm @@ -0,0 +1,18 @@ +UndergroundPathRoute5_Script: + ld a, ROUTE_5 + ld [wLastMap], a + ret + +UndergroundPathEntranceRoute5_5d6af: + db "@" + +UndergroundPathRoute5_TextPointers: + dw UndergroundPathEntranceRoute5Text1 + +UndergroundPathEntranceRoute5Text1: + TX_ASM + ld a, $9 + ld [wWhichTrade], a + predef DoInGameTradeDialogue + ld hl, UndergroundPathEntranceRoute5_5d6af + ret diff --git a/scripts/UndergroundPathRoute6.asm b/scripts/UndergroundPathRoute6.asm new file mode 100755 index 00000000..0a690518 --- /dev/null +++ b/scripts/UndergroundPathRoute6.asm @@ -0,0 +1,11 @@ +UndergroundPathRoute6_Script: + ld a, ROUTE_6 + ld [wLastMap], a + jp EnableAutoTextBoxDrawing + +UndergroundPathRoute6_TextPointers: + dw UndergroundPathEntranceRoute6Text1 + +UndergroundPathEntranceRoute6Text1: + TX_FAR _UndergrdTunnelEntRoute6Text1 + db "@" diff --git a/scripts/UndergroundPathRoute7.asm b/scripts/UndergroundPathRoute7.asm new file mode 100755 index 00000000..3a1f14c7 --- /dev/null +++ b/scripts/UndergroundPathRoute7.asm @@ -0,0 +1,11 @@ +UndergroundPathRoute7_Script: + ld a, ROUTE_7 + ld [wLastMap], a + jp EnableAutoTextBoxDrawing + +UndergroundPathRoute7_TextPointers: + dw UndergroundPathEntranceRoute7Text1 + +UndergroundPathEntranceRoute7Text1: + TX_FAR _UndergroundPathEntRoute7Text1 + db "@" diff --git a/scripts/UndergroundPathRoute7Copy.asm b/scripts/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..8a494caf --- /dev/null +++ b/scripts/UndergroundPathRoute7Copy.asm @@ -0,0 +1,24 @@ +UndergroundPathRoute7Copy_Script: + ld a, ROUTE_7 + ld [wLastMap], a + ret + +UndergroundPathRoute7Copy_TextPointers: + dw UGPathRoute7EntranceUnusedText_5d773 + dw UGPathRoute7EntranceUnusedText_5d77d + +UGPathRoute7EntranceUnusedText_5d773: + TX_FAR _UGPathRoute7EntranceUnusedText_5d773 + db "@" + +UGPathRoute7EntranceUnusedText_5d778: + TX_FAR _UGPathRoute7EntranceUnusedText_5d778 + db "@" + +UGPathRoute7EntranceUnusedText_5d77d: + TX_FAR _UGPathRoute7EntranceUnusedText_5d77d + db "@" + +UGPathRoute7EntranceUnusedText_5d782: + TX_FAR _UGPathRoute7EntranceUnusedText_5d782 + db "@" diff --git a/scripts/UndergroundPathRoute8.asm b/scripts/UndergroundPathRoute8.asm new file mode 100755 index 00000000..ab0a9977 --- /dev/null +++ b/scripts/UndergroundPathRoute8.asm @@ -0,0 +1,11 @@ +UndergroundPathRoute8_Script: + ld a, ROUTE_8 + ld [wLastMap], a + jp EnableAutoTextBoxDrawing + +UndergroundPathRoute8_TextPointers: + dw UndergroundPathEntranceRoute8Text1 + +UndergroundPathEntranceRoute8Text1: + TX_FAR _UndergroundPathEntRoute8Text1 + db "@" diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm new file mode 100755 index 00000000..cb1a7bd8 --- /dev/null +++ b/scripts/UndergroundPathWestEast.asm @@ -0,0 +1,5 @@ +UndergroundPathWestEast_Script: + jp EnableAutoTextBoxDrawing + +UndergroundPathWestEast_TextPointers: + db "@" diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm new file mode 100755 index 00000000..1ac81521 --- /dev/null +++ b/scripts/VermilionCity.asm @@ -0,0 +1,257 @@ +VermilionCity_Script: + call EnableAutoTextBoxDrawing + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + push hl + call nz, VermilionCityScript_197cb + pop hl + bit 5, [hl] + res 5, [hl] + call nz, VermilionCityScript_197c0 + ld hl, VermilionCity_ScriptPointers + ld a, [wVermilionCityCurScript] + jp CallFunctionInTable + +VermilionCityScript_197c0: + call Random + ld a, [$ffd4] + and $e + ld [wFirstLockTrashCanIndex], a + ret + +VermilionCityScript_197cb: + CheckEventHL EVENT_SS_ANNE_LEFT + ret z + CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT + SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT + ret nz + ld a, $2 + ld [wVermilionCityCurScript], a + ret + +VermilionCity_ScriptPointers: + dw VermilionCityScript0 + dw VermilionCityScript1 + dw VermilionCityScript2 + dw VermilionCityScript3 + dw VermilionCityScript4 + +VermilionCityScript0: + ld a, [wSpriteStateData1 + 9] + and a ; cp SPRITE_FACING_DOWN + ret nz + ld hl, CoordsData_19823 + call ArePlayerCoordsInArray + ret nc + xor a + ld [hJoyHeld], a + ld [wcf0d], a + ld a, $3 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + CheckEvent EVENT_SS_ANNE_LEFT + jr nz, .asm_19810 + ld b, S_S_TICKET + predef GetQuantityOfItemInBag + ld a, b + and a + ret nz +.asm_19810 + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $1 + ld [wVermilionCityCurScript], a + ret + +CoordsData_19823: + db $1e,$12 + db $ff + +VermilionCityScript4: + ld hl, CoordsData_19823 + call ArePlayerCoordsInArray + ret c + ld a, $0 + ld [wVermilionCityCurScript], a + ret + +VermilionCityScript2: + ld a, $ff + ld [wJoyIgnore], a + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + ld [wSimulatedJoypadStatesEnd + 1], a + ld a, 2 + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $3 + ld [wVermilionCityCurScript], a + ret + +VermilionCityScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + xor a + ld [wJoyIgnore], a + ld [hJoyHeld], a + ld a, $0 + ld [wVermilionCityCurScript], a + ret + +VermilionCityScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld c, 10 + call DelayFrames + ld a, $0 + ld [wVermilionCityCurScript], a + ret + +VermilionCity_TextPointers: + dw VermilionCityText1 + dw VermilionCityText2 + dw VermilionCityText3 + dw VermilionCityText4 + dw VermilionCityText5 + dw VermilionCityText6 + dw VermilionCityText7 + dw VermilionCityText8 + dw MartSignText + dw PokeCenterSignText + dw VermilionCityText11 + dw VermilionCityText12 + dw VermilionCityText13 + +VermilionCityText1: + TX_FAR _VermilionCityText1 + db "@" + +VermilionCityText2: + TX_ASM + CheckEvent EVENT_SS_ANNE_LEFT + jr nz, .asm_1989e + ld hl, VermilionCityText_198a7 + call PrintText + jr .asm_198a4 +.asm_1989e + ld hl, VermilionCityText_198ac + call PrintText +.asm_198a4 + jp TextScriptEnd + +VermilionCityText_198a7: + TX_FAR _VermilionCityText_198a7 + db "@" + +VermilionCityText_198ac: + TX_FAR _VermilionCityText_198ac + db "@" + +VermilionCityText3: + TX_ASM + CheckEvent EVENT_SS_ANNE_LEFT + jr nz, .asm_198f6 + ld a, [wSpriteStateData1 + 9] + cp SPRITE_FACING_RIGHT + jr z, .asm_198c8 + ld hl, VermilionCityCoords1 + call ArePlayerCoordsInArray + jr nc, .asm_198d0 +.asm_198c8 + ld hl, SSAnneWelcomeText4 + call PrintText + jr .asm_198fc +.asm_198d0 + ld hl, SSAnneWelcomeText9 + call PrintText + ld b, S_S_TICKET + predef GetQuantityOfItemInBag + ld a, b + and a + jr nz, .asm_198e9 + ld hl, SSAnneNoTicketText + call PrintText + jr .asm_198fc +.asm_198e9 + ld hl, SSAnneFlashedTicketText + call PrintText + ld a, $4 + ld [wVermilionCityCurScript], a + jr .asm_198fc +.asm_198f6 + ld hl, SSAnneNotHereText + call PrintText +.asm_198fc + jp TextScriptEnd + +VermilionCityCoords1: + db $1d,$13 + db $1f,$13 + db $ff + +SSAnneWelcomeText4: + TX_FAR _SSAnneWelcomeText4 + db "@" + +SSAnneWelcomeText9: + TX_FAR _SSAnneWelcomeText9 + db "@" + +SSAnneFlashedTicketText: + TX_FAR _SSAnneFlashedTicketText + db "@" + +SSAnneNoTicketText: + TX_FAR _SSAnneNoTicketText + db "@" + +SSAnneNotHereText: + TX_FAR _SSAnneNotHereText + db "@" + +VermilionCityText4: + TX_FAR _VermilionCityText4 + db "@" + +VermilionCityText5: + TX_FAR _VermilionCityText5 + TX_ASM + ld a, MACHOP + call PlayCry + call WaitForSoundToFinish + ld hl, VermilionCityText14 + ret + +VermilionCityText14: + TX_FAR _VermilionCityText14 + db "@" + +VermilionCityText6: + TX_FAR _VermilionCityText6 + db "@" + +VermilionCityText7: + TX_FAR _VermilionCityText7 + db "@" + +VermilionCityText8: + TX_FAR _VermilionCityText8 + db "@" + +VermilionCityText11: + TX_FAR _VermilionCityText11 + db "@" + +VermilionCityText12: + TX_FAR _VermilionCityText12 + db "@" + +VermilionCityText13: + TX_FAR _VermilionCityText13 + db "@" diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm new file mode 100755 index 00000000..65b66c52 --- /dev/null +++ b/scripts/VermilionDock.asm @@ -0,0 +1,215 @@ +VermilionDock_Script: + call EnableAutoTextBoxDrawing + CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK + jr nz, .asm_1db8d + CheckEventReuseHL EVENT_GOT_HM01 + ret z + ld a, [wDestinationWarpID] + cp $1 + ret nz + CheckEventReuseHL EVENT_SS_ANNE_LEFT + jp z, VermilionDock_1db9b + SetEventReuseHL EVENT_STARTED_WALKING_OUT_OF_DOCK + call Delay3 + ld hl, wd730 + set 7, [hl] + ld hl, wSimulatedJoypadStatesEnd + ld a, D_UP + ld [hli], a + ld [hli], a + ld [hl], a + ld a, $3 + ld [wSimulatedJoypadStatesIndex], a + xor a + ld [wSpriteStateData2 + $06], a + ld [wOverrideSimulatedJoypadStatesMask], a + dec a + ld [wJoyIgnore], a + ret +.asm_1db8d + CheckEventAfterBranchReuseHL EVENT_WALKED_OUT_OF_DOCK, EVENT_STARTED_WALKING_OUT_OF_DOCK + ret nz + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld [wJoyIgnore], a + SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK + ret + +VermilionDock_1db9b: + SetEventForceReuseHL EVENT_SS_ANNE_LEFT + ld a, $ff + ld [wJoyIgnore], a + ld [wNewSoundID], a + call PlaySound + ld c, BANK(Music_Surfing) + ld a, MUSIC_SURFING + call PlayMusic + callba LoadSmokeTileFourTimes + xor a + ld [wSpriteStateData1 + 2], a + ld c, 120 + call DelayFrames + ld b, $9c + call CopyScreenTileBufferToVRAM + coord hl, 0, 10 + ld bc, SCREEN_WIDTH * 6 + ld a, $14 ; water tile + call FillMemory + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a + call Delay3 + xor 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 + ld b, [hl] + push bc + push hl + ld a, SFX_SS_ANNE_HORN + call PlaySoundWaitForCurrent + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld d, $0 + ld e, $8 +.asm_1dbfa + ld hl, $0002 + add hl, bc + ld a, l + ld [wMapViewVRAMPointer], a + ld a, h + ld [wMapViewVRAMPointer + 1], a + push hl + push de + call ScheduleEastColumnRedraw + call VermilionDock_EmitSmokePuff + pop de + ld b, $10 +.asm_1dc11 + call VermilionDock_AnimSmokePuffDriftRight + ld c, $8 +.asm_1dc16 + call VermilionDock_1dc7c + dec c + jr nz, .asm_1dc16 + inc d + dec b + jr nz, .asm_1dc11 + pop bc + dec e + jr nz, .asm_1dbfa + xor a + ld [rWY], a + ld [hWY], a + call VermilionDock_EraseSSAnne + ld a, $90 + ld [hWY], a + ld a, $1 + ld [wUpdateSpritesEnabled], a + pop hl + pop bc + ld [hl], b + dec hl + ld [hl], c + call LoadPlayerSpriteGraphics + ld hl, wNumberOfWarps + dec [hl] + ret + +VermilionDock_AnimSmokePuffDriftRight: + push bc + push de + ld hl, wOAMBuffer + $11 + ld a, [wSSAnneSmokeDriftAmount] + swap a + ld c, a + ld de, 4 +.loop + inc [hl] + inc [hl] + add hl, de + dec c + jr nz, .loop + pop de + pop bc + ret + +VermilionDock_EmitSmokePuff: +; new smoke puff above the S.S. Anne's front smokestack + ld a, [wSSAnneSmokeX] + sub 16 + ld [wSSAnneSmokeX], a + ld c, a + ld b, 100 ; Y + ld a, [wSSAnneSmokeDriftAmount] + inc a + ld [wSSAnneSmokeDriftAmount], a + ld a, $1 + ld de, VermilionDockOAMBlock + call WriteOAMBlock + ret + +VermilionDockOAMBlock: + db $fc, $10 + db $fd, $10 + db $fe, $10 + db $ff, $10 + +VermilionDock_1dc7c: + ld h, d + ld l, $50 + call .asm_1dc86 + ld h, $0 + ld l, $80 +.asm_1dc86 + ld a, [rLY] + cp l + jr nz, .asm_1dc86 + ld a, h + ld [rSCX], a +.asm_1dc8e + ld a, [rLY] + cp h + jr z, .asm_1dc8e + ret + +VermilionDock_EraseSSAnne: +; Fill the area the S.S. Anne occupies in BG map 0 with water tiles. + ld hl, wVermilionDockTileMapBuffer + ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH + ld a, $14 ; water tile + call FillMemory + ld hl, vBGMap0 + 10 * BG_MAP_WIDTH + ld de, wVermilionDockTileMapBuffer + ld bc, (6 * BG_MAP_WIDTH) / 16 + call CopyVideoData + +; Replace the blocks of the lower half of the ship with water blocks. This +; leaves the upper half alone, but that doesn't matter because replacing any of +; the blocks is unnecessary because the blocks the ship occupies are south of +; the player and won't be redrawn when the player automatically walks north and +; exits the map. This code could be removed without affecting anything. + overworldMapCoord hl, 5, 2, VERMILION_DOCK_WIDTH + ld a, $d ; water block + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + + ld a, SFX_SS_ANNE_HORN + call PlaySound + ld c, 120 + call DelayFrames + ret + +VermilionDock_TextPointers: + dw VermilionDockText1 + +VermilionDockText1: + TX_FAR _VermilionDockText1 + db "@" diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm new file mode 100755 index 00000000..5755628c --- /dev/null +++ b/scripts/VermilionGym.asm @@ -0,0 +1,267 @@ +VermilionGym_Script: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + push hl + call nz, VermilionGymScript_5ca4c + pop hl + bit 6, [hl] + res 6, [hl] + call nz, VermilionGymScript_5ca6d + call EnableAutoTextBoxDrawing + ld hl, VermilionGymTrainerHeader0 + ld de, VermilionGym_ScriptPointers + ld a, [wVermilionGymCurScript] + call ExecuteCurMapScriptInTable + ld [wVermilionGymCurScript], a + ret + +VermilionGymScript_5ca4c: + ld hl, Gym3CityName + ld de, Gym3LeaderName + jp LoadGymLeaderAndCityName + +Gym3CityName: + db "VERMILION CITY@" + +Gym3LeaderName: + db "LT.SURGE@" + +VermilionGymScript_5ca6d: + CheckEvent EVENT_2ND_LOCK_OPENED + jr nz, .asm_5ca78 + ld a, $24 + jr .asm_5ca7f +.asm_5ca78 + ld a, SFX_GO_INSIDE + call PlaySound + ld a, $5 +.asm_5ca7f + ld [wNewTileBlockID], a + lb bc, 2, 2 + predef_jump ReplaceTileBlock + +VermilionGymScript_5ca8a: + xor a + ld [wJoyIgnore], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a + ret + +VermilionGym_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw VermilionGymScript3 + +VermilionGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, VermilionGymScript_5ca8a + ld a, $f0 + ld [wJoyIgnore], a + +VermilionGymScript_5caaa: + ld a, $6 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_LT_SURGE + lb bc, TM_24, 1 + call GiveItem + jr nc, .BagFull + ld a, $7 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM24 + jr .asm_5cad3 +.BagFull + ld a, $8 + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_5cad3 + ld hl, wObtainedBadges + set 2, [hl] + ld hl, wBeatGymFlags + set 2, [hl] + + ; deactivate gym trainers + SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2 + + jp VermilionGymScript_5ca8a + +VermilionGym_TextPointers: + dw VermilionGymText1 + dw VermilionGymText2 + dw VermilionGymText3 + dw VermilionGymText4 + dw VermilionGymText5 + dw VermilionGymText6 + dw VermilionGymText7 + dw VermilionGymText8 + +VermilionGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_0 + dw VermilionGymBattleText1 ; TextBeforeBattle + dw VermilionGymAfterBattleText1 ; TextAfterBattle + dw VermilionGymEndBattleText1 ; TextEndBattle + dw VermilionGymEndBattleText1 ; TextEndBattle + +VermilionGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_1 + dw VermilionGymBattleText2 ; TextBeforeBattle + dw VermilionGymAfterBattleText2 ; TextAfterBattle + dw VermilionGymEndBattleText2 ; TextEndBattle + dw VermilionGymEndBattleText2 ; TextEndBattle + +VermilionGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_2 + dw VermilionGymBattleText3 ; TextBeforeBattle + dw VermilionGymAfterBattleText3 ; TextAfterBattle + dw VermilionGymEndBattleText3 ; TextEndBattle + dw VermilionGymEndBattleText3 ; TextEndBattle + + db $ff + +VermilionGymText1: + TX_ASM + CheckEvent EVENT_BEAT_LT_SURGE + jr z, .asm_5cb39 + CheckEventReuseA EVENT_GOT_TM24 + jr nz, .asm_5cb31 + call z, VermilionGymScript_5caaa + call DisableWaitingAfterTextDisplay + jr .asm_5cb6a +.asm_5cb31 + ld hl, VermilionGymText_5cb72 + call PrintText + jr .asm_5cb6a +.asm_5cb39 + ld hl, VermilionGymText_5cb6d + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, ReceivedThunderbadgeText + ld de, ReceivedThunderbadgeText + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $3 + ld [wGymLeaderNo], a + xor a + ld [hJoyHeld], a + ld a, $3 + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a +.asm_5cb6a + jp TextScriptEnd + +VermilionGymText_5cb6d: + TX_FAR _VermilionGymText_5cb6d + db "@" + +VermilionGymText_5cb72: + TX_FAR _VermilionGymText_5cb72 + db "@" + +VermilionGymText6: + TX_FAR _VermilionGymText_5cb77 + db "@" + +VermilionGymText7: + TX_FAR _ReceivedTM24Text + TX_SFX_KEY_ITEM + TX_FAR _TM24ExplanationText + db "@" + +VermilionGymText8: + TX_FAR _TM24NoRoomText + db "@" + +ReceivedThunderbadgeText: + TX_FAR _ReceivedThunderbadgeText + db "@" + +VermilionGymText2: + TX_ASM + ld hl, VermilionGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +VermilionGymBattleText1: + TX_FAR _VermilionGymBattleText1 + db "@" + +VermilionGymEndBattleText1: + TX_FAR _VermilionGymEndBattleText1 + db "@" + +VermilionGymAfterBattleText1: + TX_FAR _VermilionGymAfterBattleText1 + db "@" + +VermilionGymText3: + TX_ASM + ld hl, VermilionGymTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +VermilionGymBattleText2: + TX_FAR _VermilionGymBattleText2 + db "@" + +VermilionGymEndBattleText2: + TX_FAR _VermilionGymEndBattleText2 + db "@" + +VermilionGymAfterBattleText2: + TX_FAR _VermilionGymAfterBattleText2 + db "@" + +VermilionGymText4: + TX_ASM + ld hl, VermilionGymTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +VermilionGymBattleText3: + TX_FAR _VermilionGymBattleText3 + db "@" + +VermilionGymEndBattleText3: + TX_FAR _VermilionGymEndBattleText3 + db "@" + +VermilionGymAfterBattleText3: + TX_FAR _VermilionGymAfterBattleText3 + db "@" + +VermilionGymText5: + TX_ASM + ld a, [wBeatGymFlags] + bit 2, a + jr nz, .asm_5cbeb + ld hl, VermilionGymText_5cbf4 + call PrintText + jr .asm_5cbf1 +.asm_5cbeb + ld hl, VermilionGymText_5cbf9 + call PrintText +.asm_5cbf1 + jp TextScriptEnd + +VermilionGymText_5cbf4: + TX_FAR _VermilionGymText_5cbf4 + db "@" + +VermilionGymText_5cbf9: + TX_FAR _VermilionGymText_5cbf9 + db "@" diff --git a/scripts/VermilionMart.asm b/scripts/VermilionMart.asm new file mode 100755 index 00000000..00ba0c26 --- /dev/null +++ b/scripts/VermilionMart.asm @@ -0,0 +1,15 @@ +VermilionMart_Script: + jp EnableAutoTextBoxDrawing + +VermilionMart_TextPointers: + dw VermilionCashierText + dw VermilionMartText2 + dw VermilionMartText3 + +VermilionMartText2: + TX_FAR _VermilionMartText2 + db "@" + +VermilionMartText3: + TX_FAR _VermilionMartText3 + db "@" diff --git a/scripts/VermilionOldRodHouse.asm b/scripts/VermilionOldRodHouse.asm new file mode 100755 index 00000000..772158ff --- /dev/null +++ b/scripts/VermilionOldRodHouse.asm @@ -0,0 +1,57 @@ +VermilionOldRodHouse_Script: + jp EnableAutoTextBoxDrawing + +VermilionOldRodHouse_TextPointers: + dw VermilionHouse2Text1 + +VermilionHouse2Text1: + TX_ASM + ld a, [wd728] + bit 3, a + jr nz, .asm_03ef5 + ld hl, VermilionHouse2Text_560b1 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_eb1b7 + lb bc, OLD_ROD, 1 + call GiveItem + jr nc, .BagFull + ld hl, wd728 + set 3, [hl] + ld hl, VermilionHouse2Text_560b6 + jr .asm_5dd95 +.BagFull + ld hl, VermilionHouse2Text_560ca + jr .asm_5dd95 +.asm_eb1b7 + ld hl, VermilionHouse2Text_560c0 + jr .asm_5dd95 +.asm_03ef5 + ld hl, VermilionHouse2Text_560c5 +.asm_5dd95 + call PrintText + jp TextScriptEnd + +VermilionHouse2Text_560b1: + TX_FAR _VermilionHouse2Text_560b1 + db "@" + +VermilionHouse2Text_560b6: + TX_FAR _VermilionHouse2Text_560b6 + TX_SFX_ITEM_1 + TX_FAR _VermilionHouse2Text_560bb + db "@" + +VermilionHouse2Text_560c0: + TX_FAR _VermilionHouse2Text_560c0 + db "@" + +VermilionHouse2Text_560c5: + TX_FAR _VermilionHouse2Text_560c5 + db "@" + +VermilionHouse2Text_560ca: + TX_FAR _VermilionHouse2Text_560ca + db "@" diff --git a/scripts/VermilionPidgeyHouse.asm b/scripts/VermilionPidgeyHouse.asm new file mode 100755 index 00000000..5004d367 --- /dev/null +++ b/scripts/VermilionPidgeyHouse.asm @@ -0,0 +1,24 @@ +VermilionPidgeyHouse_Script: + call EnableAutoTextBoxDrawing + ret + +VermilionPidgeyHouse_TextPointers: + dw VermilionHouse1Text1 + dw VermilionHouse1Text2 + dw VermilionHouse1Text3 + +VermilionHouse1Text1: + TX_FAR _VermilionHouse1Text1 + db "@" + +VermilionHouse1Text2: + TX_FAR _VermilionHouse1Text2 + TX_ASM + ld a, PIDGEY + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +VermilionHouse1Text3: + TX_FAR _VermilionHouse1Text3 + db "@" diff --git a/scripts/VermilionPokecenter.asm b/scripts/VermilionPokecenter.asm new file mode 100755 index 00000000..60b28c57 --- /dev/null +++ b/scripts/VermilionPokecenter.asm @@ -0,0 +1,23 @@ +VermilionPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +VermilionPokecenter_TextPointers: + dw VermilionHealNurseText + dw VermilionPokecenterText2 + dw VermilionPokecenterText3 + dw VermilionTradeNurseText + +VermilionHealNurseText: + TX_POKECENTER_NURSE + +VermilionPokecenterText2: + TX_FAR _VermilionPokecenterText2 + db "@" + +VermilionPokecenterText3: + TX_FAR _VermilionPokecenterText3 + db "@" + +VermilionTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/VermilionTradeHouse.asm b/scripts/VermilionTradeHouse.asm new file mode 100755 index 00000000..828e3716 --- /dev/null +++ b/scripts/VermilionTradeHouse.asm @@ -0,0 +1,12 @@ +VermilionTradeHouse_Script: + jp EnableAutoTextBoxDrawing + +VermilionTradeHouse_TextPointers: + dw VermilionHouse3Text1 + +VermilionHouse3Text1: + TX_ASM + ld a, $4 + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm new file mode 100755 index 00000000..0a2588a7 --- /dev/null +++ b/scripts/VictoryRoad1F.asm @@ -0,0 +1,103 @@ +VictoryRoad1F_Script: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + call nz, .next + call EnableAutoTextBoxDrawing + ld hl, VictoryRoad1TrainerHeader0 + ld de, VictoryRoad1F_ScriptPointers + ld a, [wVictoryRoad1FCurScript] + call ExecuteCurMapScriptInTable + ld [wVictoryRoad1FCurScript], a + ret +.next + CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH + ret z + ld a, $1d + ld [wNewTileBlockID], a + lb bc, 6, 4 + predef_jump ReplaceTileBlock + +VictoryRoad1F_ScriptPointers: + dw VictoryRoad1Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +VictoryRoad1Script0: + CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH + jp nz, CheckFightingMapTrainers + ld hl, CoordsData_5da5c + call CheckBoulderCoords + jp nc, CheckFightingMapTrainers + ld hl, wCurrentMapScriptFlags + set 5, [hl] + SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH + ret + +CoordsData_5da5c: + db $0D,$11,$FF + +VictoryRoad1F_TextPointers: + dw VictoryRoad1Text1 + dw VictoryRoad1Text2 + dw PickUpItemText + dw PickUpItemText + dw BoulderText + dw BoulderText + dw BoulderText + +VictoryRoad1TrainerHeader0: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 + dw VictoryRoad1BattleText1 ; TextBeforeBattle + dw VictoryRoad1AfterBattleText1 ; TextAfterBattle + dw VictoryRoad1EndBattleText1 ; TextEndBattle + dw VictoryRoad1EndBattleText1 ; TextEndBattle + +VictoryRoad1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 + dw VictoryRoad1BattleText2 ; TextBeforeBattle + dw VictoryRoad1AfterBattleText2 ; TextAfterBattle + dw VictoryRoad1EndBattleText2 ; TextEndBattle + dw VictoryRoad1EndBattleText2 ; TextEndBattle + + db $ff + +VictoryRoad1Text1: + TX_ASM + ld hl, VictoryRoad1TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad1Text2: + TX_ASM + ld hl, VictoryRoad1TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad1BattleText1: + TX_FAR _VictoryRoad1BattleText1 + db "@" + +VictoryRoad1EndBattleText1: + TX_FAR _VictoryRoad1EndBattleText1 + db "@" + +VictoryRoad1AfterBattleText1: + TX_FAR _VictoryRoad1AfterBattleText1 + db "@" + +VictoryRoad1BattleText2: + TX_FAR _VictoryRoad1BattleText2 + db "@" + +VictoryRoad1EndBattleText2: + TX_FAR _VictoryRoad1EndBattleText2 + db "@" + +VictoryRoad1AfterBattleText2: + TX_FAR _VictoryRoad1AfterBattleText2 + db "@" diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm new file mode 100755 index 00000000..9dfb05ed --- /dev/null +++ b/scripts/VictoryRoad2F.asm @@ -0,0 +1,244 @@ +VictoryRoad2F_Script: + ld hl, wCurrentMapScriptFlags + bit 6, [hl] + res 6, [hl] + call nz, VictoryRoad2Script_517c4 + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + call nz, VictoryRoad2Script_517c9 + call EnableAutoTextBoxDrawing + ld hl, VictoryRoad2TrainerHeader0 + ld de, VictoryRoad2F_ScriptPointers + ld a, [wVictoryRoad2FCurScript] + call ExecuteCurMapScriptInTable + ld [wVictoryRoad2FCurScript], a + ret + +VictoryRoad2Script_517c4: + ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH + +VictoryRoad2Script_517c9: + CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 + jr z, .asm_517da + push af + ld a, $15 + lb bc, 4, 3 + call VictoryRoad2Script_517e2 + pop af +.asm_517da + bit 7, a + ret z + ld a, $1d + lb bc, 7, 11 + +VictoryRoad2Script_517e2: + ld [wNewTileBlockID], a + predef ReplaceTileBlock + ret + +VictoryRoad2F_ScriptPointers: + dw VictoryRoad2Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +VictoryRoad2Script0: + ld hl, CoordsData_51816 + call CheckBoulderCoords + jp nc, CheckFightingMapTrainers + EventFlagAddress hl, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 + ld a, [wCoordIndex] + cp $2 + jr z, .asm_5180b + CheckEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 + SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 + ret nz + jr .asm_51810 +.asm_5180b + CheckEventAfterBranchReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 + SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 + ret nz +.asm_51810 + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ret + +CoordsData_51816: + db $10,$01 + db $10,$09 + db $FF + +VictoryRoad2F_TextPointers: + dw VictoryRoad2Text1 + dw VictoryRoad2Text2 + dw VictoryRoad2Text3 + dw VictoryRoad2Text4 + dw VictoryRoad2Text5 + dw MoltresText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw BoulderText + dw BoulderText + dw BoulderText + +VictoryRoad2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 + dw VictoryRoad2BattleText1 ; TextBeforeBattle + dw VictoryRoad2AfterBattleText1 ; TextAfterBattle + dw VictoryRoad2EndBattleText1 ; TextEndBattle + dw VictoryRoad2EndBattleText1 ; TextEndBattle + +VictoryRoad2TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 + dw VictoryRoad2BattleText2 ; TextBeforeBattle + dw VictoryRoad2AfterBattleText2 ; TextAfterBattle + dw VictoryRoad2EndBattleText2 ; TextEndBattle + dw VictoryRoad2EndBattleText2 ; TextEndBattle + +VictoryRoad2TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 + dw VictoryRoad2BattleText3 ; TextBeforeBattle + dw VictoryRoad2AfterBattleText3 ; TextAfterBattle + dw VictoryRoad2EndBattleText3 ; TextEndBattle + dw VictoryRoad2EndBattleText3 ; TextEndBattle + +VictoryRoad2TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 + dw VictoryRoad2BattleText4 ; TextBeforeBattle + dw VictoryRoad2AfterBattleText4 ; TextAfterBattle + dw VictoryRoad2EndBattleText4 ; TextEndBattle + dw VictoryRoad2EndBattleText4 ; TextEndBattle + +VictoryRoad2TrainerHeader4: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 + dw VictoryRoad2BattleText5 ; TextBeforeBattle + dw VictoryRoad2AfterBattleText5 ; TextAfterBattle + dw VictoryRoad2EndBattleText5 ; TextEndBattle + dw VictoryRoad2EndBattleText5 ; TextEndBattle + +MoltresTrainerHeader: + dbEventFlagBit EVENT_BEAT_MOLTRES + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_MOLTRES + dw MoltresBattleText ; TextBeforeBattle + dw MoltresBattleText ; TextAfterBattle + dw MoltresBattleText ; TextEndBattle + dw MoltresBattleText ; TextEndBattle + + db $ff + +VictoryRoad2Text1: + TX_ASM + ld hl, VictoryRoad2TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad2Text2: + TX_ASM + ld hl, VictoryRoad2TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad2Text3: + TX_ASM + ld hl, VictoryRoad2TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad2Text4: + TX_ASM + ld hl, VictoryRoad2TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad2Text5: + TX_ASM + ld hl, VictoryRoad2TrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +MoltresText: + TX_ASM + ld hl, MoltresTrainerHeader + call TalkToTrainer + jp TextScriptEnd + +MoltresBattleText: + TX_FAR _MoltresBattleText + TX_ASM + ld a, MOLTRES + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +VictoryRoad2BattleText1: + TX_FAR _VictoryRoad2BattleText1 + db "@" + +VictoryRoad2EndBattleText1: + TX_FAR _VictoryRoad2EndBattleText1 + db "@" + +VictoryRoad2AfterBattleText1: + TX_FAR _VictoryRoad2AfterBattleText1 + db "@" + +VictoryRoad2BattleText2: + TX_FAR _VictoryRoad2BattleText2 + db "@" + +VictoryRoad2EndBattleText2: + TX_FAR _VictoryRoad2EndBattleText2 + db "@" + +VictoryRoad2AfterBattleText2: + TX_FAR _VictoryRoad2AfterBattleText2 + db "@" + +VictoryRoad2BattleText3: + TX_FAR _VictoryRoad2BattleText3 + db "@" + +VictoryRoad2EndBattleText3: + TX_FAR _VictoryRoad2EndBattleText3 + db "@" + +VictoryRoad2AfterBattleText3: + TX_FAR _VictoryRoad2AfterBattleText3 + db "@" + +VictoryRoad2BattleText4: + TX_FAR _VictoryRoad2BattleText4 + db "@" + +VictoryRoad2EndBattleText4: + TX_FAR _VictoryRoad2EndBattleText4 + db "@" + +VictoryRoad2AfterBattleText4: + TX_FAR _VictoryRoad2AfterBattleText4 + db "@" + +VictoryRoad2BattleText5: + TX_FAR _VictoryRoad2BattleText5 + db "@" + +VictoryRoad2EndBattleText5: + TX_FAR _VictoryRoad2EndBattleText5 + db "@" + +VictoryRoad2AfterBattleText5: + TX_FAR _VictoryRoad2AfterBattleText5 + db "@" diff --git a/scripts/VictoryRoad3F.asm b/scripts/VictoryRoad3F.asm new file mode 100755 index 00000000..d145c4a1 --- /dev/null +++ b/scripts/VictoryRoad3F.asm @@ -0,0 +1,197 @@ +VictoryRoad3F_Script: + call VictoryRoad3Script_44996 + call EnableAutoTextBoxDrawing + ld hl, VictoryRoad3TrainerHeader0 + ld de, VictoryRoad3F_ScriptPointers + ld a, [wVictoryRoad3FCurScript] + call ExecuteCurMapScriptInTable + ld [wVictoryRoad3FCurScript], a + ret + +VictoryRoad3Script_44996: + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + ret z + CheckEventHL EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 + ret z + ld a, $1d + ld [wNewTileBlockID], a + lb bc, 5, 3 + predef_jump ReplaceTileBlock + +VictoryRoad3F_ScriptPointers: + dw VictoryRoad3Script0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +VictoryRoad3Script0: + ld hl, wFlags_0xcd60 + bit 7, [hl] + res 7, [hl] + jp z, .asm_449fe + ld hl, .coordsData_449f9 + call CheckBoulderCoords + jp nc, .asm_449fe + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_449dc + ld hl, wCurrentMapScriptFlags + set 5, [hl] + SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 + ret +.asm_449dc + CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 + jr nz, .asm_449fe + ld a, HS_VICTORY_ROAD_3F_BOULDER + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_VICTORY_ROAD_2F_BOULDER + ld [wMissableObjectIndex], a + predef_jump ShowObject + +.coordsData_449f9: + db $05,$03 + db $0F,$17 + db $FF + +.asm_449fe + ld a, VICTORY_ROAD_2F + ld [wDungeonWarpDestinationMap], a + ld hl, .coordsData_449f9 + call IsPlayerOnDungeonWarp + ld a, [wCoordIndex] + cp $1 + jr nz, .asm_44a1b + ld hl, wd72d + res 4, [hl] + ld hl, wd732 + res 4, [hl] + ret +.asm_44a1b + ld a, [wd72d] + bit 4, a + jp z, CheckFightingMapTrainers + ret + +VictoryRoad3F_TextPointers: + dw VictoryRoad3Text1 + dw VictoryRoad3Text2 + dw VictoryRoad3Text3 + dw VictoryRoad3Text4 + dw PickUpItemText + dw PickUpItemText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + +VictoryRoad3TrainerHeader0: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 + dw VictoryRoad3BattleText2 ; TextBeforeBattle + dw VictoryRoad3AfterBattleText2 ; TextAfterBattle + dw VictoryRoad3EndBattleText2 ; TextEndBattle + dw VictoryRoad3EndBattleText2 ; TextEndBattle + +VictoryRoad3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 + dw VictoryRoad3BattleText3 ; TextBeforeBattle + dw VictoryRoad3AfterBattleText3 ; TextAfterBattle + dw VictoryRoad3EndBattleText3 ; TextEndBattle + dw VictoryRoad3EndBattleText3 ; TextEndBattle + +VictoryRoad3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 + dw VictoryRoad3BattleText4 ; TextBeforeBattle + dw VictoryRoad3AfterBattleText4 ; TextAfterBattle + dw VictoryRoad3EndBattleText4 ; TextEndBattle + dw VictoryRoad3EndBattleText4 ; TextEndBattle + +VictoryRoad3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 + dw VictoryRoad3BattleText5 ; TextBeforeBattle + dw VictoryRoad3AfterBattleText5 ; TextAfterBattle + dw VictoryRoad3EndBattleText5 ; TextEndBattle + dw VictoryRoad3EndBattleText5 ; TextEndBattle + + db $ff + +VictoryRoad3Text1: + TX_ASM + ld hl, VictoryRoad3TrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad3Text2: + TX_ASM + ld hl, VictoryRoad3TrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad3Text3: + TX_ASM + ld hl, VictoryRoad3TrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad3Text4: + TX_ASM + ld hl, VictoryRoad3TrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +VictoryRoad3BattleText2: + TX_FAR _VictoryRoad3BattleText2 + db "@" + +VictoryRoad3EndBattleText2: + TX_FAR _VictoryRoad3EndBattleText2 + db "@" + +VictoryRoad3AfterBattleText2: + TX_FAR _VictoryRoad3AfterBattleText2 + db "@" + +VictoryRoad3BattleText3: + TX_FAR _VictoryRoad3BattleText3 + db "@" + +VictoryRoad3EndBattleText3: + TX_FAR _VictoryRoad3EndBattleText3 + db "@" + +VictoryRoad3AfterBattleText3: + TX_FAR _VictoryRoad3AfterBattleText3 + db "@" + +VictoryRoad3BattleText4: + TX_FAR _VictoryRoad3BattleText4 + db "@" + +VictoryRoad3EndBattleText4: + TX_FAR _VictoryRoad3EndBattleText4 + db "@" + +VictoryRoad3AfterBattleText4: + TX_FAR _VictoryRoad3AfterBattleText4 + db "@" + +VictoryRoad3BattleText5: + TX_FAR _VictoryRoad3BattleText5 + db "@" + +VictoryRoad3EndBattleText5: + TX_FAR _VictoryRoad3EndBattleText5 + db "@" + +VictoryRoad3AfterBattleText5: + TX_FAR _VictoryRoad3AfterBattleText5 + db "@" diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm new file mode 100755 index 00000000..b70927b2 --- /dev/null +++ b/scripts/ViridianCity.asm @@ -0,0 +1,327 @@ +ViridianCity_Script: + call EnableAutoTextBoxDrawing + ld hl, ViridianCity_ScriptPointers + ld a, [wViridianCityCurScript] + jp CallFunctionInTable + +ViridianCity_ScriptPointers: + dw ViridianCityScript0 + dw ViridianCityScript1 + dw ViridianCityScript2 + dw ViridianCityScript3 + +ViridianCityScript0: + call ViridianCityScript_1900b + jp ViridianCityScript_1903d + +ViridianCityScript_1900b: + CheckEvent EVENT_VIRIDIAN_GYM_OPEN + ret nz + ld a, [wObtainedBadges] + cp %01111111 + jr nz, .asm_1901e + SetEvent EVENT_VIRIDIAN_GYM_OPEN + ret +.asm_1901e + ld a, [wYCoord] + cp $8 + ret nz + ld a, [wXCoord] + cp $20 + ret nz + ld a, $e + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [hJoyHeld], a + call ViridianCityScript_190cf + ld a, $3 + ld [wViridianCityCurScript], a + ret + +ViridianCityScript_1903d: + CheckEvent EVENT_GOT_POKEDEX + ret nz + ld a, [wYCoord] + cp $9 + ret nz + ld a, [wXCoord] + cp $13 + ret nz + ld a, $5 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [hJoyHeld], a + call ViridianCityScript_190cf + ld a, $3 + ld [wViridianCityCurScript], a + ret + +ViridianCityScript1: + ld a, [wSpriteStateData1 + $34] + ld [$ffeb], a + ld a, [wSpriteStateData1 + $36] + ld [$ffec], a + ld a, [wSpriteStateData2 + $34] + ld [$ffed], a + ld a, [wSpriteStateData2 + $35] + ld [$ffee], a + xor a + ld [wListScrollOffset], a + + ; set up battle for Old Man + ld a, BATTLE_TYPE_OLD_MAN + ld [wBattleType], a + ld a, 5 + ld [wCurEnemyLVL], a + ld a, WEEDLE + ld [wCurOpponent], a + ld a, $2 + ld [wViridianCityCurScript], a + ret + +ViridianCityScript2: + ld a, [$ffeb] + ld [wSpriteStateData1 + $34], a + ld a, [$ffec] + ld [wSpriteStateData1 + $36], a + ld a, [$ffed] + ld [wSpriteStateData2 + $34], a + ld a, [$ffee] + ld [wSpriteStateData2 + $35], a + call UpdateSprites + call Delay3 + xor a + ld [wJoyIgnore], a + ld a, $f + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wBattleType], a + ld [wJoyIgnore], a + ld a, $0 + ld [wViridianCityCurScript], a + ret + +ViridianCityScript3: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + ld a, 0 + ld [wViridianCityCurScript], a + ret + +ViridianCityScript_190cf: + call StartSimulatingJoypadStates + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + xor a + ld [wSpriteStateData1 + 9], a + ld [wJoyIgnore], a + ret + +ViridianCity_TextPointers: + dw ViridianCityText1 + dw ViridianCityText2 + dw ViridianCityText3 + dw ViridianCityText4 + dw ViridianCityText5 + dw ViridianCityText6 + dw ViridianCityText7 + dw ViridianCityText8 + dw ViridianCityText9 + dw ViridianCityText10 + dw MartSignText + dw PokeCenterSignText + dw ViridianCityText13 + dw ViridianCityText14 + dw ViridianCityText15 + +ViridianCityText1: + TX_FAR _ViridianCityText1 + db "@" + +ViridianCityText2: + TX_ASM + ld a, [wObtainedBadges] + cp %01111111 + ld hl, ViridianCityText_19127 + jr z, .asm_ae9fe + CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI + jr nz, .asm_ae9fe + ld hl, ViridianCityText_19122 +.asm_ae9fe + call PrintText + jp TextScriptEnd + +ViridianCityText_19122: + TX_FAR _ViridianCityText_19122 + db "@" + +ViridianCityText_19127: + TX_FAR _ViridianCityText_19127 + db "@" + +ViridianCityText3: + TX_ASM + ld hl, ViridianCityText_1914d + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_6dfea + ld hl, ViridianCityText_19157 + call PrintText + jr .asm_d611f +.asm_6dfea + ld hl, ViridianCityText_19152 + call PrintText +.asm_d611f + jp TextScriptEnd + +ViridianCityText_1914d: + TX_FAR _ViridianCityText_1914d + db "@" + +ViridianCityText_19152: + TX_FAR _ViridianCityText_19152 + db "@" + +ViridianCityText_19157: + TX_FAR _ViridianCityText_19157 + db "@" + +ViridianCityText4: + TX_ASM + CheckEvent EVENT_GOT_POKEDEX + jr nz, .asm_83894 + ld hl, ViridianCityText_19175 + call PrintText + jr .asm_700a6 +.asm_83894 + ld hl, ViridianCityText_1917a + call PrintText +.asm_700a6 + jp TextScriptEnd + +ViridianCityText_19175: + TX_FAR _ViridianCityText_19175 + db "@" + +ViridianCityText_1917a: + TX_FAR _ViridianCityText_1917a + db "@" + +ViridianCityText5: + TX_ASM + ld hl, ViridianCityText_19191 + call PrintText + call ViridianCityScript_190cf + ld a, $3 + ld [wViridianCityCurScript], a + jp TextScriptEnd + +ViridianCityText_19191: + TX_FAR _ViridianCityText_19191 + db "@" + +ViridianCityText6: + TX_ASM + CheckEvent EVENT_GOT_TM42 + jr nz, .asm_4e5a0 + ld hl, ViridianCityText_191ca + call PrintText + lb bc, TM_42, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedTM42Text + call PrintText + SetEvent EVENT_GOT_TM42 + jr .asm_3c73c +.BagFull + ld hl, TM42NoRoomText + call PrintText + jr .asm_3c73c +.asm_4e5a0 + ld hl, TM42Explanation + call PrintText +.asm_3c73c + jp TextScriptEnd + +ViridianCityText_191ca: + TX_FAR _ViridianCityText_191ca + db "@" + +ReceivedTM42Text: + TX_FAR _ReceivedTM42Text + TX_SFX_ITEM_2 + db "@" + +TM42Explanation: + TX_FAR _TM42Explanation + db "@" + +TM42NoRoomText: + TX_FAR _TM42NoRoomText + db "@" + +ViridianCityText7: + TX_ASM + ld hl, ViridianCityText_1920a + call PrintText + ld c, 2 + call DelayFrames + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr z, .asm_42f68 + ld hl, ViridianCityText_1920f + call PrintText + ld a, $1 + ld [wViridianCityCurScript], a + jr .asm_2413a +.asm_42f68 + ld hl, ViridianCityText_19214 + call PrintText +.asm_2413a + jp TextScriptEnd + +ViridianCityText_1920a: + TX_FAR _ViridianCityText_1920a + db "@" + +ViridianCityText_1920f: + TX_FAR _ViridianCityText_1920f + db "@" + +ViridianCityText_19214: + TX_FAR _ViridianCityText_19214 + db "@" + +ViridianCityText15: + TX_FAR _ViridianCityText_19219 + db "@" + +ViridianCityText8: + TX_FAR _ViridianCityText8 + db "@" + +ViridianCityText9: + TX_FAR _ViridianCityText9 + db "@" + +ViridianCityText10: + TX_FAR _ViridianCityText10 + db "@" + +ViridianCityText13: + TX_FAR _ViridianCityText13 + db "@" + +ViridianCityText14: + TX_FAR _ViridianCityText14 + db "@" diff --git a/scripts/ViridianForest.asm b/scripts/ViridianForest.asm new file mode 100755 index 00000000..acd26b8a --- /dev/null +++ b/scripts/ViridianForest.asm @@ -0,0 +1,144 @@ +ViridianForest_Script: + call EnableAutoTextBoxDrawing + ld hl, ViridianForestTrainerHeader0 + ld de, ViridianForest_ScriptPointers + ld a, [wViridianForestCurScript] + call ExecuteCurMapScriptInTable + ld [wViridianForestCurScript], a + ret + +ViridianForest_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + +ViridianForest_TextPointers: + dw ViridianForestText1 + dw ViridianForestText2 + dw ViridianForestText3 + dw ViridianForestText4 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw ViridianForestText8 + dw ViridianForestText9 + dw ViridianForestText10 + dw ViridianForestText11 + dw ViridianForestText12 + dw ViridianForestText13 + dw ViridianForestText14 + +ViridianForestTrainerHeader0: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 + dw ViridianForestBattleText1 ; TextBeforeBattle + dw ViridianForestAfterBattleText1 ; TextAfterBattle + dw ViridianForestEndBattleText1 ; TextEndBattle + dw ViridianForestEndBattleText1 ; TextEndBattle + +ViridianForestTrainerHeader1: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 + dw ViridianForestBattleText2 ; TextBeforeBattle + dw ViridianForestAfterBattleText2 ; TextAfterBattle + dw ViridianForestEndBattleText2 ; TextEndBattle + dw ViridianForestEndBattleText2 ; TextEndBattle + +ViridianForestTrainerHeader2: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 + db ($1 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 + dw ViridianForestBattleText3 ; TextBeforeBattle + dw ViridianForestAfterBattleText3 ; TextAfterBattle + dw ViridianForestEndBattleText3 ; TextEndBattle + dw ViridianForestEndBattleText3 ; TextEndBattle + + db $ff + +ViridianForestText1: + TX_FAR _ViridianForestText1 + db "@" + +ViridianForestText2: + TX_ASM + ld hl, ViridianForestTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +ViridianForestText3: + TX_ASM + ld hl, ViridianForestTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +ViridianForestText4: + TX_ASM + ld hl, ViridianForestTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +ViridianForestBattleText1: + TX_FAR _ViridianForestBattleText1 + db "@" + +ViridianForestEndBattleText1: + TX_FAR _ViridianForestEndBattleText1 + db "@" + +ViridianForestAfterBattleText1: + TX_FAR _ViridianFrstAfterBattleText1 + db "@" + +ViridianForestBattleText2: + TX_FAR _ViridianForestBattleText2 + db "@" + +ViridianForestEndBattleText2: + TX_FAR _ViridianForestEndBattleText2 + db "@" + +ViridianForestAfterBattleText2: + TX_FAR _ViridianFrstAfterBattleText2 + db "@" + +ViridianForestBattleText3: + TX_FAR _ViridianForestBattleText3 + db "@" + +ViridianForestEndBattleText3: + TX_FAR _ViridianForestEndBattleText3 + db "@" + +ViridianForestAfterBattleText3: + TX_FAR _ViridianFrstAfterBattleText3 + db "@" + +ViridianForestText8: + TX_FAR _ViridianForestText8 + db "@" + +ViridianForestText9: + TX_FAR _ViridianForestText9 + db "@" + +ViridianForestText10: + TX_FAR _ViridianForestText10 + db "@" + +ViridianForestText11: + TX_FAR _ViridianForestText11 + db "@" + +ViridianForestText12: + TX_FAR _ViridianForestText12 + db "@" + +ViridianForestText13: + TX_FAR _ViridianForestText13 + db "@" + +ViridianForestText14: + TX_FAR _ViridianForestText14 + db "@" diff --git a/scripts/ViridianForestNorthGate.asm b/scripts/ViridianForestNorthGate.asm new file mode 100755 index 00000000..e421bf5b --- /dev/null +++ b/scripts/ViridianForestNorthGate.asm @@ -0,0 +1,14 @@ +ViridianForestNorthGate_Script: + jp EnableAutoTextBoxDrawing + +ViridianForestNorthGate_TextPointers: + dw ViridianForestExitText1 + dw ViridianForestExitText2 + +ViridianForestExitText1: + TX_FAR _ViridianForestExitText1 + db "@" + +ViridianForestExitText2: + TX_FAR _ViridianForestExitText2 + db "@" diff --git a/scripts/ViridianForestSouthGate.asm b/scripts/ViridianForestSouthGate.asm new file mode 100755 index 00000000..397f0eca --- /dev/null +++ b/scripts/ViridianForestSouthGate.asm @@ -0,0 +1,14 @@ +ViridianForestSouthGate_Script: + jp EnableAutoTextBoxDrawing + +ViridianForestSouthGate_TextPointers: + dw ViridianForestEntranceText1 + dw ViridianForestEntranceText2 + +ViridianForestEntranceText1: + TX_FAR _ViridianForestEntranceText1 + db "@" + +ViridianForestEntranceText2: + TX_FAR _ViridianForestEntranceText2 + db "@" diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm new file mode 100755 index 00000000..44966fef --- /dev/null +++ b/scripts/ViridianGym.asm @@ -0,0 +1,496 @@ +ViridianGym_Script: + ld hl, Gym8CityName + ld de, Gym8LeaderName + call LoadGymLeaderAndCityName + call EnableAutoTextBoxDrawing + ld hl, ViridianGymTrainerHeader0 + ld de, ViridianGym_ScriptPointers + ld a, [wViridianGymCurScript] + call ExecuteCurMapScriptInTable + ld [wViridianGymCurScript], a + ret + +Gym8CityName: + db "VIRIDIAN CITY@" +Gym8LeaderName: + db "GIOVANNI@" + +ViridianGymScript_748d6: + xor a + ld [wJoyIgnore], a + ld [wViridianGymCurScript], a + ld [wCurMapScript], a + ret + +ViridianGym_ScriptPointers: + dw ViridianGymScript0 + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle + dw ViridianGymScript3 + dw ViridianGymScript4 + +ViridianGymScript0: + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a + ld hl, ViridianGymArrowTilePlayerMovement + call DecodeArrowMovementRLE + cp $ff + jp z, CheckFightingMapTrainers + call StartSimulatingJoypadStates + ld hl, wd736 + set 7, [hl] + ld a, SFX_ARROW_TILES + call PlaySound + ld a, $ff + ld [wJoyIgnore], a + ld a, $4 + ld [wCurMapScript], a + ret + +;format: +;db y,x +;dw pointer to movement +ViridianGymArrowTilePlayerMovement: + db $b,$13 + dw ViridianGymArrowMovement1 + db $1,$13 + dw ViridianGymArrowMovement2 + db $2,$12 + dw ViridianGymArrowMovement3 + db $2,$b + dw ViridianGymArrowMovement4 + db $a,$10 + dw ViridianGymArrowMovement5 + db $6,$4 + dw ViridianGymArrowMovement6 + db $d,$5 + dw ViridianGymArrowMovement7 + db $e,$4 + dw ViridianGymArrowMovement8 + db $f,$0 + dw ViridianGymArrowMovement9 + db $f,$1 + dw ViridianGymArrowMovement10 + db $10,$d + dw ViridianGymArrowMovement11 + db $11,$d + dw ViridianGymArrowMovement12 + db $FF + +;format: direction, count +ViridianGymArrowMovement1: + db D_UP,$09,$FF + +ViridianGymArrowMovement2: + db D_LEFT,$08,$FF + +ViridianGymArrowMovement3: + db D_DOWN,$09,$FF + +ViridianGymArrowMovement4: + db D_RIGHT,$06,$FF + +ViridianGymArrowMovement5: + db D_DOWN,$02,$FF + +ViridianGymArrowMovement6: + db D_DOWN,$07,$FF + +ViridianGymArrowMovement7: + db D_RIGHT,$08,$FF + +ViridianGymArrowMovement8: + db D_RIGHT,$09,$FF + +ViridianGymArrowMovement9: + db D_UP,$08,$FF + +ViridianGymArrowMovement10: + db D_UP,$06,$FF + +ViridianGymArrowMovement11: + db D_LEFT,$06,$FF + +ViridianGymArrowMovement12: + db D_LEFT,$0C,$FF + +ViridianGymScript4: + ld a, [wSimulatedJoypadStatesIndex] + and a + jr nz, .asm_74980 + xor a + ld [wJoyIgnore], a + ld hl, wd736 + res 7, [hl] + ld a, $0 + ld [wCurMapScript], a + ret +.asm_74980 + jpba LoadSpinnerArrowTiles + +ViridianGymScript3: + ld a, [wIsInBattle] + cp $ff + jp z, ViridianGymScript_748d6 + ld a, $f0 + ld [wJoyIgnore], a +ViridianGymScript3_74995: + ld a, $c + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI + lb bc, TM_27, 1 + call GiveItem + jr nc, .BagFull + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_TM27 + jr .asm_749be +.BagFull + ld a, $e + ld [hSpriteIndexOrTextID], a + call DisplayTextID +.asm_749be + ld hl, wObtainedBadges + set 7, [hl] + ld hl, wBeatGymFlags + set 7, [hl] + + ; deactivate gym trainers + SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7 + + ld a, HS_ROUTE_22_RIVAL_2 + ld [wMissableObjectIndex], a + predef ShowObject + SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE + jp ViridianGymScript_748d6 + +ViridianGym_TextPointers: + dw ViridianGymText1 + dw ViridianGymText2 + dw ViridianGymText3 + dw ViridianGymText4 + dw ViridianGymText5 + dw ViridianGymText6 + dw ViridianGymText7 + dw ViridianGymText8 + dw ViridianGymText9 + dw ViridianGymText10 + dw PickUpItemText + dw ViridianGymText12 + dw ViridianGymText13 + dw ViridianGymText14 + +ViridianGymTrainerHeader0: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 + dw ViridianGymBattleText1 ; TextBeforeBattle + dw ViridianGymAfterBattleText1 ; TextAfterBattle + dw ViridianGymEndBattleText1 ; TextEndBattle + dw ViridianGymEndBattleText1 ; TextEndBattle + +ViridianGymTrainerHeader1: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 + dw ViridianGymBattleText2 ; TextBeforeBattle + dw ViridianGymAfterBattleText2 ; TextAfterBattle + dw ViridianGymEndBattleText2 ; TextEndBattle + dw ViridianGymEndBattleText2 ; TextEndBattle + +ViridianGymTrainerHeader2: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 + dw ViridianGymBattleText3 ; TextBeforeBattle + dw ViridianGymAfterBattleText3 ; TextAfterBattle + dw ViridianGymEndBattleText3 ; TextEndBattle + dw ViridianGymEndBattleText3 ; TextEndBattle + +ViridianGymTrainerHeader3: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 + db ($2 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 + dw ViridianGymBattleText4 ; TextBeforeBattle + dw ViridianGymAfterBattleText4 ; TextAfterBattle + dw ViridianGymEndBattleText4 ; TextEndBattle + dw ViridianGymEndBattleText4 ; TextEndBattle + +ViridianGymTrainerHeader4: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 + dw ViridianGymBattleText5 ; TextBeforeBattle + dw ViridianGymAfterBattleText5 ; TextAfterBattle + dw ViridianGymEndBattleText5 ; TextEndBattle + dw ViridianGymEndBattleText5 ; TextEndBattle + +ViridianGymTrainerHeader5: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 + dw ViridianGymBattleText6 ; TextBeforeBattle + dw ViridianGymAfterBattleText6 ; TextAfterBattle + dw ViridianGymEndBattleText6 ; TextEndBattle + dw ViridianGymEndBattleText6 ; TextEndBattle + +ViridianGymTrainerHeader6: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 + db ($3 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 + dw ViridianGymBattleText7 ; TextBeforeBattle + dw ViridianGymAfterBattleText7 ; TextAfterBattle + dw ViridianGymEndBattleText7 ; TextEndBattle + dw ViridianGymEndBattleText7 ; TextEndBattle + +ViridianGymTrainerHeader7: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 + dw ViridianGymBattleText8 ; TextBeforeBattle + dw ViridianGymAfterBattleText8 ; TextAfterBattle + dw ViridianGymEndBattleText8 ; TextEndBattle + dw ViridianGymEndBattleText8 ; TextEndBattle + + db $ff + +ViridianGymText1: + TX_ASM + CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI + jr z, .asm_6de66 + CheckEventReuseA EVENT_GOT_TM27 + jr nz, .asm_9fc95 + call z, ViridianGymScript3_74995 + call DisableWaitingAfterTextDisplay + jr .asm_6dff7 +.asm_9fc95 + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, ViridianGymText_74ad9 + call PrintText + call GBFadeOutToBlack + ld a, HS_VIRIDIAN_GYM_GIOVANNI + ld [wMissableObjectIndex], a + predef HideObject + call UpdateSprites + call Delay3 + call GBFadeInFromBlack + jr .asm_6dff7 +.asm_6de66 + ld hl, ViridianGymText_74ace + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, ViridianGymText_74ad3 + ld de, ViridianGymText_74ad3 + call SaveEndBattleTextPointers + ld a, [H_SPRITEINDEX] + ld [wSpriteIndex], a + call EngageMapTrainer + call InitBattleEnemyParameters + ld a, $8 + ld [wGymLeaderNo], a + ld a, $3 + ld [wViridianGymCurScript], a +.asm_6dff7 + jp TextScriptEnd + +ViridianGymText_74ace: + TX_FAR _ViridianGymText_74ace + db "@" + +ViridianGymText_74ad3: + TX_FAR _ViridianGymText_74ad3 + TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + db "@" + +ViridianGymText_74ad9: + TX_FAR _ViridianGymText_74ad9 + TX_WAIT + db "@" + +ViridianGymText12: + TX_FAR _ViridianGymText12 + db "@" + +ViridianGymText13: + TX_FAR _ReceivedTM27Text + TX_SFX_ITEM_1 + +TM27ExplanationText: + TX_FAR _TM27ExplanationText + db "@" + +ViridianGymText14: + TX_FAR _TM27NoRoomText + db "@" + +ViridianGymText2: + TX_ASM + ld hl, ViridianGymTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText1: + TX_FAR _ViridianGymBattleText1 + db "@" + +ViridianGymEndBattleText1: + TX_FAR _ViridianGymEndBattleText1 + db "@" + +ViridianGymAfterBattleText1: + TX_FAR _ViridianGymAfterBattleText1 + db "@" + +ViridianGymText3: + TX_ASM + ld hl, ViridianGymTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText2: + TX_FAR _ViridianGymBattleText2 + db "@" + +ViridianGymEndBattleText2: + TX_FAR _ViridianGymEndBattleText2 + db "@" + +ViridianGymAfterBattleText2: + TX_FAR _ViridianGymAfterBattleText2 + db "@" + +ViridianGymText4: + TX_ASM + ld hl, ViridianGymTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText3: + TX_FAR _ViridianGymBattleText3 + db "@" + +ViridianGymEndBattleText3: + TX_FAR _ViridianGymEndBattleText3 + db "@" + +ViridianGymAfterBattleText3: + TX_FAR _ViridianGymAfterBattleText3 + db "@" + +ViridianGymText5: + TX_ASM + ld hl, ViridianGymTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText4: + TX_FAR _ViridianGymBattleText4 + db "@" + +ViridianGymEndBattleText4: + TX_FAR _ViridianGymEndBattleText4 + db "@" + +ViridianGymAfterBattleText4: + TX_FAR _ViridianGymAfterBattleText4 + db "@" + +ViridianGymText6: + TX_ASM + ld hl, ViridianGymTrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText5: + TX_FAR _ViridianGymBattleText5 + db "@" + +ViridianGymEndBattleText5: + TX_FAR _ViridianGymEndBattleText5 + db "@" + +ViridianGymAfterBattleText5: + TX_FAR _ViridianGymAfterBattleText5 + db "@" + +ViridianGymText7: + TX_ASM + ld hl, ViridianGymTrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText6: + TX_FAR _ViridianGymBattleText6 + db "@" + +ViridianGymEndBattleText6: + TX_FAR _ViridianGymEndBattleText6 + db "@" + +ViridianGymAfterBattleText6: + TX_FAR _ViridianGymAfterBattleText6 + db "@" + +ViridianGymText8: + TX_ASM + ld hl, ViridianGymTrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText7: + TX_FAR _ViridianGymBattleText7 + db "@" + +ViridianGymEndBattleText7: + TX_FAR _ViridianGymEndBattleText7 + db "@" + +ViridianGymAfterBattleText7: + TX_FAR _ViridianGymAfterBattleText7 + db "@" + +ViridianGymText9: + TX_ASM + ld hl, ViridianGymTrainerHeader7 + call TalkToTrainer + jp TextScriptEnd + +ViridianGymBattleText8: + TX_FAR _ViridianGymBattleText8 + db "@" + +ViridianGymEndBattleText8: + TX_FAR _ViridianGymEndBattleText8 + db "@" + +ViridianGymAfterBattleText8: + TX_FAR _ViridianGymAfterBattleText8 + db "@" + +ViridianGymText10: + TX_ASM + CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI + jr nz, .asm_1abd1 + ld hl, ViridianGymText_74bd4 + call PrintText + jr .asm_6064d +.asm_1abd1 + ld hl, ViridianGymText_74bd9 + call PrintText +.asm_6064d + jp TextScriptEnd + +ViridianGymText_74bd4: + TX_FAR _ViridianGymText_74bd4 + db "@" + +ViridianGymText_74bd9: + TX_FAR _ViridianGymText_74bd9 + db "@" diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm new file mode 100755 index 00000000..b90d331c --- /dev/null +++ b/scripts/ViridianMart.asm @@ -0,0 +1,94 @@ +ViridianMart_Script: + call ViridianMartScript_1d47d + call EnableAutoTextBoxDrawing + ld hl, ViridianMart_ScriptPointers + ld a, [wViridianMartCurScript] + jp CallFunctionInTable + +ViridianMartScript_1d47d: + CheckEvent EVENT_OAK_GOT_PARCEL + jr nz, .asm_1d489 + ld hl, ViridianMart_TextPointers + jr .asm_1d48c +.asm_1d489 + ld hl, ViridianMart_TextPointers2 +.asm_1d48c + ld a, l + ld [wMapTextPtr], a + ld a, h + ld [wMapTextPtr+1], a + ret + +ViridianMart_ScriptPointers: + dw ViridianMartScript0 + dw ViridianMartScript1 + dw ViridianMartScript2 + +ViridianMartScript0: + call UpdateSprites + ld a, $4 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + ld hl, wSimulatedJoypadStatesEnd + ld de, RLEMovement1d4bb + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + call StartSimulatingJoypadStates + ld a, $1 + ld [wViridianMartCurScript], a + ret + +RLEMovement1d4bb: + db D_LEFT, $01 + db D_UP, $02 + db $ff + +ViridianMartScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + ld a, $5 + ld [hSpriteIndexOrTextID], a + call DisplayTextID + lb bc, OAKS_PARCEL, 1 + call GiveItem + SetEvent EVENT_GOT_OAKS_PARCEL + ld a, $2 + ld [wViridianMartCurScript], a + ; fallthrough +ViridianMartScript2: + ret + +ViridianMart_TextPointers: + dw ViridianMartText1 + dw ViridianMartText2 + dw ViridianMartText3 + dw ViridianMartText4 + dw ViridianMartText5 +ViridianMart_TextPointers2: + dw ViridianCashierText + dw ViridianMartText2 + dw ViridianMartText3 + +ViridianMartText1: + TX_FAR _ViridianMartText1 + db "@" + +ViridianMartText4: + TX_FAR _ViridianMartText4 + db "@" + +ViridianMartText5: + TX_FAR ViridianMartParcelQuestText + TX_SFX_KEY_ITEM + db "@" + +ViridianMartText2: + TX_FAR _ViridianMartText2 + db "@" + +ViridianMartText3: + TX_FAR _ViridianMartText3 + db "@" diff --git a/scripts/ViridianNicknameHouse.asm b/scripts/ViridianNicknameHouse.asm new file mode 100755 index 00000000..000fe82b --- /dev/null +++ b/scripts/ViridianNicknameHouse.asm @@ -0,0 +1,33 @@ +ViridianNicknameHouse_Script: + jp EnableAutoTextBoxDrawing + +ViridianNicknameHouse_TextPointers: + dw ViridianHouseText1 + dw ViridianHouseText2 + dw ViridianHouseText3 + dw ViridianHouseText4 + +ViridianHouseText1: + TX_FAR _ViridianHouseText1 + db "@" + +ViridianHouseText2: + TX_FAR _ViridianHouseText2 + db "@" + +ViridianHouseText3: + TX_ASM + ld hl, ViridianHouseText_1d5b1 + call PrintText + ld a, SPEAROW + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +ViridianHouseText_1d5b1: + TX_FAR _ViridianHouseText_1d5b1 + db "@" + +ViridianHouseText4: + TX_FAR _ViridianHouseText4 + db "@" diff --git a/scripts/ViridianPokecenter.asm b/scripts/ViridianPokecenter.asm new file mode 100755 index 00000000..14c25b9f --- /dev/null +++ b/scripts/ViridianPokecenter.asm @@ -0,0 +1,23 @@ +ViridianPokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +ViridianPokecenter_TextPointers: + dw ViridianHealNurseText + dw ViridianPokeCenterText2 + dw ViridianPokeCenterText3 + dw ViridianTradeNurseText + +ViridianHealNurseText: + TX_POKECENTER_NURSE + +ViridianPokeCenterText2: + TX_FAR _ViridianPokeCenterText2 + db "@" + +ViridianPokeCenterText3: + TX_FAR _ViridianPokeCenterText3 + db "@" + +ViridianTradeNurseText: + TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/ViridianSchoolHouse.asm b/scripts/ViridianSchoolHouse.asm new file mode 100755 index 00000000..2d9579b7 --- /dev/null +++ b/scripts/ViridianSchoolHouse.asm @@ -0,0 +1,14 @@ +ViridianSchoolHouse_Script: + jp EnableAutoTextBoxDrawing + +ViridianSchoolHouse_TextPointers: + dw SchoolText1 + dw SchoolText2 + +SchoolText1: + TX_FAR _SchoolText1 + db "@" + +SchoolText2: + TX_FAR _SchoolText2 + db "@" diff --git a/scripts/WardensHouse.asm b/scripts/WardensHouse.asm new file mode 100755 index 00000000..69e199c9 --- /dev/null +++ b/scripts/WardensHouse.asm @@ -0,0 +1,113 @@ +WardensHouse_Script: + jp EnableAutoTextBoxDrawing + +WardensHouse_TextPointers: + dw FuchsiaHouse2Text1 + dw PickUpItemText + dw BoulderText + dw FuchsiaHouse2Text4 + dw FuchsiaHouse2Text5 + +FuchsiaHouse2Text1: + TX_ASM + CheckEvent EVENT_GOT_HM04 + jr nz, .subtract + ld b, GOLD_TEETH + call IsItemInBag + jr nz, .asm_3f30f + CheckEvent EVENT_GAVE_GOLD_TEETH + jr nz, .asm_60cba + ld hl, WardenGibberishText1 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ld hl, WardenGibberishText3 + jr nz, .asm_61238 + ld hl, WardenGibberishText2 +.asm_61238 + call PrintText + jr .asm_52039 +.asm_3f30f + ld hl, WardenTeethText1 + call PrintText + ld a, GOLD_TEETH + ld [$ffdb], a + callba RemoveItemByID + SetEvent EVENT_GAVE_GOLD_TEETH +.asm_60cba + ld hl, WardenThankYouText + call PrintText + lb bc, HM_04, 1 + call GiveItem + jr nc, .BagFull + ld hl, ReceivedHM04Text + call PrintText + SetEvent EVENT_GOT_HM04 + jr .asm_52039 +.subtract + ld hl, HM04ExplanationText + call PrintText + jr .asm_52039 +.BagFull + ld hl, HM04NoRoomText + call PrintText +.asm_52039 + jp TextScriptEnd + +WardenGibberishText1: + TX_FAR _WardenGibberishText1 + db "@" + +WardenGibberishText2: + TX_FAR _WardenGibberishText2 + db "@" + +WardenGibberishText3: + TX_FAR _WardenGibberishText3 + db "@" + +WardenTeethText1: + TX_FAR _WardenTeethText1 + TX_SFX_ITEM_1 + +WardenTeethText2: + TX_FAR _WardenTeethText2 + db "@" + +WardenThankYouText: + TX_FAR _WardenThankYouText + db "@" + +ReceivedHM04Text: + TX_FAR _ReceivedHM04Text + TX_SFX_ITEM_1 + db "@" + +HM04ExplanationText: + TX_FAR _HM04ExplanationText + db "@" + +HM04NoRoomText: + TX_FAR _HM04NoRoomText + db "@" + +FuchsiaHouse2Text5: +FuchsiaHouse2Text4: + TX_ASM + ld a, [H_SPRITEINDEX] + cp $4 + ld hl, FuchsiaHouse2Text_7517b + jr nz, .asm_4c9a2 + ld hl, FuchsiaHouse2Text_75176 +.asm_4c9a2 + call PrintText + jp TextScriptEnd + +FuchsiaHouse2Text_75176: + TX_FAR _FuchsiaHouse2Text_75176 + db "@" + +FuchsiaHouse2Text_7517b: + TX_FAR _FuchsiaHouse2Text_7517b + db "@" diff --git a/scripts/agatha.asm b/scripts/agatha.asm deleted file mode 100755 index 88d6a8de..00000000 --- a/scripts/agatha.asm +++ /dev/null @@ -1,154 +0,0 @@ -AgathaScript: - call AgathaShowOrHideExitBlock - call EnableAutoTextBoxDrawing - ld hl, AgathaTrainerHeader0 - ld de, AgathaScriptPointers - ld a, [wAgathaCurScript] - call ExecuteCurMapScriptInTable - ld [wAgathaCurScript], a - ret - -AgathaShowOrHideExitBlock: -; Blocks or clears the exit to the next room. - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - jr z, .blockExitToNextRoom - ld a, $e - jp .setExitBlock -.blockExitToNextRoom - ld a, $3b -.setExitBlock: - ld [wNewTileBlockID], a - lb bc, 0, 2 - predef_jump ReplaceTileBlock - -ResetAgathaScript: - xor a - ld [wAgathaCurScript], a - ret - -AgathaScriptPointers: - dw AgathaScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw AgathaScript2 - dw AgathaScript3 - dw AgathaScript4 - -AgathaScript4: - ret - -AgathaScriptWalkIntoRoom: -; Walk six steps upward. - ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld a, $6 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wAgathaCurScript], a - ld [wCurMapScript], a - ret - -AgathaScript0: - ld hl, AgathaEntranceCoords - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyPressed], a - ld [hJoyHeld], a - ld [wSimulatedJoypadStatesEnd], a - ld [wSimulatedJoypadStatesIndex], a - ld a, [wCoordIndex] - cp $3 ; Is player standing one tile above the exit? - jr c, .stopPlayerFromLeaving - CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM - jr z, AgathaScriptWalkIntoRoom -.stopPlayerFromLeaving - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID ; "Don't run away!" - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wAgathaCurScript], a - ld [wCurMapScript], a - ret - -AgathaEntranceCoords: - db $0A,$04 - db $0A,$05 - db $0B,$04 - db $0B,$05 - db $FF - -AgathaScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wAgathaCurScript], a - ld [wCurMapScript], a - ret - -AgathaScript2: - call EndTrainerBattle - ld a, [wIsInBattle] - cp $ff - jp z, ResetAgathaScript - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $1 - ld [wGaryCurScript], a - ret - -AgathaTextPointers: - dw AgathaText1 - dw AgathaDontRunAwayText - -AgathaTrainerHeader0: - dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - dw AgathaBeforeBattleText ; TextBeforeBattle - dw AgathaAfterBattleText ; TextAfterBattle - dw AgathaEndBattleText ; TextEndBattle - dw AgathaEndBattleText ; TextEndBattle - - db $ff - -AgathaText1: - TX_ASM - ld hl, AgathaTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -AgathaBeforeBattleText: - TX_FAR _AgathaBeforeBattleText - db "@" - -AgathaEndBattleText: - TX_FAR _AgathaEndBattleText - db "@" - -AgathaAfterBattleText: - TX_FAR _AgathaAfterBattleText - db "@" - -AgathaDontRunAwayText: - TX_FAR _AgathaDontRunAwayText - db "@" diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm deleted file mode 100755 index 4d6853be..00000000 --- a/scripts/bikeshop.asm +++ /dev/null @@ -1,147 +0,0 @@ -BikeShopScript: - jp EnableAutoTextBoxDrawing - -BikeShopTextPointers: - dw BikeShopText1 - dw BikeShopText2 - dw BikeShopText3 - -BikeShopText1: - TX_ASM - CheckEvent EVENT_GOT_BICYCLE - jr z, .asm_260d4 - ld hl, BikeShopText_1d82f - call PrintText - jp .Done -.asm_260d4 - ld b, BIKE_VOUCHER - call IsItemInBag - jr z, .asm_41190 - ld hl, BikeShopText_1d81f - call PrintText - lb bc, BICYCLE, 1 - call GiveItem - jr nc, .BagFull - ld a, BIKE_VOUCHER - ld [$ffdb], a - callba RemoveItemByID - SetEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d824 - call PrintText - jr .Done -.BagFull - ld hl, BikeShopText_1d834 - call PrintText - jr .Done -.asm_41190 - ld hl, BikeShopText_1d810 - call PrintText - xor a - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, $1 - ld [wMaxMenuItem], a - ld a, $2 - ld [wTopMenuItemY], a - ld a, $1 - ld [wTopMenuItemX], a - ld hl, wd730 - set 6, [hl] - coord hl, 0, 0 - ld b, $4 - ld c, $f - call TextBoxBorder - call UpdateSprites - coord hl, 2, 2 - ld de, BikeShopMenuText - call PlaceString - coord hl, 8, 3 - ld de, BikeShopMenuPrice - call PlaceString - ld hl, BikeShopText_1d815 - call PrintText - call HandleMenuInput - bit 1, a - jr nz, .cancel - ld hl, wd730 - res 6, [hl] - ld a, [wCurrentMenuItem] - and a - jr nz, .cancel - ld hl, BikeShopCantAffordText - call PrintText -.cancel - ld hl, BikeShopComeAgainText - call PrintText -.Done - jp TextScriptEnd - -BikeShopMenuText: - db "BICYCLE" - next "CANCEL@" - -BikeShopMenuPrice: - db "¥1000000@" - -BikeShopText_1d810: - TX_FAR _BikeShopText_1d810 - db "@" - -BikeShopText_1d815: - TX_FAR _BikeShopText_1d815 - db "@" - -BikeShopCantAffordText: - TX_FAR _BikeShopCantAffordText - db "@" - -BikeShopText_1d81f: - TX_FAR _BikeShopText_1d81f - db "@" - -BikeShopText_1d824: - TX_FAR _BikeShopText_1d824 - TX_SFX_KEY_ITEM - db "@" - -BikeShopComeAgainText: - TX_FAR _BikeShopComeAgainText - db "@" - -BikeShopText_1d82f: - TX_FAR _BikeShopText_1d82f - db "@" - -BikeShopText_1d834: - TX_FAR _BikeShopText_1d834 - db "@" - -BikeShopText2: - TX_ASM - ld hl, BikeShopText_1d843 - call PrintText - jp TextScriptEnd - -BikeShopText_1d843: - TX_FAR _BikeShopText_1d843 - db "@" - -BikeShopText3: - TX_ASM - CheckEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d861 - jr nz, .asm_34d2d - ld hl, BikeShopText_1d85c -.asm_34d2d - call PrintText - jp TextScriptEnd - -BikeShopText_1d85c: - TX_FAR _BikeShopText_1d85c - db "@" - -BikeShopText_1d861: - TX_FAR _BikeShopText_1d861 - db "@" diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm deleted file mode 100755 index 2b60ef8c..00000000 --- a/scripts/billshouse.asm +++ /dev/null @@ -1,214 +0,0 @@ -BillsHouseScript: - call EnableAutoTextBoxDrawing - ld a, [wBillsHouseCurScript] - ld hl, BillsHouseScriptPointers - jp CallFunctionInTable - -BillsHouseScriptPointers: - dw BillsHouseScript0 - dw BillsHouseScript1 - dw BillsHouseScript2 - dw BillsHouseScript3 - dw BillsHouseScript4 - dw BillsHouseScript5 - -BillsHouseScript0: - ret - -BillsHouseScript1: - ld a, [wSpriteStateData1 + 9] - and a ; cp SPRITE_FACING_DOWN - ld de, MovementData_1e79c - jr nz, .notDown - ld de, MovementData_1e7a0 -.notDown - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $2 - ld [wBillsHouseCurScript], a - ret - -MovementData_1e79c: - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db $FF - -; make Bill walk around the player -MovementData_1e7a0: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_UP - db $FF - -BillsHouseScript2: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_BILL_POKEMON - ld [wMissableObjectIndex], a - predef HideObject - SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR - xor a - ld [wJoyIgnore], a - ld a, $3 - ld [wBillsHouseCurScript], a - ret - -BillsHouseScript3: - CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL - ret z - ld a, $f0 - ld [wJoyIgnore], a - ld a, $2 - ld [wSpriteIndex], a - ld a, $c - ld [$ffeb], a - ld a, $40 - ld [$ffec], a - ld a, $6 - ld [$ffed], a - ld a, $5 - ld [$ffee], a - call SetSpritePosition1 - ld a, HS_BILL_1 - ld [wMissableObjectIndex], a - predef ShowObject - ld c, 8 - call DelayFrames - ld a, $2 - ld [H_SPRITEINDEX], a - ld de, MovementData_1e807 - call MoveSprite - ld a, $4 - ld [wBillsHouseCurScript], a - ret - -MovementData_1e807: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db $FF - -BillsHouseScript4: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - SetEvent EVENT_MET_BILL_2 ; this event seems redundant - SetEvent EVENT_MET_BILL - ld a, $0 - ld [wBillsHouseCurScript], a - ret - -BillsHouseScript5: - ld a, $4 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $0 - ld [wBillsHouseCurScript], a - ret - -BillsHouseTextPointers: - dw BillsHouseText1 - dw BillsHouseText2 - dw BillsHouseText3 - dw BillsHouseText4 - -BillsHouseText4: - TX_BILLS_PC - -BillsHouseText1: - TX_ASM - ld hl, BillsHouseText_1e865 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_1e85a -.asm_1e84d - ld hl, BillsHouseText_1e86a - call PrintText - ld a, $1 - ld [wBillsHouseCurScript], a - jr .asm_1e862 -.asm_1e85a - ld hl, BillsHouseText_1e86f - call PrintText - jr .asm_1e84d -.asm_1e862 - jp TextScriptEnd - -BillsHouseText_1e865: - TX_FAR _BillsHouseText_1e865 - db "@" - -BillsHouseText_1e86a: - TX_FAR _BillsHouseText_1e86a - db "@" - -BillsHouseText_1e86f: - TX_FAR _BillsHouseText_1e86f - db "@" - -BillsHouseText2: - TX_ASM - CheckEvent EVENT_GOT_SS_TICKET - jr nz, .asm_1e8a9 - ld hl, BillThankYouText - call PrintText - lb bc, S_S_TICKET, 1 - call GiveItem - jr nc, .BagFull - ld hl, SSTicketReceivedText - call PrintText - SetEvent EVENT_GOT_SS_TICKET - ld a, HS_CERULEAN_GUARD_1 - ld [wMissableObjectIndex], a - predef ShowObject - ld a, HS_CERULEAN_GUARD_2 - ld [wMissableObjectIndex], a - predef HideObject -.asm_1e8a9 - ld hl, BillsHouseText_1e8cb - call PrintText - jr .asm_1e8b7 -.BagFull - ld hl, SSTicketNoRoomText - call PrintText -.asm_1e8b7 - jp TextScriptEnd - -BillThankYouText: - TX_FAR _BillThankYouText - db "@" - -SSTicketReceivedText: - TX_FAR _SSTicketReceivedText - TX_SFX_KEY_ITEM - TX_BLINK - db "@" - -SSTicketNoRoomText: - TX_FAR _SSTicketNoRoomText - db "@" - -BillsHouseText_1e8cb: - TX_FAR _BillsHouseText_1e8cb - db "@" - -BillsHouseText3: - TX_ASM - ld hl, BillsHouseText_1e8da - call PrintText - jp TextScriptEnd - -BillsHouseText_1e8da: - TX_FAR _BillsHouseText_1e8da - db "@" diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm deleted file mode 100755 index 2b72ef97..00000000 --- a/scripts/blueshouse.asm +++ /dev/null @@ -1,89 +0,0 @@ -BluesHouseScript: - call EnableAutoTextBoxDrawing - ld hl, BluesHouseScriptPointers - ld a, [wBluesHouseCurScript] - jp CallFunctionInTable - -BluesHouseScriptPointers: - dw BluesHouseScript0 - dw BluesHouseScript1 - -BluesHouseScript0: - SetEvent EVENT_ENTERED_BLUES_HOUSE - - ; trigger the next script - ld a, 1 - ld [wBluesHouseCurScript], a - ret - -BluesHouseScript1: - ret - -BluesHouseTextPointers: - dw BluesHouseText1 - dw BluesHouseText2 - dw BluesHouseText3 - -BluesHouseText1: - TX_ASM - CheckEvent EVENT_GOT_TOWN_MAP - jr nz, .GotMap - CheckEvent EVENT_GOT_POKEDEX - jr nz, .GiveMap - ld hl, DaisyInitialText - call PrintText - jr .done - -.GiveMap - ld hl, DaisyOfferMapText - call PrintText - lb bc, TOWN_MAP, 1 - call GiveItem - jr nc, .BagFull - ld a, HS_TOWN_MAP - ld [wMissableObjectIndex], a - predef HideObject ; hide table map object - ld hl, GotMapText - call PrintText - SetEvent EVENT_GOT_TOWN_MAP - jr .done - -.GotMap - ld hl, DaisyUseMapText - call PrintText - jr .done - -.BagFull - ld hl, DaisyBagFullText - call PrintText -.done - jp TextScriptEnd - -DaisyInitialText: - TX_FAR _DaisyInitialText - db "@" - -DaisyOfferMapText: - TX_FAR _DaisyOfferMapText - db "@" - -GotMapText: - TX_FAR _GotMapText - TX_SFX_KEY_ITEM - db "@" - -DaisyBagFullText: - TX_FAR _DaisyBagFullText - db "@" - -DaisyUseMapText: - TX_FAR _DaisyUseMapText - db "@" - -BluesHouseText2: ; Daisy, walking around - TX_FAR _BluesHouseText2 - db "@" - -BluesHouseText3: ; map on table - TX_FAR _BluesHouseText3 - db "@" diff --git a/scripts/bruno.asm b/scripts/bruno.asm deleted file mode 100755 index 02ceebf2..00000000 --- a/scripts/bruno.asm +++ /dev/null @@ -1,151 +0,0 @@ -BrunoScript: - call BrunoShowOrHideExitBlock - call EnableAutoTextBoxDrawing - ld hl, BrunoTrainerHeader0 - ld de, BrunoScriptPointers - ld a, [wBrunoCurScript] - call ExecuteCurMapScriptInTable - ld [wBrunoCurScript], a - ret - -BrunoShowOrHideExitBlock: -; Blocks or clears the exit to the next room. - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - jr z, .blockExitToNextRoom - ld a, $5 - jp .setExitBlock -.blockExitToNextRoom - ld a, $24 -.setExitBlock - ld [wNewTileBlockID], a - lb bc, 0, 2 - predef_jump ReplaceTileBlock - -ResetBrunoScript: - xor a - ld [wBrunoCurScript], a - ret - -BrunoScriptPointers: - dw BrunoScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw BrunoScript2 - dw BrunoScript3 - dw BrunoScript4 - -BrunoScript4: - ret - -BrunoScriptWalkIntoRoom: -; Walk six steps upward. - ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld a, $6 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wBrunoCurScript], a - ld [wCurMapScript], a - ret - -BrunoScript0: - ld hl, BrunoEntranceCoords - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyPressed], a - ld [hJoyHeld], a - ld [wSimulatedJoypadStatesEnd], a - ld [wSimulatedJoypadStatesIndex], a - ld a, [wCoordIndex] - cp $3 ; Is player standing one tile above the exit? - jr c, .stopPlayerFromLeaving - CheckAndSetEvent EVENT_AUTOWALKED_INTO_BRUNOS_ROOM - jr z, BrunoScriptWalkIntoRoom -.stopPlayerFromLeaving - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID ; "Don't run away!" - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wBrunoCurScript], a - ld [wCurMapScript], a - ret - -BrunoEntranceCoords: - db $0A,$04 - db $0A,$05 - db $0B,$04 - db $0B,$05 - db $FF - -BrunoScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wBrunoCurScript], a - ld [wCurMapScript], a - ret - -BrunoScript2: - call EndTrainerBattle - ld a, [wIsInBattle] - cp $ff - jp z, ResetBrunoScript - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -BrunoTextPointers: - dw BrunoText1 - dw BrunoDontRunAwayText - -BrunoTrainerHeader0: - dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - dw BrunoBeforeBattleText ; TextBeforeBattle - dw BrunoAfterBattleText ; TextAfterBattle - dw BrunoEndBattleText ; TextEndBattle - dw BrunoEndBattleText ; TextEndBattle - - db $ff - -BrunoText1: - TX_ASM - ld hl, BrunoTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -BrunoBeforeBattleText: - TX_FAR _BrunoBeforeBattleText - db "@" - -BrunoEndBattleText: - TX_FAR _BrunoEndBattleText - db "@" - -BrunoAfterBattleText: - TX_FAR _BrunoAfterBattleText - db "@" - -BrunoDontRunAwayText: - TX_FAR _BrunoDontRunAwayText - db "@" diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm deleted file mode 100755 index 6ef679dc..00000000 --- a/scripts/celadoncity.asm +++ /dev/null @@ -1,132 +0,0 @@ -CeladonCityScript: - call EnableAutoTextBoxDrawing - ResetEvents EVENT_1B8, EVENT_1BF - ResetEvent EVENT_67F - ret - -CeladonCityTextPointers: - dw CeladonCityText1 - dw CeladonCityText2 - dw CeladonCityText3 - dw CeladonCityText4 - dw CeladonCityText5 - dw CeladonCityText6 - dw CeladonCityText7 - dw CeladonCityText8 - dw CeladonCityText9 - dw CeladonCityText10 - dw CeladonCityText11 - dw PokeCenterSignText - dw CeladonCityText13 - dw CeladonCityText14 - dw CeladonCityText15 - dw CeladonCityText16 - dw CeladonCityText17 - dw CeladonCityText18 - -CeladonCityText1: - TX_FAR _CeladonCityText1 - db "@" - -CeladonCityText2: - TX_FAR _CeladonCityText2 - db "@" - -CeladonCityText3: - TX_FAR _CeladonCityText3 - db "@" - -CeladonCityText4: - TX_FAR _CeladonCityText4 - db "@" - -CeladonCityText5: - TX_ASM - CheckEvent EVENT_GOT_TM41 - jr nz, .asm_7053f - ld hl, TM41PreText - call PrintText - lb bc, TM_41, 1 - call GiveItem - jr c, .Success - ld hl, TM41NoRoomText - call PrintText - jr .Done -.Success - ld hl, ReceivedTM41Text - call PrintText - SetEvent EVENT_GOT_TM41 - jr .Done -.asm_7053f - ld hl, TM41ExplanationText - call PrintText -.Done - jp TextScriptEnd - -TM41PreText: - TX_FAR _TM41PreText - db "@" - -ReceivedTM41Text: - TX_FAR _ReceivedTM41Text - TX_SFX_ITEM_1 - db "@" - -TM41ExplanationText: - TX_FAR _TM41ExplanationText - db "@" - -TM41NoRoomText: - TX_FAR _TM41NoRoomText - db "@" - -CeladonCityText6: - TX_FAR _CeladonCityText6 - db "@" - -CeladonCityText7: - TX_FAR _CeladonCityText7 - TX_ASM - ld a, POLIWRATH - call PlayCry - jp TextScriptEnd - -CeladonCityText8: - TX_FAR _CeladonCityText8 - db "@" - -CeladonCityText9: - TX_FAR _CeladonCityText9 - db "@" - -CeladonCityText10: - TX_FAR _CeladonCityText10 - db "@" - -CeladonCityText11: - TX_FAR _CeladonCityText11 - db "@" - -CeladonCityText13: - TX_FAR _CeladonCityText13 - db "@" - -CeladonCityText14: - TX_FAR _CeladonCityText14 - db "@" - -CeladonCityText15: - TX_FAR _CeladonCityText15 - db "@" - -CeladonCityText16: - TX_FAR _CeladonCityText16 - db "@" - -CeladonCityText17: - TX_FAR _CeladonCityText17 - db "@" - -CeladonCityText18: - TX_FAR _CeladonCityText18 - db "@" diff --git a/scripts/celadondiner.asm b/scripts/celadondiner.asm deleted file mode 100755 index 6fd594f7..00000000 --- a/scripts/celadondiner.asm +++ /dev/null @@ -1,66 +0,0 @@ -CeladonDinerScript: - call EnableAutoTextBoxDrawing - ret - -CeladonDinerTextPointers: - dw CeladonDinerText1 - dw CeladonDinerText2 - dw CeladonDinerText3 - dw CeladonDinerText4 - dw CeladonDinerText5 - -CeladonDinerText1: - TX_FAR _CeladonDinerText1 - db "@" - -CeladonDinerText2: - TX_FAR _CeladonDinerText2 - db "@" - -CeladonDinerText3: - TX_FAR _CeladonDinerText3 - db "@" - -CeladonDinerText4: - TX_FAR _CeladonDinerText4 - db "@" - -CeladonDinerText5: - TX_ASM - CheckEvent EVENT_GOT_COIN_CASE - jr nz, .asm_eb14d - ld hl, CeladonDinerText_491a7 - call PrintText - lb bc, COIN_CASE, 1 - call GiveItem - jr nc, .BagFull - SetEvent EVENT_GOT_COIN_CASE - ld hl, ReceivedCoinCaseText - call PrintText - jr .asm_68b61 -.BagFull - ld hl, CoinCaseNoRoomText - call PrintText - jr .asm_68b61 -.asm_eb14d - ld hl, CeladonDinerText_491b7 - call PrintText -.asm_68b61 - jp TextScriptEnd - -CeladonDinerText_491a7: - TX_FAR _CeladonDinerText_491a7 - db "@" - -ReceivedCoinCaseText: - TX_FAR _ReceivedCoinCaseText - TX_SFX_KEY_ITEM - db "@" - -CoinCaseNoRoomText: - TX_FAR _CoinCaseNoRoomText - db "@" - -CeladonDinerText_491b7: - TX_FAR _CeladonDinerText_491b7 - db "@" diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm deleted file mode 100755 index cc81b076..00000000 --- a/scripts/celadongamecorner.asm +++ /dev/null @@ -1,527 +0,0 @@ -CeladonGameCornerScript: - call CeladonGameCornerScript_48bcf - call CeladonGameCornerScript_48bec - call EnableAutoTextBoxDrawing - ld hl, CeladonGameCornerScriptPointers - ld a, [wCeladonGameCornerCurScript] - jp CallFunctionInTable - -CeladonGameCornerScript_48bcf: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - ret z - call Random - ld a, [hRandomAdd] - cp $7 - jr nc, .asm_48be2 - ld a, $8 -.asm_48be2 - srl a - srl a - srl a - ld [wLuckySlotHiddenObjectIndex], a - ret - -CeladonGameCornerScript_48bec: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_FOUND_ROCKET_HIDEOUT - ret nz - ld a, $2a - ld [wNewTileBlockID], a - lb bc, 2, 8 - predef_jump ReplaceTileBlock - -CeladonGameCornerScript_48c07: - xor a - ld [wJoyIgnore], a - ld [wCeladonGameCornerCurScript], a - ld [wCurMapScript], a - ret - -CeladonGameCornerScriptPointers: - dw CeladonGameCornerScript0 - dw CeladonGameCornerScript1 - dw CeladonGameCornerScript2 - -CeladonGameCornerScript0: - ret - -CeladonGameCornerScript1: - ld a, [wIsInBattle] - cp $ff - jp z, CeladonGameCornerScript_48c07 - ld a, $f0 - ld [wJoyIgnore], a - ld a, $d - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $b - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld de, MovementData_48c5a - ld a, [wYCoord] - cp $6 - jr nz, .asm_48c43 - ld de, MovementData_48c63 - jr .asm_48c4d -.asm_48c43 - ld a, [wXCoord] - cp $8 - jr nz, .asm_48c4d - ld de, MovementData_48c63 -.asm_48c4d - ld a, $b - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $2 - ld [wCeladonGameCornerCurScript], a - ret - -MovementData_48c5a: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -MovementData_48c63: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -CeladonGameCornerScript2: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, HS_GAME_CORNER_ROCKET - ld [wMissableObjectIndex], a - predef HideObject - ld hl, wCurrentMapScriptFlags - set 5, [hl] - set 6, [hl] - ld a, $0 - ld [wCeladonGameCornerCurScript], a - ret - -CeladonGameCornerTextPointers: - dw CeladonGameCornerText1 - dw CeladonGameCornerText2 - dw CeladonGameCornerText3 - dw CeladonGameCornerText4 - dw CeladonGameCornerText5 - dw CeladonGameCornerText6 - dw CeladonGameCornerText7 - dw CeladonGameCornerText8 - dw CeladonGameCornerText9 - dw CeladonGameCornerText10 - dw CeladonGameCornerText11 - dw CeladonGameCornerText12 - dw CeladonGameCornerText13 - -CeladonGameCornerText1: - TX_FAR _CeladonGameCornerText1 - db "@" - -CeladonGameCornerText2: - TX_ASM - call CeladonGameCornerScript_48f1e - ld hl, CeladonGameCornerText_48d22 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_48d0f - ld b, COIN_CASE - call IsItemInBag - jr z, .asm_48d19 - call Has9990Coins - jr nc, .asm_48d14 - xor a - ld [hMoney], a - ld [hMoney + 2], a - ld a, $10 - ld [hMoney + 1], a - call HasEnoughMoney - jr nc, .asm_48cdb - ld hl, CeladonGameCornerText_48d31 - jr .asm_48d1c -.asm_48cdb - xor a - ld [hMoney], a - ld [hMoney + 2], a - ld a, $10 - ld [hMoney + 1], a - ld hl, hMoney + 2 - ld de, wPlayerMoney + 2 - ld c, $3 - predef SubBCDPredef - xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a - ld a, $50 - ld [hCoins + 1], a - ld de, wPlayerCoins + 1 - ld hl, hCoins + 1 - ld c, $2 - predef AddBCDPredef - call CeladonGameCornerScript_48f1e - ld hl, CeladonGameCornerText_48d27 - jr .asm_48d1c -.asm_48d0f - ld hl, CeladonGameCornerText_48d2c - jr .asm_48d1c -.asm_48d14 - ld hl, CeladonGameCornerText_48d36 - jr .asm_48d1c -.asm_48d19 - ld hl, CeladonGameCornerText_48d3b -.asm_48d1c - call PrintText - jp TextScriptEnd - -CeladonGameCornerText_48d22: - TX_FAR _CeladonGameCornerText_48d22 - db "@" - -CeladonGameCornerText_48d27: - TX_FAR _CeladonGameCornerText_48d27 - db "@" - -CeladonGameCornerText_48d2c: - TX_FAR _CeladonGameCornerText_48d2c - db "@" - -CeladonGameCornerText_48d31: - TX_FAR _CeladonGameCornerText_48d31 - db "@" - -CeladonGameCornerText_48d36: - TX_FAR _CeladonGameCornerText_48d36 - db "@" - -CeladonGameCornerText_48d3b: - TX_FAR _CeladonGameCornerText_48d3b - db "@" - -CeladonGameCornerText3: - TX_FAR _CeladonGameCornerText3 - db "@" - -CeladonGameCornerText4: - TX_FAR _CeladonGameCornerText4 - db "@" - -CeladonGameCornerText5: - TX_ASM - CheckEvent EVENT_GOT_10_COINS - jr nz, .asm_48d89 - ld hl, CeladonGameCornerText_48d9c - call PrintText - ld b, COIN_CASE - call IsItemInBag - jr z, .asm_48d93 - call Has9990Coins - jr nc, .asm_48d8e - xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a - ld a, $10 - ld [hCoins + 1], a - ld de, wPlayerCoins + 1 - ld hl, hCoins + 1 - ld c, $2 - predef AddBCDPredef - SetEvent EVENT_GOT_10_COINS - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, Received10CoinsText - jr .asm_48d96 -.asm_48d89 - ld hl, CeladonGameCornerText_48dac - jr .asm_48d96 -.asm_48d8e - ld hl, CeladonGameCornerText_48da7 - jr .asm_48d96 -.asm_48d93 - ld hl, CeladonGameCornerText_48f19 -.asm_48d96 - call PrintText - jp TextScriptEnd - -CeladonGameCornerText_48d9c: - TX_FAR _CeladonGameCornerText_48d9c - db "@" - -Received10CoinsText: - TX_FAR _Received10CoinsText - TX_SFX_ITEM_1 - db "@" - -CeladonGameCornerText_48da7: - TX_FAR _CeladonGameCornerText_48da7 - db "@" - -CeladonGameCornerText_48dac: - TX_FAR _CeladonGameCornerText_48dac - db "@" - -CeladonGameCornerText6: - TX_FAR _CeladonGameCornerText6 - db "@" - -CeladonGameCornerText7: - TX_ASM - CheckEvent EVENT_BEAT_ERIKA - ld hl, CeladonGameCornerText_48dca - jr z, .asm_48dc4 - ld hl, CeladonGameCornerText_48dcf -.asm_48dc4 - call PrintText - jp TextScriptEnd - -CeladonGameCornerText_48dca: - TX_FAR _CeladonGameCornerText_48dca - db "@" - -CeladonGameCornerText_48dcf: - TX_FAR _CeladonGameCornerText_48dcf - db "@" - -CeladonGameCornerText8: - TX_FAR _CeladonGameCornerText8 - db "@" - -CeladonGameCornerText9: - TX_ASM - CheckEvent EVENT_GOT_20_COINS_2 - jr nz, .asm_48e13 - ld hl, CeladonGameCornerText_48e26 - call PrintText - ld b, COIN_CASE - call IsItemInBag - jr z, .asm_48e1d - call Has9990Coins - jr nc, .asm_48e18 - xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a - ld a, $20 - ld [hCoins + 1], a - ld de, wPlayerCoins + 1 - ld hl, hCoins + 1 - ld c, $2 - predef AddBCDPredef - SetEvent EVENT_GOT_20_COINS_2 - ld hl, Received20CoinsText - jr .asm_48e20 -.asm_48e13 - ld hl, CeladonGameCornerText_48e36 - jr .asm_48e20 -.asm_48e18 - ld hl, CeladonGameCornerText_48e31 - jr .asm_48e20 -.asm_48e1d - ld hl, CeladonGameCornerText_48f19 -.asm_48e20 - call PrintText - jp TextScriptEnd - -CeladonGameCornerText_48e26: - TX_FAR _CeladonGameCornerText_48e26 - db "@" - -Received20CoinsText: - TX_FAR _Received20CoinsText - TX_SFX_ITEM_1 - db "@" - -CeladonGameCornerText_48e31: - TX_FAR _CeladonGameCornerText_48e31 - db "@" - -CeladonGameCornerText_48e36: - TX_FAR _CeladonGameCornerText_48e36 - db "@" - -CeladonGameCornerText10: - TX_ASM - CheckEvent EVENT_GOT_20_COINS - jr nz, .asm_48e75 - ld hl, CeladonGameCornerText_48e88 - call PrintText - ld b, COIN_CASE - call IsItemInBag - jr z, .asm_48e7f - call Has9990Coins - jr z, .asm_48e7a - xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a - ld a, $20 - ld [hCoins + 1], a - ld de, wPlayerCoins + 1 - ld hl, hCoins + 1 - ld c, $2 - predef AddBCDPredef - SetEvent EVENT_GOT_20_COINS - ld hl, CeladonGameCornerText_48e8d - jr .asm_48e82 -.asm_48e75 - ld hl, CeladonGameCornerText_48e98 - jr .asm_48e82 -.asm_48e7a - ld hl, CeladonGameCornerText_48e93 - jr .asm_48e82 -.asm_48e7f - ld hl, CeladonGameCornerText_48f19 -.asm_48e82 - call PrintText - jp TextScriptEnd - -CeladonGameCornerText_48e88: - TX_FAR _CeladonGameCornerText_48e88 - db "@" - -CeladonGameCornerText_48e8d: - TX_FAR _CeladonGameCornerText_48e8d - TX_SFX_ITEM_1 - db "@" - -CeladonGameCornerText_48e93: - TX_FAR _CeladonGameCornerText_48e93 - db "@" - -CeladonGameCornerText_48e98: - TX_FAR _CeladonGameCornerText_48e98 - db "@" - -CeladonGameCornerText11: - TX_ASM - ld hl, CeladonGameCornerText_48ece - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, CeladonGameCornerText_48ed3 - ld de, CeladonGameCornerText_48ed3 - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - xor a - ld [hJoyHeld], a - ld [hJoyPressed], a - ld [hJoyReleased], a - ld a, $1 - ld [wCeladonGameCornerCurScript], a - jp TextScriptEnd - -CeladonGameCornerText_48ece: - TX_FAR _CeladonGameCornerText_48ece - db "@" - -CeladonGameCornerText_48ed3: - TX_FAR _CeladonGameCornerText_48ed3 - db "@" - -CeladonGameCornerText13: - TX_FAR _CeladonGameCornerText_48ed8 - db "@" - -CeladonGameCornerText12: - TX_ASM - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonGameCornerText_48f09 - call PrintText - call WaitForSoundToFinish - ld a, SFX_GO_INSIDE - call PlaySound - call WaitForSoundToFinish - SetEvent EVENT_FOUND_ROCKET_HIDEOUT - ld a, $43 - ld [wNewTileBlockID], a - lb bc, 2, 8 - predef ReplaceTileBlock - jp TextScriptEnd - -CeladonGameCornerText_48f09: - TX_FAR _CeladonGameCornerText_48f09 - TX_ASM - ld a, SFX_SWITCH - call PlaySound - call WaitForSoundToFinish - jp TextScriptEnd - -CeladonGameCornerText_48f19: - TX_FAR _CeladonGameCornerText_48f19 - db "@" - -CeladonGameCornerScript_48f1e: - ld hl, wd730 - set 6, [hl] - coord hl, 11, 0 - ld b, $5 - ld c, $7 - call TextBoxBorder - call UpdateSprites - coord hl, 12, 1 - ld b, 4 - ld c, 7 - call ClearScreenArea - coord hl, 12, 2 - ld de, GameCornerMoneyText - call PlaceString - coord hl, 12, 3 - ld de, GameCornerBlankText1 - call PlaceString - coord hl, 12, 3 - ld de, wPlayerMoney - ld c, $a3 - call PrintBCDNumber - coord hl, 12, 4 - ld de, GameCornerCoinText - call PlaceString - coord hl, 12, 5 - ld de, GameCornerBlankText2 - call PlaceString - coord hl, 15, 5 - ld de, wPlayerCoins - ld c, $82 - call PrintBCDNumber - ld hl, wd730 - res 6, [hl] - ret - -GameCornerMoneyText: - db "MONEY@" - -GameCornerCoinText: - db "COIN@" - -GameCornerBlankText1: - db " @" - -GameCornerBlankText2: - db " @" - -Has9990Coins: - ld a, $99 - ld [hCoins], a - ld a, $90 - ld [hCoins + 1], a - jp HasEnoughCoins diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm deleted file mode 100755 index ae7e6846..00000000 --- a/scripts/celadongym.asm +++ /dev/null @@ -1,335 +0,0 @@ -CeladonGymScript: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - call nz, CeladonGymScript_48927 - call EnableAutoTextBoxDrawing - ld hl, CeladonGymTrainerHeader0 - ld de, CeladonGymScriptPointers - ld a, [wCeladonGymCurScript] - call ExecuteCurMapScriptInTable - ld [wCeladonGymCurScript], a - ret - -CeladonGymScript_48927: - ld hl, Gym4CityName - ld de, Gym4LeaderName - jp LoadGymLeaderAndCityName - -Gym4CityName: - db "CELADON CITY@" - -Gym4LeaderName: - db "ERIKA@" - -CeladonGymText_48943: - xor a - ld [wJoyIgnore], a - ld [wCeladonGymCurScript], a - ld [wCurMapScript], a - ret - -CeladonGymScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeladonGymScript3 - -CeladonGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, CeladonGymText_48943 - ld a, $f0 - ld [wJoyIgnore], a - -CeladonGymText_48963: - ld a, $9 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_ERIKA - lb bc, TM_21, 1 - call GiveItem - jr nc, .BagFull - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM21 - jr .asm_4898c -.BagFull - ld a, $b - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_4898c - ld hl, wObtainedBadges - set 3, [hl] - ld hl, wBeatGymFlags - set 3, [hl] - - ; deactivate gym trainers - SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 - - jp CeladonGymText_48943 - -CeladonGymTextPointers: - dw CeladonGymText1 - dw CeladonGymText2 - dw CeladonGymText3 - dw CeladonGymText4 - dw CeladonGymText5 - dw CeladonGymText6 - dw CeladonGymText7 - dw CeladonGymText8 - dw CeladonGymText9 - dw TM21Text - dw TM21NoRoomText - -CeladonGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_0 - dw CeladonGymBattleText2 ; TextBeforeBattle - dw CeladonGymAfterBattleText2 ; TextAfterBattle - dw CeladonGymEndBattleText2 ; TextEndBattle - dw CeladonGymEndBattleText2 ; TextEndBattle - -CeladonGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1 - dw CeladonGymBattleText3 ; TextBeforeBattle - dw CeladonGymAfterBattleText3 ; TextAfterBattle - dw CeladonGymEndBattleText3 ; TextEndBattle - dw CeladonGymEndBattleText3 ; TextEndBattle - -CeladonGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 - dw CeladonGymBattleText4 ; TextBeforeBattle - dw CeladonGymAfterBattleText4 ; TextAfterBattle - dw CeladonGymEndBattleText4 ; TextEndBattle - dw CeladonGymEndBattleText4 ; TextEndBattle - -CeladonGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 - dw CeladonGymBattleText5 ; TextBeforeBattle - dw CeladonGymAfterBattleText5 ; TextAfterBattle - dw CeladonGymEndBattleText5 ; TextEndBattle - dw CeladonGymEndBattleText5 ; TextEndBattle - -CeladonGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 - dw CeladonGymBattleText6 ; TextBeforeBattle - dw CeladonGymAfterBattleText6 ; TextAfterBattle - dw CeladonGymEndBattleText6 ; TextEndBattle - dw CeladonGymEndBattleText6 ; TextEndBattle - -CeladonGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 - dw CeladonGymBattleText7 ; TextBeforeBattle - dw CeladonGymAfterBattleText7 ; TextAfterBattle - dw CeladonGymEndBattleText7 ; TextEndBattle - dw CeladonGymEndBattleText7 ; TextEndBattle - -CeladonGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 - dw CeladonGymBattleText8 ; TextBeforeBattle - dw CeladonGymAfterBattleText8 ; TextAfterBattle - dw CeladonGymEndBattleText8 ; TextEndBattle - dw CeladonGymEndBattleText8 ; TextEndBattle - - db $ff - -CeladonGymText1: - TX_ASM - CheckEvent EVENT_BEAT_ERIKA - jr z, .asm_48a2d - CheckEventReuseA EVENT_GOT_TM21 - jr nz, .asm_48a25 - call z, CeladonGymText_48963 - call DisableWaitingAfterTextDisplay - jr .asm_48a5b -.asm_48a25 - ld hl, CeladonGymText_48a68 - call PrintText - jr .asm_48a5b -.asm_48a2d - ld hl, CeladonGymText_48a5e - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, CeladonGymText_48a63 - ld de, CeladonGymText_48a63 - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $4 - ld [wGymLeaderNo], a - ld a, $3 - ld [wCeladonGymCurScript], a - ld [wCurMapScript], a -.asm_48a5b - jp TextScriptEnd - -CeladonGymText_48a5e: - TX_FAR _CeladonGymText_48a5e - db "@" - -CeladonGymText_48a63: - TX_FAR _CeladonGymText_48a63 - db "@" - -CeladonGymText_48a68: - TX_FAR _CeladonGymText_48a68 - db "@" - -CeladonGymText9: - TX_FAR _CeladonGymText9 - db "@" - -TM21Text: - TX_FAR _ReceivedTM21Text - TX_SFX_ITEM_1 - TX_FAR _TM21ExplanationText - db "@" - -TM21NoRoomText: - TX_FAR _TM21NoRoomText - db "@" - -CeladonGymText2: - TX_ASM - ld hl, CeladonGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText2: - TX_FAR _CeladonGymBattleText2 - db "@" - -CeladonGymEndBattleText2: - TX_FAR _CeladonGymEndBattleText2 - db "@" - -CeladonGymAfterBattleText2: - TX_FAR _CeladonGymAfterBattleText2 - db "@" - -CeladonGymText3: - TX_ASM - ld hl, CeladonGymTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText3: - TX_FAR _CeladonGymBattleText3 - db "@" - -CeladonGymEndBattleText3: - TX_FAR _CeladonGymEndBattleText3 - db "@" - -CeladonGymAfterBattleText3: - TX_FAR _CeladonGymAfterBattleText3 - db "@" - -CeladonGymText4: - TX_ASM - ld hl, CeladonGymTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText4: - TX_FAR _CeladonGymBattleText4 - db "@" - -CeladonGymEndBattleText4: - TX_FAR _CeladonGymEndBattleText4 - db "@" - -CeladonGymAfterBattleText4: - TX_FAR _CeladonGymAfterBattleText4 - db "@" - -CeladonGymText5: - TX_ASM - ld hl, CeladonGymTrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText5: - TX_FAR _CeladonGymBattleText5 - db "@" - -CeladonGymEndBattleText5: - TX_FAR _CeladonGymEndBattleText5 - db "@" - -CeladonGymAfterBattleText5: - TX_FAR _CeladonGymAfterBattleText5 - db "@" - -CeladonGymText6: - TX_ASM - ld hl, CeladonGymTrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText6: - TX_FAR _CeladonGymBattleText6 - db "@" - -CeladonGymEndBattleText6: - TX_FAR _CeladonGymEndBattleText6 - db "@" - -CeladonGymAfterBattleText6: - TX_FAR _CeladonGymAfterBattleText6 - db "@" - -CeladonGymText7: - TX_ASM - ld hl, CeladonGymTrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText7: - TX_FAR _CeladonGymBattleText7 - db "@" - -CeladonGymEndBattleText7: - TX_FAR _CeladonGymEndBattleText7 - db "@" - -CeladonGymAfterBattleText7: - TX_FAR _CeladonGymAfterBattleText7 - db "@" - -CeladonGymText8: - TX_ASM - ld hl, CeladonGymTrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -CeladonGymBattleText8: - TX_FAR _CeladonGymBattleText8 - db "@" - -CeladonGymEndBattleText8: - TX_FAR _CeladonGymEndBattleText8 - db "@" - -CeladonGymAfterBattleText8: - TX_FAR _CeladonGymAfterBattleText8 - db "@" diff --git a/scripts/celadonhotel.asm b/scripts/celadonhotel.asm deleted file mode 100755 index 23b9eb55..00000000 --- a/scripts/celadonhotel.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonHotelScript: - jp EnableAutoTextBoxDrawing - -CeladonHotelTextPointers: - dw CeladonHotelText1 - dw CeladonHotelText2 - dw CeladonHotelText3 - -CeladonHotelText1: - TX_FAR _CeladonHotelText1 - db "@" - -CeladonHotelText2: - TX_FAR _CeladonHotelText2 - db "@" - -CeladonHotelText3: - TX_FAR _CeladonHotelText3 - db "@" diff --git a/scripts/celadonhouse.asm b/scripts/celadonhouse.asm deleted file mode 100755 index 7f2778d1..00000000 --- a/scripts/celadonhouse.asm +++ /dev/null @@ -1,20 +0,0 @@ -CeladonHouseScript: - call EnableAutoTextBoxDrawing - ret - -CeladonHouseTextPointers: - dw CeladonHouseText1 - dw CeladonHouseText2 - dw CeladonHouseText3 - -CeladonHouseText1: - TX_FAR _CeladonHouseText1 - db "@" - -CeladonHouseText2: - TX_FAR _CeladonHouseText2 - db "@" - -CeladonHouseText3: - TX_FAR _CeladonHouseText3 - db "@" diff --git a/scripts/celadonmansion1.asm b/scripts/celadonmansion1.asm deleted file mode 100755 index f6ef7669..00000000 --- a/scripts/celadonmansion1.asm +++ /dev/null @@ -1,39 +0,0 @@ -CeladonMansion1Script: - jp EnableAutoTextBoxDrawing - -CeladonMansion1TextPointers: - dw CeladonMansion1Text1 - dw CeladonMansion1Text2 - dw CeladonMansion1Text3 - dw CeladonMansion1Text4 - dw CeladonMansion1Text5 - -CeladonMansion1_486a1: - call PlayCry - jp TextScriptEnd - -CeladonMansion1Text1: - TX_FAR _CeladonMansion1Text1 - TX_ASM - ld a, MEOWTH - jp CeladonMansion1_486a1 - -CeladonMansion1Text2: - TX_FAR _CeladonMansion1Text2 - db "@" - -CeladonMansion1Text3: - TX_FAR _CeladonMansion1Text3 - TX_ASM - ld a, CLEFAIRY - jp CeladonMansion1_486a1 - -CeladonMansion1Text4: - TX_FAR _CeladonMansion1Text4 - TX_ASM - ld a, NIDORAN_F - jp CeladonMansion1_486a1 - -CeladonMansion1Text5: - TX_FAR _CeladonMansion1Text5 - db "@" diff --git a/scripts/celadonmansion2.asm b/scripts/celadonmansion2.asm deleted file mode 100755 index 520615d4..00000000 --- a/scripts/celadonmansion2.asm +++ /dev/null @@ -1,10 +0,0 @@ -CeladonMansion2Script: - call EnableAutoTextBoxDrawing - ret - -CeladonMansion2TextPointers: - dw CeladonMansion2Text1 - -CeladonMansion2Text1: - TX_FAR _CeladonMansion2Text1 - db "@" diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm deleted file mode 100755 index a1fe048b..00000000 --- a/scripts/celadonmansion3.asm +++ /dev/null @@ -1,71 +0,0 @@ -CeladonMansion3Script: - jp EnableAutoTextBoxDrawing - -CeladonMansion3TextPointers: - dw ProgrammerText - dw GraphicArtistText - dw WriterText - dw DirectorText - dw GameFreakPCText1 - dw GameFreakPCText2 - dw GameFreakPCText3 - dw GameFreakSignText - -ProgrammerText: - TX_FAR _ProgrammerText - db "@" - -GraphicArtistText: - TX_FAR _GraphicArtistText - db "@" - -WriterText: - TX_FAR _WriterText - db "@" - -DirectorText: - TX_ASM - - ; check pokédex - ld hl, wPokedexOwned - ld b, wPokedexOwnedEnd - wPokedexOwned - call CountSetBits - ld a, [wNumSetBits] - cp 150 - jr nc, .CompletedDex - ld hl, .GameDesigner - jr .done -.CompletedDex - ld hl, .CompletedDexText -.done - call PrintText - jp TextScriptEnd - -.GameDesigner - TX_FAR _GameDesignerText - db "@" - -.CompletedDexText - TX_FAR _CompletedDexText - TX_BLINK - TX_ASM - callab DisplayDiploma - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - jp TextScriptEnd - -GameFreakPCText1: - TX_FAR _CeladonMansion3Text5 - db "@" - -GameFreakPCText2: - TX_FAR _CeladonMansion3Text6 - db "@" - -GameFreakPCText3: - TX_FAR _CeladonMansion3Text7 - db "@" - -GameFreakSignText: - TX_FAR _CeladonMansion3Text8 - db "@" diff --git a/scripts/celadonmansion4.asm b/scripts/celadonmansion4.asm deleted file mode 100755 index 80d887e9..00000000 --- a/scripts/celadonmansion4.asm +++ /dev/null @@ -1,9 +0,0 @@ -CeladonMansion4Script: - jp EnableAutoTextBoxDrawing - -CeladonMansion4TextPointers: - dw CeladonMansion4Text1 - -CeladonMansion4Text1: - TX_FAR _CeladonMansion4Text1 - db "@" diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm deleted file mode 100755 index 197a0f54..00000000 --- a/scripts/celadonmansion5.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMansion5Script: - jp EnableAutoTextBoxDrawing - -CeladonMansion5TextPointers: - dw CeladonMansion5Text1 - dw CeladonMansion5Text2 - -CeladonMansion5Text1: - TX_FAR _CeladonMansion5Text1 - db "@" - -CeladonMansion5Text2: - TX_ASM - lb bc, EEVEE, 25 - call GivePokemon - jr nc, .asm_24365 - ld a, HS_CELADON_MANSION_5_GIFT - ld [wMissableObjectIndex], a - predef HideObject -.asm_24365 - jp TextScriptEnd diff --git a/scripts/celadonmart1.asm b/scripts/celadonmart1.asm deleted file mode 100755 index 0f67972b..00000000 --- a/scripts/celadonmart1.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonMart1Script: - jp EnableAutoTextBoxDrawing - -CeladonMart1TextPointers: - dw CeladonMart1Text1 - dw CeladonMart1Text2 - dw CeladonMart1Text3 - -CeladonMart1Text1: - TX_FAR _CeladonMart1Text1 - db "@" - -CeladonMart1Text2: - TX_FAR _CeladonMart1Text2 - db "@" - -CeladonMart1Text3: - TX_FAR _CeladonMart1Text3 - db "@" diff --git a/scripts/celadonmart2.asm b/scripts/celadonmart2.asm deleted file mode 100755 index c438d6e1..00000000 --- a/scripts/celadonmart2.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart2Script: - jp EnableAutoTextBoxDrawing - -CeladonMart2TextPointers: - dw CeladonMart2Clerk1Text - dw CeladonMart2Clerk2Text - dw CeladonMart2Text3 - dw CeladonMart2Text4 - dw CeladonMart2Text5 - -CeladonMart2Text3: - TX_FAR _CeladonMart2Text3 - db "@" - -CeladonMart2Text4: - TX_FAR _CeladonMart2Text4 - db "@" - -CeladonMart2Text5: - TX_FAR _CeladonMart2Text5 - db "@" diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm deleted file mode 100755 index 6af58f21..00000000 --- a/scripts/celadonmart3.asm +++ /dev/null @@ -1,108 +0,0 @@ -CeladonMart3Script: - jp EnableAutoTextBoxDrawing - -CeladonMart3TextPointers: - dw CeladonMart3Text1 - dw CeladonMart3Text2 - dw CeladonMart3Text3 - dw CeladonMart3Text4 - dw CeladonMart3Text5 - dw CeladonMart3Text6 - dw CeladonMart3Text7 - dw CeladonMart3Text8 - dw CeladonMart3Text9 - dw CeladonMart3Text10 - dw CeladonMart3Text11 - dw CeladonMart3Text12 - dw CeladonMart3Text13 - dw CeladonMart3Text14 - dw CeladonMart3Text15 - dw CeladonMart3Text16 - dw CeladonMart3Text17 - -CeladonMart3Text1: - TX_ASM - CheckEvent EVENT_GOT_TM18 - jr nz, .asm_a5463 - ld hl, TM18PreReceiveText - call PrintText - lb bc, TM_18, 1 - call GiveItem - jr nc, .BagFull - SetEvent EVENT_GOT_TM18 - ld hl, ReceivedTM18Text - jr .asm_81359 -.BagFull - ld hl, TM18NoRoomText - jr .asm_81359 -.asm_a5463 - ld hl, TM18ExplanationText -.asm_81359 - call PrintText - jp TextScriptEnd - -TM18PreReceiveText: - TX_FAR _TM18PreReceiveText - db "@" - -ReceivedTM18Text: - TX_FAR _ReceivedTM18Text - TX_SFX_ITEM_1 - db "@" - -TM18ExplanationText: - TX_FAR _TM18ExplanationText - db "@" - -TM18NoRoomText: - TX_FAR _TM18NoRoomText - db "@" - -CeladonMart3Text2: - TX_FAR _CeladonMart3Text2 - db "@" - -CeladonMart3Text3: - TX_FAR _CeladonMart3Text3 - db "@" - -CeladonMart3Text4: - TX_FAR _CeladonMart3Text4 - db "@" - -CeladonMart3Text5: - TX_FAR _CeladonMart3Text5 - db "@" - -CeladonMart3Text12 -CeladonMart3Text10: -CeladonMart3Text8: -CeladonMart3Text6: - TX_FAR _CeladonMart3Text6 - db "@" - -CeladonMart3Text7: - TX_FAR _CeladonMart3Text7 - db "@" - -CeladonMart3Text9: - TX_FAR _CeladonMart3Text9 - db "@" - -CeladonMart3Text11: - TX_FAR _CeladonMart3Text11 - db "@" - -CeladonMart3Text13: - TX_FAR _CeladonMart3Text13 - db "@" - -CeladonMart3Text14: - TX_FAR _CeladonMart3Text14 - db "@" - -CeladonMart3Text17: -CeladonMart3Text16: -CeladonMart3Text15: - TX_FAR _CeladonMart3Text15 - db "@" diff --git a/scripts/celadonmart4.asm b/scripts/celadonmart4.asm deleted file mode 100755 index 18049dc0..00000000 --- a/scripts/celadonmart4.asm +++ /dev/null @@ -1,20 +0,0 @@ -CeladonMart4Script: - jp EnableAutoTextBoxDrawing - -CeladonMart4TextPointers: - dw CeladonMart4ClerkText - dw CeladonMart4Text2 - dw CeladonMart4Text3 - dw CeladonMart4Text4 - -CeladonMart4Text2: - TX_FAR _CeladonMart4Text2 - db "@" - -CeladonMart4Text3: - TX_FAR _CeladonMart4Text3 - db "@" - -CeladonMart4Text4: - TX_FAR _CeladonMart4Text4 - db "@" diff --git a/scripts/celadonmart5.asm b/scripts/celadonmart5.asm deleted file mode 100755 index 7b7371a7..00000000 --- a/scripts/celadonmart5.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart5Script: - jp EnableAutoTextBoxDrawing - -CeladonMart5TextPointers: - dw CeladonMart5Text1 - dw CeladonMart5Text2 - dw CeladonMart5Clerk1Text - dw CeladonMart5Clerk2Text - dw CeladonMart5Text5 - -CeladonMart5Text1: - TX_FAR _CeladonMart5Text1 - db "@" - -CeladonMart5Text2: - TX_FAR _CeladonMart5Text2 - db "@" - -CeladonMart5Text5: - TX_FAR _CeladonMart5Text5 - db "@" diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm deleted file mode 100755 index 60e5210c..00000000 --- a/scripts/celadonmartelevator.asm +++ /dev/null @@ -1,73 +0,0 @@ -CeladonMartElevatorScript: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - push hl - call nz, CeladonMartElevatorScript_4861c - pop hl - bit 7, [hl] - res 7, [hl] - call nz, CeladonMartElevatorScript_48654 - xor a - ld [wAutoTextBoxDrawingControl], a - inc a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret - -CeladonMartElevatorScript_4861c: - ld hl, wWarpEntries - ld a, [wWarpedFromWhichWarp] - ld b, a - ld a, [wWarpedFromWhichMap] - ld c, a - call CeladonMartElevatorScript_4862a - -CeladonMartElevatorScript_4862a: - inc hl - inc hl - ld a, b - ld [hli], a - ld a, c - ld [hli], a - ret - -CeladonMartElevatorScript_48631: - ld hl, CeladonMartElevatorFloors - call LoadItemList - ld hl, CeladonMartElevatorWarpMaps - ld de, wElevatorWarpMaps - ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps - jp CopyData - -CeladonMartElevatorFloors: - db 5 ; number of elements in list - db FLOOR_1F - db FLOOR_2F - db FLOOR_3F - db FLOOR_4F - db FLOOR_5F - db $FF - -CeladonMartElevatorWarpMaps: -; first byte is warp number -; second byte is map number -; These specify where the player goes after getting out of the elevator. - db $05, CELADON_MART_1 - db $02, CELADON_MART_2 - db $02, CELADON_MART_3 - db $02, CELADON_MART_4 - db $02, CELADON_MART_5 -CeladonMartElevatorWarpMapsEnd: - -CeladonMartElevatorScript_48654: - jpba ShakeElevator - -CeladonMartElevatorTextPointers: - dw CeladonMartElevatorText1 - -CeladonMartElevatorText1: - TX_ASM - call CeladonMartElevatorScript_48631 - ld hl, CeladonMartElevatorWarpMaps - predef DisplayElevatorFloorMenu - jp TextScriptEnd diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm deleted file mode 100755 index 9034e8fc..00000000 --- a/scripts/celadonmartroof.asm +++ /dev/null @@ -1,255 +0,0 @@ -CeladonMartRoofScript: - jp EnableAutoTextBoxDrawing - -CeladonMartRoofScript_GetDrinksInBag: -; construct a list of all drinks in the player's bag - xor a - ld [wFilteredBagItemsCount], a - ld de, wFilteredBagItems - ld hl, CeladonMartRoofDrinkList -.loop - ld a, [hli] - and a - jr z, .done - push hl - push de - ld [wd11e], a - ld b, a - predef GetQuantityOfItemInBag - pop de - pop hl - ld a, b - and a - jr z, .loop ; if the item isn't in the bag - ld a, [wd11e] - ld [de], a - inc de - push hl - ld hl, wFilteredBagItemsCount - inc [hl] - pop hl - jr .loop -.done - ld a, $ff - ld [de], a - ret - -CeladonMartRoofDrinkList: - db FRESH_WATER - db SODA_POP - db LEMONADE - db $00 - -CeladonMartRoofScript_GiveDrinkToGirl: - ld hl, wd730 - set 6, [hl] - ld hl, CeladonMartRoofText_484ee - call PrintText - xor a - ld [wCurrentMenuItem], a - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, [wFilteredBagItemsCount] - dec a - ld [wMaxMenuItem], a - ld a, 2 - ld [wTopMenuItemY], a - ld a, 1 - ld [wTopMenuItemX], a - ld a, [wFilteredBagItemsCount] - dec a - ld bc, 2 - ld hl, 3 - call AddNTimes - dec l - ld b, l - ld c, 12 - coord hl, 0, 0 - call TextBoxBorder - call UpdateSprites - call CeladonMartRoofScript_PrintDrinksInBag - ld hl, wd730 - res 6, [hl] - call HandleMenuInput - bit 1, a ; pressed b - ret nz - ld hl, wFilteredBagItems - ld a, [wCurrentMenuItem] - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - ld [hItemToRemoveID], a - cp FRESH_WATER - jr z, .gaveFreshWater - cp SODA_POP - jr z, .gaveSodaPop -; gave Lemonade - CheckEvent EVENT_GOT_TM49 - jr nz, .alreadyGaveDrink - ld hl, CeladonMartRoofText_48515 - call PrintText - call RemoveItemByIDBank12 - lb bc, TM_49, 1 - call GiveItem - jr nc, .bagFull - ld hl, ReceivedTM49Text - call PrintText - SetEvent EVENT_GOT_TM49 - ret -.gaveSodaPop - CheckEvent EVENT_GOT_TM48 - jr nz, .alreadyGaveDrink - ld hl, CeladonMartRoofText_48504 - call PrintText - call RemoveItemByIDBank12 - lb bc, TM_48, 1 - call GiveItem - jr nc, .bagFull - ld hl, CeladonMartRoofText_4850a - call PrintText - SetEvent EVENT_GOT_TM48 - ret -.gaveFreshWater - CheckEvent EVENT_GOT_TM13 - jr nz, .alreadyGaveDrink - ld hl, CeladonMartRoofText_484f3 - call PrintText - call RemoveItemByIDBank12 - lb bc, TM_13, 1 - call GiveItem - jr nc, .bagFull - ld hl, CeladonMartRoofText_484f9 - call PrintText - SetEvent EVENT_GOT_TM13 - ret -.bagFull - ld hl, CeladonMartRoofText_48526 - jp PrintText -.alreadyGaveDrink - ld hl, CeladonMartRoofText_4852c - jp PrintText - -RemoveItemByIDBank12: - jpba RemoveItemByID - -CeladonMartRoofText_484ee: - TX_FAR _CeladonMartRoofText_484ee - db "@" - -CeladonMartRoofText_484f3: - TX_FAR _CeladonMartRoofText_484f3 - TX_WAIT - db "@" - -CeladonMartRoofText_484f9: - TX_FAR _CeladonMartRoofText_484f9 - TX_SFX_ITEM_1 - TX_FAR _CeladonMartRoofText_484fe - TX_WAIT - db "@" - -CeladonMartRoofText_48504: - TX_FAR _CeladonMartRoofText_48504 - TX_WAIT - db "@" - -CeladonMartRoofText_4850a: - TX_FAR _CeladonMartRoofText_4850a - TX_SFX_ITEM_1 - TX_FAR _CeladonMartRoofText_4850f - TX_WAIT - db "@" - -CeladonMartRoofText_48515: - TX_FAR _CeladonMartRoofText_48515 - TX_WAIT - db "@" - -ReceivedTM49Text: - TX_FAR _ReceivedTM49Text - TX_SFX_ITEM_1 - TX_FAR _CeladonMartRoofText_48520 - TX_WAIT - db "@" - -CeladonMartRoofText_48526: - TX_FAR _CeladonMartRoofText_48526 - TX_WAIT - db "@" - -CeladonMartRoofText_4852c: - TX_FAR _CeladonMartRoofText_4852c - TX_WAIT - db "@" - -CeladonMartRoofScript_PrintDrinksInBag: - ld hl, wFilteredBagItems - xor a - ld [hItemCounter], a -.loop - ld a, [hli] - cp $ff - ret z - push hl - ld [wd11e], a - call GetItemName - coord hl, 2, 2 - ld a, [hItemCounter] - ld bc, SCREEN_WIDTH * 2 - call AddNTimes - ld de, wcd6d - call PlaceString - ld hl, hItemCounter - inc [hl] - pop hl - jr .loop - -CeladonMartRoofTextPointers: - dw CeladonMartRoofText1 - dw CeladonMartRoofText2 - dw CeladonMartRoofText5 - dw CeladonMartRoofText5 - dw CeladonMartRoofText5 - dw CeladonMartRoofText6 - -CeladonMartRoofText1: - TX_FAR _CeladonMartRoofText1 - db "@" - -CeladonMartRoofText2: - TX_ASM - call CeladonMartRoofScript_GetDrinksInBag - ld a, [wFilteredBagItemsCount] - and a - jr z, .noDrinksInBag - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonMartRoofText4 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .done - call CeladonMartRoofScript_GiveDrinkToGirl - jr .done -.noDrinksInBag - ld hl, CeladonMartRoofText3 - call PrintText -.done - jp TextScriptEnd - -CeladonMartRoofText3: - TX_FAR _CeladonMartRoofText_48598 - db "@" - -CeladonMartRoofText4: - TX_FAR _CeladonMartRoofText4 - db "@" - -CeladonMartRoofText5: - TX_VENDING_MACHINE - -CeladonMartRoofText6: - TX_FAR _CeladonMartRoofText6 - db "@" diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm deleted file mode 100755 index bd91af20..00000000 --- a/scripts/celadonpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -CeladonPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -CeladonPokecenterTextPointers: - dw CeladonHealNurseText - dw CeladonPokecenterText2 - dw CeladonPokecenterText3 - dw CeladonTradeNurseText - -CeladonTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST - -CeladonHealNurseText: - TX_POKECENTER_NURSE - -CeladonPokecenterText2: - TX_FAR _CeladonPokecenterText2 - db "@" - -CeladonPokecenterText3: - TX_FAR _CeladonPokecenterText3 - db "@" diff --git a/scripts/celadonprizeroom.asm b/scripts/celadonprizeroom.asm deleted file mode 100755 index a07ce162..00000000 --- a/scripts/celadonprizeroom.asm +++ /dev/null @@ -1,20 +0,0 @@ -CeladonPrizeRoomScript: - jp EnableAutoTextBoxDrawing - -CeladonPrizeRoomTextPointers: - dw CeladonPrizeRoomText1 - dw CeladonPrizeRoomText2 - dw CeladonPrizeRoomText3 - dw CeladonPrizeRoomText3 - dw CeladonPrizeRoomText3 - -CeladonPrizeRoomText1: - TX_FAR _CeladonPrizeRoomText1 - db "@" - -CeladonPrizeRoomText2: - TX_FAR _CeladonPrizeRoomText2 - db "@" - -CeladonPrizeRoomText3: - TX_PRIZE_VENDOR diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm deleted file mode 100755 index 555e75f1..00000000 --- a/scripts/ceruleancity.asm +++ /dev/null @@ -1,453 +0,0 @@ -CeruleanCityScript: - call EnableAutoTextBoxDrawing - ld hl, CeruleanCityScriptPointers - ld a, [wCeruleanCityCurScript] - jp CallFunctionInTable - -CeruleanCityScript_1948c: - xor a - ld [wJoyIgnore], a - ld [wCeruleanCityCurScript], a - ld a, HS_CERULEAN_RIVAL - ld [wMissableObjectIndex], a - predef_jump HideObject - -CeruleanCityScriptPointers: - dw CeruleanCityScript0 - dw CeruleanCityScript1 - dw CeruleanCityScript2 - dw CeruleanCityScript3 - dw CeruleanCityScript4 - -CeruleanCityScript4: - ld a, [wIsInBattle] - cp $ff - jp z, CeruleanCityScript_1948c - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wJoyIgnore], a - ld [wCeruleanCityCurScript], a - ret - -CeruleanCityScript0: - CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF - jr nz, .asm_194f7 - ld hl, CeruleanCityCoords1 - call ArePlayerCoordsInArray - jr nc, .asm_194f7 - ld a, [wCoordIndex] - cp $1 - ld a, PLAYER_DIR_UP - ld b, SPRITE_FACING_DOWN - jr nz, .asm_194e6 - ld a, PLAYER_DIR_DOWN - ld b, SPRITE_FACING_UP -.asm_194e6 - ld [wPlayerMovingDirection], a - ld a, b - ld [wSpriteStateData1 + 2 * $10 + $9], a - call Delay3 - ld a, $2 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID -.asm_194f7 - CheckEvent EVENT_BEAT_CERULEAN_RIVAL - ret nz - ld hl, CeruleanCityCoords2 - call ArePlayerCoordsInArray - ret nc - ld a, [wWalkBikeSurfState] - and a - jr z, .asm_19512 - ld a, $ff - ld [wNewSoundID], a - call PlaySound -.asm_19512 - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - xor a - ld [hJoyHeld], a - ld a, $f0 - ld [wJoyIgnore], a - ld a, [wXCoord] - cp $14 - jr z, .asm_19535 - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, $5 - ld [H_SPRITEDATAOFFSET], a - call GetPointerWithinSpriteStateData2 - ld [hl], $19 -.asm_19535 - ld a, HS_CERULEAN_RIVAL - ld [wMissableObjectIndex], a - predef ShowObject - ld de, CeruleanCityMovement1 - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $1 - ld [wCeruleanCityCurScript], a - ret - -CeruleanCityCoords1: - db $07,$1e - db $09,$1e - db $ff - -CeruleanCityCoords2: - db $06,$14 - db $06,$15 - db $ff - -CeruleanCityMovement1: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -CeruleanCityScript_1955d: - ld a, 1 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - jp SetSpriteFacingDirectionAndDelay ; face object - -CeruleanCityScript1: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, CeruleanCityText_1966d - ld de, CeruleanCityText_19672 - call SaveEndBattleTextPointers - ld a, OPP_SONY1 - ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotSquirtle - ld a, $7 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $8 - jr .done -.Charmander - ld a, $9 -.done - ld [wTrainerNo], a - - xor a - ld [hJoyHeld], a - call CeruleanCityScript_1955d - ld a, $2 - ld [wCeruleanCityCurScript], a - ret - -CeruleanCityScript2: - ld a, [wIsInBattle] - cp $ff - jp z, CeruleanCityScript_1948c - call CeruleanCityScript_1955d - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_CERULEAN_RIVAL - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld a, [wXCoord] - cp $14 - jr nz, .asm_195f0 - ld de, CeruleanCityMovement4 - jr .asm_195f3 -.asm_195f0 - ld de, CeruleanCityMovement3 -.asm_195f3 - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $3 - ld [wCeruleanCityCurScript], a - ret - -CeruleanCityMovement3: - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -CeruleanCityMovement4: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -CeruleanCityScript3: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_CERULEAN_RIVAL - ld [wMissableObjectIndex], a - predef HideObject - xor a - ld [wJoyIgnore], a - call PlayDefaultMusic - ld a, $0 - ld [wCeruleanCityCurScript], a - ret - -CeruleanCityTextPointers: - dw CeruleanCityText1 - dw CeruleanCityText2 - dw CeruleanCityText3 - dw CeruleanCityText4 - dw CeruleanCityText5 - dw CeruleanCityText6 - dw CeruleanCityText7 - dw CeruleanCityText8 - dw CeruleanCityText9 - dw CeruleanCityText10 - dw CeruleanCityText11 - dw CeruleanCityText12 - dw CeruleanCityText13 - dw MartSignText - dw PokeCenterSignText - dw CeruleanCityText16 - dw CeruleanCityText17 - -CeruleanCityText1: - TX_ASM - CheckEvent EVENT_BEAT_CERULEAN_RIVAL - ; do pre-battle text - jr z, .PreBattleText - ; or talk about bill - ld hl, CeruleanCityText_19677 - call PrintText - jr .end -.PreBattleText - ld hl, CeruleanCityText_19668 - call PrintText -.end - jp TextScriptEnd - -CeruleanCityText_19668: - TX_FAR _CeruleanCityText_19668 - db "@" - -CeruleanCityText_1966d: - TX_FAR _CeruleanCityText_1966d - db "@" - -CeruleanCityText_19672: - TX_FAR _CeruleanCityText_19672 - db "@" - -CeruleanCityText_19677: - TX_FAR _CeruleanCityText_19677 - db "@" - -CeruleanCityText2: - TX_ASM - CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF - jr nz, .asm_4ca20 - ld hl, CeruleanCityText_196d9 - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, CeruleanCityText_196ee - ld de, CeruleanCityText_196ee - call SaveEndBattleTextPointers - ld a, [hSpriteIndexOrTextID] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $4 - ld [wCeruleanCityCurScript], a - jp TextScriptEnd -.asm_4ca20 - ld hl, CeruleanCityText_196f3 - call PrintText - lb bc, TM_28, 1 - call GiveItem - jr c, .Success - ld hl, TM28NoRoomText - call PrintText - jr .Done -.Success - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, ReceivedTM28Text - call PrintText - callba CeruleanHideRocket -.Done - jp TextScriptEnd - -CeruleanCityText_196d9: - TX_FAR _CeruleanCityText_196d9 - db "@" - -ReceivedTM28Text: - TX_FAR _ReceivedTM28Text - TX_SFX_ITEM_1 - TX_FAR _ReceivedTM28Text2 - TX_WAIT - db "@" - -TM28NoRoomText: - TX_FAR _TM28NoRoomText - db "@" - -CeruleanCityText_196ee: - TX_FAR _CeruleanCityText_196ee - db "@" - -CeruleanCityText_196f3: - TX_FAR _CeruleanCityText_196f3 - db "@" - -CeruleanCityText3: - TX_FAR _CeruleanCityText3 - db "@" - -CeruleanCityText4: - TX_FAR _CeruleanCityText4 - db "@" - -CeruleanCityText5: - TX_FAR _CeruleanCityText5 - db "@" - -CeruleanCityText11: -CeruleanCityText6: - TX_FAR _CeruleanCityText6 - db "@" - -CeruleanCityText7: - TX_ASM - ld a, [hRandomAdd] - cp 180 - jr c, .asm_e9fc9 - ld hl, CeruleanCityText_19730 - call PrintText - jr .asm_d486e -.asm_e9fc9 - cp 100 - jr c, .asm_df99b - ld hl, CeruleanCityText_19735 - call PrintText - jr .asm_d486e -.asm_df99b - ld hl, CeruleanCityText_1973a - call PrintText -.asm_d486e - jp TextScriptEnd - -CeruleanCityText_19730: - TX_FAR _CeruleanCityText_19730 - db "@" - -CeruleanCityText_19735: - TX_FAR _CeruleanCityText_19735 - db "@" - -CeruleanCityText_1973a: - TX_FAR _CeruleanCityText_1973a - db "@" - -CeruleanCityText8: - TX_ASM - ld a, [hRandomAdd] - cp 180 - jr c, .asm_e28da - ld hl, CeruleanCityText_1976f - call PrintText - jr .asm_f2f38 -.asm_e28da - cp 120 - jr c, .asm_15d08 - ld hl, CeruleanCityText_19774 - call PrintText - jr .asm_f2f38 -.asm_15d08 - cp 60 - jr c, .asm_d7fea - ld hl, CeruleanCityText_19779 - call PrintText - jr .asm_f2f38 -.asm_d7fea - ld hl, CeruleanCityText_1977e - call PrintText -.asm_f2f38 - jp TextScriptEnd - -CeruleanCityText_1976f: - TX_FAR _CeruleanCityText_1976f - db "@" - -CeruleanCityText_19774: - TX_FAR _CeruleanCityText_19774 - db "@" - -CeruleanCityText_19779: - TX_FAR _CeruleanCityText_19779 - db "@" - -CeruleanCityText_1977e: - TX_FAR _CeruleanCityText_1977e - db "@" - -CeruleanCityText9: - TX_FAR _CeruleanCityText9 - db "@" - -CeruleanCityText10: - TX_FAR _CeruleanCityText10 - db "@" - -CeruleanCityText12: - TX_FAR _CeruleanCityText12 - db "@" - -CeruleanCityText13: - TX_FAR _CeruleanCityText13 - db "@" - -CeruleanCityText16: - TX_FAR _CeruleanCityText16 - db "@" - -CeruleanCityText17: - TX_FAR _CeruleanCityText17 - db "@" diff --git a/scripts/ceruleancity2.asm b/scripts/ceruleancity2.asm deleted file mode 100755 index 53ace5c8..00000000 --- a/scripts/ceruleancity2.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeruleanHideRocket: -; code similar to this appears in a lot of banks; this particular -; one is called after you beat the Rocket that gives you TM28 DIG. -; the screen then fades out, he disappears, and fades back in - call GBFadeOutToBlack - ld a, HS_CERULEAN_GUARD_1 - ld [wMissableObjectIndex], a - predef ShowObject - ld a, HS_CERULEAN_GUARD_2 - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_CERULEAN_ROCKET - ld [wMissableObjectIndex], a - predef HideObject - call GBFadeInFromBlack - ret diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm deleted file mode 100755 index b82b89f6..00000000 --- a/scripts/ceruleangym.asm +++ /dev/null @@ -1,219 +0,0 @@ -CeruleanGymScript: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - call nz, CeruleanGymScript_5c6d0 - call EnableAutoTextBoxDrawing - ld hl, CeruleanGymTrainerHeader0 - ld de, CeruleanGymScriptPointers - ld a, [wCeruleanGymCurScript] - call ExecuteCurMapScriptInTable - ld [wCeruleanGymCurScript], a - ret - -CeruleanGymScript_5c6d0: - ld hl, Gym2CityName - ld de, Gym2LeaderName - jp LoadGymLeaderAndCityName - -Gym2CityName: - db "CERULEAN CITY@" - -Gym2LeaderName: - db "MISTY@" - -CeruleanGymScript_5c6ed: - xor a - ld [wJoyIgnore], a - ld [wCeruleanGymCurScript], a - ld [wCurMapScript], a - ret - -CeruleanGymScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeruleanGymScript3 - -CeruleanGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, CeruleanGymScript_5c6ed - ld a, $f0 - ld [wJoyIgnore], a - -CeruleanGymScript_5c70d: - ld a, $5 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_MISTY - lb bc, TM_11, 1 - call GiveItem - jr nc, .BagFull - ld a, $6 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM11 - jr .asm_5c736 -.BagFull - ld a, $7 - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_5c736 - ld hl, wObtainedBadges - set 1, [hl] - ld hl, wBeatGymFlags - set 1, [hl] - - ; deactivate gym trainers - SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - - jp CeruleanGymScript_5c6ed - -CeruleanGymTextPointers: - dw CeruleanGymText1 - dw CeruleanGymText2 - dw CeruleanGymText3 - dw CeruleanGymText4 - dw CeruleanGymText5 - dw CeruleanGymText6 - dw CeruleanGymText7 - -CeruleanGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0 - dw CeruleanGymBattleText1 ; TextBeforeBattle - dw CeruleanGymAfterBattleText1 ; TextAfterBattle - dw CeruleanGymEndBattleText1 ; TextEndBattle - dw CeruleanGymEndBattleText1 ; TextEndBattle - -CeruleanGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - dw CeruleanGymBattleText2 ; TextBeforeBattle - dw CeruleanGymAfterBattleText2 ; TextAfterBattle - dw CeruleanGymEndBattleText2 ; TextEndBattle - dw CeruleanGymEndBattleText2 ; TextEndBattle - - db $ff - -CeruleanGymText1: - TX_ASM - CheckEvent EVENT_BEAT_MISTY - jr z, .asm_5c78d - CheckEventReuseA EVENT_GOT_TM11 - jr nz, .asm_5c785 - call z, CeruleanGymScript_5c70d - call DisableWaitingAfterTextDisplay - jr .asm_5c7bb -.asm_5c785 - ld hl, CeruleanGymText_5c7c3 - call PrintText - jr .asm_5c7bb -.asm_5c78d - ld hl, CeruleanGymText_5c7be - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, CeruleanGymText_5c7d8 - ld de, CeruleanGymText_5c7d8 - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $2 - ld [wGymLeaderNo], a - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wCeruleanGymCurScript], a -.asm_5c7bb - jp TextScriptEnd - -CeruleanGymText_5c7be: - TX_FAR _CeruleanGymText_5c7be - db "@" - -CeruleanGymText_5c7c3: - TX_FAR _CeruleanGymText_5c7c3 - db "@" - -CeruleanGymText5: - TX_FAR _CeruleanGymText_5c7c8 - db "@" - -CeruleanGymText6: - TX_FAR _ReceivedTM11Text - TX_SFX_ITEM_1 - db "@" - -CeruleanGymText7: - TX_FAR _CeruleanGymText_5c7d3 - db "@" - -CeruleanGymText_5c7d8: - TX_FAR _CeruleanGymText_5c7d8 - TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded - TX_BLINK - db "@" - -CeruleanGymText2: - TX_ASM - ld hl, CeruleanGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -CeruleanGymBattleText1: - TX_FAR _CeruleanGymBattleText1 - db "@" - -CeruleanGymEndBattleText1: - TX_FAR _CeruleanGymEndBattleText1 - db "@" - -CeruleanGymAfterBattleText1: - TX_FAR _CeruleanGymAfterBattleText1 - db "@" - -CeruleanGymText3: - TX_ASM - ld hl, CeruleanGymTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -CeruleanGymBattleText2: - TX_FAR _CeruleanGymBattleText2 - db "@" - -CeruleanGymEndBattleText2: - TX_FAR _CeruleanGymEndBattleText2 - db "@" - -CeruleanGymAfterBattleText2: - TX_FAR _CeruleanGymAfterBattleText2 - db "@" - -CeruleanGymText4: - TX_ASM - CheckEvent EVENT_BEAT_MISTY - jr nz, .asm_5c821 - ld hl, CeruleanGymText_5c82a - call PrintText - jr .asm_5c827 -.asm_5c821 - ld hl, CeruleanGymText_5c82f - call PrintText -.asm_5c827 - jp TextScriptEnd - -CeruleanGymText_5c82a: - TX_FAR _CeruleanGymText_5c82a - db "@" - -CeruleanGymText_5c82f: - TX_FAR _CeruleanGymText_5c82f - db "@" diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm deleted file mode 100755 index 181a22c3..00000000 --- a/scripts/ceruleanhouse1.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanHouse1Script: - jp EnableAutoTextBoxDrawing - -CeruleanHouse1TextPointers: - dw CeruleanHouse1Text1 - dw CeruleanHouse1Text2 - -CeruleanHouse1Text1: - TX_FAR _CeruleanHouse1Text1 - db "@" - -CeruleanHouse1Text2: - TX_ASM - ld a, $6 - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd diff --git a/scripts/ceruleanhouse2.asm b/scripts/ceruleanhouse2.asm deleted file mode 100755 index e83c2194..00000000 --- a/scripts/ceruleanhouse2.asm +++ /dev/null @@ -1,109 +0,0 @@ -CeruleanHouse2Script: - ld a, $1 - ld [wAutoTextBoxDrawingControl], a - dec a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret - -CeruleanHouse2TextPointers: - dw CeruleanHouse2Text1 - -CeruleanHouse2Text1: - TX_ASM - ld hl, CeruleanHouse2Text_74e77 - call PrintText - xor a - ld [wCurrentMenuItem], a - ld [wListScrollOffset], a -.asm_74e23 - ld hl, CeruleanHouse2Text_74e7c - call PrintText - ld hl, BadgeItemList - call LoadItemList - ld hl, wItemList - ld a, l - ld [wListPointer], a - ld a, h - ld [wListPointer + 1], a - xor a - ld [wPrintItemPrices], a - ld [wMenuItemToSwap], a - ld a, SPECIALLISTMENU - ld [wListMenuID], a - call DisplayListMenuID - jr c, .asm_74e60 - ld hl, TextPointers_74e86 - ld a, [wcf91] - sub $15 - add a - ld d, $0 - ld e, a - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - call PrintText - jr .asm_74e23 -.asm_74e60 - xor a - ld [wListScrollOffset], a - ld hl, CeruleanHouse2Text_74e81 - call PrintText - jp TextScriptEnd - -BadgeItemList: - db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF - -CeruleanHouse2Text_74e77: - TX_FAR _CeruleanHouse2Text_74e77 - db "@" - -CeruleanHouse2Text_74e7c: - TX_FAR _CeruleanHouse2Text_74e7c - db "@" - -CeruleanHouse2Text_74e81: - TX_FAR _CeruleanHouse2Text_74e81 - db "@" - -TextPointers_74e86: - dw CeruleanHouse2Text_74e96 - dw CeruleanHouse2Text_74e9b - dw CeruleanHouse2Text_74ea0 - dw CeruleanHouse2Text_74ea5 - dw CeruleanHouse2Text_74eaa - dw CeruleanHouse2Text_74eaf - dw CeruleanHouse2Text_74eb4 - dw CeruleanHouse2Text_74eb9 - -CeruleanHouse2Text_74e96: - TX_FAR _CeruleanHouse2Text_74e96 - db "@" - -CeruleanHouse2Text_74e9b: - TX_FAR _CeruleanHouse2Text_74e9b - db "@" - -CeruleanHouse2Text_74ea0: - TX_FAR _CeruleanHouse2Text_74ea0 - db "@" - -CeruleanHouse2Text_74ea5: - TX_FAR _CeruleanHouse2Text_74ea5 - db "@" - -CeruleanHouse2Text_74eaa: - TX_FAR _CeruleanHouse2Text_74eaa - db "@" - -CeruleanHouse2Text_74eaf: - TX_FAR _CeruleanHouse2Text_74eaf - db "@" - -CeruleanHouse2Text_74eb4: - TX_FAR _CeruleanHouse2Text_74eb4 - db "@" - -CeruleanHouse2Text_74eb9: - TX_FAR _CeruleanHouse2Text_74eb9 - db "@" diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/ceruleanhousetrashed.asm deleted file mode 100755 index da848b7c..00000000 --- a/scripts/ceruleanhousetrashed.asm +++ /dev/null @@ -1,39 +0,0 @@ -CeruleanHouseTrashedScript: - call EnableAutoTextBoxDrawing - ret - -CeruleanHouseTrashedTextPointers: - dw CeruleanHouseTrashedText1 - dw CeruleanHouseTrashedText2 - dw CeruleanHouseTrashedText3 - -CeruleanHouseTrashedText1: - TX_ASM - ld b, $e4 - predef GetQuantityOfItemInBag - and b - jr z, .asm_f8734 - ld hl, CeruleanHouseTrashedText_1d6b0 - call PrintText - jr .asm_8dfe9 -.asm_f8734 - ld hl, CeruleanHouseTrashedText_1d6ab - call PrintText -.asm_8dfe9 - jp TextScriptEnd - -CeruleanHouseTrashedText_1d6ab: - TX_FAR _CeruleanTrashedText_1d6ab - db "@" - -CeruleanHouseTrashedText_1d6b0: - TX_FAR _CeruleanTrashedText_1d6b0 - db "@" - -CeruleanHouseTrashedText2: - TX_FAR _CeruleanHouseTrashedText2 - db "@" - -CeruleanHouseTrashedText3: - TX_FAR _CeruleanHouseTrashedText3 - db "@" diff --git a/scripts/ceruleanmart.asm b/scripts/ceruleanmart.asm deleted file mode 100755 index 76d83f90..00000000 --- a/scripts/ceruleanmart.asm +++ /dev/null @@ -1,15 +0,0 @@ -CeruleanMartScript: - jp EnableAutoTextBoxDrawing - -CeruleanMartTextPointers: - dw CeruleanCashierText - dw CeruleanMartText2 - dw CeruleanMartText3 - -CeruleanMartText2: - TX_FAR _CeruleanMartText2 - db "@" - -CeruleanMartText3: - TX_FAR _CeruleanMartText3 - db "@" diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm deleted file mode 100755 index b758f497..00000000 --- a/scripts/ceruleanpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -CeruleanPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -CeruleanPokecenterTextPointers: - dw CeruleanHealNurseText - dw CeruleanPokecenterText2 - dw CeruleanPokecenterText3 - dw CeruleanTradeNurseText - -CeruleanTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST - -CeruleanHealNurseText: - TX_POKECENTER_NURSE - -CeruleanPokecenterText2: - TX_FAR _CeruleanPokecenterText2 - db "@" - -CeruleanPokecenterText3: - TX_FAR _CeruleanPokecenterText3 - db "@" diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm deleted file mode 100755 index 8af7bbd3..00000000 --- a/scripts/cinnabargym.asm +++ /dev/null @@ -1,472 +0,0 @@ -CinnabarGymScript: - call CinnabarGymScript_75759 - call EnableAutoTextBoxDrawing - ld hl, CinnabarGymScriptPointers - ld a, [wCinnabarGymCurScript] - jp CallFunctionInTable - -CinnabarGymScript_75759: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - push hl - call nz, CinnabarGymScript_75772 - pop hl - bit 5, [hl] - res 5, [hl] - call nz, UpdateCinnabarGymGateTileBlocks - ResetEvent EVENT_2A7 - ret -CinnabarGymScript_75772: - ld hl, Gym7CityName - ld de, Gym7LeaderName - jp LoadGymLeaderAndCityName - -Gym7CityName: - db "CINNABAR ISLAND@" -Gym7LeaderName: - db "BLAINE@" - -CinnabarGymScript_75792: - xor a - ld [wJoyIgnore], a - ld [wCinnabarGymCurScript], a - ld [wCurMapScript], a - ld [wOpponentAfterWrongAnswer], a - ret - -CinnabarGymScript_757a0: - ld a, [hSpriteIndexOrTextID] - ld [wTrainerHeaderFlagBit], a - ret - -CinnabarGymScriptPointers: - dw CinnabarGymScript0 - dw CinnabarGymScript1 - dw CinnabarGymScript2 - dw CinnabarGymScript3 - -CinnabarGymScript0: - ld a, [wOpponentAfterWrongAnswer] - and a - ret z - ld [H_SPRITEINDEX], a - cp $4 - jr nz, .asm_757c3 - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld de, MovementData_757d7 - jr .asm_757cb -.asm_757c3 - ld de, MovementData_757da - ld a, PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection], a -.asm_757cb - call MoveSprite - ld a, $1 - ld [wCinnabarGymCurScript], a - ld [wCurMapScript], a - ret - -MovementData_757d7: - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_UP - db $FF - -MovementData_757da: - db NPC_MOVEMENT_LEFT - db $FF - -CinnabarGymScript1: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, [wOpponentAfterWrongAnswer] - ld [wTrainerHeaderFlagBit], a - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -CinnabarGymFlagAction: - predef_jump FlagActionPredef - -CinnabarGymScript2: - ld a, [wIsInBattle] - cp $ff - jp z, CinnabarGymScript_75792 - ld a, [wTrainerHeaderFlagBit] - ld [$ffdb], a - AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 - ld c, a - ld b, FLAG_TEST - EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0 - call CinnabarGymFlagAction - ld a, c - and a - jr nz, .asm_7581b - call WaitForSoundToFinish - ld a, SFX_GO_INSIDE - call PlaySound - call WaitForSoundToFinish -.asm_7581b - ld a, [wTrainerHeaderFlagBit] - ld [$ffdb], a - AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 - ld c, a - ld b, FLAG_SET - EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0 - call CinnabarGymFlagAction - ld a, [wTrainerHeaderFlagBit] - sub $2 - AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 - ld c, a - ld b, FLAG_SET - EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED - call CinnabarGymFlagAction - call UpdateCinnabarGymGateTileBlocks - xor a - ld [wJoyIgnore], a - ld [wOpponentAfterWrongAnswer], a - ld a, $0 - ld [wCinnabarGymCurScript], a - ld [wCurMapScript], a - ret - -CinnabarGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, CinnabarGymScript_75792 - ld a, $f0 - ld [wJoyIgnore], a -CinnabarGymScript3_75857: - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_BLAINE - lb bc, TM_38, 1 - call GiveItem - jr nc, .BagFull - ld a, $b - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM38 - jr .asm_75880 -.BagFull - ld a, $c - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_75880 - ld hl, wObtainedBadges - set 6, [hl] - ld hl, wBeatGymFlags - set 6, [hl] - - ; deactivate gym trainers - SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - - ld hl, wCurrentMapScriptFlags - set 5, [hl] - - jp CinnabarGymScript_75792 - -CinnabarGymTextPointers: - dw CinnabarGymText1 - dw CinnabarGymText2 - dw CinnabarGymText3 - dw CinnabarGymText4 - dw CinnabarGymText5 - dw CinnabarGymText6 - dw CinnabarGymText7 - dw CinnabarGymText8 - dw CinnabarGymText9 - dw BlaineBadgeText - dw ReceivedTM38Text - dw TM38NoRoomText - -CinnabarGymScript_758b7: - ld a, [hSpriteIndexOrTextID] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld a, [wSpriteIndex] - cp $1 - jr z, .asm_758d4 - ld a, $2 - jr .asm_758d6 -.asm_758d4 - ld a, $3 -.asm_758d6 - ld [wCinnabarGymCurScript], a - ld [wCurMapScript], a - jp TextScriptEnd - -CinnabarGymText1: - TX_ASM - CheckEvent EVENT_BEAT_BLAINE - jr z, .asm_d9332 - CheckEventReuseA EVENT_GOT_TM38 - jr nz, .asm_3012f - call z, CinnabarGymScript3_75857 - call DisableWaitingAfterTextDisplay - jp TextScriptEnd -.asm_3012f - ld hl, BlaineFireBlastText - call PrintText - jp TextScriptEnd -.asm_d9332 - ld hl, BlaineBattleText - call PrintText - ld hl, BlaineEndBattleText - ld de, BlaineEndBattleText - call SaveEndBattleTextPointers - ld a, $7 - ld [wGymLeaderNo], a - jp CinnabarGymScript_758b7 - -BlaineBattleText: - TX_FAR _BlaineBattleText - db "@" - -BlaineEndBattleText: - TX_FAR _BlaineEndBattleText - TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded - TX_WAIT - db "@" - -BlaineFireBlastText: - TX_FAR _BlaineFireBlastText - db "@" - -BlaineBadgeText: - TX_FAR _BlaineBadgeText - db "@" - -ReceivedTM38Text: - TX_FAR _ReceivedTM38Text - TX_SFX_ITEM_1 - TX_FAR _TM38ExplanationText - db "@" - -TM38NoRoomText: - TX_FAR _TM38NoRoomText - db "@" - -CinnabarGymText2: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 - jr nz, .asm_46bb4 - ld hl, CinnabarGymText_7595f - call PrintText - ld hl, CinnabarGymText_75964 - ld de, CinnabarGymText_75964 - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_46bb4 - ld hl, CinnabarGymText_75969 - call PrintText - jp TextScriptEnd - -CinnabarGymText_7595f: - TX_FAR _CinnabarGymText_7595f - db "@" - -CinnabarGymText_75964: - TX_FAR _CinnabarGymText_75964 - db "@" - -CinnabarGymText_75969: - TX_FAR _CinnabarGymText_75969 - db "@" - -CinnabarGymText3: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 - jr nz, .asm_4b406 - ld hl, CinnabarGymText_75994 - call PrintText - ld hl, CinnabarGymText_75999 - ld de, CinnabarGymText_75999 - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_4b406 - ld hl, CinnabarGymText_7599e - call PrintText - jp TextScriptEnd - -CinnabarGymText_75994: - TX_FAR _CinnabarGymText_75994 - db "@" - -CinnabarGymText_75999: - TX_FAR _CinnabarGymText_75999 - db "@" - -CinnabarGymText_7599e: - TX_FAR _CinnabarGymText_7599e - db "@" - -CinnabarGymText4: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 - jr nz, .asm_c0673 - ld hl, CinnabarGymText_759c9 - call PrintText - ld hl, CinnabarGymText_759ce - ld de, CinnabarGymText_759ce - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_c0673 - ld hl, CinnabarGymText_759d3 - call PrintText - jp TextScriptEnd - -CinnabarGymText_759c9: - TX_FAR _CinnabarGymText_759c9 - db "@" - -CinnabarGymText_759ce: - TX_FAR _CinnabarGymText_759ce - db "@" - -CinnabarGymText_759d3: - TX_FAR _CinnabarGymText_759d3 - db "@" - -CinnabarGymText5: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 - jr nz, .asm_5cfd7 - ld hl, CinnabarGymText_759fe - call PrintText - ld hl, CinnabarGymText_75a03 - ld de, CinnabarGymText_75a03 - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_5cfd7 - ld hl, CinnabarGymText_75a08 - call PrintText - jp TextScriptEnd - -CinnabarGymText_759fe: - TX_FAR _CinnabarGymText_759fe - db "@" - -CinnabarGymText_75a03: - TX_FAR _CinnabarGymText_75a03 - db "@" - -CinnabarGymText_75a08: - TX_FAR _CinnabarGymText_75a08 - db "@" - -CinnabarGymText6: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 - jr nz, .asm_776b4 - ld hl, CinnabarGymText_75a33 - call PrintText - ld hl, CinnabarGymText_75a38 - ld de, CinnabarGymText_75a38 - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_776b4 - ld hl, CinnabarGymText_75a3d - call PrintText - jp TextScriptEnd - -CinnabarGymText_75a33: - TX_FAR _CinnabarGymText_75a33 - db "@" - -CinnabarGymText_75a38: - TX_FAR _CinnabarGymText_75a38 - db "@" - -CinnabarGymText_75a3d: - TX_FAR _CinnabarGymText_75a3d - db "@" - -CinnabarGymText7: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 - jr nz, .asm_2f755 - ld hl, CinnabarGymText_75a68 - call PrintText - ld hl, CinnabarGymText_75a6d - ld de, CinnabarGymText_75a6d - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_2f755 - ld hl, CinnabarGymText_75a72 - call PrintText - jp TextScriptEnd - -CinnabarGymText_75a68: - TX_FAR _CinnabarGymText_75a68 - db "@" - -CinnabarGymText_75a6d: - TX_FAR _CinnabarGymText_75a6d - db "@" - -CinnabarGymText_75a72: - TX_FAR _CinnabarGymText_75a72 - db "@" - -CinnabarGymText8: - TX_ASM - call CinnabarGymScript_757a0 - CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - jr nz, .asm_d87be - ld hl, CinnabarGymText_75a9d - call PrintText - ld hl, CinnabarGymText_75aa2 - ld de, CinnabarGymText_75aa2 - call SaveEndBattleTextPointers - jp CinnabarGymScript_758b7 -.asm_d87be - ld hl, CinnabarGymText_75aa7 - call PrintText - jp TextScriptEnd - -CinnabarGymText_75a9d: - TX_FAR _CinnabarGymText_75a9d - db "@" - -CinnabarGymText_75aa2: - TX_FAR _CinnabarGymText_75aa2 - db "@" - -CinnabarGymText_75aa7: - TX_FAR _CinnabarGymText_75aa7 - db "@" - -CinnabarGymText9: - TX_ASM - CheckEvent EVENT_BEAT_BLAINE - jr nz, .asm_627d9 - ld hl, CinnabarGymText_75ac2 - jr .asm_0b11d -.asm_627d9 - ld hl, CinnabarGymText_75ac7 -.asm_0b11d - call PrintText - jp TextScriptEnd - -CinnabarGymText_75ac2: - TX_FAR _CinnabarGymText_75ac2 - db "@" - -CinnabarGymText_75ac7: - TX_FAR _CinnabarGymText_75ac7 - db "@" diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm deleted file mode 100755 index 8549042f..00000000 --- a/scripts/cinnabarisland.asm +++ /dev/null @@ -1,85 +0,0 @@ -CinnabarIslandScript: - call EnableAutoTextBoxDrawing - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ResetEvent EVENT_MANSION_SWITCH_ON - ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL - ld hl, CinnabarIslandScriptPointers - ld a, [wCinnabarIslandCurScript] - jp CallFunctionInTable - -CinnabarIslandScriptPointers: - dw CinnabarIslandScript0 - dw CinnabarIslandScript1 - -CinnabarIslandScript0: - ld b, SECRET_KEY - call IsItemInBag - ret nz - ld a, [wYCoord] - cp $4 - ret nz - ld a, [wXCoord] - cp $12 - ret nz - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - ld a, $8 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [hJoyHeld], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - xor a - ld [wSpriteStateData1 + 9], a - ld [wJoyIgnore], a - ld a, $1 - ld [wCinnabarIslandCurScript], a - ret - -CinnabarIslandScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - ld a, $0 - ld [wCinnabarIslandCurScript], a - ret - -CinnabarIslandTextPointers: - dw CinnabarIslandText1 - dw CinnabarIslandText2 - dw CinnabarIslandText3 - dw MartSignText - dw PokeCenterSignText - dw CinnabarIslandText6 - dw CinnabarIslandText7 - dw CinnabarIslandText8 - -CinnabarIslandText8: - TX_FAR _CinnabarIslandText8 - db "@" - -CinnabarIslandText1: - TX_FAR _CinnabarIslandText1 - db "@" - -CinnabarIslandText2: - TX_FAR _CinnabarIslandText2 - db "@" - -CinnabarIslandText3: - TX_FAR _CinnabarIslandText3 - db "@" - -CinnabarIslandText6: - TX_FAR _CinnabarIslandText6 - db "@" - -CinnabarIslandText7: - TX_FAR _CinnabarIslandText7 - db "@" diff --git a/scripts/cinnabarmart.asm b/scripts/cinnabarmart.asm deleted file mode 100755 index 55b82cf0..00000000 --- a/scripts/cinnabarmart.asm +++ /dev/null @@ -1,15 +0,0 @@ -CinnabarMartScript: - jp EnableAutoTextBoxDrawing - -CinnabarMartTextPointers: - dw CinnabarCashierText - dw CinnabarMartText2 - dw CinnabarMartText3 - -CinnabarMartText2: - TX_FAR _CinnabarMartText2 - db "@" - -CinnabarMartText3: - TX_FAR _CinnabarMartText3 - db "@" diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm deleted file mode 100755 index 2f6d5791..00000000 --- a/scripts/cinnabarpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -CinnabarPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -CinnabarPokecenterTextPointers: - dw CinnabarHealNurseText - dw CinnabarPokecenterText2 - dw CinnabarPokecenterText3 - dw CinnabarTradeNurseText - -CinnabarHealNurseText: - TX_POKECENTER_NURSE - -CinnabarPokecenterText2: - TX_FAR _CinnabarPokecenterText2 - db "@" - -CinnabarPokecenterText3: - TX_FAR _CinnabarPokecenterText3 - db "@" - -CinnabarTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/colosseum.asm b/scripts/colosseum.asm deleted file mode 100755 index bdfa3c44..00000000 --- a/scripts/colosseum.asm +++ /dev/null @@ -1,9 +0,0 @@ -ColosseumScript: - jp TradeCenterScript - -ColosseumTextPointers: - dw ColosseumText1 - -ColosseumText1: - TX_FAR _ColosseumText1 - db "@" diff --git a/scripts/copycatshouse1f.asm b/scripts/copycatshouse1f.asm deleted file mode 100755 index 25cd0fc2..00000000 --- a/scripts/copycatshouse1f.asm +++ /dev/null @@ -1,22 +0,0 @@ -CopycatsHouse1FScript: - jp EnableAutoTextBoxDrawing - -CopycatsHouse1FTextPointers: - dw CopycatsHouse1FText1 - dw CopycatsHouse1FText2 - dw CopycatsHouse1FText3 - -CopycatsHouse1FText1: - TX_FAR _CopycatsHouse1FText1 - db "@" - -CopycatsHouse1FText2: - TX_FAR _CopycatsHouse1FText2 - db "@" - -CopycatsHouse1FText3: - TX_FAR _CopycatsHouse1FText3 - TX_ASM - ld a, CHANSEY - call PlayCry - jp TextScriptEnd diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm deleted file mode 100755 index 87946b8f..00000000 --- a/scripts/copycatshouse2f.asm +++ /dev/null @@ -1,102 +0,0 @@ -CopycatsHouse2FScript: - jp EnableAutoTextBoxDrawing - -CopycatsHouse2FTextPointers: - dw CopycatsHouse2FText1 - dw CopycatsHouse2FText2 - dw CopycatsHouse2FText3 - dw CopycatsHouse2FText4 - dw CopycatsHouse2FText5 - dw CopycatsHouse2FText6 - dw CopycatsHouse2FText7 - -CopycatsHouse2FText1: - TX_ASM - CheckEvent EVENT_GOT_TM31 - jr nz, .asm_7ccf3 - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CopycatsHouse2FText_5ccd4 - call PrintText - ld b, POKE_DOLL - call IsItemInBag - jr z, .asm_62ecd - ld hl, TM31PreReceiveText - call PrintText - lb bc, TM_31, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedTM31Text - call PrintText - ld a, POKE_DOLL - ld [$ffdb], a - callba RemoveItemByID - SetEvent EVENT_GOT_TM31 - jr .asm_62ecd -.BagFull - ld hl, TM31NoRoomText - call PrintText - jr .asm_62ecd -.asm_7ccf3 - ld hl, TM31ExplanationText2 - call PrintText -.asm_62ecd - jp TextScriptEnd - -CopycatsHouse2FText_5ccd4: - TX_FAR _CopycatsHouse2FText_5ccd4 - db "@" - -TM31PreReceiveText: - TX_FAR _TM31PreReceiveText - db "@" - -ReceivedTM31Text: - TX_FAR _ReceivedTM31Text - TX_SFX_ITEM_1 -TM31ExplanationText1: - TX_FAR _TM31ExplanationText1 - TX_WAIT - db "@" - -TM31ExplanationText2: - TX_FAR _TM31ExplanationText2 - db "@" - -TM31NoRoomText: - TX_FAR _TM31NoRoomText - TX_WAIT - db "@" - -CopycatsHouse2FText2: - TX_FAR _CopycatsHouse2FText2 - db "@" - -CopycatsHouse2FText5: -CopycatsHouse2FText4: -CopycatsHouse2FText3: - TX_FAR _CopycatsHouse2FText3 - db "@" - -CopycatsHouse2FText6: - TX_FAR _CopycatsHouse2FText6 - db "@" - -CopycatsHouse2FText7: - TX_ASM - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ld hl, CopycatsHouse2FText_5cd1c - jr nz, .notUp - ld hl, CopycatsHouse2FText_5cd17 -.notUp - call PrintText - jp TextScriptEnd - -CopycatsHouse2FText_5cd17: - TX_FAR _CopycatsHouse2FText_5cd17 - db "@" - -CopycatsHouse2FText_5cd1c: - TX_FAR _CopycatsHouse2FText_5cd1c - db "@" diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm deleted file mode 100755 index 60daa3d5..00000000 --- a/scripts/daycarem.asm +++ /dev/null @@ -1,269 +0,0 @@ -DayCareMScript: - jp EnableAutoTextBoxDrawing - -DayCareMTextPointers: - dw DayCareMText1 - -DayCareMText1: - TX_ASM - call SaveScreenTilesToBuffer2 - ld a, [wDayCareInUse] - and a - jp nz, .daycareInUse - ld hl, DayCareIntroText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ld hl, DayCareComeAgainText - jp nz, .done - ld a, [wPartyCount] - dec a - ld hl, DayCareOnlyHaveOneMonText - jp z, .done - ld hl, DayCareWhichMonText - call PrintText - xor a - ld [wUpdateSpritesEnabled], a - ld [wPartyMenuTypeOrMessageID], a - ld [wMenuItemToSwap], a - call DisplayPartyMenu - push af - call GBPalWhiteOutWithDelay3 - call RestoreScreenTilesAndReloadTilePatterns - call LoadGBPal - pop af - ld hl, DayCareAllRightThenText - jp c, .done - callab KnowsHMMove - ld hl, DayCareCantAcceptMonWithHMText - jp c, .done - xor a - ld [wPartyAndBillsPCSavedMenuItem], a - ld a, [wWhichPokemon] - ld hl, wPartyMonNicks - call GetPartyMonName - ld hl, DayCareWillLookAfterMonText - call PrintText - ld a, 1 - ld [wDayCareInUse], a - ld a, PARTY_TO_DAYCARE - ld [wMoveMonType], a - call MoveMon - xor a - ld [wRemoveMonFromBox], a - call RemovePokemon - ld a, [wcf91] - call PlayCry - ld hl, DayCareComeSeeMeInAWhileText - jp .done - -.daycareInUse - xor a - ld hl, wDayCareMonName - call GetPartyMonName - ld a, DAYCARE_DATA - ld [wMonDataLocation], a - call LoadMonData - callab CalcLevelFromExperience - ld a, d - cp MAX_LEVEL - jr c, .skipCalcExp - - ld d, MAX_LEVEL - callab CalcExperience - ld hl, wDayCareMonExp - ld a, [hExperience] - ld [hli], a - ld a, [hExperience + 1] - ld [hli], a - ld a, [hExperience + 2] - ld [hl], a - ld d, MAX_LEVEL - -.skipCalcExp - xor a - ld [wDayCareNumLevelsGrown], a - ld hl, wDayCareMonBoxLevel - ld a, [hl] - ld [wDayCareStartLevel], a - cp d - ld [hl], d - ld hl, DayCareMonNeedsMoreTimeText - jr z, .next - ld a, [wDayCareStartLevel] - ld b, a - ld a, d - sub b - ld [wDayCareNumLevelsGrown], a - ld hl, DayCareMonHasGrownText - -.next - call PrintText - ld a, [wPartyCount] - cp PARTY_LENGTH - ld hl, DayCareNoRoomForMonText - jp z, .leaveMonInDayCare - ld de, wDayCareTotalCost - xor a - ld [de], a - inc de - ld [de], a - ld hl, wDayCarePerLevelCost - ld a, $1 - ld [hli], a - ld [hl], $0 - ld a, [wDayCareNumLevelsGrown] - inc a - ld b, a - ld c, 2 -.calcPriceLoop - push hl - push de - push bc - predef AddBCDPredef - pop bc - pop de - pop hl - dec b - jr nz, .calcPriceLoop - ld hl, DayCareOweMoneyText - call PrintText - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - call YesNoChoice - ld hl, DayCareAllRightThenText - ld a, [wCurrentMenuItem] - and a - jp nz, .leaveMonInDayCare - ld hl, wDayCareTotalCost - ld [hMoney], a - ld a, [hli] - ld [hMoney + 1], a - ld a, [hl] - ld [hMoney + 2], a - call HasEnoughMoney - jr nc, .enoughMoney - ld hl, DayCareNotEnoughMoneyText - jp .leaveMonInDayCare - -.enoughMoney - xor a - ld [wDayCareInUse], a - ld hl, wDayCareNumLevelsGrown - ld [hli], a - inc hl - ld de, wPlayerMoney + 2 - ld c, $3 - predef SubBCDPredef - ld a, SFX_PURCHASE - call PlaySoundWaitForCurrent - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - ld hl, DayCareHeresYourMonText - call PrintText - ld a, DAYCARE_TO_PARTY - ld [wMoveMonType], a - call MoveMon - ld a, [wDayCareMonSpecies] - ld [wcf91], a - ld a, [wPartyCount] - dec a - push af - ld bc, wPartyMon2 - wPartyMon1 - push bc - ld hl, wPartyMon1Moves - call AddNTimes - ld d, h - ld e, l - ld a, 1 - ld [wLearningMovesFromDayCare], a - predef WriteMonMoves - pop bc - pop af - -; set mon's HP to max - ld hl, wPartyMon1HP - call AddNTimes - ld d, h - ld e, l - ld bc, wPartyMon1MaxHP - wPartyMon1HP - add hl, bc - ld a, [hli] - ld [de], a - inc de - ld a, [hl] - ld [de], a - - ld a, [wcf91] - call PlayCry - ld hl, DayCareGotMonBackText - jr .done - -.leaveMonInDayCare - ld a, [wDayCareStartLevel] - ld [wDayCareMonBoxLevel], a - -.done - call PrintText - jp TextScriptEnd - -DayCareIntroText: - TX_FAR _DayCareIntroText - db "@" - -DayCareWhichMonText: - TX_FAR _DayCareWhichMonText - db "@" - -DayCareWillLookAfterMonText: - TX_FAR _DayCareWillLookAfterMonText - db "@" - -DayCareComeSeeMeInAWhileText: - TX_FAR _DayCareComeSeeMeInAWhileText - db "@" - -DayCareMonHasGrownText: - TX_FAR _DayCareMonHasGrownText - db "@" - -DayCareOweMoneyText: - TX_FAR _DayCareOweMoneyText - db "@" - -DayCareGotMonBackText: - TX_FAR _DayCareGotMonBackText - db "@" - -DayCareMonNeedsMoreTimeText: - TX_FAR _DayCareMonNeedsMoreTimeText - db "@" - -DayCareAllRightThenText: - TX_FAR _DayCareAllRightThenText -DayCareComeAgainText: - TX_FAR _DayCareComeAgainText - db "@" - -DayCareNoRoomForMonText: - TX_FAR _DayCareNoRoomForMonText - db "@" - -DayCareOnlyHaveOneMonText: - TX_FAR _DayCareOnlyHaveOneMonText - db "@" - -DayCareCantAcceptMonWithHMText: - TX_FAR _DayCareCantAcceptMonWithHMText - db "@" - -DayCareHeresYourMonText: - TX_FAR _DayCareHeresYourMonText - db "@" - -DayCareNotEnoughMoneyText: - TX_FAR _DayCareNotEnoughMoneyText - db "@" diff --git a/scripts/diglettscave.asm b/scripts/diglettscave.asm deleted file mode 100755 index 593b12a6..00000000 --- a/scripts/diglettscave.asm +++ /dev/null @@ -1,5 +0,0 @@ -DiglettsCaveScript: - jp EnableAutoTextBoxDrawing - -DiglettsCaveTextPointers: - db "@" diff --git a/scripts/diglettscaveroute11.asm b/scripts/diglettscaveroute11.asm deleted file mode 100755 index d97a8446..00000000 --- a/scripts/diglettscaveroute11.asm +++ /dev/null @@ -1,12 +0,0 @@ -DiglettsCaveEntranceRoute11Script: - call EnableAutoTextBoxDrawing - ld a, ROUTE_11 - ld [wLastMap], a - ret - -DiglettsCaveEntranceRoute11TextPointers: - dw DiglettsCaveEntranceRoute11Text1 - -DiglettsCaveEntranceRoute11Text1: - TX_FAR _DiglettsCaveEntRoute11Text1 - db "@" diff --git a/scripts/diglettscaveroute2.asm b/scripts/diglettscaveroute2.asm deleted file mode 100755 index 9f061daa..00000000 --- a/scripts/diglettscaveroute2.asm +++ /dev/null @@ -1,11 +0,0 @@ -DiglettsCaveRoute2Script: - ld a, ROUTE_2 - ld [wLastMap], a - jp EnableAutoTextBoxDrawing - -DiglettsCaveRoute2TextPointers: - dw DiglettsCaveRoute2Text1 - -DiglettsCaveRoute2Text1: - TX_FAR _DiglettsCaveRoute2Text1 - db "@" diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm deleted file mode 100755 index b6d65586..00000000 --- a/scripts/fanclub.asm +++ /dev/null @@ -1,173 +0,0 @@ -FanClubScript: - jp EnableAutoTextBoxDrawing - -FanClubBikeInBag: -; check if any bike paraphernalia in bag - CheckEvent EVENT_GOT_BIKE_VOUCHER - ret nz - ld b, BICYCLE - call IsItemInBag - ret nz - ld b, BIKE_VOUCHER - jp IsItemInBag - -FanClubTextPointers: - dw FanClubText1 - dw FanClubText2 - dw FanClubText3 - dw FanClubText4 - dw FanClubText5 - dw FanClubText6 - dw FanClubText7 - dw FanClubText8 - -FanClubText1: -; pikachu fan - TX_ASM - CheckEvent EVENT_PIKACHU_FAN_BOAST - jr nz, .mineisbetter - ld hl, .normaltext - call PrintText - SetEvent EVENT_SEEL_FAN_BOAST - jr .done -.mineisbetter - ld hl, .bettertext - call PrintText - ResetEvent EVENT_PIKACHU_FAN_BOAST -.done - jp TextScriptEnd - -.normaltext - TX_FAR PikachuFanText - db "@" - -.bettertext - TX_FAR PikachuFanBetterText - db "@" - -FanClubText2: -; seel fan - TX_ASM - CheckEvent EVENT_SEEL_FAN_BOAST - jr nz, .mineisbetter - ld hl, .normaltext - call PrintText - SetEvent EVENT_PIKACHU_FAN_BOAST - jr .done -.mineisbetter - ld hl, .bettertext - call PrintText - ResetEvent EVENT_SEEL_FAN_BOAST -.done - jp TextScriptEnd - -.normaltext - TX_FAR SeelFanText - db "@" - -.bettertext - TX_FAR SeelFanBetterText - db "@" - -FanClubText3: -; pikachu - TX_ASM - ld hl, .text - call PrintText - ld a, PIKACHU - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -.text - TX_FAR FanClubPikachuText - db "@" - -FanClubText4: -; seel - TX_ASM - ld hl, .text - call PrintText - ld a, SEEL - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -.text - TX_FAR FanClubSeelText - db "@" - -FanClubText5: -; chair - TX_ASM - call FanClubBikeInBag - jr nz, .nothingleft - - ld hl, .meetchairtext - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .nothanks - - ; tell the story - ld hl, .storytext - call PrintText - lb bc, BIKE_VOUCHER, 1 - call GiveItem - jr nc, .BagFull - ld hl, .receivedvouchertext - call PrintText - SetEvent EVENT_GOT_BIKE_VOUCHER - jr .done -.BagFull - ld hl, .bagfulltext - call PrintText - jr .done -.nothanks - ld hl, .nostorytext - call PrintText - jr .done -.nothingleft - ld hl, .finaltext - call PrintText -.done - jp TextScriptEnd - -.meetchairtext - TX_FAR FanClubMeetChairText - db "@" - -.storytext - TX_FAR FanClubChairStoryText - db "@" - -.receivedvouchertext - TX_FAR ReceivedBikeVoucherText - TX_SFX_KEY_ITEM - TX_FAR ExplainBikeVoucherText - db "@" - -.nostorytext - TX_FAR FanClubNoStoryText - db "@" - -.finaltext - TX_FAR FanClubChairFinalText - db "@" - -.bagfulltext - TX_FAR FanClubBagFullText - db "@" - -FanClubText6: - TX_FAR _FanClubText6 - db "@" - -FanClubText7: - TX_FAR _FanClubText7 - db "@" - -FanClubText8: - TX_FAR _FanClubText8 - db "@" diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm deleted file mode 100755 index 5c7704f5..00000000 --- a/scripts/fightingdojo.asm +++ /dev/null @@ -1,323 +0,0 @@ -FightingDojoScript: - call EnableAutoTextBoxDrawing - ld hl, FightingDojoTrainerHeader0 - ld de, FightingDojoScriptPointers - ld a, [wFightingDojoCurScript] - call ExecuteCurMapScriptInTable - ld [wFightingDojoCurScript], a - ret - -FightingDojoScript_5cd70: - xor a - ld [wJoyIgnore], a - ld [wFightingDojoCurScript], a - ld [wCurMapScript], a - ret - -FightingDojoScriptPointers: - dw FightingDojoScript1 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw FightingDojoScript3 - -FightingDojoScript1: - CheckEvent EVENT_DEFEATED_FIGHTING_DOJO - ret nz - call CheckFightingMapTrainers - ld a, [wTrainerHeaderFlagBit] - and a - ret nz - CheckEvent EVENT_BEAT_KARATE_MASTER - ret nz - xor a - ld [hJoyHeld], a - ld [wcf0d], a - ld a, [wYCoord] - cp $3 - ret nz - ld a, [wXCoord] - cp $4 - ret nz - ld a, $1 - ld [wcf0d], a - ld a, PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ret - -FightingDojoScript3: - ld a, [wIsInBattle] - cp $ff - jp z, FightingDojoScript_5cd70 - ld a, [wcf0d] - and a - jr z, .asm_5cde4 - ld a, PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - -.asm_5cde4 - ld a, $f0 - ld [wJoyIgnore], a - SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 - ld a, $8 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wJoyIgnore], a - ld [wFightingDojoCurScript], a - ld [wCurMapScript], a - ret - -FightingDojoTextPointers: - dw FightingDojoText1 - dw FightingDojoText2 - dw FightingDojoText3 - dw FightingDojoText4 - dw FightingDojoText5 - dw FightingDojoText6 - dw FightingDojoText7 - dw FightingDojoText8 - -FightingDojoTrainerHeader0: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 - dw FightingDojoBattleText1 ; TextBeforeBattle - dw FightingDojoAfterBattleText1 ; TextAfterBattle - dw FightingDojoEndBattleText1 ; TextEndBattle - dw FightingDojoEndBattleText1 ; TextEndBattle - -FightingDojoTrainerHeader1: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 - dw FightingDojoBattleText2 ; TextBeforeBattle - dw FightingDojoAfterBattleText2 ; TextAfterBattle - dw FightingDojoEndBattleText2 ; TextEndBattle - dw FightingDojoEndBattleText2 ; TextEndBattle - -FightingDojoTrainerHeader2: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 - dw FightingDojoBattleText3 ; TextBeforeBattle - dw FightingDojoAfterBattleText3 ; TextAfterBattle - dw FightingDojoEndBattleText3 ; TextEndBattle - dw FightingDojoEndBattleText3 ; TextEndBattle - -FightingDojoTrainerHeader3: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 - dw FightingDojoBattleText4 ; TextBeforeBattle - dw FightingDojoAfterBattleText4 ; TextAfterBattle - dw FightingDojoEndBattleText4 ; TextEndBattle - dw FightingDojoEndBattleText4 ; TextEndBattle - - db $ff - -FightingDojoText1: - TX_ASM - CheckEvent EVENT_DEFEATED_FIGHTING_DOJO - jp nz, .continue1 - CheckEventReuseA EVENT_BEAT_KARATE_MASTER - jp nz, .continue2 - ld hl, FightingDojoText_5ce8e - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, FightingDojoText_5ce93 - ld de, FightingDojoText_5ce93 - call SaveEndBattleTextPointers - ld a, [hSpriteIndexOrTextID] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $3 - ld [wFightingDojoCurScript], a - ld [wCurMapScript], a - jr .asm_9dba4 -.continue1 - ld hl, FightingDojoText_5ce9d - call PrintText - jr .asm_9dba4 -.continue2 - ld hl, FightingDojoText8 - call PrintText -.asm_9dba4 - jp TextScriptEnd - -FightingDojoText_5ce8e: - TX_FAR _FightingDojoText_5ce8e - db "@" - -FightingDojoText_5ce93: - TX_FAR _FightingDojoText_5ce93 - db "@" - -FightingDojoText8: - TX_FAR _FightingDojoText_5ce98 - db "@" - -FightingDojoText_5ce9d: - TX_FAR _FightingDojoText_5ce9d - db "@" - -FightingDojoText2: - TX_ASM - ld hl, FightingDojoTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -FightingDojoBattleText1: - TX_FAR _FightingDojoBattleText1 - db "@" - -FightingDojoEndBattleText1: - TX_FAR _FightingDojoEndBattleText1 - db "@" - -FightingDojoAfterBattleText1: - TX_FAR _FightingDojoAfterBattleText1 - db "@" - -FightingDojoText3: - TX_ASM - ld hl, FightingDojoTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -FightingDojoBattleText2: - TX_FAR _FightingDojoBattleText2 - db "@" - -FightingDojoEndBattleText2: - TX_FAR _FightingDojoEndBattleText2 - db "@" - -FightingDojoAfterBattleText2: - TX_FAR _FightingDojoAfterBattleText2 - db "@" - -FightingDojoText4: - TX_ASM - ld hl, FightingDojoTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -FightingDojoBattleText3: - TX_FAR _FightingDojoBattleText3 - db "@" - -FightingDojoEndBattleText3: - TX_FAR _FightingDojoEndBattleText3 - db "@" - -FightingDojoAfterBattleText3: - TX_FAR _FightingDojoAfterBattleText3 - db "@" - -FightingDojoText5: - TX_ASM - ld hl, FightingDojoTrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -FightingDojoBattleText4: - TX_FAR _FightingDojoBattleText4 - db "@" - -FightingDojoEndBattleText4: - TX_FAR _FightingDojoEndBattleText4 - db "@" - -FightingDojoAfterBattleText4: - TX_FAR _FightingDojoAfterBattleText4 - db "@" - -FightingDojoText6: -; Hitmonlee Poké Ball - TX_ASM - CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN - jr z, .GetMon - ld hl, OtherHitmonText - call PrintText - jr .done -.GetMon - ld a, HITMONLEE - call DisplayPokedex - ld hl, WantHitmonleeText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .done - ld a, [wcf91] - ld b, a - ld c, 30 - call GivePokemon - jr nc, .done - - ; once Poké Ball is taken, hide sprite - ld a, HS_FIGHTING_DOJO_GIFT_1 - ld [wMissableObjectIndex], a - predef HideObject - SetEvents EVENT_GOT_HITMONLEE, EVENT_DEFEATED_FIGHTING_DOJO -.done - jp TextScriptEnd - -WantHitmonleeText: - TX_FAR _WantHitmonleeText - db "@" - -FightingDojoText7: -; Hitmonchan Poké Ball - TX_ASM - CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN - jr z, .GetMon - ld hl, OtherHitmonText - call PrintText - jr .done -.GetMon - ld a, HITMONCHAN - call DisplayPokedex - ld hl, WantHitmonchanText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .done - ld a, [wcf91] - ld b, a - ld c, 30 - call GivePokemon - jr nc, .done - SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO - - ; once Poké Ball is taken, hide sprite - ld a, HS_FIGHTING_DOJO_GIFT_2 - ld [wMissableObjectIndex], a - predef HideObject -.done - jp TextScriptEnd - -WantHitmonchanText: - TX_FAR _WantHitmonchanText - db "@" - -OtherHitmonText: - TX_FAR _OtherHitmonText - db "@" diff --git a/scripts/fuchsiacity.asm b/scripts/fuchsiacity.asm deleted file mode 100755 index 74d7ee30..00000000 --- a/scripts/fuchsiacity.asm +++ /dev/null @@ -1,169 +0,0 @@ -FuchsiaCityScript: - jp EnableAutoTextBoxDrawing - -FuchsiaCityTextPointers: - dw FuchsiaCityText1 - dw FuchsiaCityText2 - dw FuchsiaCityText3 - dw FuchsiaCityText4 - dw FuchsiaCityText5 - dw FuchsiaCityText6 - dw FuchsiaCityText7 - dw FuchsiaCityText8 - dw FuchsiaCityText9 - dw FuchsiaCityText10 - dw FuchsiaCityText11 - dw FuchsiaCityText12 - dw FuchsiaCityText13 - dw MartSignText - dw PokeCenterSignText - dw FuchsiaCityText16 - dw FuchsiaCityText17 - dw FuchsiaCityText18 - dw FuchsiaCityText19 - dw FuchsiaCityText20 - dw FuchsiaCityText21 - dw FuchsiaCityText22 - dw FuchsiaCityText23 - dw FuchsiaCityText24 - -FuchsiaCityText1: - TX_FAR _FuchsiaCityText1 - db "@" - -FuchsiaCityText2: - TX_FAR _FuchsiaCityText2 - db "@" - -FuchsiaCityText3: - TX_FAR _FuchsiaCityText3 - db "@" - -FuchsiaCityText4: - TX_FAR _FuchsiaCityText4 - db "@" - -FuchsiaCityText5: -FuchsiaCityText6: -FuchsiaCityText7: -FuchsiaCityText8: -FuchsiaCityText9: -FuchsiaCityText10: - TX_FAR _FuchsiaCityText5 - db "@" - -FuchsiaCityText12: -FuchsiaCityText11: - TX_FAR _FuchsiaCityText11 - db "@" - -FuchsiaCityText13: - TX_FAR _FuchsiaCityText13 - db "@" - -FuchsiaCityText16: - TX_FAR _FuchsiaCityText16 - db "@" - -FuchsiaCityText17: - TX_FAR _FuchsiaCityText17 - db "@" - -FuchsiaCityText18: - TX_FAR _FuchsiaCityText18 - db "@" - -FuchsiaCityText19: - TX_ASM - ld hl, FuchsiaCityChanseyText - call PrintText - ld a, CHANSEY - call DisplayPokedex - jp TextScriptEnd - -FuchsiaCityChanseyText: - TX_FAR _FuchsiaCityChanseyText - db "@" - -FuchsiaCityText20: - TX_ASM - ld hl, FuchsiaCityVoltorbText - call PrintText - ld a, VOLTORB - call DisplayPokedex - jp TextScriptEnd - -FuchsiaCityVoltorbText: - TX_FAR _FuchsiaCityVoltorbText - db "@" - -FuchsiaCityText21: - TX_ASM - ld hl, FuchsiaCityKangaskhanText - call PrintText - ld a, KANGASKHAN - call DisplayPokedex - jp TextScriptEnd - -FuchsiaCityKangaskhanText: - TX_FAR _FuchsiaCityKangaskhanText - db "@" - -FuchsiaCityText22: - TX_ASM - ld hl, FuchsiaCitySlowpokeText - call PrintText - ld a, SLOWPOKE - call DisplayPokedex - jp TextScriptEnd - -FuchsiaCitySlowpokeText: - TX_FAR _FuchsiaCitySlowpokeText - db "@" - -FuchsiaCityText23: - TX_ASM - ld hl, FuchsiaCityLaprasText - call PrintText - ld a, LAPRAS - call DisplayPokedex - jp TextScriptEnd - -FuchsiaCityLaprasText: - TX_FAR _FuchsiaCityLaprasText - db "@" - -FuchsiaCityText24: - TX_ASM - CheckEvent EVENT_GOT_DOME_FOSSIL - jr nz, .asm_3b4e8 - CheckEventReuseA EVENT_GOT_HELIX_FOSSIL - jr nz, .asm_667d5 - ld hl, FuchsiaCityText_19b2a - call PrintText - jr .asm_4343f -.asm_3b4e8 - ld hl, FuchsiaCityOmanyteText - call PrintText - ld a, OMANYTE - jr .asm_81556 -.asm_667d5 - ld hl, FuchsiaCityKabutoText - call PrintText - ld a, KABUTO -.asm_81556 - call DisplayPokedex -.asm_4343f - jp TextScriptEnd - -FuchsiaCityOmanyteText: - TX_FAR _FuchsiaCityOmanyteText - db "@" - -FuchsiaCityKabutoText: - TX_FAR _FuchsiaCityKabutoText - db "@" - -FuchsiaCityText_19b2a: - TX_FAR _FuchsiaCityText_19b2a - db "@" diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm deleted file mode 100755 index 3628ebc0..00000000 --- a/scripts/fuchsiagym.asm +++ /dev/null @@ -1,329 +0,0 @@ -FuchsiaGymScript: - call FuchsiaGymScript_75453 - call EnableAutoTextBoxDrawing - ld hl, FuchsiaGymTrainerHeader0 - ld de, FuchsiaGymScriptPointers - ld a, [wFuchsiaGymCurScript] - call ExecuteCurMapScriptInTable - ld [wFuchsiaGymCurScript], a - ret - -FuchsiaGymScript_75453: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - ret z - ld hl, Gym5CityName - ld de, Gym5LeaderName - call LoadGymLeaderAndCityName - ret - -Gym5CityName: - db "FUCHSIA CITY@" -Gym5LeaderName: - db "KOGA@" - -FuchsiaGymScript_75477: - xor a - ld [wJoyIgnore], a - ld [wFuchsiaGymCurScript], a - ld [wCurMapScript], a - ret - -FuchsiaGymScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw FuchsiaGymScript3 - -FuchsiaGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, FuchsiaGymScript_75477 - ld a, $f0 - ld [wJoyIgnore], a -FuchsiaGymScript3_75497: - ld a, $9 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_KOGA - lb bc, TM_06, 1 - call GiveItem - jr nc, .BagFull - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM06 - jr .asm_754c0 -.BagFull - ld a, $b - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_754c0 - ld hl, wObtainedBadges - set 4, [hl] - ld hl, wBeatGymFlags - set 4, [hl] - - ; deactivate gym trainers - SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 - - jp FuchsiaGymScript_75477 - -FuchsiaGymTextPointers: - dw FuchsiaGymText1 - dw FuchsiaGymText2 - dw FuchsiaGymText3 - dw FuchsiaGymText4 - dw FuchsiaGymText5 - dw FuchsiaGymText6 - dw FuchsiaGymText7 - dw FuchsiaGymText8 - dw FuchsiaGymText9 - dw FuchsiaGymText10 - dw FuchsiaGymText11 - -FuchsiaGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 - dw FuchsiaGymBattleText1 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText1 ; TextAfterBattle - dw FuchsiaGymEndBattleText1 ; TextEndBattle - dw FuchsiaGymEndBattleText1 ; TextEndBattle - -FuchsiaGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 - dw FuchsiaGymBattleText2 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText2 ; TextAfterBattle - dw FuchsiaGymEndBattleText2 ; TextEndBattle - dw FuchsiaGymEndBattleText2 ; TextEndBattle - -FuchsiaGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 - dw FuchsiaGymBattleText3 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText3 ; TextAfterBattle - dw FuchsiaGymEndBattleText3 ; TextEndBattle - dw FuchsiaGymEndBattleText3 ; TextEndBattle - -FuchsiaGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 - dw FuchsiaGymBattleText4 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText4 ; TextAfterBattle - dw FuchsiaGymEndBattleText4 ; TextEndBattle - dw FuchsiaGymEndBattleText4 ; TextEndBattle - -FuchsiaGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 - dw FuchsiaGymBattleText5 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText5 ; TextAfterBattle - dw FuchsiaGymEndBattleText5 ; TextEndBattle - dw FuchsiaGymEndBattleText5 ; TextEndBattle - -FuchsiaGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 - dw FuchsiaGymBattleText6 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText6 ; TextAfterBattle - dw FuchsiaGymEndBattleText6 ; TextEndBattle - dw FuchsiaGymEndBattleText6 ; TextEndBattle - - db $ff - -FuchsiaGymText1: - TX_ASM - CheckEvent EVENT_BEAT_KOGA - jr z, .asm_181b6 - CheckEventReuseA EVENT_GOT_TM06 - jr nz, .asm_adc3b - call z, FuchsiaGymScript3_75497 - call DisableWaitingAfterTextDisplay - jr .asm_e84c6 -.asm_adc3b - ld hl, KogaExplainToxicText - call PrintText - jr .asm_e84c6 -.asm_181b6 - ld hl, KogaBeforeBattleText - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, KogaAfterBattleText - ld de, KogaAfterBattleText - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $5 - ld [wGymLeaderNo], a - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wFuchsiaGymCurScript], a -.asm_e84c6 - jp TextScriptEnd - -KogaBeforeBattleText: - TX_FAR _KogaBeforeBattleText - db "@" - -KogaAfterBattleText: - TX_FAR _KogaAfterBattleText - db "@" - -KogaExplainToxicText: - TX_FAR _KogaExplainToxicText - db "@" - -FuchsiaGymText9: - TX_FAR _FuchsiaGymText9 - db "@" - -FuchsiaGymText10: - TX_FAR _ReceivedTM06Text - TX_SFX_KEY_ITEM - -TM06ExplanationText: - TX_FAR _TM06ExplanationText - db "@" - -FuchsiaGymText11: - TX_FAR _TM06NoRoomText - db "@" - -FuchsiaGymText2: - TX_ASM - ld hl, FuchsiaGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -FuchsiaGymBattleText1: - TX_FAR _FuchsiaGymBattleText1 - db "@" - -FuchsiaGymEndBattleText1: - TX_FAR _FuchsiaGymEndBattleText1 - db "@" - -FuchsiaGymAfterBattleText1: - TX_FAR _FuchsiaGymAfterBattleText1 - db "@" - -FuchsiaGymText3: - TX_ASM - ld hl, FuchsiaGymTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -FuchsiaGymBattleText2: - TX_FAR _FuchsiaGymBattleText2 - db "@" - -FuchsiaGymEndBattleText2: - TX_FAR _FuchsiaGymEndBattleText2 - db "@" - -FuchsiaGymAfterBattleText2: - TX_FAR _FuchsiaGymAfterBattleText2 - db "@" - -FuchsiaGymText4: - TX_ASM - ld hl, FuchsiaGymTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -FuchsiaGymBattleText3: - TX_FAR _FuchsiaGymBattleText3 - db "@" - -FuchsiaGymEndBattleText3: - TX_FAR _FuchsiaGymEndBattleText3 - db "@" - -FuchsiaGymAfterBattleText3: - TX_FAR _FuchsiaGymAfterBattleText3 - db "@" - -FuchsiaGymText5: - TX_ASM - ld hl, FuchsiaGymTrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -FuchsiaGymBattleText4: - TX_FAR _FuchsiaGymBattleText4 - db "@" - -FuchsiaGymEndBattleText4: - TX_FAR _FuchsiaGymEndBattleText4 - db "@" - -FuchsiaGymAfterBattleText4: - TX_FAR _FuchsiaGymAfterBattleText4 - db "@" - -FuchsiaGymText6: - TX_ASM - ld hl, FuchsiaGymTrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -FuchsiaGymBattleText5: - TX_FAR _FuchsiaGymBattleText5 - db "@" - -FuchsiaGymEndBattleText5: - TX_FAR _FuchsiaGymEndBattleText5 - db "@" - -FuchsiaGymAfterBattleText5: - TX_FAR _FuchsiaGymAfterBattleText5 - db "@" - -FuchsiaGymText7: - TX_ASM - ld hl, FuchsiaGymTrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -FuchsiaGymBattleText6: - TX_FAR _FuchsiaGymBattleText6 - db "@" - -FuchsiaGymEndBattleText6: - TX_FAR _FuchsiaGymEndBattleText6 - db "@" - -FuchsiaGymAfterBattleText6: - TX_FAR _FuchsiaGymAfterBattleText6 - db "@" - -FuchsiaGymText8: - TX_ASM - CheckEvent EVENT_BEAT_KOGA - ld hl, FuchsiaGymText_75653 - jr nz, .asm_50671 - ld hl, FuchsiaGymText_7564e -.asm_50671 - call PrintText - jp TextScriptEnd - -FuchsiaGymText_7564e: - TX_FAR _FuchsiaGymText_7564e - db "@" - -FuchsiaGymText_75653: - TX_FAR _FuchsiaGymText_75653 - db "@" diff --git a/scripts/fuchsiahouse1.asm b/scripts/fuchsiahouse1.asm deleted file mode 100755 index 95e59503..00000000 --- a/scripts/fuchsiahouse1.asm +++ /dev/null @@ -1,20 +0,0 @@ -FuchsiaHouse1Script: - call EnableAutoTextBoxDrawing - ret - -FuchsiaHouse1TextPointers: - dw FuchsiaHouse1Text1 - dw FuchsiaHouse1Text2 - dw FuchsiaHouse1Text3 - -FuchsiaHouse1Text1: - TX_FAR _FuchsiaHouse1Text1 - db "@" - -FuchsiaHouse1Text2: - TX_FAR _FuchsiaHouse1Text2 - db "@" - -FuchsiaHouse1Text3: - TX_FAR _FuchsiaHouse1Text3 - db "@" diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm deleted file mode 100755 index 6d49fb2f..00000000 --- a/scripts/fuchsiahouse2.asm +++ /dev/null @@ -1,113 +0,0 @@ -FuchsiaHouse2Script: - jp EnableAutoTextBoxDrawing - -FuchsiaHouse2TextPointers: - dw FuchsiaHouse2Text1 - dw PickUpItemText - dw BoulderText - dw FuchsiaHouse2Text4 - dw FuchsiaHouse2Text5 - -FuchsiaHouse2Text1: - TX_ASM - CheckEvent EVENT_GOT_HM04 - jr nz, .subtract - ld b, GOLD_TEETH - call IsItemInBag - jr nz, .asm_3f30f - CheckEvent EVENT_GAVE_GOLD_TEETH - jr nz, .asm_60cba - ld hl, WardenGibberishText1 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ld hl, WardenGibberishText3 - jr nz, .asm_61238 - ld hl, WardenGibberishText2 -.asm_61238 - call PrintText - jr .asm_52039 -.asm_3f30f - ld hl, WardenTeethText1 - call PrintText - ld a, GOLD_TEETH - ld [$ffdb], a - callba RemoveItemByID - SetEvent EVENT_GAVE_GOLD_TEETH -.asm_60cba - ld hl, WardenThankYouText - call PrintText - lb bc, HM_04, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedHM04Text - call PrintText - SetEvent EVENT_GOT_HM04 - jr .asm_52039 -.subtract - ld hl, HM04ExplanationText - call PrintText - jr .asm_52039 -.BagFull - ld hl, HM04NoRoomText - call PrintText -.asm_52039 - jp TextScriptEnd - -WardenGibberishText1: - TX_FAR _WardenGibberishText1 - db "@" - -WardenGibberishText2: - TX_FAR _WardenGibberishText2 - db "@" - -WardenGibberishText3: - TX_FAR _WardenGibberishText3 - db "@" - -WardenTeethText1: - TX_FAR _WardenTeethText1 - TX_SFX_ITEM_1 - -WardenTeethText2: - TX_FAR _WardenTeethText2 - db "@" - -WardenThankYouText: - TX_FAR _WardenThankYouText - db "@" - -ReceivedHM04Text: - TX_FAR _ReceivedHM04Text - TX_SFX_ITEM_1 - db "@" - -HM04ExplanationText: - TX_FAR _HM04ExplanationText - db "@" - -HM04NoRoomText: - TX_FAR _HM04NoRoomText - db "@" - -FuchsiaHouse2Text5: -FuchsiaHouse2Text4: - TX_ASM - ld a, [H_SPRITEINDEX] - cp $4 - ld hl, FuchsiaHouse2Text_7517b - jr nz, .asm_4c9a2 - ld hl, FuchsiaHouse2Text_75176 -.asm_4c9a2 - call PrintText - jp TextScriptEnd - -FuchsiaHouse2Text_75176: - TX_FAR _FuchsiaHouse2Text_75176 - db "@" - -FuchsiaHouse2Text_7517b: - TX_FAR _FuchsiaHouse2Text_7517b - db "@" diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm deleted file mode 100755 index 586d62f5..00000000 --- a/scripts/fuchsiahouse3.asm +++ /dev/null @@ -1,75 +0,0 @@ -FuchsiaHouse3Script: - jp EnableAutoTextBoxDrawing - -FuchsiaHouse3TextPointers: - dw FuchsiaHouse3Text1 - -FuchsiaHouse3Text1: - TX_ASM - ld a, [wd728] - bit 4, a - jr nz, .after - - ld hl, FuchsiaHouse3Text_561bd - call PrintText - - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .refused - - lb bc, GOOD_ROD, 1 - call GiveItem - jr nc, .full - - ld hl, wd728 - set 4, [hl] - - ld hl, FuchsiaHouse3Text_561c2 - jr .talk - -.full - ld hl, FuchsiaHouse3Text_5621c - jr .talk - -.refused - ld hl, FuchsiaHouse3Text_56212 - jr .talk - -.after - ld hl, FuchsiaHouse3Text_56217 - -.talk - call PrintText - jp TextScriptEnd - -FuchsiaHouse3Text_561bd: - TX_FAR _FuchsiaHouse3Text_561bd - db "@" - -FuchsiaHouse3Text_561c2: - TX_FAR _FuchsiaHouse3Text_561c2 - TX_SFX_ITEM_1 - db "@" - -UnusedText_561c8: - para "つり こそ" - line "おとこの ロマン だ!" - - para "へぼいつりざおは" - line "コイキングしか つれ なんだが" - line "この いいつりざおなら" - line "もっと いいもんが つれるんじゃ!" - done - -FuchsiaHouse3Text_56212: - TX_FAR _FuchsiaHouse3Text_56212 - db "@" - -FuchsiaHouse3Text_56217: - TX_FAR _FuchsiaHouse3Text_56217 - db "@" - -FuchsiaHouse3Text_5621c: - TX_FAR _FuchsiaHouse3Text_5621c - db "@" diff --git a/scripts/fuchsiamart.asm b/scripts/fuchsiamart.asm deleted file mode 100755 index 96df9290..00000000 --- a/scripts/fuchsiamart.asm +++ /dev/null @@ -1,15 +0,0 @@ -FuchsiaMartScript: - jp EnableAutoTextBoxDrawing - -FuchsiaMartTextPointers: - dw FuchsiaCashierText - dw FuchsiaMartText2 - dw FuchsiaMartText3 - -FuchsiaMartText2: - TX_FAR _FuchsiaMartText2 - db "@" - -FuchsiaMartText3: - TX_FAR _FuchsiaMartText3 - db "@" diff --git a/scripts/fuchsiameetingroom.asm b/scripts/fuchsiameetingroom.asm deleted file mode 100755 index 7995a49b..00000000 --- a/scripts/fuchsiameetingroom.asm +++ /dev/null @@ -1,20 +0,0 @@ -FuchsiaMeetingRoomScript: - call EnableAutoTextBoxDrawing - ret - -FuchsiaMeetingRoomTextPointers: - dw FuchsiaMeetingRoomText1 - dw FuchsiaMeetingRoomText2 - dw FuchsiaMeetingRoomText3 - -FuchsiaMeetingRoomText1: - TX_FAR _FuchsiaMeetingRoomText1 - db "@" - -FuchsiaMeetingRoomText2: - TX_FAR _FuchsiaMeetingRoomText2 - db "@" - -FuchsiaMeetingRoomText3: - TX_FAR _FuchsiaMeetingRoomText3 - db "@" diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm deleted file mode 100755 index a6111e84..00000000 --- a/scripts/fuchsiapokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -FuchsiaPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -FuchsiaPokecenterTextPointers: - dw FuchsiaHealNurseText - dw FuchsiaPokecenterText2 - dw FuchsiaPokecenterText3 - dw FuchsiaTradeNurseText - -FuchsiaHealNurseText: - TX_POKECENTER_NURSE - -FuchsiaPokecenterText2: - TX_FAR _FuchsiaPokecenterText1 - db "@" - -FuchsiaPokecenterText3: - TX_FAR _FuchsiaPokecenterText3 - db "@" - -FuchsiaTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/gary.asm b/scripts/gary.asm deleted file mode 100755 index 1fe65fb0..00000000 --- a/scripts/gary.asm +++ /dev/null @@ -1,298 +0,0 @@ -GaryScript: - call EnableAutoTextBoxDrawing - ld hl, GaryScriptPointers - ld a, [wGaryCurScript] - jp CallFunctionInTable - -ResetGaryScript: - xor a - ld [wJoyIgnore], a - ld [wGaryCurScript], a - ret - -GaryScriptPointers: - dw GaryScript0 - dw GaryScript1 - dw GaryScript2 - dw GaryScript3 - dw GaryScript4 - dw GaryScript5 - dw GaryScript6 - dw GaryScript7 - dw GaryScript8 - dw GaryScript9 - dw GaryScript10 - -GaryScript0: - ret - -GaryScript1: - ld a, $ff - ld [wJoyIgnore], a - ld hl, wSimulatedJoypadStatesEnd - ld de, GaryEntrance_RLEMovement - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $2 - ld [wGaryCurScript], a - ret - -GaryEntrance_RLEMovement: - db D_UP,1 - db D_RIGHT,1 - db D_UP,3 - db $ff - -GaryScript2: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld hl, wOptions - res 7, [hl] ; Turn on battle animations to make the battle feel more epic. - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, GaryDefeatedText - ld de, GaryVictoryText - call SaveEndBattleTextPointers - ld a, OPP_SONY3 - ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotStarter2 - ld a, $1 - jr .saveTrainerId -.NotStarter2 - cp STARTER3 - jr nz, .NotStarter3 - ld a, $2 - jr .saveTrainerId -.NotStarter3 - ld a, $3 -.saveTrainerId - ld [wTrainerNo], a - - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wGaryCurScript], a - ret - -GaryScript3: - ld a, [wIsInBattle] - cp $ff - jp z, ResetGaryScript - call UpdateSprites - SetEvent EVENT_BEAT_CHAMPION_RIVAL - ld a, $f0 - ld [wJoyIgnore], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld a, $4 - ld [wGaryCurScript], a - ret - -GaryScript4: - callba Music_Cities1AlternateTempo - ld a, $2 - ld [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $2 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld de, OakEntranceAfterVictoryMovement - ld a, $2 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, HS_CHAMPIONS_ROOM_OAK - ld [wMissableObjectIndex], a - predef ShowObject - ld a, $5 - ld [wGaryCurScript], a - ret - -OakEntranceAfterVictoryMovement: - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db $FF - -GaryScript5: - ld a, [wd730] - bit 0, a - ret nz - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $2 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $3 - ld [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $6 - ld [wGaryCurScript], a - ret - -GaryScript6: - ld a, $2 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $4 - ld [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $7 - ld [wGaryCurScript], a - ret - -GaryScript7: - ld a, $2 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $5 - ld [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld de, OakExitGaryRoomMovement - ld a, $2 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $8 - ld [wGaryCurScript], a - ret - -OakExitGaryRoomMovement: - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db $FF - -GaryScript8: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_CHAMPIONS_ROOM_OAK - ld [wMissableObjectIndex], a - predef HideObject - ld a, $9 - ld [wGaryCurScript], a - ret - -GaryScript9: - ld a, $ff - ld [wJoyIgnore], a - ld hl, wSimulatedJoypadStatesEnd - ld de, WalkToHallOfFame_RLEMovment - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $a - ld [wGaryCurScript], a - ret - -WalkToHallOfFame_RLEMovment: - db D_UP,4 - db D_LEFT,1 - db $ff - -GaryScript10: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wGaryCurScript], a - ret - -GaryScript_760c8: - ld a, $f0 - ld [wJoyIgnore], a - call DisplayTextID - ld a, $ff - ld [wJoyIgnore], a - ret - -GaryTextPointers: - dw GaryText1 - dw GaryText2 - dw GaryText3 - dw GaryText4 - dw GaryText5 - -GaryText1: - TX_ASM - CheckEvent EVENT_BEAT_CHAMPION_RIVAL - ld hl, GaryChampionIntroText - jr z, .printText - ld hl, GaryText_76103 -.printText - call PrintText - jp TextScriptEnd - -GaryChampionIntroText: - TX_FAR _GaryChampionIntroText - db "@" - -GaryDefeatedText: - TX_FAR _GaryDefeatedText - db "@" - -GaryVictoryText: - TX_FAR _GaryVictoryText - db "@" - -GaryText_76103: - TX_FAR _GaryText_76103 - db "@" - -GaryText2: - TX_FAR _GaryText2 - db "@" - -GaryText3: - TX_ASM - ld a, [wPlayerStarter] - ld [wd11e], a - call GetMonName - ld hl, GaryText_76120 - call PrintText - jp TextScriptEnd - -GaryText_76120: - TX_FAR _GaryText_76120 - db "@" - -GaryText4: - TX_FAR _GaryText_76125 - db "@" - -GaryText5: - TX_FAR _GaryText_7612a - db "@" diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm deleted file mode 100755 index 94e64431..00000000 --- a/scripts/halloffameroom.asm +++ /dev/null @@ -1,109 +0,0 @@ -HallofFameRoomScript: - call EnableAutoTextBoxDrawing - ld hl, HallofFameRoomScriptPointers - ld a, [wHallOfFameRoomCurScript] - jp CallFunctionInTable - -HallofFameRoomScript_5a4aa: - xor a - ld [wJoyIgnore], a - ld [wHallOfFameRoomCurScript], a - ret - -HallofFameRoomScriptPointers: - dw HallofFameRoomScript0 - dw HallofFameRoomScript1 - dw HallofFameRoomScript2 - dw HallofFameRoomScript3 - -HallofFameRoomScript3: - ret - -HallofFameRoomScript2: - call Delay3 - ld a, [wLetterPrintingDelayFlags] - push af - xor a - ld [wJoyIgnore], a - predef HallOfFamePC - pop af - ld [wLetterPrintingDelayFlags], a - ld hl, wFlags_D733 - res 1, [hl] - inc hl - set 0, [hl] - xor a - ld hl, wLoreleiCurScript - ld [hli], a - ld [hli], a - ld [hl], a - ld [wLanceCurScript], a - ld [wHallOfFameRoomCurScript], a - ; Elite 4 events - ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 - xor a - ld [wHallOfFameRoomCurScript], a - ld a, PALLET_TOWN - ld [wLastBlackoutMap], a - callba SaveSAVtoSRAM - ld b, 5 -.delayLoop - ld c, 600 / 5 - call DelayFrames - dec b - jr nz, .delayLoop - call WaitForTextScrollButtonPress - jp Init - -HallofFameRoomScript0: - ld a, $ff - ld [wJoyIgnore], a - ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement5a528 - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $1 - ld [wHallOfFameRoomCurScript], a - ret - -RLEMovement5a528: - db D_UP,$5 - db $ff - -HallofFameRoomScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld a, PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - call Delay3 - xor a - ld [wJoyIgnore], a - inc a ; PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wJoyIgnore], a - ld a, HS_UNKNOWN_DUNGEON_GUY - ld [wMissableObjectIndex], a - predef HideObject - ld a, $2 - ld [wHallOfFameRoomCurScript], a - ret - -HallofFameRoomTextPointers: - dw HallofFameRoomText1 - -HallofFameRoomText1: - TX_FAR _HallofFameRoomText1 - db "@" diff --git a/scripts/indigoplateau.asm b/scripts/indigoplateau.asm deleted file mode 100755 index 6a6fdb6c..00000000 --- a/scripts/indigoplateau.asm +++ /dev/null @@ -1,4 +0,0 @@ -IndigoPlateauScript: - ret - -IndigoPlateauTextPointers: diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm deleted file mode 100755 index c26f6f0c..00000000 --- a/scripts/indigoplateaulobby.asm +++ /dev/null @@ -1,36 +0,0 @@ -IndigoPlateauLobbyScript: - call Serial_TryEstablishingExternallyClockedConnection - call EnableAutoTextBoxDrawing - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - ret z - ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - ld hl, wBeatLorelei - bit 1, [hl] - res 1, [hl] - ret z - ; Elite 4 events - ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR - ret - -IndigoPlateauLobbyTextPointers: - dw IndigoHealNurseText - dw IndigoPlateauLobbyText2 - dw IndigoPlateauLobbyText3 - dw IndigoCashierText - dw IndigoTradeNurseText - -IndigoHealNurseText: - TX_POKECENTER_NURSE - -IndigoPlateauLobbyText2: - TX_FAR _IndigoPlateauLobbyText2 - db "@" - -IndigoPlateauLobbyText3: - TX_FAR _IndigoPlateauLobbyText3 - db "@" - -IndigoTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/lab1.asm b/scripts/lab1.asm deleted file mode 100755 index 5b08f4f2..00000000 --- a/scripts/lab1.asm +++ /dev/null @@ -1,30 +0,0 @@ -Lab1Script: - call EnableAutoTextBoxDrawing - ret - -Lab1TextPointers: - dw Lab1Text1 - dw Lab1Text2 - dw Lab1Text3 - dw Lab1Text4 - dw Lab1Text5 - -Lab1Text1: - TX_FAR _Lab1Text1 - db "@" - -Lab1Text2: - TX_FAR _Lab1Text2 - db "@" - -Lab1Text3: - TX_FAR _Lab1Text3 - db "@" - -Lab1Text4: - TX_FAR _Lab1Text4 - db "@" - -Lab1Text5: - TX_FAR _Lab1Text5 - db "@" diff --git a/scripts/lab2.asm b/scripts/lab2.asm deleted file mode 100755 index ed9ef1b4..00000000 --- a/scripts/lab2.asm +++ /dev/null @@ -1,25 +0,0 @@ -Lab2Script: - jp EnableAutoTextBoxDrawing - -Lab2TextPointers: - dw Lab2Text1 - dw Lab2Text2 - dw Lab2Text3 - -Lab2Text1: - TX_FAR _Lab2Text1 - db "@" - -Lab2Text2: - TX_ASM - ld a, $7 - ld [wWhichTrade], a - jr Lab2DoTrade - -Lab2Text3: - TX_ASM - ld a, $8 - ld [wWhichTrade], a -Lab2DoTrade: - predef DoInGameTradeDialogue - jp TextScriptEnd diff --git a/scripts/lab3.asm b/scripts/lab3.asm deleted file mode 100755 index b533d162..00000000 --- a/scripts/lab3.asm +++ /dev/null @@ -1,62 +0,0 @@ -Lab3Script: - jp EnableAutoTextBoxDrawing - -Lab3TextPointers: - dw Lab3Text1 - dw Lab3Text2 - dw Lab3Text3 - dw Lab3Text4 - dw Lab3Text5 - -Lab3Text1: - TX_ASM - CheckEvent EVENT_GOT_TM35 - jr nz, .asm_e551a - ld hl, TM35PreReceiveText - call PrintText - lb bc, TM_35, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedTM35Text - call PrintText - SetEvent EVENT_GOT_TM35 - jr .asm_eb896 -.BagFull - ld hl, TM35NoRoomText - call PrintText - jr .asm_eb896 -.asm_e551a - ld hl, TM35ExplanationText - call PrintText -.asm_eb896 - jp TextScriptEnd - -TM35PreReceiveText: - TX_FAR _TM35PreReceiveText - db "@" - -ReceivedTM35Text: - TX_FAR _ReceivedTM35Text - TX_SFX_ITEM_1 - db "@" - -TM35ExplanationText: - TX_FAR _TM35ExplanationText - db "@" - -TM35NoRoomText: - TX_FAR _TM35NoRoomText - db "@" - -Lab3Text2: - TX_FAR _Lab3Text2 - db "@" - -Lab3Text4: -Lab3Text3: - TX_FAR _Lab3Text3 - db "@" - -Lab3Text5: - TX_FAR _Lab3Text5 - db "@" diff --git a/scripts/lab4.asm b/scripts/lab4.asm deleted file mode 100755 index 7d0db339..00000000 --- a/scripts/lab4.asm +++ /dev/null @@ -1,109 +0,0 @@ -Lab4Script: - jp EnableAutoTextBoxDrawing - -Lab4TextPointers: - dw Lab4Text1 - dw Lab4Text2 - -Lab4Script_GetFossilsInBag: -; construct a list of all fossils in the player's bag - xor a - ld [wFilteredBagItemsCount], a - ld de, wFilteredBagItems - ld hl, FossilsList -.loop - ld a, [hli] - and a - jr z, .done - push hl - push de - ld [wd11e], a - ld b, a - predef GetQuantityOfItemInBag - pop de - pop hl - ld a, b - and a - jr z, .loop - - ; A fossil's in the bag - ld a, [wd11e] - ld [de], a - inc de - push hl - ld hl, wFilteredBagItemsCount - inc [hl] - pop hl - jr .loop -.done - ld a, $ff - ld [de], a - ret - -FossilsList: - db DOME_FOSSIL - db HELIX_FOSSIL - db OLD_AMBER - db $00 - -Lab4Text1: - TX_ASM - CheckEvent EVENT_GAVE_FOSSIL_TO_LAB - jr nz, .asm_75d96 - ld hl, Lab4Text_75dc6 - call PrintText - call Lab4Script_GetFossilsInBag - ld a, [wFilteredBagItemsCount] - and a - jr z, .asm_75d8d - callba GiveFossilToCinnabarLab - jr .asm_75d93 -.asm_75d8d - ld hl, Lab4Text_75dcb - call PrintText -.asm_75d93 - jp TextScriptEnd -.asm_75d96 - CheckEventAfterBranchReuseA EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_GAVE_FOSSIL_TO_LAB - jr z, .asm_75da2 - ld hl, Lab4Text_75dd0 - call PrintText - jr .asm_75d93 -.asm_75da2 - call LoadFossilItemAndMonNameBank1D - ld hl, Lab4Text_75dd5 - call PrintText - SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON - ld a, [wFossilMon] - ld b, a - ld c, 30 - call GivePokemon - jr nc, .asm_75d93 - ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON - jr .asm_75d93 - -Lab4Text_75dc6: - TX_FAR _Lab4Text_75dc6 - db "@" - -Lab4Text_75dcb: - TX_FAR _Lab4Text_75dcb - db "@" - -Lab4Text_75dd0: - TX_FAR _Lab4Text_75dd0 - db "@" - -Lab4Text_75dd5: - TX_FAR _Lab4Text_75dd5 - db "@" - -Lab4Text2: - TX_ASM - ld a, $3 - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd - -LoadFossilItemAndMonNameBank1D: - jpba LoadFossilItemAndMonName diff --git a/scripts/lance.asm b/scripts/lance.asm deleted file mode 100755 index a0b0e6e7..00000000 --- a/scripts/lance.asm +++ /dev/null @@ -1,162 +0,0 @@ -LanceScript: - call LanceShowOrHideEntranceBlocks - call EnableAutoTextBoxDrawing - ld hl, LanceTrainerHeader0 - ld de, LanceScriptPointers - ld a, [wLanceCurScript] - call ExecuteCurMapScriptInTable - ld [wLanceCurScript], a - ret - -LanceShowOrHideEntranceBlocks: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_LANCES_ROOM_LOCK_DOOR - jr nz, .closeEntrance - ; open entrance - ld a, $31 - ld b, $32 - jp LanceSetEntranceBlocks -.closeEntrance - ld a, $72 - ld b, $73 - -LanceSetEntranceBlocks: -; Replaces the tile blocks so the player can't leave. - push bc - ld [wNewTileBlockID], a - lb bc, 6, 2 - call LanceSetEntranceBlock - pop bc - ld a, b - ld [wNewTileBlockID], a - lb bc, 6, 3 - -LanceSetEntranceBlock: - predef_jump ReplaceTileBlock - -ResetLanceScript: - xor a - ld [wLanceCurScript], a - ret - -LanceScriptPointers: - dw LanceScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw LanceScript2 - dw LanceScript3 - dw LanceScript4 - -LanceScript4: - ret - -LanceScript0: - CheckEvent EVENT_BEAT_LANCE - ret nz - ld hl, LanceTriggerMovementCoords - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyHeld], a - ld a, [wCoordIndex] - cp $3 ; Is player standing next to Lance's sprite? - jr nc, .notStandingNextToLance - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID -.notStandingNextToLance - cp $5 ; Is player standing on the entrance staircase? - jr z, WalkToLance - CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR - ret nz - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ld a, SFX_GO_INSIDE - call PlaySound - jp LanceShowOrHideEntranceBlocks - -LanceTriggerMovementCoords: - db $01,$05 - db $02,$06 - db $0B,$05 - db $0B,$06 - db $10,$18 - db $FF - -LanceScript2: - call EndTrainerBattle - ld a, [wIsInBattle] - cp $ff - jp z, ResetLanceScript - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -WalkToLance: -; Moves the player down the hallway to Lance's room. - ld a, $ff - ld [wJoyIgnore], a - ld hl, wSimulatedJoypadStatesEnd - ld de, WalkToLance_RLEList - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wLanceCurScript], a - ld [wCurMapScript], a - ret - -WalkToLance_RLEList: - db D_UP, $0C - db D_LEFT, $0C - db D_DOWN, $07 - db D_LEFT, $06 - db $FF - -LanceScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wLanceCurScript], a - ld [wCurMapScript], a - ret - -LanceTextPointers: - dw LanceText1 - -LanceTrainerHeader0: - dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0 - dw LanceBeforeBattleText ; TextBeforeBattle - dw LanceAfterBattleText ; TextAfterBattle - dw LanceEndBattleText ; TextEndBattle - dw LanceEndBattleText ; TextEndBattle - - db $ff - -LanceText1: - TX_ASM - ld hl, LanceTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -LanceBeforeBattleText: - TX_FAR _LanceBeforeBattleText - db "@" - -LanceEndBattleText: - TX_FAR _LanceEndBattleText - db "@" - -LanceAfterBattleText: - TX_FAR _LanceAfterBattleText - TX_ASM - SetEvent EVENT_BEAT_LANCE - jp TextScriptEnd diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm deleted file mode 100755 index 91b9286b..00000000 --- a/scripts/lavenderhouse1.asm +++ /dev/null @@ -1,112 +0,0 @@ -LavenderHouse1Script: - call EnableAutoTextBoxDrawing - ret - -LavenderHouse1TextPointers: - dw LavenderHouse1Text1 - dw LavenderHouse1Text2 - dw LavenderHouse1Text3 - dw LavenderHouse1Text4 - dw LavenderHouse1Text5 - dw LavenderHouse1Text6 - -LavenderHouse1Text1: - TX_ASM - CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_72e5d - ld hl, LavenderHouse1Text_1d8d1 - call PrintText - jr .asm_6957f -.asm_72e5d - ld hl, LavenderHouse1Text_1d8d6 - call PrintText -.asm_6957f - jp TextScriptEnd - -LavenderHouse1Text_1d8d1: - TX_FAR _LavenderHouse1Text_1d8d1 - db "@" - -LavenderHouse1Text_1d8d6: - TX_FAR _LavenderHouse1Text_1d8d6 - db "@" - -LavenderHouse1Text2: - TX_ASM - CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_06470 - ld hl, LavenderHouse1Text_1d8f4 - call PrintText - jr .asm_3d208 -.asm_06470 - ld hl, LavenderHouse1Text_1d8f9 - call PrintText -.asm_3d208 - jp TextScriptEnd - -LavenderHouse1Text_1d8f4: - TX_FAR _LavenderHouse1Text_1d8f4 - db "@" - -LavenderHouse1Text_1d8f9: - TX_FAR _LavenderHouse1Text_1d8f9 - db "@" - -LavenderHouse1Text3: - TX_FAR _LavenderHouse1Text3 - TX_ASM - ld a, PSYDUCK - call PlayCry - jp TextScriptEnd - -LavenderHouse1Text4: - TX_FAR _LavenderHouse1Text4 - TX_ASM - ld a, NIDORINO - call PlayCry - jp TextScriptEnd - -LavenderHouse1Text5: - TX_ASM - CheckEvent EVENT_GOT_POKE_FLUTE - jr nz, .asm_15ac2 - ld hl, LavenderHouse1Text_1d94c - call PrintText - lb bc, POKE_FLUTE, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedFluteText - call PrintText - SetEvent EVENT_GOT_POKE_FLUTE - jr .asm_da749 -.BagFull - ld hl, FluteNoRoomText - call PrintText - jr .asm_da749 -.asm_15ac2 - ld hl, MrFujiAfterFluteText - call PrintText -.asm_da749 - jp TextScriptEnd - -LavenderHouse1Text_1d94c: - TX_FAR _LavenderHouse1Text_1d94c - db "@" - -ReceivedFluteText: - TX_FAR _ReceivedFluteText - TX_SFX_KEY_ITEM - TX_FAR _FluteExplanationText - db "@" - -FluteNoRoomText: - TX_FAR _FluteNoRoomText - db "@" - -MrFujiAfterFluteText: - TX_FAR _MrFujiAfterFluteText - db "@" - -LavenderHouse1Text6: - TX_FAR _LavenderHouse1Text6 - db "@" diff --git a/scripts/lavenderhouse2.asm b/scripts/lavenderhouse2.asm deleted file mode 100755 index b531c047..00000000 --- a/scripts/lavenderhouse2.asm +++ /dev/null @@ -1,35 +0,0 @@ -LavenderHouse2Script: - call EnableAutoTextBoxDrawing - ret - -LavenderHouse2TextPointers: - dw LavenderHouse2Text1 - dw LavenderHouse2Text2 - -LavenderHouse2Text1: - TX_FAR _LavenderHouse2Text1 - TX_ASM - ld a, CUBONE - call PlayCry - jp TextScriptEnd - -LavenderHouse2Text2: - TX_ASM - CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_65711 - ld hl, LavenderHouse2Text_1d9dc - call PrintText - jr .asm_64be1 -.asm_65711 - ld hl, LavenderHouse2Text_1d9e1 - call PrintText -.asm_64be1 - jp TextScriptEnd - -LavenderHouse2Text_1d9dc: - TX_FAR _LavenderHouse2Text_1d9dc - db "@" - -LavenderHouse2Text_1d9e1: - TX_FAR _LavenderHouse2Text_1d9e1 - db "@" diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm deleted file mode 100755 index 51b64992..00000000 --- a/scripts/lavendermart.asm +++ /dev/null @@ -1,32 +0,0 @@ -LavenderMartScript: - jp EnableAutoTextBoxDrawing - -LavenderMartTextPointers: - dw LavenderCashierText - dw LavenderMartText2 - dw LavenderMartText3 - -LavenderMartText2: - TX_FAR _LavenderMartText2 - db "@" - -LavenderMartText3: - TX_ASM - CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .Nugget - ld hl, .ReviveText - call PrintText - jr .done -.Nugget - ld hl, .NuggetText - call PrintText -.done - jp TextScriptEnd - -.ReviveText - TX_FAR _LavenderMartReviveText - db "@" - -.NuggetText - TX_FAR _LavenderMartNuggetText - db "@" diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm deleted file mode 100755 index 61d0b887..00000000 --- a/scripts/lavenderpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -LavenderPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -LavenderPokecenterTextPointers: - dw LavenderHealNurseText - dw LavenderPokecenterText2 - dw LavenderPokecenterText3 - dw LavenderTradeNurseText - -LavenderTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST - -LavenderHealNurseText: - TX_POKECENTER_NURSE - -LavenderPokecenterText2: - TX_FAR _LavenderPokecenterText2 - db "@" - -LavenderPokecenterText3: - TX_FAR _LavenderPokecenterText3 - db "@" diff --git a/scripts/lavendertown.asm b/scripts/lavendertown.asm deleted file mode 100755 index daf490b1..00000000 --- a/scripts/lavendertown.asm +++ /dev/null @@ -1,63 +0,0 @@ -LavenderTownScript: - jp EnableAutoTextBoxDrawing - -LavenderTownTextPointers: - dw LavenderTownText1 - dw LavenderTownText2 - dw LavenderTownText3 - dw LavenderTownText4 - dw LavenderTownText5 - dw MartSignText - dw PokeCenterSignText - dw LavenderTownText8 - dw LavenderTownText9 - -LavenderTownText1: - TX_ASM - ld hl, LavenderTownText_4413c - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ld hl, LavenderTownText_44146 - jr nz, .asm_40831 - ld hl, LavenderTownText_44141 -.asm_40831 - call PrintText - jp TextScriptEnd - -LavenderTownText_4413c: - TX_FAR _LavenderTownText_4413c - db "@" - -LavenderTownText_44141: - TX_FAR _LavenderTownText_44141 - db "@" - -LavenderTownText_44146: - TX_FAR _LavenderTownText_44146 - db "@" - -LavenderTownText2: - TX_FAR _LavenderTownText2 - db "@" - -LavenderTownText3: - TX_FAR _LavenderTownText3 - db "@" - -LavenderTownText4: - TX_FAR _LavenderTownText4 - db "@" - -LavenderTownText5: - TX_FAR _LavenderTownText5 - db "@" - -LavenderTownText8: - TX_FAR _LavenderTownText8 - db "@" - -LavenderTownText9: - TX_FAR _LavenderTownText9 - db "@" diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm deleted file mode 100755 index ec29847a..00000000 --- a/scripts/lorelei.asm +++ /dev/null @@ -1,153 +0,0 @@ -LoreleiScript: - call LoreleiShowOrHideExitBlock - call EnableAutoTextBoxDrawing - ld hl, LoreleiTrainerHeader0 - ld de, LoreleiScriptPointers - ld a, [wLoreleiCurScript] - call ExecuteCurMapScriptInTable - ld [wLoreleiCurScript], a - ret - -LoreleiShowOrHideExitBlock: -; Blocks or clears the exit to the next room. - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, wBeatLorelei - set 1, [hl] - CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - jr z, .blockExitToNextRoom - ld a, $5 - jr .setExitBlock -.blockExitToNextRoom - ld a, $24 -.setExitBlock - ld [wNewTileBlockID], a - lb bc, 0, 2 - predef_jump ReplaceTileBlock - -ResetLoreleiScript: - xor a - ld [wLoreleiCurScript], a - ret - -LoreleiScriptPointers: - dw LoreleiScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw LoreleiScript2 - dw LoreleiScript3 - dw LoreleiScript4 - -LoreleiScript4: - ret - -LoreleiScriptWalkIntoRoom: -; Walk six steps upward. - ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld a, $6 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wLoreleiCurScript], a - ld [wCurMapScript], a - ret - -LoreleiScript0: - ld hl, LoreleiEntranceCoords - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyPressed], a - ld [hJoyHeld], a - ld [wSimulatedJoypadStatesEnd], a - ld [wSimulatedJoypadStatesIndex], a - ld a, [wCoordIndex] - cp $3 ; Is player standing one tile above the exit? - jr c, .stopPlayerFromLeaving - CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM - jr z, LoreleiScriptWalkIntoRoom -.stopPlayerFromLeaving - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID ; "Don't run away!" - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wLoreleiCurScript], a - ld [wCurMapScript], a - ret - -LoreleiEntranceCoords: - db $0A,$04 - db $0A,$05 - db $0B,$04 - db $0B,$05 - db $FF - -LoreleiScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wLoreleiCurScript], a - ld [wCurMapScript], a - ret - -LoreleiScript2: - call EndTrainerBattle - ld a, [wIsInBattle] - cp $ff - jp z, ResetLoreleiScript - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -LoreleiTextPointers: - dw LoreleiText1 - dw LoreleiDontRunAwayText - -LoreleiTrainerHeader0: - dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - dw LoreleiBeforeBattleText ; TextBeforeBattle - dw LoreleiAfterBattleText ; TextAfterBattle - dw LoreleiEndBattleText ; TextEndBattle - dw LoreleiEndBattleText ; TextEndBattle - - db $ff - -LoreleiText1: - TX_ASM - ld hl, LoreleiTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -LoreleiBeforeBattleText: - TX_FAR _LoreleiBeforeBattleText - db "@" - -LoreleiEndBattleText: - TX_FAR _LoreleiEndBattleText - db "@" - -LoreleiAfterBattleText: - TX_FAR _LoreleiAfterBattleText - db "@" - -LoreleiDontRunAwayText: - TX_FAR _LoreleiDontRunAwayText - db "@" diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm deleted file mode 100755 index 2fdc18c6..00000000 --- a/scripts/mansion1.asm +++ /dev/null @@ -1,134 +0,0 @@ -Mansion1Script: - call Mansion1Subscript1 - call EnableAutoTextBoxDrawing - ld hl, Mansion1TrainerHeader0 - ld de, Mansion1ScriptPointers - ld a, [wMansion1CurScript] - call ExecuteCurMapScriptInTable - ld [wMansion1CurScript], a - ret - -Mansion1Subscript1: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_442ec - lb bc, 6, 12 - call Mansion1Script_4430b - lb bc, 3, 8 - call Mansion1Script_44304 - lb bc, 8, 10 - call Mansion1Script_44304 - lb bc, 13, 13 - jp Mansion1Script_44304 -.asm_442ec - lb bc, 6, 12 - call Mansion1Script_44304 - lb bc, 3, 8 - call Mansion1Script_4430b - lb bc, 8, 10 - call Mansion1Script_4430b - lb bc, 13, 13 - jp Mansion1Script_4430b - -Mansion1Script_44304: - ld a, $2d - ld [wNewTileBlockID], a - jr Mansion1ReplaceBlock - -Mansion1Script_4430b: - ld a, $e - ld [wNewTileBlockID], a -Mansion1ReplaceBlock: - predef ReplaceTileBlock - ret - -Mansion1Script_Switches: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - xor a - ld [hJoyHeld], a - ld a, $4 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -Mansion1ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Mansion1TextPointers: - dw Mansion1Text1 - dw PickUpItemText - dw PickUpItemText - dw Mansion1Text4 - -Mansion1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0 - dw Mansion1BattleText2 ; TextBeforeBattle - dw Mansion1AfterBattleText2 ; TextAfterBattle - dw Mansion1EndBattleText2 ; TextEndBattle - dw Mansion1EndBattleText2 ; TextEndBattle - - db $ff - -Mansion1Text1: - TX_ASM - ld hl, Mansion1TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Mansion1BattleText2: - TX_FAR _Mansion1BattleText2 - db "@" - -Mansion1EndBattleText2: - TX_FAR _Mansion1EndBattleText2 - db "@" - -Mansion1AfterBattleText2: - TX_FAR _Mansion1AfterBattleText2 - db "@" - -Mansion1Text4: - TX_ASM - ld hl, MansionSwitchText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_4438c - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ld hl, MansionSwitchPressedText - call PrintText - ld a, SFX_GO_INSIDE - call PlaySound - CheckAndSetEvent EVENT_MANSION_SWITCH_ON - jr z, .asm_44392 - ResetEventReuseHL EVENT_MANSION_SWITCH_ON - jr .asm_44392 -.asm_4438c - ld hl, MansionSwitchNotPressedText - call PrintText -.asm_44392 - jp TextScriptEnd - -MansionSwitchText: - TX_FAR _MansionSwitchText - db "@" - -MansionSwitchPressedText: - TX_FAR _MansionSwitchPressedText - db "@" - -MansionSwitchNotPressedText: - TX_FAR _MansionSwitchNotPressedText - db "@" diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm deleted file mode 100755 index ddc1ff7a..00000000 --- a/scripts/mansion2.asm +++ /dev/null @@ -1,140 +0,0 @@ -Mansion2Script: - call Mansion2Script_51fee - call EnableAutoTextBoxDrawing - ld hl, Mansion2TrainerHeader0 - ld de, Mansion2ScriptPointers - ld a, [wMansion2CurScript] - call ExecuteCurMapScriptInTable - ld [wMansion2CurScript], a - ret - -Mansion2Script_51fee: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_52016 - ld a, $e - lb bc, 2, 4 - call Mansion2Script_5202f - ld a, $54 - lb bc, 4, 9 - call Mansion2Script_5202f - ld a, $5f - lb bc, 11, 3 - call Mansion2Script_5202f - ret -.asm_52016 - ld a, $5f - lb bc, 2, 4 - call Mansion2Script_5202f - ld a, $e - lb bc, 4, 9 - call Mansion2Script_5202f - ld a, $e - lb bc, 11, 3 - call Mansion2Script_5202f - ret - -Mansion2Script_5202f: - ld [wNewTileBlockID], a - predef_jump ReplaceTileBlock - -Mansion2Script_Switches: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - xor a - ld [hJoyHeld], a - ld a, $5 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -Mansion2ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Mansion2TextPointers: - dw Mansion2Text1 - dw PickUpItemText - dw Mansion2Text3 - dw Mansion2Text4 - dw Mansion2Text5 - -Mansion2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0 - dw Mansion2BattleText1 ; TextBeforeBattle - dw Mansion2AfterBattleText1 ; TextAfterBattle - dw Mansion2EndBattleText1 ; TextEndBattle - dw Mansion2EndBattleText1 ; TextEndBattle - - db $ff - -Mansion2Text1: - TX_ASM - ld hl, Mansion2TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Mansion2BattleText1: - TX_FAR _Mansion2BattleText1 - db "@" - -Mansion2EndBattleText1: - TX_FAR _Mansion2EndBattleText1 - db "@" - -Mansion2AfterBattleText1: - TX_FAR _Mansion2AfterBattleText1 - db "@" - -Mansion2Text3: - TX_FAR _Mansion2Text3 - db "@" - -Mansion2Text4: - TX_FAR _Mansion2Text4 - db "@" - -Mansion3Text6: -Mansion2Text5: - TX_ASM - ld hl, Mansion2Text_520c2 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_520b9 - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ld hl, Mansion2Text_520c7 - call PrintText - ld a, SFX_GO_INSIDE - call PlaySound - CheckAndSetEvent EVENT_MANSION_SWITCH_ON - jr z, .asm_520bf - ResetEventReuseHL EVENT_MANSION_SWITCH_ON - jr .asm_520bf -.asm_520b9 - ld hl, Mansion2Text_520cc - call PrintText -.asm_520bf - jp TextScriptEnd - -Mansion2Text_520c2: - TX_FAR _Mansion2Text_520c2 - db "@" - -Mansion2Text_520c7: - TX_FAR _Mansion2Text_520c7 - db "@" - -Mansion2Text_520cc: - TX_FAR _Mansion2Text_520cc - db "@" diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm deleted file mode 100755 index abe76df8..00000000 --- a/scripts/mansion3.asm +++ /dev/null @@ -1,151 +0,0 @@ -Mansion3Script: - call Mansion3Script_52204 - call EnableAutoTextBoxDrawing - ld hl, Mansion3TrainerHeader0 - ld de, Mansion3ScriptPointers - ld a, [wMansion3CurScript] - call ExecuteCurMapScriptInTable - ld [wMansion3CurScript], a - ret - -Mansion3Script_52204: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_52224 - ld a, $e - ld bc, $207 - call Mansion2Script_5202f - ld a, $5f - ld bc, $507 - call Mansion2Script_5202f - ret -.asm_52224 - ld a, $5f - ld bc, $207 - call Mansion2Script_5202f - ld a, $e - ld bc, $507 - call Mansion2Script_5202f - ret - -Mansion3ScriptPointers: - dw Mansion3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Mansion3Script0: - ld hl, CoordsData_52254 - call Mansion3Script_5225b - ld a, [wWhichDungeonWarp] - and a - jp z, CheckFightingMapTrainers - cp $3 - ld a, $a5 - jr nz, .asm_52250 - ld a, $d6 -.asm_52250 - ld [wDungeonWarpDestinationMap], a - ret - -CoordsData_52254: - db $0E,$10 - db $0E,$11 - db $0E,$13 - db $FF - -Mansion3Script_5225b: - xor a - ld [wWhichDungeonWarp], a - ld a, [wd72d] - bit 4, a - ret nz - call ArePlayerCoordsInArray - ret nc - ld a, [wCoordIndex] - ld [wWhichDungeonWarp], a - ld hl, wd72d - set 4, [hl] - ld hl, wd732 - set 4, [hl] - ret - -Mansion3Script_Switches: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - xor a - ld [hJoyHeld], a - ld a, $6 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -Mansion3TextPointers: - dw Mansion3Text1 - dw Mansion3Text2 - dw PickUpItemText - dw PickUpItemText - dw Mansion3Text5 - dw Mansion3Text6 - -Mansion3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_0 - dw Mansion3BattleText1 ; TextBeforeBattle - dw Mansion3AfterBattleText1 ; TextAfterBattle - dw Mansion3EndBattleText1 ; TextEndBattle - dw Mansion3EndBattleText1 ; TextEndBattle - -Mansion3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 - dw Mansion3BattleText2 ; TextBeforeBattle - dw Mansion3AfterBattleText2 ; TextAfterBattle - dw Mansion3EndBattleText2 ; TextEndBattle - dw Mansion3EndBattleText2 ; TextEndBattle - - db $ff - -Mansion3Text1: - TX_ASM - ld hl, Mansion3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Mansion3Text2: - TX_ASM - ld hl, Mansion3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Mansion3BattleText1: - TX_FAR _Mansion3BattleText1 - db "@" - -Mansion3EndBattleText1: - TX_FAR _Mansion3EndBattleText1 - db "@" - -Mansion3AfterBattleText1: - TX_FAR _Mansion3AfterBattleText1 - db "@" - -Mansion3BattleText2: - TX_FAR _Mansion3BattleText2 - db "@" - -Mansion3EndBattleText2: - TX_FAR _Mansion3EndBattleText2 - db "@" - -Mansion3AfterBattleText2: - TX_FAR _Mansion3AfterBattleText2 - db "@" - -Mansion3Text5: - TX_FAR _Mansion3Text5 - db "@" diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm deleted file mode 100755 index de8a5d58..00000000 --- a/scripts/mansion4.asm +++ /dev/null @@ -1,130 +0,0 @@ -Mansion4Script: - call Mansion4Script_523cf - call EnableAutoTextBoxDrawing - ld hl, Mansion4TrainerHeader0 - ld de, Mansion4ScriptPointers - ld a, [wMansion4CurScript] - call ExecuteCurMapScriptInTable - ld [wMansion4CurScript], a - ret - -Mansion4Script_523cf: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_523ff - ld a, $e - ld bc, $80d - call Mansion2Script_5202f - ld a, $e - ld bc, $b06 - call Mansion2Script_5202f - ld a, $5f - ld bc, $304 - call Mansion2Script_5202f - ld a, $54 - ld bc, $808 - call Mansion2Script_5202f - ret -.asm_523ff - ld a, $2d - ld bc, $80d - call Mansion2Script_5202f - ld a, $5f - ld bc, $b06 - call Mansion2Script_5202f - ld a, $e - ld bc, $304 - call Mansion2Script_5202f - ld a, $e - ld bc, $808 - call Mansion2Script_5202f - ret - -Mansion4Script_Switches: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - xor a - ld [hJoyHeld], a - ld a, $9 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -Mansion4ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Mansion4TextPointers: - dw Mansion4Text1 - dw Mansion4Text2 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw Mansion4Text7 - dw PickUpItemText - dw Mansion3Text6 - -Mansion4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_0 - dw Mansion4BattleText1 ; TextBeforeBattle - dw Mansion4AfterBattleText1 ; TextAfterBattle - dw Mansion4EndBattleText1 ; TextEndBattle - dw Mansion4EndBattleText1 ; TextEndBattle - -Mansion4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 - dw Mansion4BattleText2 ; TextBeforeBattle - dw Mansion4AfterBattleText2 ; TextAfterBattle - dw Mansion4EndBattleText2 ; TextEndBattle - dw Mansion4EndBattleText2 ; TextEndBattle - - db $ff - -Mansion4Text1: - TX_ASM - ld hl, Mansion4TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Mansion4Text2: - TX_ASM - ld hl, Mansion4TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Mansion4BattleText1: - TX_FAR _Mansion4BattleText1 - db "@" - -Mansion4EndBattleText1: - TX_FAR _Mansion4EndBattleText1 - db "@" - -Mansion4AfterBattleText1: - TX_FAR _Mansion4AfterBattleText1 - db "@" - -Mansion4BattleText2: - TX_FAR _Mansion4BattleText2 - db "@" - -Mansion4EndBattleText2: - TX_FAR _Mansion4EndBattleText2 - db "@" - -Mansion4AfterBattleText2: - TX_FAR _Mansion4AfterBattleText2 - db "@" - -Mansion4Text7: - TX_FAR _Mansion4Text7 - db "@" diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm deleted file mode 100755 index 5ee3d025..00000000 --- a/scripts/mtmoon1.asm +++ /dev/null @@ -1,224 +0,0 @@ -MtMoon1Script: - call EnableAutoTextBoxDrawing - ld hl, MtMoon1TrainerHeader0 - ld de, MtMoon1ScriptPointers - ld a, [wMtMoon1CurScript] - call ExecuteCurMapScriptInTable - ld [wMtMoon1CurScript], a - ret - -MtMoon1ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -MtMoon1TextPointers: - dw MtMoon1Text1 - dw MtMoon1Text2 - dw MtMoon1Text3 - dw MtMoon1Text4 - dw MtMoon1Text5 - dw MtMoon1Text6 - dw MtMoon1Text7 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw MtMoon1Text14 - -MtMoon1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_0 - dw MtMoon1BattleText2 ; TextBeforeBattle - dw MtMoon1AfterBattleText2 ; TextAfterBattle - dw MtMoon1EndBattleText2 ; TextEndBattle - dw MtMoon1EndBattleText2 ; TextEndBattle - -MtMoon1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1 - dw MtMoon1BattleText3 ; TextBeforeBattle - dw MtMoon1AfterBattleText3 ; TextAfterBattle - dw MtMoon1EndBattleText3 ; TextEndBattle - dw MtMoon1EndBattleText3 ; TextEndBattle - -MtMoon1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 - dw MtMoon1BattleText4 ; TextBeforeBattle - dw MtMoon1AfterBattleText4 ; TextAfterBattle - dw MtMoon1EndBattleText4 ; TextEndBattle - dw MtMoon1EndBattleText4 ; TextEndBattle - -MtMoon1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 - dw MtMoon1BattleText5 ; TextBeforeBattle - dw MtMoon1AfterBattleText5 ; TextAfterBattle - dw MtMoon1EndBattleText5 ; TextEndBattle - dw MtMoon1EndBattleText5 ; TextEndBattle - -MtMoon1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 - dw MtMoon1BattleText6 ; TextBeforeBattle - dw MtMoon1AfterBattleText6 ; TextAfterBattle - dw MtMoon1EndBattleText6 ; TextEndBattle - dw MtMoon1EndBattleText6 ; TextEndBattle - -MtMoon1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 - dw MtMoon1BattleText7 ; TextBeforeBattle - dw MtMoon1AfterBattleText7 ; TextAfterBattle - dw MtMoon1EndBattleText7 ; TextEndBattle - dw MtMoon1EndBattleText7 ; TextEndBattle - -MtMoon1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 - dw MtMoon1BattleText8 ; TextBeforeBattle - dw MtMoon1AfterBattleText8 ; TextAfterBattle - dw MtMoon1EndBattleText8 ; TextEndBattle - dw MtMoon1EndBattleText8 ; TextEndBattle - - db $ff - -MtMoon1Text1: - TX_ASM - ld hl, MtMoon1TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1Text2: - TX_ASM - ld hl, MtMoon1TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1Text3: - TX_ASM - ld hl, MtMoon1TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1Text4: - TX_ASM - ld hl, MtMoon1TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1Text5: - TX_ASM - ld hl, MtMoon1TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1Text6: - TX_ASM - ld hl, MtMoon1TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1Text7: - TX_ASM - ld hl, MtMoon1TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -MtMoon1BattleText2: - TX_FAR _MtMoon1BattleText2 - db "@" - -MtMoon1EndBattleText2: - TX_FAR _MtMoon1EndBattleText2 - db "@" - -MtMoon1AfterBattleText2: - TX_FAR _MtMoon1AfterBattleText2 - db "@" - -MtMoon1BattleText3: - TX_FAR _MtMoon1BattleText3 - db "@" - -MtMoon1EndBattleText3: - TX_FAR _MtMoon1EndBattleText3 - db "@" - -MtMoon1AfterBattleText3: - TX_FAR _MtMoon1AfterBattleText3 - db "@" - -MtMoon1BattleText4: - TX_FAR _MtMoon1BattleText4 - db "@" - -MtMoon1EndBattleText4: - TX_FAR _MtMoon1EndBattleText4 - db "@" - -MtMoon1AfterBattleText4: - TX_FAR _MtMoon1AfterBattleText4 - db "@" - -MtMoon1BattleText5: - TX_FAR _MtMoon1BattleText5 - db "@" - -MtMoon1EndBattleText5: - TX_FAR _MtMoon1EndBattleText5 - db "@" - -MtMoon1AfterBattleText5: - TX_FAR _MtMoon1AfterBattleText5 - db "@" - -MtMoon1BattleText6: - TX_FAR _MtMoon1BattleText6 - db "@" - -MtMoon1EndBattleText6: - TX_FAR _MtMoon1EndBattleText6 - db "@" - -MtMoon1AfterBattleText6: - TX_FAR _MtMoon1AfterBattleText6 - db "@" - -MtMoon1BattleText7: - TX_FAR _MtMoon1BattleText7 - db "@" - -MtMoon1EndBattleText7: - TX_FAR _MtMoon1EndBattleText7 - db "@" - -MtMoon1AfterBattleText7: - TX_FAR _MtMoon1AfterBattleText7 - db "@" - -MtMoon1BattleText8: - TX_FAR _MtMoon1BattleText8 - db "@" - -MtMoon1EndBattleText8: - TX_FAR _MtMoon1EndBattleText8 - db "@" - -MtMoon1AfterBattleText8: - TX_FAR _MtMoon1AfterBattleText8 - db "@" - -MtMoon1Text14: - TX_FAR _MtMoon1Text14 - db "@" diff --git a/scripts/mtmoon2.asm b/scripts/mtmoon2.asm deleted file mode 100755 index 6d1e5339..00000000 --- a/scripts/mtmoon2.asm +++ /dev/null @@ -1,10 +0,0 @@ -MtMoon2Script: - call EnableAutoTextBoxDrawing - ret - -MtMoon2TextPointers: - dw MtMoonText1 - -MtMoonText1: - TX_FAR _MtMoonText1 - db "@" diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm deleted file mode 100755 index 60cd1ab8..00000000 --- a/scripts/mtmoon3.asm +++ /dev/null @@ -1,406 +0,0 @@ -MtMoon3Script: - call EnableAutoTextBoxDrawing - ld hl, MtMoon3TrainerHeader0 - ld de, MtMoon3ScriptPointers - ld a, [wMtMoon3CurScript] - call ExecuteCurMapScriptInTable - ld [wMtMoon3CurScript], a - CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - ret z - ld hl, CoordsData_49d37 - call ArePlayerCoordsInArray - jr nc, .asm_49d31 - ld hl, wd72e - set 4, [hl] - ret -.asm_49d31 - ld hl, wd72e - res 4, [hl] - ret - -CoordsData_49d37: - db $05,$0B - db $05,$0C - db $05,$0D - db $05,$0E - db $06,$0B - db $06,$0C - db $06,$0D - db $06,$0E - db $07,$0B - db $07,$0C - db $07,$0D - db $07,$0E - db $08,$0B - db $08,$0C - db $08,$0D - db $08,$0E - db $FF - -MtMoon3Script_49d58: - xor a - ld [wJoyIgnore], a - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a - ret - -MtMoon3ScriptPointers: - dw MtMoon3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw MtMoon3Script3 - dw MtMoon3Script4 - dw MtMoon3Script5 - -MtMoon3Script0: - CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - jp nz, MtMoon3Script_49d91 - ld a, [wYCoord] - cp $8 - jp nz, MtMoon3Script_49d91 - ld a, [wXCoord] - cp $d - jp nz, MtMoon3Script_49d91 - xor a - ld [hJoyHeld], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -MtMoon3Script_49d91: - CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL - jp z, CheckFightingMapTrainers - ret - -MtMoon3Script3: - ld a, [wIsInBattle] - cp $ff - jp z, MtMoon3Script_49d58 - call UpdateSprites - call Delay3 - SetEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a - ret - -MtMoon3Script4: - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld hl, CoordsData_49dea - call ArePlayerCoordsInArray - jr c, .asm_49dd7 - ld hl, CoordsData_49df1 - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - ld de, MovementData_49df9 - jr .asm_49dda -.asm_49dd7 - ld de, MovementData_49df8 -.asm_49dda - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $5 - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a - ret - -CoordsData_49dea: - db $07,$0C - db $06,$0B - db $05,$0C - db $FF - -CoordsData_49df1: - db $07,$0D - db $06,$0E - db $05,$0E - db $FF - -MovementData_49df8: - db NPC_MOVEMENT_RIGHT - -MovementData_49df9: - db NPC_MOVEMENT_UP,$FF - -MtMoon3Script5: - ld a, [wd730] - bit 0, a - ret nz - ld a, $f0 - ld [wJoyIgnore], a - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - CheckEvent EVENT_GOT_DOME_FOSSIL - jr z, .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_2 - jr .asm_49e1f -.asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_1 -.asm_49e1f - ld [wMissableObjectIndex], a - predef HideObject - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a - ret - -MtMoon3TextPointers: - dw MtMoon3Text1 - dw MtMoon3Text2 - dw MtMoon3Text3 - dw MtMoon3Text4 - dw MtMoon3Text5 - dw MtMoon3Text6 - dw MtMoon3Text7 - dw PickUpItemText - dw PickUpItemText - dw MtMoon3Text_49f99 - -MtMoon3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_0 - dw MtMoon3BattleText2 ; TextBeforeBattle - dw MtMoon3AfterBattleText2 ; TextAfterBattle - dw MtMoon3EndBattleText2 ; TextEndBattle - dw MtMoon3EndBattleText2 ; TextEndBattle - -MtMoon3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1 - dw MtMoon3BattleText3 ; TextBeforeBattle - dw MtMoon3AfterBattleText3 ; TextAfterBattle - dw MtMoon3EndBattleText3 ; TextEndBattle - dw MtMoon3EndBattleText3 ; TextEndBattle - -MtMoon3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 - dw MtMoon3BattleText4 ; TextBeforeBattle - dw MtMoon3AfterBattleText4 ; TextAfterBattle - dw MtMoon3EndBattleText4 ; TextEndBattle - dw MtMoon3EndBattleText4 ; TextEndBattle - -MtMoon3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 - dw MtMoon3BattleText5 ; TextBeforeBattle - dw MtMoon3AfterBattleText5 ; TextAfterBattle - dw MtMoon3EndBattleText5 ; TextEndBattle - dw MtMoon3EndBattleText5 ; TextEndBattle - - db $ff - -MtMoon3Text1: - TX_ASM - CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - jr z, .asm_49e8d - and $c0 - jr nz, .asm_49eb8 - ld hl, MtMoon3Text_49f8f - call PrintText - jr .asm_49ebe -.asm_49e8d - ld hl, MtMoon3Text_49f85 - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, MtMoon3Text_49f8a - ld de, MtMoon3Text_49f8a - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $3 - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a - jr .asm_49ebe -.asm_49eb8 - ld hl, MtMoon3Text_49f94 - call PrintText -.asm_49ebe - jp TextScriptEnd - -MtMoon3Text2: - TX_ASM - ld hl, MtMoon3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -MtMoon3Text3: - TX_ASM - ld hl, MtMoon3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -MtMoon3Text4: - TX_ASM - ld hl, MtMoon3TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -MtMoon3Text5: - TX_ASM - ld hl, MtMoon3TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -MtMoon3Text6: - TX_ASM - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, MtMoon3Text_49f24 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_49f21 - lb bc, DOME_FOSSIL, 1 - call GiveItem - jp nc, MtMoon3Script_49f76 - call MtMoon3Script_49f69 - ld a, HS_MT_MOON_3_FOSSIL_1 - ld [wMissableObjectIndex], a - predef HideObject - SetEvent EVENT_GOT_DOME_FOSSIL - ld a, $4 - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a -.asm_49f21 - jp TextScriptEnd - -MtMoon3Text_49f24: - TX_FAR _MtMoon3Text_49f24 - db "@" - -MtMoon3Text7: - TX_ASM - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, MtMoon3Text_49f64 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_49f61 - lb bc, HELIX_FOSSIL, 1 - call GiveItem - jp nc, MtMoon3Script_49f76 - call MtMoon3Script_49f69 - ld a, HS_MT_MOON_3_FOSSIL_2 - ld [wMissableObjectIndex], a - predef HideObject - SetEvent EVENT_GOT_HELIX_FOSSIL - ld a, $4 - ld [wMtMoon3CurScript], a - ld [wCurMapScript], a -.asm_49f61 - jp TextScriptEnd - -MtMoon3Text_49f64: - TX_FAR _MtMoon3Text_49f64 - db "@" - -MtMoon3Script_49f69: - ld hl, MtMoon3Text_49f6f - jp PrintText - -MtMoon3Text_49f6f: - TX_FAR _MtMoon3Text_49f6f - TX_SFX_KEY_ITEM - TX_WAIT - db "@" - -MtMoon3Script_49f76: - ld hl, MtMoon3Text_49f7f - call PrintText - jp TextScriptEnd - -MtMoon3Text_49f7f: - TX_FAR _MtMoon3Text_49f7f - TX_WAIT - db "@" - -MtMoon3Text_49f85: - TX_FAR _MtMoon3Text_49f85 - db "@" - -MtMoon3Text_49f8a: - TX_FAR _MtMoon3Text_49f8a - db "@" - -MtMoon3Text_49f8f: - TX_FAR _MtMoon3Text_49f8f - db "@" - -MtMoon3Text_49f94: - TX_FAR _MtMoon3Text_49f94 - db "@" - -MtMoon3Text_49f99: - TX_FAR _MtMoon3Text_49f99 - TX_SFX_KEY_ITEM - db "@" - -MtMoon3BattleText2: - TX_FAR _MtMoon3BattleText2 - db "@" - -MtMoon3EndBattleText2: - TX_FAR _MtMoon3EndBattleText2 - db "@" - -MtMoon3AfterBattleText2: - TX_FAR _MtMoon3AfterBattleText2 - db "@" - -MtMoon3BattleText3: - TX_FAR _MtMoon3BattleText3 - db "@" - -MtMoon3EndBattleText3: - TX_FAR _MtMoon3EndBattleText3 - db "@" - -MtMoon3AfterBattleText3: - TX_FAR _MtMoon3AfterBattleText3 - db "@" - -MtMoon3BattleText4: - TX_FAR _MtMoon3BattleText4 - db "@" - -MtMoon3EndBattleText4: - TX_FAR _MtMoon3EndBattleText4 - db "@" - -MtMoon3AfterBattleText4: - TX_FAR _MtMoon3AfterBattleText4 - db "@" - -MtMoon3BattleText5: - TX_FAR _MtMoon3BattleText5 - db "@" - -MtMoon3EndBattleText5: - TX_FAR _MtMoon3EndBattleText5 - db "@" - -MtMoon3AfterBattleText5: - TX_FAR _MtMoon3AfterBattleText5 - db "@" diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm deleted file mode 100755 index b5edee8d..00000000 --- a/scripts/mtmoonpokecenter.asm +++ /dev/null @@ -1,94 +0,0 @@ -MtMoonPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -MtMoonPokecenterTextPointers: - dw MtMoonHealNurseText - dw MtMoonPokecenterText2 - dw MtMoonPokecenterText3 - dw MagikarpSalesmanText - dw MtMoonPokecenterText5 - dw MtMoonTradeNurseText - -MtMoonHealNurseText: - db $ff - -MtMoonPokecenterText2: - TX_FAR _MtMoonPokecenterText1 - db "@" - -MtMoonPokecenterText3: - TX_FAR _MtMoonPokecenterText3 - db "@" - -MagikarpSalesmanText: - TX_ASM - CheckEvent EVENT_BOUGHT_MAGIKARP, 1 - jp c, .alreadyBoughtMagikarp - ld hl, .Text1 - call PrintText - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jp nz, .choseNo - ld [hMoney], a - ld [hMoney + 2], a - ld a, $5 - ld [hMoney + 1], a - call HasEnoughMoney - jr nc, .enoughMoney - ld hl, .NoMoneyText - jr .printText -.enoughMoney - lb bc, MAGIKARP, 5 - call GivePokemon - jr nc, .done - xor a - ld [wPriceTemp], a - ld [wPriceTemp + 2], a - ld a, $5 - ld [wPriceTemp + 1], a - ld hl, wPriceTemp + 2 - ld de, wPlayerMoney + 2 - ld c, $3 - predef SubBCDPredef - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - SetEvent EVENT_BOUGHT_MAGIKARP - jr .done -.choseNo - ld hl, .RefuseText - jr .printText -.alreadyBoughtMagikarp - ld hl, .Text2 -.printText - call PrintText -.done - jp TextScriptEnd - -.Text1 - TX_FAR _MagikarpSalesmanText1 - db "@" - -.RefuseText - TX_FAR _MagikarpSalesmanNoText - db "@" - -.NoMoneyText - TX_FAR _MagikarpSalesmanNoMoneyText - db "@" - -.Text2 - TX_FAR _MagikarpSalesmanText2 - db "@" - -MtMoonPokecenterText5: - TX_FAR _MtMoonPokecenterText5 - db "@" - -MtMoonTradeNurseText: - db $f6 diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm deleted file mode 100755 index 35bfb446..00000000 --- a/scripts/museum1f.asm +++ /dev/null @@ -1,247 +0,0 @@ -Museum1FScript: - ld a, $1 - ld [wAutoTextBoxDrawingControl], a - xor a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, Museum1FScriptPointers - ld a, [wMuseum1fCurScript] - jp CallFunctionInTable - -Museum1FScriptPointers: - dw Museum1FScript0 - dw Museum1FScript1 - -Museum1FScript0: - ld a, [wYCoord] - cp $4 - ret nz - ld a, [wXCoord] - cp $9 - jr z, .asm_5c120 - ld a, [wXCoord] - cp $a - ret nz -.asm_5c120 - xor a - ld [hJoyHeld], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -Museum1FScript1: - ret - -Museum1FTextPointers: - dw Museum1FText1 - dw Museum1FText2 - dw Museum1FText3 - dw Museum1FText4 - dw Museum1FText5 - -Museum1FText1: - TX_ASM - ld a, [wYCoord] - cp $4 - jr nz, .asm_8774b - ld a, [wXCoord] - cp $d - jp z, Museum1FScript_5c1f9 - jr .asm_b8709 -.asm_8774b - cp $3 - jr nz, .asm_d49e7 - ld a, [wXCoord] - cp $c - jp z, Museum1FScript_5c1f9 -.asm_d49e7 - CheckEvent EVENT_BOUGHT_MUSEUM_TICKET - jr nz, .asm_31a16 - ld hl, Museum1FText_5c23d - call PrintText - jp Museum1FScriptEnd -.asm_b8709 - CheckEvent EVENT_BOUGHT_MUSEUM_TICKET - jr z, .asm_3ded4 -.asm_31a16 - ld hl, Museum1FText_5c242 - call PrintText - jp Museum1FScriptEnd -.asm_3ded4 - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - xor a - ld [hJoyHeld], a - ld hl, Museum1FText_5c21f - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_de133 - xor a - ld [hMoney], a - ld [hMoney + 1], a - ld a, $50 - ld [hMoney + 2], a - call HasEnoughMoney - jr nc, .asm_0f3e3 - ld hl, Museum1FText_5c229 - call PrintText - jp .asm_de133 -.asm_0f3e3 - ld hl, Museum1FText_5c224 - call PrintText - SetEvent EVENT_BOUGHT_MUSEUM_TICKET - xor a - ld [wPriceTemp], a - ld [wPriceTemp + 1], a - ld a, $50 - ld [wPriceTemp + 2], a - ld hl, wPriceTemp + 2 - ld de, wPlayerMoney + 2 - ld c, $3 - predef SubBCDPredef - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - ld a, SFX_PURCHASE - call PlaySoundWaitForCurrent - call WaitForSoundToFinish - jr .asm_0b094 -.asm_de133 - ld hl, Museum1FText_5c21a - call PrintText - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - call UpdateSprites - jr Museum1FScriptEnd -.asm_0b094 - ld a, $1 - ld [wMuseum1fCurScript], a - jr Museum1FScriptEnd - -Museum1FScript_5c1f9: - ld hl, Museum1FText_5c22e - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - cp $0 - jr nz, .asm_d1144 - ld hl, Museum1FText_5c233 - call PrintText - jr Museum1FScriptEnd -.asm_d1144 - ld hl, Museum1FText_5c238 - call PrintText -Museum1FScriptEnd: - jp TextScriptEnd - -Museum1FText_5c21a: - TX_FAR _Museum1FText_5c21a - db "@" - -Museum1FText_5c21f: - TX_FAR _Museum1FText_5c21f - db "@" - -Museum1FText_5c224: - TX_FAR _Museum1FText_5c224 - db "@" - -Museum1FText_5c229: - TX_FAR _Museum1FText_5c229 - db "@" - -Museum1FText_5c22e: - TX_FAR _Museum1FText_5c22e - db "@" - -Museum1FText_5c233: - TX_FAR _Museum1FText_5c233 - db "@" - -Museum1FText_5c238: - TX_FAR _Museum1FText_5c238 - db "@" - -Museum1FText_5c23d: - TX_FAR _Museum1FText_5c23d - db "@" - -Museum1FText_5c242: - TX_FAR _Museum1FText_5c242 - db "@" - -Museum1FText2: - TX_ASM - ld hl, Museum1FText_5c251 - call PrintText - jp TextScriptEnd - -Museum1FText_5c251: - TX_FAR _Museum1FText_5c251 - db "@" - -Museum1FText3: - TX_ASM - CheckEvent EVENT_GOT_OLD_AMBER - jr nz, .asm_5c285 - ld hl, Museum1FText_5c28e - call PrintText - lb bc, OLD_AMBER, 1 - call GiveItem - jr nc, .BagFull - SetEvent EVENT_GOT_OLD_AMBER - ld a, HS_OLD_AMBER - ld [wMissableObjectIndex], a - predef HideObject - ld hl, ReceivedOldAmberText - jr .asm_5c288 -.BagFull - ld hl, Museum1FText_5c29e - jr .asm_5c288 -.asm_5c285 - ld hl, Museum1FText_5c299 -.asm_5c288 - call PrintText - jp TextScriptEnd - -Museum1FText_5c28e: - TX_FAR _Museum1FText_5c28e - db "@" - -ReceivedOldAmberText: - TX_FAR _ReceivedOldAmberText - TX_SFX_ITEM_1 - db "@" - -Museum1FText_5c299: - TX_FAR _Museum1FText_5c299 - db "@" - -Museum1FText_5c29e: - TX_FAR _Museum1FText_5c29e - db "@" - -Museum1FText4: - TX_ASM - ld hl, Museum1FText_5c2ad - call PrintText - jp TextScriptEnd - -Museum1FText_5c2ad: - TX_FAR _Museum1FText_5c2ad - db "@" - -Museum1FText5: - TX_ASM - ld hl, Museum1FText_5c2bc - call PrintText - jp TextScriptEnd - -Museum1FText_5c2bc: - TX_FAR _Museum1FText_5c2bc - db "@" diff --git a/scripts/museum2f.asm b/scripts/museum2f.asm deleted file mode 100755 index 6ee8d72a..00000000 --- a/scripts/museum2f.asm +++ /dev/null @@ -1,39 +0,0 @@ -Museum2FScript: - jp EnableAutoTextBoxDrawing - -Museum2FTextPointers: - dw Museum2FText1 - dw Museum2FText2 - dw Museum2FText3 - dw Museum2FText4 - dw Museum2FText5 - dw Museum2FText6 - dw Museum2FText7 - -Museum2FText1: - TX_FAR _Museum2FText1 - db "@" - -Museum2FText2: - TX_FAR _Museum2FText2 - db "@" - -Museum2FText3: - TX_FAR _Museum2FText3 - db "@" - -Museum2FText4: - TX_FAR _Museum2FText4 - db "@" - -Museum2FText5: - TX_FAR _Museum2FText5 - db "@" - -Museum2FText6: - TX_FAR _Museum2FText6 - db "@" - -Museum2FText7: - TX_FAR _Museum2FText7 - db "@" diff --git a/scripts/namerater.asm b/scripts/namerater.asm deleted file mode 100755 index 160948ac..00000000 --- a/scripts/namerater.asm +++ /dev/null @@ -1,107 +0,0 @@ -NameRaterScript: - jp EnableAutoTextBoxDrawing - -NameRaterScript_1da15: - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ret - -NameRaterScript_1da20: - ld hl, wPartyMonOT - ld bc, NAME_LENGTH - ld a, [wWhichPokemon] - call AddNTimes - ld de, wPlayerName - ld c, NAME_LENGTH - call .asm_1da47 - jr c, .asm_1da52 - ld hl, wPartyMon1OTID - ld bc, wPartyMon2 - wPartyMon1 - ld a, [wWhichPokemon] - call AddNTimes - ld de, wPlayerID - ld c, $2 -.asm_1da47 - ld a, [de] - cp [hl] - jr nz, .asm_1da52 - inc hl - inc de - dec c - jr nz, .asm_1da47 - and a - ret -.asm_1da52 - scf - ret - -NameRaterTextPointers: - dw NameRaterText1 - -NameRaterText1: - TX_ASM - call SaveScreenTilesToBuffer2 - ld hl, NameRaterText_1dab3 - call NameRaterScript_1da15 - jr nz, .asm_1daae - ld hl, NameRaterText_1dab8 - call PrintText - xor a - ld [wPartyMenuTypeOrMessageID], a - ld [wUpdateSpritesEnabled], a - ld [wMenuItemToSwap], a - call DisplayPartyMenu - push af - call GBPalWhiteOutWithDelay3 - call RestoreScreenTilesAndReloadTilePatterns - call LoadGBPal - pop af - jr c, .asm_1daae - call GetPartyMonName2 - call NameRaterScript_1da20 - ld hl, NameRaterText_1dad1 - jr c, .asm_1daa8 - ld hl, NameRaterText_1dabd - call NameRaterScript_1da15 - jr nz, .asm_1daae - ld hl, NameRaterText_1dac2 - call PrintText - callba DisplayNameRaterScreen - jr c, .asm_1daae - ld hl, NameRaterText_1dac7 -.asm_1daa8 - call PrintText - jp TextScriptEnd -.asm_1daae - ld hl, NameRaterText_1dacc - jr .asm_1daa8 - -NameRaterText_1dab3: - TX_FAR _NameRaterText_1dab3 - db "@" - -NameRaterText_1dab8: - TX_FAR _NameRaterText_1dab8 - db "@" - -NameRaterText_1dabd: - TX_FAR _NameRaterText_1dabd - db "@" - -NameRaterText_1dac2: - TX_FAR _NameRaterText_1dac2 - db "@" - -NameRaterText_1dac7: - TX_FAR _NameRaterText_1dac7 - db "@" - -NameRaterText_1dacc: - TX_FAR _NameRaterText_1dacc - db "@" - -NameRaterText_1dad1: - TX_FAR _NameRaterText_1dad1 - db "@" diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm deleted file mode 100755 index aa84fab9..00000000 --- a/scripts/oakslab.asm +++ /dev/null @@ -1,1233 +0,0 @@ -OaksLabScript: - CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 - call nz, OaksLabScript_1d076 - ld a, $1 - ld [wAutoTextBoxDrawingControl], a - xor a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OaksLabScriptPointers - ld a, [wOaksLabCurScript] - jp CallFunctionInTable - -OaksLabScriptPointers: - dw OaksLabScript0 - dw OaksLabScript1 - dw OaksLabScript2 - dw OaksLabScript3 - dw OaksLabScript4 - dw OaksLabScript5 - dw OaksLabScript6 - dw OaksLabScript7 - dw OaksLabScript8 - dw OaksLabScript9 - dw OaksLabScript10 - dw OaksLabScript11 - dw OaksLabScript12 - dw OaksLabScript13 - dw OaksLabScript14 - dw OaksLabScript15 - dw OaksLabScript16 - dw OaksLabScript17 - dw OaksLabScript18 - -OaksLabScript0: - CheckEvent EVENT_OAK_APPEARED_IN_PALLET - ret z - ld a, [wNPCMovementScriptFunctionNum] - and a - ret nz - ld a, HS_OAKS_LAB_OAK_2 - ld [wMissableObjectIndex], a - predef ShowObject - ld hl, wd72e - res 4, [hl] - - ld a, $1 - ld [wOaksLabCurScript], a - ret - -OaksLabScript1: - ld a, $8 - ld [H_SPRITEINDEX], a - ld de, OakEntryMovement - call MoveSprite - - ld a, $2 - ld [wOaksLabCurScript], a - ret - -OakEntryMovement: - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db $FF - -OaksLabScript2: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_OAKS_LAB_OAK_2 - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_OAKS_LAB_OAK_1 - ld [wMissableObjectIndex], a - predef ShowObject - - ld a, $3 - ld [wOaksLabCurScript], a - ret - -OaksLabScript3: - call Delay3 - ld hl, wSimulatedJoypadStatesEnd - ld de, PlayerEntryMovementRLE - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $1 - ld [H_SPRITEINDEX], a - xor a - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $5 - ld [H_SPRITEINDEX], a - xor a - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - - ld a, $4 - ld [wOaksLabCurScript], a - ret - -PlayerEntryMovementRLE: - db D_UP,$8 - db $ff - -OaksLabScript4: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - SetEvent EVENT_FOLLOWED_OAK_INTO_LAB - SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - call UpdateSprites - ld hl, wFlags_D733 - res 1, [hl] - call PlayDefaultMusic - - ld a, $5 - ld [wOaksLabCurScript], a - ret - -OaksLabScript5: - ld a, $fc - ld [wJoyIgnore], a - ld a, $11 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld a, $12 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld a, $13 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld a, $14 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON - xor a - ld [wJoyIgnore], a - - ld a, $6 - ld [wOaksLabCurScript], a - ret - -OaksLabScript6: - ld a, [wYCoord] - cp $6 - ret nz - ld a, $5 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $1 - ld [H_SPRITEINDEX], a - xor a - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - call UpdateSprites - ld a, $c - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - - ld a, $7 - ld [wOaksLabCurScript], a - ret - -OaksLabScript7: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - - ld a, $6 - ld [wOaksLabCurScript], a - ret - -OaksLabScript8: - ld a, [wPlayerStarter] - cp STARTER1 - jr z, .Charmander - cp STARTER2 - jr z, .Squirtle - jr .Bulbasaur -.Charmander - ld de, .MiddleBallMovement1 - ld a, [wYCoord] - cp $4 ; is the player standing below the table? - jr z, .asm_1ccf3 - ld de, .MiddleBallMovement2 - jr .asm_1ccf3 - -.MiddleBallMovement1 - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_UP - db $FF - -.MiddleBallMovement2 - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -.Squirtle - ld de, .RightBallMovement1 - ld a, [wYCoord] - cp $4 ; is the player standing below the table? - jr z, .asm_1ccf3 - ld de, .RightBallMovement2 - jr .asm_1ccf3 - -.RightBallMovement1 - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_UP - db $FF - -.RightBallMovement2 - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -.Bulbasaur - ld de, .LeftBallMovement1 - ld a, [wXCoord] - cp $9 ; is the player standing to the right of the table? - jr nz, .asm_1ccf3 - push hl - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, $4 - ld [H_SPRITEDATAOFFSET], a - call GetPointerWithinSpriteStateData1 - push hl - ld [hl], $4c - inc hl - inc hl - ld [hl], $0 - pop hl - inc h - ld [hl], $8 - inc hl - ld [hl], $9 - ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that - pop hl - jr .asm_1ccf3 - -.LeftBallMovement1 - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT ; not yet terminated! -.LeftBallMovement2 - db NPC_MOVEMENT_RIGHT - db $FF - -.asm_1ccf3 - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - - ld a, $9 - ld [wOaksLabCurScript], a - ret - -OaksLabScript9: - ld a, [wd730] - bit 0, a - ret nz - ld a, $fc - ld [wJoyIgnore], a - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $d - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, [wRivalStarterBallSpriteIndex] - cp $2 - jr nz, .asm_1cd28 - ld a, HS_STARTER_BALL_1 - jr .asm_1cd32 -.asm_1cd28 - cp $3 - jr nz, .asm_1cd30 - ld a, HS_STARTER_BALL_2 - jr .asm_1cd32 -.asm_1cd30 - ld a, HS_STARTER_BALL_3 -.asm_1cd32 - ld [wMissableObjectIndex], a - predef HideObject - call Delay3 - ld a, [wRivalStarterTemp] - ld [wRivalStarter], a - ld [wcf91], a - ld [wd11e], a - call GetMonName - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $e - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_STARTER - xor a - ld [wJoyIgnore], a - - ld a, $a - ld [wOaksLabCurScript], a - ret - -OaksLabScript10: - ld a, [wYCoord] - cp $6 - ret nz - ld a, $1 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld a, $f - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $1 - ld [hNPCPlayerRelativePosPerspective], a - ld a, $1 - swap a - ld [hNPCSpriteOffset], a - predef CalcPositionOfPlayerRelativeToNPC - ld a, [hNPCPlayerYDistance] - dec a - ld [hNPCPlayerYDistance], a - predef FindPathToPlayer - ld de, wNPCMovementDirections2 - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - - ld a, $b - ld [wOaksLabCurScript], a - ret - -OaksLabScript11: - ld a, [wd730] - bit 0, a - ret nz - - ; define which team rival uses, and fight it - ld a, OPP_SONY1 - ld [wCurOpponent], a - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotSquirtle - ld a, $1 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $2 - jr .done -.Charmander - ld a, $3 -.done - ld [wTrainerNo], a - ld a, $1 - ld [wSpriteIndex], a - call GetSpritePosition1 - ld hl, OaksLabText_1d3be - ld de, OaksLabText_1d3c3 - call SaveEndBattleTextPointers - ld hl, wd72d - set 6, [hl] - set 7, [hl] - xor a - ld [wJoyIgnore], a - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - ld a, $c - ld [wOaksLabCurScript], a - ret - -OaksLabScript12: - ld a, $f0 - ld [wJoyIgnore], a - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - call UpdateSprites - ld a, $1 - ld [wSpriteIndex], a - call SetSpritePosition1 - ld a, $1 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - predef HealParty - SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB - - ld a, $d - ld [wOaksLabCurScript], a - ret - -OaksLabScript13: - ld c, 20 - call DelayFrames - ld a, $10 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - callba Music_RivalAlternateStart - ld a, $1 - ld [H_SPRITEINDEX], a - ld de, .RivalExitMovement - call MoveSprite - ld a, [wXCoord] - cp $4 - ; move left or right depending on where the player is standing - jr nz, .moveLeft - ld a, NPC_MOVEMENT_RIGHT - jr .next -.moveLeft - ld a, NPC_MOVEMENT_LEFT -.next - ld [wNPCMovementDirections], a - - ld a, $e - ld [wOaksLabCurScript], a - ret - -.RivalExitMovement - db $E0 ; change sprite facing direction - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -OaksLabScript14: - ld a, [wd730] - bit 0, a - jr nz, .asm_1ce8c - ld a, HS_OAKS_LAB_RIVAL - ld [wMissableObjectIndex], a - predef HideObject - xor a - ld [wJoyIgnore], a - call PlayDefaultMusic ; reset to map music - ld a, $12 - ld [wOaksLabCurScript], a - jr .done -; make the player keep facing the rival as he walks away -.asm_1ce8c - ld a, [wNPCNumScriptedSteps] - cp $5 - jr nz, .asm_1cea8 - ld a, [wXCoord] - cp $4 - jr nz, .asm_1cea1 - ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + 9], a - jr .done -.asm_1cea1 - ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + 9], a - jr .done -.asm_1cea8 - cp $4 - ret nz - xor a ; ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 9], a -.done - ret - -OaksLabScript15: - xor a - ld [hJoyHeld], a - call EnableAutoTextBoxDrawing - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld a, $15 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call OaksLabScript_1d02b - ld a, HS_OAKS_LAB_RIVAL - ld [wMissableObjectIndex], a - predef ShowObject - ld a, [wNPCMovementDirections2Index] - ld [wSavedNPCMovementDirections2Index], a - ld b, 0 - ld c, a - ld hl, wNPCMovementDirections2 - ld a, NPC_MOVEMENT_UP - call FillMemory - ld [hl], $ff - ld a, $1 - ld [H_SPRITEINDEX], a - ld de, wNPCMovementDirections2 - call MoveSprite - - ld a, $10 - ld [wOaksLabCurScript], a - ret - -OaksLabScript_1cefd: - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $8 - ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a - jp SetSpriteFacingDirectionAndDelay - -OaksLabScript16: - ld a, [wd730] - bit 0, a - ret nz - call EnableAutoTextBoxDrawing - call PlayDefaultMusic - ld a, $fc - ld [wJoyIgnore], a - call OaksLabScript_1cefd - ld a, $16 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call DelayFrame - call OaksLabScript_1cefd - ld a, $17 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call DelayFrame - call OaksLabScript_1cefd - ld a, $18 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call DelayFrame - ld a, $19 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld a, HS_POKEDEX_1 - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_POKEDEX_2 - ld [wMissableObjectIndex], a - predef HideObject - call OaksLabScript_1cefd - ld a, $1a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - call Delay3 - ld a, $1b - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_POKEDEX - SetEvent EVENT_OAK_GOT_PARCEL - ld a, HS_LYING_OLD_MAN - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_OLD_MAN - ld [wMissableObjectIndex], a - predef ShowObject - ld a, [wSavedNPCMovementDirections2Index] - ld b, 0 - ld c, a - ld hl, wNPCMovementDirections2 - xor a ; NPC_MOVEMENT_DOWN - call FillMemory - ld [hl], $ff - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld a, $1 - ld [H_SPRITEINDEX], a - ld de, wNPCMovementDirections2 - call MoveSprite - - ld a, $11 - ld [wOaksLabCurScript], a - ret - -OaksLabScript17: - ld a, [wd730] - bit 0, a - ret nz - call PlayDefaultMusic - ld a, HS_OAKS_LAB_RIVAL - ld [wMissableObjectIndex], a - predef HideObject - SetEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE - ResetEventReuseHL EVENT_2ND_ROUTE22_RIVAL_BATTLE - SetEventReuseHL EVENT_ROUTE22_RIVAL_WANTS_BATTLE - ld a, HS_ROUTE_22_RIVAL_1 - ld [wMissableObjectIndex], a - predef ShowObject - ld a, $5 - ld [wPalletTownCurScript], a - xor a - ld [wJoyIgnore], a - - ld a, $12 - ld [wOaksLabCurScript], a - ret - -OaksLabScript18: - ret - -OaksLabScript_RemoveParcel: - ld hl, wBagItems - ld bc, $0000 -.loop - ld a, [hli] - cp $ff - ret z - cp OAKS_PARCEL - jr z, .foundParcel - inc hl - inc c - jr .loop -.foundParcel - ld hl, wNumBagItems - ld a, c - ld [wWhichPokemon], a - ld a, $1 - ld [wItemQuantity], a - jp RemoveItemFromInventory - -OaksLabScript_1d02b: - ld a, $7c - ld [$ffeb], a - ld a, $8 - ld [$ffee], a - ld a, [wYCoord] - cp $3 - jr nz, .asm_1d045 - ld a, $4 - ld [wNPCMovementDirections2Index], a - ld a, $30 - ld b, $b - jr .asm_1d068 -.asm_1d045 - cp $1 - jr nz, .asm_1d054 - ld a, $2 - ld [wNPCMovementDirections2Index], a - ld a, $30 - ld b, $9 - jr .asm_1d068 -.asm_1d054 - ld a, $3 - ld [wNPCMovementDirections2Index], a - ld b, $a - ld a, [wXCoord] - cp $4 - jr nz, .asm_1d066 - ld a, $40 - jr .asm_1d068 -.asm_1d066 - ld a, $20 -.asm_1d068 - ld [$ffec], a - ld a, b - ld [$ffed], a - ld a, $1 - ld [wSpriteIndex], a - call SetSpritePosition1 - ret - -OaksLabScript_1d076: - ld hl, OaksLabTextPointers2 - ld a, l - ld [wMapTextPtr], a - ld a, h - ld [wMapTextPtr+1], a - ret - -OaksLabTextPointers: - dw OaksLabText1 - dw OaksLabText2 - dw OaksLabText3 - dw OaksLabText4 - dw OaksLabText5 - dw OaksLabText6 - dw OaksLabText7 - dw OaksLabText8 - dw OaksLabText9 - dw OaksLabText10 - dw OaksLabText11 - dw OaksLabText12 - dw OaksLabText13 - dw OaksLabText14 - dw OaksLabText15 - dw OaksLabText16 - dw OaksLabText17 - dw OaksLabText18 - dw OaksLabText19 - dw OaksLabText20 - dw OaksLabText21 - dw OaksLabText22 - dw OaksLabText23 - dw OaksLabText24 - dw OaksLabText25 - dw OaksLabText26 - dw OaksLabText27 - -OaksLabTextPointers2: - dw OaksLabText1 - dw OaksLabText2 - dw OaksLabText3 - dw OaksLabText4 - dw OaksLabText5 - dw OaksLabText6 - dw OaksLabText7 - dw OaksLabText8 - dw OaksLabText9 - dw OaksLabText10 - dw OaksLabText11 - -OaksLabText1: - TX_ASM - CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 - jr nz, .asm_1d0de - ld hl, OaksLabGaryText1 - call PrintText - jr .asm_1d0f0 -.asm_1d0de - bit 2, a - jr nz, .asm_1d0ea - ld hl, OaksLabText40 - call PrintText - jr .asm_1d0f0 -.asm_1d0ea - ld hl, OaksLabText41 - call PrintText -.asm_1d0f0 - jp TextScriptEnd - -OaksLabGaryText1: - TX_FAR _OaksLabGaryText1 - db "@" - -OaksLabText40: - TX_FAR _OaksLabText40 - db "@" - -OaksLabText41: - TX_FAR _OaksLabText41 - db "@" - -OaksLabText2: - TX_ASM - ld a, STARTER2 - ld [wRivalStarterTemp], a - ld a, $3 - ld [wRivalStarterBallSpriteIndex], a - ld a, STARTER1 - ld b, $2 - jr OaksLabScript_1d133 - -OaksLabText3: - TX_ASM - ld a, STARTER3 - ld [wRivalStarterTemp], a - ld a, $4 - ld [wRivalStarterBallSpriteIndex], a - ld a, STARTER2 - ld b, $3 - jr OaksLabScript_1d133 - -OaksLabText4: - TX_ASM - ld a, STARTER1 - ld [wRivalStarterTemp], a - ld a, $2 - ld [wRivalStarterBallSpriteIndex], a - ld a, STARTER3 - ld b, $4 - -OaksLabScript_1d133: - ld [wcf91], a - ld [wd11e], a - ld a, b - ld [wSpriteIndex], a - CheckEvent EVENT_GOT_STARTER - jp nz, OaksLabScript_1d22d - CheckEventReuseA EVENT_OAK_ASKED_TO_CHOOSE_MON - jr nz, OaksLabScript_1d157 - ld hl, OaksLabText39 - call PrintText - jp TextScriptEnd - -OaksLabText39: - TX_FAR _OaksLabText39 - db "@" - -OaksLabScript_1d157: - ld a, $5 - ld [H_SPRITEINDEX], a - ld a, $9 - ld [H_SPRITEDATAOFFSET], a - call GetPointerWithinSpriteStateData1 - ld [hl], SPRITE_FACING_DOWN - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, $9 - ld [H_SPRITEDATAOFFSET], a - call GetPointerWithinSpriteStateData1 - ld [hl], SPRITE_FACING_RIGHT - ld hl, wd730 - set 6, [hl] - predef StarterDex - ld hl, wd730 - res 6, [hl] - call ReloadMapData - ld c, 10 - call DelayFrames - ld a, [wSpriteIndex] - cp $2 - jr z, OaksLabLookAtCharmander - cp $3 - jr z, OaksLabLookAtSquirtle - jr OaksLabLookAtBulbasaur - -OaksLabLookAtCharmander: - ld hl, OaksLabCharmanderText - jr OaksLabMonChoiceMenu -OaksLabCharmanderText: - TX_FAR _OaksLabCharmanderText - db "@" - -OaksLabLookAtSquirtle: - ld hl, OaksLabSquirtleText - jr OaksLabMonChoiceMenu -OaksLabSquirtleText: - TX_FAR _OaksLabSquirtleText - db "@" - -OaksLabLookAtBulbasaur: - ld hl, OaksLabBulbasaurText - jr OaksLabMonChoiceMenu -OaksLabBulbasaurText: - TX_FAR _OaksLabBulbasaurText - db "@" - -OaksLabMonChoiceMenu: - call PrintText - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - call YesNoChoice ; yes/no menu - ld a, [wCurrentMenuItem] - and a - jr nz, OaksLabMonChoiceEnd - ld a, [wcf91] - ld [wPlayerStarter], a - ld [wd11e], a - call GetMonName - ld a, [wSpriteIndex] - cp $2 - jr nz, .asm_1d1db - ld a, HS_STARTER_BALL_1 - jr .asm_1d1e5 -.asm_1d1db - cp $3 - jr nz, .asm_1d1e3 - ld a, HS_STARTER_BALL_2 - jr .asm_1d1e5 -.asm_1d1e3 - ld a, HS_STARTER_BALL_3 -.asm_1d1e5 - ld [wMissableObjectIndex], a - predef HideObject - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OaksLabMonEnergeticText - call PrintText - ld hl, OaksLabReceivedMonText - call PrintText - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - ld a, 5 - ld [wCurEnemyLVL], a - ld a, [wcf91] - ld [wd11e], a - call AddPartyMon - ld hl, wd72e - set 3, [hl] - ld a, $fc - ld [wJoyIgnore], a - ld a, $8 - ld [wOaksLabCurScript], a -OaksLabMonChoiceEnd: - jp TextScriptEnd - -OaksLabMonEnergeticText: - TX_FAR _OaksLabMonEnergeticText - db "@" - -OaksLabReceivedMonText: - TX_FAR _OaksLabReceivedMonText - TX_SFX_KEY_ITEM - db "@" - -OaksLabScript_1d22d: - ld a, $5 - ld [H_SPRITEINDEX], a - ld a, $9 - ld [H_SPRITEDATAOFFSET], a - call GetPointerWithinSpriteStateData1 - ld [hl], $0 - ld hl, OaksLabLastMonText - call PrintText - jp TextScriptEnd - -OaksLabLastMonText: - TX_FAR _OaksLabLastMonText - db "@" - -OaksLabText32: -OaksLabText5: - TX_ASM - CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS - jr nz, .asm_1d266 - ld hl, wPokedexOwned - ld b, wPokedexOwnedEnd - wPokedexOwned - call CountSetBits - ld a, [wNumSetBits] - cp 2 - jr c, .asm_1d279 - CheckEvent EVENT_GOT_POKEDEX - jr z, .asm_1d279 -.asm_1d266 - ld hl, OaksLabText_1d31d - call PrintText - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - predef DisplayDexRating - jp .asm_1d2ed -.asm_1d279 - ld b, POKE_BALL - call IsItemInBag - jr nz, .asm_1d2e7 - CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - jr nz, .asm_1d2d0 - CheckEvent EVENT_GOT_POKEDEX - jr nz, .asm_1d2c8 - CheckEventReuseA EVENT_BATTLED_RIVAL_IN_OAKS_LAB - jr nz, .asm_1d2a9 - ld a, [wd72e] - bit 3, a - jr nz, .asm_1d2a1 - ld hl, OaksLabText_1d2f0 - call PrintText - jr .asm_1d2ed -.asm_1d2a1 - ld hl, OaksLabText_1d2f5 - call PrintText - jr .asm_1d2ed -.asm_1d2a9 - ld b, OAKS_PARCEL - call IsItemInBag - jr nz, .asm_1d2b8 - ld hl, OaksLabText_1d2fa - call PrintText - jr .asm_1d2ed -.asm_1d2b8 - ld hl, OaksLabDeliverParcelText - call PrintText - call OaksLabScript_RemoveParcel - ld a, $f - ld [wOaksLabCurScript], a - jr .asm_1d2ed -.asm_1d2c8 - ld hl, OaksLabAroundWorldText - call PrintText - jr .asm_1d2ed -.asm_1d2d0 - CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK - jr nz, .asm_1d2e7 - lb bc, POKE_BALL, 5 - call GiveItem - ld hl, OaksLabGivePokeballsText - call PrintText - jr .asm_1d2ed -.asm_1d2e7 - ld hl, OaksLabPleaseVisitText - call PrintText -.asm_1d2ed - jp TextScriptEnd - -OaksLabText_1d2f0: - TX_FAR _OaksLabText_1d2f0 - db "@" - -OaksLabText_1d2f5: - TX_FAR _OaksLabText_1d2f5 - db "@" - -OaksLabText_1d2fa: - TX_FAR _OaksLabText_1d2fa - db "@" - -OaksLabDeliverParcelText: - TX_FAR _OaksLabDeliverParcelText1 - TX_SFX_KEY_ITEM - TX_FAR _OaksLabDeliverParcelText2 - db "@" - -OaksLabAroundWorldText: - TX_FAR _OaksLabAroundWorldText - db "@" - -OaksLabGivePokeballsText: - TX_FAR _OaksLabGivePokeballsText1 - TX_SFX_KEY_ITEM - TX_FAR _OaksLabGivePokeballsText2 - db "@" - -OaksLabPleaseVisitText: - TX_FAR _OaksLabPleaseVisitText - db "@" - -OaksLabText_1d31d: - TX_FAR _OaksLabText_1d31d - db "@" - -OaksLabText7: -OaksLabText6: - TX_ASM - ld hl, OaksLabText_1d32c - call PrintText - jp TextScriptEnd - -OaksLabText_1d32c: - TX_FAR _OaksLabText_1d32c - db "@" - -OaksLabText8: - TX_FAR _OaksLabText8 - db "@" - -OaksLabText9: - TX_ASM - ld hl, OaksLabText_1d340 - call PrintText - jp TextScriptEnd - -OaksLabText_1d340: - TX_FAR _OaksLabText_1d340 - db "@" - -OaksLabText17: - TX_ASM - ld hl, OaksLabRivalWaitingText - call PrintText - jp TextScriptEnd - -OaksLabRivalWaitingText: - TX_FAR _OaksLabRivalWaitingText - db "@" - -OaksLabText18: - TX_ASM - ld hl, OaksLabChooseMonText - call PrintText - jp TextScriptEnd - -OaksLabChooseMonText: - TX_FAR _OaksLabChooseMonText - db "@" - -OaksLabText19: - TX_ASM - ld hl, OaksLabRivalInterjectionText - call PrintText - jp TextScriptEnd - -OaksLabRivalInterjectionText: - TX_FAR _OaksLabRivalInterjectionText - db "@" - -OaksLabText20: - TX_ASM - ld hl, OaksLabBePatientText - call PrintText - jp TextScriptEnd - -OaksLabBePatientText: - TX_FAR _OaksLabBePatientText - db "@" - -OaksLabText12: - TX_ASM - ld hl, OaksLabLeavingText - call PrintText - jp TextScriptEnd - -OaksLabLeavingText: - TX_FAR _OaksLabLeavingText - db "@" - -OaksLabText13: - TX_ASM - ld hl, OaksLabRivalPickingMonText - call PrintText - jp TextScriptEnd - -OaksLabRivalPickingMonText: - TX_FAR _OaksLabRivalPickingMonText - db "@" - -OaksLabText14: - TX_ASM - ld hl, OaksLabRivalReceivedMonText - call PrintText - jp TextScriptEnd - -OaksLabRivalReceivedMonText: - TX_FAR _OaksLabRivalReceivedMonText - TX_SFX_KEY_ITEM - db "@" - -OaksLabText15: - TX_ASM - ld hl, OaksLabRivalChallengeText - call PrintText - jp TextScriptEnd - -OaksLabRivalChallengeText: - TX_FAR _OaksLabRivalChallengeText - db "@" - -OaksLabText_1d3be: - TX_FAR _OaksLabText_1d3be - db "@" - -OaksLabText_1d3c3: - TX_FAR _OaksLabText_1d3c3 - db "@" - -OaksLabText16: - TX_ASM - ld hl, OaksLabRivalToughenUpText - call PrintText - jp TextScriptEnd - -OaksLabRivalToughenUpText: - TX_FAR _OaksLabRivalToughenUpText - db "@" - -OaksLabText21: - TX_FAR _OaksLabText21 - db "@" - -OaksLabText22: - TX_FAR _OaksLabText22 - db "@" - -OaksLabText23: - TX_FAR _OaksLabText23 - db "@" - -OaksLabText24: - TX_FAR _OaksLabText24 - db "@" - -OaksLabText25: - TX_FAR _OaksLabText25 - TX_SFX_KEY_ITEM - db "@" - -OaksLabText26: - TX_FAR _OaksLabText26 - db "@" - -OaksLabText27: - TX_FAR _OaksLabText27 - db "@" - -OaksLabText11: -OaksLabText10: - TX_ASM - ld hl, OaksLabText_1d405 - call PrintText - jp TextScriptEnd - -OaksLabText_1d405: - TX_FAR _OaksLabText_1d405 - db "@" diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm deleted file mode 100755 index 5b2d2a35..00000000 --- a/scripts/pallettown.asm +++ /dev/null @@ -1,214 +0,0 @@ -PalletTownScript: - CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK - jr z, .next - SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS -.next - call EnableAutoTextBoxDrawing - ld hl, PalletTownScriptPointers - ld a, [wPalletTownCurScript] - jp CallFunctionInTable - -PalletTownScriptPointers: - dw PalletTownScript0 - dw PalletTownScript1 - dw PalletTownScript2 - dw PalletTownScript3 - dw PalletTownScript4 - dw PalletTownScript5 - dw PalletTownScript6 - -PalletTownScript0: - CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB - ret nz - ld a, [wYCoord] - cp 1 ; is player near north exit? - ret nz - xor a - ld [hJoyHeld], a - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld a, $FF - call PlaySound ; stop music - ld a, BANK(Music_MeetProfOak) - ld c, a - ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music - call PlayMusic - ld a, $FC - ld [wJoyIgnore], a - SetEvent EVENT_OAK_APPEARED_IN_PALLET - - ; trigger the next script - ld a, 1 - ld [wPalletTownCurScript], a - ret - -PalletTownScript1: - xor a - ld [wcf0d], a - ld a, 1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $FF - ld [wJoyIgnore], a - ld a, HS_PALLET_TOWN_OAK - ld [wMissableObjectIndex], a - predef ShowObject - - ; trigger the next script - ld a, 2 - ld [wPalletTownCurScript], a - ret - -PalletTownScript2: - ld a, 1 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - call Delay3 - ld a, 1 - ld [wYCoord], a - ld a, 1 - ld [hNPCPlayerRelativePosPerspective], a - ld a, 1 - swap a - ld [hNPCSpriteOffset], a - predef CalcPositionOfPlayerRelativeToNPC - ld hl, hNPCPlayerYDistance - dec [hl] - predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2 - ld de, wNPCMovementDirections2 - ld a, 1 ; oak - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $FF - ld [wJoyIgnore], a - - ; trigger the next script - ld a, 3 - ld [wPalletTownCurScript], a - ret - -PalletTownScript3: - ld a, [wd730] - bit 0, a - ret nz - xor a ; ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 9], a - ld a, 1 - ld [wcf0d], a - ld a, $FC - ld [wJoyIgnore], a - ld a, 1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID -; set up movement script that causes the player to follow Oak to his lab - ld a, $FF - ld [wJoyIgnore], a - ld a, 1 - ld [wSpriteIndex], a - xor a - ld [wNPCMovementScriptFunctionNum], a - ld a, 1 - ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] - ld [wNPCMovementScriptBank], a - - ; trigger the next script - ld a, 4 - ld [wPalletTownCurScript], a - ret - -PalletTownScript4: - ld a, [wNPCMovementScriptPointerTableNum] - and a ; is the movement script over? - ret nz - - ; trigger the next script - ld a, 5 - ld [wPalletTownCurScript], a - ret - -PalletTownScript5: - CheckEvent EVENT_DAISY_WALKING - jr nz, .next - CheckBothEventsSet EVENT_GOT_TOWN_MAP, EVENT_ENTERED_BLUES_HOUSE, 1 - jr nz, .next - SetEvent EVENT_DAISY_WALKING - ld a, HS_DAISY_SITTING - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_DAISY_WALKING - ld [wMissableObjectIndex], a - predef_jump ShowObject -.next - CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK - ret z - SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 -PalletTownScript6: - ret - -PalletTownTextPointers: - dw PalletTownText1 - dw PalletTownText2 - dw PalletTownText3 - dw PalletTownText4 - dw PalletTownText5 - dw PalletTownText6 - dw PalletTownText7 - -PalletTownText1: - TX_ASM - ld a, [wcf0d] - and a - jr nz, .next - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OakAppearsText - jr .done -.next - ld hl, OakWalksUpText -.done - call PrintText - jp TextScriptEnd - -OakAppearsText: - TX_FAR _OakAppearsText - TX_ASM - ld c, 10 - call DelayFrames - xor a - ld [wEmotionBubbleSpriteIndex], a ; player's sprite - ld [wWhichEmotionBubble], a ; EXCLAMATION_BUBBLE - predef EmotionBubble - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - jp TextScriptEnd - -OakWalksUpText: - TX_FAR _OakWalksUpText - db "@" - -PalletTownText2: ; girl - TX_FAR _PalletTownText2 - db "@" - -PalletTownText3: ; fat man - TX_FAR _PalletTownText3 - db "@" - -PalletTownText4: ; sign by lab - TX_FAR _PalletTownText4 - db "@" - -PalletTownText5: ; sign by fence - TX_FAR _PalletTownText5 - db "@" - -PalletTownText6: ; sign by Red’s house - TX_FAR _PalletTownText6 - db "@" - -PalletTownText7: ; sign by Blue’s house - TX_FAR _PalletTownText7 - db "@" diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm deleted file mode 100755 index 80acede8..00000000 --- a/scripts/pewtercity.asm +++ /dev/null @@ -1,322 +0,0 @@ -PewterCityScript: - call EnableAutoTextBoxDrawing - ld hl, PewterCityScriptPointers - ld a, [wPewterCityCurScript] - jp CallFunctionInTable - -PewterCityScriptPointers: - dw PewterCityScript0 - dw PewterCityScript1 - dw PewterCityScript2 - dw PewterCityScript3 - dw PewterCityScript4 - dw PewterCityScript5 - dw PewterCityScript6 - -PewterCityScript0: - xor a - ld [wMuseum1fCurScript], a - ResetEvent EVENT_BOUGHT_MUSEUM_TICKET - call PewterCityScript_1925e - ret - -PewterCityScript_1925e: - CheckEvent EVENT_BEAT_BROCK - ret nz - ld hl, CoordsData_19277 - call ArePlayerCoordsInArray - ret nc - ld a, $f0 - ld [wJoyIgnore], a - ld a, $5 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -CoordsData_19277: - db $11,$23 - db $11,$24 - db $12,$25 - db $13,$25 - db $ff - -PewterCityScript1: - ld a, [wNPCMovementScriptPointerTableNum] - and a - ret nz - ld a, $3 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, ($3 << 4) | SPRITE_FACING_UP - ld [hSpriteImageIndex], a - call SetSpriteImageIndexAfterSettingFacingDirection - call PlayDefaultMusic - ld hl, wFlags_0xcd60 - set 4, [hl] - ld a, $d - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $3c - ld [$ffeb], a - ld a, $30 - ld [$ffec], a - ld a, $c - ld [$ffed], a - ld a, $11 - ld [$ffee], a - ld a, $3 - ld [wSpriteIndex], a - call SetSpritePosition1 - ld a, $3 - ld [H_SPRITEINDEX], a - ld de, MovementData_PewterMuseumGuyExit - call MoveSprite - ld a, $2 - ld [wPewterCityCurScript], a - ret - -MovementData_PewterMuseumGuyExit: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -PewterCityScript2: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_MUSEUM_GUY - ld [wMissableObjectIndex], a - predef HideObject - ld a, $3 - ld [wPewterCityCurScript], a - ret - -PewterCityScript3: - ld a, $3 - ld [wSpriteIndex], a - call SetSpritePosition2 - ld a, HS_MUSEUM_GUY - ld [wMissableObjectIndex], a - predef ShowObject - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wPewterCityCurScript], a - ret - -PewterCityScript4: - ld a, [wNPCMovementScriptPointerTableNum] - and a - ret nz - ld a, $5 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, ($1 << 4) | SPRITE_FACING_LEFT - ld [hSpriteImageIndex], a - call SetSpriteImageIndexAfterSettingFacingDirection - call PlayDefaultMusic - ld hl, wFlags_0xcd60 - set 4, [hl] - ld a, $e - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $3c - ld [$ffeb], a - ld a, $40 - ld [$ffec], a - ld a, $16 - ld [$ffed], a - ld a, $10 - ld [$ffee], a - ld a, $5 - ld [wSpriteIndex], a - call SetSpritePosition1 - ld a, $5 - ld [H_SPRITEINDEX], a - ld de, MovementData_PewterGymGuyExit - call MoveSprite - ld a, $5 - ld [wPewterCityCurScript], a - ret - -MovementData_PewterGymGuyExit: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -PewterCityScript5: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_GYM_GUY - ld [wMissableObjectIndex], a - predef HideObject - ld a, $6 - ld [wPewterCityCurScript], a - ret - -PewterCityScript6: - ld a, $5 - ld [wSpriteIndex], a - call SetSpritePosition2 - ld a, HS_GYM_GUY - ld [wMissableObjectIndex], a - predef ShowObject - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wPewterCityCurScript], a - ret - -PewterCityTextPointers: - dw PewterCityText1 - dw PewterCityText2 - dw PewterCityText3 - dw PewterCityText4 - dw PewterCityText5 - dw PewterCityText6 - dw PewterCityText7 - dw MartSignText - dw PokeCenterSignText - dw PewterCityText10 - dw PewterCityText11 - dw PewterCityText12 - dw PewterCityText13 - dw PewterCityText14 - -PewterCityText1: - TX_FAR _PewterCityText1 - db "@" - -PewterCityText2: - TX_FAR _PewterCityText2 - db "@" - -PewterCityText3: - TX_ASM - ld hl, PewterCityText_193f1 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_193c9 - ld hl, PewterCityText_193f6 - call PrintText - jr .asm_193ee -.asm_193c9 - ld hl, PewterCityText_193fb - call PrintText - xor a - ld [hJoyPressed], a - ld [hJoyHeld], a - ld [wNPCMovementScriptFunctionNum], a - ld a, $2 - ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] - ld [wNPCMovementScriptBank], a - ld a, $3 - ld [wSpriteIndex], a - call GetSpritePosition2 - ld a, $1 - ld [wPewterCityCurScript], a -.asm_193ee - jp TextScriptEnd - -PewterCityText_193f1: - TX_FAR _PewterCityText_193f1 - db "@" - -PewterCityText_193f6: - TX_FAR _PewterCityText_193f6 - db "@" - -PewterCityText_193fb: - TX_FAR _PewterCityText_193fb - db "@" - -PewterCityText13: - TX_FAR _PewterCityText13 - db "@" - -PewterCityText4: - TX_ASM - ld hl, PewterCityText_19427 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - cp $0 - jr nz, .asm_1941e - ld hl, PewterCityText_1942c - call PrintText - jr .asm_19424 -.asm_1941e - ld hl, PewterCityText_19431 - call PrintText -.asm_19424 - jp TextScriptEnd - -PewterCityText_19427: - TX_FAR _PewterCityText_19427 - db "@" - -PewterCityText_1942c: - TX_FAR _PewterCityText_1942c - db "@" - -PewterCityText_19431: - TX_FAR _PewterCityText_19431 - db "@" - -PewterCityText5: - TX_ASM - ld hl, PewterCityText_1945d - call PrintText - xor a - ld [hJoyHeld], a - ld [wNPCMovementScriptFunctionNum], a - ld a, $3 - ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] - ld [wNPCMovementScriptBank], a - ld a, $5 - ld [wSpriteIndex], a - call GetSpritePosition2 - ld a, $4 - ld [wPewterCityCurScript], a - jp TextScriptEnd - -PewterCityText_1945d: - TX_FAR _PewterCityText_1945d - db "@" - -PewterCityText14: - TX_FAR _PewterCityText14 - db "@" - -PewterCityText6: - TX_FAR _PewterCityText6 - db "@" - -PewterCityText7: - TX_FAR _PewterCityText7 - db "@" - -PewterCityText10: - TX_FAR _PewterCityText10 - db "@" - -PewterCityText11: - TX_FAR _PewterCityText11 - db "@" - -PewterCityText12: - TX_FAR _PewterCityText12 - db "@" diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm deleted file mode 100755 index 2cfee6c0..00000000 --- a/scripts/pewtergym.asm +++ /dev/null @@ -1,228 +0,0 @@ -PewterGymScript: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - call nz, PewterGymScript_5c3a4 - call EnableAutoTextBoxDrawing - ld hl, PewterGymTrainerHeader0 - ld de, PewterGymScriptPointers - ld a, [wPewterGymCurScript] - call ExecuteCurMapScriptInTable - ld [wPewterGymCurScript], a - ret - -PewterGymScript_5c3a4: - ld hl, Gym1CityName - ld de, Gym1LeaderName - jp LoadGymLeaderAndCityName - -Gym1CityName: - db "PEWTER CITY@" - -Gym1LeaderName: - db "BROCK@" - -PewterGymScript_5c3bf: - xor a - ld [wJoyIgnore], a - ld [wPewterGymCurScript], a - ld [wCurMapScript], a - ret - -PewterGymScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw PewterGymScript3 - -PewterGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, PewterGymScript_5c3bf - ld a, $f0 - ld [wJoyIgnore], a - -PewterGymScript_5c3df: - ld a, $4 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_BROCK - lb bc, TM_34, 1 - call GiveItem - jr nc, .BagFull - ld a, $5 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM34 - jr .asm_5c408 -.BagFull - ld a, $6 - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_5c408 - ld hl, wObtainedBadges - set 0, [hl] - ld hl, wBeatGymFlags - set 0, [hl] - - ld a, HS_GYM_GUY - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_ROUTE_22_RIVAL_1 - ld [wMissableObjectIndex], a - predef HideObject - - ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - - ; deactivate gym trainers - SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0 - - jp PewterGymScript_5c3bf - -PewterGymTextPointers: - dw PewterGymText1 - dw PewterGymText2 - dw PewterGymText3 - dw PewterGymText4 - dw PewterGymText5 - dw PewterGymText6 - -PewterGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 - db ($5 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_PEWTER_GYM_TRAINER_0 - dw PewterGymBattleText1 ; TextBeforeBattle - dw PewterGymAfterBattleText1 ; TextAfterBattle - dw PewterGymEndBattleText1 ; TextEndBattle - dw PewterGymEndBattleText1 ; TextEndBattle - - db $ff - -PewterGymText1: - TX_ASM - CheckEvent EVENT_BEAT_BROCK - jr z, .asm_5c46a - CheckEventReuseA EVENT_GOT_TM34 - jr nz, .asm_5c462 - call z, PewterGymScript_5c3df - call DisableWaitingAfterTextDisplay - jr .asm_5c49b -.asm_5c462 - ld hl, PewterGymText_5c4a3 - call PrintText - jr .asm_5c49b -.asm_5c46a - ld hl, PewterGymText_5c49e - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, PewterGymText_5c4bc - ld de, PewterGymText_5c4bc - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $1 - ld [wGymLeaderNo], a - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wPewterGymCurScript], a - ld [wCurMapScript], a -.asm_5c49b - jp TextScriptEnd - -PewterGymText_5c49e: - TX_FAR _PewterGymText_5c49e - db "@" - -PewterGymText_5c4a3: - TX_FAR _PewterGymText_5c4a3 - db "@" - -PewterGymText4: - TX_FAR _TM34PreReceiveText - db "@" - -PewterGymText5: - TX_FAR _ReceivedTM34Text - TX_SFX_ITEM_1 - TX_FAR _TM34ExplanationText - db "@" - -PewterGymText6: - TX_FAR _TM34NoRoomText - db "@" - -PewterGymText_5c4bc: - TX_FAR _PewterGymText_5c4bc - TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded - TX_FAR _PewterGymText_5c4c1 - db "@" - -PewterGymText2: - TX_ASM - ld hl, PewterGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -PewterGymBattleText1: - TX_FAR _PewterGymBattleText1 - db "@" - -PewterGymEndBattleText1: - TX_FAR _PewterGymEndBattleText1 - db "@" - -PewterGymAfterBattleText1: - TX_FAR _PewterGymAfterBattleText1 - db "@" - -PewterGymText3: - TX_ASM - ld a, [wBeatGymFlags] - bit 0, a - jr nz, .asm_5c50c - ld hl, PewterGymText_5c515 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_5c4fe - ld hl, PewterGymText_5c51a - call PrintText - jr .asm_5c504 -.asm_5c4fe - ld hl, PewterGymText_5c524 - call PrintText -.asm_5c504 - ld hl, PewterGymText_5c51f - call PrintText - jr .asm_5c512 -.asm_5c50c - ld hl, PewterGymText_5c529 - call PrintText -.asm_5c512 - jp TextScriptEnd - -PewterGymText_5c515: - TX_FAR _PewterGymText_5c515 - db "@" - -PewterGymText_5c51a: - TX_FAR _PewterGymText_5c51a - db "@" - -PewterGymText_5c51f: - TX_FAR _PewterGymText_5c51f - db "@" - -PewterGymText_5c524: - TX_FAR _PewterGymText_5c524 - db "@" - -PewterGymText_5c529: - TX_FAR _PewterGymText_5c529 - db "@" diff --git a/scripts/pewterhouse1.asm b/scripts/pewterhouse1.asm deleted file mode 100755 index 8fa8dc3c..00000000 --- a/scripts/pewterhouse1.asm +++ /dev/null @@ -1,23 +0,0 @@ -PewterHouse1Script: - jp EnableAutoTextBoxDrawing - -PewterHouse1TextPointers: - dw PewterHouse1Text1 - dw PewterHouse1Text2 - dw PewterHouse1Text3 - -PewterHouse1Text1: - TX_FAR _PewterHouse1Text1 - TX_ASM - ld a, NIDORAN_M - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -PewterHouse1Text2: - TX_FAR _PewterHouse1Text2 - db "@" - -PewterHouse1Text3: - TX_FAR _PewterHouse1Text3 - db "@" diff --git a/scripts/pewterhouse2.asm b/scripts/pewterhouse2.asm deleted file mode 100755 index e3bbe01e..00000000 --- a/scripts/pewterhouse2.asm +++ /dev/null @@ -1,14 +0,0 @@ -PewterHouse2Script: - jp EnableAutoTextBoxDrawing - -PewterHouse2TextPointers: - dw PewterHouse2Text1 - dw PewterHouse2Text2 - -PewterHouse2Text1: - TX_FAR _PewterHouse2Text1 - db "@" - -PewterHouse2Text2: - TX_FAR _PewterHouse2Text2 - db "@" diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm deleted file mode 100755 index d5281704..00000000 --- a/scripts/pewtermart.asm +++ /dev/null @@ -1,28 +0,0 @@ -PewterMartScript: - call EnableAutoTextBoxDrawing - ld a, $1 - ld [wAutoTextBoxDrawingControl], a - ret - -PewterMartTextPointers: - dw PewterCashierText - dw PewterMartText2 - dw PewterMartText3 - -PewterMartText2: - TX_ASM - ld hl, .Text - call PrintText - jp TextScriptEnd -.Text - TX_FAR _PewterMartText2 - db "@" - -PewterMartText3: - TX_ASM - ld hl, .Text - call PrintText - jp TextScriptEnd -.Text - TX_FAR _PewterMartText3 - db "@" diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm deleted file mode 100755 index 4dd63559..00000000 --- a/scripts/pewterpokecenter.asm +++ /dev/null @@ -1,84 +0,0 @@ -PewterPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -PewterPokecenterTextPointers: - dw PewterHealNurseText - dw PewterPokecenterText2 - dw PewterJigglypuffText - dw PewterTradeNurseText - -PewterHealNurseText: - TX_POKECENTER_NURSE - -PewterPokecenterText2: - TX_FAR _PewterPokecenterText2 - db "@" - -PewterJigglypuffText: - TX_ASM - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, .Text - call PrintText - StopAllMusic - ld c, 32 - call DelayFrames - ld hl, JigglypuffFacingDirections - ld de, wJigglypuffFacingDirections - ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections - call CopyData - - ld a, [wSprite03StateData1ImageIndex] - ld hl, wJigglypuffFacingDirections -.findMatchingFacingDirectionLoop - cp [hl] - inc hl - jr nz, .findMatchingFacingDirectionLoop - dec hl - push hl - ld c, BANK(Music_JigglypuffSong) - ld a, MUSIC_JIGGLYPUFF_SONG - call PlayMusic - pop hl -.loop - ld a, [hl] - ld [wSprite03StateData1ImageIndex], a - -; rotate the array - push hl - ld hl, wJigglypuffFacingDirections - ld de, wJigglypuffFacingDirections - 1 - ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections - call CopyData - ld a, [wJigglypuffFacingDirections - 1] - ld [wJigglypuffFacingDirections + 3], a - pop hl - - ld c, 24 - call DelayFrames - - ld a, [wChannelSoundIDs] - ld b, a - ld a, [wChannelSoundIDs + Ch1] - or b - jr nz, .loop - - ld c, 48 - call DelayFrames - call PlayDefaultMusic - jp TextScriptEnd - -.Text - TX_FAR _PewterJigglypuffText - db "@" - -JigglypuffFacingDirections: - db $30 | SPRITE_FACING_DOWN - db $30 | SPRITE_FACING_LEFT - db $30 | SPRITE_FACING_UP - db $30 | SPRITE_FACING_RIGHT -JigglypuffFacingDirectionsEnd: - -PewterTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/pokemontower1.asm b/scripts/pokemontower1.asm deleted file mode 100755 index 6d9d1b3f..00000000 --- a/scripts/pokemontower1.asm +++ /dev/null @@ -1,29 +0,0 @@ -PokemonTower1Script: - jp EnableAutoTextBoxDrawing - -PokemonTower1TextPointers: - dw PokemonTower1Text1 - dw PokemonTower1Text2 - dw PokemonTower1Text3 - dw PokemonTower1Text4 - dw PokemonTower1Text5 - -PokemonTower1Text1: - TX_FAR _PokemonTower1Text1 - db "@" - -PokemonTower1Text2: - TX_FAR _PokemonTower1Text2 - db "@" - -PokemonTower1Text3: - TX_FAR _PokemonTower1Text3 - db "@" - -PokemonTower1Text4: - TX_FAR _PokemonTower1Text4 - db "@" - -PokemonTower1Text5: - TX_FAR _PokemonTower1Text5 - db "@" diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm deleted file mode 100755 index 383b175d..00000000 --- a/scripts/pokemontower2.asm +++ /dev/null @@ -1,188 +0,0 @@ -PokemonTower2Script: - call EnableAutoTextBoxDrawing - ld hl, PokemonTower2ScriptPointers - ld a, [wPokemonTower2CurScript] - jp CallFunctionInTable - -PokemonTower2Script_604fe: - xor a - ld [wJoyIgnore], a - ld [wPokemonTower2CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower2ScriptPointers: - dw PokemonTower2Script0 - dw PokemonTower2Script1 - dw PokemonTower2Script2 - -PokemonTower2Script0: - CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL - ret nz - ld hl, CoordsData_6055e - call ArePlayerCoordsInArray - ret nc - ld a, $ff - ld [wNewSoundID], a - call PlaySound - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT - ld a, [wCoordIndex] - cp $1 - ld a, PLAYER_DIR_UP - ld b, SPRITE_FACING_DOWN - jr nz, .asm_60544 -; the rival is on the left side and the player is on the right side - SetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT - ld a, PLAYER_DIR_LEFT - ld b, SPRITE_FACING_RIGHT -.asm_60544 - ld [wPlayerMovingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - ld a, b - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [hJoyHeld], a - ld [hJoyPressed], a - ret - -CoordsData_6055e: - db $05,$0F - db $06,$0E - db $0F ; isn't this supposed to end in $ff? - -PokemonTower2Script1: - ld a, [wIsInBattle] - cp $ff - jp z, PokemonTower2Script_604fe - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld de, MovementData_605b2 - CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT - jr nz, .asm_60589 - ld de, MovementData_605a9 -.asm_60589 - ld a, $1 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld a, $2 - ld [wPokemonTower2CurScript], a - ld [wCurMapScript], a - ret - -MovementData_605a9: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -MovementData_605b2: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -PokemonTower2Script2: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_POKEMONTOWER_2_RIVAL - ld [wMissableObjectIndex], a - predef HideObject - xor a - ld [wJoyIgnore], a - call PlayDefaultMusic - ld a, $0 - ld [wPokemonTower2CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower2TextPointers: - dw PokemonTower2Text1 - dw PokemonTower2Text2 - -PokemonTower2Text1: - TX_ASM - CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL - jr z, .asm_16f24 - ld hl, PokemonTower2Text_6063c - call PrintText - jr .asm_41852 -.asm_16f24 - ld hl, PokemonTower2Text_6062d - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, PokemonTower2Text_60632 - ld de, PokemonTower2Text_60637 - call SaveEndBattleTextPointers - ld a, OPP_SONY2 - ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotSquirtle - ld a, $4 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $5 - jr .done -.Charmander - ld a, $6 -.done - ld [wTrainerNo], a - - ld a, $1 - ld [wPokemonTower2CurScript], a - ld [wCurMapScript], a -.asm_41852 - jp TextScriptEnd - -PokemonTower2Text_6062d: - TX_FAR _PokemonTower2Text_6062d - db "@" - -PokemonTower2Text_60632: - TX_FAR _PokemonTower2Text_60632 - db "@" - -PokemonTower2Text_60637: - TX_FAR _PokemonTower2Text_60637 - db "@" - -PokemonTower2Text_6063c: - TX_FAR _PokemonTower2Text_6063c - db "@" - -PokemonTower2Text2: - TX_FAR _PokemonTower2Text2 - db "@" diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm deleted file mode 100755 index 6027b450..00000000 --- a/scripts/pokemontower3.asm +++ /dev/null @@ -1,101 +0,0 @@ -PokemonTower3Script: - call EnableAutoTextBoxDrawing - ld hl, PokemonTower3TrainerHeader0 - ld de, PokemonTower3ScriptPointers - ld a, [wPokemonTower3CurScript] - call ExecuteCurMapScriptInTable - ld [wPokemonTower3CurScript], a - ret - -PokemonTower3ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -PokemonTower3TextPointers: - dw PokemonTower3Text1 - dw PokemonTower3Text2 - dw PokemonTower3Text3 - dw PickUpItemText - -PokemonTower3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 - dw PokemonTower3BattleText1 ; TextBeforeBattle - dw PokemonTower3AfterBattleText1 ; TextAfterBattle - dw PokemonTower3EndBattleText1 ; TextEndBattle - dw PokemonTower3EndBattleText1 ; TextEndBattle - -PokemonTower3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 - dw PokemonTower3BattleText2 ; TextBeforeBattle - dw PokemonTower3AfterBattleText2 ; TextAfterBattle - dw PokemonTower3EndBattleText2 ; TextEndBattle - dw PokemonTower3EndBattleText2 ; TextEndBattle - -PokemonTower3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 - dw PokemonTower3BattleText3 ; TextBeforeBattle - dw PokemonTower3AfterBattleText3 ; TextAfterBattle - dw PokemonTower3EndBattleText3 ; TextEndBattle - dw PokemonTower3EndBattleText3 ; TextEndBattle - db $ff - -PokemonTower3Text1: - TX_ASM - ld hl, PokemonTower3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower3Text2: - TX_ASM - ld hl, PokemonTower3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower3Text3: - TX_ASM - ld hl, PokemonTower3TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower3BattleText1: - TX_FAR _PokemonTower3BattleText1 - db "@" - -PokemonTower3EndBattleText1: - TX_FAR _PokemonTower3EndBattleText1 - db "@" - -PokemonTower3AfterBattleText1: - TX_FAR _PokemonTower3AfterBattleText1 - db "@" - -PokemonTower3BattleText2: - TX_FAR _PokemonTower3BattleText2 - db "@" - -PokemonTower3EndBattleText2: - TX_FAR _PokemonTower3EndBattleText2 - db "@" - -PokemonTower3AfterBattleText2: - TX_FAR _PokemonTower3AfterBattleText2 - db "@" - -PokemonTower3BattleText3: - TX_FAR _PokemonTower3BattleText3 - db "@" - -PokemonTower3EndBattleText3: - TX_FAR _PokemonTower3EndBattleText3 - db "@" - -PokemonTower3AfterBattleText3: - TX_FAR _PokemonTower3AfterBattleText3 - db "@" diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm deleted file mode 100755 index a8307c01..00000000 --- a/scripts/pokemontower4.asm +++ /dev/null @@ -1,104 +0,0 @@ -PokemonTower4Script: - call EnableAutoTextBoxDrawing - ld hl, PokemonTower4TrainerHeader0 - ld de, PokemonTower4ScriptPointers - ld a, [wPokemonTower4CurScript] - call ExecuteCurMapScriptInTable - ld [wPokemonTower4CurScript], a - ret - -PokemonTower4ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -PokemonTower4TextPointers: - dw PokemonTower4Text1 - dw PokemonTower4Text2 - dw PokemonTower4Text3 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - -PokemonTower4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 - dw PokemonTower4BattleText1 ; TextBeforeBattle - dw PokemonTower4AfterBattleText1 ; TextAfterBattle - dw PokemonTower4EndBattleText1 ; TextEndBattle - dw PokemonTower4EndBattleText1 ; TextEndBattle - -PokemonTower4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 - dw PokemonTower4BattleText2 ; TextBeforeBattle - dw PokemonTower4AfterBattleText2 ; TextAfterBattle - dw PokemonTower4EndBattleText2 ; TextEndBattle - dw PokemonTower4EndBattleText2 ; TextEndBattle - -PokemonTower4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 - dw PokemonTower4BattleText3 ; TextBeforeBattle - dw PokemonTower4AfterBattleText3 ; TextAfterBattle - dw PokemonTower4EndBattleText3 ; TextEndBattle - dw PokemonTower4EndBattleText3 ; TextEndBattle - - db $ff - -PokemonTower4Text1: - TX_ASM - ld hl, PokemonTower4TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower4Text2: - TX_ASM - ld hl, PokemonTower4TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower4Text3: - TX_ASM - ld hl, PokemonTower4TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower4BattleText1: - TX_FAR _PokemonTower4BattleText1 - db "@" - -PokemonTower4EndBattleText1: - TX_FAR _PokemonTower4EndBattleText1 - db "@" - -PokemonTower4AfterBattleText1: - TX_FAR _PokemonTower4AfterBattleText1 - db "@" - -PokemonTower4BattleText2: - TX_FAR _PokemonTower4BattleText2 - db "@" - -PokemonTower4EndBattleText2: - TX_FAR _PokemonTower4EndBattleText2 - db "@" - -PokemonTower4AfterBattleText2: - TX_FAR _PokemonTower4AfterBattleText2 - db "@" - -PokemonTower4BattleText3: - TX_FAR _PokemonTower4BattleText3 - db "@" - -PokemonTower4EndBattleText3: - TX_FAR _PokemonTower4EndBattleText3 - db "@" - -PokemonTower4AfterBattleText3: - TX_FAR _PokemonTower4AfterBattleText3 - db "@" diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm deleted file mode 100755 index 9a13f286..00000000 --- a/scripts/pokemontower5.asm +++ /dev/null @@ -1,176 +0,0 @@ -PokemonTower5Script: - call EnableAutoTextBoxDrawing - ld hl, PokemonTower5TrainerHeader0 - ld de, PokemonTower5ScriptPointers - ld a, [wPokemonTower5CurScript] - call ExecuteCurMapScriptInTable - ld [wPokemonTower5CurScript], a - ret - -PokemonTower5ScriptPointers: - dw PokemonTower5Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -PokemonTower5Script0: - ld hl, CoordsData_60992 - call ArePlayerCoordsInArray - jr c, .asm_60960 - ld hl, wd72e - res 4, [hl] - ResetEvent EVENT_IN_PURIFIED_ZONE - jp CheckFightingMapTrainers -.asm_60960 - CheckAndSetEvent EVENT_IN_PURIFIED_ZONE - ret nz - xor a - ld [hJoyHeld], a - ld a, $f0 - ld [wJoyIgnore], a - ld hl, wd72e - set 4, [hl] - predef HealParty - call GBFadeOutToWhite - call Delay3 - call Delay3 - call GBFadeInFromWhite - ld a, $7 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wJoyIgnore], a - ret - -CoordsData_60992: - db $08,$0A - db $08,$0B - db $09,$0A - db $09,$0B - db $FF - -PokemonTower5TextPointers: - dw PokemonTower5Text1 - dw PokemonTower5Text2 - dw PokemonTower5Text3 - dw PokemonTower5Text4 - dw PokemonTower5Text5 - dw PickUpItemText - dw PokemonTower5Text7 - -PokemonTower5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 - dw PokemonTower5BattleText1 ; TextBeforeBattle - dw PokemonTower5AfterBattleText1 ; TextAfterBattle - dw PokemonTower5EndBattleText1 ; TextEndBattle - dw PokemonTower5EndBattleText1 ; TextEndBattle - -PokemonTower5TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 - dw PokemonTower5BattleText2 ; TextBeforeBattle - dw PokemonTower5AfterBattleText2 ; TextAfterBattle - dw PokemonTower5EndBattleText2 ; TextEndBattle - dw PokemonTower5EndBattleText2 ; TextEndBattle - -PokemonTower5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 - dw PokemonTower5BattleText3 ; TextBeforeBattle - dw PokemonTower5AfterBattleText3 ; TextAfterBattle - dw PokemonTower5EndBattleText3 ; TextEndBattle - dw PokemonTower5EndBattleText3 ; TextEndBattle - -PokemonTower5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 - dw PokemonTower5BattleText4 ; TextBeforeBattle - dw PokemonTower5AfterBattleText4 ; TextAfterBattle - dw PokemonTower5EndBattleText4 ; TextEndBattle - dw PokemonTower5EndBattleText4 ; TextEndBattle - - db $ff - -PokemonTower5Text1: - TX_FAR _PokemonTower5Text1 - db "@" - -PokemonTower5Text2: - TX_ASM - ld hl, PokemonTower5TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower5BattleText1: - TX_FAR _PokemonTower5BattleText1 - db "@" - -PokemonTower5EndBattleText1: - TX_FAR _PokemonTower5EndBattleText1 - db "@" - -PokemonTower5AfterBattleText1: - TX_FAR _PokemonTower5AfterBattleText1 - db "@" - -PokemonTower5Text3: - TX_ASM - ld hl, PokemonTower5TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower5BattleText2: - TX_FAR _PokemonTower5BattleText2 - db "@" - -PokemonTower5EndBattleText2: - TX_FAR _PokemonTower5EndBattleText2 - db "@" - -PokemonTower5AfterBattleText2: - TX_FAR _PokemonTower5AfterBattleText2 - db "@" - -PokemonTower5Text4: - TX_ASM - ld hl, PokemonTower5TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower5BattleText3: - TX_FAR _PokemonTower5BattleText3 - db "@" - -PokemonTower5EndBattleText3: - TX_FAR _PokemonTower5EndBattleText3 - db "@" - -PokemonTower5AfterBattleText3: - TX_FAR _PokemonTower5AfterBattleText3 - db "@" - -PokemonTower5Text5: - TX_ASM - ld hl, PokemonTower5TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower5BattleText4: - TX_FAR _PokemonTower5BattleText4 - db "@" - -PokemonTower5EndBattleText4: - TX_FAR _PokemonTower5EndBattleText4 - db "@" - -PokemonTower5AfterBattleText4: - TX_FAR _PokemonTower5AfterBattleText4 - db "@" - -PokemonTower5Text7: - TX_FAR _PokemonTower5Text7 - db "@" diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm deleted file mode 100755 index c3118f62..00000000 --- a/scripts/pokemontower6.asm +++ /dev/null @@ -1,212 +0,0 @@ -PokemonTower6Script: - call EnableAutoTextBoxDrawing - ld hl, PokemonTower6TrainerHeader0 - ld de, PokemonTower6ScriptPointers - ld a, [wPokemonTower6CurScript] - call ExecuteCurMapScriptInTable - ld [wPokemonTower6CurScript], a - ret - -PokemonTower6Script_60b02: - xor a - ld [wJoyIgnore], a - ld [wPokemonTower6CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower6ScriptPointers: - dw PokemonTower6Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw PokemonTower6Script3 - dw PokemonTower6Script4 - -PokemonTower6Script0: - CheckEvent EVENT_BEAT_GHOST_MAROWAK - jp nz, CheckFightingMapTrainers - ld hl, CoordsData_60b45 - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyHeld], a - ld a, $6 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, MAROWAK - ld [wCurOpponent], a - ld a, 30 - ld [wCurEnemyLVL], a - ld a, $4 - ld [wPokemonTower6CurScript], a - ld [wCurMapScript], a - ret - -CoordsData_60b45: - db $10,$0A,$FF - -PokemonTower6Script4: - ld a, [wIsInBattle] - cp $ff - jp z, PokemonTower6Script_60b02 - ld a, $ff - ld [wJoyIgnore], a - ld a, [wd72d] - bit 6, a - ret nz - call UpdateSprites - ld a, $f0 - ld [wJoyIgnore], a - ld a, [wBattleResult] - and a - jr nz, .asm_60b82 - SetEvent EVENT_BEAT_GHOST_MAROWAK - ld a, $7 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wPokemonTower6CurScript], a - ld [wCurMapScript], a - ret -.asm_60b82 - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, $10 - ld [wSimulatedJoypadStatesEnd], a - xor a - ld [wSpriteStateData2 + $06], a - ld [wOverrideSimulatedJoypadStatesMask], a - ld hl, wd730 - set 7, [hl] - ld a, $3 - ld [wPokemonTower6CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower6Script3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wPokemonTower6CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower6TextPointers: - dw PokemonTower6Text1 - dw PokemonTower6Text2 - dw PokemonTower6Text3 - dw PickUpItemText - dw PickUpItemText - dw PokemonTower6Text6 - dw PokemonTower6Text7 - -PokemonTower6TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 - dw PokemonTower6BattleText1 ; TextBeforeBattle - dw PokemonTower6AfterBattleText1 ; TextAfterBattle - dw PokemonTower6EndBattleText1 ; TextEndBattle - dw PokemonTower6EndBattleText1 ; TextEndBattle - -PokemonTower6TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 - dw PokemonTower6BattleText2 ; TextBeforeBattle - dw PokemonTower6AfterBattleText2 ; TextAfterBattle - dw PokemonTower6EndBattleText2 ; TextEndBattle - dw PokemonTower6EndBattleText2 ; TextEndBattle - -PokemonTower6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 - dw PokemonTower6BattleText3 ; TextBeforeBattle - dw PokemonTower6AfterBattleText3 ; TextAfterBattle - dw PokemonTower6EndBattleText3 ; TextEndBattle - dw PokemonTower6EndBattleText3 ; TextEndBattle - - db $ff - -PokemonTower6Text1: - TX_ASM - ld hl, PokemonTower6TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower6Text2: - TX_ASM - ld hl, PokemonTower6TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower6Text3: - TX_ASM - ld hl, PokemonTower6TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower6Text7: - TX_ASM - ld hl, PokemonTower2Text_60c1f - call PrintText - ld a, MAROWAK - call PlayCry - call WaitForSoundToFinish - ld c, 30 - call DelayFrames - ld hl, PokemonTower2Text_60c24 - call PrintText - jp TextScriptEnd - -PokemonTower2Text_60c1f: - TX_FAR _PokemonTower2Text_60c1f - db "@" - -PokemonTower2Text_60c24: - TX_FAR _PokemonTower2Text_60c24 - db "@" - -PokemonTower6BattleText1: - TX_FAR _PokemonTower6BattleText1 - db "@" - -PokemonTower6EndBattleText1: - TX_FAR _PokemonTower6EndBattleText1 - db "@" - -PokemonTower6AfterBattleText1: - TX_FAR _PokemonTower6AfterBattleText1 - db "@" - -PokemonTower6BattleText2: - TX_FAR _PokemonTower6BattleText2 - db "@" - -PokemonTower6EndBattleText2: - TX_FAR _PokemonTower6EndBattleText2 - db "@" - -PokemonTower6AfterBattleText2: - TX_FAR _PokemonTower6AfterBattleText2 - db "@" - -PokemonTower6BattleText3: - TX_FAR _PokemonTower6BattleText3 - db "@" - -PokemonTower6EndBattleText3: - TX_FAR _PokemonTower6EndBattleText3 - db "@" - -PokemonTower6AfterBattleText3: - TX_FAR _PokemonTower6AfterBattleText3 - db "@" - -PokemonTower6Text6: - TX_FAR _PokemonTower6Text6 - db "@" diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm deleted file mode 100755 index 88c62c53..00000000 --- a/scripts/pokemontower7.asm +++ /dev/null @@ -1,312 +0,0 @@ -PokemonTower7Script: - call EnableAutoTextBoxDrawing - ld hl, PokemonTower7TrainerHeader0 - ld de, PokemonTower7ScriptPointers - ld a, [wPokemonTower7CurScript] - call ExecuteCurMapScriptInTable - ld [wPokemonTower7CurScript], a - ret - -PokemonTower7Script_60d18: - xor a - ld [wJoyIgnore], a - ld [wPokemonTower7CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower7ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw PokemonTower7Script2 - dw PokemonTower7Script3 - dw PokemonTower7Script4 - -PokemonTower7Script2: - ld hl, wFlags_0xcd60 - res 0, [hl] - ld a, [wIsInBattle] - cp $ff - jp z, PokemonTower7Script_60d18 - call EndTrainerBattle - ld a, $f0 - ld [wJoyIgnore], a - ld a, [wSpriteIndex] - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call PokemonTower7Script_60db6 - ld a, $3 - ld [wPokemonTower7CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower7Script3: - ld a, [wd730] - bit 0, a - ret nz - ld hl, wMissableObjectList - ld a, [wSpriteIndex] - ld b, a -.missableObjectsListLoop - ld a, [hli] - cp b ; search for sprite ID in missing objects list - ld a, [hli] - jr nz, .missableObjectsListLoop - ld [wMissableObjectIndex], a ; remove missable object - predef HideObject - xor a - ld [wJoyIgnore], a - ld [wSpriteIndex], a - ld [wTrainerHeaderFlagBit], a - ld [wUnusedDA38], a - ld a, $0 - ld [wPokemonTower7CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower7Script4: - ld a, $ff - ld [wJoyIgnore], a - ld a, HS_POKEMONTOWER_7_MR_FUJI - ld [wMissableObjectIndex], a - predef HideObject - ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 9], a - ld a, LAVENDER_HOUSE_1 - ld [hWarpDestinationMap], a - ld a, $1 - ld [wDestinationWarpID], a - ld a, LAVENDER_TOWN - ld [wLastMap], a - ld hl, wd72d - set 3, [hl] - ld a, $0 - ld [wPokemonTower7CurScript], a - ld [wCurMapScript], a - ret - -PokemonTower7Script_60db6: - ld hl, CoordsData_60de3 - ld a, [wSpriteIndex] - dec a - swap a - ld d, $0 - ld e, a - add hl, de - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a -.asm_60dcb - ld a, [hli] - cp b - jr nz, .asm_60dde - ld a, [hli] - cp c - jr nz, .asm_60ddf - ld a, [hli] - ld d, [hl] - ld e, a - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - jp MoveSprite -.asm_60dde - inc hl -.asm_60ddf - inc hl - inc hl - jr .asm_60dcb - -CoordsData_60de3: - db $0C,$09 - dw MovementData_60e13 - db $0B,$0A - dw MovementData_60e1b - db $0B,$0B - dw MovementData_60e22 - db $0B,$0C - dw MovementData_60e22 - db $0A,$0C - dw MovementData_60e28 - db $09,$0B - dw MovementData_60e30 - db $09,$0A - dw MovementData_60e22 - db $09,$09 - dw MovementData_60e22 - db $08,$09 - dw MovementData_60e37 - db $07,$0A - dw MovementData_60e22 - db $07,$0B - dw MovementData_60e22 - db $07,$0C - dw MovementData_60e22 - -MovementData_60e13: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_LEFT - db $FF - -MovementData_60e1b: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -MovementData_60e22: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -MovementData_60e28: - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -MovementData_60e30: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -MovementData_60e37: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -PokemonTower7TextPointers: - dw PokemonTower7Text1 - dw PokemonTower7Text2 - dw PokemonTower7Text3 - dw PokemonTower7FujiText - -PokemonTower7TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 - dw PokemonTower7BattleText1 ; TextBeforeBattle - dw PokemonTower7AfterBattleText1 ; TextAfterBattle - dw PokemonTower7EndBattleText1 ; TextEndBattle - dw PokemonTower7EndBattleText1 ; TextEndBattle - -PokemonTower7TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 - dw PokemonTower7BattleText2 ; TextBeforeBattle - dw PokemonTower7AfterBattleText2 ; TextAfterBattle - dw PokemonTower7EndBattleText2 ; TextEndBattle - dw PokemonTower7EndBattleText2 ; TextEndBattle - -PokemonTower7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 - dw PokemonTower7BattleText3 ; TextBeforeBattle - dw PokemonTower7AfterBattleText3 ; TextAfterBattle - dw PokemonTower7EndBattleText3 ; TextEndBattle - dw PokemonTower7EndBattleText3 ; TextEndBattle - - db $ff - -PokemonTower7Text1: - TX_ASM - ld hl, PokemonTower7TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower7Text2: - TX_ASM - ld hl, PokemonTower7TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower7Text3: - TX_ASM - ld hl, PokemonTower7TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -PokemonTower7FujiText: - TX_ASM - ld hl, TowerRescueFujiText - call PrintText - SetEvent EVENT_RESCUED_MR_FUJI - SetEvent EVENT_RESCUED_MR_FUJI_2 - ld a, HS_LAVENDER_HOUSE_1_MR_FUJI - ld [wMissableObjectIndex], a - predef ShowObject - ld a, HS_SAFFRON_CITY_E - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_SAFFRON_CITY_F - ld [wMissableObjectIndex], a - predef ShowObject - ld a, $4 - ld [wPokemonTower7CurScript], a - ld [wCurMapScript], a - jp TextScriptEnd - -TowerRescueFujiText: - TX_FAR _TowerRescueFujiText - db "@" - -PokemonTower7BattleText1: - TX_FAR _PokemonTower7BattleText1 - db "@" - -PokemonTower7EndBattleText1: - TX_FAR _PokemonTower7EndBattleText1 - db "@" - -PokemonTower7AfterBattleText1: - TX_FAR _PokemonTower7AfterBattleText1 - db "@" - -PokemonTower7BattleText2: - TX_FAR _PokemonTower7BattleText2 - db "@" - -PokemonTower7EndBattleText2: - TX_FAR _PokemonTower7EndBattleText2 - db "@" - -PokemonTower7AfterBattleText2: - TX_FAR _PokemonTower7AfterBattleText2 - db "@" - -PokemonTower7BattleText3: - TX_FAR _PokemonTower7BattleText3 - db "@" - -PokemonTower7EndBattleText3: - TX_FAR _PokemonTower7EndBattleText3 - db "@" - -PokemonTower7AfterBattleText3: - TX_FAR _PokemonTower7AfterBattleText3 - db "@" diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm deleted file mode 100755 index 5391585d..00000000 --- a/scripts/powerplant.asm +++ /dev/null @@ -1,175 +0,0 @@ -PowerPlantScript: - call EnableAutoTextBoxDrawing - ld hl, Voltorb0TrainerHeader - ld de, .ScriptPointers - ld a, [wPowerPlantCurScript] - call ExecuteCurMapScriptInTable - ld [wPowerPlantCurScript], a - ret - -.ScriptPointers - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -PowerPlantTextPointers: - dw Voltorb0Text - dw Voltorb1Text - dw Voltorb2Text - dw Voltorb3Text - dw Voltorb4Text - dw Voltorb5Text - dw Voltorb6Text - dw Voltorb7Text - dw ZapdosText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - -Voltorb0TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb1TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb2TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb3TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb4TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb5TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb6TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -Voltorb7TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - -ZapdosTrainerHeader: - dbEventFlagBit EVENT_BEAT_ZAPDOS, 1 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1 - dw ZapdosBattleText ; TextBeforeBattle - dw ZapdosBattleText ; TextAfterBattle - dw ZapdosBattleText ; TextEndBattle - dw ZapdosBattleText ; TextEndBattle - - db $ff - -InitVoltorbBattle: - call TalkToTrainer - ld a, [wCurMapScript] - ld [wPowerPlantCurScript], a - jp TextScriptEnd - -Voltorb0Text: - TX_ASM - ld hl, Voltorb0TrainerHeader - jr InitVoltorbBattle - -Voltorb1Text: - TX_ASM - ld hl, Voltorb1TrainerHeader - jr InitVoltorbBattle - -Voltorb2Text: - TX_ASM - ld hl, Voltorb2TrainerHeader - jr InitVoltorbBattle - -Voltorb3Text: - TX_ASM - ld hl, Voltorb3TrainerHeader - jr InitVoltorbBattle - -Voltorb4Text: - TX_ASM - ld hl, Voltorb4TrainerHeader - jr InitVoltorbBattle - -Voltorb5Text: - TX_ASM - ld hl, Voltorb5TrainerHeader - jr InitVoltorbBattle - -Voltorb6Text: - TX_ASM - ld hl, Voltorb6TrainerHeader - jr InitVoltorbBattle - -Voltorb7Text: - TX_ASM - ld hl, Voltorb7TrainerHeader - jr InitVoltorbBattle - -ZapdosText: - TX_ASM - ld hl, ZapdosTrainerHeader - jr InitVoltorbBattle - -VoltorbBattleText: - TX_FAR _VoltorbBattleText - db "@" - -ZapdosBattleText: - TX_FAR _ZapdosBattleText - TX_ASM - ld a, ZAPDOS - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm deleted file mode 100755 index 59323b8e..00000000 --- a/scripts/redshouse1f.asm +++ /dev/null @@ -1,69 +0,0 @@ -RedsHouse1FScript: - jp EnableAutoTextBoxDrawing - -RedsHouse1FTextPointers: - dw RedsHouse1FText1 - dw RedsHouse1FText2 - -RedsHouse1FText1: ; Mom - TX_ASM - ld a, [wd72e] - bit 3, a - jr nz, .heal ; if player has received a Pokémon from Oak, heal team - ld hl, MomWakeUpText - call PrintText - jr .done -.heal - call MomHealPokemon -.done - jp TextScriptEnd - -MomWakeUpText: - TX_FAR _MomWakeUpText - db "@" - -MomHealPokemon: - ld hl, MomHealText1 - call PrintText - call GBFadeOutToWhite - call ReloadMapData - predef HealParty - ld a, MUSIC_PKMN_HEALED - ld [wNewSoundID], a - call PlaySound -.next - ld a, [wChannelSoundIDs] - cp MUSIC_PKMN_HEALED - jr z, .next - ld a, [wMapMusicSoundID] - ld [wNewSoundID], a - call PlaySound - call GBFadeInFromWhite - ld hl, MomHealText2 - jp PrintText - -MomHealText1: - TX_FAR _MomHealText1 - db "@" -MomHealText2: - TX_FAR _MomHealText2 - db "@" - -RedsHouse1FText2: ; TV - TX_ASM - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ld hl, TVWrongSideText - jr nz, .notUp - ld hl, StandByMeText -.notUp - call PrintText - jp TextScriptEnd - -StandByMeText: - TX_FAR _StandByMeText - db "@" - -TVWrongSideText: - TX_FAR _TVWrongSideText - db "@" diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm deleted file mode 100755 index 0ec59077..00000000 --- a/scripts/redshouse2f.asm +++ /dev/null @@ -1,24 +0,0 @@ -RedsHouse2FScript: - call EnableAutoTextBoxDrawing - ld hl, RedsHouse2FScriptPointers - ld a, [wRedsHouse2CurScript] - jp CallFunctionInTable - -RedsHouse2FScriptPointers: - dw RedsHouse2FScript0 - dw RedsHouse2FScript1 - -RedsHouse2FScript0: - xor a - ld [hJoyHeld], a - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - ld a, 1 - ld [wRedsHouse2CurScript], a - ret - -RedsHouse2FScript1: - ret - -RedsHouse2FTextPointers: - db "@" diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm deleted file mode 100755 index 88b3a7e9..00000000 --- a/scripts/rockethideout1.asm +++ /dev/null @@ -1,189 +0,0 @@ -RocketHideout1Script: - call RocketHideout1Script_44be0 - call EnableAutoTextBoxDrawing - ld hl, RocketHideout1TrainerHeader0 - ld de, RocketHideout1ScriptPointers - ld a, [wRocketHideout1CurScript] - call ExecuteCurMapScriptInTable - ld [wRocketHideout1CurScript], a - ret - -RocketHideout1Script_44be0: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_677 - jr nz, .asm_44c01 - CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - jr nz, .asm_44bf7 - ld a, $54 - jr .asm_44c03 -.asm_44bf7 - ld a, SFX_GO_INSIDE - call PlaySound - CheckEventHL EVENT_677 -.asm_44c01 - ld a, $e -.asm_44c03 - ld [wNewTileBlockID], a - lb bc, 8, 12 - predef_jump ReplaceTileBlock - -RocketHideout1ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -RocketHideout1TextPointers: - dw RocketHideout1Text1 - dw RocketHideout1Text2 - dw RocketHideout1Text3 - dw RocketHideout1Text4 - dw RocketHideout1Text5 - dw PickUpItemText - dw PickUpItemText - -RocketHideout1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 - dw RocketHideout1BattleText2 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout1EndBattleText2 ; TextEndBattle - dw RocketHideout1EndBattleText2 ; TextEndBattle - -RocketHideout1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 - dw RocketHideout1BattleText3 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle - dw RocketHideout1EndBattleText3 ; TextEndBattle - dw RocketHideout1EndBattleText3 ; TextEndBattle - -RocketHideout1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 - dw RocketHideout1BattleText4 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle - dw RocketHideout1EndBattleText4 ; TextEndBattle - dw RocketHideout1EndBattleText4 ; TextEndBattle - -RocketHideout1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 - dw RocketHideout1BattleText5 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle - dw RocketHideout1EndBattleText5 ; TextEndBattle - dw RocketHideout1EndBattleText5 ; TextEndBattle - -RocketHideout1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - dw RocketHideout1BattleText6 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle - dw RocketHideout1EndBattleText6 ; TextEndBattle - dw RocketHideout1EndBattleText6 ; TextEndBattle - - db $ff - -RocketHideout1Text1: - TX_ASM - ld hl, RocketHideout1TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout1Text2: - TX_ASM - ld hl, RocketHideout1TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout1Text3: - TX_ASM - ld hl, RocketHideout1TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout1Text4: - TX_ASM - ld hl, RocketHideout1TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout1Text5: - TX_ASM - ld hl, RocketHideout1TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout1EndBattleText6: - TX_FAR _RocketHideout1EndBattleText6 - TX_ASM - SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - ld hl, RocketHideout1Text_44c9f - ret - -RocketHideout1Text_44c9f: - TX_BLINK - db "@" - -RocketHideout1BattleText2: - TX_FAR _RocketHideout1BattleText2 - db "@" - -RocketHideout1EndBattleText2: - TX_FAR _RocketHideout1EndBattleText2 - db "@" - -RocketHideout1AfterBattleTxt2: - TX_FAR _RocketHideout1AfterBattleTxt2 - db "@" - -RocketHideout1BattleText3: - TX_FAR _RocketHideout1BattleText3 - db "@" - -RocketHideout1EndBattleText3: - TX_FAR _RocketHideout1EndBattleText3 - db "@" - -RocketHideout1AfterBattleTxt3: - TX_FAR _RocketHideout1AfterBattleTxt3 - db "@" - -RocketHideout1BattleText4: - TX_FAR _RocketHideout1BattleText4 - db "@" - -RocketHideout1EndBattleText4: - TX_FAR _RocketHideout1EndBattleText4 - db "@" - -RocketHideout1AfterBattleTxt4: - TX_FAR _RocketHideout1AfterBattleTxt4 - db "@" - -RocketHideout1BattleText5: - TX_FAR _RocketHideout1BattleText5 - db "@" - -RocketHideout1EndBattleText5: - TX_FAR _RocketHideout1EndBattleText5 - db "@" - -RocketHideout1AfterBattleTxt5: - TX_FAR _RocketHideout1AfterBattleTxt5 - db "@" - -RocketHideout1BattleText6: - TX_FAR _RocketHideout1BattleText6 - db "@" - -RocketHideout1AfterBattleTxt6: - TX_FAR _RocketHideout1AfterBattleTxt6 - db "@" diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm deleted file mode 100755 index c5f026d5..00000000 --- a/scripts/rockethideout2.asm +++ /dev/null @@ -1,450 +0,0 @@ -RocketHideout2Script: - call EnableAutoTextBoxDrawing - ld hl, RocketHideout2TrainerHeader0 - ld de, RocketHideout2ScriptPointers - ld a, [wRocketHideout2CurScript] - call ExecuteCurMapScriptInTable - ld [wRocketHideout2CurScript], a - ret - -RocketHideout2ScriptPointers: - dw RocketHideout2Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout2Script3 - -RocketHideout2Script0: - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a - ld hl, RocketHideout2ArrowTilePlayerMovement - call DecodeArrowMovementRLE - cp $ff - jp z, CheckFightingMapTrainers - ld hl, wd736 - set 7, [hl] - call StartSimulatingJoypadStates - ld a, SFX_ARROW_TILES - call PlaySound - ld a, $ff - ld [wJoyIgnore], a - ld a, $3 - ld [wCurMapScript], a - ret - -;format: -;db y,x -;dw pointer to movement -RocketHideout2ArrowTilePlayerMovement: - db $9,$4 - dw RocketHideout2ArrowMovement1 - db $b,$4 - dw RocketHideout2ArrowMovement2 - db $f,$4 - dw RocketHideout2ArrowMovement3 - db $10,$4 - dw RocketHideout2ArrowMovement4 - db $13,$4 - dw RocketHideout2ArrowMovement1 - db $16,$4 - dw RocketHideout2ArrowMovement5 - db $e,$5 - dw RocketHideout2ArrowMovement6 - db $16,$6 - dw RocketHideout2ArrowMovement7 - db $18,$6 - dw RocketHideout2ArrowMovement8 - db $9,$8 - dw RocketHideout2ArrowMovement9 - db $c,$8 - dw RocketHideout2ArrowMovement10 - db $f,$8 - dw RocketHideout2ArrowMovement8 - db $13,$8 - dw RocketHideout2ArrowMovement9 - db $17,$8 - dw RocketHideout2ArrowMovement11 - db $e,$9 - dw RocketHideout2ArrowMovement12 - db $16,$9 - dw RocketHideout2ArrowMovement12 - db $9,$a - dw RocketHideout2ArrowMovement13 - db $a,$a - dw RocketHideout2ArrowMovement14 - db $f,$a - dw RocketHideout2ArrowMovement15 - db $11,$a - dw RocketHideout2ArrowMovement16 - db $13,$a - dw RocketHideout2ArrowMovement17 - db $19,$a - dw RocketHideout2ArrowMovement2 - db $e,$b - dw RocketHideout2ArrowMovement18 - db $10,$b - dw RocketHideout2ArrowMovement19 - db $12,$b - dw RocketHideout2ArrowMovement12 - db $9,$c - dw RocketHideout2ArrowMovement20 - db $b,$c - dw RocketHideout2ArrowMovement21 - db $d,$c - dw RocketHideout2ArrowMovement22 - db $11,$c - dw RocketHideout2ArrowMovement23 - db $a,$d - dw RocketHideout2ArrowMovement24 - db $c,$d - dw RocketHideout2ArrowMovement25 - db $10,$d - dw RocketHideout2ArrowMovement26 - db $12,$d - dw RocketHideout2ArrowMovement27 - db $13,$d - dw RocketHideout2ArrowMovement28 - db $16,$d - dw RocketHideout2ArrowMovement29 - db $17,$d - dw RocketHideout2ArrowMovement30 - db $11,$e - dw RocketHideout2ArrowMovement31 - db $10,$f - dw RocketHideout2ArrowMovement12 - db $e,$10 - dw RocketHideout2ArrowMovement32 - db $10,$10 - dw RocketHideout2ArrowMovement33 - db $12,$10 - dw RocketHideout2ArrowMovement34 - db $a,$11 - dw RocketHideout2ArrowMovement35 - db $b,$11 - dw RocketHideout2ArrowMovement36 - db $FF - -;format: direction, count -;each list is read starting from the $FF and working backwards -RocketHideout2ArrowMovement1: - db D_LEFT,$02 - db $FF - -RocketHideout2ArrowMovement2: - db D_RIGHT,$04 - db $FF - -RocketHideout2ArrowMovement3: - db D_UP,$04 - db D_RIGHT,$04 - db $FF - -RocketHideout2ArrowMovement4: - db D_UP,$04 - db D_RIGHT,$04 - db D_UP,$01 - db $FF - -RocketHideout2ArrowMovement5: - db D_LEFT,$02 - db D_UP,$03 - db $FF - -RocketHideout2ArrowMovement6: - db D_DOWN,$02 - db D_RIGHT,$04 - db $FF - -RocketHideout2ArrowMovement7: - db D_UP,$02 - db $FF - -RocketHideout2ArrowMovement8: - db D_UP,$04 - db $FF - -RocketHideout2ArrowMovement9: - db D_LEFT,$06 - db $FF - -RocketHideout2ArrowMovement10: - db D_UP,$01 - db $FF - -RocketHideout2ArrowMovement11: - db D_LEFT,$06 - db D_UP,$04 - db $FF - -RocketHideout2ArrowMovement12: - db D_DOWN,$02 - db $FF - -RocketHideout2ArrowMovement13: - db D_LEFT,$08 - db $FF - -RocketHideout2ArrowMovement14: - db D_LEFT,$08 - db D_UP,$01 - db $FF - -RocketHideout2ArrowMovement15: - db D_LEFT,$08 - db D_UP,$06 - db $FF - -RocketHideout2ArrowMovement16: - db D_UP,$02 - db D_RIGHT,$04 - db $FF - -RocketHideout2ArrowMovement17: - db D_UP,$02 - db D_RIGHT,$04 - db D_UP,$02 - db $FF - -RocketHideout2ArrowMovement18: - db D_DOWN,$02 - db D_RIGHT,$04 - db D_DOWN,$02 - db $FF - -RocketHideout2ArrowMovement19: - db D_DOWN,$02 - db D_RIGHT,$04 - db $FF - -RocketHideout2ArrowMovement20: - db D_LEFT,$0A - db $FF - -RocketHideout2ArrowMovement21: - db D_LEFT,$0A - db D_UP,$02 - db $FF - -RocketHideout2ArrowMovement22: - db D_LEFT,$0A - db D_UP,$04 - db $FF - -RocketHideout2ArrowMovement23: - db D_UP,$02 - db D_RIGHT,$02 - db $FF - -RocketHideout2ArrowMovement24: - db D_RIGHT,$01 - db D_DOWN,$02 - db $FF - -RocketHideout2ArrowMovement25: - db D_RIGHT,$01 - db $FF - -RocketHideout2ArrowMovement26: - db D_DOWN,$02 - db D_RIGHT,$02 - db $FF - -RocketHideout2ArrowMovement27: - db D_DOWN,$02 - db D_LEFT,$02 - db $FF - -RocketHideout2ArrowMovement28: - db D_UP,$02 - db D_RIGHT,$04 - db D_UP,$02 - db D_LEFT,$03 - db $FF - -RocketHideout2ArrowMovement29: - db D_DOWN,$02 - db D_LEFT,$04 - db $FF - -RocketHideout2ArrowMovement30: - db D_LEFT,$06 - db D_UP,$04 - db D_LEFT,$05 - db $FF - -RocketHideout2ArrowMovement31: - db D_UP,$02 - db $FF - -RocketHideout2ArrowMovement32: - db D_UP,$01 - db $FF - -RocketHideout2ArrowMovement33: - db D_UP,$03 - db $FF - -RocketHideout2ArrowMovement34: - db D_UP,$05 - db $FF - -RocketHideout2ArrowMovement35: - db D_RIGHT,$01 - db D_DOWN,$02 - db D_LEFT,$04 - db $FF - -RocketHideout2ArrowMovement36: - db D_LEFT,$0A - db D_UP,$02 - db D_LEFT,$05 - db $FF - -RocketHideout2Script3: - ld a, [wSimulatedJoypadStatesIndex] - and a - jr nz, LoadSpinnerArrowTiles - xor a - ld [wJoyIgnore], a - ld hl, wd736 - res 7, [hl] - ld a, $0 - ld [wCurMapScript], a - ret - -LoadSpinnerArrowTiles: - ld a, [wSpriteStateData1 + 2] - srl a - srl a - ld hl, SpinnerPlayerFacingDirections - ld c, a - ld b, $0 - add hl, bc - ld a, [hl] - ld [wSpriteStateData1 + 2], a - ld a, [wCurMapTileset] - cp FACILITY - ld hl, FacilitySpinnerArrows - jr z, .asm_44ff6 - ld hl, GymSpinnerArrows -.asm_44ff6 - ld a, [wSimulatedJoypadStatesIndex] - bit 0, a - jr nz, .asm_45001 - ld de, $18 - add hl, de -.asm_45001 - ld a, $4 - ld bc, $0 -.asm_45006 - push af - push hl - push bc - add hl, bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld a, [hli] - ld h, [hl] - ld l, a - call CopyVideoData - pop bc - ld a, $6 - add c - ld c, a - pop hl - pop af - dec a - jr nz, .asm_45006 - ret - -spinner: MACRO -; \1: source -; \2: offset (BANK() chokes on literals) -; \3: length -; \4: dest - dw \1 + \2 - db \3, BANK(\1) - dw \4 -ENDM - -FacilitySpinnerArrows: -FACILITY_SPINNER EQU $20 * $10 -vFacilitySpinner EQU vTileset + FACILITY_SPINNER - - spinner SpinnerArrowAnimTiles, $00, 1, vFacilitySpinner - spinner SpinnerArrowAnimTiles, $10, 1, vFacilitySpinner + $10 - spinner SpinnerArrowAnimTiles, $20, 1, vFacilitySpinner + $100 - spinner SpinnerArrowAnimTiles, $30, 1, vFacilitySpinner + $110 - spinner Facility_GFX, FACILITY_SPINNER + $000, 1, vFacilitySpinner - spinner Facility_GFX, FACILITY_SPINNER + $010, 1, vFacilitySpinner + $10 - spinner Facility_GFX, FACILITY_SPINNER + $100, 1, vFacilitySpinner + $100 - spinner Facility_GFX, FACILITY_SPINNER + $110, 1, vFacilitySpinner + $110 - -GymSpinnerArrows: -GYM_SPINNER EQU $3c * $10 -vGymSpinner EQU vTileset + GYM_SPINNER - - spinner SpinnerArrowAnimTiles, $10, 1, vGymSpinner - spinner SpinnerArrowAnimTiles, $30, 1, vGymSpinner + $10 - spinner SpinnerArrowAnimTiles, $00, 1, vGymSpinner + $100 - spinner SpinnerArrowAnimTiles, $20, 1, vGymSpinner + $110 - spinner Gym_GFX, GYM_SPINNER + $000, 1, vGymSpinner - spinner Gym_GFX, GYM_SPINNER + $010, 1, vGymSpinner + $10 - spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100 - spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110 - -SpinnerPlayerFacingDirections: -; This isn't the order of the facing directions. Rather, it's a list of -; the facing directions that come next. For example, when the player is -; facing down (00), the next facing direction is left (08). - db $08 ; down -> left - db $0C ; up -> right - db $04 ; left -> up - db $00 ; right -> down - -; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ -SpinnerArrowAnimTiles: - INCBIN "gfx/spinner_arrow.2bpp" - -RocketHideout2TextPointers: - dw RocketHideout2Text1 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - -RocketHideout2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 - dw RocketHideout2BattleText2 ; TextBeforeBattle - dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout2EndBattleText2 ; TextEndBattle - dw RocketHideout2EndBattleText2 ; TextEndBattle - - db $ff - -RocketHideout2Text1: - TX_ASM - ld hl, RocketHideout2TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout2BattleText2: - TX_FAR _RocketHideout2BattleText2 - db "@" - -RocketHideout2EndBattleText2: - TX_FAR _RocketHideout2EndBattleText2 - db "@" - -RocketHideout2AfterBattleTxt2: - TX_FAR _RocketHideout2AfterBattleTxt2 - db "@" diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm deleted file mode 100755 index 00a61568..00000000 --- a/scripts/rockethideout3.asm +++ /dev/null @@ -1,206 +0,0 @@ -RocketHideout3Script: - call EnableAutoTextBoxDrawing - ld hl, RocketHideout3TrainerHeader0 - ld de, RocketHideout3ScriptPointers - ld a, [wRocketHideout3CurScript] - call ExecuteCurMapScriptInTable - ld [wRocketHideout3CurScript], a - ret - -RocketHideout3ScriptPointers: - dw RocketHideout3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout3Script3 - -RocketHideout3Script0: - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a - ld hl, RocketHideout3ArrowTilePlayerMovement - call DecodeArrowMovementRLE - cp $ff - jp z, CheckFightingMapTrainers - ld hl, wd736 - set 7, [hl] - call StartSimulatingJoypadStates - ld a, SFX_ARROW_TILES - call PlaySound - ld a, $ff - ld [wJoyIgnore], a - ld a, $3 - ld [wCurMapScript], a - ret - -;format: -;db y,x -;dw pointer to movement -RocketHideout3ArrowTilePlayerMovement: - db $d,$a - dw RocketHideout3ArrowMovement6 - db $13,$a - dw RocketHideout3ArrowMovement1 - db $12,$b - dw RocketHideout3ArrowMovement2 - db $b,$c - dw RocketHideout3ArrowMovement3 - db $11,$c - dw RocketHideout3ArrowMovement4 - db $14,$c - dw RocketHideout3ArrowMovement5 - db $10,$d - dw RocketHideout3ArrowMovement6 - db $b,$e - dw RocketHideout3ArrowMovement7 - db $f,$e - dw RocketHideout3ArrowMovement6 - db $11,$e - dw RocketHideout3ArrowMovement8 - db $13,$e - dw RocketHideout3ArrowMovement9 - db $10,$f - dw RocketHideout3ArrowMovement7 - db $12,$f - dw RocketHideout3ArrowMovement10 - db $d,$10 - dw RocketHideout3ArrowMovement11 - db $c,$11 - dw RocketHideout3ArrowMovement10 - db $10,$12 - dw RocketHideout3ArrowMovement12 - db $FF - -;format: direction, count -;each list is read starting from the $FF and working backwards -RocketHideout3ArrowMovement1: - db D_RIGHT,$04 - db D_UP,$04 - db D_RIGHT,$04 - db $FF - -RocketHideout3ArrowMovement2: - db D_DOWN,$04 - db D_RIGHT,$04 - db $FF - -RocketHideout3ArrowMovement3: - db D_LEFT,$02 - db $FF - -RocketHideout3ArrowMovement4: - db D_RIGHT,$04 - db D_UP,$02 - db D_RIGHT,$02 - db $FF - -RocketHideout3ArrowMovement5: - db D_RIGHT,$04 - db D_UP,$02 - db D_RIGHT,$02 - db D_UP,$03 - db $FF - -RocketHideout3ArrowMovement6: - db D_RIGHT,$04 - db $FF - -RocketHideout3ArrowMovement7: - db D_RIGHT,$02 - db $FF - -RocketHideout3ArrowMovement8: - db D_RIGHT,$04 - db D_UP,$02 - db $FF - -RocketHideout3ArrowMovement9: - db D_RIGHT,$04 - db D_UP,$04 - db $FF - -RocketHideout3ArrowMovement10: - db D_DOWN,$04 - db $FF - -RocketHideout3ArrowMovement11: - db D_UP,$02 - db $FF - -RocketHideout3ArrowMovement12: - db D_UP,$01 - db $FF - -RocketHideout3Script3: - ld a, [wSimulatedJoypadStatesIndex] - and a - jp nz, LoadSpinnerArrowTiles - xor a - ld [wJoyIgnore], a - ld hl, wd736 - res 7, [hl] - ld a, $0 - ld [wCurMapScript], a - ret - -RocketHideout3TextPointers: - dw RocketHideout3Text1 - dw RocketHideout3Text2 - dw PickUpItemText - dw PickUpItemText - -RocketHideout3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 - dw RocketHideout3BattleText2 ; TextBeforeBattle - dw RocketHideout3AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout3EndBattleText2 ; TextEndBattle - dw RocketHideout3EndBattleText2 ; TextEndBattle - -RocketHideout3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 - dw RocketHideout3BattleTxt ; TextBeforeBattle - dw RocketHideout3AfterBattleText3 ; TextAfterBattle - dw RocketHideout3EndBattleText3 ; TextEndBattle - dw RocketHideout3EndBattleText3 ; TextEndBattle - - db $ff - -RocketHideout3Text1: - TX_ASM - ld hl, RocketHideout3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout3BattleText2: - TX_FAR _RocketHideout3BattleText2 - db "@" - -RocketHideout3EndBattleText2: - TX_FAR _RocketHideout3EndBattleText2 - db "@" - -RocketHideout3AfterBattleTxt2: - TX_FAR _RocketHideout3AfterBattleTxt2 - db "@" - -RocketHideout3Text2: - TX_ASM - ld hl, RocketHideout3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout3BattleTxt: - TX_FAR _RocketHideout3BattleTxt - db "@" - -RocketHideout3EndBattleText3: - TX_FAR _RocketHideout3EndBattleText3 - db "@" - -RocketHideout3AfterBattleText3: - TX_FAR _RocketHide3AfterBattleText3 - db "@" diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm deleted file mode 100755 index e8361988..00000000 --- a/scripts/rockethideout4.asm +++ /dev/null @@ -1,220 +0,0 @@ -RocketHideout4Script: - call RocketHideout4Script_45473 - call EnableAutoTextBoxDrawing - ld hl, RocketHideout4TrainerHeader0 - ld de, RocketHideout4ScriptPointers - ld a, [wRocketHideout4CurScript] - call ExecuteCurMapScriptInTable - ld [wRocketHideout4CurScript], a - ret - -RocketHideout4Script_45473: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED - jr nz, .asm_45496 - CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1 - jr z, .asm_4548c - ld a, $2d - jr .asm_45498 -.asm_4548c - ld a, SFX_GO_INSIDE - call PlaySound - SetEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED -.asm_45496 - ld a, $e -.asm_45498 - ld [wNewTileBlockID], a - lb bc, 5, 12 - predef_jump ReplaceTileBlock - -RocketHideout4Script_454a3: - xor a - ld [wJoyIgnore], a - ld [wRocketHideout4CurScript], a - ld [wCurMapScript], a - ret - -RocketHideout4ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw RocketHideout4Script3 - -RocketHideout4Script3: - ld a, [wIsInBattle] - cp $ff - jp z, RocketHideout4Script_454a3 - call UpdateSprites - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call GBFadeOutToBlack - ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_ROCKET_HIDEOUT_4_ITEM_4 - ld [wMissableObjectIndex], a - predef ShowObject - call UpdateSprites - call GBFadeInFromBlack - xor a - ld [wJoyIgnore], a - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ld a, $0 - ld [wRocketHideout4CurScript], a - ld [wCurMapScript], a - ret - -RocketHideout4TextPointers: - dw RocketHideout4Text1 - dw RocketHideout4Text2 - dw RocketHideout4Text3 - dw RocketHideout4Text4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw RocketHideout4Text10 - -RocketHideout4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 - dw RocketHideout4BattleText2 ; TextBeforeBattle - dw RocketHideout4AfterBattleText2 ; TextAfterBattle - dw RocketHideout4EndBattleText2 ; TextEndBattle - dw RocketHideout4EndBattleText2 ; TextEndBattle - -RocketHideout4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 - dw RocketHideout4BattleText3 ; TextBeforeBattle - dw RocketHideout4AfterBattleText3 ; TextAfterBattle - dw RocketHideout4EndBattleText3 ; TextEndBattle - dw RocketHideout4EndBattleText3 ; TextEndBattle - -RocketHideout4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 - dw RocketHideout4BattleText4 ; TextBeforeBattle - dw RocketHideout4AfterBattleText4 ; TextAfterBattle - dw RocketHideout4EndBattleText4 ; TextEndBattle - dw RocketHideout4EndBattleText4 ; TextEndBattle - - db $ff - -RocketHideout4Text1: - TX_ASM - CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI - jp nz, .asm_545571 - ld hl, RocketHideout4Text_4557a - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, RocketHideout4Text_4557f - ld de, RocketHideout4Text_4557f - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wRocketHideout4CurScript], a - ld [wCurMapScript], a - jr .asm_209f0 -.asm_545571 - ld hl, RocketHideout4Text10 - call PrintText -.asm_209f0 - jp TextScriptEnd - -RocketHideout4Text_4557a: - TX_FAR _RocketHideout4Text_4557a - db "@" - -RocketHideout4Text_4557f: - TX_FAR _RocketHideout4Text_4557f - db "@" - -RocketHideout4Text10: - TX_FAR _RocketHideout4Text_45584 - db "@" - -RocketHideout4Text2: - TX_ASM - ld hl, RocketHideout4TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout4BattleText2: - TX_FAR _RocketHideout4BattleText2 - db "@" - -RocketHideout4EndBattleText2: - TX_FAR _RocketHideout4EndBattleText2 - db "@" - -RocketHideout4AfterBattleText2: - TX_FAR _RocketHide4AfterBattleText2 - db "@" - -RocketHideout4Text3: - TX_ASM - ld hl, RocketHideout4TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout4BattleText3: - TX_FAR _RocketHideout4BattleText3 - db "@" - -RocketHideout4EndBattleText3: - TX_FAR _RocketHideout4EndBattleText3 - db "@" - -RocketHideout4AfterBattleText3: - TX_FAR _RocketHide4AfterBattleText3 - db "@" - -RocketHideout4Text4: - TX_ASM - ld hl, RocketHideout4TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout4BattleText4: - TX_FAR _RocketHideout4BattleText4 - db "@" - -RocketHideout4EndBattleText4: - TX_FAR _RocketHideout4EndBattleText4 - db "@" - -RocketHideout4AfterBattleText4: - TX_ASM - ld hl, RocketHideout4Text_455ec - call PrintText - CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY - jr nz, .asm_455e9 - ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 - ld [wMissableObjectIndex], a - predef ShowObject -.asm_455e9 - jp TextScriptEnd - -RocketHideout4Text_455ec: - TX_FAR _RocketHideout4Text_455ec - db "@" diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm deleted file mode 100755 index aed0f0cf..00000000 --- a/scripts/rockethideoutelevator.asm +++ /dev/null @@ -1,85 +0,0 @@ -RocketHideoutElevatorScript: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - push hl - call nz, RocketHideoutElevatorScript_4572c - pop hl - bit 7, [hl] - res 7, [hl] - call nz, RocketHideoutElevatorScript_4575f - xor a - ld [wAutoTextBoxDrawingControl], a - inc a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret - -RocketHideoutElevatorScript_4572c: - ld hl, wWarpEntries - ld a, [wWarpedFromWhichWarp] - ld b, a - ld a, [wWarpedFromWhichMap] - ld c, a - call RocketHideoutElevatorScript_4573a - -RocketHideoutElevatorScript_4573a: - inc hl - inc hl - ld a, b - ld [hli], a - ld a, c - ld [hli], a - ret - -RocketHideoutElevatorScript_45741: - ld hl, RocketHideoutElavatorFloors - call LoadItemList - ld hl, RocketHideoutElevatorWarpMaps - ld de, wElevatorWarpMaps - ld bc, RocketHideoutElevatorWarpMapsEnd - RocketHideoutElevatorWarpMaps - call CopyData - ret - -RocketHideoutElavatorFloors: - db $03 ; num elements in list - db FLOOR_B1F - db FLOOR_B2F - db FLOOR_B4F - db $FF ; terminator - -RocketHideoutElevatorWarpMaps: -; first byte is warp number -; second byte is map number -; These specify where the player goes after getting out of the elevator. - db $04, ROCKET_HIDEOUT_1 - db $04, ROCKET_HIDEOUT_2 - db $02, ROCKET_HIDEOUT_4 -RocketHideoutElevatorWarpMapsEnd: - -RocketHideoutElevatorScript_4575f: - call Delay3 - callba ShakeElevator - ret - -RocketHideoutElevatorTextPointers: - dw RocketHideoutElevatorText1 - -RocketHideoutElevatorText1: - TX_ASM - ld b, LIFT_KEY - call IsItemInBag - jr z, .asm_45782 - call RocketHideoutElevatorScript_45741 - ld hl, RocketHideoutElevatorWarpMaps - predef DisplayElevatorFloorMenu - jr .asm_45788 -.asm_45782 - ld hl, RocketHideoutElevatorText_4578b - call PrintText -.asm_45788 - jp TextScriptEnd - -RocketHideoutElevatorText_4578b: - TX_FAR _RocketElevatorText_4578b - TX_WAIT - db "@" diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm deleted file mode 100755 index 390330e8..00000000 --- a/scripts/rocktunnel1.asm +++ /dev/null @@ -1,213 +0,0 @@ -RockTunnel1Script: - call EnableAutoTextBoxDrawing - ld hl, RockTunnel1TrainerHeader0 - ld de, RockTunnel1ScriptPointers - ld a, [wRockTunnel1CurScript] - call ExecuteCurMapScriptInTable - ld [wRockTunnel1CurScript], a - ret - -RockTunnel1ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -RockTunnel1TextPointers: - dw RockTunnel1Text1 - dw RockTunnel1Text2 - dw RockTunnel1Text3 - dw RockTunnel1Text4 - dw RockTunnel1Text5 - dw RockTunnel1Text6 - dw RockTunnel1Text7 - dw RockTunnel1Text8 - -RockTunnel1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 - dw RockTunnel1BattleText1 ; TextBeforeBattle - dw RockTunnel1AfterBattleText1 ; TextAfterBattle - dw RockTunnel1EndBattleText1 ; TextEndBattle - dw RockTunnel1EndBattleText1 ; TextEndBattle - -RockTunnel1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 - dw RockTunnel1BattleText2 ; TextBeforeBattle - dw RockTunnel1AfterBattleText2 ; TextAfterBattle - dw RockTunnel1EndBattleText2 ; TextEndBattle - dw RockTunnel1EndBattleText2 ; TextEndBattle - -RockTunnel1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 - dw RockTunnel1BattleText3 ; TextBeforeBattle - dw RockTunnel1AfterBattleText3 ; TextAfterBattle - dw RockTunnel1EndBattleText3 ; TextEndBattle - dw RockTunnel1EndBattleText3 ; TextEndBattle - -RockTunnel1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 - dw RockTunnel1BattleText4 ; TextBeforeBattle - dw RockTunnel1AfterBattleText4 ; TextAfterBattle - dw RockTunnel1EndBattleText4 ; TextEndBattle - dw RockTunnel1EndBattleText4 ; TextEndBattle - -RockTunnel1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 - dw RockTunnel1BattleText5 ; TextBeforeBattle - dw RockTunnel1AfterBattleText5 ; TextAfterBattle - dw RockTunnel1EndBattleText5 ; TextEndBattle - dw RockTunnel1EndBattleText5 ; TextEndBattle - -RockTunnel1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 - dw RockTunnel1BattleText6 ; TextBeforeBattle - dw RockTunnel1AfterBattleText6 ; TextAfterBattle - dw RockTunnel1EndBattleText6 ; TextEndBattle - dw RockTunnel1EndBattleText6 ; TextEndBattle - -RockTunnel1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 - dw RockTunnel1BattleText7 ; TextBeforeBattle - dw RockTunnel1AfterBattleText7 ; TextAfterBattle - dw RockTunnel1EndBattleText7 ; TextEndBattle - dw RockTunnel1EndBattleText7 ; TextEndBattle - - db $ff - -RockTunnel1Text1: - TX_ASM - ld hl, RockTunnel1TrainerHeader0 - jr RockTunnel1TalkToTrainer - -RockTunnel1Text2: - TX_ASM - ld hl, RockTunnel1TrainerHeader1 - jr RockTunnel1TalkToTrainer - -RockTunnel1Text3: - TX_ASM - ld hl, RockTunnel1TrainerHeader2 - jr RockTunnel1TalkToTrainer - -RockTunnel1Text4: - TX_ASM - ld hl, RockTunnel1TrainerHeader3 - jr RockTunnel1TalkToTrainer - -RockTunnel1Text5: - TX_ASM - ld hl, RockTunnel1TrainerHeader4 - jr RockTunnel1TalkToTrainer - -RockTunnel1Text6: - TX_ASM - ld hl, RockTunnel1TrainerHeader5 - jr RockTunnel1TalkToTrainer - -RockTunnel1Text7: - TX_ASM - ld hl, RockTunnel1TrainerHeader6 -RockTunnel1TalkToTrainer: - call TalkToTrainer - jp TextScriptEnd - -RockTunnel1BattleText1: - TX_FAR _RockTunnel1BattleText1 - db "@" - -RockTunnel1EndBattleText1: - TX_FAR _RockTunnel1EndBattleText1 - db "@" - -RockTunnel1AfterBattleText1: - TX_FAR _RockTunnel1AfterBattleText1 - db "@" - -RockTunnel1BattleText2: - TX_FAR _RockTunnel1BattleText2 - db "@" - -RockTunnel1EndBattleText2: - TX_FAR _RockTunnel1EndBattleText2 - db "@" - -RockTunnel1AfterBattleText2: - TX_FAR _RockTunnel1AfterBattleText2 - db "@" - -RockTunnel1BattleText3: - TX_FAR _RockTunnel1BattleText3 - db "@" - -RockTunnel1EndBattleText3: - TX_FAR _RockTunnel1EndBattleText3 - db "@" - -RockTunnel1AfterBattleText3: - TX_FAR _RockTunnel1AfterBattleText3 - db "@" - -RockTunnel1BattleText4: - TX_FAR _RockTunnel1BattleText4 - db "@" - -RockTunnel1EndBattleText4: - TX_FAR _RockTunnel1EndBattleText4 - db "@" - -RockTunnel1AfterBattleText4: - TX_FAR _RockTunnel1AfterBattleText4 - db "@" - -RockTunnel1BattleText5: - TX_FAR _RockTunnel1BattleText5 - db "@" - -RockTunnel1EndBattleText5: - TX_FAR _RockTunnel1EndBattleText5 - db "@" - -RockTunnel1AfterBattleText5: - TX_FAR _RockTunnel1AfterBattleText5 - db "@" - -RockTunnel1BattleText6: - TX_FAR _RockTunnel1BattleText6 - db "@" - -RockTunnel1EndBattleText6: - TX_FAR _RockTunnel1EndBattleText6 - db "@" - -RockTunnel1AfterBattleText6: - TX_FAR _RockTunnel1AfterBattleText6 - db "@" - -RockTunnel1BattleText7: - TX_FAR _RockTunnel1BattleText7 - db "@" - -RockTunnel1EndBattleText7: - TX_FAR _RockTunnel1EndBattleText7 - db "@" - -RockTunnel1AfterBattleText7: - TX_FAR _RockTunnel1AfterBattleText7 - db "@" - -RockTunnel1Text8: - TX_FAR _RockTunnel1Text8 - db "@" diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm deleted file mode 100755 index 4385b5f7..00000000 --- a/scripts/rocktunnel2.asm +++ /dev/null @@ -1,241 +0,0 @@ -RockTunnel2Script: - call EnableAutoTextBoxDrawing - ld hl, RockTunnel2TrainerHeader0 - ld de, RockTunnel2ScriptPointers - ld a, [wRockTunnel2CurScript] - call ExecuteCurMapScriptInTable - ld [wRockTunnel2CurScript], a - ret - -RockTunnel2ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -RockTunnel2TextPointers: - dw RockTunnel2Text1 - dw RockTunnel2Text2 - dw RockTunnel2Text3 - dw RockTunnel2Text4 - dw RockTunnel2Text5 - dw RockTunnel2Text6 - dw RockTunnel2Text7 - dw RockTunnel2Text8 - -RockTunnel2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 - dw RockTunnel2BattleText2 ; TextBeforeBattle - dw RockTunnel2AfterBattleText2 ; TextAfterBattle - dw RockTunnel2EndBattleText2 ; TextEndBattle - dw RockTunnel2EndBattleText2 ; TextEndBattle - -RockTunnel2TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 - dw RockTunnel2BattleText3 ; TextBeforeBattle - dw RockTunnel2AfterBattleText3 ; TextAfterBattle - dw RockTunnel2EndBattleText3 ; TextEndBattle - dw RockTunnel2EndBattleText3 ; TextEndBattle - -RockTunnel2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 - dw RockTunnel2BattleText4 ; TextBeforeBattle - dw RockTunnel2AfterBattleText4 ; TextAfterBattle - dw RockTunnel2EndBattleText4 ; TextEndBattle - dw RockTunnel2EndBattleText4 ; TextEndBattle - -RockTunnel2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 - dw RockTunnel2BattleText5 ; TextBeforeBattle - dw RockTunnel2AfterBattleText5 ; TextAfterBattle - dw RockTunnel2EndBattleText5 ; TextEndBattle - dw RockTunnel2EndBattleText5 ; TextEndBattle - -RockTunnel2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 - dw RockTunnel2BattleText6 ; TextBeforeBattle - dw RockTunnel2AfterBattleText6 ; TextAfterBattle - dw RockTunnel2EndBattleText6 ; TextEndBattle - dw RockTunnel2EndBattleText6 ; TextEndBattle - -RockTunnel2TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 - dw RockTunnel2BattleText7 ; TextBeforeBattle - dw RockTunnel2AfterBattleText7 ; TextAfterBattle - dw RockTunnel2EndBattleText7 ; TextEndBattle - dw RockTunnel2EndBattleText7 ; TextEndBattle - -RockTunnel2TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 - dw RockTunnel2BattleText8 ; TextBeforeBattle - dw RockTunnel2AfterBattleText8 ; TextAfterBattle - dw RockTunnel2EndBattleText8 ; TextEndBattle - dw RockTunnel2EndBattleText8 ; TextEndBattle - -RockTunnel2TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 - dw RockTunnel2BattleText9 ; TextBeforeBattle - dw RockTunnel2AfterBattleText9 ; TextAfterBattle - dw RockTunnel2EndBattleText9 ; TextEndBattle - dw RockTunnel2EndBattleText9 ; TextEndBattle - - db $ff - -RockTunnel2Text1: - TX_ASM - ld hl, RockTunnel2TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text2: - TX_ASM - ld hl, RockTunnel2TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text3: - TX_ASM - ld hl, RockTunnel2TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text4: - TX_ASM - ld hl, RockTunnel2TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text5: - TX_ASM - ld hl, RockTunnel2TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text6: - TX_ASM - ld hl, RockTunnel2TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text7: - TX_ASM - ld hl, RockTunnel2TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2Text8: - TX_ASM - ld hl, RockTunnel2TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -RockTunnel2BattleText2: - TX_FAR _RockTunnel2BattleText2 - db "@" - -RockTunnel2EndBattleText2: - TX_FAR _RockTunnel2EndBattleText2 - db "@" - -RockTunnel2AfterBattleText2: - TX_FAR _RockTunnel2AfterBattleText2 - db "@" - -RockTunnel2BattleText3: - TX_FAR _RockTunnel2BattleText3 - db "@" - -RockTunnel2EndBattleText3: - TX_FAR _RockTunnel2EndBattleText3 - db "@" - -RockTunnel2AfterBattleText3: - TX_FAR _RockTunnel2AfterBattleText3 - db "@" - -RockTunnel2BattleText4: - TX_FAR _RockTunnel2BattleText4 - db "@" - -RockTunnel2EndBattleText4: - TX_FAR _RockTunnel2EndBattleText4 - db "@" - -RockTunnel2AfterBattleText4: - TX_FAR _RockTunnel2AfterBattleText4 - db "@" - -RockTunnel2BattleText5: - TX_FAR _RockTunnel2BattleText5 - db "@" - -RockTunnel2EndBattleText5: - TX_FAR _RockTunnel2EndBattleText5 - db "@" - -RockTunnel2AfterBattleText5: - TX_FAR _RockTunnel2AfterBattleText5 - db "@" - -RockTunnel2BattleText6: - TX_FAR _RockTunnel2BattleText6 - db "@" - -RockTunnel2EndBattleText6: - TX_FAR _RockTunnel2EndBattleText6 - db "@" - -RockTunnel2AfterBattleText6: - TX_FAR _RockTunnel2AfterBattleText6 - db "@" - -RockTunnel2BattleText7: - TX_FAR _RockTunnel2BattleText7 - db "@" - -RockTunnel2EndBattleText7: - TX_FAR _RockTunnel2EndBattleText7 - db "@" - -RockTunnel2AfterBattleText7: - TX_FAR _RockTunnel2AfterBattleText7 - db "@" - -RockTunnel2BattleText8: - TX_FAR _RockTunnel2BattleText8 - db "@" - -RockTunnel2EndBattleText8: - TX_FAR _RockTunnel2EndBattleText8 - db "@" - -RockTunnel2AfterBattleText8: - TX_FAR _RockTunnel2AfterBattleText8 - db "@" - -RockTunnel2BattleText9: - TX_FAR _RockTunnel2BattleText9 - db "@" - -RockTunnel2EndBattleText9: - TX_FAR _RockTunnel2EndBattleText9 - db "@" - -RockTunnel2AfterBattleText9: - TX_FAR _RockTunnel2AfterBattleText9 - db "@" diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm deleted file mode 100755 index 7bcdc1ae..00000000 --- a/scripts/rocktunnelpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -RockTunnelPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -RockTunnelPokecenterTextPointers: - dw RockTunnelHealNurseText - dw RockTunnelPokecenterText2 - dw RockTunnelPokecenterText3 - dw RockTunnelTradeNurseText - -RockTunnelHealNurseText: - db $ff - -RockTunnelPokecenterText2: - TX_FAR _RockTunnelPokecenterText2 - db "@" - -RockTunnelPokecenterText3: - TX_FAR _RockTunnelPokecenterText3 - db "@" - -RockTunnelTradeNurseText: - db $f6 diff --git a/scripts/route1.asm b/scripts/route1.asm deleted file mode 100755 index 7f988fab..00000000 --- a/scripts/route1.asm +++ /dev/null @@ -1,52 +0,0 @@ -Route1Script: - jp EnableAutoTextBoxDrawing - -Route1TextPointers: - dw Route1Text1 - dw Route1Text2 - dw Route1Text3 - -Route1Text1: - TX_ASM - CheckAndSetEvent EVENT_GOT_POTION_SAMPLE - jr nz, .asm_1cada - ld hl, Route1ViridianMartSampleText - call PrintText - lb bc, POTION, 1 - call GiveItem - jr nc, .BagFull - ld hl, Route1Text_1cae8 - jr .asm_1cadd -.BagFull - ld hl, Route1Text_1caf3 - jr .asm_1cadd -.asm_1cada - ld hl, Route1Text_1caee -.asm_1cadd - call PrintText - jp TextScriptEnd - -Route1ViridianMartSampleText: - TX_FAR _Route1ViridianMartSampleText - db "@" - -Route1Text_1cae8: - TX_FAR _Route1Text_1cae8 - TX_SFX_ITEM_1 - db "@" - -Route1Text_1caee: - TX_FAR _Route1Text_1caee - db "@" - -Route1Text_1caf3: - TX_FAR _Route1Text_1caf3 - db "@" - -Route1Text2: - TX_FAR _Route1Text2 - db "@" - -Route1Text3: - TX_FAR _Route1Text3 - db "@" diff --git a/scripts/route10.asm b/scripts/route10.asm deleted file mode 100755 index 03a1e818..00000000 --- a/scripts/route10.asm +++ /dev/null @@ -1,198 +0,0 @@ -Route10Script: - call EnableAutoTextBoxDrawing - ld hl, Route10TrainerHeader0 - ld de, Route10ScriptPointers - ld a, [wRoute10CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute10CurScript], a - ret - -Route10ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route10TextPointers: - dw Route10Text1 - dw Route10Text2 - dw Route10Text3 - dw Route10Text4 - dw Route10Text5 - dw Route10Text6 - dw Route10Text7 - dw PokeCenterSignText - dw Route10Text9 - dw Route10Text10 - -Route10TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0 - dw Route10BattleText1 ; TextBeforeBattle - dw Route10AfterBattleText1 ; TextAfterBattle - dw Route10EndBattleText1 ; TextEndBattle - dw Route10EndBattleText1 ; TextEndBattle - -Route10TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1 - dw Route10BattleText2 ; TextBeforeBattle - dw Route10AfterBattleText2 ; TextAfterBattle - dw Route10EndBattleText2 ; TextEndBattle - dw Route10EndBattleText2 ; TextEndBattle - -Route10TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2 - dw Route10BattleText3 ; TextBeforeBattle - dw Route10AfterBattleText3 ; TextAfterBattle - dw Route10EndBattleText3 ; TextEndBattle - dw Route10EndBattleText3 ; TextEndBattle - -Route10TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3 - dw Route10BattleText4 ; TextBeforeBattle - dw Route10AfterBattleText4 ; TextAfterBattle - dw Route10EndBattleText4 ; TextEndBattle - dw Route10EndBattleText4 ; TextEndBattle - -Route10TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4 - dw Route10BattleText5 ; TextBeforeBattle - dw Route10AfterBattleText5 ; TextAfterBattle - dw Route10EndBattleText5 ; TextEndBattle - dw Route10EndBattleText5 ; TextEndBattle - -Route10TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5 - dw Route10BattleText6 ; TextBeforeBattle - dw Route10AfterBattleText6 ; TextAfterBattle - dw Route10EndBattleText6 ; TextEndBattle - dw Route10EndBattleText6 ; TextEndBattle - - db $ff - -Route10Text1: - TX_ASM - ld hl, Route10TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route10BattleText1: - TX_FAR _Route10BattleText1 - db "@" - -Route10EndBattleText1: - TX_FAR _Route10EndBattleText1 - db "@" - -Route10AfterBattleText1: - TX_FAR _Route10AfterBattleText1 - db "@" - -Route10Text2: - TX_ASM - ld hl, Route10TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route10BattleText2: - TX_FAR _Route10BattleText2 - db "@" - -Route10EndBattleText2: - TX_FAR _Route10EndBattleText2 - db "@" - -Route10AfterBattleText2: - TX_FAR _Route10AfterBattleText2 - db "@" - -Route10Text3: - TX_ASM - ld hl, Route10TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route10BattleText3: - TX_FAR _Route10BattleText3 - db "@" - -Route10EndBattleText3: - TX_FAR _Route10EndBattleText3 - db "@" - -Route10AfterBattleText3: - TX_FAR _Route10AfterBattleText3 - db "@" - -Route10Text4: - TX_ASM - ld hl, Route10TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route10BattleText4: - TX_FAR _Route10BattleText4 - db "@" - -Route10EndBattleText4: - TX_FAR _Route10EndBattleText4 - db "@" - -Route10AfterBattleText4: - TX_FAR _Route10AfterBattleText4 - db "@" - -Route10Text5: - TX_ASM - ld hl, Route10TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route10BattleText5: - TX_FAR _Route10BattleText5 - db "@" - -Route10EndBattleText5: - TX_FAR _Route10EndBattleText5 - db "@" - -Route10AfterBattleText5: - TX_FAR _Route10AfterBattleText5 - db "@" - -Route10Text6: - TX_ASM - ld hl, Route10TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route10BattleText6: - TX_FAR _Route10BattleText6 - db "@" - -Route10EndBattleText6: - TX_FAR _Route10EndBattleText6 - db "@" - -Route10AfterBattleText6: - TX_FAR _Route10AfterBattleText6 - db "@" - -Route10Text9: -Route10Text7: - TX_FAR _Route10Text7 ; _Route10Text9 - db "@" - -Route10Text10: - TX_FAR _Route10Text10 - db "@" diff --git a/scripts/route11.asm b/scripts/route11.asm deleted file mode 100755 index afedfc32..00000000 --- a/scripts/route11.asm +++ /dev/null @@ -1,302 +0,0 @@ -Route11Script: - call EnableAutoTextBoxDrawing - ld hl, Route11TrainerHeader0 - ld de, Route11ScriptPointers - ld a, [wRoute11CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute11CurScript], a - ret - -Route11ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route11TextPointers: - dw Route11Text1 - dw Route11Text2 - dw Route11Text3 - dw Route11Text4 - dw Route11Text5 - dw Route11Text6 - dw Route11Text7 - dw Route11Text8 - dw Route11Text9 - dw Route11Text10 - dw Route11Text11 - -Route11TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_0 - dw Route11BattleText1 ; TextBeforeBattle - dw Route11AfterBattleText1 ; TextAfterBattle - dw Route11EndBattleText1 ; TextEndBattle - dw Route11EndBattleText1 ; TextEndBattle - -Route11TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_1 - dw Route11BattleText2 ; TextBeforeBattle - dw Route11AfterBattleText2 ; TextAfterBattle - dw Route11EndBattleText2 ; TextEndBattle - dw Route11EndBattleText2 ; TextEndBattle - -Route11TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_2 - dw Route11BattleText3 ; TextBeforeBattle - dw Route11AfterBattleText3 ; TextAfterBattle - dw Route11EndBattleText3 ; TextEndBattle - dw Route11EndBattleText3 ; TextEndBattle - -Route11TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_3 - dw Route11BattleText4 ; TextBeforeBattle - dw Route11AfterBattleText4 ; TextAfterBattle - dw Route11EndBattleText4 ; TextEndBattle - dw Route11EndBattleText4 ; TextEndBattle - -Route11TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_4 - dw Route11BattleText5 ; TextBeforeBattle - dw Route11AfterBattleText5 ; TextAfterBattle - dw Route11EndBattleText5 ; TextEndBattle - dw Route11EndBattleText5 ; TextEndBattle - -Route11TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_5 - dw Route11BattleText6 ; TextBeforeBattle - dw Route11AfterBattleText6 ; TextAfterBattle - dw Route11EndBattleText6 ; TextEndBattle - dw Route11EndBattleText6 ; TextEndBattle - -Route11TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_6 - dw Route11BattleText7 ; TextBeforeBattle - dw Route11AfterBattleText7 ; TextAfterBattle - dw Route11EndBattleText7 ; TextEndBattle - dw Route11EndBattleText7 ; TextEndBattle - -Route11TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_7, 1 - dw Route11BattleText8 ; TextBeforeBattle - dw Route11AfterBattleText8 ; TextAfterBattle - dw Route11EndBattleText8 ; TextEndBattle - dw Route11EndBattleText8 ; TextEndBattle - -Route11TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_8, 1 - dw Route11BattleText9 ; TextBeforeBattle - dw Route11AfterBattleText9 ; TextAfterBattle - dw Route11EndBattleText9 ; TextEndBattle - dw Route11EndBattleText9 ; TextEndBattle - -Route11TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_9, 1 - dw Route11BattleText10 ; TextBeforeBattle - dw Route11AfterBattleText10 ; TextAfterBattle - dw Route11EndBattleText10 ; TextEndBattle - dw Route11EndBattleText10 ; TextEndBattle - - db $ff - -Route11Text1: - TX_ASM - ld hl, Route11TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText1: - TX_FAR _Route11BattleText1 - db "@" - -Route11EndBattleText1: - TX_FAR _Route11EndBattleText1 - db "@" - -Route11AfterBattleText1: - TX_FAR _Route11AfterBattleText1 - db "@" - -Route11Text2: - TX_ASM - ld hl, Route11TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText2: - TX_FAR _Route11BattleText2 - db "@" - -Route11EndBattleText2: - TX_FAR _Route11EndBattleText2 - db "@" - -Route11AfterBattleText2: - TX_FAR _Route11AfterBattleText2 - db "@" - -Route11Text3: - TX_ASM - ld hl, Route11TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText3: - TX_FAR _Route11BattleText3 - db "@" - -Route11EndBattleText3: - TX_FAR _Route11EndBattleText3 - db "@" - -Route11AfterBattleText3: - TX_FAR _Route11AfterBattleText3 - db "@" - -Route11Text4: - TX_ASM - ld hl, Route11TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText4: - TX_FAR _Route11BattleText4 - db "@" - -Route11EndBattleText4: - TX_FAR _Route11EndBattleText4 - db "@" - -Route11AfterBattleText4: - TX_FAR _Route11AfterBattleText4 - db "@" - -Route11Text5: - TX_ASM - ld hl, Route11TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText5: - TX_FAR _Route11BattleText5 - db "@" - -Route11EndBattleText5: - TX_FAR _Route11EndBattleText5 - db "@" - -Route11AfterBattleText5: - TX_FAR _Route11AfterBattleText5 - db "@" - -Route11Text6: - TX_ASM - ld hl, Route11TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText6: - TX_FAR _Route11BattleText6 - db "@" - -Route11EndBattleText6: - TX_FAR _Route11EndBattleText6 - db "@" - -Route11AfterBattleText6: - TX_FAR _Route11AfterBattleText6 - db "@" - -Route11Text7: - TX_ASM - ld hl, Route11TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText7: - TX_FAR _Route11BattleText7 - db "@" - -Route11EndBattleText7: - TX_FAR _Route11EndBattleText7 - db "@" - -Route11AfterBattleText7: - TX_FAR _Route11AfterBattleText7 - db "@" - -Route11Text8: - TX_ASM - ld hl, Route11TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText8: - TX_FAR _Route11BattleText8 - db "@" - -Route11EndBattleText8: - TX_FAR _Route11EndBattleText8 - db "@" - -Route11AfterBattleText8: - TX_FAR _Route11AfterBattleText8 - db "@" - -Route11Text9: - TX_ASM - ld hl, Route11TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText9: - TX_FAR _Route11BattleText9 - db "@" - -Route11EndBattleText9: - TX_FAR _Route11EndBattleText9 - db "@" - -Route11AfterBattleText9: - TX_FAR _Route11AfterBattleText9 - db "@" - -Route11Text10: - TX_ASM - ld hl, Route11TrainerHeader9 - call TalkToTrainer - jp TextScriptEnd - -Route11BattleText10: - TX_FAR _Route11BattleText10 - db "@" - -Route11EndBattleText10: - TX_FAR _Route11EndBattleText10 - db "@" - -Route11AfterBattleText10: - TX_FAR _Route11AfterBattleText10 - db "@" - -Route11Text11: - TX_FAR _Route11Text11 - db "@" diff --git a/scripts/route11gate.asm b/scripts/route11gate.asm deleted file mode 100755 index 9ecfe0ca..00000000 --- a/scripts/route11gate.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route11GateScript: - jp EnableAutoTextBoxDrawing - -Route11GateTextPointers: - dw Route11GateText1 - -Route11GateText1: - TX_FAR _Route11GateText1 - db "@" diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm deleted file mode 100755 index 6c8d6e99..00000000 --- a/scripts/route11gateupstairs.asm +++ /dev/null @@ -1,76 +0,0 @@ -Route11GateUpstairsScript: - jp DisableAutoTextBoxDrawing - -Route11GateUpstairsTextPointers: - dw Route11GateUpstairsText1 - dw Route11GateUpstairsText2 - dw Route11GateUpstairsText3 - dw Route11GateUpstairsText4 - -Route11GateUpstairsText1: - TX_ASM - xor a - ld [wWhichTrade], a - predef DoInGameTradeDialogue -Route11GateUpstairsScriptEnd: - jp TextScriptEnd - -Route11GateUpstairsText2: - TX_ASM - CheckEvent EVENT_GOT_ITEMFINDER, 1 - jr c, .asm_4949b - ld a, 30 ; pokemon needed - ld [hOaksAideRequirement], a - ld a, ITEMFINDER ; oak's aide reward - ld [hOaksAideRewardItem], a - ld [wd11e], a - call GetItemName - ld h, d - ld l, e - ld de, wOaksAideRewardItemName - ld bc, ITEM_NAME_LENGTH - call CopyData - predef OaksAideScript - ld a, [hOaksAideResult] - dec a - jr nz, .asm_494a1 - SetEvent EVENT_GOT_ITEMFINDER -.asm_4949b - ld hl, Route11GateUpstairsText_494a3 - call PrintText -.asm_494a1 - jr Route11GateUpstairsScriptEnd - -Route11GateUpstairsText_494a3: - TX_FAR _Route11GateUpstairsText_494a3 - db "@" - -Route11GateUpstairsText3: - TX_ASM - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - jp nz, GateUpstairsScript_PrintIfFacingUp - CheckEvent EVENT_BEAT_ROUTE12_SNORLAX - ld hl, BinocularsSnorlaxText - jr z, .print - ld hl, BinocularsNoSnorlaxText -.print - call PrintText - jp TextScriptEnd - -BinocularsSnorlaxText: - TX_FAR _BinocularsSnorlaxText - db "@" - -BinocularsNoSnorlaxText: - TX_FAR _BinocularsNoSnorlaxText - db "@" - -Route11GateUpstairsText4: - TX_ASM - ld hl, Route11GateUpstairsText_494d5 - jp GateUpstairsScript_PrintIfFacingUp - -Route11GateUpstairsText_494d5: - TX_FAR _Route11GateUpstairsText_494d5 - db "@" diff --git a/scripts/route12.asm b/scripts/route12.asm deleted file mode 100755 index 07b5833b..00000000 --- a/scripts/route12.asm +++ /dev/null @@ -1,288 +0,0 @@ -Route12Script: - call EnableAutoTextBoxDrawing - ld hl, Route12TrainerHeader0 - ld de, Route12ScriptPointers - ld a, [wRoute12CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute12CurScript], a - ret - -Route12Script_59606: - xor a - ld [wJoyIgnore], a - ld [wRoute12CurScript], a - ld [wCurMapScript], a - ret - -Route12ScriptPointers: - dw Route12Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route12Script3 - -Route12Script0: - CheckEventHL EVENT_BEAT_ROUTE12_SNORLAX - jp nz, CheckFightingMapTrainers - CheckEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX - ResetEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX - jp z, CheckFightingMapTrainers - ld a, $d - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, SNORLAX - ld [wCurOpponent], a - ld a, 30 - ld [wCurEnemyLVL], a - ld a, HS_ROUTE_12_SNORLAX - ld [wMissableObjectIndex], a - predef HideObject - ld a, $3 - ld [wRoute12CurScript], a - ld [wCurMapScript], a - ret - -Route12Script3: - ld a, [wIsInBattle] - cp $ff - jr z, Route12Script_59606 - call UpdateSprites - ld a, [wBattleResult] - cp $2 - jr z, .asm_59664 - ld a, $e - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_59664 - SetEvent EVENT_BEAT_ROUTE12_SNORLAX - call Delay3 - ld a, $0 - ld [wRoute12CurScript], a - ld [wCurMapScript], a - ret - -Route12TextPointers: - dw Route12Text1 - dw Route12Text2 - dw Route12Text3 - dw Route12Text4 - dw Route12Text5 - dw Route12Text6 - dw Route12Text7 - dw Route12Text8 - dw PickUpItemText - dw PickUpItemText - dw Route12Text11 - dw Route12Text12 - dw Route12Text13 - dw Route12Text14 - -Route12TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_0 - dw Route12BattleText1 ; TextBeforeBattle - dw Route12AfterBattleText1 ; TextAfterBattle - dw Route12EndBattleText1 ; TextEndBattle - dw Route12EndBattleText1 ; TextEndBattle - -Route12TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_1 - dw Route12BattleText2 ; TextBeforeBattle - dw Route12AfterBattleText2 ; TextAfterBattle - dw Route12EndBattleText2 ; TextEndBattle - dw Route12EndBattleText2 ; TextEndBattle - -Route12TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_2 - dw Route12BattleText3 ; TextBeforeBattle - dw Route12AfterBattleText3 ; TextAfterBattle - dw Route12EndBattleText3 ; TextEndBattle - dw Route12EndBattleText3 ; TextEndBattle - -Route12TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_3 - dw Route12BattleText4 ; TextBeforeBattle - dw Route12AfterBattleText4 ; TextAfterBattle - dw Route12EndBattleText4 ; TextEndBattle - dw Route12EndBattleText4 ; TextEndBattle - -Route12TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_4 - dw Route12BattleText5 ; TextBeforeBattle - dw Route12AfterBattleText5 ; TextAfterBattle - dw Route12EndBattleText5 ; TextEndBattle - dw Route12EndBattleText5 ; TextEndBattle - -Route12TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_5 - dw Route12BattleText6 ; TextBeforeBattle - dw Route12AfterBattleText6 ; TextAfterBattle - dw Route12EndBattleText6 ; TextEndBattle - dw Route12EndBattleText6 ; TextEndBattle - -Route12TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_6, 1 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_6, 1 - dw Route12BattleText7 ; TextBeforeBattle - dw Route12AfterBattleText7 ; TextAfterBattle - dw Route12EndBattleText7 ; TextEndBattle - dw Route12EndBattleText7 ; TextEndBattle - - db $ff - -Route12Text1: - TX_FAR _Route12Text1 - db "@" - -Route12Text13: - TX_FAR _Route12Text13 - db "@" - -Route12Text14: - TX_FAR _Route12Text14 - db "@" - -Route12Text2: - TX_ASM - ld hl, Route12TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText1: - TX_FAR _Route12BattleText1 - db "@" - -Route12EndBattleText1: - TX_FAR _Route12EndBattleText1 - db "@" - -Route12AfterBattleText1: - TX_FAR _Route12AfterBattleText1 - db "@" - -Route12Text3: - TX_ASM - ld hl, Route12TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText2: - TX_FAR _Route12BattleText2 - db "@" - -Route12EndBattleText2: - TX_FAR _Route12EndBattleText2 - db "@" - -Route12AfterBattleText2: - TX_FAR _Route12AfterBattleText2 - db "@" - -Route12Text4: - TX_ASM - ld hl, Route12TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText3: - TX_FAR _Route12BattleText3 - db "@" - -Route12EndBattleText3: - TX_FAR _Route12EndBattleText3 - db "@" - -Route12AfterBattleText3: - TX_FAR _Route12AfterBattleText3 - db "@" - -Route12Text5: - TX_ASM - ld hl, Route12TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText4: - TX_FAR _Route12BattleText4 - db "@" - -Route12EndBattleText4: - TX_FAR _Route12EndBattleText4 - db "@" - -Route12AfterBattleText4: - TX_FAR _Route12AfterBattleText4 - db "@" - -Route12Text6: - TX_ASM - ld hl, Route12TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText5: - TX_FAR _Route12BattleText5 - db "@" - -Route12EndBattleText5: - TX_FAR _Route12EndBattleText5 - db "@" - -Route12AfterBattleText5: - TX_FAR _Route12AfterBattleText5 - db "@" - -Route12Text7: - TX_ASM - ld hl, Route12TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText6: - TX_FAR _Route12BattleText6 - db "@" - -Route12EndBattleText6: - TX_FAR _Route12EndBattleText6 - db "@" - -Route12AfterBattleText6: - TX_FAR _Route12AfterBattleText6 - db "@" - -Route12Text8: - TX_ASM - ld hl, Route12TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route12BattleText7: - TX_FAR _Route12BattleText7 - db "@" - -Route12EndBattleText7: - TX_FAR _Route12EndBattleText7 - db "@" - -Route12AfterBattleText7: - TX_FAR _Route12AfterBattleText7 - db "@" - -Route12Text11: - TX_FAR _Route12Text11 - db "@" - -Route12Text12: - TX_FAR _Route12Text12 - db "@" diff --git a/scripts/route12gate.asm b/scripts/route12gate.asm deleted file mode 100755 index 8474100d..00000000 --- a/scripts/route12gate.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route12GateScript: - jp EnableAutoTextBoxDrawing - -Route12GateTextPointers: - dw Route12GateText1 - -Route12GateText1: - TX_FAR _Route12GateText1 - db "@" diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm deleted file mode 100755 index cd355265..00000000 --- a/scripts/route12gateupstairs.asm +++ /dev/null @@ -1,78 +0,0 @@ -Route12GateUpstairsScript: - jp DisableAutoTextBoxDrawing - -Route12GateUpstairsTextPointers: - dw Route12GateUpstairsText1 - dw Route12GateUpstairsText2 - dw Route12GateUpstairsText3 - -Route12GateUpstairsText1: - TX_ASM - CheckEvent EVENT_GOT_TM39, 1 - jr c, .asm_0ad3c - ld hl, TM39PreReceiveText - call PrintText - lb bc, TM_39, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedTM39Text - call PrintText - SetEvent EVENT_GOT_TM39 - jr .asm_4ba56 -.BagFull - ld hl, TM39NoRoomText - call PrintText - jr .asm_4ba56 -.asm_0ad3c - ld hl, TM39ExplanationText - call PrintText -.asm_4ba56 - jp TextScriptEnd - -TM39PreReceiveText: - TX_FAR _TM39PreReceiveText - db "@" - -ReceivedTM39Text: - TX_FAR _ReceivedTM39Text - TX_SFX_ITEM_1 - db "@" - -TM39ExplanationText: - TX_FAR _TM39ExplanationText - db "@" - -TM39NoRoomText: - TX_FAR _TM39NoRoomText - db "@" - -Route12GateUpstairsText2: - TX_ASM - ld hl, Route12GateUpstairsText_495b8 - jp GateUpstairsScript_PrintIfFacingUp - -Route12GateUpstairsText_495b8: - TX_FAR _Route12GateUpstairsText_495b8 - db "@" - -Route12GateUpstairsText3: - TX_ASM - ld hl, Route12GateUpstairsText_495c4 - jp GateUpstairsScript_PrintIfFacingUp - -Route12GateUpstairsText_495c4: - TX_FAR _Route12GateUpstairsText_495c4 - db "@" - -GateUpstairsScript_PrintIfFacingUp: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - jr z, .up - ld a, $1 - jr .done -.up - call PrintText - xor a -.done - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - jp TextScriptEnd diff --git a/scripts/route12house.asm b/scripts/route12house.asm deleted file mode 100755 index 4b93395f..00000000 --- a/scripts/route12house.asm +++ /dev/null @@ -1,57 +0,0 @@ -Route12HouseScript: - jp EnableAutoTextBoxDrawing - -Route12HouseTextPointers: - dw Route12HouseText1 - -Route12HouseText1: - TX_ASM - ld a, [wd728] - bit 5, a - jr nz, .asm_b4cad - ld hl, Route12HouseText_564c0 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_a2d76 - lb bc, SUPER_ROD, 1 - call GiveItem - jr nc, .BagFull - ld hl, wd728 - set 5, [hl] - ld hl, Route12HouseText_564c5 - jr .asm_df984 -.BagFull - ld hl, Route12HouseText_564d9 - jr .asm_df984 -.asm_a2d76 - ld hl, Route12HouseText_564cf - jr .asm_df984 -.asm_b4cad - ld hl, Route12HouseText_564d4 -.asm_df984 - call PrintText - jp TextScriptEnd - -Route12HouseText_564c0: - TX_FAR _Route12HouseText_564c0 - db "@" - -Route12HouseText_564c5: - TX_FAR _Route12HouseText_564c5 - TX_SFX_ITEM_1 - TX_FAR _Route12HouseText_564ca - db "@" - -Route12HouseText_564cf: - TX_FAR _Route12HouseText_564cf - db "@" - -Route12HouseText_564d4: - TX_FAR _Route12HouseText_564d4 - db "@" - -Route12HouseText_564d9: - TX_FAR _Route12HouseText_564d9 - db "@" diff --git a/scripts/route13.asm b/scripts/route13.asm deleted file mode 100755 index 54fb9d68..00000000 --- a/scripts/route13.asm +++ /dev/null @@ -1,312 +0,0 @@ -Route13Script: - call EnableAutoTextBoxDrawing - ld hl, Route13TrainerHeader0 - ld de, Route13ScriptPointers - ld a, [wRoute13CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute13CurScript], a - ret - -Route13ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route13TextPointers: - dw Route13Text1 - dw Route13Text2 - dw Route13Text3 - dw Route13Text4 - dw Route13Text5 - dw Route13Text6 - dw Route13Text7 - dw Route13Text8 - dw Route13Text9 - dw Route13Text10 - dw Route13Text11 - dw Route13Text12 - dw Route13Text13 - -Route13TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_0 - dw Route13BattleText2 ; TextBeforeBattle - dw Route13AfterBattleText2 ; TextAfterBattle - dw Route13EndBattleText2 ; TextEndBattle - dw Route13EndBattleText2 ; TextEndBattle - -Route13TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1 - dw Route13BattleText3 ; TextBeforeBattle - dw Route13AfterBattleText3 ; TextAfterBattle - dw Route13EndBattleText3 ; TextEndBattle - dw Route13EndBattleText3 ; TextEndBattle - -Route13TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 - dw Route13BattleText4 ; TextBeforeBattle - dw Route13AfterBattleText4 ; TextAfterBattle - dw Route13EndBattleText4 ; TextEndBattle - dw Route13EndBattleText4 ; TextEndBattle - -Route13TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 - dw Route13BattleText5 ; TextBeforeBattle - dw Route13AfterBattleText5 ; TextAfterBattle - dw Route13EndBattleText5 ; TextEndBattle - dw Route13EndBattleText5 ; TextEndBattle - -Route13TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 - dw Route13BattleText6 ; TextBeforeBattle - dw Route13AfterBattleText6 ; TextAfterBattle - dw Route13EndBattleText6 ; TextEndBattle - dw Route13EndBattleText6 ; TextEndBattle - -Route13TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 - dw Route13BattleText7 ; TextBeforeBattle - dw Route13AfterBattleText7 ; TextAfterBattle - dw Route13EndBattleText7 ; TextEndBattle - dw Route13EndBattleText7 ; TextEndBattle - -Route13TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 - dw Route13BattleText8 ; TextBeforeBattle - dw Route13AfterBattleText8 ; TextAfterBattle - dw Route13EndBattleText8 ; TextEndBattle - dw Route13EndBattleText8 ; TextEndBattle - -Route13TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1 - dw Route13BattleText9 ; TextBeforeBattle - dw Route13AfterBattleText9 ; TextAfterBattle - dw Route13EndBattleText9 ; TextEndBattle - dw Route13EndBattleText9 ; TextEndBattle - -Route13TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 - dw Route13BattleText10 ; TextBeforeBattle - dw Route13AfterBattleText10 ; TextAfterBattle - dw Route13EndBattleText10 ; TextEndBattle - dw Route13EndBattleText10 ; TextEndBattle - -Route13TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 - dw Route13BattleText11 ; TextBeforeBattle - dw Route13AfterBattleText11 ; TextAfterBattle - dw Route13EndBattleText11 ; TextEndBattle - dw Route13EndBattleText11 ; TextEndBattle - - db $ff - -Route13Text1: - TX_ASM - ld hl, Route13TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText2: - TX_FAR _Route13BattleText2 - db "@" - -Route13EndBattleText2: - TX_FAR _Route13EndBattleText2 - db "@" - -Route13AfterBattleText2: - TX_FAR _Route13AfterBattleText2 - db "@" - -Route13Text2: - TX_ASM - ld hl, Route13TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText3: - TX_FAR _Route13BattleText3 - db "@" - -Route13EndBattleText3: - TX_FAR _Route13EndBattleText3 - db "@" - -Route13AfterBattleText3: - TX_FAR _Route13AfterBattleText3 - db "@" - -Route13Text3: - TX_ASM - ld hl, Route13TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText4: - TX_FAR _Route13BattleText4 - db "@" - -Route13EndBattleText4: - TX_FAR _Route13EndBattleText4 - db "@" - -Route13AfterBattleText4: - TX_FAR _Route13AfterBattleText4 - db "@" - -Route13Text4: - TX_ASM - ld hl, Route13TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText5: - TX_FAR _Route13BattleText5 - db "@" - -Route13EndBattleText5: - TX_FAR _Route13EndBattleText5 - db "@" - -Route13AfterBattleText5: - TX_FAR _Route13AfterBattleText5 - db "@" - -Route13Text5: - TX_ASM - ld hl, Route13TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText6: - TX_FAR _Route13BattleText6 - db "@" - -Route13EndBattleText6: - TX_FAR _Route13EndBattleText6 - db "@" - -Route13AfterBattleText6: - TX_FAR _Route13AfterBattleText6 - db "@" - -Route13Text6: - TX_ASM - ld hl, Route13TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText7: - TX_FAR _Route13BattleText7 - db "@" - -Route13EndBattleText7: - TX_FAR _Route13EndBattleText7 - db "@" - -Route13AfterBattleText7: - TX_FAR _Route13AfterBattleText7 - db "@" - -Route13Text7: - TX_ASM - ld hl, Route13TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText8: - TX_FAR _Route13BattleText8 - db "@" - -Route13EndBattleText8: - TX_FAR _Route13EndBattleText8 - db "@" - -Route13AfterBattleText8: - TX_FAR _Route13AfterBattleText8 - db "@" - -Route13Text8: - TX_ASM - ld hl, Route13TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText9: - TX_FAR _Route13BattleText9 - db "@" - -Route13EndBattleText9: - TX_FAR _Route13EndBattleText9 - db "@" - -Route13AfterBattleText9: - TX_FAR _Route13AfterBattleText9 - db "@" - -Route13Text9: - TX_ASM - ld hl, Route13TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText10: - TX_FAR _Route13BattleText10 - db "@" - -Route13EndBattleText10: - TX_FAR _Route13EndBattleText10 - db "@" - -Route13AfterBattleText10: - TX_FAR _Route13AfterBattleText10 - db "@" - -Route13Text10: - TX_ASM - ld hl, Route13TrainerHeader9 - call TalkToTrainer - jp TextScriptEnd - -Route13BattleText11: - TX_FAR _Route13BattleText11 - db "@" - -Route13EndBattleText11: - TX_FAR _Route13EndBattleText11 - db "@" - -Route13AfterBattleText11: - TX_FAR _Route13AfterBattleText11 - db "@" - -Route13Text11: - TX_FAR _Route13Text11 - db "@" - -Route13Text12: - TX_FAR _Route13Text12 - db "@" - -Route13Text13: - TX_FAR _Route13Text13 - db "@" diff --git a/scripts/route14.asm b/scripts/route14.asm deleted file mode 100755 index c929451f..00000000 --- a/scripts/route14.asm +++ /dev/null @@ -1,302 +0,0 @@ -Route14Script: - call EnableAutoTextBoxDrawing - ld hl, Route14TrainerHeader0 - ld de, Route14ScriptPointers - ld a, [wRoute14CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute14CurScript], a - ret - -Route14ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route14TextPointers: - dw Route14Text1 - dw Route14Text2 - dw Route14Text3 - dw Route14Text4 - dw Route14Text5 - dw Route14Text6 - dw Route14Text7 - dw Route14Text8 - dw Route14Text9 - dw Route14Text10 - dw Route14Text11 - -Route14TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_0 - dw Route14BattleText1 ; TextBeforeBattle - dw Route14AfterBattleText1 ; TextAfterBattle - dw Route14EndBattleText1 ; TextEndBattle - dw Route14EndBattleText1 ; TextEndBattle - -Route14TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_1 - dw Route14BattleText2 ; TextBeforeBattle - dw Route14AfterBattleText2 ; TextAfterBattle - dw Route14EndBattleText2 ; TextEndBattle - dw Route14EndBattleText2 ; TextEndBattle - -Route14TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_2 - dw Route14BattleText3 ; TextBeforeBattle - dw Route14AfterBattleText3 ; TextAfterBattle - dw Route14EndBattleText3 ; TextEndBattle - dw Route14EndBattleText3 ; TextEndBattle - -Route14TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_3 - dw Route14BattleText4 ; TextBeforeBattle - dw Route14AfterBattleText4 ; TextAfterBattle - dw Route14EndBattleText4 ; TextEndBattle - dw Route14EndBattleText4 ; TextEndBattle - -Route14TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_4 - dw Route14BattleText5 ; TextBeforeBattle - dw Route14AfterBattleText5 ; TextAfterBattle - dw Route14EndBattleText5 ; TextEndBattle - dw Route14EndBattleText5 ; TextEndBattle - -Route14TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_5 - dw Route14BattleText6 ; TextBeforeBattle - dw Route14AfterBattleText6 ; TextAfterBattle - dw Route14EndBattleText6 ; TextEndBattle - dw Route14EndBattleText6 ; TextEndBattle - -Route14TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_6 - dw Route14BattleText7 ; TextBeforeBattle - dw Route14AfterBattleText7 ; TextAfterBattle - dw Route14EndBattleText7 ; TextEndBattle - dw Route14EndBattleText7 ; TextEndBattle - -Route14TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_7, 1 - dw Route14BattleText8 ; TextBeforeBattle - dw Route14AfterBattleText8 ; TextAfterBattle - dw Route14EndBattleText8 ; TextEndBattle - dw Route14EndBattleText8 ; TextEndBattle - -Route14TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_8, 1 - dw Route14BattleText9 ; TextBeforeBattle - dw Route14AfterBattleText9 ; TextAfterBattle - dw Route14EndBattleText9 ; TextEndBattle - dw Route14EndBattleText9 ; TextEndBattle - -Route14TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_9, 1 - dw Route14BattleText10 ; TextBeforeBattle - dw Route14AfterBattleText10 ; TextAfterBattle - dw Route14EndBattleText10 ; TextEndBattle - dw Route14EndBattleText10 ; TextEndBattle - - db $ff - -Route14Text1: - TX_ASM - ld hl, Route14TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText1: - TX_FAR _Route14BattleText1 - db "@" - -Route14EndBattleText1: - TX_FAR _Route14EndBattleText1 - db "@" - -Route14AfterBattleText1: - TX_FAR _Route14AfterBattleText1 - db "@" - -Route14Text2: - TX_ASM - ld hl, Route14TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText2: - TX_FAR _Route14BattleText2 - db "@" - -Route14EndBattleText2: - TX_FAR _Route14EndBattleText2 - db "@" - -Route14AfterBattleText2: - TX_FAR _Route14AfterBattleText2 - db "@" - -Route14Text3: - TX_ASM - ld hl, Route14TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText3: - TX_FAR _Route14BattleText3 - db "@" - -Route14EndBattleText3: - TX_FAR _Route14EndBattleText3 - db "@" - -Route14AfterBattleText3: - TX_FAR _Route14AfterBattleText3 - db "@" - -Route14Text4: - TX_ASM - ld hl, Route14TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText4: - TX_FAR _Route14BattleText4 - db "@" - -Route14EndBattleText4: - TX_FAR _Route14EndBattleText4 - db "@" - -Route14AfterBattleText4: - TX_FAR _Route14AfterBattleText4 - db "@" - -Route14Text5: - TX_ASM - ld hl, Route14TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText5: - TX_FAR _Route14BattleText5 - db "@" - -Route14EndBattleText5: - TX_FAR _Route14EndBattleText5 - db "@" - -Route14AfterBattleText5: - TX_FAR _Route14AfterBattleText5 - db "@" - -Route14Text6: - TX_ASM - ld hl, Route14TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText6: - TX_FAR _Route14BattleText6 - db "@" - -Route14EndBattleText6: - TX_FAR _Route14EndBattleText6 - db "@" - -Route14AfterBattleText6: - TX_FAR _Route14AfterBattleText6 - db "@" - -Route14Text7: - TX_ASM - ld hl, Route14TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText7: - TX_FAR _Route14BattleText7 - db "@" - -Route14EndBattleText7: - TX_FAR _Route14EndBattleText7 - db "@" - -Route14AfterBattleText7: - TX_FAR _Route14AfterBattleText7 - db "@" - -Route14Text8: - TX_ASM - ld hl, Route14TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText8: - TX_FAR _Route14BattleText8 - db "@" - -Route14EndBattleText8: - TX_FAR _Route14EndBattleText8 - db "@" - -Route14AfterBattleText8: - TX_FAR _Route14AfterBattleText8 - db "@" - -Route14Text9: - TX_ASM - ld hl, Route14TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText9: - TX_FAR _Route14BattleText9 - db "@" - -Route14EndBattleText9: - TX_FAR _Route14EndBattleText9 - db "@" - -Route14AfterBattleText9: - TX_FAR _Route14AfterBattleText9 - db "@" - -Route14Text10: - TX_ASM - ld hl, Route14TrainerHeader9 - call TalkToTrainer - jp TextScriptEnd - -Route14BattleText10: - TX_FAR _Route14BattleText10 - db "@" - -Route14EndBattleText10: - TX_FAR _Route14EndBattleText10 - db "@" - -Route14AfterBattleText10: - TX_FAR _Route14AfterBattleText10 - db "@" - -Route14Text11: - TX_FAR _Route14Text11 - db "@" diff --git a/scripts/route15.asm b/scripts/route15.asm deleted file mode 100755 index 58c5d0ab..00000000 --- a/scripts/route15.asm +++ /dev/null @@ -1,295 +0,0 @@ -Route15Script: - call EnableAutoTextBoxDrawing - ld hl, Route15TrainerHeader0 - ld de, Route15ScriptPointers - ld a, [wRoute15CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute15CurScript], a - ret - -Route15ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route15TextPointers: - dw Route15Text1 - dw Route15Text2 - dw Route15Text3 - dw Route15Text4 - dw Route15Text5 - dw Route15Text6 - dw Route15Text7 - dw Route15Text8 - dw Route15Text9 - dw Route15Text10 - dw PickUpItemText - dw Route15Text12 - -Route15TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_0 - dw Route15BattleText1 ; TextBeforeBattle - dw Route15AfterBattleText1 ; TextAfterBattle - dw Route15EndBattleText1 ; TextEndBattle - dw Route15EndBattleText1 ; TextEndBattle - -Route15TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_1 - dw Route15BattleText2 ; TextBeforeBattle - dw Route15AfterBattleText2 ; TextAfterBattle - dw Route15EndBattleText2 ; TextEndBattle - dw Route15EndBattleText2 ; TextEndBattle - -Route15TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_2 - dw Route15BattleText3 ; TextBeforeBattle - dw Route15AfterBattleText3 ; TextAfterBattle - dw Route15EndBattleText3 ; TextEndBattle - dw Route15EndBattleText3 ; TextEndBattle - -Route15TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_3 - dw Route15BattleText4 ; TextBeforeBattle - dw Route15AfterBattleText4 ; TextAfterBattle - dw Route15EndBattleText4 ; TextEndBattle - dw Route15EndBattleText4 ; TextEndBattle - -Route15TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_4 - dw Route15BattleText5 ; TextBeforeBattle - dw Route15AfterBattleText5 ; TextAfterBattle - dw Route15EndBattleText5 ; TextEndBattle - dw Route15EndBattleText5 ; TextEndBattle - -Route15TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_5 - dw Route15BattleText6 ; TextBeforeBattle - dw Route15AfterBattleText6 ; TextAfterBattle - dw Route15EndBattleText6 ; TextEndBattle - dw Route15EndBattleText6 ; TextEndBattle - -Route15TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_6 - dw Route15BattleText7 ; TextBeforeBattle - dw Route15AfterBattleText7 ; TextAfterBattle - dw Route15EndBattleText7 ; TextEndBattle - dw Route15EndBattleText7 ; TextEndBattle - -Route15TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_7, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_7, 1 - dw Route15BattleText8 ; TextBeforeBattle - dw Route15AfterBattleText8 ; TextAfterBattle - dw Route15EndBattleText8 ; TextEndBattle - dw Route15EndBattleText8 ; TextEndBattle - -Route15TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_8, 1 - dw Route15BattleText9 ; TextBeforeBattle - dw Route15AfterBattleText9 ; TextAfterBattle - dw Route15EndBattleText9 ; TextEndBattle - dw Route15EndBattleText9 ; TextEndBattle - -Route15TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_9, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_9, 1 - dw Route15BattleText10 ; TextBeforeBattle - dw Route15AfterBattleText10 ; TextAfterBattle - dw Route15EndBattleText10 ; TextEndBattle - dw Route15EndBattleText10 ; TextEndBattle - - db $ff - -Route15Text1: - TX_ASM - ld hl, Route15TrainerHeader0 - jr Route15TalkToTrainer - -Route15Text2: - TX_ASM - ld hl, Route15TrainerHeader1 - jr Route15TalkToTrainer - -Route15Text3: - TX_ASM - ld hl, Route15TrainerHeader2 - jr Route15TalkToTrainer - -Route15Text4: - TX_ASM - ld hl, Route15TrainerHeader3 - jr Route15TalkToTrainer - -Route15Text5: - TX_ASM - ld hl, Route15TrainerHeader4 - jr Route15TalkToTrainer - -Route15Text6: - TX_ASM - ld hl, Route15TrainerHeader5 - jr Route15TalkToTrainer - -Route15Text7: - TX_ASM - ld hl, Route15TrainerHeader6 - jr Route15TalkToTrainer - -Route15Text8: - TX_ASM - ld hl, Route15TrainerHeader7 - jr Route15TalkToTrainer - -Route15Text9: - TX_ASM - ld hl, Route15TrainerHeader8 - jr Route15TalkToTrainer - -Route15Text10: - TX_ASM - ld hl, Route15TrainerHeader9 -Route15TalkToTrainer: - call TalkToTrainer - jp TextScriptEnd - -Route15BattleText1: - TX_FAR _Route15BattleText1 - db "@" - -Route15EndBattleText1: - TX_FAR _Route15EndBattleText1 - db "@" - -Route15AfterBattleText1: - TX_FAR _Route15AfterBattleText1 - db "@" - -Route15BattleText2: - TX_FAR _Route15BattleText2 - db "@" - -Route15EndBattleText2: - TX_FAR _Route15EndBattleText2 - db "@" - -Route15AfterBattleText2: - TX_FAR _Route15AfterBattleText2 - db "@" - -Route15BattleText3: - TX_FAR _Route15BattleText3 - db "@" - -Route15EndBattleText3: - TX_FAR _Route15EndBattleText3 - db "@" - -Route15AfterBattleText3: - TX_FAR _Route15AfterBattleText3 - db "@" - -Route15BattleText4: - TX_FAR _Route15BattleText4 - db "@" - -Route15EndBattleText4: - TX_FAR _Route15EndBattleText4 - db "@" - -Route15AfterBattleText4: - TX_FAR _Route15AfterBattleText4 - db "@" - -Route15BattleText5: - TX_FAR _Route15BattleText5 - db "@" - -Route15EndBattleText5: - TX_FAR _Route15EndBattleText5 - db "@" - -Route15AfterBattleText5: - TX_FAR _Route15AfterBattleText5 - db "@" - -Route15BattleText6: - TX_FAR _Route15BattleText6 - db "@" - -Route15EndBattleText6: - TX_FAR _Route15EndBattleText6 - db "@" - -Route15AfterBattleText6: - TX_FAR _Route15AfterBattleText6 - db "@" - -Route15BattleText7: - TX_FAR _Route15BattleText7 - db "@" - -Route15EndBattleText7: - TX_FAR _Route15EndBattleText7 - db "@" - -Route15AfterBattleText7: - TX_FAR _Route15AfterBattleText7 - db "@" - -Route15BattleText8: - TX_FAR _Route15BattleText8 - db "@" - -Route15EndBattleText8: - TX_FAR _Route15EndBattleText8 - db "@" - -Route15AfterBattleText8: - TX_FAR _Route15AfterBattleText8 - db "@" - -Route15BattleText9: - TX_FAR _Route15BattleText9 - db "@" - -Route15EndBattleText9: - TX_FAR _Route15EndBattleText9 - db "@" - -Route15AfterBattleText9: - TX_FAR _Route15AfterBattleText9 - db "@" - -Route15BattleText10: - TX_FAR _Route15BattleText10 - db "@" - -Route15EndBattleText10: - TX_FAR _Route15EndBattleText10 - db "@" - -Route15AfterBattleText10: - TX_FAR _Route15AfterBattleText10 - db "@" - -Route15Text12: - TX_FAR _Route15Text12 - db "@" diff --git a/scripts/route15gate.asm b/scripts/route15gate.asm deleted file mode 100755 index 40db02dd..00000000 --- a/scripts/route15gate.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route15GateScript: - jp EnableAutoTextBoxDrawing - -Route15GateTextPointers: - dw Route15GateText1 - -Route15GateText1: - TX_FAR _Route15GateText1 - db "@" diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm deleted file mode 100755 index c7f6a2ad..00000000 --- a/scripts/route15gateupstairs.asm +++ /dev/null @@ -1,44 +0,0 @@ -Route15GateUpstairsScript: - jp DisableAutoTextBoxDrawing - -Route15GateUpstairsTextPointers: - dw Route15GateUpstairsText1 - dw Route15GateUpstairsText2 - -Route15GateUpstairsText1: - TX_ASM - CheckEvent EVENT_GOT_EXP_ALL - jr nz, .asm_49683 - ld a, 50 ; pokemon needed - ld [hOaksAideRequirement], a - ld a, EXP_ALL ; oak's aide reward - ld [hOaksAideRewardItem], a - ld [wd11e], a - call GetItemName - ld hl, wcd6d - ld de, wOaksAideRewardItemName - ld bc, ITEM_NAME_LENGTH - call CopyData - predef OaksAideScript - ld a, [hOaksAideResult] - cp $1 - jr nz, .asm_49689 - SetEvent EVENT_GOT_EXP_ALL -.asm_49683 - ld hl, Route15GateUpstairsText_4968c - call PrintText -.asm_49689 - jp TextScriptEnd - -Route15GateUpstairsText_4968c: - TX_FAR _Route15GateUpstairsText_4968c - db "@" - -Route15GateUpstairsText2: - TX_ASM - ld hl, Route15GateUpstairsText_49698 - jp GateUpstairsScript_PrintIfFacingUp - -Route15GateUpstairsText_49698: - TX_FAR _Route15GateUpstairsText_49698 - db "@" diff --git a/scripts/route16.asm b/scripts/route16.asm deleted file mode 100755 index 20431608..00000000 --- a/scripts/route16.asm +++ /dev/null @@ -1,259 +0,0 @@ -Route16Script: - call EnableAutoTextBoxDrawing - ld hl, Route16TrainerHeader0 - ld de, Route16ScriptPointers - ld a, [wRoute16CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute16CurScript], a - ret - -Route16Script_59946: - xor a - ld [wJoyIgnore], a - ld [wRoute16CurScript], a - ld [wCurMapScript], a - ret - -Route16ScriptPointers: - dw Route16Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route16Script3 - -Route16Script0: - CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX - jp nz, CheckFightingMapTrainers - CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX - ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX - jp z, CheckFightingMapTrainers - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, SNORLAX - ld [wCurOpponent], a - ld a, 30 - ld [wCurEnemyLVL], a - ld a, HS_ROUTE_16_SNORLAX - ld [wMissableObjectIndex], a - predef HideObject - call UpdateSprites - ld a, $3 - ld [wRoute16CurScript], a - ld [wCurMapScript], a - ret - -Route16Script3: - ld a, [wIsInBattle] - cp $ff - jp z, Route16Script_59946 - call UpdateSprites - ld a, [wBattleResult] - cp $2 - jr z, .asm_599a8 - ld a, $b - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_599a8 - SetEvent EVENT_BEAT_ROUTE16_SNORLAX - call Delay3 - ld a, $0 - ld [wRoute16CurScript], a - ld [wCurMapScript], a - ret - -Route16TextPointers: - dw Route16Text1 - dw Route16Text2 - dw Route16Text3 - dw Route16Text4 - dw Route16Text5 - dw Route16Text6 - dw Route16Text7 - dw Route16Text8 - dw Route16Text9 - dw Route16Text10 - dw Route16Text11 - -Route16TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_0 - dw Route16BattleText1 ; TextBeforeBattle - dw Route16AfterBattleText1 ; TextAfterBattle - dw Route16EndBattleText1 ; TextEndBattle - dw Route16EndBattleText1 ; TextEndBattle - -Route16TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_1 - dw Route16BattleText2 ; TextBeforeBattle - dw Route16AfterBattleText2 ; TextAfterBattle - dw Route16EndBattleText2 ; TextEndBattle - dw Route16EndBattleText2 ; TextEndBattle - -Route16TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_2 - dw Route16BattleText3 ; TextBeforeBattle - dw Route16AfterBattleText3 ; TextAfterBattle - dw Route16EndBattleText3 ; TextEndBattle - dw Route16EndBattleText3 ; TextEndBattle - -Route16TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_3 - dw Route16BattleText4 ; TextBeforeBattle - dw Route16AfterBattleText4 ; TextAfterBattle - dw Route16EndBattleText4 ; TextEndBattle - dw Route16EndBattleText4 ; TextEndBattle - -Route16TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_4 - dw Route16BattleText5 ; TextBeforeBattle - dw Route16AfterBattleText5 ; TextAfterBattle - dw Route16EndBattleText5 ; TextEndBattle - dw Route16EndBattleText5 ; TextEndBattle - -Route16TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_5 - dw Route16BattleText6 ; TextBeforeBattle - dw Route16AfterBattleText6 ; TextAfterBattle - dw Route16EndBattleText6 ; TextEndBattle - dw Route16EndBattleText6 ; TextEndBattle - - db $ff - -Route16Text1: - TX_ASM - ld hl, Route16TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route16BattleText1: - TX_FAR _Route16BattleText1 - db "@" - -Route16EndBattleText1: - TX_FAR _Route16EndBattleText1 - db "@" - -Route16AfterBattleText1: - TX_FAR _Route16AfterBattleText1 - db "@" - -Route16Text2: - TX_ASM - ld hl, Route16TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route16BattleText2: - TX_FAR _Route16BattleText2 - db "@" - -Route16EndBattleText2: - TX_FAR _Route16EndBattleText2 - db "@" - -Route16AfterBattleText2: - TX_FAR _Route16AfterBattleText2 - db "@" - -Route16Text3: - TX_ASM - ld hl, Route16TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route16BattleText3: - TX_FAR _Route16BattleText3 - db "@" - -Route16EndBattleText3: - TX_FAR _Route16EndBattleText3 - db "@" - -Route16AfterBattleText3: - TX_FAR _Route16AfterBattleText3 - db "@" - -Route16Text4: - TX_ASM - ld hl, Route16TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route16BattleText4: - TX_FAR _Route16BattleText4 - db "@" - -Route16EndBattleText4: - TX_FAR _Route16EndBattleText4 - db "@" - -Route16AfterBattleText4: - TX_FAR _Route16AfterBattleText4 - db "@" - -Route16Text5: - TX_ASM - ld hl, Route16TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route16BattleText5: - TX_FAR _Route16BattleText5 - db "@" - -Route16EndBattleText5: - TX_FAR _Route16EndBattleText5 - db "@" - -Route16AfterBattleText5: - TX_FAR _Route16AfterBattleText5 - db "@" - -Route16Text6: - TX_ASM - ld hl, Route16TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route16BattleText6: - TX_FAR _Route16BattleText6 - db "@" - -Route16EndBattleText6: - TX_FAR _Route16EndBattleText6 - db "@" - -Route16AfterBattleText6: - TX_FAR _Route16AfterBattleText6 - db "@" - -Route16Text7: - TX_FAR _Route16Text7 - db "@" - -Route16Text10: - TX_FAR _Route16Text10 - db "@" - -Route16Text11: - TX_FAR _Route16Text11 - db "@" - -Route16Text8: - TX_FAR _Route16Text8 - db "@" - -Route16Text9: - TX_FAR _Route16Text9 - db "@" diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm deleted file mode 100755 index e20ba6f7..00000000 --- a/scripts/route16gate.asm +++ /dev/null @@ -1,121 +0,0 @@ -Route16GateScript: - ld hl, wd732 - res 5, [hl] - call EnableAutoTextBoxDrawing - ld a, [wRoute16GateCurScript] - ld hl, Route16GateScriptPointers - jp CallFunctionInTable - -Route16GateScriptPointers: - dw Route16GateScript0 - dw Route16GateScript1 - dw Route16GateScript2 - dw Route16GateScript3 - -Route16GateScript0: - call Route16GateScript_49755 - ret nz - ld hl, CoordsData_49714 - call ArePlayerCoordsInArray - ret nc - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [hJoyHeld], a - ld a, [wCoordIndex] - cp $1 - jr z, .asm_4970e - ld a, [wCoordIndex] - dec a - ld [wSimulatedJoypadStatesIndex], a - ld b, $0 - ld c, a - ld a, D_UP - ld hl, wSimulatedJoypadStatesEnd - call FillMemory - call StartSimulatingJoypadStates - ld a, $1 - ld [wRoute16GateCurScript], a - ret -.asm_4970e - ld a, $2 - ld [wRoute16GateCurScript], a - ret - -CoordsData_49714: - db $07,$04 - db $08,$04 - db $09,$04 - db $0A,$04 - db $FF - -Route16GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld a, $f0 - ld [wJoyIgnore], a - -Route16GateScript2: - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_RIGHT - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wRoute16GateCurScript], a - ret - -Route16GateScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - xor a - ld [wJoyIgnore], a - ld hl, wd730 - res 7, [hl] - ld a, $0 - ld [wRoute16GateCurScript], a - ret - -Route16GateScript_49755: - ld b, BICYCLE - jp IsItemInBag - -Route16GateTextPointers: - dw Route16GateText1 - dw Route16GateText2 - dw Route16GateText3 - -Route16GateText1: - TX_ASM - call Route16GateScript_49755 - jr z, .asm_0bdf3 - ld hl, Route16GateText_4977c - call PrintText - jr .asm_56c9d -.asm_0bdf3 - ld hl, Route16GateText_49777 - call PrintText -.asm_56c9d - jp TextScriptEnd - -Route16GateText_49777: - TX_FAR _Route16GateText_49777 - db "@" - -Route16GateText_4977c: - TX_FAR _Route16GateText_4977c - db "@" - -Route16GateText3: - TX_FAR _Route16GateText_49781 - db "@" - -Route16GateText2: - TX_FAR _Route16GateText2 - db "@" diff --git a/scripts/route16gateupstairs.asm b/scripts/route16gateupstairs.asm deleted file mode 100755 index 664976a2..00000000 --- a/scripts/route16gateupstairs.asm +++ /dev/null @@ -1,46 +0,0 @@ -Route16GateUpstairsScript: - jp DisableAutoTextBoxDrawing - -Route16GateUpstairsTextPointers: - dw Route16GateUpstairsText1 - dw Route16GateUpstairsText2 - dw Route16GateUpstairsText3 - dw Route16GateUpstairsText4 - -Route16GateUpstairsText1: - TX_ASM - ld hl, Route16GateUpstairsText_49820 - call PrintText - jp TextScriptEnd - -Route16GateUpstairsText_49820: - TX_FAR _Route16GateUpstairsText_49820 - db "@" - -Route16GateUpstairsText2: - TX_ASM - ld hl, Route16GateUpstairsText_4982f - call PrintText - jp TextScriptEnd - -Route16GateUpstairsText_4982f: - TX_FAR _Route16GateUpstairsText_4982f - db "@" - -Route16GateUpstairsText3: - TX_ASM - ld hl, Route16GateUpstairsText_4983b - jp GateUpstairsScript_PrintIfFacingUp - -Route16GateUpstairsText_4983b: - TX_FAR _Route16GateUpstairsText_4983b - db "@" - -Route16GateUpstairsText4: - TX_ASM - ld hl, Route16GateUpstairsText_49847 - jp GateUpstairsScript_PrintIfFacingUp - -Route16GateUpstairsText_49847: - TX_FAR _Route16GateUpstairsText_49847 - db "@" diff --git a/scripts/route16house.asm b/scripts/route16house.asm deleted file mode 100755 index 5359248c..00000000 --- a/scripts/route16house.asm +++ /dev/null @@ -1,55 +0,0 @@ -Route16HouseScript: - jp EnableAutoTextBoxDrawing - -Route16HouseTextPointers: - dw Route16HouseText1 - dw Route16HouseText2 - -Route16HouseText1: - TX_ASM - CheckEvent EVENT_GOT_HM02 - ld hl, HM02ExplanationText - jr nz, .asm_13616 - ld hl, Route16HouseText3 - call PrintText - lb bc, HM_02, 1 - call GiveItem - jr nc, .BagFull - SetEvent EVENT_GOT_HM02 - ld hl, ReceivedHM02Text - jr .asm_13616 -.BagFull - ld hl, HM02NoRoomText -.asm_13616 - call PrintText - jp TextScriptEnd - -Route16HouseText3: - TX_FAR _Route16HouseText3 - db "@" - -ReceivedHM02Text: - TX_FAR _ReceivedHM02Text - TX_SFX_KEY_ITEM - db "@" - -HM02ExplanationText: - TX_FAR _HM02ExplanationText - db "@" - -HM02NoRoomText: - TX_FAR _HM02NoRoomText - db "@" - -Route16HouseText2: - TX_ASM - ld hl, Route16HouseText_1e652 - call PrintText - ld a, FEAROW - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -Route16HouseText_1e652: - TX_FAR _Route16HouseText_1e652 - db "@" diff --git a/scripts/route17.asm b/scripts/route17.asm deleted file mode 100755 index fb9f4cd8..00000000 --- a/scripts/route17.asm +++ /dev/null @@ -1,327 +0,0 @@ -Route17Script: - call EnableAutoTextBoxDrawing - ld hl, Route17TrainerHeader0 - ld de, Route17ScriptPointers - ld a, [wRoute17CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute17CurScript], a - ret - -Route17ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route17TextPointers: - dw Route17Text1 - dw Route17Text2 - dw Route17Text3 - dw Route17Text4 - dw Route17Text5 - dw Route17Text6 - dw Route17Text7 - dw Route17Text8 - dw Route17Text9 - dw Route17Text10 - dw Route17Text11 - dw Route17Text12 - dw Route17Text13 - dw Route17Text14 - dw Route17Text15 - dw Route17Text16 - -Route17TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0 - dw Route17BattleText1 ; TextBeforeBattle - dw Route17AfterBattleText1 ; TextAfterBattle - dw Route17EndBattleText1 ; TextEndBattle - dw Route17EndBattleText1 ; TextEndBattle - -Route17TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1 - dw Route17BattleText2 ; TextBeforeBattle - dw Route17AfterBattleText2 ; TextAfterBattle - dw Route17EndBattleText2 ; TextEndBattle - dw Route17EndBattleText2 ; TextEndBattle - -Route17TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2 - dw Route17BattleText3 ; TextBeforeBattle - dw Route17AfterBattleText3 ; TextAfterBattle - dw Route17EndBattleText3 ; TextEndBattle - dw Route17EndBattleText3 ; TextEndBattle - -Route17TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3 - dw Route17BattleText4 ; TextBeforeBattle - dw Route17AfterBattleText4 ; TextAfterBattle - dw Route17EndBattleText4 ; TextEndBattle - dw Route17EndBattleText4 ; TextEndBattle - -Route17TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4 - dw Route17BattleText5 ; TextBeforeBattle - dw Route17AfterBattleText5 ; TextAfterBattle - dw Route17EndBattleText5 ; TextEndBattle - dw Route17EndBattleText5 ; TextEndBattle - -Route17TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5 - dw Route17BattleText6 ; TextBeforeBattle - dw Route17AfterBattleText6 ; TextAfterBattle - dw Route17EndBattleText6 ; TextEndBattle - dw Route17EndBattleText6 ; TextEndBattle - -Route17TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6 - dw Route17BattleText7 ; TextBeforeBattle - dw Route17AfterBattleText7 ; TextAfterBattle - dw Route17EndBattleText7 ; TextEndBattle - dw Route17EndBattleText7 ; TextEndBattle - -Route17TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1 - dw Route17BattleText8 ; TextBeforeBattle - dw Route17AfterBattleText8 ; TextAfterBattle - dw Route17EndBattleText8 ; TextEndBattle - dw Route17EndBattleText8 ; TextEndBattle - -Route17TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1 - dw Route17BattleText9 ; TextBeforeBattle - dw Route17AfterBattleText9 ; TextAfterBattle - dw Route17EndBattleText9 ; TextEndBattle - dw Route17EndBattleText9 ; TextEndBattle - -Route17TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1 - dw Route17BattleText10 ; TextBeforeBattle - dw Route17AfterBattleText10 ; TextAfterBattle - dw Route17EndBattleText10 ; TextEndBattle - dw Route17EndBattleText10 ; TextEndBattle - - db $ff - -Route17Text1: - TX_ASM - ld hl, Route17TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText1: - TX_FAR _Route17BattleText1 - db "@" - -Route17EndBattleText1: - TX_FAR _Route17EndBattleText1 - db "@" - -Route17AfterBattleText1: - TX_FAR _Route17AfterBattleText1 - db "@" - -Route17Text2: - TX_ASM - ld hl, Route17TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText2: - TX_FAR _Route17BattleText2 - db "@" - -Route17EndBattleText2: - TX_FAR _Route17EndBattleText2 - db "@" - -Route17AfterBattleText2: - TX_FAR _Route17AfterBattleText2 - db "@" - -Route17Text3: - TX_ASM - ld hl, Route17TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText3: - TX_FAR _Route17BattleText3 - db "@" - -Route17EndBattleText3: - TX_FAR _Route17EndBattleText3 - db "@" - -Route17AfterBattleText3: - TX_FAR _Route17AfterBattleText3 - db "@" - -Route17Text4: - TX_ASM - ld hl, Route17TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText4: - TX_FAR _Route17BattleText4 - db "@" - -Route17EndBattleText4: - TX_FAR _Route17EndBattleText4 - db "@" - -Route17AfterBattleText4: - TX_FAR _Route17AfterBattleText4 - db "@" - -Route17Text5: - TX_ASM - ld hl, Route17TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText5: - TX_FAR _Route17BattleText5 - db "@" - -Route17EndBattleText5: - TX_FAR _Route17EndBattleText5 - db "@" - -Route17AfterBattleText5: - TX_FAR _Route17AfterBattleText5 - db "@" - -Route17Text6: - TX_ASM - ld hl, Route17TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText6: - TX_FAR _Route17BattleText6 - db "@" - -Route17EndBattleText6: - TX_FAR _Route17EndBattleText6 - db "@" - -Route17AfterBattleText6: - TX_FAR _Route17AfterBattleText6 - db "@" - -Route17Text7: - TX_ASM - ld hl, Route17TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText7: - TX_FAR _Route17BattleText7 - db "@" - -Route17EndBattleText7: - TX_FAR _Route17EndBattleText7 - db "@" - -Route17AfterBattleText7: - TX_FAR _Route17AfterBattleText7 - db "@" - -Route17Text8: - TX_ASM - ld hl, Route17TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText8: - TX_FAR _Route17BattleText8 - db "@" - -Route17EndBattleText8: - TX_FAR _Route17EndBattleText8 - db "@" - -Route17AfterBattleText8: - TX_FAR _Route17AfterBattleText8 - db "@" - -Route17Text9: - TX_ASM - ld hl, Route17TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText9: - TX_FAR _Route17BattleText9 - db "@" - -Route17EndBattleText9: - TX_FAR _Route17EndBattleText9 - db "@" - -Route17AfterBattleText9: - TX_FAR _Route17AfterBattleText9 - db "@" - -Route17Text10: - TX_ASM - ld hl, Route17TrainerHeader9 - call TalkToTrainer - jp TextScriptEnd - -Route17BattleText10: - TX_FAR _Route17BattleText10 - db "@" - -Route17EndBattleText10: - TX_FAR _Route17EndBattleText10 - db "@" - -Route17AfterBattleText10: - TX_FAR _Route17AfterBattleText10 - db "@" - -Route17Text11: - TX_FAR _Route17Text11 - db "@" - -Route17Text12: - TX_FAR _Route17Text12 - db "@" - -Route17Text13: - TX_FAR _Route17Text13 - db "@" - -Route17Text14: - TX_FAR _Route17Text14 - db "@" - -Route17Text15: - TX_FAR _Route17Text15 - db "@" - -Route17Text16: - TX_FAR _Route17Text16 - db "@" diff --git a/scripts/route18.asm b/scripts/route18.asm deleted file mode 100755 index 687b269c..00000000 --- a/scripts/route18.asm +++ /dev/null @@ -1,111 +0,0 @@ -Route18Script: - call EnableAutoTextBoxDrawing - ld hl, Route18TrainerHeader0 - ld de, Route18ScriptPointers - ld a, [wRoute18CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute18CurScript], a - ret - -Route18ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route18TextPointers: - dw Route18Text1 - dw Route18Text2 - dw Route18Text3 - dw Route18Text4 - dw Route18Text5 - -Route18TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0 - dw Route18BattleText1 ; TextBeforeBattle - dw Route18AfterBattleText1 ; TextAfterBattle - dw Route18EndBattleText1 ; TextEndBattle - dw Route18EndBattleText1 ; TextEndBattle - -Route18TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1 - dw Route18BattleText2 ; TextBeforeBattle - dw Route18AfterBattleText2 ; TextAfterBattle - dw Route18EndBattleText2 ; TextEndBattle - dw Route18EndBattleText2 ; TextEndBattle - -Route18TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2 - dw Route18BattleText3 ; TextBeforeBattle - dw Route18AfterBattleText3 ; TextAfterBattle - dw Route18EndBattleText3 ; TextEndBattle - dw Route18EndBattleText3 ; TextEndBattle - - db $ff - -Route18Text1: - TX_ASM - ld hl, Route18TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route18BattleText1: - TX_FAR _Route18BattleText1 - db "@" - -Route18EndBattleText1: - TX_FAR _Route18EndBattleText1 - db "@" - -Route18AfterBattleText1: - TX_FAR _Route18AfterBattleText1 - db "@" - -Route18Text2: - TX_ASM - ld hl, Route18TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route18BattleText2: - TX_FAR _Route18BattleText2 - db "@" - -Route18EndBattleText2: - TX_FAR _Route18EndBattleText2 - db "@" - -Route18AfterBattleText2: - TX_FAR _Route18AfterBattleText2 - db "@" - -Route18Text3: - TX_ASM - ld hl, Route18TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route18BattleText3: - TX_FAR _Route18BattleText3 - db "@" - -Route18EndBattleText3: - TX_FAR _Route18EndBattleText3 - db "@" - -Route18AfterBattleText3: - TX_FAR _Route18AfterBattleText3 - db "@" - -Route18Text4: - TX_FAR _Route18Text4 - db "@" - -Route18Text5: - TX_FAR _Route18Text5 - db "@" diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm deleted file mode 100755 index 893801a1..00000000 --- a/scripts/route18gate.asm +++ /dev/null @@ -1,112 +0,0 @@ -Route18GateScript: - ld hl, wd732 - res 5, [hl] - call EnableAutoTextBoxDrawing - ld a, [wRoute18GateCurScript] - ld hl, Route18GateScriptPointers - jp CallFunctionInTable - -Route18GateScriptPointers: - dw Route18GateScript0 - dw Route18GateScript1 - dw Route18GateScript2 - dw Route18GateScript3 - -Route18GateScript0: - call Route16GateScript_49755 - ret nz - ld hl, CoordsData_498cc - call ArePlayerCoordsInArray - ret nc - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [hJoyHeld], a - ld a, [wCoordIndex] - cp $1 - jr z, .asm_498c6 - ld a, [wCoordIndex] - dec a - ld [wSimulatedJoypadStatesIndex], a - ld b, 0 - ld c, a - ld a, D_UP - ld hl, wSimulatedJoypadStatesEnd - call FillMemory - call StartSimulatingJoypadStates - ld a, $1 - ld [wRoute18GateCurScript], a - ret -.asm_498c6 - ld a, $2 - ld [wRoute18GateCurScript], a - ret - -CoordsData_498cc: - db $03,$04 - db $04,$04 - db $05,$04 - db $06,$04 - db $FF - -Route18GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld a, $f0 - ld [wJoyIgnore], a - -Route18GateScript2: - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_RIGHT - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wRoute18GateCurScript], a - ret - -Route18GateScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - xor a - ld [wJoyIgnore], a - ld hl, wd730 - res 7, [hl] - ld a, $0 - ld [wRoute18GateCurScript], a - ret - -Route18GateTextPointers: - dw Route18GateText1 - dw Route18GateText2 - -Route18GateText1: - TX_ASM - call Route16GateScript_49755 - jr z, .asm_3c84d - ld hl, Route18GateText_4992d - call PrintText - jr .asm_a8410 -.asm_3c84d - ld hl, Route18GateText_49928 - call PrintText -.asm_a8410 - jp TextScriptEnd - -Route18GateText_49928: - TX_FAR _Route18GateText_49928 - db "@" - -Route18GateText_4992d: - TX_FAR _Route18GateText_4992d - db "@" - -Route18GateText2: - TX_FAR _Route18GateText_49932 - db "@" diff --git a/scripts/route18gateupstairs.asm b/scripts/route18gateupstairs.asm deleted file mode 100755 index 3d623142..00000000 --- a/scripts/route18gateupstairs.asm +++ /dev/null @@ -1,32 +0,0 @@ -Route18GateUpstairsScript: - jp DisableAutoTextBoxDrawing - -Route18GateUpstairsTextPointers: - dw Route18GateUpstairsText1 - dw Route18GateUpstairsText2 - dw Route18GateUpstairsText3 - -Route18GateUpstairsText1: - TX_ASM - ld a, $5 - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd - -Route18GateUpstairsText2: - TX_ASM - ld hl, Route18GateUpstairsText_49993 - jp GateUpstairsScript_PrintIfFacingUp - -Route18GateUpstairsText_49993: - TX_FAR _Route18GateUpstairsText_49993 - db "@" - -Route18GateUpstairsText3: - TX_ASM - ld hl, Route18GateUpstairsText_4999f - jp GateUpstairsScript_PrintIfFacingUp - -Route18GateUpstairsText_4999f: - TX_FAR _Route18GateUpstairsText_4999f - db "@" diff --git a/scripts/route19.asm b/scripts/route19.asm deleted file mode 100755 index 01ea5dce..00000000 --- a/scripts/route19.asm +++ /dev/null @@ -1,302 +0,0 @@ -Route19Script: - call EnableAutoTextBoxDrawing - ld hl, Route19TrainerHeader0 - ld de, Route19ScriptPointers - ld a, [wRoute19CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute19CurScript], a - ret - -Route19ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route19TextPointers: - dw Route19Text1 - dw Route19Text2 - dw Route19Text3 - dw Route19Text4 - dw Route19Text5 - dw Route19Text6 - dw Route19Text7 - dw Route19Text8 - dw Route19Text9 - dw Route19Text10 - dw Route19Text11 - -Route19TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_0 - dw Route19BattleText1 ; TextBeforeBattle - dw Route19AfterBattleText1 ; TextAfterBattle - dw Route19EndBattleText1 ; TextEndBattle - dw Route19EndBattleText1 ; TextEndBattle - -Route19TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1 - dw Route19BattleText2 ; TextBeforeBattle - dw Route19AfterBattleText2 ; TextAfterBattle - dw Route19EndBattleText2 ; TextEndBattle - dw Route19EndBattleText2 ; TextEndBattle - -Route19TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_2 - dw Route19BattleText3 ; TextBeforeBattle - dw Route19AfterBattleText3 ; TextAfterBattle - dw Route19EndBattleText3 ; TextEndBattle - dw Route19EndBattleText3 ; TextEndBattle - -Route19TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_3 - dw Route19BattleText4 ; TextBeforeBattle - dw Route19AfterBattleText4 ; TextAfterBattle - dw Route19EndBattleText4 ; TextEndBattle - dw Route19EndBattleText4 ; TextEndBattle - -Route19TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_4 - dw Route19BattleText5 ; TextBeforeBattle - dw Route19AfterBattleText5 ; TextAfterBattle - dw Route19EndBattleText5 ; TextEndBattle - dw Route19EndBattleText5 ; TextEndBattle - -Route19TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_5 - dw Route19BattleText6 ; TextBeforeBattle - dw Route19AfterBattleText6 ; TextAfterBattle - dw Route19EndBattleText6 ; TextEndBattle - dw Route19EndBattleText6 ; TextEndBattle - -Route19TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_6 - dw Route19BattleText7 ; TextBeforeBattle - dw Route19AfterBattleText7 ; TextAfterBattle - dw Route19EndBattleText7 ; TextEndBattle - dw Route19EndBattleText7 ; TextEndBattle - -Route19TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_7, 1 - dw Route19BattleText8 ; TextBeforeBattle - dw Route19AfterBattleText8 ; TextAfterBattle - dw Route19EndBattleText8 ; TextEndBattle - dw Route19EndBattleText8 ; TextEndBattle - -Route19TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_8, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_8, 1 - dw Route19BattleText9 ; TextBeforeBattle - dw Route19AfterBattleText9 ; TextAfterBattle - dw Route19EndBattleText9 ; TextEndBattle - dw Route19EndBattleText9 ; TextEndBattle - -Route19TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_9, 1 - dw Route19BattleText10 ; TextBeforeBattle - dw Route19AfterBattleText10 ; TextAfterBattle - dw Route19EndBattleText10 ; TextEndBattle - dw Route19EndBattleText10 ; TextEndBattle - - db $ff - -Route19Text1: - TX_ASM - ld hl, Route19TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route19Text2: - TX_ASM - ld hl, Route19TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route19Text3: - TX_ASM - ld hl, Route19TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route19Text4: - TX_ASM - ld hl, Route19TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route19Text5: - TX_ASM - ld hl, Route19TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route19Text6: - TX_ASM - ld hl, Route19TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route19Text7: - TX_ASM - ld hl, Route19TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route19Text8: - TX_ASM - ld hl, Route19TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route19Text9: - TX_ASM - ld hl, Route19TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route19Text10: - TX_ASM - ld hl, Route19TrainerHeader9 - call TalkToTrainer - jp TextScriptEnd - -Route19BattleText1: - TX_FAR _Route19BattleText1 - db "@" - -Route19EndBattleText1: - TX_FAR _Route19EndBattleText1 - db "@" - -Route19AfterBattleText1: - TX_FAR _Route19AfterBattleText1 - db "@" - -Route19BattleText2: - TX_FAR _Route19BattleText2 - db "@" - -Route19EndBattleText2: - TX_FAR _Route19EndBattleText2 - db "@" - -Route19AfterBattleText2: - TX_FAR _Route19AfterBattleText2 - db "@" - -Route19BattleText3: - TX_FAR _Route19BattleText3 - db "@" - -Route19EndBattleText3: - TX_FAR _Route19EndBattleText3 - db "@" - -Route19AfterBattleText3: - TX_FAR _Route19AfterBattleText3 - db "@" - -Route19BattleText4: - TX_FAR _Route19BattleText4 - db "@" - -Route19EndBattleText4: - TX_FAR _Route19EndBattleText4 - db "@" - -Route19AfterBattleText4: - TX_FAR _Route19AfterBattleText4 - db "@" - -Route19BattleText5: - TX_FAR _Route19BattleText5 - db "@" - -Route19EndBattleText5: - TX_FAR _Route19EndBattleText5 - db "@" - -Route19AfterBattleText5: - TX_FAR _Route19AfterBattleText5 - db "@" - -Route19BattleText6: - TX_FAR _Route19BattleText6 - db "@" - -Route19EndBattleText6: - TX_FAR _Route19EndBattleText6 - db "@" - -Route19AfterBattleText6: - TX_FAR _Route19AfterBattleText6 - db "@" - -Route19BattleText7: - TX_FAR _Route19BattleText7 - db "@" - -Route19EndBattleText7: - TX_FAR _Route19EndBattleText7 - db "@" - -Route19AfterBattleText7: - TX_FAR _Route19AfterBattleText7 - db "@" - -Route19BattleText8: - TX_FAR _Route19BattleText8 - db "@" - -Route19EndBattleText8: - TX_FAR _Route19EndBattleText8 - db "@" - -Route19AfterBattleText8: - TX_FAR _Route19AfterBattleText8 - db "@" - -Route19BattleText9: - TX_FAR _Route19BattleText9 - db "@" - -Route19EndBattleText9: - TX_FAR _Route19EndBattleText9 - db "@" - -Route19AfterBattleText9: - TX_FAR _Route19AfterBattleText9 - db "@" - -Route19BattleText10: - TX_FAR _Route19BattleText10 - db "@" - -Route19EndBattleText10: - TX_FAR _Route19EndBattleText10 - db "@" - -Route19AfterBattleText10: - TX_FAR _Route19AfterBattleText10 - db "@" - -Route19Text11: - TX_FAR _Route19Text11 - db "@" diff --git a/scripts/route2.asm b/scripts/route2.asm deleted file mode 100755 index 810792ef..00000000 --- a/scripts/route2.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route2Script: - jp EnableAutoTextBoxDrawing - -Route2TextPointers: - dw PickUpItemText - dw PickUpItemText - dw Route2Text3 - dw Route2Text4 - -Route2Text3: - TX_FAR _Route2Text3 - db "@" - -Route2Text4: - TX_FAR _Route2Text4 - db "@" diff --git a/scripts/route20.asm b/scripts/route20.asm deleted file mode 100755 index 53ff5e55..00000000 --- a/scripts/route20.asm +++ /dev/null @@ -1,353 +0,0 @@ -Route20Script: - CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS - call nz, Route20Script_50cc6 - call EnableAutoTextBoxDrawing - ld hl, Route20TrainerHeader0 - ld de, Route20ScriptPointers - ld a, [wRoute20CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute20CurScript], a - ret - -Route20Script_50cc6: - CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE - jr z, .asm_50cef - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 - call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 - call Route20Script_50d0c - ld hl, .MissableObjectIDs -.asm_50cdc - ld a, [hli] - cp $ff - jr z, .asm_50cef - push hl - call Route20Script_50d14 - pop hl - jr .asm_50cdc - -.MissableObjectIDs: - db HS_SEAFOAM_ISLANDS_2_BOULDER_1 - db HS_SEAFOAM_ISLANDS_2_BOULDER_2 - db HS_SEAFOAM_ISLANDS_3_BOULDER_1 - db HS_SEAFOAM_ISLANDS_3_BOULDER_2 - db HS_SEAFOAM_ISLANDS_4_BOULDER_3 - db HS_SEAFOAM_ISLANDS_4_BOULDER_4 - db $FF - -.asm_50cef - CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE - ret z - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 - call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 - call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 - call Route20Script_50d14 - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 - call Route20Script_50d14 - ret - -Route20Script_50d0c: - ld [wMissableObjectIndex], a - predef_jump ShowObject - -Route20Script_50d14: - ld [wMissableObjectIndex], a - predef_jump HideObject - -Route20ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route20TextPointers: - dw Route20Text1 - dw Route20Text2 - dw Route20Text3 - dw Route20Text4 - dw Route20Text5 - dw Route20Text6 - dw Route20Text7 - dw Route20Text8 - dw Route20Text9 - dw Route20Text10 - dw Route20Text11 - dw Route20Text12 - -Route20TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_0 - dw Route20BattleText1 ; TextBeforeBattle - dw Route20AfterBattleText1 ; TextAfterBattle - dw Route20EndBattleText1 ; TextEndBattle - dw Route20EndBattleText1 ; TextEndBattle - -Route20TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1 - dw Route20BattleText2 ; TextBeforeBattle - dw Route20AfterBattleText2 ; TextAfterBattle - dw Route20EndBattleText2 ; TextEndBattle - dw Route20EndBattleText2 ; TextEndBattle - -Route20TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 - dw Route20BattleText3 ; TextBeforeBattle - dw Route20AfterBattleText3 ; TextAfterBattle - dw Route20EndBattleText3 ; TextEndBattle - dw Route20EndBattleText3 ; TextEndBattle - -Route20TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 - dw Route20BattleText4 ; TextBeforeBattle - dw Route20AfterBattleText4 ; TextAfterBattle - dw Route20EndBattleText4 ; TextEndBattle - dw Route20EndBattleText4 ; TextEndBattle - -Route20TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 - dw Route20BattleText5 ; TextBeforeBattle - dw Route20AfterBattleText5 ; TextAfterBattle - dw Route20EndBattleText5 ; TextEndBattle - dw Route20EndBattleText5 ; TextEndBattle - -Route20TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 - dw Route20BattleText6 ; TextBeforeBattle - dw Route20AfterBattleText6 ; TextAfterBattle - dw Route20EndBattleText6 ; TextEndBattle - dw Route20EndBattleText6 ; TextEndBattle - -Route20TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 - dw Route20BattleText7 ; TextBeforeBattle - dw Route20AfterBattleText7 ; TextAfterBattle - dw Route20EndBattleText7 ; TextEndBattle - dw Route20EndBattleText7 ; TextEndBattle - -Route20TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1 - dw Route20BattleText8 ; TextBeforeBattle - dw Route20AfterBattleText8 ; TextAfterBattle - dw Route20EndBattleText8 ; TextEndBattle - dw Route20EndBattleText8 ; TextEndBattle - -Route20TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 - dw Route20BattleText9 ; TextBeforeBattle - dw Route20AfterBattleText9 ; TextAfterBattle - dw Route20EndBattleText9 ; TextEndBattle - dw Route20EndBattleText9 ; TextEndBattle - -Route20TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 - dw Route20BattleText10 ; TextBeforeBattle - dw Route20AfterBattleText10 ; TextAfterBattle - dw Route20EndBattleText10 ; TextEndBattle - dw Route20EndBattleText10 ; TextEndBattle - - db $ff - -Route20Text1: - TX_ASM - ld hl, Route20TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route20Text2: - TX_ASM - ld hl, Route20TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route20Text3: - TX_ASM - ld hl, Route20TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route20Text4: - TX_ASM - ld hl, Route20TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route20Text5: - TX_ASM - ld hl, Route20TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route20Text6: - TX_ASM - ld hl, Route20TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route20Text7: - TX_ASM - ld hl, Route20TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route20Text8: - TX_ASM - ld hl, Route20TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route20Text9: - TX_ASM - ld hl, Route20TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route20Text10: - TX_ASM - ld hl, Route20TrainerHeader9 - call TalkToTrainer - jp TextScriptEnd - -Route20BattleText1: - TX_FAR _Route20BattleText1 - db "@" - -Route20EndBattleText1: - TX_FAR _Route20EndBattleText1 - db "@" - -Route20AfterBattleText1: - TX_FAR _Route20AfterBattleText1 - db "@" - -Route20BattleText2: - TX_FAR _Route20BattleText2 - db "@" - -Route20EndBattleText2: - TX_FAR _Route20EndBattleText2 - db "@" - -Route20AfterBattleText2: - TX_FAR _Route20AfterBattleText2 - db "@" - -Route20BattleText3: - TX_FAR _Route20BattleText3 - db "@" - -Route20EndBattleText3: - TX_FAR _Route20EndBattleText3 - db "@" - -Route20AfterBattleText3: - TX_FAR _Route20AfterBattleText3 - db "@" - -Route20BattleText4: - TX_FAR _Route20BattleText4 - db "@" - -Route20EndBattleText4: - TX_FAR _Route20EndBattleText4 - db "@" - -Route20AfterBattleText4: - TX_FAR _Route20AfterBattleText4 - db "@" - -Route20BattleText5: - TX_FAR _Route20BattleText5 - db "@" - -Route20EndBattleText5: - TX_FAR _Route20EndBattleText5 - db "@" - -Route20AfterBattleText5: - TX_FAR _Route20AfterBattleText5 - db "@" - -Route20BattleText6: - TX_FAR _Route20BattleText6 - db "@" - -Route20EndBattleText6: - TX_FAR _Route20EndBattleText6 - db "@" - -Route20AfterBattleText6: - TX_FAR _Route20AfterBattleText6 - db "@" - -Route20BattleText7: - TX_FAR _Route20BattleText7 - db "@" - -Route20EndBattleText7: - TX_FAR _Route20EndBattleText7 - db "@" - -Route20AfterBattleText7: - TX_FAR _Route20AfterBattleText7 - db "@" - -Route20BattleText8: - TX_FAR _Route20BattleText8 - db "@" - -Route20EndBattleText8: - TX_FAR _Route20EndBattleText8 - db "@" - -Route20AfterBattleText8: - TX_FAR _Route20AfterBattleText8 - db "@" - -Route20BattleText9: - TX_FAR _Route20BattleText9 - db "@" - -Route20EndBattleText9: - TX_FAR _Route20EndBattleText9 - db "@" - -Route20AfterBattleText9: - TX_FAR _Route20AfterBattleText9 - db "@" - -Route20BattleText10: - TX_FAR _Route20BattleText10 - db "@" - -Route20EndBattleText10: - TX_FAR _Route20EndBattleText10 - db "@" - -Route20AfterBattleText10: - TX_FAR _Route20AfterBattleText10 - db "@" - -Route20Text12: -Route20Text11: - TX_FAR _Route20Text11 - db "@" diff --git a/scripts/route21.asm b/scripts/route21.asm deleted file mode 100755 index dcdc8022..00000000 --- a/scripts/route21.asm +++ /dev/null @@ -1,269 +0,0 @@ -Route21Script: - call EnableAutoTextBoxDrawing - ld hl, Route21TrainerHeader0 - ld de, Route21ScriptPointers - ld a, [wRoute21CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute21CurScript], a - ret - -Route21ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route21TextPointers: - dw Route21Text1 - dw Route21Text2 - dw Route21Text3 - dw Route21Text4 - dw Route21Text5 - dw Route21Text6 - dw Route21Text7 - dw Route21Text8 - dw Route21Text9 - -Route21TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0 - dw Route21BattleText1 ; TextBeforeBattle - dw Route21AfterBattleText1 ; TextAfterBattle - dw Route21EndBattleText1 ; TextEndBattle - dw Route21EndBattleText1 ; TextEndBattle - -Route21TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1 - dw Route21BattleText2 ; TextBeforeBattle - dw Route21AfterBattleText2 ; TextAfterBattle - dw Route21EndBattleText2 ; TextEndBattle - dw Route21EndBattleText2 ; TextEndBattle - -Route21TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2 - dw Route21BattleText3 ; TextBeforeBattle - dw Route21AfterBattleText3 ; TextAfterBattle - dw Route21EndBattleText3 ; TextEndBattle - dw Route21EndBattleText3 ; TextEndBattle - -Route21TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3 - dw Route21BattleText4 ; TextBeforeBattle - dw Route21AfterBattleText4 ; TextAfterBattle - dw Route21EndBattleText4 ; TextEndBattle - dw Route21EndBattleText4 ; TextEndBattle - -Route21TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4 - dw Route21BattleText5 ; TextBeforeBattle - dw Route21AfterBattleText5 ; TextAfterBattle - dw Route21EndBattleText5 ; TextEndBattle - dw Route21EndBattleText5 ; TextEndBattle - -Route21TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5 - dw Route21BattleText6 ; TextBeforeBattle - dw Route21AfterBattleText6 ; TextAfterBattle - dw Route21EndBattleText6 ; TextEndBattle - dw Route21EndBattleText6 ; TextEndBattle - -Route21TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6 - dw Route21BattleText7 ; TextBeforeBattle - dw Route21AfterBattleText7 ; TextAfterBattle - dw Route21EndBattleText7 ; TextEndBattle - dw Route21EndBattleText7 ; TextEndBattle - -Route21TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1 - dw Route21BattleText8 ; TextBeforeBattle - dw Route21AfterBattleText8 ; TextAfterBattle - dw Route21EndBattleText8 ; TextEndBattle - dw Route21EndBattleText8 ; TextEndBattle - -Route21TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1 - dw Route21BattleText9 ; TextBeforeBattle - dw Route21AfterBattleText9 ; TextAfterBattle - dw Route21EndBattleText9 ; TextEndBattle - dw Route21EndBattleText9 ; TextEndBattle - - db $ff - -Route21Text1: - TX_ASM - ld hl, Route21TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route21Text2: - TX_ASM - ld hl, Route21TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route21Text3: - TX_ASM - ld hl, Route21TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route21Text4: - TX_ASM - ld hl, Route21TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route21Text5: - TX_ASM - ld hl, Route21TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route21Text6: - TX_ASM - ld hl, Route21TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route21Text7: - TX_ASM - ld hl, Route21TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route21Text8: - TX_ASM - ld hl, Route21TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route21Text9: - TX_ASM - ld hl, Route21TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route21BattleText1: - TX_FAR _Route21BattleText1 - db "@" - -Route21EndBattleText1: - TX_FAR _Route21EndBattleText1 - db "@" - -Route21AfterBattleText1: - TX_FAR _Route21AfterBattleText1 - db "@" - -Route21BattleText2: - TX_FAR _Route21BattleText2 - db "@" - -Route21EndBattleText2: - TX_FAR _Route21EndBattleText2 - db "@" - -Route21AfterBattleText2: - TX_FAR _Route21AfterBattleText2 - db "@" - -Route21BattleText3: - TX_FAR _Route21BattleText3 - db "@" - -Route21EndBattleText3: - TX_FAR _Route21EndBattleText3 - db "@" - -Route21AfterBattleText3: - TX_FAR _Route21AfterBattleText3 - db "@" - -Route21BattleText4: - TX_FAR _Route21BattleText4 - db "@" - -Route21EndBattleText4: - TX_FAR _Route21EndBattleText4 - db "@" - -Route21AfterBattleText4: - TX_FAR _Route21AfterBattleText4 - db "@" - -Route21BattleText5: - TX_FAR _Route21BattleText5 - db "@" - -Route21EndBattleText5: - TX_FAR _Route21EndBattleText5 - db "@" - -Route21AfterBattleText5: - TX_FAR _Route21AfterBattleText5 - db "@" - -Route21BattleText6: - TX_FAR _Route21BattleText6 - db "@" - -Route21EndBattleText6: - TX_FAR _Route21EndBattleText6 - db "@" - -Route21AfterBattleText6: - TX_FAR _Route21AfterBattleText6 - db "@" - -Route21BattleText7: - TX_FAR _Route21BattleText7 - db "@" - -Route21EndBattleText7: - TX_FAR _Route21EndBattleText7 - db "@" - -Route21AfterBattleText7: - TX_FAR _Route21AfterBattleText7 - db "@" - -Route21BattleText8: - TX_FAR _Route21BattleText8 - db "@" - -Route21EndBattleText8: - TX_FAR _Route21EndBattleText8 - db "@" - -Route21AfterBattleText8: - TX_FAR _Route21AfterBattleText8 - db "@" - -Route21BattleText9: - TX_FAR _Route21BattleText9 - db "@" - -Route21EndBattleText9: - TX_FAR _Route21EndBattleText9 - db "@" - -Route21AfterBattleText9: - TX_FAR _Route21AfterBattleText9 - db "@" diff --git a/scripts/route22.asm b/scripts/route22.asm deleted file mode 100755 index 86c3768b..00000000 --- a/scripts/route22.asm +++ /dev/null @@ -1,445 +0,0 @@ -Route22Script: - call EnableAutoTextBoxDrawing - ld hl, Route22ScriptPointers - ld a, [wRoute22CurScript] - jp CallFunctionInTable - -Route22ScriptPointers: - dw Route22Script0 - dw Route22Script1 - dw Route22Script2 - dw Route22Script3 - dw Route22Script4 - dw Route22Script5 - dw Route22Script6 - dw Route22Script7 - -Route22Script_50ece: - xor a - ld [wJoyIgnore], a - ld [wRoute22CurScript], a -Route22Script7: - ret - -Route22Script_50ed6: - ld a, [wRivalStarter] - ld b, a -.asm_50eda - ld a, [hli] - cp b - jr z, .asm_50ee1 - inc hl - jr .asm_50eda -.asm_50ee1 - ld a, [hl] - ld [wTrainerNo], a - ret - -Route22MoveRivalSprite: - ld de, Route22RivalMovementData - ld a, [wcf0d] - cp $1 - jr z, .asm_50ef1 - inc de -.asm_50ef1 - call MoveSprite - ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a - jp SetSpriteFacingDirectionAndDelay - -Route22RivalMovementData: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -Route22Script0: - CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE - ret z - ld hl, .Route22RivalBattleCoords - call ArePlayerCoordsInArray - ret nc - ld a, [wCoordIndex] - ld [wcf0d], a - xor a - ld [hJoyHeld], a - ld a, $f0 - ld [wJoyIgnore], a - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - CheckEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE - jr nz, .firstRivalBattle - CheckEventReuseA EVENT_2ND_ROUTE22_RIVAL_BATTLE ; is this the rival at the end of the game? - jp nz, Route22Script_5104e - ret - -.Route22RivalBattleCoords - db $04, $1D - db $05, $1D - db $FF - -.firstRivalBattle - ld a, $1 - ld [wEmotionBubbleSpriteIndex], a - xor a ; EXCLAMATION_BUBBLE - ld [wWhichEmotionBubble], a - predef EmotionBubble - ld a, [wWalkBikeSurfState] - and a - jr z, .asm_50f4e - ld a, $ff - ld [wNewSoundID], a - call PlaySound -.asm_50f4e - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld a, $1 - ld [H_SPRITEINDEX], a - call Route22MoveRivalSprite - ld a, $1 - ld [wRoute22CurScript], a - ret - -Route22Script1: - ld a, [wd730] - bit 0, a - ret nz - ld a, [wcf0d] - cp $1 - jr nz, .asm_50f78 - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld a, SPRITE_FACING_UP - jr .asm_50f7a -.asm_50f78 - ld a, SPRITE_FACING_RIGHT -.asm_50f7a - ld [hSpriteFacingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteFacingDirectionAndDelay - xor a - ld [wJoyIgnore], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, Route22RivalDefeatedText1 - ld de, Route22Text_511bc - call SaveEndBattleTextPointers - ld a, OPP_SONY1 - ld [wCurOpponent], a - ld hl, StarterMons_50faf - call Route22Script_50ed6 - ld a, $2 - ld [wRoute22CurScript], a - ret - -StarterMons_50faf: -; starter the rival picked, rival trainer number - db STARTER2,$04 - db STARTER3,$05 - db STARTER1,$06 - -Route22Script2: - ld a, [wIsInBattle] - cp $ff - jp z, Route22Script_50ece - ld a, [wSpriteStateData1 + 9] - and a ; cp SPRITE_FACING_DOWN - jr nz, .notDown - ld a, SPRITE_FACING_UP - jr .done -.notDown - ld a, SPRITE_FACING_RIGHT -.done - ld [hSpriteFacingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteFacingDirectionAndDelay - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld a, [wcf0d] - cp $1 - jr nz, .asm_50fff - call Route22Script_51008 - jr .asm_51002 -.asm_50fff - call Route22Script_5100d -.asm_51002 - ld a, $3 - ld [wRoute22CurScript], a - ret - -Route22Script_51008: - ld de, Route22RivalExitMovementData1 - jr Route22MoveRival1 - -Route22Script_5100d: - ld de, Route22RivalExitMovementData2 -Route22MoveRival1: - ld a, $1 - ld [H_SPRITEINDEX], a - jp MoveSprite - -Route22RivalExitMovementData1: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -Route22RivalExitMovementData2: - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -Route22Script3: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, HS_ROUTE_22_RIVAL_1 - ld [wMissableObjectIndex], a - predef HideObject - call PlayDefaultMusic - ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - ld a, $0 - ld [wRoute22CurScript], a - ret - -Route22Script_5104e: - ld a, $2 - ld [wEmotionBubbleSpriteIndex], a - xor a ; EXCLAMATION_BUBBLE - ld [wWhichEmotionBubble], a - predef EmotionBubble - ld a, [wWalkBikeSurfState] - and a - jr z, .skipYVisibilityTesta - ld a, $ff - ld [wNewSoundID], a - call PlaySound -.skipYVisibilityTesta - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateTempo - ld a, $2 - ld [H_SPRITEINDEX], a - call Route22MoveRivalSprite - ld a, $4 - ld [wRoute22CurScript], a - ret - -Route22Script4: - ld a, [wd730] - bit 0, a - ret nz - ld a, $2 - ld [H_SPRITEINDEX], a - ld a, [wcf0d] - cp $1 - jr nz, .asm_510a1 - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld a, SPRITE_FACING_UP - jr .asm_510a8 -.asm_510a1 - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - ld a, SPRITE_FACING_RIGHT -.asm_510a8 - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - xor a - ld [wJoyIgnore], a - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, Route22RivalDefeatedText2 - ld de, Route22Text_511d0 - call SaveEndBattleTextPointers - ld a, OPP_SONY2 - ld [wCurOpponent], a - ld hl, StarterMons_510d9 - call Route22Script_50ed6 - ld a, $5 - ld [wRoute22CurScript], a - ret - -StarterMons_510d9: - db STARTER2,$0a - db STARTER3,$0b - db STARTER1,$0c - -Route22Script5: - ld a, [wIsInBattle] - cp $ff - jp z, Route22Script_50ece - ld a, $2 - ld [H_SPRITEINDEX], a - ld a, [wcf0d] - cp $1 - jr nz, .asm_510fb - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld a, SPRITE_FACING_UP - jr .asm_51102 -.asm_510fb - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - ld a, SPRITE_FACING_RIGHT -.asm_51102 - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStartAndTempo - ld a, [wcf0d] - cp $1 - jr nz, .asm_51134 - call Route22Script_5113d - jr .asm_51137 -.asm_51134 - call Route22Script_51142 -.asm_51137 - ld a, $6 - ld [wRoute22CurScript], a - ret - -Route22Script_5113d: - ld de, MovementData_5114c - jr Route22MoveRival2 - -Route22Script_51142: - ld de, MovementData_5114d -Route22MoveRival2: - ld a, $2 - ld [H_SPRITEINDEX], a - jp MoveSprite - -MovementData_5114c: - db NPC_MOVEMENT_LEFT - -MovementData_5114d: - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_LEFT - db $FF - -Route22Script6: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, HS_ROUTE_22_RIVAL_2 - ld [wMissableObjectIndex], a - predef HideObject - call PlayDefaultMusic - ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - ld a, $7 - ld [wRoute22CurScript], a - ret - -Route22TextPointers: - dw Route22Text1 - dw Route22Text2 - dw Route22FrontGateText - -Route22Text1: - TX_ASM - CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - jr z, .asm_5118b - ld hl, Route22RivalAfterBattleText1 - call PrintText - jr .asm_51191 -.asm_5118b - ld hl, Route22RivalBeforeBattleText1 - call PrintText -.asm_51191 - jp TextScriptEnd - -Route22Text2: - TX_ASM - CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE - jr z, .asm_511a4 - ld hl, Route22RivalAfterBattleText2 - call PrintText - jr .asm_511aa -.asm_511a4 - ld hl, Route22RivalBeforeBattleText2 - call PrintText -.asm_511aa - jp TextScriptEnd - -Route22RivalBeforeBattleText1: - TX_FAR _Route22RivalBeforeBattleText1 - db "@" - -Route22RivalAfterBattleText1: - TX_FAR _Route22RivalAfterBattleText1 - db "@" - -Route22RivalDefeatedText1: - TX_FAR _Route22RivalDefeatedText1 - db "@" - -Route22Text_511bc: - TX_FAR _Route22Text_511bc - db "@" - -Route22RivalBeforeBattleText2: - TX_FAR _Route22RivalBeforeBattleText2 - db "@" - -Route22RivalAfterBattleText2: - TX_FAR _Route22RivalAfterBattleText2 - db "@" - -Route22RivalDefeatedText2: - TX_FAR _Route22RivalDefeatedText2 - db "@" - -Route22Text_511d0: - TX_FAR _Route22Text_511d0 - db "@" - -Route22FrontGateText: - TX_FAR _Route22FrontGateText - db "@" diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm deleted file mode 100755 index ee2e5b6b..00000000 --- a/scripts/route22gate.asm +++ /dev/null @@ -1,93 +0,0 @@ -Route22GateScript: - call EnableAutoTextBoxDrawing - ld hl, Route22GateScriptPointers - ld a, [wRoute22GateCurScript] - call CallFunctionInTable - ld a, [wYCoord] - cp $4 - ld a, ROUTE_23 - jr c, .asm_1e69a - ld a, ROUTE_22 -.asm_1e69a - ld [wLastMap], a - ret - -Route22GateScriptPointers: - dw Route22GateScript0 - dw Route22GateScript1 - dw Route22GateScript2 - -Route22GateScript0: - ld hl, Route22GateScriptCoords - call ArePlayerCoordsInArray - ret nc - xor a - ld [hJoyHeld], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -Route22GateScriptCoords: - db 2,4 - db 2,5 - db $ff - -Route22GateScript_1e6ba: - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - ld [wSpriteStateData1 + 9], a - ld [wJoyIgnore], a - jp StartSimulatingJoypadStates - -Route22GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - xor a - ld [wJoyIgnore], a - call Delay3 - ld a, $0 - ld [wRoute22GateCurScript], a -Route22GateScript2: - ret - -Route22GateTextPointers: - dw Route22GateText1 - -Route22GateText1: - TX_ASM - ld a, [wObtainedBadges] - bit 0, a - jr nz, .asm_1e6f6 - ld hl, Route22GateText_1e704 - call PrintText - call Route22GateScript_1e6ba - ld a, $1 - jr .asm_1e6fe -.asm_1e6f6 - ld hl, Route22GateText_1e71a - call PrintText - ld a, $2 -.asm_1e6fe - ld [wRoute22GateCurScript], a - jp TextScriptEnd - -Route22GateText_1e704: - TX_FAR _Route22GateText_1e704 - TX_ASM - ld a, SFX_DENIED - call PlaySoundWaitForCurrent - call WaitForSoundToFinish - ld hl, Route22GateText_1e715 - ret - -Route22GateText_1e715: - TX_FAR _Route22GateText_1e715 - db "@" - -Route22GateText_1e71a: - TX_FAR _Route22GateText_1e71a - TX_SFX_ITEM_1 - db "@" diff --git a/scripts/route23.asm b/scripts/route23.asm deleted file mode 100755 index 4eb6b5f7..00000000 --- a/scripts/route23.asm +++ /dev/null @@ -1,236 +0,0 @@ -Route23Script: - call Route23Script_511e9 - call EnableAutoTextBoxDrawing - ld hl, Route23ScriptPointers - ld a, [wRoute23CurScript] - jp CallFunctionInTable - -Route23Script_511e9: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - ret z - ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 - ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 - ld a, HS_VICTORY_ROAD_3_BOULDER - ld [wMissableObjectIndex], a - predef ShowObject - ld a, HS_VICTORY_ROAD_2_BOULDER - ld [wMissableObjectIndex], a - predef_jump HideObject - -Route23ScriptPointers: - dw Route23Script0 - dw Route23Script1 - dw Route23Script2 - -Route23Script0: - ld hl, YCoordsData_51255 - ld a, [wYCoord] - ld b, a - ld e, $0 - EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK -.asm_51224 - ld a, [hli] - cp $ff - ret z - inc e - dec c - cp b - jr nz, .asm_51224 - cp $23 - jr nz, .asm_51237 - ld a, [wXCoord] - cp $e - ret nc -.asm_51237 - ld a, e - ld [hSpriteIndexOrTextID], a - ld a, c - ld [wWhichBadge], a - ld b, FLAG_TEST - EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK - predef FlagActionPredef - ld a, c - and a - ret nz - call Route23Script_5125d - call DisplayTextID - xor a - ld [hJoyHeld], a - ret - -YCoordsData_51255: - db $23,$38,$55,$60,$69,$77,$88,$FF - -Route23Script_5125d: - ld hl, BadgeTextPointers - ld a, [wWhichBadge] - ld c, a - ld b, 0 - add hl, bc - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - ld de, wcd6d -.copyTextLoop - ld a, [hli] - ld [de], a - inc de - cp "@" - jr nz, .copyTextLoop - ret - -BadgeTextPointers: - dw CascadeBadgeText - dw ThunderBadgeText - dw RainbowBadgeText - dw SoulBadgeText - dw MarshBadgeText - dw VolcanoBadgeText - dw EarthBadgeText - -EarthBadgeText: - db "EARTHBADGE@" - -VolcanoBadgeText: - db "VOLCANOBADGE@" - -MarshBadgeText: - db "MARSHBADGE@" - -SoulBadgeText: - db "SOULBADGE@" - -RainbowBadgeText: - db "RAINBOWBADGE@" - -ThunderBadgeText: - db "THUNDERBADGE@" - -CascadeBadgeText: - db "CASCADEBADGE@" - -Route23Script_512d8: - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - xor a - ld [wSpriteStateData1 + 9], a - ld [wJoyIgnore], a - jp StartSimulatingJoypadStates - -Route23Script1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz -Route23Script2: - ld a, $0 - ld [wRoute23CurScript], a - ret - -Route23TextPointers: - dw Route23Text1 - dw Route23Text2 - dw Route23Text3 - dw Route23Text4 - dw Route23Text5 - dw Route23Text6 - dw Route23Text7 - dw Route23Text8 - -Route23Text1: - TX_ASM - EventFlagBit a, EVENT_PASSED_EARTHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Text2: - TX_ASM - EventFlagBit a, EVENT_PASSED_VOLCANOBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Text3: - TX_ASM - EventFlagBit a, EVENT_PASSED_MARSHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Text4: - TX_ASM - EventFlagBit a, EVENT_PASSED_SOULBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Text5: - TX_ASM - EventFlagBit a, EVENT_PASSED_RAINBOWBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Text6: - TX_ASM - EventFlagBit a, EVENT_PASSED_THUNDERBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Text7: - TX_ASM - EventFlagBit a, EVENT_PASSED_CASCADEBADGE_CHECK - call Route23Script_51346 - jp TextScriptEnd - -Route23Script_51346: - ld [wWhichBadge], a - call Route23Script_5125d - ld a, [wWhichBadge] - inc a - ld c, a - ld b, FLAG_TEST - ld hl, wObtainedBadges - predef FlagActionPredef - ld a, c - and a - jr nz, .asm_5136e - ld hl, VictoryRoadGuardText1 - call PrintText - call Route23Script_512d8 - ld a, $1 - ld [wRoute23CurScript], a - ret -.asm_5136e - ld hl, VictoryRoadGuardText2 - call PrintText - ld a, [wWhichBadge] - ld c, a - ld b, FLAG_SET - EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK - predef FlagActionPredef - ld a, $2 - ld [wRoute23CurScript], a - ret - -Route23Script_51388: - ld hl, VictoryRoadGuardText2 - jp PrintText - -VictoryRoadGuardText1: - TX_FAR _VictoryRoadGuardText1 - TX_ASM - ld a, SFX_DENIED - call PlaySoundWaitForCurrent - call WaitForSoundToFinish - jp TextScriptEnd - -VictoryRoadGuardText2: - TX_FAR _VictoryRoadGuardText2 - TX_SFX_ITEM_1 - TX_FAR _VictoryRoadGuardText_513a3 - db "@" - -Route23Text8: - TX_FAR _Route23Text8 - db "@" diff --git a/scripts/route24.asm b/scripts/route24.asm deleted file mode 100755 index f55d2268..00000000 --- a/scripts/route24.asm +++ /dev/null @@ -1,319 +0,0 @@ -Route24Script: - call EnableAutoTextBoxDrawing - ld hl, Route24TrainerHeader0 - ld de, Route24ScriptPointers - ld a, [wRoute24CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute24CurScript], a - ret - -Route24Script_513c0: - xor a - ld [wJoyIgnore], a - ld [wRoute24CurScript], a - ld [wCurMapScript], a - ret - -Route24ScriptPointers: - dw Route24Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route24Script3 - dw Route24Script4 - -Route24Script0: - CheckEvent EVENT_GOT_NUGGET - jp nz, CheckFightingMapTrainers - ld hl, CoordsData_5140e - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyHeld], a - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE - ret z - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $4 - ld [wRoute24CurScript], a - ld [wCurMapScript], a - ret - -CoordsData_5140e: - db $0F,$0A,$FF - -Route24Script4: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - ld a, $0 - ld [wRoute24CurScript], a - ld [wCurMapScript], a - ret - -Route24Script3: - ld a, [wIsInBattle] - cp $ff - jp z, Route24Script_513c0 - call UpdateSprites - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_ROUTE24_ROCKET - ld a, $1 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wRoute24CurScript], a - ld [wCurMapScript], a - ret - -Route24TextPointers: - dw Route24Text1 - dw Route24Text2 - dw Route24Text3 - dw Route24Text4 - dw Route24Text5 - dw Route24Text6 - dw Route24Text7 - dw PickUpItemText - -Route24TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_0 - dw Route24BattleText1 ; TextBeforeBattle - dw Route24AfterBattleText1 ; TextAfterBattle - dw Route24EndBattleText1 ; TextEndBattle - dw Route24EndBattleText1 ; TextEndBattle - -Route24TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1 - dw Route24BattleText2 ; TextBeforeBattle - dw Route24AfterBattleText2 ; TextAfterBattle - dw Route24EndBattleText2 ; TextEndBattle - dw Route24EndBattleText2 ; TextEndBattle - -Route24TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 - dw Route24BattleText3 ; TextBeforeBattle - dw Route24AfterBattleText3 ; TextAfterBattle - dw Route24EndBattleText3 ; TextEndBattle - dw Route24EndBattleText3 ; TextEndBattle - -Route24TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 - dw Route24BattleText4 ; TextBeforeBattle - dw Route24AfterBattleText4 ; TextAfterBattle - dw Route24EndBattleText4 ; TextEndBattle - dw Route24EndBattleText4 ; TextEndBattle - -Route24TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 - dw Route24BattleText5 ; TextBeforeBattle - dw Route24AfterBattleText5 ; TextAfterBattle - dw Route24EndBattleText5 ; TextEndBattle - dw Route24EndBattleText5 ; TextEndBattle - -Route24TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 - dw Route24BattleText6 ; TextBeforeBattle - dw Route24AfterBattleText6 ; TextAfterBattle - dw Route24EndBattleText6 ; TextEndBattle - dw Route24EndBattleText6 ; TextEndBattle - - db $ff - -Route24Text1: - TX_ASM - ResetEvent EVENT_NUGGET_REWARD_AVAILABLE - CheckEvent EVENT_GOT_NUGGET - jr nz, .asm_514f9 - ld hl, Route24Text_51510 - call PrintText - lb bc, NUGGET, 1 - call GiveItem - jr nc, .BagFull - SetEvent EVENT_GOT_NUGGET - ld hl, Route24Text_5151a - call PrintText - ld hl, Route24Text_51526 - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, Route24Text_5152b - ld de, Route24Text_5152b - call SaveEndBattleTextPointers - ld a, [hSpriteIndexOrTextID] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wRoute24CurScript], a - ld [wCurMapScript], a - jp TextScriptEnd -.asm_514f9 - ld hl, Route24Text_51530 - call PrintText - jp TextScriptEnd -.BagFull - ld hl, Route24Text_51521 - call PrintText - SetEvent EVENT_NUGGET_REWARD_AVAILABLE - jp TextScriptEnd - -Route24Text_51510: - TX_FAR _Route24Text_51510 - TX_SFX_ITEM_1 - TX_FAR _Route24Text_51515 - db "@" - -Route24Text_5151a: - TX_FAR _Route24Text_5151a - TX_SFX_ITEM_1 - TX_BLINK - db "@" - -Route24Text_51521: - TX_FAR _Route24Text_51521 - db "@" - -Route24Text_51526: - TX_FAR _Route24Text_51526 - db "@" - -Route24Text_5152b: - TX_FAR _Route24Text_5152b - db "@" - -Route24Text_51530: - TX_FAR _Route24Text_51530 - db "@" - -Route24Text2: - TX_ASM - ld hl, Route24TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route24Text3: - TX_ASM - ld hl, Route24TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route24Text4: - TX_ASM - ld hl, Route24TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route24Text5: - TX_ASM - ld hl, Route24TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route24Text6: - TX_ASM - ld hl, Route24TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route24Text7: - TX_ASM - ld hl, Route24TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route24BattleText1: - TX_FAR _Route24BattleText1 - db "@" - -Route24EndBattleText1: - TX_FAR _Route24EndBattleText1 - db "@" - -Route24AfterBattleText1: - TX_FAR _Route24AfterBattleText1 - db "@" - -Route24BattleText2: - TX_FAR _Route24BattleText2 - db "@" - -Route24EndBattleText2: - TX_FAR _Route24EndBattleText2 - db "@" - -Route24AfterBattleText2: - TX_FAR _Route24AfterBattleText2 - db "@" - -Route24BattleText3: - TX_FAR _Route24BattleText3 - db "@" - -Route24EndBattleText3: - TX_FAR _Route24EndBattleText3 - db "@" - -Route24AfterBattleText3: - TX_FAR _Route24AfterBattleText3 - db "@" - -Route24BattleText4: - TX_FAR _Route24BattleText4 - db "@" - -Route24EndBattleText4: - TX_FAR _Route24EndBattleText4 - db "@" - -Route24AfterBattleText4: - TX_FAR _Route24AfterBattleText4 - db "@" - -Route24BattleText5: - TX_FAR _Route24BattleText5 - db "@" - -Route24EndBattleText5: - TX_FAR _Route24EndBattleText5 - db "@" - -Route24AfterBattleText5: - TX_FAR _Route24AfterBattleText5 - db "@" - -Route24BattleText6: - TX_FAR _Route24BattleText6 - db "@" - -Route24EndBattleText6: - TX_FAR _Route24EndBattleText6 - db "@" - -Route24AfterBattleText6: - TX_FAR _Route24AfterBattleText6 - db "@" diff --git a/scripts/route25.asm b/scripts/route25.asm deleted file mode 100755 index c83c725b..00000000 --- a/scripts/route25.asm +++ /dev/null @@ -1,303 +0,0 @@ -Route25Script: - call Route25Script_515e1 - call EnableAutoTextBoxDrawing - ld hl, Route25TrainerHeader0 - ld de, Route25ScriptPointers - ld a, [wRoute25CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute25CurScript], a - ret - -Route25Script_515e1: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - ret z - CheckEventHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING - ret nz - CheckEventReuseHL EVENT_MET_BILL_2 - jr nz, .asm_515ff - ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR - ld a, HS_BILL_POKEMON - ld [wMissableObjectIndex], a - predef_jump ShowObject -.asm_515ff - CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 - ret z - SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING - ld a, HS_NUGGET_BRIDGE_GUY - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_BILL_1 - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_BILL_2 - ld [wMissableObjectIndex], a - predef_jump ShowObject - -Route25ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route25TextPointers: - dw Route25Text1 - dw Route25Text2 - dw Route25Text3 - dw Route25Text4 - dw Route25Text5 - dw Route25Text6 - dw Route25Text7 - dw Route25Text8 - dw Route25Text9 - dw PickUpItemText - dw Route25Text11 - -Route25TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_0 - dw Route25BattleText1 ; TextBeforeBattle - dw Route25AfterBattleText1 ; TextAfterBattle - dw Route25EndBattleText1 ; TextEndBattle - dw Route25EndBattleText1 ; TextEndBattle - -Route25TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1 - dw Route25BattleText2 ; TextBeforeBattle - dw Route25AfterBattleText2 ; TextAfterBattle - dw Route25EndBattleText2 ; TextEndBattle - dw Route25EndBattleText2 ; TextEndBattle - -Route25TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 - dw Route25BattleText3 ; TextBeforeBattle - dw Route25AfterBattleText3 ; TextAfterBattle - dw Route25EndBattleText3 ; TextEndBattle - dw Route25EndBattleText3 ; TextEndBattle - -Route25TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 - dw Route25BattleText4 ; TextBeforeBattle - dw Route25AfterBattleText4 ; TextAfterBattle - dw Route25EndBattleText4 ; TextEndBattle - dw Route25EndBattleText4 ; TextEndBattle - -Route25TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 - dw Route25BattleText5 ; TextBeforeBattle - dw Route25AfterBattleText5 ; TextAfterBattle - dw Route25EndBattleText5 ; TextEndBattle - dw Route25EndBattleText5 ; TextEndBattle - -Route25TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 - dw Route25BattleText6 ; TextBeforeBattle - dw Route25AfterBattleText6 ; TextAfterBattle - dw Route25EndBattleText6 ; TextEndBattle - dw Route25EndBattleText6 ; TextEndBattle - -Route25TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 - dw Route25BattleText7 ; TextBeforeBattle - dw Route25AfterBattleText7 ; TextAfterBattle - dw Route25EndBattleText7 ; TextEndBattle - dw Route25EndBattleText7 ; TextEndBattle - -Route25TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1 - dw Route25BattleText8 ; TextBeforeBattle - dw Route25AfterBattleText8 ; TextAfterBattle - dw Route25EndBattleText8 ; TextEndBattle - dw Route25EndBattleText8 ; TextEndBattle - -Route25TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 - dw Route25BattleText9 ; TextBeforeBattle - dw Route25AfterBattleText9 ; TextAfterBattle - dw Route25EndBattleText9 ; TextEndBattle - dw Route25EndBattleText9 ; TextEndBattle - - db $ff - -Route25Text1: - TX_ASM - ld hl, Route25TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route25Text2: - TX_ASM - ld hl, Route25TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route25Text3: - TX_ASM - ld hl, Route25TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route25Text4: - TX_ASM - ld hl, Route25TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route25Text5: - TX_ASM - ld hl, Route25TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route25Text6: - TX_ASM - ld hl, Route25TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route25Text7: - TX_ASM - ld hl, Route25TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route25Text8: - TX_ASM - ld hl, Route25TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route25Text9: - TX_ASM - ld hl, Route25TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route25BattleText1: - TX_FAR _Route25BattleText1 - db "@" - -Route25EndBattleText1: - TX_FAR _Route25EndBattleText1 - db "@" - -Route25AfterBattleText1: - TX_FAR _Route25AfterBattleText1 - db "@" - -Route25BattleText2: - TX_FAR _Route25BattleText2 - db "@" - -Route25EndBattleText2: - TX_FAR _Route25EndBattleText2 - db "@" - -Route25AfterBattleText2: - TX_FAR _Route25AfterBattleText2 - db "@" - -Route25BattleText3: - TX_FAR _Route25BattleText3 - db "@" - -Route25EndBattleText3: - TX_FAR _Route25EndBattleText3 - db "@" - -Route25AfterBattleText3: - TX_FAR _Route25AfterBattleText3 - db "@" - -Route25BattleText4: - TX_FAR _Route25BattleText4 - db "@" - -Route25EndBattleText4: - TX_FAR _Route25EndBattleText4 - db "@" - -Route25AfterBattleText4: - TX_FAR _Route25AfterBattleText4 - db "@" - -Route25BattleText5: - TX_FAR _Route25BattleText5 - db "@" - -Route25EndBattleText5: - TX_FAR _Route25EndBattleText5 - db "@" - -Route25AfterBattleText5: - TX_FAR _Route25AfterBattleText5 - db "@" - -Route25BattleText6: - TX_FAR _Route25BattleText6 - db "@" - -Route25EndBattleText6: - TX_FAR _Route25EndBattleText6 - db "@" - -Route25AfterBattleText6: - TX_FAR _Route25AfterBattleText6 - db "@" - -Route25BattleText7: - TX_FAR _Route25BattleText7 - db "@" - -Route25EndBattleText7: - TX_FAR _Route25EndBattleText7 - db "@" - -Route25AfterBattleText7: - TX_FAR _Route25AfterBattleText7 - db "@" - -Route25BattleText8: - TX_FAR _Route25BattleText8 - db "@" - -Route25EndBattleText8: - TX_FAR _Route25EndBattleText8 - db "@" - -Route25AfterBattleText8: - TX_FAR _Route25AfterBattleText8 - db "@" - -Route25BattleText9: - TX_FAR _Route25BattleText9 - db "@" - -Route25EndBattleText9: - TX_FAR _Route25EndBattleText9 - db "@" - -Route25AfterBattleText9: - TX_FAR _Route25AfterBattleText9 - db "@" - -Route25Text11: - TX_FAR _Route25Text11 - db "@" diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm deleted file mode 100755 index 34f1aa35..00000000 --- a/scripts/route2gate.asm +++ /dev/null @@ -1,39 +0,0 @@ -Route2GateScript: - jp EnableAutoTextBoxDrawing - -Route2GateTextPointers: - dw Route2GateText1 - dw Route2GateText2 - -Route2GateText1: - TX_ASM - CheckEvent EVENT_GOT_HM05 - jr nz, .asm_5d60d - ld a, 10 ; pokemon needed - ld [hOaksAideRequirement], a - ld a, HM_05 ; oak's aide reward - ld [hOaksAideRewardItem], a - ld [wd11e], a - call GetItemName - ld hl, wcd6d - ld de, wOaksAideRewardItemName - ld bc, ITEM_NAME_LENGTH - call CopyData - predef OaksAideScript - ld a, [hOaksAideResult] - cp $1 - jr nz, .asm_5d613 - SetEvent EVENT_GOT_HM05 -.asm_5d60d - ld hl, Route2GateText_5d616 - call PrintText -.asm_5d613 - jp TextScriptEnd - -Route2GateText_5d616: - TX_FAR _Route2GateText_5d616 - db "@" - -Route2GateText2: - TX_FAR _Route2GateText2 - db "@" diff --git a/scripts/route2house.asm b/scripts/route2house.asm deleted file mode 100755 index 95055aec..00000000 --- a/scripts/route2house.asm +++ /dev/null @@ -1,17 +0,0 @@ -Route2HouseScript: - jp EnableAutoTextBoxDrawing - -Route2HouseTextPointers: - dw Route2HouseText1 - dw Route2HouseText2 - -Route2HouseText1: - TX_FAR _Route2HouseText1 - db "@" - -Route2HouseText2: - TX_ASM - ld a, $1 - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd diff --git a/scripts/route3.asm b/scripts/route3.asm deleted file mode 100755 index e4748b8c..00000000 --- a/scripts/route3.asm +++ /dev/null @@ -1,251 +0,0 @@ -Route3Script: - call EnableAutoTextBoxDrawing - ld hl, Route3TrainerHeader0 - ld de, Route3ScriptPointers - ld a, [wRoute3CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute3CurScript], a - ret - -Route3ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route3TextPointers: - dw Route3Text1 - dw Route3Text2 - dw Route3Text3 - dw Route3Text4 - dw Route3Text5 - dw Route3Text6 - dw Route3Text7 - dw Route3Text8 - dw Route3Text9 - dw Route3Text10 - -Route3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_0 - dw Route3BattleText1 ; TextBeforeBattle - dw Route3AfterBattleText1 ; TextAfterBattle - dw Route3EndBattleText1 ; TextEndBattle - dw Route3EndBattleText1 ; TextEndBattle - -Route3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1 - dw Route3BattleText2 ; TextBeforeBattle - dw Route3AfterBattleText2 ; TextAfterBattle - dw Route3EndBattleText2 ; TextEndBattle - dw Route3EndBattleText2 ; TextEndBattle - -Route3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 - dw Route3BattleText3 ; TextBeforeBattle - dw Route3AfterBattleText3 ; TextAfterBattle - dw Route3EndBattleText3 ; TextEndBattle - dw Route3EndBattleText3 ; TextEndBattle - -Route3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 - dw Route3BattleText4 ; TextBeforeBattle - dw Route3AfterBattleText4 ; TextAfterBattle - dw Route3EndBattleText4 ; TextEndBattle - dw Route3EndBattleText4 ; TextEndBattle - -Route3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 - dw Route3BattleText5 ; TextBeforeBattle - dw Route3AfterBattleText5 ; TextAfterBattle - dw Route3EndBattleText5 ; TextEndBattle - dw Route3EndBattleText5 ; TextEndBattle - -Route3TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 - dw Route3BattleText6 ; TextBeforeBattle - dw Route3AfterBattleText6 ; TextAfterBattle - dw Route3EndBattleText6 ; TextEndBattle - dw Route3EndBattleText6 ; TextEndBattle - -Route3TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1 - dw Route3BattleText7 ; TextBeforeBattle - dw Route3AfterBattleText7 ; TextAfterBattle - dw Route3EndBattleText7 ; TextEndBattle - dw Route3EndBattleText7 ; TextEndBattle - -Route3TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 - dw Route3BattleText8 ; TextBeforeBattle - dw Route3AfterBattleText8 ; TextAfterBattle - dw Route3EndBattleText8 ; TextEndBattle - dw Route3EndBattleText8 ; TextEndBattle - - db $ff - -Route3Text1: - TX_FAR _Route3Text1 - db "@" - -Route3Text2: - TX_ASM - ld hl, Route3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText1: - TX_FAR _Route3BattleText1 - db "@" - -Route3EndBattleText1: - TX_FAR _Route3EndBattleText1 - db "@" - -Route3AfterBattleText1: - TX_FAR _Route3AfterBattleText1 - db "@" - -Route3Text3: - TX_ASM - ld hl, Route3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText2: - TX_FAR _Route3BattleText2 - db "@" - -Route3EndBattleText2: - TX_FAR _Route3EndBattleText2 - db "@" - -Route3AfterBattleText2: - TX_FAR _Route3AfterBattleText2 - db "@" - -Route3Text4: - TX_ASM - ld hl, Route3TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText3: - TX_FAR _Route3BattleText3 - db "@" - -Route3EndBattleText3: - TX_FAR _Route3EndBattleText3 - db "@" - -Route3AfterBattleText3: - TX_FAR _Route3AfterBattleText3 - db "@" - -Route3Text5: - TX_ASM - ld hl, Route3TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText4: - TX_FAR _Route3BattleText4 - db "@" - -Route3EndBattleText4: - TX_FAR _Route3EndBattleText4 - db "@" - -Route3AfterBattleText4: - TX_FAR _Route3AfterBattleText4 - db "@" - -Route3Text6: - TX_ASM - ld hl, Route3TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText5: - TX_FAR _Route3BattleText5 - db "@" - -Route3EndBattleText5: - TX_FAR _Route3EndBattleText5 - db "@" - -Route3AfterBattleText5: - TX_FAR _Route3AfterBattleText5 - db "@" - -Route3Text7: - TX_ASM - ld hl, Route3TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText6: - TX_FAR _Route3BattleText6 - db "@" - -Route3EndBattleText6: - TX_FAR _Route3EndBattleText6 - db "@" - -Route3AfterBattleText6: - TX_FAR _Route3AfterBattleText6 - db "@" - -Route3Text8: - TX_ASM - ld hl, Route3TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText7: - TX_FAR _Route3BattleText7 - db "@" - -Route3EndBattleText7: - TX_FAR _Route3EndBattleText7 - db "@" - -Route3AfterBattleText7: - TX_FAR _Route3AfterBattleText7 - db "@" - -Route3Text9: - TX_ASM - ld hl, Route3TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route3BattleText8: - TX_FAR _Route3BattleText8 - db "@" - -Route3EndBattleText8: - TX_FAR _Route3EndBattleText8 - db "@" - -Route3AfterBattleText8: - TX_FAR _Route3AfterBattleText8 - db "@" - -Route3Text10: - TX_FAR _Route3Text10 - db "@" diff --git a/scripts/route4.asm b/scripts/route4.asm deleted file mode 100755 index ee9e2cdf..00000000 --- a/scripts/route4.asm +++ /dev/null @@ -1,62 +0,0 @@ -Route4Script: - call EnableAutoTextBoxDrawing - ld hl, Route4TrainerHeader0 - ld de, Route4ScriptPointers - ld a, [wRoute4CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute4CurScript], a - ret - -Route4ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route4TextPointers: - dw Route4Text1 - dw Route4Text2 - dw PickUpItemText - dw PokeCenterSignText - dw Route4Text5 - dw Route4Text6 - -Route4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_4_TRAINER_0 - dw Route4BattleText1 ; TextBeforeBattle - dw Route4AfterBattleText1 ; TextAfterBattle - dw Route4EndBattleText1 ; TextEndBattle - dw Route4EndBattleText1 ; TextEndBattle - - db $ff - -Route4Text1: - TX_FAR _Route4Text1 - db "@" - -Route4Text2: - TX_ASM - ld hl, Route4TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route4BattleText1: - TX_FAR _Route4BattleText1 - db "@" - -Route4EndBattleText1: - TX_FAR _Route4EndBattleText1 - db "@" - -Route4AfterBattleText1: - TX_FAR _Route4AfterBattleText1 - db "@" - -Route4Text5: - TX_FAR _Route4Text5 - db "@" - -Route4Text6: - TX_FAR _Route4Text6 - db "@" diff --git a/scripts/route5.asm b/scripts/route5.asm deleted file mode 100755 index 113212a4..00000000 --- a/scripts/route5.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route5Script: - jp EnableAutoTextBoxDrawing - -Route5TextPointers: - dw Route5Text1 - -Route5Text1: - TX_FAR _Route5Text1 - db "@" diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm deleted file mode 100755 index 6072f943..00000000 --- a/scripts/route5gate.asm +++ /dev/null @@ -1,117 +0,0 @@ -Route5GateScript: - call EnableAutoTextBoxDrawing - ld a, [wRoute5GateCurScript] - ld hl, Route5GateScriptPointers - jp CallFunctionInTable - -Route5GateScriptPointers: - dw Route5GateScript0 - dw Route5GateScript1 - -Route5GateScript_1df43: - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - jp StartSimulatingJoypadStates - -Route5GateScript0: - ld a, [wd728] - bit 6, a - ret nz - ld hl, CoordsData_1df8f - call ArePlayerCoordsInArray - ret nc - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] - and a - jr nz, .asm_1df82 - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Route5GateScript_1df43 - ld a, $1 - ld [wRoute5GateCurScript], a - ret -.asm_1df82 - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wd728 - set 6, [hl] - ret - -CoordsData_1df8f: - db 3,3 - db 3,4 - db $ff - -Route5GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wRoute5GateCurScript], a - ret - -Route5GateTextPointers: - dw Route5GateText1 - dw Route5GateText2 - dw Route5GateText3 - -Route8GateText1: -Route7GateText1: -Route6GateText1: -Route5GateText1: - TX_ASM - ld a, [wd728] - bit 6, a - jr nz, .asm_88856 - callba RemoveGuardDrink - ld a, [$ffdb] - and a - jr nz, .asm_768a2 - ld hl, Route5GateText2 - call PrintText - call Route5GateScript_1df43 - ld a, $1 - ld [wRoute5GateCurScript], a - jp TextScriptEnd -.asm_768a2 - ld hl, Route5GateText3 - call PrintText - ld hl, wd728 - set 6, [hl] - jp TextScriptEnd -.asm_88856 - ld hl, SaffronGateText_1dff6 - call PrintText - jp TextScriptEnd - -Route8GateText2: -Route7GateText2: -Route6GateText2: -Route5GateText2: - TX_FAR _SaffronGateText_1dfe7 - db "@" - -Route8GateText3: -Route7GateText3: -Route6GateText3: -Route5GateText3: - TX_FAR _SaffronGateText_8aaa9 - TX_SFX_KEY_ITEM - TX_FAR _SaffronGateText_1dff1 - db "@" - -SaffronGateText_1dff6: - TX_FAR _SaffronGateText_1dff6 - db "@" - - diff --git a/scripts/route6.asm b/scripts/route6.asm deleted file mode 100755 index ba727adc..00000000 --- a/scripts/route6.asm +++ /dev/null @@ -1,186 +0,0 @@ -Route6Script: - call EnableAutoTextBoxDrawing - ld hl, Route6TrainerHeader0 - ld de, Route6ScriptPointers - ld a, [wRoute6CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute6CurScript], a - ret - -Route6ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route6TextPointers: - dw Route6Text1 - dw Route6Text2 - dw Route6Text3 - dw Route6Text4 - dw Route6Text5 - dw Route6Text6 - dw Route6Text7 - -Route6TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_0 - dw Route6BattleText1 ; TextBeforeBattle - dw Route6AfterBattleText1 ; TextAfterBattle - dw Route6EndBattleText1 ; TextEndBattle - dw Route6EndBattleText1 ; TextEndBattle - -Route6TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1 - dw Route6BattleText2 ; TextBeforeBattle - dw Route6AfterBattleText1 ; TextAfterBattle - dw Route6EndBattleText2 ; TextEndBattle - dw Route6EndBattleText2 ; TextEndBattle - -Route6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_2 - dw Route6BattleText3 ; TextBeforeBattle - dw Route6AfterBattleText3 ; TextAfterBattle - dw Route6EndBattleText3 ; TextEndBattle - dw Route6EndBattleText3 ; TextEndBattle - -Route6TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_3 - dw Route6BattleText4 ; TextBeforeBattle - dw Route6AfterBattleText4 ; TextAfterBattle - dw Route6EndBattleText4 ; TextEndBattle - dw Route6EndBattleText4 ; TextEndBattle - -Route6TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_4 - dw Route6BattleText5 ; TextBeforeBattle - dw Route6AfterBattleText5 ; TextAfterBattle - dw Route6EndBattleText5 ; TextEndBattle - dw Route6EndBattleText5 ; TextEndBattle - -Route6TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_5 - dw Route6BattleText6 ; TextBeforeBattle - dw Route6AfterBattleText6 ; TextAfterBattle - dw Route6EndBattleText6 ; TextEndBattle - dw Route6EndBattleText6 ; TextEndBattle - - db $ff - -Route6Text1: - TX_ASM - ld hl, Route6TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route6BattleText1: - TX_FAR _Route6BattleText1 - db "@" - -Route6EndBattleText1: - TX_FAR _Route6EndBattleText1 - db "@" - -Route6AfterBattleText1: - TX_FAR _Route6AfterBattleText1 - db "@" - -Route6Text2: - TX_ASM - ld hl, Route6TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route6BattleText2: - TX_FAR _Route6BattleText2 - db "@" - -Route6EndBattleText2: - TX_FAR _Route6EndBattleText2 - db "@" - -Route6Text3: - TX_ASM - ld hl, Route6TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route6BattleText3: - TX_FAR _Route6BattleText3 - db "@" - -Route6EndBattleText3: - TX_FAR _Route6EndBattleText3 - db "@" - -Route6AfterBattleText3: - TX_FAR _Route6AfterBattleText3 - db "@" - -Route6Text4: - TX_ASM - ld hl, Route6TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route6BattleText4: - TX_FAR _Route6BattleText4 - db "@" - -Route6EndBattleText4: - TX_FAR _Route6EndBattleText4 - db "@" - -Route6AfterBattleText4: - TX_FAR _Route6AfterBattleText4 - db "@" - -Route6Text5: - TX_ASM - ld hl, Route6TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route6BattleText5: - TX_FAR _Route6BattleText5 - db "@" - -Route6EndBattleText5: - TX_FAR _Route6EndBattleText5 - db "@" - -Route6AfterBattleText5: - TX_FAR _Route6AfterBattleText5 - db "@" - -Route6Text6: - TX_ASM - ld hl, Route6TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route6BattleText6: - TX_FAR _Route6BattleText6 - db "@" - -Route6EndBattleText6: - TX_FAR _Route6EndBattleText6 - db "@" - -Route6AfterBattleText6: - TX_FAR _Route6AfterBattleText6 - db "@" - -Route6Text7: - TX_FAR _Route6Text7 - db "@" diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm deleted file mode 100755 index cf872f69..00000000 --- a/scripts/route6gate.asm +++ /dev/null @@ -1,70 +0,0 @@ -Route6GateScript: - call EnableAutoTextBoxDrawing - ld hl, Route6GateScriptPointers - ld a, [wRoute6GateCurScript] - call CallFunctionInTable - ret - -Route6GateScriptPointers: - dw Route6GateScript0 - dw Route6GateScript1 - -Route6GateScript0: - ld a, [wd728] - bit 6, a - ret nz - ld hl, CoordsData_1e08c - call ArePlayerCoordsInArray - ret nc - ld a, PLAYER_DIR_RIGHT - ld [wPlayerMovingDirection], a - xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] - and a - jr nz, .asm_1e080 - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Route6GateScript_1e0a1 - ld a, $1 - ld [wRoute6GateCurScript], a - ret -.asm_1e080 - ld hl, wd728 - set 6, [hl] - ld a, $3 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -CoordsData_1e08c: - db $02,$03 - db $02,$04,$FF - -Route6GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wRoute6GateCurScript], a - ret - -Route6GateScript_1e0a1: - ld hl, wd730 - set 7, [hl] - ld a, $80 - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - xor a - ld [wSpriteStateData2 + $06], a - ld [wOverrideSimulatedJoypadStatesMask], a - ret - -Route6GateTextPointers: - dw Route6GateText1 - dw Route6GateText2 - dw Route6GateText3 diff --git a/scripts/route7.asm b/scripts/route7.asm deleted file mode 100755 index 5e8288ea..00000000 --- a/scripts/route7.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route7Script: - jp EnableAutoTextBoxDrawing - -Route7TextPointers: - dw Route7Text1 - -Route7Text1: - TX_FAR _Route7Text1 - db "@" diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm deleted file mode 100755 index 6d4e27bb..00000000 --- a/scripts/route7gate.asm +++ /dev/null @@ -1,73 +0,0 @@ -Route7GateScript: - call EnableAutoTextBoxDrawing - ld a, [wRoute7GateCurScript] - ld hl, Route7GateScriptPointers - call CallFunctionInTable - ret - -Route7GateScriptPointers: - dw Route7GateScript0 - dw Route7GateScript1 - -Route7GateScript_1e111: - ld hl, wd730 - set 7, [hl] - ld a, $20 - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - xor a - ld [wSpriteStateData2 + $06], a - ld [wOverrideSimulatedJoypadStatesMask], a - ret - -Route7GateScript0: - ld a, [wd728] - bit 6, a - ret nz - ld hl, CoordsData_1e167 - call ArePlayerCoordsInArray - ret nc - ld a, PLAYER_DIR_UP - ld [wPlayerMovingDirection], a - xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] - and a - jr nz, .asm_1e15a - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Route7GateScript_1e111 - ld a, $1 - ld [wRoute7GateCurScript], a - ret -.asm_1e15a - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wd728 - set 6, [hl] - ret - -CoordsData_1e167: - db 3,3 - db 4,3 - db $ff - -Route7GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wRoute7GateCurScript], a - ld [wCurMapScript], a - ret - -Route7GateTextPointers: - dw Route7GateText1 - dw Route7GateText2 - dw Route7GateText3 diff --git a/scripts/route8.asm b/scripts/route8.asm deleted file mode 100755 index e05508bb..00000000 --- a/scripts/route8.asm +++ /dev/null @@ -1,274 +0,0 @@ -Route8Script: - call EnableAutoTextBoxDrawing - ld hl, Route8TrainerHeader0 - ld de, Route8ScriptPointers - ld a, [wRoute8CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute8CurScript], a - ret - -Route8ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route8TextPointers: - dw Route8Text1 - dw Route8Text2 - dw Route8Text3 - dw Route8Text4 - dw Route8Text5 - dw Route8Text6 - dw Route8Text7 - dw Route8Text8 - dw Route8Text9 - dw Route8Text10 - -Route8TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_0 - dw Route8BattleText1 ; TextBeforeBattle - dw Route8AfterBattleText1 ; TextAfterBattle - dw Route8EndBattleText1 ; TextEndBattle - dw Route8EndBattleText1 ; TextEndBattle - -Route8TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_1 - dw Route8BattleText2 ; TextBeforeBattle - dw Route8AfterBattleText2 ; TextAfterBattle - dw Route8EndBattleText2 ; TextEndBattle - dw Route8EndBattleText2 ; TextEndBattle - -Route8TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_2 - dw Route8BattleText3 ; TextBeforeBattle - dw Route8AfterBattleText3 ; TextAfterBattle - dw Route8EndBattleText3 ; TextEndBattle - dw Route8EndBattleText3 ; TextEndBattle - -Route8TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_3 - dw Route8BattleText4 ; TextBeforeBattle - dw Route8AfterBattleText4 ; TextAfterBattle - dw Route8EndBattleText4 ; TextEndBattle - dw Route8EndBattleText4 ; TextEndBattle - -Route8TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_4 - dw Route8BattleText5 ; TextBeforeBattle - dw Route8AfterBattleText5 ; TextAfterBattle - dw Route8EndBattleText5 ; TextEndBattle - dw Route8EndBattleText5 ; TextEndBattle - -Route8TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_5 - dw Route8BattleText6 ; TextBeforeBattle - dw Route8AfterBattleText6 ; TextAfterBattle - dw Route8EndBattleText6 ; TextEndBattle - dw Route8EndBattleText6 ; TextEndBattle - -Route8TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_6 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_6 - dw Route8BattleText7 ; TextBeforeBattle - dw Route8AfterBattleText7 ; TextAfterBattle - dw Route8EndBattleText7 ; TextEndBattle - dw Route8EndBattleText7 ; TextEndBattle - -Route8TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_7, 1 - dw Route8BattleText8 ; TextBeforeBattle - dw Route8AfterBattleText8 ; TextAfterBattle - dw Route8EndBattleText8 ; TextEndBattle - dw Route8EndBattleText8 ; TextEndBattle - -Route8TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_8, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1 - dw Route8BattleText9 ; TextBeforeBattle - dw Route8AfterBattleText9 ; TextAfterBattle - dw Route8EndBattleText9 ; TextEndBattle - dw Route8EndBattleText9 ; TextEndBattle - - db $ff - -Route8Text1: - TX_ASM - ld hl, Route8TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText1: - TX_FAR _Route8BattleText1 - db "@" - -Route8EndBattleText1: - TX_FAR _Route8EndBattleText1 - db "@" - -Route8AfterBattleText1: - TX_FAR _Route8AfterBattleText1 - db "@" - -Route8Text2: - TX_ASM - ld hl, Route8TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText2: - TX_FAR _Route8BattleText2 - db "@" - -Route8EndBattleText2: - TX_FAR _Route8EndBattleText2 - db "@" - -Route8AfterBattleText2: - TX_FAR _Route8AfterBattleText2 - db "@" - -Route8Text3: - TX_ASM - ld hl, Route8TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText3: - TX_FAR _Route8BattleText3 - db "@" - -Route8EndBattleText3: - TX_FAR _Route8EndBattleText3 - db "@" - -Route8AfterBattleText3: - TX_FAR _Route8AfterBattleText3 - db "@" - -Route8Text4: - TX_ASM - ld hl, Route8TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText4: - TX_FAR _Route8BattleText4 - db "@" - -Route8EndBattleText4: - TX_FAR _Route8EndBattleText4 - db "@" - -Route8AfterBattleText4: - TX_FAR _Route8AfterBattleText4 - db "@" - -Route8Text5: - TX_ASM - ld hl, Route8TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText5: - TX_FAR _Route8BattleText5 - db "@" - -Route8EndBattleText5: - TX_FAR _Route8EndBattleText5 - db "@" - -Route8AfterBattleText5: - TX_FAR _Route8AfterBattleText5 - db "@" - -Route8Text6: - TX_ASM - ld hl, Route8TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText6: - TX_FAR _Route8BattleText6 - db "@" - -Route8EndBattleText6: - TX_FAR _Route8EndBattleText6 - db "@" - -Route8AfterBattleText6: - TX_FAR _Route8AfterBattleText6 - db "@" - -Route8Text7: - TX_ASM - ld hl, Route8TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText7: - TX_FAR _Route8BattleText7 - db "@" - -Route8EndBattleText7: - TX_FAR _Route8EndBattleText7 - db "@" - -Route8AfterBattleText7: - TX_FAR _Route8AfterBattleText7 - db "@" - -Route8Text8: - TX_ASM - ld hl, Route8TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText8: - TX_FAR _Route8BattleText8 - db "@" - -Route8EndBattleText8: - TX_FAR _Route8EndBattleText8 - db "@" - -Route8AfterBattleText8: - TX_FAR _Route8AfterBattleText8 - db "@" - -Route8Text9: - TX_ASM - ld hl, Route8TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd - -Route8BattleText9: - TX_FAR _Route8BattleText9 - db "@" - -Route8EndBattleText9: - TX_FAR _Route8EndBattleText9 - db "@" - -Route8AfterBattleText9: - TX_FAR _Route8AfterBattleText9 - db "@" - -Route8Text10: - TX_FAR _Route8Text10 - db "@" diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm deleted file mode 100755 index 28835f9d..00000000 --- a/scripts/route8gate.asm +++ /dev/null @@ -1,70 +0,0 @@ -Route8GateScript: - call EnableAutoTextBoxDrawing - ld hl, Route8GateScriptPointers - ld a, [wRoute8GateCurScript] - jp CallFunctionInTable - -Route8GateScriptPointers: - dw Route8GateScript0 - dw Route8GateScript1 - -Route8GateScript_1e1d7: - ld hl, wd730 - set 7, [hl] - ld a, $10 - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - xor a - ld [wSpriteStateData2 + $06], a - ld [wOverrideSimulatedJoypadStatesMask], a - ret - -Route8GateScript0: - ld a, [wd728] - bit 6, a - ret nz - ld hl, CoordsData_1e22c - call ArePlayerCoordsInArray - ret nc - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] - and a - jr nz, .asm_1e220 - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Route8GateScript_1e1d7 - ld a, $1 - ld [wRoute8GateCurScript], a - ret -.asm_1e220 - ld hl, wd728 - set 6, [hl] - ld a, $3 - ld [hSpriteIndexOrTextID], a - jp DisplayTextID - -CoordsData_1e22c: - db 3,2 - db 4,2 - db $ff - -Route8GateScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - xor a - ld [wJoyIgnore], a - ld [wRoute8GateCurScript], a - ret - -Route8GateTextPointers: - dw Route8GateText1 - dw Route8GateText2 - dw Route8GateText3 diff --git a/scripts/route9.asm b/scripts/route9.asm deleted file mode 100755 index c965d853..00000000 --- a/scripts/route9.asm +++ /dev/null @@ -1,268 +0,0 @@ -Route9Script: - call EnableAutoTextBoxDrawing - ld hl, Route9TrainerHeader0 - ld de, Route9ScriptPointers - ld a, [wRoute9CurScript] - call ExecuteCurMapScriptInTable - ld [wRoute9CurScript], a - ret - -Route9ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -Route9TextPointers: - dw Route9Text1 - dw Route9Text2 - dw Route9Text3 - dw Route9Text4 - dw Route9Text5 - dw Route9Text6 - dw Route9Text7 - dw Route9Text8 - dw Route9Text9 - dw PickUpItemText - dw Route9Text11 - -Route9TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0 - dw Route9BattleText1 ; TextBeforeBattle - dw Route9AfterBattleText1 ; TextAfterBattle - dw Route9EndBattleText1 ; TextEndBattle - dw Route9EndBattleText1 ; TextEndBattle - -Route9TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1 - dw Route9BattleText2 ; TextBeforeBattle - dw Route9AfterBattleText2 ; TextAfterBattle - dw Route9EndBattleText2 ; TextEndBattle - dw Route9EndBattleText2 ; TextEndBattle - -Route9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 - dw Route9BattleText3 ; TextBeforeBattle - dw Route9AfterBattleText3 ; TextAfterBattle - dw Route9EndBattleText3 ; TextEndBattle - dw Route9EndBattleText3 ; TextEndBattle - -Route9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 - dw Route9BattleText4 ; TextBeforeBattle - dw Route9AfterBattleText4 ; TextAfterBattle - dw Route9EndBattleText4 ; TextEndBattle - dw Route9EndBattleText4 ; TextEndBattle - -Route9TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 - dw Route9BattleText5 ; TextBeforeBattle - dw Route9AfterBattleText5 ; TextAfterBattle - dw Route9EndBattleText5 ; TextEndBattle - dw Route9EndBattleText5 ; TextEndBattle - -Route9TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 - dw Route9BattleText6 ; TextBeforeBattle - dw Route9AfterBattleText6 ; TextAfterBattle - dw Route9EndBattleText6 ; TextEndBattle - dw Route9EndBattleText6 ; TextEndBattle - -Route9TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 - dw Route9BattleText7 ; TextBeforeBattle - dw Route9AfterBattleText7 ; TextAfterBattle - dw Route9EndBattleText7 ; TextEndBattle - dw Route9EndBattleText7 ; TextEndBattle - -Route9TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1 - dw Route9BattleText8 ; TextBeforeBattle - dw Route9AfterBattleText8 ; TextAfterBattle - dw Route9EndBattleText8 ; TextEndBattle - dw Route9EndBattleText8 ; TextEndBattle - -Route9TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 - dw Route9BattleText9 ; TextBeforeBattle - dw Route9AfterBattleText9 ; TextAfterBattle - dw Route9EndBattleText9 ; TextEndBattle - dw Route9EndBattleText9 ; TextEndBattle - - db $ff - -Route9Text1: - TX_ASM - ld hl, Route9TrainerHeader0 - jr Route9TalkToTrainer - -Route9Text2: - TX_ASM - ld hl, Route9TrainerHeader1 - jr Route9TalkToTrainer - -Route9Text3: - TX_ASM - ld hl, Route9TrainerHeader2 - jr Route9TalkToTrainer - -Route9Text4: - TX_ASM - ld hl, Route9TrainerHeader3 - jr Route9TalkToTrainer - -Route9Text5: - TX_ASM - ld hl, Route9TrainerHeader4 - jr Route9TalkToTrainer - -Route9Text6: - TX_ASM - ld hl, Route9TrainerHeader5 - jr Route9TalkToTrainer - -Route9Text7: - TX_ASM - ld hl, Route9TrainerHeader6 - jr Route9TalkToTrainer - -Route9Text8: - TX_ASM - ld hl, Route9TrainerHeader7 - jr Route9TalkToTrainer - -Route9Text9: - TX_ASM - ld hl, Route9TrainerHeader8 -Route9TalkToTrainer: - call TalkToTrainer - jp TextScriptEnd - -Route9BattleText1: - TX_FAR _Route9BattleText1 - db "@" - -Route9EndBattleText1: - TX_FAR _Route9EndBattleText1 - db "@" - -Route9AfterBattleText1: - TX_FAR _Route9AfterBattleText1 - db "@" - -Route9BattleText2: - TX_FAR _Route9BattleText2 - db "@" - -Route9EndBattleText2: - TX_FAR _Route9EndBattleText2 - db "@" - -Route9AfterBattleText2: - TX_FAR _Route9AfterBattleText2 - db "@" - -Route9BattleText3: - TX_FAR _Route9BattleText3 - db "@" - -Route9EndBattleText3: - TX_FAR _Route9EndBattleText3 - db "@" - -Route9AfterBattleText3: - TX_FAR _Route9AfterBattleText3 - db "@" - -Route9BattleText4: - TX_FAR _Route9BattleText4 - db "@" - -Route9EndBattleText4: - TX_FAR _Route9EndBattleText4 - db "@" - -Route9AfterBattleText4: - TX_FAR _Route9AfterBattleText4 - db "@" - -Route9BattleText5: - TX_FAR _Route9BattleText5 - db "@" - -Route9EndBattleText5: - TX_FAR _Route9EndBattleText5 - db "@" - -Route9AfterBattleText5: - TX_FAR _Route9AfterBattleText5 - db "@" - -Route9BattleText6: - TX_FAR _Route9BattleText6 - db "@" - -Route9EndBattleText6: - TX_FAR _Route9EndBattleText6 - db "@" - -Route9AfterBattleText6: - TX_FAR _Route9AfterBattleText6 - db "@" - -Route9BattleText7: - TX_FAR _Route9BattleText7 - db "@" - -Route9EndBattleText7: - TX_FAR _Route9EndBattleText7 - db "@" - -Route9AfterBattleText7: - TX_FAR _Route9AfterBattleText7 - db "@" - -Route9BattleText8: - TX_FAR _Route9BattleText8 - db "@" - -Route9EndBattleText8: - TX_FAR _Route9EndBattleText8 - db "@" - -Route9AfterBattleText8: - TX_FAR _Route9AfterBattleText8 - db "@" - -Route9BattleText9: - TX_FAR _Route9BattleText9 - db "@" - -Route9EndBattleText9: - TX_FAR _Route9EndBattleText9 - db "@" - -Route9AfterBattleText9: - TX_FAR _Route9AfterBattleText9 - db "@" - -Route9Text11: - TX_FAR _Route9Text11 - db "@" diff --git a/scripts/safarizonecenter.asm b/scripts/safarizonecenter.asm deleted file mode 100755 index d796c403..00000000 --- a/scripts/safarizonecenter.asm +++ /dev/null @@ -1,15 +0,0 @@ -SafariZoneCenterScript: - jp EnableAutoTextBoxDrawing - -SafariZoneCenterTextPointers: - dw PickUpItemText - dw SafariZoneCenterText2 - dw SafariZoneCenterText3 - -SafariZoneCenterText2: - TX_FAR _SafariZoneCenterText2 - db "@" - -SafariZoneCenterText3: - TX_FAR _SafariZoneCenterText3 - db "@" diff --git a/scripts/safarizoneeast.asm b/scripts/safarizoneeast.asm deleted file mode 100755 index 25d0ee30..00000000 --- a/scripts/safarizoneeast.asm +++ /dev/null @@ -1,23 +0,0 @@ -SafariZoneEastScript: - jp EnableAutoTextBoxDrawing - -SafariZoneEastTextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SafariZoneEastText5 - dw SafariZoneEastText6 - dw SafariZoneEastText7 - -SafariZoneEastText5: - TX_FAR _SafariZoneEastText5 - db "@" - -SafariZoneEastText6: - TX_FAR _SafariZoneEastText6 - db "@" - -SafariZoneEastText7: - TX_FAR _SafariZoneEastText7 - db "@" diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm deleted file mode 100755 index 5c6002a9..00000000 --- a/scripts/safarizoneentrance.asm +++ /dev/null @@ -1,293 +0,0 @@ -SafariZoneEntranceScript: - call EnableAutoTextBoxDrawing - ld hl, SafariZoneEntranceScriptPointers - ld a, [wSafariZoneEntranceCurScript] - jp CallFunctionInTable - -SafariZoneEntranceScriptPointers: - dw .SafariZoneEntranceScript0 - dw .SafariZoneEntranceScript1 - dw .SafariZoneEntranceScript2 - dw .SafariZoneEntranceScript3 - dw .SafariZoneEntranceScript4 - dw .SafariZoneEntranceScript5 - dw .SafariZoneEntranceScript6 - -.SafariZoneEntranceScript0 - ld hl, .CoordsData_75221 - call ArePlayerCoordsInArray - ret nc - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wJoyIgnore], a - xor a - ld [hJoyHeld], a - ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + 9], a - ld a, [wCoordIndex] - cp $1 - jr z, .asm_7520f - ld a, $2 - ld [wSafariZoneEntranceCurScript], a - ret -.asm_7520f - ld a, D_RIGHT - ld c, $1 - call SafariZoneEntranceAutoWalk - ld a, $f0 - ld [wJoyIgnore], a - ld a, $1 - ld [wSafariZoneEntranceCurScript], a - ret - -.CoordsData_75221: - db $02,$03 - db $02,$04 - db $FF - -.SafariZoneEntranceScript1 - call SafariZoneEntranceScript_752b4 - ret nz -.SafariZoneEntranceScript2 - xor a - ld [hJoyHeld], a - ld [wJoyIgnore], a - call UpdateSprites - ld a, $4 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wJoyIgnore], a - ret - -.SafariZoneEntranceScript3 - call SafariZoneEntranceScript_752b4 - ret nz - xor a - ld [wJoyIgnore], a - ld a, $5 - ld [wSafariZoneEntranceCurScript], a - ret - -.SafariZoneEntranceScript5 - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - CheckAndResetEvent EVENT_SAFARI_GAME_OVER - jr z, .asm_7527f - ResetEventReuseHL EVENT_IN_SAFARI_ZONE - call UpdateSprites - ld a, $f0 - ld [wJoyIgnore], a - ld a, $6 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wNumSafariBalls], a - ld a, D_DOWN - ld c, $3 - call SafariZoneEntranceAutoWalk - ld a, $4 - ld [wSafariZoneEntranceCurScript], a - jr .asm_75286 -.asm_7527f - ld a, $5 - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_75286 - ret - -.SafariZoneEntranceScript4 - call SafariZoneEntranceScript_752b4 - ret nz - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wSafariZoneEntranceCurScript], a - ret - -.SafariZoneEntranceScript6 - call SafariZoneEntranceScript_752b4 - ret nz - call Delay3 - ld a, [wcf0d] - ld [wSafariZoneEntranceCurScript], a - ret - -SafariZoneEntranceAutoWalk: - push af - ld b, 0 - ld a, c - ld [wSimulatedJoypadStatesIndex], a - ld hl, wSimulatedJoypadStatesEnd - pop af - call FillMemory - jp StartSimulatingJoypadStates - -SafariZoneEntranceScript_752b4: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret - -SafariZoneEntranceTextPointers: - dw .SafariZoneEntranceText1 - dw .SafariZoneEntranceText2 - dw .SafariZoneEntranceText1 - dw .SafariZoneEntranceText4 - dw .SafariZoneEntranceText5 - dw .SafariZoneEntranceText6 - -.SafariZoneEntranceText1 - TX_FAR _SafariZoneEntranceText1 - db "@" - -.SafariZoneEntranceText4 - TX_FAR SafariZoneEntranceText_9e6e4 - TX_ASM - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jp nz, .PleaseComeAgain - xor a - ld [hMoney], a - ld a, $05 - ld [hMoney + 1], a - ld a, $00 - ld [hMoney + 2], a - call HasEnoughMoney - jr nc, .success - ld hl, .NotEnoughMoneyText - call PrintText - jr .CantPayWalkDown - -.success - xor a - ld [wPriceTemp], a - ld a, $05 - ld [wPriceTemp + 1], a - ld a, $00 - ld [wPriceTemp + 2], a - ld hl, wPriceTemp + 2 - ld de, wPlayerMoney + 2 - ld c, 3 - predef SubBCDPredef - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - ld hl, .MakePaymentText - call PrintText - ld a, 30 - ld [wNumSafariBalls], a - ld a, 502 / $100 - ld [wSafariSteps], a - ld a, 502 % $100 - ld [wSafariSteps + 1], a - ld a, D_UP - ld c, 3 - call SafariZoneEntranceAutoWalk - SetEvent EVENT_IN_SAFARI_ZONE - ResetEventReuseHL EVENT_SAFARI_GAME_OVER - ld a, 3 - ld [wSafariZoneEntranceCurScript], a - jr .done - -.PleaseComeAgain - ld hl, .PleaseComeAgainText - call PrintText -.CantPayWalkDown - ld a, D_DOWN - ld c, 1 - call SafariZoneEntranceAutoWalk - ld a, 4 - ld [wSafariZoneEntranceCurScript], a -.done - jp TextScriptEnd - -.MakePaymentText - TX_FAR SafariZoneEntranceText_9e747 - TX_SFX_ITEM_1 - TX_FAR _SafariZoneEntranceText_75360 - db "@" - -.PleaseComeAgainText - TX_FAR _SafariZoneEntranceText_75365 - db "@" - -.NotEnoughMoneyText - TX_FAR _SafariZoneEntranceText_7536a - db "@" - -.SafariZoneEntranceText5 - TX_FAR SafariZoneEntranceText_9e814 - TX_ASM - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_7539c - ld hl, .SafariZoneEntranceText_753bb - call PrintText - xor a - ld [wSpriteStateData1 + 9], a - ld a, D_DOWN - ld c, $3 - call SafariZoneEntranceAutoWalk - ResetEvents EVENT_SAFARI_GAME_OVER, EVENT_IN_SAFARI_ZONE - ld a, $0 - ld [wcf0d], a - jr .asm_753b3 -.asm_7539c - ld hl, .SafariZoneEntranceText_753c0 - call PrintText - ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 9], a - ld a, D_UP - ld c, $1 - call SafariZoneEntranceAutoWalk - ld a, $5 - ld [wcf0d], a -.asm_753b3 - ld a, $6 - ld [wSafariZoneEntranceCurScript], a - jp TextScriptEnd - -.SafariZoneEntranceText_753bb - TX_FAR _SafariZoneEntranceText_753bb - db "@" - -.SafariZoneEntranceText_753c0 - TX_FAR _SafariZoneEntranceText_753c0 - db "@" - -.SafariZoneEntranceText6 - TX_FAR _SafariZoneEntranceText_753c5 - db "@" - -.SafariZoneEntranceText2 - TX_ASM - ld hl, .FirstTimeQuestionText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ld hl, .RegularText - jr nz, .Explanation - ld hl, .ExplanationText -.Explanation - call PrintText - jp TextScriptEnd - -.FirstTimeQuestionText - TX_FAR _SafariZoneEntranceText_753e6 - db "@" - -.ExplanationText - TX_FAR _SafariZoneEntranceText_753eb - db "@" - -.RegularText - TX_FAR _SafariZoneEntranceText_753f0 - db "@" diff --git a/scripts/safarizonenorth.asm b/scripts/safarizonenorth.asm deleted file mode 100755 index b870c99e..00000000 --- a/scripts/safarizonenorth.asm +++ /dev/null @@ -1,31 +0,0 @@ -SafariZoneNorthScript: - jp EnableAutoTextBoxDrawing - -SafariZoneNorthTextPointers: - dw PickUpItemText - dw PickUpItemText - dw SafariZoneNorthText3 - dw SafariZoneNorthText4 - dw SafariZoneNorthText5 - dw SafariZoneNorthText6 - dw SafariZoneNorthText7 - -SafariZoneNorthText3: - TX_FAR _SafariZoneNorthText3 - db "@" - -SafariZoneNorthText4: - TX_FAR _SafariZoneNorthText4 - db "@" - -SafariZoneNorthText5: - TX_FAR _SafariZoneNorthText5 - db "@" - -SafariZoneNorthText6: - TX_FAR _SafariZoneNorthText6 - db "@" - -SafariZoneNorthText7: - TX_FAR _SafariZoneNorthText7 - db "@" diff --git a/scripts/safarizoneresthouse1.asm b/scripts/safarizoneresthouse1.asm deleted file mode 100755 index 1d43890d..00000000 --- a/scripts/safarizoneresthouse1.asm +++ /dev/null @@ -1,14 +0,0 @@ -SafariZoneRestHouse1Script: - jp EnableAutoTextBoxDrawing - -SafariZoneRestHouse1TextPointers: - dw SafariZoneRestHouse1Text1 - dw SafariZoneRestHouse1Text2 - -SafariZoneRestHouse1Text1: - TX_FAR _SafariZoneRestHouse1Text1 - db "@" - -SafariZoneRestHouse1Text2: - TX_FAR _SafariZoneRestHouse1Text2 - db "@" diff --git a/scripts/safarizoneresthouse2.asm b/scripts/safarizoneresthouse2.asm deleted file mode 100755 index 4cd512f2..00000000 --- a/scripts/safarizoneresthouse2.asm +++ /dev/null @@ -1,20 +0,0 @@ -SafariZoneRestHouse2Script: - call EnableAutoTextBoxDrawing - ret - -SafariZoneRestHouse2TextPointers: - dw SafariZoneRestHouse2Text1 - dw SafariZoneRestHouse2Text2 - dw SafariZoneRestHouse2Text3 - -SafariZoneRestHouse2Text1: - TX_FAR _SafariZoneRestHouse2Text1 - db "@" - -SafariZoneRestHouse2Text2: - TX_FAR _SafariZoneRestHouse2Text2 - db "@" - -SafariZoneRestHouse2Text3: - TX_FAR _SafariZoneRestHouse2Text3 - db "@" diff --git a/scripts/safarizoneresthouse3.asm b/scripts/safarizoneresthouse3.asm deleted file mode 100755 index 18c4770f..00000000 --- a/scripts/safarizoneresthouse3.asm +++ /dev/null @@ -1,20 +0,0 @@ -SafariZoneRestHouse3Script: - call EnableAutoTextBoxDrawing - ret - -SafariZoneRestHouse3TextPointers: - dw SafariZoneRestHouse3Text1 - dw SafariZoneRestHouse3Text2 - dw SafariZoneRestHouse3Text3 - -SafariZoneRestHouse3Text1: - TX_FAR _SafariZoneRestHouse3Text1 - db "@" - -SafariZoneRestHouse3Text2: - TX_FAR _SafariZoneRestHouse3Text2 - db "@" - -SafariZoneRestHouse3Text3: - TX_FAR _SafariZoneRestHouse3Text3 - db "@" diff --git a/scripts/safarizoneresthouse4.asm b/scripts/safarizoneresthouse4.asm deleted file mode 100755 index 3ff3fa48..00000000 --- a/scripts/safarizoneresthouse4.asm +++ /dev/null @@ -1,20 +0,0 @@ -SafariZoneRestHouse4Script: - call EnableAutoTextBoxDrawing - ret - -SafariZoneRestHouse4TextPointers: - dw SafariZoneRestHouse4Text1 - dw SafariZoneRestHouse4Text2 - dw SafariZoneRestHouse4Text3 - -SafariZoneRestHouse4Text1: - TX_FAR _SafariZoneRestHouse4Text1 - db "@" - -SafariZoneRestHouse4Text2: - TX_FAR _SafariZoneRestHouse4Text2 - db "@" - -SafariZoneRestHouse4Text3: - TX_FAR _SafariZoneRestHouse4Text3 - db "@" diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm deleted file mode 100755 index 44c89281..00000000 --- a/scripts/safarizonesecrethouse.asm +++ /dev/null @@ -1,45 +0,0 @@ -SafariZoneSecretHouseScript: - jp EnableAutoTextBoxDrawing - -SafariZoneSecretHouseTextPointers: - dw SafariZoneSecretHouseText1 - -SafariZoneSecretHouseText1: - TX_ASM - CheckEvent EVENT_GOT_HM03 - jr nz, .asm_20a9b - ld hl, SafariZoneSecretHouseText_4a350 - call PrintText - lb bc, HM_03, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedHM03Text - call PrintText - SetEvent EVENT_GOT_HM03 - jr .asm_8f1fc -.BagFull - ld hl, HM03NoRoomText - call PrintText - jr .asm_8f1fc -.asm_20a9b - ld hl, HM03ExplanationText - call PrintText -.asm_8f1fc - jp TextScriptEnd - -SafariZoneSecretHouseText_4a350: - TX_FAR _SecretHouseText_4a350 - db "@" - -ReceivedHM03Text: - TX_FAR _ReceivedHM03Text - TX_SFX_ITEM_1 - db "@" - -HM03ExplanationText: - TX_FAR _HM03ExplanationText - db "@" - -HM03NoRoomText: - TX_FAR _HM03NoRoomText - db "@" diff --git a/scripts/safarizonewest.asm b/scripts/safarizonewest.asm deleted file mode 100755 index 81190c4c..00000000 --- a/scripts/safarizonewest.asm +++ /dev/null @@ -1,28 +0,0 @@ -SafariZoneWestScript: - jp EnableAutoTextBoxDrawing - -SafariZoneWestTextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SafariZoneWestText5 - dw SafariZoneWestText6 - dw SafariZoneWestText7 - dw SafariZoneWestText8 - -SafariZoneWestText5: - TX_FAR _SafariZoneWestText5 - db "@" - -SafariZoneWestText6: - TX_FAR _SafariZoneWestText6 - db "@" - -SafariZoneWestText7: - TX_FAR _SafariZoneWestText7 - db "@" - -SafariZoneWestText8: - TX_FAR _SafariZoneWestText8 - db "@" diff --git a/scripts/saffroncity.asm b/scripts/saffroncity.asm deleted file mode 100755 index 57a1a3a5..00000000 --- a/scripts/saffroncity.asm +++ /dev/null @@ -1,122 +0,0 @@ -SaffronCityScript: - jp EnableAutoTextBoxDrawing - -SaffronCityTextPointers: - dw SaffronCityText1 - dw SaffronCityText2 - dw SaffronCityText3 - dw SaffronCityText4 - dw SaffronCityText5 - dw SaffronCityText6 - dw SaffronCityText7 - dw SaffronCityText8 - dw SaffronCityText9 - dw SaffronCityText10 - dw SaffronCityText11 - dw SaffronCityText12 - dw SaffronCityText13 - dw SaffronCityText14 - dw SaffronCityText15 - dw SaffronCityText16 - dw SaffronCityText17 - dw SaffronCityText18 - dw MartSignText - dw SaffronCityText20 - dw SaffronCityText21 - dw SaffronCityText22 - dw PokeCenterSignText - dw SaffronCityText24 - dw SaffronCityText25 - -SaffronCityText1: - TX_FAR _SaffronCityText1 - db "@" - -SaffronCityText2: - TX_FAR _SaffronCityText2 - db "@" - -SaffronCityText3: - TX_FAR _SaffronCityText3 - db "@" - -SaffronCityText4: - TX_FAR _SaffronCityText4 - db "@" - -SaffronCityText5: - TX_FAR _SaffronCityText5 - db "@" - -SaffronCityText6: - TX_FAR _SaffronCityText6 - db "@" - -SaffronCityText7: - TX_FAR _SaffronCityText7 - db "@" - -SaffronCityText8: - TX_FAR _SaffronCityText8 - db "@" - -SaffronCityText9: - TX_FAR _SaffronCityText9 - db "@" - -SaffronCityText10: - TX_FAR _SaffronCityText10 - db "@" - -SaffronCityText11: - TX_FAR _SaffronCityText11 - db "@" - -SaffronCityText12: - TX_FAR _SaffronCityText12 - TX_CRY_PIDGEOT - db "@" - -SaffronCityText13: - TX_FAR _SaffronCityText13 - db "@" - -SaffronCityText14: - TX_FAR _SaffronCityText14 - db "@" - -SaffronCityText15: - TX_FAR _SaffronCityText15 - db "@" - -SaffronCityText16: - TX_FAR _SaffronCityText16 - db "@" - -SaffronCityText17: - TX_FAR _SaffronCityText17 - db "@" - -SaffronCityText18: - TX_FAR _SaffronCityText18 - db "@" - -SaffronCityText20: - TX_FAR _SaffronCityText20 - db "@" - -SaffronCityText21: - TX_FAR _SaffronCityText21 - db "@" - -SaffronCityText22: - TX_FAR _SaffronCityText22 - db "@" - -SaffronCityText24: - TX_FAR _SaffronCityText24 - db "@" - -SaffronCityText25: - TX_FAR _SaffronCityText25 - db "@" diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm deleted file mode 100755 index cbf935e7..00000000 --- a/scripts/saffrongym.asm +++ /dev/null @@ -1,358 +0,0 @@ -SaffronGymScript: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - call nz, .extra - call EnableAutoTextBoxDrawing - ld hl, SaffronGymTrainerHeader0 - ld de, SaffronGymScriptPointers - ld a, [wSaffronGymCurScript] - call ExecuteCurMapScriptInTable - ld [wSaffronGymCurScript], a - ret - -.extra - ld hl, Gym6CityName - ld de, Gym6LeaderName - jp LoadGymLeaderAndCityName - -Gym6CityName: - db "SAFFRON CITY@" - -Gym6LeaderName: - db "SABRINA@" - -SaffronGymText_5d048: - xor a - ld [wJoyIgnore], a - ld [wSaffronGymCurScript], a - ld [wCurMapScript], a - ret - -SaffronGymScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw SaffronGymScript3 - -SaffronGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, SaffronGymText_5d048 - ld a, $f0 - ld [wJoyIgnore], a - -SaffronGymText_5d068: - ld a, $a - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_SABRINA - lb bc, TM_46, 1 - call GiveItem - jr nc, .BagFull - ld a, $b - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM46 - jr .asm_5d091 -.BagFull - ld a, $c - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_5d091 - ld hl, wObtainedBadges - set 5, [hl] - ld hl, wBeatGymFlags - set 5, [hl] - - ; deactivate gym trainers - SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6 - - jp SaffronGymText_5d048 - -SaffronGymTextPointers: - dw SaffronGymText1 - dw SaffronGymText2 - dw SaffronGymText3 - dw SaffronGymText4 - dw SaffronGymText5 - dw SaffronGymText6 - dw SaffronGymText7 - dw SaffronGymText8 - dw SaffronGymText9 - dw SaffronGymText10 - dw SaffronGymText11 - dw SaffronGymText12 - -SaffronGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_0 - dw SaffronGymBattleText1 ; TextBeforeBattle - dw SaffronGymAfterBattleText1 ; TextAfterBattle - dw SaffronGymEndBattleText1 ; TextEndBattle - dw SaffronGymEndBattleText1 ; TextEndBattle - -SaffronGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_1 - dw SaffronGymBattleText2 ; TextBeforeBattle - dw SaffronGymAfterBattleText2 ; TextAfterBattle - dw SaffronGymEndBattleText2 ; TextEndBattle - dw SaffronGymEndBattleText2 ; TextEndBattle - -SaffronGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_2 - dw SaffronGymBattleText3 ; TextBeforeBattle - dw SaffronGymAfterBattleText3 ; TextAfterBattle - dw SaffronGymEndBattleText3 ; TextEndBattle - dw SaffronGymEndBattleText3 ; TextEndBattle - -SaffronGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_3 - dw SaffronGymBattleText4 ; TextBeforeBattle - dw SaffronGymAfterBattleText4 ; TextAfterBattle - dw SaffronGymEndBattleText4 ; TextEndBattle - dw SaffronGymEndBattleText4 ; TextEndBattle - -SaffronGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_4 - dw SaffronGymBattleText5 ; TextBeforeBattle - dw SaffronGymAfterBattleText5 ; TextAfterBattle - dw SaffronGymEndBattleText5 ; TextEndBattle - dw SaffronGymEndBattleText5 ; TextEndBattle - -SaffronGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_5 - dw SaffronGymBattleText6 ; TextBeforeBattle - dw SaffronGymAfterBattleText6 ; TextAfterBattle - dw SaffronGymEndBattleText6 ; TextEndBattle - dw SaffronGymEndBattleText6 ; TextEndBattle - -SaffronGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 - dw SaffronGymBattleText7 ; TextBeforeBattle - dw SaffronGymAfterBattleText7 ; TextAfterBattle - dw SaffronGymEndBattleText7 ; TextEndBattle - dw SaffronGymEndBattleText7 ; TextEndBattle - - db $ff - -SaffronGymText1: - TX_ASM - CheckEvent EVENT_BEAT_SABRINA - jr z, .asm_5d134 - CheckEventReuseA EVENT_GOT_TM46 - jr nz, .asm_5d12c - call z, SaffronGymText_5d068 - call DisableWaitingAfterTextDisplay - jr .asm_5d15f -.asm_5d12c - ld hl, SaffronGymText_5d16e - call PrintText - jr .asm_5d15f -.asm_5d134 - ld hl, SaffronGymText_5d162 - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, SaffronGymText_5d167 - ld de, SaffronGymText_5d167 - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $6 - ld [wGymLeaderNo], a - ld a, $3 - ld [wSaffronGymCurScript], a -.asm_5d15f - jp TextScriptEnd - -SaffronGymText_5d162: - TX_FAR _SaffronGymText_5d162 - db "@" - -SaffronGymText_5d167: - TX_FAR _SaffronGymText_5d167 - TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded - TX_BLINK - db "@" - -SaffronGymText_5d16e: - TX_FAR _SaffronGymText_5d16e - db "@" - -SaffronGymText10: - TX_FAR _SaffronGymText_5d173 - db "@" - -SaffronGymText11: - TX_FAR ReceivedTM46Text - TX_SFX_ITEM_1 - TX_FAR _TM46ExplanationText - db "@" - -SaffronGymText12: - TX_FAR _TM46NoRoomText - db "@" - -SaffronGymText2: - TX_ASM - ld hl, SaffronGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText3: - TX_ASM - ld hl, SaffronGymTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText4: - TX_ASM - ld hl, SaffronGymTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText5: - TX_ASM - ld hl, SaffronGymTrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText6: - TX_ASM - ld hl, SaffronGymTrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText7: - TX_ASM - ld hl, SaffronGymTrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText8: - TX_ASM - ld hl, SaffronGymTrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -SaffronGymText9: - TX_ASM - CheckEvent EVENT_BEAT_SABRINA - jr nz, .asm_5d1dd - ld hl, SaffronGymText_5d1e6 - call PrintText - jr .asm_5d1e3 -.asm_5d1dd - ld hl, SaffronGymText_5d1eb - call PrintText -.asm_5d1e3 - jp TextScriptEnd - -SaffronGymText_5d1e6: - TX_FAR _SaffronGymText_5d1e6 - db "@" - -SaffronGymText_5d1eb: - TX_FAR _SaffronGymText_5d1eb - db "@" - -SaffronGymBattleText1: - TX_FAR _SaffronGymBattleText1 - db "@" - -SaffronGymEndBattleText1: - TX_FAR _SaffronGymEndBattleText1 - db "@" - -SaffronGymAfterBattleText1: - TX_FAR _SaffronGymAfterBattleText1 - db "@" - -SaffronGymBattleText2: - TX_FAR _SaffronGymBattleText2 - db "@" - -SaffronGymEndBattleText2: - TX_FAR _SaffronGymEndBattleText2 - db "@" - -SaffronGymAfterBattleText2: - TX_FAR _SaffronGymAfterBattleText2 - db "@" - -SaffronGymBattleText3: - TX_FAR _SaffronGymBattleText3 - db "@" - -SaffronGymEndBattleText3: - TX_FAR _SaffronGymEndBattleText3 - db "@" - -SaffronGymAfterBattleText3: - TX_FAR _SaffronGymAfterBattleText3 - db "@" - -SaffronGymBattleText4: - TX_FAR _SaffronGymBattleText4 - db "@" - -SaffronGymEndBattleText4: - TX_FAR _SaffronGymEndBattleText4 - db "@" - -SaffronGymAfterBattleText4: - TX_FAR _SaffronGymAfterBattleText4 - db "@" - -SaffronGymBattleText5: - TX_FAR _SaffronGymBattleText5 - db "@" - -SaffronGymEndBattleText5: - TX_FAR _SaffronGymEndBattleText5 - db "@" - -SaffronGymAfterBattleText5: - TX_FAR _SaffronGymAfterBattleText5 - db "@" - -SaffronGymBattleText6: - TX_FAR _SaffronGymBattleText6 - db "@" - -SaffronGymEndBattleText6: - TX_FAR _SaffronGymEndBattleText6 - db "@" - -SaffronGymAfterBattleText6: - TX_FAR _SaffronGymAfterBattleText6 - db "@" - -SaffronGymBattleText7: - TX_FAR _SaffronGymBattleText7 - db "@" - -SaffronGymEndBattleText7: - TX_FAR _SaffronGymEndBattleText7 - db "@" - -SaffronGymAfterBattleText7: - TX_FAR _SaffronGymAfterBattleText7 - db "@" diff --git a/scripts/saffronhouse1.asm b/scripts/saffronhouse1.asm deleted file mode 100755 index 5f417978..00000000 --- a/scripts/saffronhouse1.asm +++ /dev/null @@ -1,27 +0,0 @@ -SaffronHouse1Script: - jp EnableAutoTextBoxDrawing - -SaffronHouse1TextPointers: - dw SaffronHouse1Text1 - dw SaffronHouse1Text2 - dw SaffronHouse1Text3 - dw SaffronHouse1Text4 - -SaffronHouse1Text1: - TX_FAR _SaffronHouse1Text1 - db "@" - -SaffronHouse1Text2: - TX_FAR _SaffronHouse1Text2 - TX_ASM - ld a, PIDGEY - call PlayCry - jp TextScriptEnd - -SaffronHouse1Text3: - TX_FAR _SaffronHouse1Text3 - db "@" - -SaffronHouse1Text4: - TX_FAR _SaffronHouse1Text4 - db "@" diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm deleted file mode 100755 index 10c3d29e..00000000 --- a/scripts/saffronhouse2.asm +++ /dev/null @@ -1,45 +0,0 @@ -SaffronHouse2Script: - jp EnableAutoTextBoxDrawing - -SaffronHouse2TextPointers: - dw SaffronHouse2Text1 - -SaffronHouse2Text1: - TX_ASM - CheckEvent EVENT_GOT_TM29 - jr nz, .asm_9e72b - ld hl, TM29PreReceiveText - call PrintText - lb bc, TM_29, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedTM29Text - call PrintText - SetEvent EVENT_GOT_TM29 - jr .asm_fe4e1 -.BagFull - ld hl, TM29NoRoomText - call PrintText - jr .asm_fe4e1 -.asm_9e72b - ld hl, TM29ExplanationText - call PrintText -.asm_fe4e1 - jp TextScriptEnd - -TM29PreReceiveText: - TX_FAR _TM29PreReceiveText - db "@" - -ReceivedTM29Text: - TX_FAR _ReceivedTM29Text - TX_SFX_ITEM_1 - db "@" - -TM29ExplanationText: - TX_FAR _TM29ExplanationText - db "@" - -TM29NoRoomText: - TX_FAR _TM29NoRoomText - db "@" diff --git a/scripts/saffronmart.asm b/scripts/saffronmart.asm deleted file mode 100755 index 8b140610..00000000 --- a/scripts/saffronmart.asm +++ /dev/null @@ -1,15 +0,0 @@ -SaffronMartScript: - jp EnableAutoTextBoxDrawing - -SaffronMartTextPointers: - dw SaffronCashierText - dw SaffronMartText2 - dw SaffronMartText3 - -SaffronMartText2: - TX_FAR _SaffronMartText2 - db "@" - -SaffronMartText3: - TX_FAR _SaffronMartText3 - db "@" diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm deleted file mode 100755 index 82467215..00000000 --- a/scripts/saffronpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -SaffronPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -SaffronPokecenterTextPointers: - dw SaffronHealNurseText - dw SaffronPokecenterText2 - dw SaffronPokecenterText3 - dw SaffronTradeNurseText - -SaffronHealNurseText: - TX_POKECENTER_NURSE - -SaffronPokecenterText2: - TX_FAR _SaffronPokecenterText2 - db "@" - -SaffronPokecenterText3: - TX_FAR _SaffronPokecenterText3 - db "@" - -SaffronTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/school.asm b/scripts/school.asm deleted file mode 100755 index 2300946b..00000000 --- a/scripts/school.asm +++ /dev/null @@ -1,14 +0,0 @@ -SchoolScript: - jp EnableAutoTextBoxDrawing - -SchoolTextPointers: - dw SchoolText1 - dw SchoolText2 - -SchoolText1: - TX_FAR _SchoolText1 - db "@" - -SchoolText2: - TX_FAR _SchoolText2 - db "@" diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm deleted file mode 100755 index 52561fa7..00000000 --- a/scripts/seafoamislands1.asm +++ /dev/null @@ -1,47 +0,0 @@ -SeafoamIslands1Script: - call EnableAutoTextBoxDrawing - SetEvent EVENT_IN_SEAFOAM_ISLANDS - ld hl, wFlags_0xcd60 - bit 7, [hl] - res 7, [hl] - jr z, .asm_4483b - ld hl, Seafoam1HolesCoords - call CheckBoulderCoords - ret nc - EventFlagAddress hl, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_44819 - SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 - ld [wObjectToShow], a - jr .asm_44825 -.asm_44819 - SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 - ld [wObjectToShow], a -.asm_44825 - ld a, [wObjectToHide] - ld [wMissableObjectIndex], a - predef HideObject - ld a, [wObjectToShow] - ld [wMissableObjectIndex], a - predef_jump ShowObject -.asm_4483b - ld a, $9f - ld [wDungeonWarpDestinationMap], a - ld hl, Seafoam1HolesCoords - jp IsPlayerOnDungeonWarp - -Seafoam1HolesCoords: - db $06,$11 - db $06,$18 - db $ff - -SeafoamIslands1TextPointers: - dw BoulderText - dw BoulderText diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm deleted file mode 100755 index 50024bad..00000000 --- a/scripts/seafoamislands2.asm +++ /dev/null @@ -1,46 +0,0 @@ -SeafoamIslands2Script: - call EnableAutoTextBoxDrawing - ld hl, wFlags_0xcd60 - bit 7, [hl] - res 7, [hl] - jr z, .asm_46362 - ld hl, Seafoam2HolesCoords - call CheckBoulderCoords - ret nc - EventFlagAddress hl, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_46340 - SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 - ld [wObjectToShow], a - jr .asm_4634c -.asm_46340 - SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 - ld [wObjectToShow], a -.asm_4634c - ld a, [wObjectToHide] - ld [wMissableObjectIndex], a - predef HideObject - ld a, [wObjectToShow] - ld [wMissableObjectIndex], a - predef_jump ShowObject -.asm_46362 - ld a, $a0 - ld [wDungeonWarpDestinationMap], a - ld hl, Seafoam2HolesCoords - jp IsPlayerOnDungeonWarp - -Seafoam2HolesCoords: - db $06,$12 - db $06,$17 - db $ff - -SeafoamIslands2TextPointers: - dw BoulderText - dw BoulderText diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm deleted file mode 100755 index 4a7848a4..00000000 --- a/scripts/seafoamislands3.asm +++ /dev/null @@ -1,46 +0,0 @@ -SeafoamIslands3Script: - call EnableAutoTextBoxDrawing - ld hl, wFlags_0xcd60 - bit 7, [hl] - res 7, [hl] - jr z, .asm_4649e - ld hl, Seafoam3HolesCoords - call CheckBoulderCoords - ret nc - EventFlagAddress hl, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_4647c - SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3 - ld [wObjectToShow], a - jr .asm_46488 -.asm_4647c - SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4 - ld [wObjectToShow], a -.asm_46488 - ld a, [wObjectToHide] - ld [wMissableObjectIndex], a - predef HideObject - ld a, [wObjectToShow] - ld [wMissableObjectIndex], a - predef_jump ShowObject -.asm_4649e - ld a, $a1 - ld [wDungeonWarpDestinationMap], a - ld hl, Seafoam3HolesCoords - jp IsPlayerOnDungeonWarp - -Seafoam3HolesCoords: - db $06,$13 - db $06,$16 - db $ff - -SeafoamIslands3TextPointers: - dw BoulderText - dw BoulderText diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm deleted file mode 100755 index 34873004..00000000 --- a/scripts/seafoamislands4.asm +++ /dev/null @@ -1,149 +0,0 @@ -SeafoamIslands4Script: - call EnableAutoTextBoxDrawing - ld hl, wFlags_0xcd60 - bit 7, [hl] - res 7, [hl] - jr z, .asm_465dc - ld hl, Seafoam4HolesCoords - call CheckBoulderCoords - ret nc - EventFlagAddress hl, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_465b8 - SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 - ld [wObjectToShow], a - jr .asm_465c4 -.asm_465b8 - SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 - ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 - ld [wObjectToShow], a -.asm_465c4 - ld a, [wObjectToHide] - ld [wMissableObjectIndex], a - predef HideObject - ld a, [wObjectToShow] - ld [wMissableObjectIndex], a - predef ShowObject - jr .asm_465ed -.asm_465dc - ld a, $a2 - ld [wDungeonWarpDestinationMap], a - ld hl, Seafoam4HolesCoords - call IsPlayerOnDungeonWarp - ld a, [wd732] - bit 4, a - ret nz -.asm_465ed - ld hl, SeafoamIslands4ScriptPointers - ld a, [wSeafoamIslands4CurScript] - jp CallFunctionInTable - -Seafoam4HolesCoords: - db $10,$03 - db $10,$06 - db $ff - -SeafoamIslands4ScriptPointers: - dw SeafoamIslands4Script0 - dw SeafoamIslands4Script1 - dw SeafoamIslands4Script2 - dw SeafoamIslands4Script3 - -SeafoamIslands4Script0: - CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE - ret z - ld a, [wYCoord] - cp $8 - ret nz - ld a, [wXCoord] - cp $f - ret nz - ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement46632 - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld hl, wFlags_D733 - set 2, [hl] - ld a, $1 - ld [wSeafoamIslands4CurScript], a - ret - -RLEMovement46632: - db D_DOWN,6 - db D_RIGHT,5 - db D_DOWN,3 - db $ff - -SeafoamIslands4Script1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld a, $0 - ld [wSeafoamIslands4CurScript], a - ret - -SeafoamIslands4Script2: - CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE - ret z - ld a, [wXCoord] - cp $12 - jr z, .asm_4665e - cp $13 - ld a, $0 - jr nz, .asm_4667b - ld de, RLEData_4667f - jr .asm_46661 -.asm_4665e - ld de, RLEData_46688 -.asm_46661 - ld hl, wSimulatedJoypadStatesEnd - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - xor a - ld [wSpriteStateData2 + $06], a - ld hl, wd730 - set 7, [hl] - ld hl, wFlags_D733 - set 2, [hl] - ld a, $3 -.asm_4667b - ld [wSeafoamIslands4CurScript], a - ret - -RLEData_4667f: - db D_DOWN,$06 - db D_RIGHT,$02 - db D_DOWN,$04 - db D_LEFT,$01 - db $FF - -RLEData_46688: - db D_DOWN,$06 - db D_RIGHT,$02 - db D_DOWN,$04 - db $FF - -SeafoamIslands4Script3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld a, $0 - ld [wSeafoamIslands4CurScript], a - ret - -SeafoamIslands4TextPointers: - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm deleted file mode 100755 index a233fb6a..00000000 --- a/scripts/seafoamislands5.asm +++ /dev/null @@ -1,173 +0,0 @@ -SeafoamIslands5Script: - call EnableAutoTextBoxDrawing - ld a, [wSeafoamIslands5CurScript] - ld hl, SeafoamIslands5ScriptPointers - jp CallFunctionInTable - -SeafoamIslands5Script_467a5: - xor a - ld [wSeafoamIslands5CurScript], a - ld [wJoyIgnore], a - ret - -SeafoamIslands5ScriptPointers: - dw SeafoamIslands5Script0 - dw SeafoamIslands5Script1 - dw SeafoamIslands5Script2 - dw SeafoamIslands5Script3 - dw SeafoamIslands5Script4 - -SeafoamIslands5Script4: - ld a, [wIsInBattle] - cp $ff - jr z, SeafoamIslands5Script_467a5 - call EndTrainerBattle - ld a, $0 - ld [wSeafoamIslands5CurScript], a - ret - -SeafoamIslands5Script0: - CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE - ret z - ld hl, .Coords - call ArePlayerCoordsInArray - ret nc - ld a, [wCoordIndex] - cp $3 - jr nc, .asm_467e6 - ld a, NPC_MOVEMENT_UP - ld [wSimulatedJoypadStatesEnd + 1], a - ld a, 2 - jr .asm_467e8 -.asm_467e6 - ld a, 1 -.asm_467e8 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - ld hl, wFlags_D733 - res 2, [hl] - ld a, $1 - ld [wSeafoamIslands5CurScript], a - ret - -.Coords - db $11,$14 - db $11,$15 - db $10,$14 - db $10,$15 - db $FF - -SeafoamIslands5Script1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - xor a - ld [wJoyIgnore], a - ld a, $0 - ld [wSeafoamIslands5CurScript], a - ret - -SeafoamIslands5Script2: - CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE - ld a, $0 - jr z, .asm_46849 - ld hl, .Coords - call ArePlayerCoordsInArray - ld a, $0 - jr nc, .asm_46849 - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_46837 - ld de, RLEMovementData_46859 - jr .asm_4683a -.asm_46837 - ld de, RLEMovementData_46852 -.asm_4683a - ld hl, wSimulatedJoypadStatesEnd - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 -.asm_46849 - ld [wSeafoamIslands5CurScript], a - ret - -.Coords - db $0E,$04 - db $0E,$05 - db $FF - -RLEMovementData_46852: - db D_UP,$03 - db D_RIGHT,$02 - db D_UP,$01 - db $FF - -RLEMovementData_46859: - db D_UP,$03 - db D_RIGHT,$03 - db D_UP,$01 - db $FF - -SeafoamIslands5Script3: - ld a, [wSimulatedJoypadStatesIndex] - ld b, a - cp $1 - call z, SeaFoamIslands5Script_46872 - ld a, b - and a - ret nz - ld a, $0 - ld [wSeafoamIslands5CurScript], a - ret - -SeaFoamIslands5Script_46872: - xor a - ld [wWalkBikeSurfState], a - ld [wWalkBikeSurfStateCopy], a - jp ForceBikeOrSurf - -SeafoamIslands5TextPointers: - dw BoulderText - dw BoulderText - dw ArticunoText - dw SeafoamIslands5Text4 - dw SeafoamIslands5Text5 - -ArticunoTrainerHeader: - dbEventFlagBit EVENT_BEAT_ARTICUNO - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ARTICUNO - dw ArticunoBattleText ; TextBeforeBattle - dw ArticunoBattleText ; TextAfterBattle - dw ArticunoBattleText ; TextEndBattle - dw ArticunoBattleText ; TextEndBattle - - db $ff - -ArticunoText: - TX_ASM - ld hl, ArticunoTrainerHeader - call TalkToTrainer - ld a, $4 - ld [wSeafoamIslands5CurScript], a - jp TextScriptEnd - -ArticunoBattleText: - TX_FAR _ArticunoBattleText - TX_ASM - ld a, ARTICUNO - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -SeafoamIslands5Text4: - TX_FAR _SeafoamIslands5Text4 - db "@" - -SeafoamIslands5Text5: - TX_FAR _SeafoamIslands5Text5 - db "@" diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm deleted file mode 100755 index c0cb169b..00000000 --- a/scripts/silphco1.asm +++ /dev/null @@ -1,16 +0,0 @@ -SilphCo1Script: - call EnableAutoTextBoxDrawing - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ret z - CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK - ret nz - ld a, HS_SILPH_CO_1F_RECEPTIONIST - ld [wMissableObjectIndex], a - predef_jump ShowObject - -SilphCo1TextPointers: - dw SilphCo1Text1 - -SilphCo1Text1: - TX_FAR _SilphCo1Text1 - db "@" diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm deleted file mode 100755 index 5cfb92b2..00000000 --- a/scripts/silphco10.asm +++ /dev/null @@ -1,122 +0,0 @@ -SilphCo10Script: - call SilphCo10Script_5a14f - call EnableAutoTextBoxDrawing - ld hl, SilphCo10TrainerHeader0 - ld de, SilphCo10ScriptPointers - ld a, [wSilphCo10CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo10CurScript], a - ret - -SilphCo10Script_5a14f: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo10GateCoords - call SilphCo2Script_59d43 - call SilphCo10Text_5a176 - CheckEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR - ret nz - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 4, 5 - predef_jump ReplaceTileBlock - -SilphCo10GateCoords: - db $04,$05 - db $FF - -SilphCo10Text_5a176: - ld a, [$ffe0] - and a - ret z - SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR - ret - -SilphCo10ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo10TextPointers: - dw SilphCo10Text1 - dw SilphCo10Text2 - dw SilphCo10Text3 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - -SilphCo10TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_0 - dw SilphCo10BattleText1 ; TextBeforeBattle - dw SilphCo10AfterBattleText1 ; TextAfterBattle - dw SilphCo10EndBattleText1 ; TextEndBattle - dw SilphCo10EndBattleText1 ; TextEndBattle - -SilphCo10TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_1 - dw SilphCo10BattleText2 ; TextBeforeBattle - dw SilphCo10AfterBattleText2 ; TextAfterBattle - dw SilphCo10EndBattleText2 ; TextEndBattle - dw SilphCo10EndBattleText2 ; TextEndBattle - - db $ff - -SilphCo10Text1: - TX_ASM - ld hl, SilphCo10TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo10Text2: - TX_ASM - ld hl, SilphCo10TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo10Text3: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo10Text_5a1d8 - jr nz, .asm_cf85f - ld hl, SilphCo10Text_5a1d3 -.asm_cf85f - call PrintText - jp TextScriptEnd - -SilphCo10Text_5a1d3: - TX_FAR _SilphCo10Text_5a1d3 - db "@" - -SilphCo10Text_5a1d8: - TX_FAR _SilphCo10Text_5a1d8 - db "@" - -SilphCo10BattleText1: - TX_FAR _SilphCo10BattleText1 - db "@" - -SilphCo10EndBattleText1: - TX_FAR _SilphCo10EndBattleText1 - db "@" - -SilphCo10AfterBattleText1: - TX_FAR _SilphCo10AfterBattleText1 - db "@" - -SilphCo10BattleText2: - TX_FAR _SilphCo10BattleText2 - db "@" - -SilphCo10EndBattleText2: - TX_FAR _SilphCo10EndBattleText2 - db "@" - -SilphCo10AfterBattleText2: - TX_FAR _SilphCo10AfterBattleText2 - db "@" diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm deleted file mode 100755 index 342fef07..00000000 --- a/scripts/silphco11.asm +++ /dev/null @@ -1,405 +0,0 @@ -SilphCo11Script: - call SilphCo11Script_62110 - call EnableAutoTextBoxDrawing - ld hl, SilphCo11TrainerHeader0 - ld de, SilphCo11ScriptPointers - ld a, [wSilphCo11CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo11CurScript], a - ret - -SilphCo11Script_62110: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo11GateCoords - call SilphCo11Script_62137 - call SilphCo11Script_62163 - CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR - ret nz - ld a, $20 - ld [wNewTileBlockID], a - lb bc, 6, 3 - predef_jump ReplaceTileBlock - -SilphCo11GateCoords: - db $06,$03 - db $FF - -SilphCo11Script_62137: - push hl - ld hl, wCardKeyDoorY - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - xor a - ld [$ffe0], a - pop hl -.asm_62143 - ld a, [hli] - cp $ff - jr z, .asm_6215f - push hl - ld hl, $ffe0 - inc [hl] - pop hl - cp b - jr z, .asm_62154 - inc hl - jr .asm_62143 -.asm_62154 - ld a, [hli] - cp c - jr nz, .asm_62143 - ld hl, wCardKeyDoorY - xor a - ld [hli], a - ld [hl], a - ret -.asm_6215f - xor a - ld [$ffe0], a - ret - -SilphCo11Script_62163: - ld a, [$ffe0] - and a - ret z - SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR - ret - -SilphCo11Script_6216d: - ld hl, MissableObjectIDs_6219b -.asm_62170 - ld a, [hli] - cp $ff - jr z, .asm_62181 - push hl - ld [wMissableObjectIndex], a - predef HideObject - pop hl - jr .asm_62170 -.asm_62181 - ld hl, MissableObjectIDs_62194 -.asm_62184 - ld a, [hli] - cp $ff - ret z - push hl - ld [wMissableObjectIndex], a - predef ShowObject - pop hl - jr .asm_62184 - -MissableObjectIDs_62194: - db HS_SAFFRON_CITY_8 - db HS_SAFFRON_CITY_9 - db HS_SAFFRON_CITY_A - db HS_SAFFRON_CITY_B - db HS_SAFFRON_CITY_C - db HS_SAFFRON_CITY_D - db $FF - -MissableObjectIDs_6219b: - db HS_SAFFRON_CITY_1 - db HS_SAFFRON_CITY_2 - db HS_SAFFRON_CITY_3 - db HS_SAFFRON_CITY_4 - db HS_SAFFRON_CITY_5 - db HS_SAFFRON_CITY_6 - db HS_SAFFRON_CITY_7 - db HS_SAFFRON_CITY_E - db HS_SAFFRON_CITY_F - db HS_SILPH_CO_2F_2 - db HS_SILPH_CO_2F_3 - db HS_SILPH_CO_2F_4 - db HS_SILPH_CO_2F_5 - db HS_SILPH_CO_3F_1 - db HS_SILPH_CO_3F_2 - db HS_SILPH_CO_4F_1 - db HS_SILPH_CO_4F_2 - db HS_SILPH_CO_4F_3 - db HS_SILPH_CO_5F_1 - db HS_SILPH_CO_5F_2 - db HS_SILPH_CO_5F_3 - db HS_SILPH_CO_5F_4 - db HS_SILPH_CO_6F_1 - db HS_SILPH_CO_6F_2 - db HS_SILPH_CO_6F_3 - db HS_SILPH_CO_7F_1 - db HS_SILPH_CO_7F_2 - db HS_SILPH_CO_7F_3 - db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_8F_1 - db HS_SILPH_CO_8F_2 - db HS_SILPH_CO_8F_3 - db HS_SILPH_CO_9F_1 - db HS_SILPH_CO_9F_2 - db HS_SILPH_CO_9F_3 - db HS_SILPH_CO_10F_1 - db HS_SILPH_CO_10F_2 - db HS_SILPH_CO_11F_1 - db HS_SILPH_CO_11F_2 - db HS_SILPH_CO_11F_3 - db $FF - -SilphCo11Script_621c4: - xor a - ld [wJoyIgnore], a - -SilphCo11Script_621c8: - ld [wSilphCo11CurScript], a - ld [wCurMapScript], a - ret - -SilphCo11ScriptPointers: - dw SilphCo11Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw SilphCo11Script3 - dw SilphCo11Script4 - dw SilphCo11Script5 - -SilphCo11Script0: - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ret nz - ld hl, CoordsData_62211 - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - ld a, [wCoordIndex] - ld [wcf0d], a - xor a - ld [hJoyHeld], a - ld a, $f0 - ld [wJoyIgnore], a - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $3 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld de, MovementData_62216 - call MoveSprite - ld a, $3 - jp SilphCo11Script_621c8 - -CoordsData_62211: - db $0D,$06 - db $0C,$07 - db $FF - -MovementData_62216: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -SilphCo11Script_6221a: - ld [wPlayerMovingDirection], a - ld a, $3 - ld [H_SPRITEINDEX], a - ld a, b - ld [hSpriteFacingDirection], a - jp SetSpriteFacingDirectionAndDelay - -SilphCo11Script5: - ld a, [wIsInBattle] - cp $ff - jp z, SilphCo11Script_621c4 - ld a, [wcf0d] - cp $1 - jr z, .asm_6223c - ld a, PLAYER_DIR_LEFT - ld b, SPRITE_FACING_RIGHT - jr .asm_62240 -.asm_6223c - ld a, PLAYER_DIR_UP - ld b, SPRITE_FACING_DOWN -.asm_62240 - call SilphCo11Script_6221a - ld a, $f0 - ld [wJoyIgnore], a - ld a, $6 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call GBFadeOutToBlack - call SilphCo11Script_6216d - call UpdateSprites - call Delay3 - call GBFadeInFromBlack - SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI - xor a - ld [wJoyIgnore], a - jp SilphCo11Script_621c8 - -SilphCo11Script3: - ld a, [wd730] - bit 0, a - ret nz - ld a, $3 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld a, [wcf0d] - cp $1 - jr z, .asm_62284 - ld a, PLAYER_DIR_LEFT - ld b, SPRITE_FACING_RIGHT - jr .asm_62288 -.asm_62284 - ld a, PLAYER_DIR_UP - ld b, SPRITE_FACING_DOWN -.asm_62288 - call SilphCo11Script_6221a - call Delay3 - ld a, $4 - jp SilphCo11Script_621c8 - -SilphCo11Script4: - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, SilphCo10Text_62330 - ld de, SilphCo10Text_62330 - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - xor a - ld [wJoyIgnore], a - ld a, $5 - jp SilphCo11Script_621c8 - -SilphCo11TextPointers: - dw SilphCo11Text1 - dw SilphCo11Text2 - dw SilphCo11Text3 - dw SilphCo11Text4 - dw SilphCo11Text5 - dw SilphCo11Text6 - -SilphCo11TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0 - dw SilphCo11BattleText1 ; TextBeforeBattle - dw SilphCo11AfterBattleText1 ; TextAfterBattle - dw SilphCo11EndBattleText1 ; TextEndBattle - dw SilphCo11EndBattleText1 ; TextEndBattle - -SilphCo11TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1 - dw SilphCo11BattleText2 ; TextBeforeBattle - dw SilphCo11AfterBattleText2 ; TextAfterBattle - dw SilphCo11EndBattleText2 ; TextEndBattle - dw SilphCo11EndBattleText2 ; TextEndBattle - - db $ff - -SilphCo11Text1: - TX_ASM - CheckEvent EVENT_GOT_MASTER_BALL - jp nz, .asm_62308 - ld hl, SilphCoPresidentText - call PrintText - lb bc, MASTER_BALL, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedSilphCoMasterBallText - call PrintText - SetEvent EVENT_GOT_MASTER_BALL - jr .asm_6230e -.BagFull - ld hl, SilphCoMasterBallNoRoomText - call PrintText - jr .asm_6230e -.asm_62308 - ld hl, SilphCo10Text_6231c - call PrintText -.asm_6230e - jp TextScriptEnd - -SilphCoPresidentText: - TX_FAR _SilphCoPresidentText - db "@" - -ReceivedSilphCoMasterBallText: - TX_FAR _ReceivedSilphCoMasterBallText - TX_SFX_KEY_ITEM - db "@" - -SilphCo10Text_6231c: - TX_FAR _SilphCo10Text_6231c - db "@" - -SilphCoMasterBallNoRoomText: - TX_FAR _SilphCoMasterBallNoRoomText - db "@" - -SilphCo11Text2: - TX_FAR _SilphCo11Text2 - db "@" - -SilphCo11Text3: - TX_FAR _SilphCo11Text3 - db "@" - -SilphCo10Text_62330: - TX_FAR _SilphCo10Text_62330 - db "@" - -SilphCo11Text6: - TX_FAR _SilphCo10Text_62335 - db "@" - -SilphCo11Text4: - TX_ASM - ld hl, SilphCo11TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo11BattleText1: - TX_FAR _SilphCo11BattleText1 - db "@" - -SilphCo11EndBattleText1: - TX_FAR _SilphCo11EndBattleText1 - db "@" - -SilphCo11AfterBattleText1: - TX_FAR _SilphCo11AfterBattleText1 - db "@" - -SilphCo11Text5: - TX_ASM - ld hl, SilphCo11TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo11BattleText2: - TX_FAR _SilphCo11BattleText2 - db "@" - -SilphCo11EndBattleText2: - TX_FAR _SilphCo11EndBattleText2 - db "@" - -SilphCo11AfterBattleText2: - TX_FAR _SilphCo11AfterBattleText2 - db "@" - -SilphCo10Text_6236c: - TX_ASM - ld hl, SilphCo10Text_6237b - call PrintText - ld a, PORYGON - call DisplayPokedex - jp TextScriptEnd - -SilphCo10Text_6237b: - TX_FAR _SilphCo10Text_6237b - db "@" diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm deleted file mode 100755 index e77c45dd..00000000 --- a/scripts/silphco2.asm +++ /dev/null @@ -1,245 +0,0 @@ -SilphCo2Script: - call SilphCo2Script_59d07 - call EnableAutoTextBoxDrawing - ld hl, SilphCo2TrainerHeader0 - ld de, SilphCo2ScriptPointers - ld a, [wSilphCo2CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo2CurScript], a - ret - -SilphCo2Script_59d07: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo2GateCoords - call SilphCo2Script_59d43 - call SilphCo2Script_59d6f - CheckEvent EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - jr nz, .asm_59d2e - push af - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 2, 2 - predef ReplaceTileBlock - pop af -.asm_59d2e - CheckEventAfterBranchReuseA EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - ret nz - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 5, 2 - predef_jump ReplaceTileBlock - -SilphCo2GateCoords: - db $02,$02 - db $05,$02 - db $FF - -SilphCo2Script_59d43: - push hl - ld hl, wCardKeyDoorY - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - xor a - ld [$ffe0], a - pop hl -.asm_59d4f - ld a, [hli] - cp $ff - jr z, .asm_59d6b - push hl - ld hl, $ffe0 - inc [hl] - pop hl - cp b - jr z, .asm_59d60 - inc hl - jr .asm_59d4f -.asm_59d60 - ld a, [hli] - cp c - jr nz, .asm_59d4f - ld hl, wCardKeyDoorY - xor a - ld [hli], a - ld [hl], a - ret -.asm_59d6b - xor a - ld [$ffe0], a - ret - -SilphCo2Script_59d6f: - EventFlagAddress hl, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - ld a, [$ffe0] - and a - ret z - cp $1 - jr nz, .next - SetEventReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - ret -.next - SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - ret - -SilphCo2ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo2TextPointers: - dw SilphCo2Text1 - dw SilphCo2Text2 - dw SilphCo2Text3 - dw SilphCo2Text4 - dw SilphCo2Text5 - -SilphCo2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_0 - dw SilphCo2BattleText1 ; TextBeforeBattle - dw SilphCo2AfterBattleText1 ; TextAfterBattle - dw SilphCo2EndBattleText1 ; TextEndBattle - dw SilphCo2EndBattleText1 ; TextEndBattle - -SilphCo2TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_1 - dw SilphCo2BattleText2 ; TextBeforeBattle - dw SilphCo2AfterBattleText2 ; TextAfterBattle - dw SilphCo2EndBattleText2 ; TextEndBattle - dw SilphCo2EndBattleText2 ; TextEndBattle - -SilphCo2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_2 - dw SilphCo2BattleText3 ; TextBeforeBattle - dw SilphCo2AfterBattleText3 ; TextAfterBattle - dw SilphCo2EndBattleText3 ; TextEndBattle - dw SilphCo2EndBattleText3 ; TextEndBattle - -SilphCo2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_3 - dw SilphCo2BattleText4 ; TextBeforeBattle - dw SilphCo2AfterBattleText4 ; TextAfterBattle - dw SilphCo2EndBattleText4 ; TextEndBattle - dw SilphCo2EndBattleText4 ; TextEndBattle - - db $ff - -SilphCo2Text1: - TX_ASM - CheckEvent EVENT_GOT_TM36 - jr nz, .asm_59de4 - ld hl, SilphCo2Text_59ded - call PrintText - lb bc, TM_36, 1 - call GiveItem - ld hl, TM36NoRoomText - jr nc, .asm_59de7 - SetEvent EVENT_GOT_TM36 - ld hl, ReceivedTM36Text - jr .asm_59de7 -.asm_59de4 - ld hl, TM36ExplanationText -.asm_59de7 - call PrintText - jp TextScriptEnd - -SilphCo2Text_59ded: - TX_FAR _SilphCo2Text_59ded - db "@" - -ReceivedTM36Text: - TX_FAR _ReceivedTM36Text - TX_SFX_ITEM_1 - db "@" - -TM36ExplanationText: - TX_FAR _TM36ExplanationText - db "@" - -TM36NoRoomText: - TX_FAR _TM36NoRoomText - db "@" - -SilphCo2Text2: - TX_ASM - ld hl, SilphCo2TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo2Text3: - TX_ASM - ld hl, SilphCo2TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo2Text4: - TX_ASM - ld hl, SilphCo2TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo2Text5: - TX_ASM - ld hl, SilphCo2TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SilphCo2BattleText1: - TX_FAR _SilphCo2BattleText1 - db "@" - -SilphCo2EndBattleText1: - TX_FAR _SilphCo2EndBattleText1 - db "@" - -SilphCo2AfterBattleText1: - TX_FAR _SilphCo2AfterBattleText1 - db "@" - -SilphCo2BattleText2: - TX_FAR _SilphCo2BattleText2 - db "@" - -SilphCo2EndBattleText2: - TX_FAR _SilphCo2EndBattleText2 - db "@" - -SilphCo2AfterBattleText2: - TX_FAR _SilphCo2AfterBattleText2 - db "@" - -SilphCo2BattleText3: - TX_FAR _SilphCo2BattleText3 - db "@" - -SilphCo2EndBattleText3: - TX_FAR _SilphCo2EndBattleText3 - db "@" - -SilphCo2AfterBattleText3: - TX_FAR _SilphCo2AfterBattleText3 - db "@" - -SilphCo2BattleText4: - TX_FAR _SilphCo2BattleText4 - db "@" - -SilphCo2EndBattleText4: - TX_FAR _SilphCo2EndBattleText4 - db "@" - -SilphCo2AfterBattleText4: - TX_FAR _SilphCo2AfterBattleText4 - db "@" diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm deleted file mode 100755 index 0d12b768..00000000 --- a/scripts/silphco3.asm +++ /dev/null @@ -1,136 +0,0 @@ -SilphCo3Script: - call SilphCo3Script_59f71 - call EnableAutoTextBoxDrawing - ld hl, SilphCo3TrainerHeader0 - ld de, SilphCo3ScriptPointers - ld a, [wSilphCo3CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo3CurScript], a - ret - -SilphCo3Script_59f71: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo3GateCoords - call SilphCo2Script_59d43 - call SilphCo3Script_59fad - CheckEvent EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - jr nz, .asm_59f98 - push af - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 4, 4 - predef ReplaceTileBlock - pop af -.asm_59f98 - CheckEventAfterBranchReuseA EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - ret nz - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 4, 8 - predef_jump ReplaceTileBlock - -SilphCo3GateCoords: - db $04,$04 - db $04,$08 - db $FF - -SilphCo3Script_59fad: - EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - ld a, [$ffe0] - and a - ret z - cp $1 - jr nz, .next - SetEventReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - ret -.next - SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - ret - -SilphCo3ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo3TextPointers: - dw SilphCo3Text1 - dw SilphCo3Text2 - dw SilphCo3Text3 - dw PickUpItemText - -SilphCo3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0 - dw SilphCo3BattleText1 ; TextBeforeBattle - dw SilphCo3AfterBattleText1 ; TextAfterBattle - dw SilphCo3EndBattleText1 ; TextEndBattle - dw SilphCo3EndBattleText1 ; TextEndBattle - -SilphCo3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1 - dw SilphCo3BattleText2 ; TextBeforeBattle - dw SilphCo3AfterBattleText2 ; TextAfterBattle - dw SilphCo3EndBattleText2 ; TextEndBattle - dw SilphCo3EndBattleText2 ; TextEndBattle - - db $ff - -SilphCo3Text1: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo3Text_59ffe - jr nz, .asm_59fee - ld hl, SilphCo3Text_59ff9 -.asm_59fee - call PrintText - jp TextScriptEnd - -SilphCo3Text_59ff9: - TX_FAR _SilphCo3Text_59ff9 - db "@" - -SilphCo3Text_59ffe: - TX_FAR _SilphCo3Text_59ffe - db "@" - -SilphCo3Text2: - TX_ASM - ld hl, SilphCo3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo3BattleText1: - TX_FAR _SilphCo3BattleText1 - db "@" - -SilphCo3EndBattleText1: - TX_FAR _SilphCo3EndBattleText1 - db "@" - -SilphCo3AfterBattleText1: - TX_FAR _SilphCo3AfterBattleText1 - db "@" - -SilphCo3Text3: - TX_ASM - ld hl, SilphCo3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo3BattleText2: - TX_FAR _SilphCo3BattleText2 - db "@" - -SilphCo3EndBattleText2: - TX_FAR _SilphCo3EndBattleText2 - db "@" - -SilphCo3AfterBattleText2: - TX_FAR _SilphCo3AfterBattleText2 - db "@" diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm deleted file mode 100755 index 1cfd1ceb..00000000 --- a/scripts/silphco4.asm +++ /dev/null @@ -1,199 +0,0 @@ -SilphCo4Script: - call SilphCo4Script_19d21 - call EnableAutoTextBoxDrawing - ld hl, SilphCo4TrainerHeader0 - ld de, SilphCo4ScriptPointers - ld a, [wSilphCo4CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo4CurScript], a - ret - -SilphCo4Script_19d21: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo4GateCoords - call SilphCo4Script_19d5d - call SilphCo4Script_19d89 - CheckEvent EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - jr nz, .asm_19d48 - push af - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 6, 2 - predef ReplaceTileBlock - pop af -.asm_19d48 - CheckEventAfterBranchReuseA EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - ret nz - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 4, 6 - predef_jump ReplaceTileBlock - -SilphCo4GateCoords: - db $06,$02 - db $04,$06 - db $FF - -SilphCo4Script_19d5d: - push hl - ld hl, wCardKeyDoorY - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - xor a - ld [$ffe0], a - pop hl -.asm_19d69 - ld a, [hli] - cp $ff - jr z, .asm_19d85 - push hl - ld hl, $ffe0 - inc [hl] - pop hl - cp b - jr z, .asm_19d7a - inc hl - jr .asm_19d69 -.asm_19d7a - ld a, [hli] - cp c - jr nz, .asm_19d69 - ld hl, wCardKeyDoorY - xor a - ld [hli], a - ld [hl], a - ret -.asm_19d85 - xor a - ld [$ffe0], a - ret - -SilphCo4Script_19d89: - EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - ld a, [$ffe0] - and a - ret z - cp $1 - jr nz, .next - SetEventReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - ret -.next - SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - ret - -SilphCo4ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo4TextPointers: - dw SilphCo4Text1 - dw SilphCo4Text2 - dw SilphCo4Text3 - dw SilphCo4Text4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - -SilphCo4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_0 - dw SilphCo4BattleText2 ; TextBeforeBattle - dw SilphCo4AfterBattleText2 ; TextAfterBattle - dw SilphCo4EndBattleText2 ; TextEndBattle - dw SilphCo4EndBattleText2 ; TextEndBattle - -SilphCo4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1 - dw SilphCo4BattleText3 ; TextBeforeBattle - dw SilphCo4AfterBattleText3 ; TextAfterBattle - dw SilphCo4EndBattleText3 ; TextEndBattle - dw SilphCo4EndBattleText3 ; TextEndBattle - -SilphCo4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 - dw SilphCo4BattleText4 ; TextBeforeBattle - dw SilphCo4AfterBattleText4 ; TextAfterBattle - dw SilphCo4EndBattleText4 ; TextEndBattle - dw SilphCo4EndBattleText4 ; TextEndBattle - - db $ff - -SilphCo4Text1: - TX_ASM - ld hl, SilphCo4Text_19de0 - ld de, SilphCo4Text_19de5 - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo4Text_19de0: - TX_FAR _SilphCo4Text_19de0 - db "@" - -SilphCo4Text_19de5: - TX_FAR _SilphCo4Text_19de5 - db "@" - -SilphCo4Text2: - TX_ASM - ld hl, SilphCo4TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo4BattleText2: - TX_FAR _SilphCo4BattleText2 - db "@" - -SilphCo4EndBattleText2: - TX_FAR _SilphCo4EndBattleText2 - db "@" - -SilphCo4AfterBattleText2: - TX_FAR _SilphCo4AfterBattleText2 - db "@" - -SilphCo4Text3: - TX_ASM - ld hl, SilphCo4TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo4BattleText3: - TX_FAR _SilphCo4BattleText3 - db "@" - -SilphCo4EndBattleText3: - TX_FAR _SilphCo4EndBattleText3 - db "@" - -SilphCo4AfterBattleText3: - TX_FAR _SilphCo4AfterBattleText3 - db "@" - -SilphCo4Text4: - TX_ASM - ld hl, SilphCo4TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo4BattleText4: - TX_FAR _SilphCo4BattleText4 - db "@" - -SilphCo4EndBattleText4: - TX_FAR _SilphCo4EndBattleText4 - db "@" - -SilphCo4AfterBattleText4: - TX_FAR _SilphCo4AfterBattleText4 - db "@" diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm deleted file mode 100755 index 45a81b68..00000000 --- a/scripts/silphco5.asm +++ /dev/null @@ -1,221 +0,0 @@ -SilphCo5Script: - call SilphCo5Script_19f4d - call EnableAutoTextBoxDrawing - ld hl, SilphCo5TrainerHeader0 - ld de, SilphCo5ScriptPointers - ld a, [wSilphCo5CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo5CurScript], a - ret - -SilphCo5Script_19f4d: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo5GateCoords - call SilphCo4Script_19d5d - call SilphCo5Script_19f9e - CheckEvent EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - jr nz, .asm_19f74 - push af - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 2, 3 - predef ReplaceTileBlock - pop af -.asm_19f74 - CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - jr nz, .asm_19f87 - push af - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 6, 3 - predef ReplaceTileBlock - pop af -.asm_19f87 - CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR2 - ret nz - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 5, 7 - predef_jump ReplaceTileBlock - -SilphCo5GateCoords: - db $02,$03 - db $06,$03 - db $05,$07 - db $FF - -SilphCo5Script_19f9e: - EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - ld a, [$ffe0] - and a - ret z - cp $1 - jr nz, .next1 - SetEventReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - ret -.next1 - cp $2 - jr nz, .next2 - SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR2, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - ret -.next2 - SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - ret - -SilphCo5ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo5TextPointers: - dw SilphCo5Text1 - dw SilphCo5Text2 - dw SilphCo5Text3 - dw SilphCo5Text4 - dw SilphCo5Text5 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SilphCo5Text9 - dw SilphCo5Text10 - dw SilphCo5Text11 - -SilphCo5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 - dw SilphCo5BattleText2 ; TextBeforeBattle - dw SilphCo5AfterBattleText2 ; TextAfterBattle - dw SilphCo5EndBattleText2 ; TextEndBattle - dw SilphCo5EndBattleText2 ; TextEndBattle - -SilphCo5TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 - dw SilphCo5BattleText3 ; TextBeforeBattle - dw SilphCo5AfterBattleText3 ; TextAfterBattle - dw SilphCo5EndBattleText3 ; TextEndBattle - dw SilphCo5EndBattleText3 ; TextEndBattle - -SilphCo5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 - dw SilphCo5BattleText4 ; TextBeforeBattle - dw SilphCo5AfterBattleText4 ; TextAfterBattle - dw SilphCo5EndBattleText4 ; TextEndBattle - dw SilphCo5EndBattleText4 ; TextEndBattle - -SilphCo5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 - dw SilphCo5BattleText5 ; TextBeforeBattle - dw SilphCo5AfterBattleText5 ; TextAfterBattle - dw SilphCo5EndBattleText5 ; TextEndBattle - dw SilphCo5EndBattleText5 ; TextEndBattle - - db $ff - -SilphCo5Text1: - TX_ASM - ld hl, SilphCo5Text_1a010 - ld de, SilphCo5Text_1a015 - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo5Text_1a010: - TX_FAR _SilphCo5Text_1a010 - db "@" - -SilphCo5Text_1a015: - TX_FAR _SilphCo5Text_1a015 - db "@" - -SilphCo5Text2: - TX_ASM - ld hl, SilphCo5TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo5BattleText2: - TX_FAR _SilphCo5BattleText2 - db "@" - -SilphCo5EndBattleText2: - TX_FAR _SilphCo5EndBattleText2 - db "@" - -SilphCo5AfterBattleText2: - TX_FAR _SilphCo5AfterBattleText2 - db "@" - -SilphCo5Text3: - TX_ASM - ld hl, SilphCo5TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo5BattleText3: - TX_FAR _SilphCo5BattleText3 - db "@" - -SilphCo5EndBattleText3: - TX_FAR _SilphCo5EndBattleText3 - db "@" - -SilphCo5AfterBattleText3: - TX_FAR _SilphCo5AfterBattleText3 - db "@" - -SilphCo5Text4: - TX_ASM - ld hl, SilphCo5TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo5BattleText4: - TX_FAR _SilphCo5BattleText4 - db "@" - -SilphCo5EndBattleText4: - TX_FAR _SilphCo5EndBattleText4 - db "@" - -SilphCo5AfterBattleText4: - TX_FAR _SilphCo5AfterBattleText4 - db "@" - -SilphCo5Text5: - TX_ASM - ld hl, SilphCo5TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SilphCo5BattleText5: - TX_FAR _SilphCo5BattleText5 - db "@" - -SilphCo5EndBattleText5: - TX_FAR _SilphCo5EndBattleText5 - db "@" - -SilphCo5AfterBattleText5: - TX_FAR _SilphCo5AfterBattleText5 - db "@" - -SilphCo5Text9: - TX_FAR _SilphCo5Text9 - db "@" - -SilphCo5Text10: - TX_FAR _SilphCo5Text10 - db "@" - -SilphCo5Text11: - TX_FAR _SilphCo5Text11 - db "@" diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm deleted file mode 100755 index 240b6793..00000000 --- a/scripts/silphco6.asm +++ /dev/null @@ -1,220 +0,0 @@ -SilphCo6Script: - call SilphCo6Script_1a1bf - call EnableAutoTextBoxDrawing - ld hl, SilphCo6TrainerHeader0 - ld de, SilphCo6ScriptPointers - ld a, [wSilphCo6CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo6CurScript], a - ret - -SilphCo6Script_1a1bf: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo6GateCoords - call SilphCo4Script_19d5d - call SilphCo6Script_1a1e6 - CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR - ret nz - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 6, 2 - predef_jump ReplaceTileBlock - -SilphCo6GateCoords: - db $06,$02 - db $FF - -SilphCo6Script_1a1e6: - ld a, [$ffe0] - and a - ret z - SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR - ret - -SilphCo6ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo6TextPointers: - dw SilphCo6Text1 - dw SilphCo6Text2 - dw SilphCo6Text3 - dw SilphCo6Text4 - dw SilphCo6Text5 - dw SilphCo6Text6 - dw SilphCo6Text7 - dw SilphCo6Text8 - dw PickUpItemText - dw PickUpItemText - -SilphCo6TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0 - dw SilphCo6BattleText2 ; TextBeforeBattle - dw SilphCo6AfterBattleText2 ; TextAfterBattle - dw SilphCo6EndBattleText2 ; TextEndBattle - dw SilphCo6EndBattleText2 ; TextEndBattle - -SilphCo6TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 - dw SilphCo6BattleText3 ; TextBeforeBattle - dw SilphCo6AfterBattleText3 ; TextAfterBattle - dw SilphCo6EndBattleText3 ; TextEndBattle - dw SilphCo6EndBattleText3 ; TextEndBattle - -SilphCo6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 - dw SilphCo6BattleText4 ; TextBeforeBattle - dw SilphCo6AfterBattleText4 ; TextAfterBattle - dw SilphCo6EndBattleText4 ; TextEndBattle - dw SilphCo6EndBattleText4 ; TextEndBattle - - db $ff - -SilphCo6Script_1a22f: - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .asm_1a238 - jr .asm_1a23a -.asm_1a238 - ld h, d - ld l, e -.asm_1a23a - jp PrintText - -SilphCo6Text1: - TX_ASM - ld hl, SilphCo6Text_1a24a - ld de, SilphCo6Text_1a24f - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo6Text_1a24a: - TX_FAR _SilphCo6Text_1a24a - db "@" - -SilphCo6Text_1a24f: - TX_FAR _SilphCo6Text_1a24f - db "@" - -SilphCo6Text2: - TX_ASM - ld hl, SilphCo6Text_1a261 - ld de, SilphCo6Text_1a266 - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo6Text_1a261: - TX_FAR _SilphCo6Text_1a261 - db "@" - -SilphCo6Text_1a266: - TX_FAR _SilphCo6Text_1a266 - db "@" - -SilphCo6Text3: - TX_ASM - ld hl, SilphCo6Text_1a278 - ld de, SilphCo6Text_1a27d - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo6Text_1a278: - TX_FAR _SilphCo6Text_1a278 - db "@" - -SilphCo6Text_1a27d: - TX_FAR _SilphCo6Text_1a27d - db "@" - -SilphCo6Text4: - TX_ASM - ld hl, SilphCo6Text_1a28f - ld de, SilphCo6Text_1a294 - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo6Text_1a28f: - TX_FAR _SilphCo6Text_1a28f - db "@" - -SilphCo6Text_1a294: - TX_FAR _SilphCo6Text_1a294 - db "@" - -SilphCo6Text5: - TX_ASM - ld hl, SilphCo6Text_1a2a6 - ld de, SilphCo6Text_1a2ab - call SilphCo6Script_1a22f - jp TextScriptEnd - -SilphCo6Text_1a2a6: - TX_FAR _SilphCo6Text_1a2a6 - db "@" - -SilphCo6Text_1a2ab: - TX_FAR _SilphCo6Text_1a2ab - db "@" - -SilphCo6Text6: - TX_ASM - ld hl, SilphCo6TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo6BattleText2: - TX_FAR _SilphCo6BattleText2 - db "@" - -SilphCo6EndBattleText2: - TX_FAR _SilphCo6EndBattleText2 - db "@" - -SilphCo6AfterBattleText2: - TX_FAR _SilphCo6AfterBattleText2 - db "@" - -SilphCo6Text7: - TX_ASM - ld hl, SilphCo6TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo6BattleText3: - TX_FAR _SilphCo6BattleText3 - db "@" - -SilphCo6EndBattleText3: - TX_FAR _SilphCo6EndBattleText3 - db "@" - -SilphCo6AfterBattleText3: - TX_FAR _SilphCo6AfterBattleText3 - db "@" - -SilphCo6Text8: - TX_ASM - ld hl, SilphCo6TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo6BattleText4: - TX_FAR _SilphCo6BattleText4 - db "@" - -SilphCo6EndBattleText4: - TX_FAR _SilphCo6EndBattleText4 - db "@" - -SilphCo6AfterBattleText4: - TX_FAR _SilphCo6AfterBattleText4 - db "@" diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm deleted file mode 100755 index b211c8a9..00000000 --- a/scripts/silphco7.asm +++ /dev/null @@ -1,527 +0,0 @@ -SilphCo7Script: - call SilphCo7Script_51b77 - call EnableAutoTextBoxDrawing - ld hl, SilphCo7TrainerHeader0 - ld de, SilphCo7ScriptPointers - ld a, [wSilphCo7CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo7CurScript], a - ret - -SilphCo7Script_51b77: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo7GateCoords - call SilphCo7Text_51bc8 - call SilphCo7Text_51bf4 - CheckEvent EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - jr nz, .asm_51b9e - push af - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 3, 5 - predef ReplaceTileBlock - pop af -.asm_51b9e - CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR2, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - jr nz, .asm_51bb1 - push af - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 2, 10 - predef ReplaceTileBlock - pop af -.asm_51bb1 - CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR2 - ret nz - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 6, 10 - predef_jump ReplaceTileBlock - -SilphCo7GateCoords: - db $03,$05 - db $02,$0A - db $06,$0A - db $FF - -SilphCo7Text_51bc8: - push hl - ld hl, wCardKeyDoorY - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - xor a - ld [$ffe0], a - pop hl -.asm_51bd4 - ld a, [hli] - cp $ff - jr z, .asm_51bf0 - push hl - ld hl, $ffe0 - inc [hl] - pop hl - cp b - jr z, .asm_51be5 - inc hl - jr .asm_51bd4 -.asm_51be5 - ld a, [hli] - cp c - jr nz, .asm_51bd4 - ld hl, wCardKeyDoorY - xor a - ld [hli], a - ld [hl], a - ret -.asm_51bf0 - xor a - ld [$ffe0], a - ret - -SilphCo7Text_51bf4: - EventFlagAddress hl, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - ld a, [$ffe0] - and a - ret z - cp $1 - jr nz, .next1 - SetEventReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - ret -.next1 - cp $2 - jr nz, .next2 - SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR2, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - ret -.next2 - SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - ret - -SilphCo7Text_51c0c: - xor a - ld [wJoyIgnore], a - -SilphCo7Text_51c10: - ld [wSilphCo7CurScript], a - ld [wCurMapScript], a - ret - -SilphCo7ScriptPointers: - dw SilphCo7Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw SilphCo7Script3 - dw SilphCo7Script4 - dw SilphCo7Script5 - -SilphCo7Script0: - CheckEvent EVENT_BEAT_SILPH_CO_RIVAL - jp nz, CheckFightingMapTrainers - ld hl, CoordsData_51c78 - call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - xor a - ld [hJoyHeld], a - ld a, $f0 - ld [wJoyIgnore], a - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld a, $9 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $9 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld de, MovementData_51c7d - ld a, [wCoordIndex] - ld [wcf0d], a - cp $1 - jr z, .asm_51c6c - inc de -.asm_51c6c - ld a, $9 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $3 - jp SilphCo7Text_51c10 - -CoordsData_51c78: - db $02,$03 - db $03,$03 - db $FF - -MovementData_51c7d: - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db $FF - -SilphCo7Script3: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, $d - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, SilphCo7Text14 - ld de, SilphCo7Text_51ecd - call SaveEndBattleTextPointers - ld a, OPP_SONY2 - ld [wCurOpponent], a - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .asm_51cb6 - ld a, $7 - jr .asm_51cc0 -.asm_51cb6 - cp STARTER3 - jr nz, .asm_51cbe - ld a, $8 - jr .asm_51cc0 -.asm_51cbe - ld a, $9 -.asm_51cc0 - ld [wTrainerNo], a - ld a, $4 - jp SilphCo7Text_51c10 - -SilphCo7Script4: - ld a, [wIsInBattle] - cp $ff - jp z, SilphCo7Text_51c0c - ld a, $f0 - ld [wJoyIgnore], a - SetEvent EVENT_BEAT_SILPH_CO_RIVAL - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - ld a, $9 - ld [H_SPRITEINDEX], a - ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, $f - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld de, MovementData_51d1d - ld a, [wcf0d] - cp $1 - jr nz, .asm_51d0e - ld de, MovementData_51d1a -.asm_51d0e - ld a, $9 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $5 - jp SilphCo7Text_51c10 - -MovementData_51d1a: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db $FF - -MovementData_51d1d: - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_UP - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - db $FF - -SilphCo7Script5: - ld a, [wd730] - bit 0, a - ret nz - ld a, HS_SILPH_CO_7F_RIVAL - ld [wMissableObjectIndex], a - predef HideObject - call PlayDefaultMusic - xor a - ld [wJoyIgnore], a - jp SilphCo7Text_51c10 - -SilphCo7TextPointers: - dw SilphCo7Text1 - dw SilphCo7Text2 - dw SilphCo7Text3 - dw SilphCo7Text4 - dw SilphCo7Text5 - dw SilphCo7Text6 - dw SilphCo7Text7 - dw SilphCo7Text8 - dw SilphCo7Text9 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw SilphCo7Text13 - dw SilphCo7Text14 - dw SilphCo7Text15 - -SilphCo7TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_0 - dw SilphCo7BattleText1 ; TextBeforeBattle - dw SilphCo7AfterBattleText1 ; TextAfterBattle - dw SilphCo7EndBattleText1 ; TextEndBattle - dw SilphCo7EndBattleText1 ; TextEndBattle - -SilphCo7TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1 - dw SilphCo7BattleText2 ; TextBeforeBattle - dw SilphCo7AfterBattleText2 ; TextAfterBattle - dw SilphCo7EndBattleText2 ; TextEndBattle - dw SilphCo7EndBattleText2 ; TextEndBattle - -SilphCo7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 - dw SilphCo7BattleText3 ; TextBeforeBattle - dw SilphCo7AfterBattleText3 ; TextAfterBattle - dw SilphCo7EndBattleText3 ; TextEndBattle - dw SilphCo7EndBattleText3 ; TextEndBattle - -SilphCo7TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 - dw SilphCo7BattleText4 ; TextBeforeBattle - dw SilphCo7AfterBattleText4 ; TextAfterBattle - dw SilphCo7EndBattleText4 ; TextEndBattle - dw SilphCo7EndBattleText4 ; TextEndBattle - - db $ff - -SilphCo7Text1: -; lapras guy - TX_ASM - ld a, [wd72e] - bit 0, a ; got lapras? - jr z, .givelapras - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .LaprasGuyText - call PrintText - jr .done -.givelapras - ld hl, .MeetLaprasGuyText - call PrintText - lb bc, LAPRAS, 15 - call GivePokemon - jr nc, .done - ld a, [wSimulatedJoypadStatesEnd] - and a - call z, WaitForTextScrollButtonPress - call EnableAutoTextBoxDrawing - ld hl, .HeresYourLaprasText - call PrintText - ld hl, wd72e - set 0, [hl] - jr .done -.savedsilph - ld hl, .LaprasGuySavedText - call PrintText -.done - jp TextScriptEnd - -.MeetLaprasGuyText - TX_FAR _MeetLaprasGuyText - db "@" - -.HeresYourLaprasText - TX_FAR _HeresYourLaprasText - db "@" - -.LaprasGuyText - TX_FAR _LaprasGuyText - db "@" - -.LaprasGuySavedText - TX_FAR _LaprasGuySavedText - db "@" - -SilphCo7Text2: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .rockettext - call PrintText - jr .done -.savedsilph - ld hl, .savedtext - call PrintText -.done - jp TextScriptEnd - -.rockettext - TX_FAR _SilphCo7Text_51e00 - db "@" - -.savedtext - TX_FAR _CanceledMasterBallText - db "@" - -SilphCo7Text3: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .rockettext - call PrintText - jr .done -.savedsilph - ld hl, .savedtext - call PrintText -.done - jp TextScriptEnd - -.rockettext - TX_FAR _SilphCo7Text_51e23 - db "@" - -.savedtext - TX_FAR _SilphCo7Text_51e28 - db "@" - -SilphCo7Text4: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .savedsilph - ld hl, .rockettext - call PrintText - jr .done -.savedsilph - ld hl, .savedtext - call PrintText -.done - jp TextScriptEnd - -.rockettext - TX_FAR _SilphCo7Text_51e46 - db "@" - -.savedtext - TX_FAR _SilphCo7Text_51e4b - db "@" - -SilphCo7Text5: - TX_ASM - ld hl, SilphCo7TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo7BattleText1: - TX_FAR _SilphCo7BattleText1 - db "@" - -SilphCo7EndBattleText1: - TX_FAR _SilphCo7EndBattleText1 - db "@" - -SilphCo7AfterBattleText1: - TX_FAR _SilphCo7AfterBattleText1 - db "@" - -SilphCo7Text6: - TX_ASM - ld hl, SilphCo7TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo7BattleText2: - TX_FAR _SilphCo7BattleText2 - db "@" - -SilphCo7EndBattleText2: - TX_FAR _SilphCo7EndBattleText2 - db "@" - -SilphCo7AfterBattleText2: - TX_FAR _SilphCo7AfterBattleText2 - db "@" - -SilphCo7Text7: - TX_ASM - ld hl, SilphCo7TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo7BattleText3: - TX_FAR _SilphCo7BattleText3 - db "@" - -SilphCo7EndBattleText3: - TX_FAR _SilphCo7EndBattleText3 - db "@" - -SilphCo7AfterBattleText3: - TX_FAR _SilphCo7AfterBattleText3 - db "@" - -SilphCo7Text8: - TX_ASM - ld hl, SilphCo7TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SilphCo7BattleText4: - TX_FAR _SilphCo7BattleText4 - db "@" - -SilphCo7EndBattleText4: - TX_FAR _SilphCo7EndBattleText4 - db "@" - -SilphCo7AfterBattleText4: - TX_FAR _SilphCo7AfterBattleText4 - db "@" - -SilphCo7Text9: - TX_ASM - ld hl, SilphCo7Text_51ebe - call PrintText - jp TextScriptEnd - -SilphCo7Text_51ebe: - TX_FAR _SilphCo7Text_51ebe - db "@" - -SilphCo7Text13: - TX_FAR _SilphCo7Text_51ec3 - db "@" - -SilphCo7Text14: - TX_FAR _SilphCo7Text_51ec8 - db "@" - -SilphCo7Text_51ecd: - TX_FAR _SilphCo7Text_51ecd - db "@" - -SilphCo7Text15: - TX_FAR _SilphCo7Text_51ed2 - db "@" diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm deleted file mode 100755 index 498fd569..00000000 --- a/scripts/silphco8.asm +++ /dev/null @@ -1,183 +0,0 @@ -SilphCo8Script: - call SilphCo8Script_5651a - call EnableAutoTextBoxDrawing - ld hl, SilphCo8TrainerHeader0 - ld de, SilphCo8ScriptPointers - ld a, [wSilphCo8CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo8CurScript], a - ret - -SilphCo8Script_5651a: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo8GateCoords - call SilphCo8Script_56541 - call SilphCo8Script_5656d - CheckEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR - ret nz - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 4, 3 - predef_jump ReplaceTileBlock - -SilphCo8GateCoords: - db $04,$03 - db $FF - -SilphCo8Script_56541: - push hl - ld hl, wCardKeyDoorY - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - xor a - ld [$ffe0], a - pop hl -.asm_5654d - ld a, [hli] - cp $ff - jr z, .asm_56569 - push hl - ld hl, $ffe0 - inc [hl] - pop hl - cp b - jr z, .asm_5655e - inc hl - jr .asm_5654d -.asm_5655e - ld a, [hli] - cp c - jr nz, .asm_5654d - ld hl, wCardKeyDoorY - xor a - ld [hli], a - ld [hl], a - ret -.asm_56569 - xor a - ld [$ffe0], a - ret - -SilphCo8Script_5656d: - ld a, [$ffe0] - and a - ret z - SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR - ret - -SilphCo8ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo8TextPointers: - dw SilphCo8Text1 - dw SilphCo8Text2 - dw SilphCo8Text3 - dw SilphCo8Text4 - -SilphCo8TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_0 - dw SilphCo8BattleText1 ; TextBeforeBattle - dw SilphCo8AfterBattleText1 ; TextAfterBattle - dw SilphCo8EndBattleText1 ; TextEndBattle - dw SilphCo8EndBattleText1 ; TextEndBattle - -SilphCo8TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_1 - dw SilphCo8BattleText2 ; TextBeforeBattle - dw SilphCo8AfterBattleText2 ; TextAfterBattle - dw SilphCo8EndBattleText2 ; TextEndBattle - dw SilphCo8EndBattleText2 ; TextEndBattle - -SilphCo8TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_2 - dw SilphCo8BattleText3 ; TextBeforeBattle - dw SilphCo8AfterBattleText3 ; TextAfterBattle - dw SilphCo8EndBattleText3 ; TextEndBattle - dw SilphCo8EndBattleText3 ; TextEndBattle - - db $ff - -SilphCo8Text1: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SilphCo8Text_565c3 - jr nz, .asm_565b8 - ld hl, SilphCo8Text_565be -.asm_565b8 - call PrintText - jp TextScriptEnd - -SilphCo8Text_565be: - TX_FAR _SilphCo8Text_565be - db "@" - -SilphCo8Text_565c3: - TX_FAR _SilphCo8Text_565c3 - db "@" - -SilphCo8Text2: - TX_ASM - ld hl, SilphCo8TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo8Text3: - TX_ASM - ld hl, SilphCo8TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo8Text4: - TX_ASM - ld hl, SilphCo8TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo8BattleText1: - TX_FAR _SilphCo8BattleText1 - db "@" - -SilphCo8EndBattleText1: - TX_FAR _SilphCo8EndBattleText1 - db "@" - -SilphCo8AfterBattleText1: - TX_FAR _SilphCo8AfterBattleText1 - db "@" - -SilphCo8BattleText2: - TX_FAR _SilphCo8BattleText2 - db "@" - -SilphCo8EndBattleText2: - TX_FAR _SilphCo8EndBattleText2 - db "@" - -SilphCo8AfterBattleText2: - TX_FAR _SilphCo8AfterBattleText2 - db "@" - -SilphCo8BattleText3: - TX_FAR _SilphCo8BattleText3 - db "@" - -SilphCo8EndBattleText3: - TX_FAR _SilphCo8EndBattleText3 - db "@" - -SilphCo8AfterBattleText3: - TX_FAR _SilphCo8AfterBattleText3 - db "@" diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm deleted file mode 100755 index 57b8bc89..00000000 --- a/scripts/silphco9.asm +++ /dev/null @@ -1,244 +0,0 @@ -SilphCo9Script: - call SilphCo9Script_5d7d1 - call EnableAutoTextBoxDrawing - ld hl, SilphCo9TrainerHeader0 - ld de, SilphCo9ScriptPointers - ld a, [wSilphCo9CurScript] - call ExecuteCurMapScriptInTable - ld [wSilphCo9CurScript], a - ret - -SilphCo9Script_5d7d1: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - ld hl, SilphCo9GateCoords - call SilphCo9Script_5d837 - call SilphCo9Script_5d863 - CheckEvent EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - jr nz, .asm_5d7f8 - push af - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 4, 1 - predef ReplaceTileBlock - pop af -.asm_5d7f8 - CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR2, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - jr nz, .asm_5d80b - push af - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 2, 9 - predef ReplaceTileBlock - pop af -.asm_5d80b - CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR3, EVENT_SILPH_CO_9_UNLOCKED_DOOR2 - jr nz, .asm_5d81e - push af - ld a, $54 - ld [wNewTileBlockID], a - lb bc, 5, 9 - predef ReplaceTileBlock - pop af -.asm_5d81e - CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR3 - ret nz - ld a, $5f - ld [wNewTileBlockID], a - lb bc, 6, 5 - predef_jump ReplaceTileBlock - -SilphCo9GateCoords: - db $04,$01 - db $02,$09 - db $05,$09 - db $06,$05 - db $FF - -SilphCo9Script_5d837: - push hl - ld hl, wCardKeyDoorY - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - xor a - ld [$ffe0], a - pop hl -.asm_5d843 - ld a, [hli] - cp $ff - jr z, .asm_5d85f - push hl - ld hl, $ffe0 - inc [hl] - pop hl - cp b - jr z, .asm_5d854 - inc hl - jr .asm_5d843 -.asm_5d854 - ld a, [hli] - cp c - jr nz, .asm_5d843 - ld hl, wCardKeyDoorY - xor a - ld [hli], a - ld [hl], a - ret -.asm_5d85f - xor a - ld [$ffe0], a - ret - -SilphCo9Script_5d863: - EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - ld a, [$ffe0] - and a - ret z - cp $1 - jr nz, .next1 - SetEventReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - ret -.next1 - cp $2 - jr nz, .next2 - SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR2, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - ret -.next2 - cp $3 - jr nz, .next3 - SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR3, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - ret -.next3 - cp $4 - ret nz - SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - ret - -SilphCo9ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SilphCo9TextPointers: - dw SilphCo9Text1 - dw SilphCo9Text2 - dw SilphCo9Text3 - dw SilphCo9Text4 - -SilphCo9TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_0 - dw SilphCo9BattleText1 ; TextBeforeBattle - dw SilphCo9AfterBattleText1 ; TextAfterBattle - dw SilphCo9EndBattleText1 ; TextEndBattle - dw SilphCo9EndBattleText1 ; TextEndBattle - -SilphCo9TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_1 - dw SilphCo9BattleText2 ; TextBeforeBattle - dw SilphCo9AfterBattleText2 ; TextAfterBattle - dw SilphCo9EndBattleText2 ; TextEndBattle - dw SilphCo9EndBattleText2 ; TextEndBattle - -SilphCo9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_2 - dw SilphCo9BattleText3 ; TextBeforeBattle - dw SilphCo9AfterBattleText3 ; TextAfterBattle - dw SilphCo9EndBattleText3 ; TextEndBattle - dw SilphCo9EndBattleText3 ; TextEndBattle - - db $ff - -SilphCo9Text1: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - jr nz, .asm_5d8dc - ld hl, SilphCo9Text_5d8e5 - call PrintText - predef HealParty - call GBFadeOutToWhite - call Delay3 - call GBFadeInFromWhite - ld hl, SilphCo9Text_5d8ea - call PrintText - jr .asm_5d8e2 -.asm_5d8dc - ld hl, SilphCo9Text_5d8ef - call PrintText -.asm_5d8e2 - jp TextScriptEnd - -SilphCo9Text_5d8e5: - TX_FAR _SilphCo9Text_5d8e5 - db "@" - -SilphCo9Text_5d8ea: - TX_FAR _SilphCo9Text_5d8ea - db "@" - -SilphCo9Text_5d8ef: - TX_FAR _SilphCo9Text_5d8ef - db "@" - -SilphCo9Text2: - TX_ASM - ld hl, SilphCo9TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SilphCo9Text3: - TX_ASM - ld hl, SilphCo9TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo9Text4: - TX_ASM - ld hl, SilphCo9TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SilphCo9BattleText1: - TX_FAR _SilphCo9BattleText1 - db "@" - -SilphCo9EndBattleText1: - TX_FAR _SilphCo9EndBattleText1 - db "@" - -SilphCo9AfterBattleText1: - TX_FAR _SilphCo9AfterBattleText1 - db "@" - -SilphCo9BattleText2: - TX_FAR _SilphCo9BattleText2 - db "@" - -SilphCo9EndBattleText2: - TX_FAR _SilphCo9EndBattleText2 - db "@" - -SilphCo9AfterBattleText2: - TX_FAR _SilphCo9AfterBattleText2 - db "@" - -SilphCo9BattleText3: - TX_FAR _SilphCo9BattleText3 - db "@" - -SilphCo9EndBattleText3: - TX_FAR _SilphCo9EndBattleText3 - db "@" - -SilphCo9AfterBattleText3: - TX_FAR _SilphCo9AfterBattleText3 - db "@" diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm deleted file mode 100755 index df4d08c7..00000000 --- a/scripts/silphcoelevator.asm +++ /dev/null @@ -1,88 +0,0 @@ -SilphCoElevatorScript: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - push hl - call nz, SilphCoElevatorScript_457dc - pop hl - bit 7, [hl] - res 7, [hl] - call nz, SilphCoElevatorScript_45827 - xor a - ld [wAutoTextBoxDrawingControl], a - inc a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret - -SilphCoElevatorScript_457dc: - ld hl, wWarpEntries - ld a, [wWarpedFromWhichWarp] - ld b, a - ld a, [wWarpedFromWhichMap] - ld c, a - call SilphCoElevatorScript_457ea - -SilphCoElevatorScript_457ea: - inc hl - inc hl - ld a, b - ld [hli], a - ld a, c - ld [hli], a - ret - -SilphCoElevatorScript_457f1: - ld hl, SilphCoElavatorFloors - call LoadItemList - ld hl, SilphCoElevatorWarpMaps - ld de, wElevatorWarpMaps - ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps - call CopyData - ret - -SilphCoElavatorFloors: - db $0B ; num elements in list - db FLOOR_1F - db FLOOR_2F - db FLOOR_3F - db FLOOR_4F - db FLOOR_5F - db FLOOR_6F - db FLOOR_7F - db FLOOR_8F - db FLOOR_9F - db FLOOR_10F - db FLOOR_11F - db $FF ; terminator - -SilphCoElevatorWarpMaps: -; first byte is warp number -; second byte is map number -; These specify where the player goes after getting out of the elevator. - db $03, SILPH_CO_1F - db $02, SILPH_CO_2F - db $02, SILPH_CO_3F - db $02, SILPH_CO_4F - db $02, SILPH_CO_5F - db $02, SILPH_CO_6F - db $02, SILPH_CO_7F - db $02, SILPH_CO_8F - db $02, SILPH_CO_9F - db $02, SILPH_CO_10F - db $01, SILPH_CO_11F -SilphCoElevatorWarpMapsEnd: - -SilphCoElevatorScript_45827: - call Delay3 - callba ShakeElevator - ret - -SilphCoElevatorTextPointers: - dw SilphCoElevatorText1 - -SilphCoElevatorText1: - TX_ASM - call SilphCoElevatorScript_457f1 - ld hl, SilphCoElevatorWarpMaps - predef DisplayElevatorFloorMenu - jp TextScriptEnd diff --git a/scripts/ssanne1.asm b/scripts/ssanne1.asm deleted file mode 100755 index 3f8861d5..00000000 --- a/scripts/ssanne1.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne1Script: - call EnableAutoTextBoxDrawing - ret - -SSAnne1TextPointers: - dw SSAnne1Text1 - dw SSAnne1Text2 - -SSAnne1Text1: - TX_FAR _SSAnne1Text1 - db "@" - -SSAnne1Text2: - TX_FAR _SSAnne1Text2 - db "@" diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm deleted file mode 100755 index 12433732..00000000 --- a/scripts/ssanne10.asm +++ /dev/null @@ -1,201 +0,0 @@ -SSAnne10Script: - call EnableAutoTextBoxDrawing - ld hl, SSAnne10TrainerHeader0 - ld de, SSAnne10ScriptPointers - ld a, [wSSAnne10CurScript] - call ExecuteCurMapScriptInTable - ld [wSSAnne10CurScript], a - ret - -SSAnne10ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SSAnne10TextPointers: - dw SSAnne10Text1 - dw SSAnne10Text2 - dw SSAnne10Text3 - dw SSAnne10Text4 - dw SSAnne10Text5 - dw SSAnne10Text6 - dw SSAnne10Text7 - dw SSAnne10Text8 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - -SSAnne10TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0 - dw SSAnne10BattleText1 ; TextBeforeBattle - dw SSAnne10AfterBattleText1 ; TextAfterBattle - dw SSAnne10EndBattleText1 ; TextEndBattle - dw SSAnne10EndBattleText1 ; TextEndBattle - -SSAnne10TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1 - dw SSAnne10BattleText2 ; TextBeforeBattle - dw SSAnne10AfterBattleText2 ; TextAfterBattle - dw SSAnne10EndBattleText2 ; TextEndBattle - dw SSAnne10EndBattleText2 ; TextEndBattle - -SSAnne10TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2 - dw SSAnne10BattleText3 ; TextBeforeBattle - dw SSAnne10AfterBattleText3 ; TextAfterBattle - dw SSAnne10EndBattleText3 ; TextEndBattle - dw SSAnne10EndBattleText3 ; TextEndBattle - -SSAnne10TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3 - dw SSAnne10BattleText4 ; TextBeforeBattle - dw SSAnne10AfterBattleText4 ; TextAfterBattle - dw SSAnne10EndBattleText4 ; TextEndBattle - dw SSAnne10EndBattleText4 ; TextEndBattle - -SSAnne10TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4 - dw SSAnne10BattleText5 ; TextBeforeBattle - dw SSAnne10AfterBattleText5 ; TextAfterBattle - dw SSAnne10EndBattleText5 ; TextEndBattle - dw SSAnne10EndBattleText5 ; TextEndBattle - -SSAnne10TrainerHeader5: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5 - dw SSAnne10BattleText6 ; TextBeforeBattle - dw SSAnne10AfterBattleText6 ; TextAfterBattle - dw SSAnne10EndBattleText6 ; TextEndBattle - dw SSAnne10EndBattleText6 ; TextEndBattle - - db $ff - -SSAnne10Text1: - TX_ASM - ld hl, SSAnne10TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SSAnne10Text2: - TX_ASM - ld hl, SSAnne10TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SSAnne10Text3: - TX_ASM - ld hl, SSAnne10TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SSAnne10Text4: - TX_ASM - ld hl, SSAnne10TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SSAnne10Text5: - TX_ASM - ld hl, SSAnne10TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -SSAnne10Text6: - TX_ASM - ld hl, SSAnne10TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -SSAnne10Text8: - TX_FAR _SSAnne10Text8 - TX_ASM - ld a, MACHOKE - call PlayCry - jp TextScriptEnd - -SSAnne10BattleText1: - TX_FAR _SSAnne10BattleText1 - db "@" - -SSAnne10EndBattleText1: - TX_FAR _SSAnne10EndBattleText1 - db "@" - -SSAnne10AfterBattleText1: - TX_FAR _SSAnne10AfterBattleText1 - db "@" - -SSAnne10BattleText2: - TX_FAR _SSAnne10BattleText2 - db "@" - -SSAnne10EndBattleText2: - TX_FAR _SSAnne10EndBattleText2 - db "@" - -SSAnne10AfterBattleText2: - TX_FAR _SSAnne10AfterBattleText2 - db "@" - -SSAnne10BattleText3: - TX_FAR _SSAnne10BattleText3 - db "@" - -SSAnne10EndBattleText3: - TX_FAR _SSAnne10EndBattleText3 - db "@" - -SSAnne10AfterBattleText3: - TX_FAR _SSAnne10AfterBattleText3 - db "@" - -SSAnne10BattleText4: - TX_FAR _SSAnne10BattleText4 - db "@" - -SSAnne10EndBattleText4: - TX_FAR _SSAnne10EndBattleText4 - db "@" - -SSAnne10AfterBattleText4: - TX_FAR _SSAnne10AfterBattleText4 - db "@" - -SSAnne10BattleText5: - TX_FAR _SSAnne10BattleText5 - db "@" - -SSAnne10EndBattleText5: - TX_FAR _SSAnne10EndBattleText5 - db "@" - -SSAnne10AfterBattleText5: - TX_FAR _SSAnne10AfterBattleText5 - db "@" - -SSAnne10BattleText6: - TX_FAR _SSAnne10BattleText6 - db "@" - -SSAnne10EndBattleText6: - TX_FAR _SSAnne10EndBattleText6 - db "@" - -SSAnne10AfterBattleText6: - TX_FAR _SSAnne10AfterBattleText6 - db "@" - -SSAnne10Text7: - TX_FAR _SSAnne10Text7 - db "@" diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm deleted file mode 100755 index 654b881a..00000000 --- a/scripts/ssanne2.asm +++ /dev/null @@ -1,216 +0,0 @@ -SSAnne2Script: - call EnableAutoTextBoxDrawing - ld hl, SSAnne2ScriptPointers - ld a, [wSSAnne2CurScript] - jp CallFunctionInTable - -SSAnne2Script_613ab: - xor a - ld [wJoyIgnore], a - ld [wSSAnne2CurScript], a - ret - -SSAnne2ScriptPointers: - dw SSAnne2Script0 - dw SSAnne2Script1 - dw SSAnne2Script2 - dw SSAnne2Script3 - dw SSAnne2Script4 - -SSAnne2Script4: - ret - -SSAnne2Script0: - ld hl, CoordsData_61411 - call ArePlayerCoordsInArray - ret nc - ld a, $ff - ld [wNewSoundID], a - call PlaySound - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld a, [wCoordIndex] - ld [$ffdb], a - ld a, HS_SS_ANNE_2_RIVAL - ld [wMissableObjectIndex], a - predef ShowObject - call Delay3 - ld a, $2 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - xor a - ld [hJoyHeld], a - ld a, $f0 - ld [wJoyIgnore], a - ld a, [$ffdb] - cp $2 - jr nz, .asm_61400 - ld de, MovementData_6140c - jr .asm_61403 -.asm_61400 - ld de, MovementData_6140d -.asm_61403 - call MoveSprite - ld a, $1 - ld [wSSAnne2CurScript], a - ret - -MovementData_6140c: - db NPC_MOVEMENT_DOWN - -MovementData_6140d: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -CoordsData_61411: - db $08,$24 - db $08,$25 - db $FF - -SSAnne2Script_61416: - ld a, [wXCoord] - cp $25 - jr nz, .asm_61426 - ld a, PLAYER_DIR_LEFT - ld [wPlayerMovingDirection], a - ld a, SPRITE_FACING_RIGHT - jr .asm_61427 -.asm_61426 - xor a ; SPRITE_FACING_DOWN -.asm_61427 - ld [hSpriteFacingDirection], a - ld a, $2 - ld [H_SPRITEINDEX], a - jp SetSpriteFacingDirectionAndDelay - -SSAnne2Script1: - ld a, [wd730] - bit 0, a - ret nz - call SSAnne2Script_61416 - xor a - ld [wJoyIgnore], a - ld a, $2 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - call Delay3 - ld a, OPP_SONY2 - ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [wRivalStarter] - cp STARTER2 - jr nz, .NotSquirtle - ld a, $1 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $2 - jr .done -.Charmander - ld a, $3 -.done - ld [wTrainerNo], a - - call SSAnne2Script_61416 - ld a, $2 - ld [wSSAnne2CurScript], a - ret - -SSAnne2Script2: - ld a, [wIsInBattle] - cp $ff - jp z, SSAnne2Script_613ab - call SSAnne2Script_61416 - ld a, $f0 - ld [wJoyIgnore], a - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $2 - ld [H_SPRITEINDEX], a - call SetSpriteMovementBytesToFF - ld a, [wXCoord] - cp $25 - jr nz, .asm_61497 - ld de, MovementData_614b9 - jr .asm_6149a -.asm_61497 - ld de, MovementData_614b7 -.asm_6149a - ld a, $2 - ld [H_SPRITEINDEX], a - call MoveSprite - ld a, $ff - ld [wNewSoundID], a - call PlaySound - callba Music_RivalAlternateStart - ld a, $3 - ld [wSSAnne2CurScript], a - ret - -MovementData_614b7: - db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_DOWN - -MovementData_614b9: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db $FF - -SSAnne2Script3: - ld a, [wd730] - bit 0, a - ret nz - xor a - ld [wJoyIgnore], a - ld a, HS_SS_ANNE_2_RIVAL - ld [wMissableObjectIndex], a - predef HideObject - call PlayDefaultMusic - ld a, $4 - ld [wSSAnne2CurScript], a - ret - -SSAnne2TextPointers: - dw SSAnne2Text1 - dw SSAnne2Text2 - dw SSAnne2Text3 - -SSAnne2Text1: - TX_FAR _SSAnne2Text1 - db "@" - -SSAnne2Text2: - TX_ASM - ld hl, SSAnneRivalBeforeBattleText - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, SSAnneRivalDefeatedText - ld de, SSAnneRivalWonText - call SaveEndBattleTextPointers - jp TextScriptEnd - -SSAnneRivalBeforeBattleText: - TX_FAR _SSAnneRivalBeforeBattleText - db "@" - -SSAnneRivalDefeatedText: - TX_FAR _SSAnneRivalDefeatedText - db "@" - -SSAnneRivalWonText: - TX_FAR _SSAnneRivalWonText - db "@" - -SSAnne2Text3: - TX_FAR _SSAnneRivalCaptainText - db "@" diff --git a/scripts/ssanne3.asm b/scripts/ssanne3.asm deleted file mode 100755 index e681591a..00000000 --- a/scripts/ssanne3.asm +++ /dev/null @@ -1,9 +0,0 @@ -SSAnne3Script: - jp EnableAutoTextBoxDrawing - -SSAnne3TextPointers: - dw SSAnne3Text1 - -SSAnne3Text1: - TX_FAR _SSAnne3Text1 - db "@" diff --git a/scripts/ssanne4.asm b/scripts/ssanne4.asm deleted file mode 100755 index c9411717..00000000 --- a/scripts/ssanne4.asm +++ /dev/null @@ -1,5 +0,0 @@ -SSAnne4Script: - jp EnableAutoTextBoxDrawing - -SSAnne4TextPointers: - db "@" diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm deleted file mode 100755 index 0cfef9f4..00000000 --- a/scripts/ssanne5.asm +++ /dev/null @@ -1,88 +0,0 @@ -SSAnne5Script: - call EnableAutoTextBoxDrawing - ld hl, SSAnne5TrainerHeader0 - ld de, SSAnne5ScriptPointers - ld a, [wSSAnne5CurScript] - call ExecuteCurMapScriptInTable - ld [wSSAnne5CurScript], a - ret - -SSAnne5ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SSAnne5TextPointers: - dw SSAnne5Text1 - dw SSAnne5Text2 - dw SSAnne5Text3 - dw SSAnne5Text4 - dw SSAnne5Text5 - -SSAnne5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_0 - dw SSAnne5BattleText1 ; TextBeforeBattle - dw SSAnne5AfterBattleText1 ; TextAfterBattle - dw SSAnne5EndBattleText1 ; TextEndBattle - dw SSAnne5EndBattleText1 ; TextEndBattle - -SSAnne5TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_1 - dw SSAnne5BattleText2 ; TextBeforeBattle - dw SSAnne5AfterBattleText2 ; TextAfterBattle - dw SSAnne5EndBattleText2 ; TextEndBattle - dw SSAnne5EndBattleText2 ; TextEndBattle - - db $ff - -SSAnne5Text1: - TX_FAR _SSAnne5Text1 - db "@" - -SSAnne5Text2: - TX_FAR _SSAnne5Text2 - db "@" - -SSAnne5Text3: - TX_FAR _SSAnne5Text3 - db "@" - -SSAnne5Text4: - TX_ASM - ld hl, SSAnne5TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SSAnne5BattleText1: - TX_FAR _SSAnne5BattleText1 - db "@" - -SSAnne5EndBattleText1: - TX_FAR _SSAnne5EndBattleText1 - db "@" - -SSAnne5AfterBattleText1: - TX_FAR _SSAnne5AfterBattleText1 - db "@" - -SSAnne5Text5: - TX_ASM - ld hl, SSAnne5TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SSAnne5BattleText2: - TX_FAR _SSAnne5BattleText2 - db "@" - -SSAnne5EndBattleText2: - TX_FAR _SSAnne5EndBattleText2 - db "@" - -SSAnne5AfterBattleText2: - TX_FAR _SSAnne5AfterBattleText2 - db "@" diff --git a/scripts/ssanne6.asm b/scripts/ssanne6.asm deleted file mode 100755 index e1998858..00000000 --- a/scripts/ssanne6.asm +++ /dev/null @@ -1,72 +0,0 @@ -SSAnne6Script: - call EnableAutoTextBoxDrawing - ret - -SSAnne6TextPointers: - dw SSAnne6Text1 - dw SSAnne6Text2 - dw SSAnne6Text3 - dw SSAnne6Text4 - dw SSAnne6Text5 - dw SSAnne6Text6 - dw SSAnne6Text7 - -SSAnne6Text1: - TX_FAR _SSAnne6Text1 - db "@" - -SSAnne6Text2: - TX_FAR _SSAnne6Text2 - db "@" - -SSAnne6Text3: - TX_FAR _SSAnne6Text3 - db "@" - -SSAnne6Text4: - TX_FAR _SSAnne6Text4 - db "@" - -SSAnne6Text5: - TX_FAR _SSAnne6Text5 - db "@" - -SSAnne6Text6: - TX_FAR _SSAnne6Text6 - db "@" - -SSAnne6Text7: - TX_ASM - ld hl, SSAnne6Text_61807 - call PrintText - ld a, [hRandomAdd] - bit 7, a - jr z, .asm_93eb1 - ld hl, SSAnne6Text_6180c - jr .asm_63292 -.asm_93eb1 - bit 4, a - jr z, .asm_7436c - ld hl, SSAnne6Text_61811 - jr .asm_63292 -.asm_7436c - ld hl, SSAnne6Text_61816 -.asm_63292 - call PrintText - jp TextScriptEnd - -SSAnne6Text_61807: - TX_FAR _SSAnne6Text_61807 - db "@" - -SSAnne6Text_6180c: - TX_FAR _SSAnne6Text_6180c - db "@" - -SSAnne6Text_61811: - TX_FAR _SSAnne6Text_61811 - db "@" - -SSAnne6Text_61816: - TX_FAR _SSAnne6Text_61816 - db "@" diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm deleted file mode 100755 index 0df842c2..00000000 --- a/scripts/ssanne7.asm +++ /dev/null @@ -1,93 +0,0 @@ -SSAnne7Script: - call SSAnne7Script_6189b - jp EnableAutoTextBoxDrawing - -SSAnne7Script_6189b: - CheckEvent EVENT_RUBBED_CAPTAINS_BACK - ret nz - ld hl, wd72d - set 5, [hl] - ret - -SSAnne7TextPointers: - dw SSAnne7Text1 - dw SSAnne7Text2 - dw SSAnne7Text3 - -SSAnne7Text1: - TX_ASM - CheckEvent EVENT_GOT_HM01 - jr nz, .asm_797c4 - ld hl, SSAnne7RubText - call PrintText - ld hl, ReceivingHM01Text - call PrintText - lb bc, HM_01, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedHM01Text - call PrintText - SetEvent EVENT_GOT_HM01 - jr .asm_0faf5 -.BagFull - ld hl, HM01NoRoomText - call PrintText - ld hl, wd72d - set 5, [hl] - jr .asm_0faf5 -.asm_797c4 - ld hl, SSAnne7Text_61932 - call PrintText -.asm_0faf5 - jp TextScriptEnd - -SSAnne7RubText: - TX_FAR _SSAnne7RubText - TX_ASM - ld a, [wAudioROMBank] - cp BANK(Audio3_UpdateMusic) - ld [wAudioSavedROMBank], a - jr nz, .asm_61908 - ld a, $ff - ld [wNewSoundID], a - call PlaySound - ld a, Bank(Music_PkmnHealed) - ld [wAudioROMBank], a -.asm_61908 - ld a, MUSIC_PKMN_HEALED - ld [wNewSoundID], a - call PlaySound -.asm_61910 - ld a, [wChannelSoundIDs] - cp MUSIC_PKMN_HEALED - jr z, .asm_61910 - call PlayDefaultMusic - SetEvent EVENT_RUBBED_CAPTAINS_BACK - ld hl, wd72d - res 5, [hl] - jp TextScriptEnd - -ReceivingHM01Text: - TX_FAR _ReceivingHM01Text - db "@" - -ReceivedHM01Text: - TX_FAR _ReceivedHM01Text - TX_SFX_KEY_ITEM - db "@" - -SSAnne7Text_61932: - TX_FAR _SSAnne7Text_61932 - db "@" - -HM01NoRoomText: - TX_FAR _HM01NoRoomText - db "@" - -SSAnne7Text2: - TX_FAR _SSAnne7Text2 - db "@" - -SSAnne7Text3: - TX_FAR _SSAnne7Text3 - db "@" diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm deleted file mode 100755 index c684f84b..00000000 --- a/scripts/ssanne8.asm +++ /dev/null @@ -1,163 +0,0 @@ -SSAnne8Script: - call EnableAutoTextBoxDrawing - ld hl, SSAnne8TrainerHeader0 - ld de, SSAnne8ScriptPointers - ld a, [wSSAnne8CurScript] - call ExecuteCurMapScriptInTable - ld [wSSAnne8CurScript], a - ret - -SSAnne8ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SSAnne8TextPointers: - dw SSAnne8Text1 - dw SSAnne8Text2 - dw SSAnne8Text3 - dw SSAnne8Text4 - dw SSAnne8Text5 - dw SSAnne8Text6 - dw SSAnne8Text7 - dw SSAnne8Text8 - dw SSAnne8Text9 - dw PickUpItemText - dw SSAnne8Text11 - -SSAnne8TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_0 - dw SSAnne8BattleText1 ; TextBeforeBattle - dw SSAnne8AfterBattleText1 ; TextAfterBattle - dw SSAnne8EndBattleText1 ; TextEndBattle - dw SSAnne8EndBattleText1 ; TextEndBattle - -SSAnne8TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_1 - dw SSAnne8BattleText2 ; TextBeforeBattle - dw SSAnne8AfterBattleText2 ; TextAfterBattle - dw SSAnne8EndBattleText2 ; TextEndBattle - dw SSAnne8EndBattleText2 ; TextEndBattle - -SSAnne8TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_2 - dw SSAnne8BattleText3 ; TextBeforeBattle - dw SSAnne8AfterBattleText3 ; TextAfterBattle - dw SSAnne8EndBattleText3 ; TextEndBattle - dw SSAnne8EndBattleText3 ; TextEndBattle - -SSAnne8TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_3 - dw SSAnne8BattleText4 ; TextBeforeBattle - dw SSAnne8AfterBattleText4 ; TextAfterBattle - dw SSAnne8EndBattleText4 ; TextEndBattle - dw SSAnne8EndBattleText4 ; TextEndBattle - - db $ff - -SSAnne8Text1: - TX_ASM - ld hl, SSAnne8TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SSAnne8Text2: - TX_ASM - ld hl, SSAnne8TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SSAnne8Text3: - TX_ASM - ld hl, SSAnne8TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SSAnne8Text4: - TX_ASM - ld hl, SSAnne8TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SSAnne8Text8: - TX_FAR _SSAnne8Text8 - TX_ASM - ld a, WIGGLYTUFF - call PlayCry - jp TextScriptEnd - -SSAnne8BattleText1: - TX_FAR _SSAnne8BattleText1 - db "@" - -SSAnne8EndBattleText1: - TX_FAR _SSAnne8EndBattleText1 - db "@" - -SSAnne8AfterBattleText1: - TX_FAR _SSAnne8AfterBattleText1 - db "@" - -SSAnne8BattleText2: - TX_FAR _SSAnne8BattleText2 - db "@" - -SSAnne8EndBattleText2: - TX_FAR _SSAnne8EndBattleText2 - db "@" - -SSAnne8AfterBattleText2: - TX_FAR _SSAnne8AfterBattleText2 - db "@" - -SSAnne8BattleText3: - TX_FAR _SSAnne8BattleText3 - db "@" - -SSAnne8EndBattleText3: - TX_FAR _SSAnne8EndBattleText3 - db "@" - -SSAnne8AfterBattleText3: - TX_FAR _SSAnne8AfterBattleText3 - db "@" - -SSAnne8BattleText4: - TX_FAR _SSAnne8BattleText4 - db "@" - -SSAnne8EndBattleText4: - TX_FAR _SSAnne8EndBattleText4 - db "@" - -SSAnne8AfterBattleText4: - TX_FAR _SSAnne8AfterBattleText4 - db "@" - -SSAnne8Text5: - TX_FAR _SSAnne8Text5 - db "@" - -SSAnne8Text6: - TX_FAR _SSAnne8Text6 - db "@" - -SSAnne8Text7: - TX_FAR _SSAnne8Text7 - db "@" - -SSAnne8Text9: - TX_FAR _SSAnne8Text9 - db "@" - -SSAnne8Text11: - TX_FAR _SSAnne8Text11 - db "@" diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm deleted file mode 100755 index 1f965e0d..00000000 --- a/scripts/ssanne9.asm +++ /dev/null @@ -1,215 +0,0 @@ -SSAnne9Script: - ld a, $1 - ld [wAutoTextBoxDrawingControl], a - xor a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, SSAnne9TrainerHeader0 - ld de, SSAnne9ScriptPointers - ld a, [wSSAnne9CurScript] - call ExecuteCurMapScriptInTable - ld [wSSAnne9CurScript], a - ret - -SSAnne9ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -SSAnne9TextPointers: - dw SSAnne9Text1 - dw SSAnne9Text2 - dw SSAnne9Text3 - dw SSAnne9Text4 - dw SSAnne9Text5 - dw PickUpItemText - dw SSAnne9Text7 - dw SSAnne9Text8 - dw PickUpItemText - dw SSAnne9Text10 - dw SSAnne9Text11 - dw SSAnne9Text12 - dw SSAnne9Text13 - -SSAnne9TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0 - dw SSAnne9BattleText1 ; TextBeforeBattle - dw SSAnne9AfterBattleText1 ; TextAfterBattle - dw SSAnne9EndBattleText1 ; TextEndBattle - dw SSAnne9EndBattleText1 ; TextEndBattle - -SSAnne9TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1 - dw SSAnne9BattleText2 ; TextBeforeBattle - dw SSAnne9AfterBattleText2 ; TextAfterBattle - dw SSAnne9EndBattleText2 ; TextEndBattle - dw SSAnne9EndBattleText2 ; TextEndBattle - -SSAnne9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2 - dw SSAnne9BattleText3 ; TextBeforeBattle - dw SSAnne9AfterBattleText3 ; TextAfterBattle - dw SSAnne9EndBattleText3 ; TextEndBattle - dw SSAnne9EndBattleText3 ; TextEndBattle - -SSAnne9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3 - dw SSAnne9BattleText4 ; TextBeforeBattle - dw SSAnne9AfterBattleText4 ; TextAfterBattle - dw SSAnne9EndBattleText4 ; TextEndBattle - dw SSAnne9EndBattleText4 ; TextEndBattle - - db $ff - -SSAnne9Text1: - TX_ASM - ld hl, SSAnne9TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -SSAnne9Text2: - TX_ASM - ld hl, SSAnne9TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SSAnne9Text3: - TX_ASM - ld hl, SSAnne9TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -SSAnne9Text4: - TX_ASM - ld hl, SSAnne9TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -SSAnne9Text5: - TX_ASM - call SaveScreenTilesToBuffer1 - ld hl, SSAnne9Text_61bf2 - call PrintText - call LoadScreenTilesFromBuffer1 - ld a, SNORLAX - call DisplayPokedex - jp TextScriptEnd - -SSAnne9Text_61bf2: - TX_FAR _SSAnne9Text_61bf2 - db "@" - -SSAnne9Text7: - TX_ASM - ld hl, SSAnne9Text_61c01 - call PrintText - jp TextScriptEnd - -SSAnne9Text_61c01: - TX_FAR _SSAnne9Text_61c01 - db "@" - -SSAnne9Text8: - TX_ASM - ld hl, SSAnne9Text_61c10 - call PrintText - jp TextScriptEnd - -SSAnne9Text_61c10: - TX_FAR _SSAnne9Text_61c10 - db "@" - -SSAnne9Text10: - TX_ASM - ld hl, SSAnne9Text_61c1f - call PrintText - jp TextScriptEnd - -SSAnne9Text_61c1f: - TX_FAR _SSAnne9Text_61c1f - db "@" - -SSAnne9Text11: - TX_ASM - ld hl, SSAnne9Text_61c2e - call PrintText - jp TextScriptEnd - -SSAnne9Text_61c2e: - TX_FAR _SSAnne9Text_61c2e - db "@" - -SSAnne9Text12: - TX_ASM - ld hl, SSAnne9Text_61c3d - call PrintText - jp TextScriptEnd - -SSAnne9Text_61c3d: - TX_FAR _SSAnne9Text_61c3d - db "@" - -SSAnne9Text13: - TX_ASM - ld hl, SSAnne9Text_61c4c - call PrintText - jp TextScriptEnd - -SSAnne9Text_61c4c: - TX_FAR _SSAnne9Text_61c4c - db "@" - -SSAnne9BattleText1: - TX_FAR _SSAnne9BattleText1 - db "@" - -SSAnne9EndBattleText1: - TX_FAR _SSAnne9EndBattleText1 - db "@" - -SSAnne9AfterBattleText1: - TX_FAR _SSAnne9AfterBattleText1 - db "@" - -SSAnne9BattleText2: - TX_FAR _SSAnne9BattleText2 - db "@" - -SSAnne9EndBattleText2: - TX_FAR _SSAnne9EndBattleText2 - db "@" - -SSAnne9AfterBattleText2: - TX_FAR _SSAnne9AfterBattleText2 - db "@" - -SSAnne9BattleText3: - TX_FAR _SSAnne9BattleText3 - db "@" - -SSAnne9EndBattleText3: - TX_FAR _SSAnne9EndBattleText3 - db "@" - -SSAnne9AfterBattleText3: - TX_FAR _SSAnne9AfterBattleText3 - db "@" - -SSAnne9BattleText4: - TX_FAR _SSAnne9BattleText4 - db "@" - -SSAnne9EndBattleText4: - TX_FAR _SSAnne9EndBattleText4 - db "@" - -SSAnne9AfterBattleText4: - TX_FAR _SSAnne9AfterBattleText4 - db "@" diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm deleted file mode 100755 index 80efe4f9..00000000 --- a/scripts/tradecenter.asm +++ /dev/null @@ -1,38 +0,0 @@ -TradeCenterScript: - call EnableAutoTextBoxDrawing - ld a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK - ld a, SPRITE_FACING_LEFT - jr z, .next - ld a, SPRITE_FACING_RIGHT -.next - ld [hSpriteFacingDirection], a - ld a, $1 - ld [H_SPRITEINDEX], a - call SetSpriteFacingDirection - ld hl, wd72d - bit 0, [hl] - set 0, [hl] - ret nz - ld hl, wSpriteStateData2 + $14 - ld a, $8 - ld [hli], a - ld a, $a - ld [hl], a - ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + $19], a - ld a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK - ret z - ld a, $7 - ld [wSpriteStateData2 + $15], a - ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + $19], a - ret - -TradeCenterTextPointers: - dw TradeCenterText1 - -TradeCenterText1: - TX_FAR _TradeCenterText1 - db "@" diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/undergroundpathentranceroute5.asm deleted file mode 100755 index 18707c4a..00000000 --- a/scripts/undergroundpathentranceroute5.asm +++ /dev/null @@ -1,18 +0,0 @@ -UndergroundPathEntranceRoute5Script: - ld a, ROUTE_5 - ld [wLastMap], a - ret - -UndergroundPathEntranceRoute5_5d6af: - db "@" - -UndergroundPathEntranceRoute5TextPointers: - dw UndergroundPathEntranceRoute5Text1 - -UndergroundPathEntranceRoute5Text1: - TX_ASM - ld a, $9 - ld [wWhichTrade], a - predef DoInGameTradeDialogue - ld hl, UndergroundPathEntranceRoute5_5d6af - ret diff --git a/scripts/undergroundpathentranceroute6.asm b/scripts/undergroundpathentranceroute6.asm deleted file mode 100755 index c6dfdcc9..00000000 --- a/scripts/undergroundpathentranceroute6.asm +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPathEntranceRoute6Script: - ld a, ROUTE_6 - ld [wLastMap], a - jp EnableAutoTextBoxDrawing - -UndergroundPathEntranceRoute6TextPointers: - dw UndergroundPathEntranceRoute6Text1 - -UndergroundPathEntranceRoute6Text1: - TX_FAR _UndergrdTunnelEntRoute6Text1 - db "@" diff --git a/scripts/undergroundpathentranceroute7.asm b/scripts/undergroundpathentranceroute7.asm deleted file mode 100755 index 84c8e4d5..00000000 --- a/scripts/undergroundpathentranceroute7.asm +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPathEntranceRoute7Script: - ld a, ROUTE_7 - ld [wLastMap], a - jp EnableAutoTextBoxDrawing - -UndergroundPathEntranceRoute7TextPointers: - dw UndergroundPathEntranceRoute7Text1 - -UndergroundPathEntranceRoute7Text1: - TX_FAR _UndergroundPathEntRoute7Text1 - db "@" diff --git a/scripts/undergroundpathentranceroute7copy.asm b/scripts/undergroundpathentranceroute7copy.asm deleted file mode 100755 index c623eeec..00000000 --- a/scripts/undergroundpathentranceroute7copy.asm +++ /dev/null @@ -1,24 +0,0 @@ -UndergroundPathEntranceRoute7CopyScript: - ld a, ROUTE_7 - ld [wLastMap], a - ret - -UndergroundPathEntranceRoute7CopyTextPointers: - dw UGPathRoute7EntranceUnusedText_5d773 - dw UGPathRoute7EntranceUnusedText_5d77d - -UGPathRoute7EntranceUnusedText_5d773: - TX_FAR _UGPathRoute7EntranceUnusedText_5d773 - db "@" - -UGPathRoute7EntranceUnusedText_5d778: - TX_FAR _UGPathRoute7EntranceUnusedText_5d778 - db "@" - -UGPathRoute7EntranceUnusedText_5d77d: - TX_FAR _UGPathRoute7EntranceUnusedText_5d77d - db "@" - -UGPathRoute7EntranceUnusedText_5d782: - TX_FAR _UGPathRoute7EntranceUnusedText_5d782 - db "@" diff --git a/scripts/undergroundpathentranceroute8.asm b/scripts/undergroundpathentranceroute8.asm deleted file mode 100755 index ad0b60ab..00000000 --- a/scripts/undergroundpathentranceroute8.asm +++ /dev/null @@ -1,11 +0,0 @@ -UndergroundPathEntranceRoute8Script: - ld a, ROUTE_8 - ld [wLastMap], a - jp EnableAutoTextBoxDrawing - -UndergroundPathEntranceRoute8TextPointers: - dw UndergroundPathEntranceRoute8Text1 - -UndergroundPathEntranceRoute8Text1: - TX_FAR _UndergroundPathEntRoute8Text1 - db "@" diff --git a/scripts/undergroundpathns.asm b/scripts/undergroundpathns.asm deleted file mode 100755 index 8c744740..00000000 --- a/scripts/undergroundpathns.asm +++ /dev/null @@ -1,5 +0,0 @@ -UndergroundPathNSScript: - jp EnableAutoTextBoxDrawing - -UndergroundPathNSTextPointers: - db "@" diff --git a/scripts/undergroundpathwe.asm b/scripts/undergroundpathwe.asm deleted file mode 100755 index 921d3dab..00000000 --- a/scripts/undergroundpathwe.asm +++ /dev/null @@ -1,5 +0,0 @@ -UndergroundPathWEScript: - jp EnableAutoTextBoxDrawing - -UndergroundPathWETextPointers: - db "@" diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm deleted file mode 100755 index 9d7f120e..00000000 --- a/scripts/unknowndungeon1.asm +++ /dev/null @@ -1,7 +0,0 @@ -UnknownDungeon1Script: - jp EnableAutoTextBoxDrawing - -UnknownDungeon1TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm deleted file mode 100755 index 3ed00a45..00000000 --- a/scripts/unknowndungeon2.asm +++ /dev/null @@ -1,7 +0,0 @@ -UnknownDungeon2Script: - jp EnableAutoTextBoxDrawing - -UnknownDungeon2TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm deleted file mode 100755 index 78b1ab80..00000000 --- a/scripts/unknowndungeon3.asm +++ /dev/null @@ -1,43 +0,0 @@ -UnknownDungeon3Script: - call EnableAutoTextBoxDrawing - ld hl, MewtwoTrainerHeader - ld de, .ScriptPointers - ld a, [wUnknownDungeon3CurScript] - call ExecuteCurMapScriptInTable - ld [wUnknownDungeon3CurScript], a - ret - -.ScriptPointers - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -UnknownDungeon3TextPointers: - dw MewtwoText - dw PickUpItemText - dw PickUpItemText - -MewtwoTrainerHeader: - dbEventFlagBit EVENT_BEAT_MEWTWO - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MEWTWO - dw MewtwoBattleText ; TextBeforeBattle - dw MewtwoBattleText ; TextAfterBattle - dw MewtwoBattleText ; TextEndBattle - dw MewtwoBattleText ; TextEndBattle - - db $ff - -MewtwoText: - TX_ASM - ld hl, MewtwoTrainerHeader - call TalkToTrainer - jp TextScriptEnd - -MewtwoBattleText: - TX_FAR _MewtwoBattleText - TX_ASM - ld a, MEWTWO - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm deleted file mode 100755 index 0a734e25..00000000 --- a/scripts/vermilioncity.asm +++ /dev/null @@ -1,257 +0,0 @@ -VermilionCityScript: - call EnableAutoTextBoxDrawing - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - push hl - call nz, VermilionCityScript_197cb - pop hl - bit 5, [hl] - res 5, [hl] - call nz, VermilionCityScript_197c0 - ld hl, VermilionCityScriptPointers - ld a, [wVermilionCityCurScript] - jp CallFunctionInTable - -VermilionCityScript_197c0: - call Random - ld a, [$ffd4] - and $e - ld [wFirstLockTrashCanIndex], a - ret - -VermilionCityScript_197cb: - CheckEventHL EVENT_SS_ANNE_LEFT - ret z - CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT - SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT - ret nz - ld a, $2 - ld [wVermilionCityCurScript], a - ret - -VermilionCityScriptPointers: - dw VermilionCityScript0 - dw VermilionCityScript1 - dw VermilionCityScript2 - dw VermilionCityScript3 - dw VermilionCityScript4 - -VermilionCityScript0: - ld a, [wSpriteStateData1 + 9] - and a ; cp SPRITE_FACING_DOWN - ret nz - ld hl, CoordsData_19823 - call ArePlayerCoordsInArray - ret nc - xor a - ld [hJoyHeld], a - ld [wcf0d], a - ld a, $3 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_19810 - ld b, S_S_TICKET - predef GetQuantityOfItemInBag - ld a, b - and a - ret nz -.asm_19810 - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $1 - ld [wVermilionCityCurScript], a - ret - -CoordsData_19823: - db $1e,$12 - db $ff - -VermilionCityScript4: - ld hl, CoordsData_19823 - call ArePlayerCoordsInArray - ret c - ld a, $0 - ld [wVermilionCityCurScript], a - ret - -VermilionCityScript2: - ld a, $ff - ld [wJoyIgnore], a - ld a, D_UP - ld [wSimulatedJoypadStatesEnd], a - ld [wSimulatedJoypadStatesEnd + 1], a - ld a, 2 - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $3 - ld [wVermilionCityCurScript], a - ret - -VermilionCityScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - xor a - ld [wJoyIgnore], a - ld [hJoyHeld], a - ld a, $0 - ld [wVermilionCityCurScript], a - ret - -VermilionCityScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld c, 10 - call DelayFrames - ld a, $0 - ld [wVermilionCityCurScript], a - ret - -VermilionCityTextPointers: - dw VermilionCityText1 - dw VermilionCityText2 - dw VermilionCityText3 - dw VermilionCityText4 - dw VermilionCityText5 - dw VermilionCityText6 - dw VermilionCityText7 - dw VermilionCityText8 - dw MartSignText - dw PokeCenterSignText - dw VermilionCityText11 - dw VermilionCityText12 - dw VermilionCityText13 - -VermilionCityText1: - TX_FAR _VermilionCityText1 - db "@" - -VermilionCityText2: - TX_ASM - CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_1989e - ld hl, VermilionCityText_198a7 - call PrintText - jr .asm_198a4 -.asm_1989e - ld hl, VermilionCityText_198ac - call PrintText -.asm_198a4 - jp TextScriptEnd - -VermilionCityText_198a7: - TX_FAR _VermilionCityText_198a7 - db "@" - -VermilionCityText_198ac: - TX_FAR _VermilionCityText_198ac - db "@" - -VermilionCityText3: - TX_ASM - CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_198f6 - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_RIGHT - jr z, .asm_198c8 - ld hl, VermilionCityCoords1 - call ArePlayerCoordsInArray - jr nc, .asm_198d0 -.asm_198c8 - ld hl, SSAnneWelcomeText4 - call PrintText - jr .asm_198fc -.asm_198d0 - ld hl, SSAnneWelcomeText9 - call PrintText - ld b, S_S_TICKET - predef GetQuantityOfItemInBag - ld a, b - and a - jr nz, .asm_198e9 - ld hl, SSAnneNoTicketText - call PrintText - jr .asm_198fc -.asm_198e9 - ld hl, SSAnneFlashedTicketText - call PrintText - ld a, $4 - ld [wVermilionCityCurScript], a - jr .asm_198fc -.asm_198f6 - ld hl, SSAnneNotHereText - call PrintText -.asm_198fc - jp TextScriptEnd - -VermilionCityCoords1: - db $1d,$13 - db $1f,$13 - db $ff - -SSAnneWelcomeText4: - TX_FAR _SSAnneWelcomeText4 - db "@" - -SSAnneWelcomeText9: - TX_FAR _SSAnneWelcomeText9 - db "@" - -SSAnneFlashedTicketText: - TX_FAR _SSAnneFlashedTicketText - db "@" - -SSAnneNoTicketText: - TX_FAR _SSAnneNoTicketText - db "@" - -SSAnneNotHereText: - TX_FAR _SSAnneNotHereText - db "@" - -VermilionCityText4: - TX_FAR _VermilionCityText4 - db "@" - -VermilionCityText5: - TX_FAR _VermilionCityText5 - TX_ASM - ld a, MACHOP - call PlayCry - call WaitForSoundToFinish - ld hl, VermilionCityText14 - ret - -VermilionCityText14: - TX_FAR _VermilionCityText14 - db "@" - -VermilionCityText6: - TX_FAR _VermilionCityText6 - db "@" - -VermilionCityText7: - TX_FAR _VermilionCityText7 - db "@" - -VermilionCityText8: - TX_FAR _VermilionCityText8 - db "@" - -VermilionCityText11: - TX_FAR _VermilionCityText11 - db "@" - -VermilionCityText12: - TX_FAR _VermilionCityText12 - db "@" - -VermilionCityText13: - TX_FAR _VermilionCityText13 - db "@" diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm deleted file mode 100755 index 5b5d520b..00000000 --- a/scripts/vermiliondock.asm +++ /dev/null @@ -1,215 +0,0 @@ -VermilionDockScript: - call EnableAutoTextBoxDrawing - CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK - jr nz, .asm_1db8d - CheckEventReuseHL EVENT_GOT_HM01 - ret z - ld a, [wDestinationWarpID] - cp $1 - ret nz - CheckEventReuseHL EVENT_SS_ANNE_LEFT - jp z, VermilionDock_1db9b - SetEventReuseHL EVENT_STARTED_WALKING_OUT_OF_DOCK - call Delay3 - ld hl, wd730 - set 7, [hl] - ld hl, wSimulatedJoypadStatesEnd - ld a, D_UP - ld [hli], a - ld [hli], a - ld [hl], a - ld a, $3 - ld [wSimulatedJoypadStatesIndex], a - xor a - ld [wSpriteStateData2 + $06], a - ld [wOverrideSimulatedJoypadStatesMask], a - dec a - ld [wJoyIgnore], a - ret -.asm_1db8d - CheckEventAfterBranchReuseHL EVENT_WALKED_OUT_OF_DOCK, EVENT_STARTED_WALKING_OUT_OF_DOCK - ret nz - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld [wJoyIgnore], a - SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK - ret - -VermilionDock_1db9b: - SetEventForceReuseHL EVENT_SS_ANNE_LEFT - ld a, $ff - ld [wJoyIgnore], a - ld [wNewSoundID], a - call PlaySound - ld c, BANK(Music_Surfing) - ld a, MUSIC_SURFING - call PlayMusic - callba LoadSmokeTileFourTimes - xor a - ld [wSpriteStateData1 + 2], a - ld c, 120 - call DelayFrames - ld b, $9c - call CopyScreenTileBufferToVRAM - coord hl, 0, 10 - ld bc, SCREEN_WIDTH * 6 - ld a, $14 ; water tile - call FillMemory - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a - call Delay3 - xor 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 - ld b, [hl] - push bc - push hl - ld a, SFX_SS_ANNE_HORN - call PlaySoundWaitForCurrent - ld a, $ff - ld [wUpdateSpritesEnabled], a - ld d, $0 - ld e, $8 -.asm_1dbfa - ld hl, $0002 - add hl, bc - ld a, l - ld [wMapViewVRAMPointer], a - ld a, h - ld [wMapViewVRAMPointer + 1], a - push hl - push de - call ScheduleEastColumnRedraw - call VermilionDock_EmitSmokePuff - pop de - ld b, $10 -.asm_1dc11 - call VermilionDock_AnimSmokePuffDriftRight - ld c, $8 -.asm_1dc16 - call VermilionDock_1dc7c - dec c - jr nz, .asm_1dc16 - inc d - dec b - jr nz, .asm_1dc11 - pop bc - dec e - jr nz, .asm_1dbfa - xor a - ld [rWY], a - ld [hWY], a - call VermilionDock_EraseSSAnne - ld a, $90 - ld [hWY], a - ld a, $1 - ld [wUpdateSpritesEnabled], a - pop hl - pop bc - ld [hl], b - dec hl - ld [hl], c - call LoadPlayerSpriteGraphics - ld hl, wNumberOfWarps - dec [hl] - ret - -VermilionDock_AnimSmokePuffDriftRight: - push bc - push de - ld hl, wOAMBuffer + $11 - ld a, [wSSAnneSmokeDriftAmount] - swap a - ld c, a - ld de, 4 -.loop - inc [hl] - inc [hl] - add hl, de - dec c - jr nz, .loop - pop de - pop bc - ret - -VermilionDock_EmitSmokePuff: -; new smoke puff above the S.S. Anne's front smokestack - ld a, [wSSAnneSmokeX] - sub 16 - ld [wSSAnneSmokeX], a - ld c, a - ld b, 100 ; Y - ld a, [wSSAnneSmokeDriftAmount] - inc a - ld [wSSAnneSmokeDriftAmount], a - ld a, $1 - ld de, VermilionDockOAMBlock - call WriteOAMBlock - ret - -VermilionDockOAMBlock: - db $fc, $10 - db $fd, $10 - db $fe, $10 - db $ff, $10 - -VermilionDock_1dc7c: - ld h, d - ld l, $50 - call .asm_1dc86 - ld h, $0 - ld l, $80 -.asm_1dc86 - ld a, [rLY] - cp l - jr nz, .asm_1dc86 - ld a, h - ld [rSCX], a -.asm_1dc8e - ld a, [rLY] - cp h - jr z, .asm_1dc8e - ret - -VermilionDock_EraseSSAnne: -; Fill the area the S.S. Anne occupies in BG map 0 with water tiles. - ld hl, wVermilionDockTileMapBuffer - ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH - ld a, $14 ; water tile - call FillMemory - ld hl, vBGMap0 + 10 * BG_MAP_WIDTH - ld de, wVermilionDockTileMapBuffer - ld bc, (6 * BG_MAP_WIDTH) / 16 - call CopyVideoData - -; Replace the blocks of the lower half of the ship with water blocks. This -; leaves the upper half alone, but that doesn't matter because replacing any of -; the blocks is unnecessary because the blocks the ship occupies are south of -; the player and won't be redrawn when the player automatically walks north and -; exits the map. This code could be removed without affecting anything. - overworldMapCoord hl, 5, 2, VERMILION_DOCK_WIDTH - ld a, $d ; water block - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - - ld a, SFX_SS_ANNE_HORN - call PlaySound - ld c, 120 - call DelayFrames - ret - -VermilionDockTextPointers: - dw VermilionDockText1 - -VermilionDockText1: - TX_FAR _VermilionDockText1 - db "@" diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm deleted file mode 100755 index c22ce9ce..00000000 --- a/scripts/vermiliongym.asm +++ /dev/null @@ -1,267 +0,0 @@ -VermilionGymScript: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - push hl - call nz, VermilionGymScript_5ca4c - pop hl - bit 6, [hl] - res 6, [hl] - call nz, VermilionGymScript_5ca6d - call EnableAutoTextBoxDrawing - ld hl, VermilionGymTrainerHeader0 - ld de, VermilionGymScriptPointers - ld a, [wVermilionGymCurScript] - call ExecuteCurMapScriptInTable - ld [wVermilionGymCurScript], a - ret - -VermilionGymScript_5ca4c: - ld hl, Gym3CityName - ld de, Gym3LeaderName - jp LoadGymLeaderAndCityName - -Gym3CityName: - db "VERMILION CITY@" - -Gym3LeaderName: - db "LT.SURGE@" - -VermilionGymScript_5ca6d: - CheckEvent EVENT_2ND_LOCK_OPENED - jr nz, .asm_5ca78 - ld a, $24 - jr .asm_5ca7f -.asm_5ca78 - ld a, SFX_GO_INSIDE - call PlaySound - ld a, $5 -.asm_5ca7f - ld [wNewTileBlockID], a - lb bc, 2, 2 - predef_jump ReplaceTileBlock - -VermilionGymScript_5ca8a: - xor a - ld [wJoyIgnore], a - ld [wVermilionGymCurScript], a - ld [wCurMapScript], a - ret - -VermilionGymScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw VermilionGymScript3 - -VermilionGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, VermilionGymScript_5ca8a - ld a, $f0 - ld [wJoyIgnore], a - -VermilionGymScript_5caaa: - ld a, $6 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_LT_SURGE - lb bc, TM_24, 1 - call GiveItem - jr nc, .BagFull - ld a, $7 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM24 - jr .asm_5cad3 -.BagFull - ld a, $8 - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_5cad3 - ld hl, wObtainedBadges - set 2, [hl] - ld hl, wBeatGymFlags - set 2, [hl] - - ; deactivate gym trainers - SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2 - - jp VermilionGymScript_5ca8a - -VermilionGymTextPointers: - dw VermilionGymText1 - dw VermilionGymText2 - dw VermilionGymText3 - dw VermilionGymText4 - dw VermilionGymText5 - dw VermilionGymText6 - dw VermilionGymText7 - dw VermilionGymText8 - -VermilionGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_0 - dw VermilionGymBattleText1 ; TextBeforeBattle - dw VermilionGymAfterBattleText1 ; TextAfterBattle - dw VermilionGymEndBattleText1 ; TextEndBattle - dw VermilionGymEndBattleText1 ; TextEndBattle - -VermilionGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_1 - dw VermilionGymBattleText2 ; TextBeforeBattle - dw VermilionGymAfterBattleText2 ; TextAfterBattle - dw VermilionGymEndBattleText2 ; TextEndBattle - dw VermilionGymEndBattleText2 ; TextEndBattle - -VermilionGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_2 - dw VermilionGymBattleText3 ; TextBeforeBattle - dw VermilionGymAfterBattleText3 ; TextAfterBattle - dw VermilionGymEndBattleText3 ; TextEndBattle - dw VermilionGymEndBattleText3 ; TextEndBattle - - db $ff - -VermilionGymText1: - TX_ASM - CheckEvent EVENT_BEAT_LT_SURGE - jr z, .asm_5cb39 - CheckEventReuseA EVENT_GOT_TM24 - jr nz, .asm_5cb31 - call z, VermilionGymScript_5caaa - call DisableWaitingAfterTextDisplay - jr .asm_5cb6a -.asm_5cb31 - ld hl, VermilionGymText_5cb72 - call PrintText - jr .asm_5cb6a -.asm_5cb39 - ld hl, VermilionGymText_5cb6d - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, ReceivedThunderbadgeText - ld de, ReceivedThunderbadgeText - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $3 - ld [wGymLeaderNo], a - xor a - ld [hJoyHeld], a - ld a, $3 - ld [wVermilionGymCurScript], a - ld [wCurMapScript], a -.asm_5cb6a - jp TextScriptEnd - -VermilionGymText_5cb6d: - TX_FAR _VermilionGymText_5cb6d - db "@" - -VermilionGymText_5cb72: - TX_FAR _VermilionGymText_5cb72 - db "@" - -VermilionGymText6: - TX_FAR _VermilionGymText_5cb77 - db "@" - -VermilionGymText7: - TX_FAR _ReceivedTM24Text - TX_SFX_KEY_ITEM - TX_FAR _TM24ExplanationText - db "@" - -VermilionGymText8: - TX_FAR _TM24NoRoomText - db "@" - -ReceivedThunderbadgeText: - TX_FAR _ReceivedThunderbadgeText - db "@" - -VermilionGymText2: - TX_ASM - ld hl, VermilionGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -VermilionGymBattleText1: - TX_FAR _VermilionGymBattleText1 - db "@" - -VermilionGymEndBattleText1: - TX_FAR _VermilionGymEndBattleText1 - db "@" - -VermilionGymAfterBattleText1: - TX_FAR _VermilionGymAfterBattleText1 - db "@" - -VermilionGymText3: - TX_ASM - ld hl, VermilionGymTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -VermilionGymBattleText2: - TX_FAR _VermilionGymBattleText2 - db "@" - -VermilionGymEndBattleText2: - TX_FAR _VermilionGymEndBattleText2 - db "@" - -VermilionGymAfterBattleText2: - TX_FAR _VermilionGymAfterBattleText2 - db "@" - -VermilionGymText4: - TX_ASM - ld hl, VermilionGymTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -VermilionGymBattleText3: - TX_FAR _VermilionGymBattleText3 - db "@" - -VermilionGymEndBattleText3: - TX_FAR _VermilionGymEndBattleText3 - db "@" - -VermilionGymAfterBattleText3: - TX_FAR _VermilionGymAfterBattleText3 - db "@" - -VermilionGymText5: - TX_ASM - ld a, [wBeatGymFlags] - bit 2, a - jr nz, .asm_5cbeb - ld hl, VermilionGymText_5cbf4 - call PrintText - jr .asm_5cbf1 -.asm_5cbeb - ld hl, VermilionGymText_5cbf9 - call PrintText -.asm_5cbf1 - jp TextScriptEnd - -VermilionGymText_5cbf4: - TX_FAR _VermilionGymText_5cbf4 - db "@" - -VermilionGymText_5cbf9: - TX_FAR _VermilionGymText_5cbf9 - db "@" diff --git a/scripts/vermilionhouse1.asm b/scripts/vermilionhouse1.asm deleted file mode 100755 index d2dac4ca..00000000 --- a/scripts/vermilionhouse1.asm +++ /dev/null @@ -1,24 +0,0 @@ -VermilionHouse1Script: - call EnableAutoTextBoxDrawing - ret - -VermilionHouse1TextPointers: - dw VermilionHouse1Text1 - dw VermilionHouse1Text2 - dw VermilionHouse1Text3 - -VermilionHouse1Text1: - TX_FAR _VermilionHouse1Text1 - db "@" - -VermilionHouse1Text2: - TX_FAR _VermilionHouse1Text2 - TX_ASM - ld a, PIDGEY - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -VermilionHouse1Text3: - TX_FAR _VermilionHouse1Text3 - db "@" diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm deleted file mode 100755 index c0735f32..00000000 --- a/scripts/vermilionhouse2.asm +++ /dev/null @@ -1,57 +0,0 @@ -VermilionHouse2Script: - jp EnableAutoTextBoxDrawing - -VermilionHouse2TextPointers: - dw VermilionHouse2Text1 - -VermilionHouse2Text1: - TX_ASM - ld a, [wd728] - bit 3, a - jr nz, .asm_03ef5 - ld hl, VermilionHouse2Text_560b1 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_eb1b7 - lb bc, OLD_ROD, 1 - call GiveItem - jr nc, .BagFull - ld hl, wd728 - set 3, [hl] - ld hl, VermilionHouse2Text_560b6 - jr .asm_5dd95 -.BagFull - ld hl, VermilionHouse2Text_560ca - jr .asm_5dd95 -.asm_eb1b7 - ld hl, VermilionHouse2Text_560c0 - jr .asm_5dd95 -.asm_03ef5 - ld hl, VermilionHouse2Text_560c5 -.asm_5dd95 - call PrintText - jp TextScriptEnd - -VermilionHouse2Text_560b1: - TX_FAR _VermilionHouse2Text_560b1 - db "@" - -VermilionHouse2Text_560b6: - TX_FAR _VermilionHouse2Text_560b6 - TX_SFX_ITEM_1 - TX_FAR _VermilionHouse2Text_560bb - db "@" - -VermilionHouse2Text_560c0: - TX_FAR _VermilionHouse2Text_560c0 - db "@" - -VermilionHouse2Text_560c5: - TX_FAR _VermilionHouse2Text_560c5 - db "@" - -VermilionHouse2Text_560ca: - TX_FAR _VermilionHouse2Text_560ca - db "@" diff --git a/scripts/vermilionhouse3.asm b/scripts/vermilionhouse3.asm deleted file mode 100755 index 1f0af501..00000000 --- a/scripts/vermilionhouse3.asm +++ /dev/null @@ -1,12 +0,0 @@ -VermilionHouse3Script: - jp EnableAutoTextBoxDrawing - -VermilionHouse3TextPointers: - dw VermilionHouse3Text1 - -VermilionHouse3Text1: - TX_ASM - ld a, $4 - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd diff --git a/scripts/vermilionmart.asm b/scripts/vermilionmart.asm deleted file mode 100755 index 2d4df78d..00000000 --- a/scripts/vermilionmart.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionMartScript: - jp EnableAutoTextBoxDrawing - -VermilionMartTextPointers: - dw VermilionCashierText - dw VermilionMartText2 - dw VermilionMartText3 - -VermilionMartText2: - TX_FAR _VermilionMartText2 - db "@" - -VermilionMartText3: - TX_FAR _VermilionMartText3 - db "@" diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm deleted file mode 100755 index f70aed31..00000000 --- a/scripts/vermilionpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -VermilionPokecenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -VermilionPokecenterTextPointers: - dw VermilionHealNurseText - dw VermilionPokecenterText2 - dw VermilionPokecenterText3 - dw VermilionTradeNurseText - -VermilionHealNurseText: - TX_POKECENTER_NURSE - -VermilionPokecenterText2: - TX_FAR _VermilionPokecenterText2 - db "@" - -VermilionPokecenterText3: - TX_FAR _VermilionPokecenterText3 - db "@" - -VermilionTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm deleted file mode 100755 index 5409d733..00000000 --- a/scripts/victoryroad1.asm +++ /dev/null @@ -1,103 +0,0 @@ -VictoryRoad1Script: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - call nz, .next - call EnableAutoTextBoxDrawing - ld hl, VictoryRoad1TrainerHeader0 - ld de, VictoryRoad1ScriptPointers - ld a, [wVictoryRoad1CurScript] - call ExecuteCurMapScriptInTable - ld [wVictoryRoad1CurScript], a - ret -.next - CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - ret z - ld a, $1d - ld [wNewTileBlockID], a - lb bc, 6, 4 - predef_jump ReplaceTileBlock - -VictoryRoad1ScriptPointers: - dw VictoryRoad1Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -VictoryRoad1Script0: - CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - jp nz, CheckFightingMapTrainers - ld hl, CoordsData_5da5c - call CheckBoulderCoords - jp nc, CheckFightingMapTrainers - ld hl, wCurrentMapScriptFlags - set 5, [hl] - SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - ret - -CoordsData_5da5c: - db $0D,$11,$FF - -VictoryRoad1TextPointers: - dw VictoryRoad1Text1 - dw VictoryRoad1Text2 - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText - -VictoryRoad1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 - dw VictoryRoad1BattleText1 ; TextBeforeBattle - dw VictoryRoad1AfterBattleText1 ; TextAfterBattle - dw VictoryRoad1EndBattleText1 ; TextEndBattle - dw VictoryRoad1EndBattleText1 ; TextEndBattle - -VictoryRoad1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 - dw VictoryRoad1BattleText2 ; TextBeforeBattle - dw VictoryRoad1AfterBattleText2 ; TextAfterBattle - dw VictoryRoad1EndBattleText2 ; TextEndBattle - dw VictoryRoad1EndBattleText2 ; TextEndBattle - - db $ff - -VictoryRoad1Text1: - TX_ASM - ld hl, VictoryRoad1TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad1Text2: - TX_ASM - ld hl, VictoryRoad1TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad1BattleText1: - TX_FAR _VictoryRoad1BattleText1 - db "@" - -VictoryRoad1EndBattleText1: - TX_FAR _VictoryRoad1EndBattleText1 - db "@" - -VictoryRoad1AfterBattleText1: - TX_FAR _VictoryRoad1AfterBattleText1 - db "@" - -VictoryRoad1BattleText2: - TX_FAR _VictoryRoad1BattleText2 - db "@" - -VictoryRoad1EndBattleText2: - TX_FAR _VictoryRoad1EndBattleText2 - db "@" - -VictoryRoad1AfterBattleText2: - TX_FAR _VictoryRoad1AfterBattleText2 - db "@" diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm deleted file mode 100755 index 847573d8..00000000 --- a/scripts/victoryroad2.asm +++ /dev/null @@ -1,244 +0,0 @@ -VictoryRoad2Script: - ld hl, wCurrentMapScriptFlags - bit 6, [hl] - res 6, [hl] - call nz, VictoryRoad2Script_517c4 - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - call nz, VictoryRoad2Script_517c9 - call EnableAutoTextBoxDrawing - ld hl, VictoryRoad2TrainerHeader0 - ld de, VictoryRoad2ScriptPointers - ld a, [wVictoryRoad2CurScript] - call ExecuteCurMapScriptInTable - ld [wVictoryRoad2CurScript], a - ret - -VictoryRoad2Script_517c4: - ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - -VictoryRoad2Script_517c9: - CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 - jr z, .asm_517da - push af - ld a, $15 - lb bc, 4, 3 - call VictoryRoad2Script_517e2 - pop af -.asm_517da - bit 7, a - ret z - ld a, $1d - lb bc, 7, 11 - -VictoryRoad2Script_517e2: - ld [wNewTileBlockID], a - predef ReplaceTileBlock - ret - -VictoryRoad2ScriptPointers: - dw VictoryRoad2Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -VictoryRoad2Script0: - ld hl, CoordsData_51816 - call CheckBoulderCoords - jp nc, CheckFightingMapTrainers - EventFlagAddress hl, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 - ld a, [wCoordIndex] - cp $2 - jr z, .asm_5180b - CheckEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 - SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 - ret nz - jr .asm_51810 -.asm_5180b - CheckEventAfterBranchReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 - SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 - ret nz -.asm_51810 - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ret - -CoordsData_51816: - db $10,$01 - db $10,$09 - db $FF - -VictoryRoad2TextPointers: - dw VictoryRoad2Text1 - dw VictoryRoad2Text2 - dw VictoryRoad2Text3 - dw VictoryRoad2Text4 - dw VictoryRoad2Text5 - dw MoltresText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText - -VictoryRoad2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 - dw VictoryRoad2BattleText1 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText1 ; TextAfterBattle - dw VictoryRoad2EndBattleText1 ; TextEndBattle - dw VictoryRoad2EndBattleText1 ; TextEndBattle - -VictoryRoad2TrainerHeader1: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 - dw VictoryRoad2BattleText2 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText2 ; TextAfterBattle - dw VictoryRoad2EndBattleText2 ; TextEndBattle - dw VictoryRoad2EndBattleText2 ; TextEndBattle - -VictoryRoad2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 - dw VictoryRoad2BattleText3 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText3 ; TextAfterBattle - dw VictoryRoad2EndBattleText3 ; TextEndBattle - dw VictoryRoad2EndBattleText3 ; TextEndBattle - -VictoryRoad2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 - dw VictoryRoad2BattleText4 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText4 ; TextAfterBattle - dw VictoryRoad2EndBattleText4 ; TextEndBattle - dw VictoryRoad2EndBattleText4 ; TextEndBattle - -VictoryRoad2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 - dw VictoryRoad2BattleText5 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText5 ; TextAfterBattle - dw VictoryRoad2EndBattleText5 ; TextEndBattle - dw VictoryRoad2EndBattleText5 ; TextEndBattle - -MoltresTrainerHeader: - dbEventFlagBit EVENT_BEAT_MOLTRES - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MOLTRES - dw MoltresBattleText ; TextBeforeBattle - dw MoltresBattleText ; TextAfterBattle - dw MoltresBattleText ; TextEndBattle - dw MoltresBattleText ; TextEndBattle - - db $ff - -VictoryRoad2Text1: - TX_ASM - ld hl, VictoryRoad2TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad2Text2: - TX_ASM - ld hl, VictoryRoad2TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad2Text3: - TX_ASM - ld hl, VictoryRoad2TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad2Text4: - TX_ASM - ld hl, VictoryRoad2TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad2Text5: - TX_ASM - ld hl, VictoryRoad2TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -MoltresText: - TX_ASM - ld hl, MoltresTrainerHeader - call TalkToTrainer - jp TextScriptEnd - -MoltresBattleText: - TX_FAR _MoltresBattleText - TX_ASM - ld a, MOLTRES - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -VictoryRoad2BattleText1: - TX_FAR _VictoryRoad2BattleText1 - db "@" - -VictoryRoad2EndBattleText1: - TX_FAR _VictoryRoad2EndBattleText1 - db "@" - -VictoryRoad2AfterBattleText1: - TX_FAR _VictoryRoad2AfterBattleText1 - db "@" - -VictoryRoad2BattleText2: - TX_FAR _VictoryRoad2BattleText2 - db "@" - -VictoryRoad2EndBattleText2: - TX_FAR _VictoryRoad2EndBattleText2 - db "@" - -VictoryRoad2AfterBattleText2: - TX_FAR _VictoryRoad2AfterBattleText2 - db "@" - -VictoryRoad2BattleText3: - TX_FAR _VictoryRoad2BattleText3 - db "@" - -VictoryRoad2EndBattleText3: - TX_FAR _VictoryRoad2EndBattleText3 - db "@" - -VictoryRoad2AfterBattleText3: - TX_FAR _VictoryRoad2AfterBattleText3 - db "@" - -VictoryRoad2BattleText4: - TX_FAR _VictoryRoad2BattleText4 - db "@" - -VictoryRoad2EndBattleText4: - TX_FAR _VictoryRoad2EndBattleText4 - db "@" - -VictoryRoad2AfterBattleText4: - TX_FAR _VictoryRoad2AfterBattleText4 - db "@" - -VictoryRoad2BattleText5: - TX_FAR _VictoryRoad2BattleText5 - db "@" - -VictoryRoad2EndBattleText5: - TX_FAR _VictoryRoad2EndBattleText5 - db "@" - -VictoryRoad2AfterBattleText5: - TX_FAR _VictoryRoad2AfterBattleText5 - db "@" diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm deleted file mode 100755 index c615091b..00000000 --- a/scripts/victoryroad3.asm +++ /dev/null @@ -1,197 +0,0 @@ -VictoryRoad3Script: - call VictoryRoad3Script_44996 - call EnableAutoTextBoxDrawing - ld hl, VictoryRoad3TrainerHeader0 - ld de, VictoryRoad3ScriptPointers - ld a, [wVictoryRoad3CurScript] - call ExecuteCurMapScriptInTable - ld [wVictoryRoad3CurScript], a - ret - -VictoryRoad3Script_44996: - ld hl, wCurrentMapScriptFlags - bit 5, [hl] - res 5, [hl] - ret z - CheckEventHL EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 - ret z - ld a, $1d - ld [wNewTileBlockID], a - lb bc, 5, 3 - predef_jump ReplaceTileBlock - -VictoryRoad3ScriptPointers: - dw VictoryRoad3Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -VictoryRoad3Script0: - ld hl, wFlags_0xcd60 - bit 7, [hl] - res 7, [hl] - jp z, .asm_449fe - ld hl, .coordsData_449f9 - call CheckBoulderCoords - jp nc, .asm_449fe - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_449dc - ld hl, wCurrentMapScriptFlags - set 5, [hl] - SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 - ret -.asm_449dc - CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 - jr nz, .asm_449fe - ld a, HS_VICTORY_ROAD_3_BOULDER - ld [wMissableObjectIndex], a - predef HideObject - ld a, HS_VICTORY_ROAD_2_BOULDER - ld [wMissableObjectIndex], a - predef_jump ShowObject - -.coordsData_449f9: - db $05,$03 - db $0F,$17 - db $FF - -.asm_449fe - ld a, VICTORY_ROAD_2 - ld [wDungeonWarpDestinationMap], a - ld hl, .coordsData_449f9 - call IsPlayerOnDungeonWarp - ld a, [wCoordIndex] - cp $1 - jr nz, .asm_44a1b - ld hl, wd72d - res 4, [hl] - ld hl, wd732 - res 4, [hl] - ret -.asm_44a1b - ld a, [wd72d] - bit 4, a - jp z, CheckFightingMapTrainers - ret - -VictoryRoad3TextPointers: - dw VictoryRoad3Text1 - dw VictoryRoad3Text2 - dw VictoryRoad3Text3 - dw VictoryRoad3Text4 - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - -VictoryRoad3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 - dw VictoryRoad3BattleText2 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText2 ; TextAfterBattle - dw VictoryRoad3EndBattleText2 ; TextEndBattle - dw VictoryRoad3EndBattleText2 ; TextEndBattle - -VictoryRoad3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 - dw VictoryRoad3BattleText3 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText3 ; TextAfterBattle - dw VictoryRoad3EndBattleText3 ; TextEndBattle - dw VictoryRoad3EndBattleText3 ; TextEndBattle - -VictoryRoad3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 - dw VictoryRoad3BattleText4 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText4 ; TextAfterBattle - dw VictoryRoad3EndBattleText4 ; TextEndBattle - dw VictoryRoad3EndBattleText4 ; TextEndBattle - -VictoryRoad3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 - dw VictoryRoad3BattleText5 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText5 ; TextAfterBattle - dw VictoryRoad3EndBattleText5 ; TextEndBattle - dw VictoryRoad3EndBattleText5 ; TextEndBattle - - db $ff - -VictoryRoad3Text1: - TX_ASM - ld hl, VictoryRoad3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad3Text2: - TX_ASM - ld hl, VictoryRoad3TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad3Text3: - TX_ASM - ld hl, VictoryRoad3TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad3Text4: - TX_ASM - ld hl, VictoryRoad3TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -VictoryRoad3BattleText2: - TX_FAR _VictoryRoad3BattleText2 - db "@" - -VictoryRoad3EndBattleText2: - TX_FAR _VictoryRoad3EndBattleText2 - db "@" - -VictoryRoad3AfterBattleText2: - TX_FAR _VictoryRoad3AfterBattleText2 - db "@" - -VictoryRoad3BattleText3: - TX_FAR _VictoryRoad3BattleText3 - db "@" - -VictoryRoad3EndBattleText3: - TX_FAR _VictoryRoad3EndBattleText3 - db "@" - -VictoryRoad3AfterBattleText3: - TX_FAR _VictoryRoad3AfterBattleText3 - db "@" - -VictoryRoad3BattleText4: - TX_FAR _VictoryRoad3BattleText4 - db "@" - -VictoryRoad3EndBattleText4: - TX_FAR _VictoryRoad3EndBattleText4 - db "@" - -VictoryRoad3AfterBattleText4: - TX_FAR _VictoryRoad3AfterBattleText4 - db "@" - -VictoryRoad3BattleText5: - TX_FAR _VictoryRoad3BattleText5 - db "@" - -VictoryRoad3EndBattleText5: - TX_FAR _VictoryRoad3EndBattleText5 - db "@" - -VictoryRoad3AfterBattleText5: - TX_FAR _VictoryRoad3AfterBattleText5 - db "@" diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm deleted file mode 100755 index 3ccdc509..00000000 --- a/scripts/viridiancity.asm +++ /dev/null @@ -1,327 +0,0 @@ -ViridianCityScript: - call EnableAutoTextBoxDrawing - ld hl, ViridianCityScriptPointers - ld a, [wViridianCityCurScript] - jp CallFunctionInTable - -ViridianCityScriptPointers: - dw ViridianCityScript0 - dw ViridianCityScript1 - dw ViridianCityScript2 - dw ViridianCityScript3 - -ViridianCityScript0: - call ViridianCityScript_1900b - jp ViridianCityScript_1903d - -ViridianCityScript_1900b: - CheckEvent EVENT_VIRIDIAN_GYM_OPEN - ret nz - ld a, [wObtainedBadges] - cp %01111111 - jr nz, .asm_1901e - SetEvent EVENT_VIRIDIAN_GYM_OPEN - ret -.asm_1901e - ld a, [wYCoord] - cp $8 - ret nz - ld a, [wXCoord] - cp $20 - ret nz - ld a, $e - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [hJoyHeld], a - call ViridianCityScript_190cf - ld a, $3 - ld [wViridianCityCurScript], a - ret - -ViridianCityScript_1903d: - CheckEvent EVENT_GOT_POKEDEX - ret nz - ld a, [wYCoord] - cp $9 - ret nz - ld a, [wXCoord] - cp $13 - ret nz - ld a, $5 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [hJoyHeld], a - call ViridianCityScript_190cf - ld a, $3 - ld [wViridianCityCurScript], a - ret - -ViridianCityScript1: - ld a, [wSpriteStateData1 + $34] - ld [$ffeb], a - ld a, [wSpriteStateData1 + $36] - ld [$ffec], a - ld a, [wSpriteStateData2 + $34] - ld [$ffed], a - ld a, [wSpriteStateData2 + $35] - ld [$ffee], a - xor a - ld [wListScrollOffset], a - - ; set up battle for Old Man - ld a, BATTLE_TYPE_OLD_MAN - ld [wBattleType], a - ld a, 5 - ld [wCurEnemyLVL], a - ld a, WEEDLE - ld [wCurOpponent], a - ld a, $2 - ld [wViridianCityCurScript], a - ret - -ViridianCityScript2: - ld a, [$ffeb] - ld [wSpriteStateData1 + $34], a - ld a, [$ffec] - ld [wSpriteStateData1 + $36], a - ld a, [$ffed] - ld [wSpriteStateData2 + $34], a - ld a, [$ffee] - ld [wSpriteStateData2 + $35], a - call UpdateSprites - call Delay3 - xor a - ld [wJoyIgnore], a - ld a, $f - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wBattleType], a - ld [wJoyIgnore], a - ld a, $0 - ld [wViridianCityCurScript], a - ret - -ViridianCityScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - ld a, 0 - ld [wViridianCityCurScript], a - ret - -ViridianCityScript_190cf: - call StartSimulatingJoypadStates - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - xor a - ld [wSpriteStateData1 + 9], a - ld [wJoyIgnore], a - ret - -ViridianCityTextPointers: - dw ViridianCityText1 - dw ViridianCityText2 - dw ViridianCityText3 - dw ViridianCityText4 - dw ViridianCityText5 - dw ViridianCityText6 - dw ViridianCityText7 - dw ViridianCityText8 - dw ViridianCityText9 - dw ViridianCityText10 - dw MartSignText - dw PokeCenterSignText - dw ViridianCityText13 - dw ViridianCityText14 - dw ViridianCityText15 - -ViridianCityText1: - TX_FAR _ViridianCityText1 - db "@" - -ViridianCityText2: - TX_ASM - ld a, [wObtainedBadges] - cp %01111111 - ld hl, ViridianCityText_19127 - jr z, .asm_ae9fe - CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr nz, .asm_ae9fe - ld hl, ViridianCityText_19122 -.asm_ae9fe - call PrintText - jp TextScriptEnd - -ViridianCityText_19122: - TX_FAR _ViridianCityText_19122 - db "@" - -ViridianCityText_19127: - TX_FAR _ViridianCityText_19127 - db "@" - -ViridianCityText3: - TX_ASM - ld hl, ViridianCityText_1914d - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_6dfea - ld hl, ViridianCityText_19157 - call PrintText - jr .asm_d611f -.asm_6dfea - ld hl, ViridianCityText_19152 - call PrintText -.asm_d611f - jp TextScriptEnd - -ViridianCityText_1914d: - TX_FAR _ViridianCityText_1914d - db "@" - -ViridianCityText_19152: - TX_FAR _ViridianCityText_19152 - db "@" - -ViridianCityText_19157: - TX_FAR _ViridianCityText_19157 - db "@" - -ViridianCityText4: - TX_ASM - CheckEvent EVENT_GOT_POKEDEX - jr nz, .asm_83894 - ld hl, ViridianCityText_19175 - call PrintText - jr .asm_700a6 -.asm_83894 - ld hl, ViridianCityText_1917a - call PrintText -.asm_700a6 - jp TextScriptEnd - -ViridianCityText_19175: - TX_FAR _ViridianCityText_19175 - db "@" - -ViridianCityText_1917a: - TX_FAR _ViridianCityText_1917a - db "@" - -ViridianCityText5: - TX_ASM - ld hl, ViridianCityText_19191 - call PrintText - call ViridianCityScript_190cf - ld a, $3 - ld [wViridianCityCurScript], a - jp TextScriptEnd - -ViridianCityText_19191: - TX_FAR _ViridianCityText_19191 - db "@" - -ViridianCityText6: - TX_ASM - CheckEvent EVENT_GOT_TM42 - jr nz, .asm_4e5a0 - ld hl, ViridianCityText_191ca - call PrintText - lb bc, TM_42, 1 - call GiveItem - jr nc, .BagFull - ld hl, ReceivedTM42Text - call PrintText - SetEvent EVENT_GOT_TM42 - jr .asm_3c73c -.BagFull - ld hl, TM42NoRoomText - call PrintText - jr .asm_3c73c -.asm_4e5a0 - ld hl, TM42Explanation - call PrintText -.asm_3c73c - jp TextScriptEnd - -ViridianCityText_191ca: - TX_FAR _ViridianCityText_191ca - db "@" - -ReceivedTM42Text: - TX_FAR _ReceivedTM42Text - TX_SFX_ITEM_2 - db "@" - -TM42Explanation: - TX_FAR _TM42Explanation - db "@" - -TM42NoRoomText: - TX_FAR _TM42NoRoomText - db "@" - -ViridianCityText7: - TX_ASM - ld hl, ViridianCityText_1920a - call PrintText - ld c, 2 - call DelayFrames - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr z, .asm_42f68 - ld hl, ViridianCityText_1920f - call PrintText - ld a, $1 - ld [wViridianCityCurScript], a - jr .asm_2413a -.asm_42f68 - ld hl, ViridianCityText_19214 - call PrintText -.asm_2413a - jp TextScriptEnd - -ViridianCityText_1920a: - TX_FAR _ViridianCityText_1920a - db "@" - -ViridianCityText_1920f: - TX_FAR _ViridianCityText_1920f - db "@" - -ViridianCityText_19214: - TX_FAR _ViridianCityText_19214 - db "@" - -ViridianCityText15: - TX_FAR _ViridianCityText_19219 - db "@" - -ViridianCityText8: - TX_FAR _ViridianCityText8 - db "@" - -ViridianCityText9: - TX_FAR _ViridianCityText9 - db "@" - -ViridianCityText10: - TX_FAR _ViridianCityText10 - db "@" - -ViridianCityText13: - TX_FAR _ViridianCityText13 - db "@" - -ViridianCityText14: - TX_FAR _ViridianCityText14 - db "@" diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm deleted file mode 100755 index bce093a9..00000000 --- a/scripts/viridianforest.asm +++ /dev/null @@ -1,144 +0,0 @@ -ViridianForestScript: - call EnableAutoTextBoxDrawing - ld hl, ViridianForestTrainerHeader0 - ld de, ViridianForestScriptPointers - ld a, [wViridianForestCurScript] - call ExecuteCurMapScriptInTable - ld [wViridianForestCurScript], a - ret - -ViridianForestScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - -ViridianForestTextPointers: - dw ViridianForestText1 - dw ViridianForestText2 - dw ViridianForestText3 - dw ViridianForestText4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw ViridianForestText8 - dw ViridianForestText9 - dw ViridianForestText10 - dw ViridianForestText11 - dw ViridianForestText12 - dw ViridianForestText13 - dw ViridianForestText14 - -ViridianForestTrainerHeader0: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 - dw ViridianForestBattleText1 ; TextBeforeBattle - dw ViridianForestAfterBattleText1 ; TextAfterBattle - dw ViridianForestEndBattleText1 ; TextEndBattle - dw ViridianForestEndBattleText1 ; TextEndBattle - -ViridianForestTrainerHeader1: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 - dw ViridianForestBattleText2 ; TextBeforeBattle - dw ViridianForestAfterBattleText2 ; TextAfterBattle - dw ViridianForestEndBattleText2 ; TextEndBattle - dw ViridianForestEndBattleText2 ; TextEndBattle - -ViridianForestTrainerHeader2: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 - dw ViridianForestBattleText3 ; TextBeforeBattle - dw ViridianForestAfterBattleText3 ; TextAfterBattle - dw ViridianForestEndBattleText3 ; TextEndBattle - dw ViridianForestEndBattleText3 ; TextEndBattle - - db $ff - -ViridianForestText1: - TX_FAR _ViridianForestText1 - db "@" - -ViridianForestText2: - TX_ASM - ld hl, ViridianForestTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -ViridianForestText3: - TX_ASM - ld hl, ViridianForestTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -ViridianForestText4: - TX_ASM - ld hl, ViridianForestTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -ViridianForestBattleText1: - TX_FAR _ViridianForestBattleText1 - db "@" - -ViridianForestEndBattleText1: - TX_FAR _ViridianForestEndBattleText1 - db "@" - -ViridianForestAfterBattleText1: - TX_FAR _ViridianFrstAfterBattleText1 - db "@" - -ViridianForestBattleText2: - TX_FAR _ViridianForestBattleText2 - db "@" - -ViridianForestEndBattleText2: - TX_FAR _ViridianForestEndBattleText2 - db "@" - -ViridianForestAfterBattleText2: - TX_FAR _ViridianFrstAfterBattleText2 - db "@" - -ViridianForestBattleText3: - TX_FAR _ViridianForestBattleText3 - db "@" - -ViridianForestEndBattleText3: - TX_FAR _ViridianForestEndBattleText3 - db "@" - -ViridianForestAfterBattleText3: - TX_FAR _ViridianFrstAfterBattleText3 - db "@" - -ViridianForestText8: - TX_FAR _ViridianForestText8 - db "@" - -ViridianForestText9: - TX_FAR _ViridianForestText9 - db "@" - -ViridianForestText10: - TX_FAR _ViridianForestText10 - db "@" - -ViridianForestText11: - TX_FAR _ViridianForestText11 - db "@" - -ViridianForestText12: - TX_FAR _ViridianForestText12 - db "@" - -ViridianForestText13: - TX_FAR _ViridianForestText13 - db "@" - -ViridianForestText14: - TX_FAR _ViridianForestText14 - db "@" diff --git a/scripts/viridianforestentrance.asm b/scripts/viridianforestentrance.asm deleted file mode 100755 index e24225ed..00000000 --- a/scripts/viridianforestentrance.asm +++ /dev/null @@ -1,14 +0,0 @@ -ViridianForestEntranceScript: - jp EnableAutoTextBoxDrawing - -ViridianForestEntranceTextPointers: - dw ViridianForestEntranceText1 - dw ViridianForestEntranceText2 - -ViridianForestEntranceText1: - TX_FAR _ViridianForestEntranceText1 - db "@" - -ViridianForestEntranceText2: - TX_FAR _ViridianForestEntranceText2 - db "@" diff --git a/scripts/viridianforestexit.asm b/scripts/viridianforestexit.asm deleted file mode 100755 index af7a8523..00000000 --- a/scripts/viridianforestexit.asm +++ /dev/null @@ -1,14 +0,0 @@ -ViridianForestExitScript: - jp EnableAutoTextBoxDrawing - -ViridianForestExitTextPointers: - dw ViridianForestExitText1 - dw ViridianForestExitText2 - -ViridianForestExitText1: - TX_FAR _ViridianForestExitText1 - db "@" - -ViridianForestExitText2: - TX_FAR _ViridianForestExitText2 - db "@" diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm deleted file mode 100755 index cc8dcb90..00000000 --- a/scripts/viridiangym.asm +++ /dev/null @@ -1,496 +0,0 @@ -ViridianGymScript: - ld hl, Gym8CityName - ld de, Gym8LeaderName - call LoadGymLeaderAndCityName - call EnableAutoTextBoxDrawing - ld hl, ViridianGymTrainerHeader0 - ld de, ViridianGymScriptPointers - ld a, [wViridianGymCurScript] - call ExecuteCurMapScriptInTable - ld [wViridianGymCurScript], a - ret - -Gym8CityName: - db "VIRIDIAN CITY@" -Gym8LeaderName: - db "GIOVANNI@" - -ViridianGymScript_748d6: - xor a - ld [wJoyIgnore], a - ld [wViridianGymCurScript], a - ld [wCurMapScript], a - ret - -ViridianGymScriptPointers: - dw ViridianGymScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw ViridianGymScript3 - dw ViridianGymScript4 - -ViridianGymScript0: - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a - ld hl, ViridianGymArrowTilePlayerMovement - call DecodeArrowMovementRLE - cp $ff - jp z, CheckFightingMapTrainers - call StartSimulatingJoypadStates - ld hl, wd736 - set 7, [hl] - ld a, SFX_ARROW_TILES - call PlaySound - ld a, $ff - ld [wJoyIgnore], a - ld a, $4 - ld [wCurMapScript], a - ret - -;format: -;db y,x -;dw pointer to movement -ViridianGymArrowTilePlayerMovement: - db $b,$13 - dw ViridianGymArrowMovement1 - db $1,$13 - dw ViridianGymArrowMovement2 - db $2,$12 - dw ViridianGymArrowMovement3 - db $2,$b - dw ViridianGymArrowMovement4 - db $a,$10 - dw ViridianGymArrowMovement5 - db $6,$4 - dw ViridianGymArrowMovement6 - db $d,$5 - dw ViridianGymArrowMovement7 - db $e,$4 - dw ViridianGymArrowMovement8 - db $f,$0 - dw ViridianGymArrowMovement9 - db $f,$1 - dw ViridianGymArrowMovement10 - db $10,$d - dw ViridianGymArrowMovement11 - db $11,$d - dw ViridianGymArrowMovement12 - db $FF - -;format: direction, count -ViridianGymArrowMovement1: - db D_UP,$09,$FF - -ViridianGymArrowMovement2: - db D_LEFT,$08,$FF - -ViridianGymArrowMovement3: - db D_DOWN,$09,$FF - -ViridianGymArrowMovement4: - db D_RIGHT,$06,$FF - -ViridianGymArrowMovement5: - db D_DOWN,$02,$FF - -ViridianGymArrowMovement6: - db D_DOWN,$07,$FF - -ViridianGymArrowMovement7: - db D_RIGHT,$08,$FF - -ViridianGymArrowMovement8: - db D_RIGHT,$09,$FF - -ViridianGymArrowMovement9: - db D_UP,$08,$FF - -ViridianGymArrowMovement10: - db D_UP,$06,$FF - -ViridianGymArrowMovement11: - db D_LEFT,$06,$FF - -ViridianGymArrowMovement12: - db D_LEFT,$0C,$FF - -ViridianGymScript4: - ld a, [wSimulatedJoypadStatesIndex] - and a - jr nz, .asm_74980 - xor a - ld [wJoyIgnore], a - ld hl, wd736 - res 7, [hl] - ld a, $0 - ld [wCurMapScript], a - ret -.asm_74980 - jpba LoadSpinnerArrowTiles - -ViridianGymScript3: - ld a, [wIsInBattle] - cp $ff - jp z, ViridianGymScript_748d6 - ld a, $f0 - ld [wJoyIgnore], a -ViridianGymScript3_74995: - ld a, $c - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - lb bc, TM_27, 1 - call GiveItem - jr nc, .BagFull - ld a, $d - ld [hSpriteIndexOrTextID], a - call DisplayTextID - SetEvent EVENT_GOT_TM27 - jr .asm_749be -.BagFull - ld a, $e - ld [hSpriteIndexOrTextID], a - call DisplayTextID -.asm_749be - ld hl, wObtainedBadges - set 7, [hl] - ld hl, wBeatGymFlags - set 7, [hl] - - ; deactivate gym trainers - SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7 - - ld a, HS_ROUTE_22_RIVAL_2 - ld [wMissableObjectIndex], a - predef ShowObject - SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - jp ViridianGymScript_748d6 - -ViridianGymTextPointers: - dw ViridianGymText1 - dw ViridianGymText2 - dw ViridianGymText3 - dw ViridianGymText4 - dw ViridianGymText5 - dw ViridianGymText6 - dw ViridianGymText7 - dw ViridianGymText8 - dw ViridianGymText9 - dw ViridianGymText10 - dw PickUpItemText - dw ViridianGymText12 - dw ViridianGymText13 - dw ViridianGymText14 - -ViridianGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 - dw ViridianGymBattleText1 ; TextBeforeBattle - dw ViridianGymAfterBattleText1 ; TextAfterBattle - dw ViridianGymEndBattleText1 ; TextEndBattle - dw ViridianGymEndBattleText1 ; TextEndBattle - -ViridianGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 - dw ViridianGymBattleText2 ; TextBeforeBattle - dw ViridianGymAfterBattleText2 ; TextAfterBattle - dw ViridianGymEndBattleText2 ; TextEndBattle - dw ViridianGymEndBattleText2 ; TextEndBattle - -ViridianGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 - dw ViridianGymBattleText3 ; TextBeforeBattle - dw ViridianGymAfterBattleText3 ; TextAfterBattle - dw ViridianGymEndBattleText3 ; TextEndBattle - dw ViridianGymEndBattleText3 ; TextEndBattle - -ViridianGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 - dw ViridianGymBattleText4 ; TextBeforeBattle - dw ViridianGymAfterBattleText4 ; TextAfterBattle - dw ViridianGymEndBattleText4 ; TextEndBattle - dw ViridianGymEndBattleText4 ; TextEndBattle - -ViridianGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 - dw ViridianGymBattleText5 ; TextBeforeBattle - dw ViridianGymAfterBattleText5 ; TextAfterBattle - dw ViridianGymEndBattleText5 ; TextEndBattle - dw ViridianGymEndBattleText5 ; TextEndBattle - -ViridianGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 - dw ViridianGymBattleText6 ; TextBeforeBattle - dw ViridianGymAfterBattleText6 ; TextAfterBattle - dw ViridianGymEndBattleText6 ; TextEndBattle - dw ViridianGymEndBattleText6 ; TextEndBattle - -ViridianGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 - dw ViridianGymBattleText7 ; TextBeforeBattle - dw ViridianGymAfterBattleText7 ; TextAfterBattle - dw ViridianGymEndBattleText7 ; TextEndBattle - dw ViridianGymEndBattleText7 ; TextEndBattle - -ViridianGymTrainerHeader7: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 - dw ViridianGymBattleText8 ; TextBeforeBattle - dw ViridianGymAfterBattleText8 ; TextAfterBattle - dw ViridianGymEndBattleText8 ; TextEndBattle - dw ViridianGymEndBattleText8 ; TextEndBattle - - db $ff - -ViridianGymText1: - TX_ASM - CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr z, .asm_6de66 - CheckEventReuseA EVENT_GOT_TM27 - jr nz, .asm_9fc95 - call z, ViridianGymScript3_74995 - call DisableWaitingAfterTextDisplay - jr .asm_6dff7 -.asm_9fc95 - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, ViridianGymText_74ad9 - call PrintText - call GBFadeOutToBlack - ld a, HS_VIRIDIAN_GYM_GIOVANNI - ld [wMissableObjectIndex], a - predef HideObject - call UpdateSprites - call Delay3 - call GBFadeInFromBlack - jr .asm_6dff7 -.asm_6de66 - ld hl, ViridianGymText_74ace - call PrintText - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, ViridianGymText_74ad3 - ld de, ViridianGymText_74ad3 - call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] - ld [wSpriteIndex], a - call EngageMapTrainer - call InitBattleEnemyParameters - ld a, $8 - ld [wGymLeaderNo], a - ld a, $3 - ld [wViridianGymCurScript], a -.asm_6dff7 - jp TextScriptEnd - -ViridianGymText_74ace: - TX_FAR _ViridianGymText_74ace - db "@" - -ViridianGymText_74ad3: - TX_FAR _ViridianGymText_74ad3 - TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded - db "@" - -ViridianGymText_74ad9: - TX_FAR _ViridianGymText_74ad9 - TX_WAIT - db "@" - -ViridianGymText12: - TX_FAR _ViridianGymText12 - db "@" - -ViridianGymText13: - TX_FAR _ReceivedTM27Text - TX_SFX_ITEM_1 - -TM27ExplanationText: - TX_FAR _TM27ExplanationText - db "@" - -ViridianGymText14: - TX_FAR _TM27NoRoomText - db "@" - -ViridianGymText2: - TX_ASM - ld hl, ViridianGymTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText1: - TX_FAR _ViridianGymBattleText1 - db "@" - -ViridianGymEndBattleText1: - TX_FAR _ViridianGymEndBattleText1 - db "@" - -ViridianGymAfterBattleText1: - TX_FAR _ViridianGymAfterBattleText1 - db "@" - -ViridianGymText3: - TX_ASM - ld hl, ViridianGymTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText2: - TX_FAR _ViridianGymBattleText2 - db "@" - -ViridianGymEndBattleText2: - TX_FAR _ViridianGymEndBattleText2 - db "@" - -ViridianGymAfterBattleText2: - TX_FAR _ViridianGymAfterBattleText2 - db "@" - -ViridianGymText4: - TX_ASM - ld hl, ViridianGymTrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText3: - TX_FAR _ViridianGymBattleText3 - db "@" - -ViridianGymEndBattleText3: - TX_FAR _ViridianGymEndBattleText3 - db "@" - -ViridianGymAfterBattleText3: - TX_FAR _ViridianGymAfterBattleText3 - db "@" - -ViridianGymText5: - TX_ASM - ld hl, ViridianGymTrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText4: - TX_FAR _ViridianGymBattleText4 - db "@" - -ViridianGymEndBattleText4: - TX_FAR _ViridianGymEndBattleText4 - db "@" - -ViridianGymAfterBattleText4: - TX_FAR _ViridianGymAfterBattleText4 - db "@" - -ViridianGymText6: - TX_ASM - ld hl, ViridianGymTrainerHeader4 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText5: - TX_FAR _ViridianGymBattleText5 - db "@" - -ViridianGymEndBattleText5: - TX_FAR _ViridianGymEndBattleText5 - db "@" - -ViridianGymAfterBattleText5: - TX_FAR _ViridianGymAfterBattleText5 - db "@" - -ViridianGymText7: - TX_ASM - ld hl, ViridianGymTrainerHeader5 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText6: - TX_FAR _ViridianGymBattleText6 - db "@" - -ViridianGymEndBattleText6: - TX_FAR _ViridianGymEndBattleText6 - db "@" - -ViridianGymAfterBattleText6: - TX_FAR _ViridianGymAfterBattleText6 - db "@" - -ViridianGymText8: - TX_ASM - ld hl, ViridianGymTrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText7: - TX_FAR _ViridianGymBattleText7 - db "@" - -ViridianGymEndBattleText7: - TX_FAR _ViridianGymEndBattleText7 - db "@" - -ViridianGymAfterBattleText7: - TX_FAR _ViridianGymAfterBattleText7 - db "@" - -ViridianGymText9: - TX_ASM - ld hl, ViridianGymTrainerHeader7 - call TalkToTrainer - jp TextScriptEnd - -ViridianGymBattleText8: - TX_FAR _ViridianGymBattleText8 - db "@" - -ViridianGymEndBattleText8: - TX_FAR _ViridianGymEndBattleText8 - db "@" - -ViridianGymAfterBattleText8: - TX_FAR _ViridianGymAfterBattleText8 - db "@" - -ViridianGymText10: - TX_ASM - CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr nz, .asm_1abd1 - ld hl, ViridianGymText_74bd4 - call PrintText - jr .asm_6064d -.asm_1abd1 - ld hl, ViridianGymText_74bd9 - call PrintText -.asm_6064d - jp TextScriptEnd - -ViridianGymText_74bd4: - TX_FAR _ViridianGymText_74bd4 - db "@" - -ViridianGymText_74bd9: - TX_FAR _ViridianGymText_74bd9 - db "@" diff --git a/scripts/viridianhouse.asm b/scripts/viridianhouse.asm deleted file mode 100755 index 105c8fb6..00000000 --- a/scripts/viridianhouse.asm +++ /dev/null @@ -1,33 +0,0 @@ -ViridianHouseScript: - jp EnableAutoTextBoxDrawing - -ViridianHouseTextPointers: - dw ViridianHouseText1 - dw ViridianHouseText2 - dw ViridianHouseText3 - dw ViridianHouseText4 - -ViridianHouseText1: - TX_FAR _ViridianHouseText1 - db "@" - -ViridianHouseText2: - TX_FAR _ViridianHouseText2 - db "@" - -ViridianHouseText3: - TX_ASM - ld hl, ViridianHouseText_1d5b1 - call PrintText - ld a, SPEAROW - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -ViridianHouseText_1d5b1: - TX_FAR _ViridianHouseText_1d5b1 - db "@" - -ViridianHouseText4: - TX_FAR _ViridianHouseText4 - db "@" diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm deleted file mode 100755 index 451ab989..00000000 --- a/scripts/viridianmart.asm +++ /dev/null @@ -1,93 +0,0 @@ -ViridianMartScript: - call ViridianMartScript_1d47d - call EnableAutoTextBoxDrawing - ld hl, ViridianMartScriptPointers - ld a, [wViridianMarketCurScript] - jp CallFunctionInTable - -ViridianMartScript_1d47d: - CheckEvent EVENT_OAK_GOT_PARCEL - jr nz, .asm_1d489 - ld hl, ViridianMartTextPointers - jr .asm_1d48c -.asm_1d489 - ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 -.asm_1d48c - ld a, l - ld [wMapTextPtr], a - ld a, h - ld [wMapTextPtr+1], a - ret - -ViridianMartScriptPointers: - dw ViridianMartScript0 - dw ViridianMartScript1 - dw ViridianMartScript2 - -ViridianMartScript0: - call UpdateSprites - ld a, $4 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement1d4bb - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates - ld a, $1 - ld [wViridianMarketCurScript], a - ret - -RLEMovement1d4bb: - db D_LEFT, $01 - db D_UP, $02 - db $ff - -ViridianMartScript1: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - call Delay3 - ld a, $5 - ld [hSpriteIndexOrTextID], a - call DisplayTextID - lb bc, OAKS_PARCEL, 1 - call GiveItem - SetEvent EVENT_GOT_OAKS_PARCEL - ld a, $2 - ld [wViridianMarketCurScript], a - ; fallthrough -ViridianMartScript2: - ret - -ViridianMartTextPointers: - dw ViridianMartText1 - dw ViridianMartText2 - dw ViridianMartText3 - dw ViridianMartText4 - dw ViridianMartText5 - dw ViridianCashierText - dw ViridianMartText2 - dw ViridianMartText3 - -ViridianMartText1: - TX_FAR _ViridianMartText1 - db "@" - -ViridianMartText4: - TX_FAR _ViridianMartText4 - db "@" - -ViridianMartText5: - TX_FAR ViridianMartParcelQuestText - TX_SFX_KEY_ITEM - db "@" - -ViridianMartText2: - TX_FAR _ViridianMartText2 - db "@" - -ViridianMartText3: - TX_FAR _ViridianMartText3 - db "@" diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm deleted file mode 100755 index 904ff47f..00000000 --- a/scripts/viridianpokecenter.asm +++ /dev/null @@ -1,23 +0,0 @@ -ViridianPokeCenterScript: - call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing - -ViridianPokecenterTextPointers: - dw ViridianHealNurseText - dw ViridianPokeCenterText2 - dw ViridianPokeCenterText3 - dw ViridianTradeNurseText - -ViridianHealNurseText: - TX_POKECENTER_NURSE - -ViridianPokeCenterText2: - TX_FAR _ViridianPokeCenterText2 - db "@" - -ViridianPokeCenterText3: - TX_FAR _ViridianPokeCenterText3 - db "@" - -ViridianTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST diff --git a/text.asm b/text.asm index 51355e33..5a760a8e 100644 --- a/text.asm +++ b/text.asm @@ -1,5 +1,7 @@ INCLUDE "charmap.asm" + INCLUDE "constants/text_constants.asm" + TEXT_1 EQU $20 TEXT_2 EQU TEXT_1 + 1 TEXT_3 EQU TEXT_2 + 1 @@ -16,6 +18,7 @@ POKEDEX_TEXT EQU TEXT_11 + 1 MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" + INCLUDE "hram.asm" @@ -167,67 +170,67 @@ _OaksAideNoRoomText:: text "." done -INCLUDE "text/maps/viridian_forest.asm" -INCLUDE "text/maps/mt_moon_1f.asm" -INCLUDE "text/maps/mt_moon_b1f.asm" -INCLUDE "text/maps/mt_moon_b2f.asm" -INCLUDE "text/maps/ss_anne_1.asm" -INCLUDE "text/maps/ss_anne_2.asm" -INCLUDE "text/maps/ss_anne_3.asm" -INCLUDE "text/maps/ss_anne_5.asm" -INCLUDE "text/maps/ss_anne_6.asm" -INCLUDE "text/maps/ss_anne_7.asm" -INCLUDE "text/maps/ss_anne_8.asm" -INCLUDE "text/maps/ss_anne_9.asm" -INCLUDE "text/maps/ss_anne_10.asm" -INCLUDE "text/maps/victory_road_3f.asm" -INCLUDE "text/maps/rocket_hideout_b1f.asm" -INCLUDE "text/maps/rocket_hideout_b2f.asm" -INCLUDE "text/maps/rocket_hideout_b3f.asm" -INCLUDE "text/maps/rocket_hideout_b4f.asm" -INCLUDE "text/maps/rocket_hideout_elevator.asm" -INCLUDE "text/maps/silph_co_2f.asm" -INCLUDE "text/maps/silph_co_3f.asm" -INCLUDE "text/maps/silph_co_4f.asm" -INCLUDE "text/maps/silph_co_5f_1.asm" +INCLUDE "text/maps/ViridianForest.asm" +INCLUDE "text/maps/MtMoon1F.asm" +INCLUDE "text/maps/MtMoonB1F.asm" +INCLUDE "text/maps/MtMoonB2F.asm" +INCLUDE "text/maps/SSAnne1F.asm" +INCLUDE "text/maps/SSAnne2F.asm" +INCLUDE "text/maps/SSAnne3F.asm" +INCLUDE "text/maps/SSAnneBow.asm" +INCLUDE "text/maps/SSAnneKitchen.asm" +INCLUDE "text/maps/SSAnneCaptainsRoom.asm" +INCLUDE "text/maps/SSAnne1FRooms.asm" +INCLUDE "text/maps/SSAnne2FRooms.asm" +INCLUDE "text/maps/SSAnneB1FRooms.asm" +INCLUDE "text/maps/VictoryRoad3F.asm" +INCLUDE "text/maps/RocketHideoutB1F.asm" +INCLUDE "text/maps/RocketHideoutB2F.asm" +INCLUDE "text/maps/RocketHideoutB3F.asm" +INCLUDE "text/maps/RocketHideoutB4F.asm" +INCLUDE "text/maps/RocketHideoutElevator.asm" +INCLUDE "text/maps/SilphCo2F.asm" +INCLUDE "text/maps/SilphCo3F.asm" +INCLUDE "text/maps/SilphCo4F.asm" +INCLUDE "text/maps/SilphCo5F.asm" SECTION "Text 2", ROMX ; BANK $21 -INCLUDE "text/maps/silph_co_5f_2.asm" -INCLUDE "text/maps/silph_co_6f.asm" -INCLUDE "text/maps/silph_co_7f.asm" -INCLUDE "text/maps/silph_co_8f.asm" -INCLUDE "text/maps/silph_co_9f.asm" -INCLUDE "text/maps/silph_co_10f.asm" -INCLUDE "text/maps/silph_co_11f.asm" -INCLUDE "text/maps/mansion_2f.asm" -INCLUDE "text/maps/mansion_3f.asm" -INCLUDE "text/maps/mansion_b1f.asm" -INCLUDE "text/maps/safari_zone_east.asm" -INCLUDE "text/maps/safari_zone_north.asm" -INCLUDE "text/maps/safari_zone_west.asm" -INCLUDE "text/maps/safari_zone_center.asm" -INCLUDE "text/maps/safari_zone_rest_house_1.asm" -INCLUDE "text/maps/safari_zone_secret_house.asm" -INCLUDE "text/maps/safari_zone_rest_house_2.asm" -INCLUDE "text/maps/safari_zone_rest_house_3.asm" -INCLUDE "text/maps/safari_zone_rest_house_4.asm" -INCLUDE "text/maps/unknown_dungeon_b1f.asm" -INCLUDE "text/maps/victory_road_1f.asm" -INCLUDE "text/maps/lance.asm" -INCLUDE "text/maps/hall_of_fame.asm" -INCLUDE "text/maps/champion.asm" -INCLUDE "text/maps/lorelei.asm" -INCLUDE "text/maps/bruno.asm" -INCLUDE "text/maps/agatha.asm" -INCLUDE "text/maps/rock_tunnel_b2f_1.asm" +INCLUDE "text/maps/SilphCo5F_2.asm" +INCLUDE "text/maps/SilphCo6F.asm" +INCLUDE "text/maps/SilphCo7F.asm" +INCLUDE "text/maps/SilphCo8F.asm" +INCLUDE "text/maps/SilphCo9F.asm" +INCLUDE "text/maps/SilphCo10F.asm" +INCLUDE "text/maps/SilphCo11F.asm" +INCLUDE "text/maps/PokemonMansion2F.asm" +INCLUDE "text/maps/PokemonMansion3F.asm" +INCLUDE "text/maps/PokemonMansionB1F.asm" +INCLUDE "text/maps/SafariZoneEast.asm" +INCLUDE "text/maps/SafariZoneNorth.asm" +INCLUDE "text/maps/SafariZoneWest.asm" +INCLUDE "text/maps/SafariZoneCenter.asm" +INCLUDE "text/maps/SafariZoneCenterRestHouse.asm" +INCLUDE "text/maps/SafariZoneSecretHouse.asm" +INCLUDE "text/maps/SafariZoneWestRestHouse.asm" +INCLUDE "text/maps/SafariZoneEastRestHouse.asm" +INCLUDE "text/maps/SafariZoneNorthRestHouse.asm" +INCLUDE "text/maps/CeruleanCaveB1F.asm" +INCLUDE "text/maps/VictoryRoad1F.asm" +INCLUDE "text/maps/LancesRoom.asm" +INCLUDE "text/maps/HallOfFame.asm" +INCLUDE "text/maps/ChampionsRoom.asm" +INCLUDE "text/maps/LoreleisRoom.asm" +INCLUDE "text/maps/BrunosRoom.asm" +INCLUDE "text/maps/AgathasRoom.asm" +INCLUDE "text/maps/RockTunnelB1F.asm" SECTION "Text 3", ROMX ; BANK $22 -INCLUDE "text/maps/rock_tunnel_b2f_2.asm" -INCLUDE "text/maps/seafoam_islands_b4f.asm" +INCLUDE "text/maps/RockTunnelB1F_2.asm" +INCLUDE "text/maps/SeafoamIslandsB4F.asm" _AIBattleWithdrawText:: TX_RAM wTrainerName @@ -1531,14 +1534,14 @@ _NotVeryEffectiveText:: _SafariZoneEatingText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is eating!" prompt _SafariZoneAngryText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is angry!" prompt @@ -1929,77 +1932,77 @@ _Char00Text:: _Char55Text:: text $4B,"@@" -INCLUDE "text/maps/digletts_cave_route_2_entrance.asm" -INCLUDE "text/maps/viridian_forest_exit.asm" -INCLUDE "text/maps/route_2_house.asm" -INCLUDE "text/maps/route_2_gate.asm" -INCLUDE "text/maps/viridian_forest_entrance.asm" -INCLUDE "text/maps/mt_moon_pokecenter.asm" -INCLUDE "text/maps/saffron_gates.asm" -INCLUDE "text/maps/daycare_1.asm" +INCLUDE "text/maps/DiglettsCaveRoute2.asm" +INCLUDE "text/maps/ViridianForestNorthGate.asm" +INCLUDE "text/maps/Route2TradeHouse.asm" +INCLUDE "text/maps/Route2Gate.asm" +INCLUDE "text/maps/ViridianForestSouthGate.asm" +INCLUDE "text/maps/MtMoonPokecenter.asm" +INCLUDE "text/maps/SaffronGates.asm" +INCLUDE "text/maps/Daycare.asm" SECTION "Text 4", ROMX ; BANK $23 -INCLUDE "text/maps/daycare_2.asm" -INCLUDE "text/maps/underground_path_route_6_entrance.asm" -INCLUDE "text/maps/underground_path_route_7_entrance.asm" -INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm" -INCLUDE "text/maps/underground_path_route_8_entrance.asm" -INCLUDE "text/maps/rock_tunnel_pokecenter.asm" -INCLUDE "text/maps/rock_tunnel_b1f.asm" -INCLUDE "text/maps/power_plant.asm" -INCLUDE "text/maps/route_11_gate.asm" -INCLUDE "text/maps/route_11_gate_upstairs.asm" -INCLUDE "text/maps/digletts_cave_route_11_entrance.asm" -INCLUDE "text/maps/route_12_gate.asm" -INCLUDE "text/maps/route_12_gate_upstairs.asm" -INCLUDE "text/maps/route_12_house.asm" -INCLUDE "text/maps/route_15_gate.asm" -INCLUDE "text/maps/route_15_gate_upstairs.asm" -INCLUDE "text/maps/route_16_gate.asm" -INCLUDE "text/maps/route_16_gate_upstairs.asm" -INCLUDE "text/maps/route_16_house.asm" -INCLUDE "text/maps/route_18_gate.asm" -INCLUDE "text/maps/route_18_gate_upstairs.asm" -INCLUDE "text/maps/pokemon_league_gate.asm" -INCLUDE "text/maps/victory_road_2f.asm" -INCLUDE "text/maps/bills_house.asm" -INCLUDE "text/maps/route_1.asm" -INCLUDE "text/maps/route_2.asm" -INCLUDE "text/maps/route_3.asm" -INCLUDE "text/maps/route_4.asm" -INCLUDE "text/maps/route_5.asm" -INCLUDE "text/maps/route_6.asm" -INCLUDE "text/maps/route_7.asm" -INCLUDE "text/maps/route_8.asm" -INCLUDE "text/maps/route_9.asm" -INCLUDE "text/maps/route_10.asm" -INCLUDE "text/maps/route_11_1.asm" +INCLUDE "text/maps/Daycare_2.asm" +INCLUDE "text/maps/UndergroundPathRoute6.asm" +INCLUDE "text/maps/UndergroundPathRoute7.asm" +INCLUDE "text/maps/UndergroundPathRoute7Copy.asm" +INCLUDE "text/maps/UndergroundPathRoute8.asm" +INCLUDE "text/maps/RockTunnelPokecenter.asm" +INCLUDE "text/maps/RockTunnel1F.asm" +INCLUDE "text/maps/PowerPlant.asm" +INCLUDE "text/maps/Route11Gate1F.asm" +INCLUDE "text/maps/Route11Gate2F.asm" +INCLUDE "text/maps/DiglettsCaveRoute11.asm" +INCLUDE "text/maps/Route12Gate1F.asm" +INCLUDE "text/maps/Route12Gate2F.asm" +INCLUDE "text/maps/Route12SuperRodHouse.asm" +INCLUDE "text/maps/Route15Gate1F.asm" +INCLUDE "text/maps/Route15Gate2F.asm" +INCLUDE "text/maps/Route16Gate1F.asm" +INCLUDE "text/maps/Route16Gate2F.asm" +INCLUDE "text/maps/Route16FlyHouse.asm" +INCLUDE "text/maps/Route18Gate1F.asm" +INCLUDE "text/maps/Route18Gate2F.asm" +INCLUDE "text/maps/Route22Gate.asm" +INCLUDE "text/maps/VictoryRoad2F.asm" +INCLUDE "text/maps/BillsHouse.asm" +INCLUDE "text/maps/Route1.asm" +INCLUDE "text/maps/Route2.asm" +INCLUDE "text/maps/Route3.asm" +INCLUDE "text/maps/Route4.asm" +INCLUDE "text/maps/Route5.asm" +INCLUDE "text/maps/Route6.asm" +INCLUDE "text/maps/Route7.asm" +INCLUDE "text/maps/Route8.asm" +INCLUDE "text/maps/Route9.asm" +INCLUDE "text/maps/Route10.asm" +INCLUDE "text/maps/Route11.asm" SECTION "Text 5", ROMX ; BANK $24 -INCLUDE "text/maps/route_11_2.asm" -INCLUDE "text/maps/route_12.asm" -INCLUDE "text/maps/route_13.asm" -INCLUDE "text/maps/route_14.asm" -INCLUDE "text/maps/route_15.asm" -INCLUDE "text/maps/route_16.asm" -INCLUDE "text/maps/route_17.asm" -INCLUDE "text/maps/route_18.asm" -INCLUDE "text/maps/route_19.asm" -INCLUDE "text/maps/route_20.asm" -INCLUDE "text/maps/route_21.asm" -INCLUDE "text/maps/route_22.asm" -INCLUDE "text/maps/route_23.asm" -INCLUDE "text/maps/route_24_1.asm" +INCLUDE "text/maps/Route11_2.asm" +INCLUDE "text/maps/Route12.asm" +INCLUDE "text/maps/Route13.asm" +INCLUDE "text/maps/Route14.asm" +INCLUDE "text/maps/Route15.asm" +INCLUDE "text/maps/Route16.asm" +INCLUDE "text/maps/Route17.asm" +INCLUDE "text/maps/Route18.asm" +INCLUDE "text/maps/Route19.asm" +INCLUDE "text/maps/Route20.asm" +INCLUDE "text/maps/Route21.asm" +INCLUDE "text/maps/Route22.asm" +INCLUDE "text/maps/Route23.asm" +INCLUDE "text/maps/Route24.asm" SECTION "Text 6", ROMX ; BANK $25 -INCLUDE "text/maps/route_24_2.asm" -INCLUDE "text/maps/route_25.asm" +INCLUDE "text/maps/Route24_2.asm" +INCLUDE "text/maps/Route25.asm" _FileDataDestroyedText:: text "The file data is" @@ -2326,106 +2329,106 @@ _ColosseumText1:: text "!" done -INCLUDE "text/maps/reds_house_1f.asm" -INCLUDE "text/maps/blues_house.asm" -INCLUDE "text/maps/oaks_lab.asm" -INCLUDE "text/maps/viridian_pokecenter.asm" -INCLUDE "text/maps/viridian_mart.asm" -INCLUDE "text/maps/school.asm" -INCLUDE "text/maps/viridian_house.asm" -INCLUDE "text/maps/viridian_gym.asm" -INCLUDE "text/maps/museum_1f.asm" -INCLUDE "text/maps/museum_2f.asm" -INCLUDE "text/maps/pewter_gym_1.asm" +INCLUDE "text/maps/RedsHouse1F.asm" +INCLUDE "text/maps/BluesHouse.asm" +INCLUDE "text/maps/OaksLab.asm" +INCLUDE "text/maps/ViridianPokecenter.asm" +INCLUDE "text/maps/ViridianMart.asm" +INCLUDE "text/maps/ViridianSchoolHouse.asm" +INCLUDE "text/maps/ViridianNicknameHouse.asm" +INCLUDE "text/maps/ViridianGym.asm" +INCLUDE "text/maps/Museum1F.asm" +INCLUDE "text/maps/Museum2F.asm" +INCLUDE "text/maps/PewterGym.asm" SECTION "Text 7", ROMX ; BANK $26 -INCLUDE "text/maps/pewter_gym_2.asm" -INCLUDE "text/maps/pewter_house_1.asm" -INCLUDE "text/maps/pewter_mart.asm" -INCLUDE "text/maps/pewter_house_2.asm" -INCLUDE "text/maps/pewter_pokecenter.asm" -INCLUDE "text/maps/cerulean_trashed_house.asm" -INCLUDE "text/maps/cerulean_trade_house.asm" -INCLUDE "text/maps/cerulean_pokecenter.asm" -INCLUDE "text/maps/cerulean_gym.asm" -INCLUDE "text/maps/bike_shop.asm" -INCLUDE "text/maps/cerulean_mart.asm" -INCLUDE "text/maps/cerulean_badge_house.asm" -INCLUDE "text/maps/lavender_pokecenter.asm" -INCLUDE "text/maps/pokemon_tower_1f.asm" -INCLUDE "text/maps/pokemon_tower_2f.asm" -INCLUDE "text/maps/pokemon_tower_3f.asm" -INCLUDE "text/maps/pokemon_tower_4f.asm" -INCLUDE "text/maps/pokemon_tower_5f.asm" -INCLUDE "text/maps/pokemon_tower_6f.asm" -INCLUDE "text/maps/pokemon_tower_7f.asm" -INCLUDE "text/maps/fujis_house.asm" -INCLUDE "text/maps/lavender_mart.asm" -INCLUDE "text/maps/lavender_house.asm" -INCLUDE "text/maps/name_rater.asm" -INCLUDE "text/maps/vermilion_pokecenter.asm" -INCLUDE "text/maps/fan_club.asm" -INCLUDE "text/maps/vermilion_mart.asm" -INCLUDE "text/maps/vermilion_gym_1.asm" +INCLUDE "text/maps/PewterGym_2.asm" +INCLUDE "text/maps/PewterNidoranHouse.asm" +INCLUDE "text/maps/PewterMart.asm" +INCLUDE "text/maps/PewterSpeechHouse.asm" +INCLUDE "text/maps/PewterPokecenter.asm" +INCLUDE "text/maps/CeruleanTrashedHouse.asm" +INCLUDE "text/maps/CeruleanTradeHouse.asm" +INCLUDE "text/maps/CeruleanPokecenter.asm" +INCLUDE "text/maps/CeruleanGym.asm" +INCLUDE "text/maps/BikeShop.asm" +INCLUDE "text/maps/CeruleanMart.asm" +INCLUDE "text/maps/CeruleanBadgeHouse.asm" +INCLUDE "text/maps/LavenderPokecenter.asm" +INCLUDE "text/maps/PokemonTower1F.asm" +INCLUDE "text/maps/PokemonTower2F.asm" +INCLUDE "text/maps/PokemonTower3F.asm" +INCLUDE "text/maps/PokemonTower4F.asm" +INCLUDE "text/maps/PokemonTower5F.asm" +INCLUDE "text/maps/PokemonTower6F.asm" +INCLUDE "text/maps/PokemonTower7F.asm" +INCLUDE "text/maps/MrFujisHouse.asm" +INCLUDE "text/maps/LavenderMart.asm" +INCLUDE "text/maps/LavenderCuboneHouse.asm" +INCLUDE "text/maps/NameRatersHouse.asm" +INCLUDE "text/maps/VermilionPokecenter.asm" +INCLUDE "text/maps/PokemonFanClub.asm" +INCLUDE "text/maps/VermilionMart.asm" +INCLUDE "text/maps/VermilionGym.asm" SECTION "Text 8", ROMX ; BANK $27 -INCLUDE "text/maps/vermilion_gym_2.asm" -INCLUDE "text/maps/vermilion_house.asm" -INCLUDE "text/maps/vermilion_dock.asm" -INCLUDE "text/maps/vermilion_fishing_house.asm" -INCLUDE "text/maps/celadon_dept_store_1f.asm" -INCLUDE "text/maps/celadon_dept_store_2f.asm" -INCLUDE "text/maps/celadon_dept_store_3f.asm" -INCLUDE "text/maps/celadon_dept_store_4f.asm" -INCLUDE "text/maps/celadon_dept_store_roof.asm" -INCLUDE "text/maps/celadon_mansion_1f.asm" -INCLUDE "text/maps/celadon_mansion_2f.asm" -INCLUDE "text/maps/celadon_mansion_3f.asm" -INCLUDE "text/maps/celadon_mansion_4f_outside.asm" -INCLUDE "text/maps/celadon_mansion_4f_inside.asm" -INCLUDE "text/maps/celadon_pokecenter.asm" -INCLUDE "text/maps/celadon_gym.asm" -INCLUDE "text/maps/celadon_game_corner.asm" -INCLUDE "text/maps/celadon_dept_store_5f.asm" -INCLUDE "text/maps/celadon_prize_room.asm" -INCLUDE "text/maps/celadon_diner.asm" -INCLUDE "text/maps/celadon_house.asm" -INCLUDE "text/maps/celadon_hotel.asm" -INCLUDE "text/maps/fuchsia_mart.asm" -INCLUDE "text/maps/fuchsia_house.asm" -INCLUDE "text/maps/fuchsia_pokecenter.asm" -INCLUDE "text/maps/wardens_house.asm" -INCLUDE "text/maps/safari_zone_entrance.asm" -INCLUDE "text/maps/fuchsia_gym_1.asm" +INCLUDE "text/maps/VermilionGym_2.asm" +INCLUDE "text/maps/VermilionPidgeyHouse.asm" +INCLUDE "text/maps/VermilionDock.asm" +INCLUDE "text/maps/VermilionOldRodHouse.asm" +INCLUDE "text/maps/CeladonMart1F.asm" +INCLUDE "text/maps/CeladonMart2F.asm" +INCLUDE "text/maps/CeladonMart3F.asm" +INCLUDE "text/maps/CeladonMart4F.asm" +INCLUDE "text/maps/CeladonMartRoof.asm" +INCLUDE "text/maps/CeladonMansion1F.asm" +INCLUDE "text/maps/CeladonMansion2F.asm" +INCLUDE "text/maps/CeladonMansion3F.asm" +INCLUDE "text/maps/CeladonMansionRoof.asm" +INCLUDE "text/maps/CeladonMansionRoofHouse.asm" +INCLUDE "text/maps/CeladonPokecenter.asm" +INCLUDE "text/maps/CeladonGym.asm" +INCLUDE "text/maps/GameCorner.asm" +INCLUDE "text/maps/CeladonMart5F.asm" +INCLUDE "text/maps/GameCornerPrizeRoom.asm" +INCLUDE "text/maps/CeladonDiner.asm" +INCLUDE "text/maps/CeladonChiefHouse.asm" +INCLUDE "text/maps/CeladonHotel.asm" +INCLUDE "text/maps/FuchsiaMart.asm" +INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "text/maps/FuchsiaPokecenter.asm" +INCLUDE "text/maps/WardensHouse.asm" +INCLUDE "text/maps/SafariZoneGate.asm" +INCLUDE "text/maps/FuchsiaGym.asm" SECTION "Text 9", ROMX ; BANK $28 -INCLUDE "text/maps/fuchsia_gym_2.asm" -INCLUDE "text/maps/fuchsia_meeting_room.asm" -INCLUDE "text/maps/fuchsia_fishing_house.asm" -INCLUDE "text/maps/mansion_1f.asm" -INCLUDE "text/maps/cinnabar_gym.asm" -INCLUDE "text/maps/cinnabar_lab.asm" -INCLUDE "text/maps/cinnabar_lab_trade_room.asm" -INCLUDE "text/maps/cinnabar_lab_metronome_room.asm" -INCLUDE "text/maps/cinnabar_lab_fossil_room.asm" -INCLUDE "text/maps/cinnabar_pokecenter.asm" -INCLUDE "text/maps/cinnabar_mart.asm" -INCLUDE "text/maps/indigo_plateau_lobby.asm" -INCLUDE "text/maps/copycats_house_1f.asm" -INCLUDE "text/maps/copycats_house_2f.asm" -INCLUDE "text/maps/fighting_dojo.asm" -INCLUDE "text/maps/saffron_gym.asm" -INCLUDE "text/maps/saffron_house.asm" -INCLUDE "text/maps/saffron_mart.asm" -INCLUDE "text/maps/silph_co_1f.asm" -INCLUDE "text/maps/saffron_pokecenter.asm" -INCLUDE "text/maps/mr_psychics_house.asm" +INCLUDE "text/maps/FuchsiaGym_2.asm" +INCLUDE "text/maps/FuchsiaMeetingRoom.asm" +INCLUDE "text/maps/FuchsiaGoodRodHouse.asm" +INCLUDE "text/maps/PokemonMansion1F.asm" +INCLUDE "text/maps/CinnabarGym.asm" +INCLUDE "text/maps/CinnabarLab.asm" +INCLUDE "text/maps/CinnabarLabTradeRoom.asm" +INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm" +INCLUDE "text/maps/CinnabarLabFossilRoom.asm" +INCLUDE "text/maps/CinnabarPokecenter.asm" +INCLUDE "text/maps/CinnabarMart.asm" +INCLUDE "text/maps/IndigoPlateauLobby.asm" +INCLUDE "text/maps/CopycatsHouse1F.asm" +INCLUDE "text/maps/CopycatsHouse2F.asm" +INCLUDE "text/maps/FightingDojo.asm" +INCLUDE "text/maps/SaffronGym.asm" +INCLUDE "text/maps/SaffronPidgeyHouse.asm" +INCLUDE "text/maps/SaffronMart.asm" +INCLUDE "text/maps/SilphCo1F.asm" +INCLUDE "text/maps/SaffronPokecenter.asm" +INCLUDE "text/maps/MrPsychicsHouse.asm" _PokemartGreetingText:: text "Hi there!" @@ -2751,16 +2754,16 @@ _BoxIsFullText:: line "a #MON CENTER!" done -INCLUDE "text/maps/pallet_town.asm" -INCLUDE "text/maps/viridian_city.asm" -INCLUDE "text/maps/pewter_city.asm" -INCLUDE "text/maps/cerulean_city.asm" -INCLUDE "text/maps/lavender_town.asm" -INCLUDE "text/maps/vermilion_city.asm" -INCLUDE "text/maps/celadon_city.asm" -INCLUDE "text/maps/fuchsia_city.asm" -INCLUDE "text/maps/cinnabar_island.asm" -INCLUDE "text/maps/saffron_city.asm" +INCLUDE "text/maps/PalletTown.asm" +INCLUDE "text/maps/ViridianCity.asm" +INCLUDE "text/maps/PewterCity.asm" +INCLUDE "text/maps/CeruleanCity.asm" +INCLUDE "text/maps/LavenderTown.asm" +INCLUDE "text/maps/VermilionCity.asm" +INCLUDE "text/maps/CeladonCity.asm" +INCLUDE "text/maps/FuchsiaCity.asm" +INCLUDE "text/maps/CinnabarIsland.asm" +INCLUDE "text/maps/SaffronCity.asm" _ItemUseBallText00:: text "It dodged the" diff --git a/text/maps/AgathasRoom.asm b/text/maps/AgathasRoom.asm new file mode 100644 index 00000000..9ef5059a --- /dev/null +++ b/text/maps/AgathasRoom.asm @@ -0,0 +1,44 @@ +_AgathaBeforeBattleText:: + text "I am AGATHA of" + line "the ELITE FOUR!" + + para "OAK's taken a lot" + line "of interest in" + cont "you, child!" + + para "That old duff was" + line "once tough and" + cont "handsome! That" + cont "was decades ago!" + + para "Now he just wants" + line "to fiddle with" + cont "his #DEX! He's" + cont "wrong! #MON" + cont "are for fighting!" + + para "! I'll show" + line "you how a real" + cont "trainer fights!" + done + +_AgathaEndBattleText:: + text "Oh ho!" + line "You're something" + cont "special, child!" + prompt + +_AgathaAfterBattleText:: + text "You win! I see" + line "what the old duff" + cont "sees in you now!" + + para "I have nothing" + line "else to say! Run" + cont "along now, child!" + done + +_AgathaDontRunAwayText:: + text "Someone's voice:" + line "Don't run away!" + done diff --git a/text/maps/BikeShop.asm b/text/maps/BikeShop.asm new file mode 100644 index 00000000..86799865 --- /dev/null +++ b/text/maps/BikeShop.asm @@ -0,0 +1,70 @@ +_BikeShopText_1d810:: + text "Hi! Welcome to" + line "our BIKE SHOP." + + para "Have we got just" + line "the BIKE for you!" + prompt + +_BikeShopText_1d815:: + text "It's a cool BIKE!" + line "Do you want it?" + done + +_BikeShopCantAffordText:: + text "Sorry! You can't" + line "afford it!" + prompt + +_BikeShopText_1d81f:: + text "Oh, that's..." + + para "A BIKE VOUCHER!" + + para "OK! Here you go!" + prompt + +_BikeShopText_1d824:: + text " exchanged" + line "the BIKE VOUCHER" + cont "for a BICYCLE.@@" + +_BikeShopComeAgainText:: + text "Come back again" + line "some time!" + done + +_BikeShopText_1d82f:: + text "How do you like" + line "your new BICYCLE?" + + para "You can take it" + line "on CYCLING ROAD" + cont "and in caves!" + done + +_BikeShopText_1d834:: + text "You better make" + line "room for this!" + done + +_BikeShopText_1d843:: + text "A plain city BIKE" + line "is good enough" + cont "for me!" + + para "You can't put a" + line "shopping basket" + cont "on an MTB!" + done + +_BikeShopText_1d85c:: + text "These BIKEs are" + line "cool, but they're" + cont "way expensive!" + done + +_BikeShopText_1d861:: + text "Wow. Your BIKE is" + line "really cool!" + done diff --git a/text/maps/BillsHouse.asm b/text/maps/BillsHouse.asm new file mode 100644 index 00000000..5ece48d7 --- /dev/null +++ b/text/maps/BillsHouse.asm @@ -0,0 +1,87 @@ +_BillsHouseText_1e865:: + text "Hiya! I'm a" + line "#MON..." + cont "...No I'm not!" + + para "Call me BILL!" + line "I'm a true blue" + cont "#MANIAC! Hey!" + cont "What's with that" + cont "skeptical look?" + + para "I'm not joshing" + line "you, I screwed up" + cont "an experiment and" + cont "got combined with" + cont "a #MON!" + + para "So, how about it?" + line "Help me out here!" + done + +_BillsHouseText_1e86a:: + text "When I'm in the" + line "TELEPORTER, go to" + cont "my PC and run the" + cont "Cell Separation" + cont "System!" + done + +_BillsHouseText_1e86f:: + text "No!? Come on, you" + line "gotta help a guy" + cont "in deep trouble!" + + para "What do you say," + line "chief? Please?" + cont "OK? All right!" + prompt + +_BillThankYouText:: + text "BILL: Yeehah!" + line "Thanks, bud! I" + cont "owe you one!" + + para "So, did you come" + line "to see my #MON" + cont "collection?" + cont "You didn't?" + cont "That's a bummer." + + para "I've got to thank" + line "you... Oh here," + cont "maybe this'll do." + prompt + +_SSTicketReceivedText:: + text " received" + line "an @" + TX_RAM wcf4b + text "!@@" + +_SSTicketNoRoomText:: + text "You've got too" + line "much stuff, bud!" + done + +_BillsHouseText_1e8cb:: + text "That cruise ship," + line "S.S.ANNE, is in" + cont "VERMILION CITY." + cont "Its passengers" + cont "are all trainers!" + + para "They invited me" + line "to their party," + cont "but I can't stand" + cont "fancy do's. Why" + cont "don't you go" + cont "instead of me?" + done + +_BillsHouseText_1e8da:: + text "BILL: Look, bud," + line "just check out" + cont "some of my rare" + cont "#MON on my PC!" + done diff --git a/text/maps/BluesHouse.asm b/text/maps/BluesHouse.asm new file mode 100644 index 00000000..1898636a --- /dev/null +++ b/text/maps/BluesHouse.asm @@ -0,0 +1,41 @@ +_DaisyInitialText:: + text "Hi !" + line " is out at" + cont "Grandpa's lab." + done + +_DaisyOfferMapText:: + text "Grandpa asked you" + line "to run an errand?" + cont "Here, this will" + cont "help you!" + prompt + +_GotMapText:: + text " got a" + line "@" + TX_RAM wcf4b + text "!@@" + +_DaisyBagFullText:: + text "You have too much" + line "stuff with you." + done + +_DaisyUseMapText:: + text "Use the TOWN MAP" + line "to find out where" + cont "you are." + done + +_BluesHouseText2:: + text "#MON are living" + line "things! If they" + cont "get tired, give" + cont "them a rest!" + done + +_BluesHouseText3:: + text "It's a big map!" + line "This is useful!" + done diff --git a/text/maps/BrunosRoom.asm b/text/maps/BrunosRoom.asm new file mode 100644 index 00000000..9c493c4a --- /dev/null +++ b/text/maps/BrunosRoom.asm @@ -0,0 +1,37 @@ +_BrunoBeforeBattleText:: + text "I am BRUNO of" + line "the ELITE FOUR!" + + para "Through rigorous" + line "training, people" + cont "and #MON can" + cont "become stronger!" + + para "I've weight" + line "trained with" + cont "my #MON!" + + para "!" + + para "We will grind you" + line "down with our" + cont "superior power!" + + para "Hoo hah!" + done + +_BrunoEndBattleText:: + text "Why?" + line "How could I lose?" + prompt + +_BrunoAfterBattleText:: + text "My job is done!" + line "Go face your next" + cont "challenge!" + done + +_BrunoDontRunAwayText:: + text "Someone's voice:" + line "Don't run away!" + done diff --git a/text/maps/CeladonChiefHouse.asm b/text/maps/CeladonChiefHouse.asm new file mode 100644 index 00000000..19e59bd6 --- /dev/null +++ b/text/maps/CeladonChiefHouse.asm @@ -0,0 +1,22 @@ +_CeladonHouseText1:: + text "Hehehe! The slots" + line "just reel in the" + cont "dough, big time!" + done + +_CeladonHouseText2:: + text "CHIEF!" + + para "We just shipped" + line "2000 #MON as" + cont "slot prizes!" + done + +_CeladonHouseText3:: + text "Don't touch the" + line "poster at the" + cont "GAME CORNER!" + + para "There's no secret" + line "switch behind it!" + done diff --git a/text/maps/CeladonCity.asm b/text/maps/CeladonCity.asm new file mode 100644 index 00000000..1dbd5cdf --- /dev/null +++ b/text/maps/CeladonCity.asm @@ -0,0 +1,152 @@ +_CeladonCityText1:: + text "I got my KOFFING" + line "in CINNABAR!" + + para "It's nice, but it" + line "breathes poison" + cont "when it's angry!" + done + +_CeladonCityText2:: + text "Heheh! This GYM" + line "is great! It's" + cont "full of women!" + done + +_CeladonCityText3:: + text "The GAME CORNER" + line "is bad for our" + cont "city's image!" + done + +_CeladonCityText4:: + text "Moan! I blew it" + line "all at the slots!" + + para "I knew I should" + line "have cashed in my" + cont "coins for prizes!" + done + +_TM41PreText:: + text "Hello, there!" + + para "I've seen you," + line "but I never had a" + cont "chance to talk!" + + para "Here's a gift for" + line "dropping by!" + prompt + +_ReceivedTM41Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM41ExplanationText:: + text "TM41 teaches" + line "SOFTBOILED!" + + para "Only one #MON" + line "can use it!" + + para "That #MON is" + line "CHANSEY!" + done + +_TM41NoRoomText:: + text "Oh, your pack is" + line "full of items!" + done + +_CeladonCityText6:: + text "This is my trusted" + line "pal, POLIWRATH!" + + para "It evolved from" + line "POLIWHIRL when I" + cont "used WATER STONE!" + done + +_CeladonCityText7:: + text "POLIWRATH: Ribi" + line "ribit!@@" + +_CeladonCityText8:: + text "What are you" + line "staring at?" + done + +_CeladonCityText9:: + text "Keep out of TEAM" + line "ROCKET's way!" + done + +_CeladonCityText10:: + text "TRAINER TIPS" + + para "X ACCURACY boosts" + line "the accuracy of" + cont "techniques!" + + para "DIRE HIT jacks up" + line "the likelihood of" + cont "critical hits!" + + para "Get your items at" + line "CELADON DEPT." + cont "STORE!" + done + +_CeladonCityText11:: + text "CELADON CITY" + line "The City of" + cont "Rainbow Dreams" + done + +_CeladonCityText13:: + text "CELADON CITY" + line "#MON GYM" + cont "LEADER: ERIKA" + + para "The Nature Loving" + line "Princess!" + done + +_CeladonCityText14:: + text "CELADON MANSION" + done + +_CeladonCityText15:: + text "Find what you" + line "need at CELADON" + cont "DEPT. STORE!" + done + +_CeladonCityText16:: + text "TRAINER TIPS" + + para "GUARD SPEC." + line "protects #MON" + cont "against SPECIAL" + cont "attacks such as" + cont "fire and water!" + + para "Get your items at" + line "CELADON DEPT." + cont "STORE!" + done + +_CeladonCityText17:: + text "Coins exchanged" + line "for prizes!" + cont "PRIZE EXCHANGE" + done + +_CeladonCityText18:: + text "ROCKET GAME CORNER" + line "The playground" + cont "for grown-ups!" + done diff --git a/text/maps/CeladonDiner.asm b/text/maps/CeladonDiner.asm new file mode 100644 index 00000000..dc5e9350 --- /dev/null +++ b/text/maps/CeladonDiner.asm @@ -0,0 +1,59 @@ +_CeladonDinerText1:: + text "Hi!" + + para "We're taking a" + line "break now." + done + +_CeladonDinerText2:: + text "My #MON are" + line "weak, so I often" + cont "have to go to the" + cont "DRUG STORE." + done + +_CeladonDinerText3:: + text "Psst! There's a" + line "basement under" + cont "the GAME CORNER." + done + +_CeladonDinerText4:: + text "Munch..." + + para "The man at that" + line "table lost it all" + cont "at the slots." + done + +_CeladonDinerText_491a7:: + text "Go ahead! Laugh!" + + para "I'm flat out" + line "busted!" + + para "No more slots for" + line "me! I'm going" + cont "straight!" + + para "Here! I won't be" + line "needing this any-" + cont "more!" + prompt + +_ReceivedCoinCaseText:: + text " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_CoinCaseNoRoomText:: + text "Make room for" + line "this!" + done + +_CeladonDinerText_491b7:: + text "I always thought" + line "I was going to" + cont "win it back..." + done diff --git a/text/maps/CeladonGym.asm b/text/maps/CeladonGym.asm new file mode 100644 index 00000000..d6586035 --- /dev/null +++ b/text/maps/CeladonGym.asm @@ -0,0 +1,219 @@ +_CeladonGymText_48a5e:: + text "Hello. Lovely" + line "weather isn't it?" + cont "It's so pleasant." + + para "...Oh dear..." + line "I must have dozed" + cont "off. Welcome." + + para "My name is ERIKA." + line "I am the LEADER" + cont "of CELADON GYM." + + para "I teach the art of" + line "flower arranging." + cont "My #MON are of" + cont "the grass-type." + + para "Oh, I'm sorry, I" + line "had no idea that" + cont "you wished to" + cont "challenge me." + + para "Very well, but I" + line "shall not lose." + done + +_CeladonGymText_48a63:: + text "Oh!" + line "I concede defeat." + + para "You are remarkably" + line "strong." + + para "I must confer you" + line "the RAINBOWBADGE." + prompt + +_CeladonGymText_48a68:: + text "You are cataloging" + line "#MON? I must" + cont "say I'm impressed." + + para "I would never" + line "collect #MON" + cont "if they were" + cont "unattractive." + done + +_CeladonGymText9:: + text "The RAINBOWBADGE" + line "will make #MON" + cont "up to L50 obey." + + para "It also allows" + line "#MON to use" + cont "STRENGTH in and" + cont "out of battle." + + para "Please also take" + line "this with you." + done + +_ReceivedTM21Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM21ExplanationText:: + text "" + + para "TM21 contains" + line "MEGA DRAIN." + + para "Half the damage" + line "it inflicts is" + cont "drained to heal" + cont "your #MON!" + done + +_TM21NoRoomText:: + text "You should make" + line "room for this." + done + +_CeladonGymBattleText2:: + text "Hey!" + + para "You are not" + line "allowed in here!" + done + +_CeladonGymEndBattleText2:: + text "You're" + line "too rough!" + prompt + +_CeladonGymAfterBattleText2:: + text "Bleaah!" + line "I hope ERIKA" + cont "wipes you out!" + done + +_CeladonGymBattleText3:: + text "I was getting" + line "bored." + done + +_CeladonGymEndBattleText3:: + text "My" + line "makeup!" + prompt + +_CeladonGymAfterBattleText3:: + text "Grass-type #MON" + line "are tough against" + cont "the water-type!" + + para "They also have an" + line "edge on rock and" + cont "ground #MON!" + done + +_CeladonGymBattleText4:: + text "Aren't you the" + line "peeping Tom?" + done + +_CeladonGymEndBattleText4:: + text "I'm" + line "in shock!" + prompt + +_CeladonGymAfterBattleText4:: + text "Oh, you weren't" + line "peeping? We get a" + cont "lot of gawkers!" + done + +_CeladonGymBattleText5:: + text "Look at my grass" + line "#MON!" + + para "They're so easy" + line "to raise!" + done + +_CeladonGymEndBattleText5:: + text "No!" + prompt + +_CeladonGymAfterBattleText5:: + text "We only use grass-" + line "type #MON at" + cont "our GYM!" + + para "We also use them" + line "for making flower" + cont "arrangements!" + done + +_CeladonGymBattleText6:: + text "Don't bring any" + line "bugs or fire" + cont "#MON in here!" + done + +_CeladonGymEndBattleText6:: + text "Oh!" + line "You!" + prompt + +_CeladonGymAfterBattleText6:: + text "Our LEADER, ERIKA," + line "might be quiet," + cont "but she's also" + cont "very skilled!" + done + +_CeladonGymBattleText7:: + text "Pleased to meet" + line "you. My hobby is" + cont "#MON training." + done + +_CeladonGymEndBattleText7:: + text "Oh!" + line "Splendid!" + prompt + +_CeladonGymAfterBattleText7:: + text "I have a blind" + line "date coming up." + cont "I have to learn" + cont "to be polite." + done + +_CeladonGymBattleText8:: + text "Welcome to" + line "CELADON GYM!" + + para "You better not" + line "underestimate" + cont "girl power!" + done + +_CeladonGymEndBattleText8:: + text "Oh!" + line "Beaten!" + prompt + +_CeladonGymAfterBattleText8:: + text "I didn't bring my" + line "best #MON!" + + para "Wait 'til next" + line "time!" + done diff --git a/text/maps/CeladonHotel.asm b/text/maps/CeladonHotel.asm new file mode 100644 index 00000000..f2eb059e --- /dev/null +++ b/text/maps/CeladonHotel.asm @@ -0,0 +1,21 @@ +_CeladonHotelText1:: + text "#MON? No, this" + line "is a hotel for" + cont "people." + + para "We're full up." + done + +_CeladonHotelText2:: + text "I'm on vacation" + line "with my brother" + cont "and boy friend." + + para "CELADON is such a" + line "pretty city!" + done + +_CeladonHotelText3:: + text "Why did she bring" + line "her brother?" + done diff --git a/text/maps/CeladonMansion1F.asm b/text/maps/CeladonMansion1F.asm new file mode 100644 index 00000000..fc175cd5 --- /dev/null +++ b/text/maps/CeladonMansion1F.asm @@ -0,0 +1,23 @@ +_CeladonMansion1Text1:: + text "MEOWTH: Meow!@@" + +_CeladonMansion1Text2:: + text "My dear #MON" + line "keep me company." + + para "MEOWTH even brings" + line "money home!" + done + +_CeladonMansion1Text3:: + text "CLEFAIRY: Pi" + line "pippippi!@@" + +_CeladonMansion1Text4:: + text "NIDORAN: Kya" + line "kyaoo!@@" + +_CeladonMansion1Text5:: + text "CELADON MANSION" + line "Manager's Suite" + done diff --git a/text/maps/CeladonMansion2F.asm b/text/maps/CeladonMansion2F.asm new file mode 100644 index 00000000..b2ecb4fa --- /dev/null +++ b/text/maps/CeladonMansion2F.asm @@ -0,0 +1,4 @@ +_CeladonMansion2Text1:: + text "GAME FREAK" + line "Meeting Room" + done diff --git a/text/maps/CeladonMansion3F.asm b/text/maps/CeladonMansion3F.asm new file mode 100644 index 00000000..c8858281 --- /dev/null +++ b/text/maps/CeladonMansion3F.asm @@ -0,0 +1,66 @@ +_ProgrammerText:: + text "Me? I'm the" + line "programmer!" + done + +_GraphicArtistText:: + text "I'm the graphic" + line "artist!" + cont "I drew you!" + done + +_WriterText:: + text "I wrote the story!" + line "Isn't ERIKA cute?" + + para "I like MISTY a" + line "lot too!" + + para "Oh, and SABRINA," + line "I like her!" + done + +_GameDesignerText:: + text "Is that right?" + + para "I'm the game" + line "designer!" + + para "Filling up your" + line "#DEX is tough," + cont "but don't quit!" + + para "When you finish," + line "come tell me!" + done + +_CompletedDexText:: + text "Wow! Excellent!" + line "You completed" + cont "your #DEX!" + cont "Congratulations!" + cont "...@@" + +_CeladonMansion3Text5:: + text "It's the game" + line "program! Messing" + cont "with it could bug" + cont "out the game!" + done + +_CeladonMansion3Text6:: + text "Someone's playing" + line "a game instead of" + cont "working!" + done + +_CeladonMansion3Text7:: + text "It's the script!" + line "Better not look" + cont "at the ending!" + done + +_CeladonMansion3Text8:: + text "GAME FREAK" + line "Development Room" + done diff --git a/text/maps/CeladonMansionRoof.asm b/text/maps/CeladonMansionRoof.asm new file mode 100644 index 00000000..c8fd7ec8 --- /dev/null +++ b/text/maps/CeladonMansionRoof.asm @@ -0,0 +1,3 @@ +_CeladonMansion4Text1:: + text "I KNOW EVERYTHING!" + done diff --git a/text/maps/CeladonMansionRoofHouse.asm b/text/maps/CeladonMansionRoofHouse.asm new file mode 100644 index 00000000..dab81a8d --- /dev/null +++ b/text/maps/CeladonMansionRoofHouse.asm @@ -0,0 +1,10 @@ +_CeladonMansion5Text1:: + text "I know everything" + line "about the world" + cont "of #MON in" + cont "your GAME BOY!" + + para "Get together with" + line "your friends and" + cont "trade #MON!" + done diff --git a/text/maps/CeladonMart1F.asm b/text/maps/CeladonMart1F.asm new file mode 100644 index 00000000..8d805edc --- /dev/null +++ b/text/maps/CeladonMart1F.asm @@ -0,0 +1,31 @@ +_CeladonMart1Text1:: + text "Hello! Welcome to" + line "CELADON DEPT." + cont "STORE." + + para "The board on the" + line "right describes" + cont "the store layout." + done + +_CeladonMart1Text2:: + text "1F: SERVICE" + line " COUNTER" + + para "2F: TRAINER'S" + line " MARKET" + + para "3F: TV GAME SHOP" + + para "4F: WISEMAN GIFTS" + + para "5F: DRUG STORE" + + para "ROOFTOP SQUARE:" + line "VENDING MACHINES" + done + +_CeladonMart1Text3:: + text "1F: SERVICE" + line " COUNTER" + done diff --git a/text/maps/CeladonMart2F.asm b/text/maps/CeladonMart2F.asm new file mode 100644 index 00000000..74869902 --- /dev/null +++ b/text/maps/CeladonMart2F.asm @@ -0,0 +1,22 @@ +_CeladonMart2Text3:: + text "SUPER REPEL keeps" + line "weak #MON at" + cont "bay..." + + para "Hmm, it's a more" + line "powerful REPEL!" + done + +_CeladonMart2Text4:: + text "For long outings," + line "you should buy" + cont "REVIVE." + done + +_CeladonMart2Text5:: + text "Top Grade Items" + line "for Trainers!" + + para "2F: TRAINER'S" + line " MARKET" + done diff --git a/text/maps/CeladonMart3F.asm b/text/maps/CeladonMart3F.asm new file mode 100644 index 00000000..8211750d --- /dev/null +++ b/text/maps/CeladonMart3F.asm @@ -0,0 +1,98 @@ +_TM18PreReceiveText:: + text "Oh, hi! I finally" + line "finished #MON!" + + para "Not done yet?" + line "This might be" + cont "useful!" + prompt + +_ReceivedTM18Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM18ExplanationText:: + text "TM18 is COUNTER!" + line "Not like the one" + cont "I'm leaning on," + cont "mind you!" + done + +_TM18NoRoomText:: + text "Your pack is full" + line "of items!" + done + +_CeladonMart3Text2:: + text "Captured #MON" + line "are registered" + cont "with an ID No." + cont "and OT, the name" + cont "of the Original" + cont "Trainer that" + cont "caught it!" + done + +_CeladonMart3Text3:: + text "All right!" + + para "My buddy's going" + line "to trade me his" + cont "KANGASKHAN for my" + cont "GRAVELER!" + done + +_CeladonMart3Text4:: + text "Come on GRAVELER!" + + para "I love GRAVELER!" + line "I collect them!" + + para "Huh?" + + para "GRAVELER turned" + line "into a different" + cont "#MON!" + done + +_CeladonMart3Text5:: + text "You can identify" + line "#MON you got" + cont "in trades by" + cont "their ID Numbers!" + done + +_CeladonMart3Text6:: + text "It's an SNES!" + done + +_CeladonMart3Text7:: + text "An RPG! There's" + line "no time for that!" + done + +_CeladonMart3Text9:: + text "A sports game!" + line "Dad'll like that!" + done + +_CeladonMart3Text11:: + text "A puzzle game!" + line "Looks addictive!" + done + +_CeladonMart3Text13:: + text "A fighting game!" + line "Looks tough!" + done + +_CeladonMart3Text14:: + text "3F: TV GAME SHOP" + done + +_CeladonMart3Text15:: + text "Red and Blue!" + line "Both are #MON!" + done diff --git a/text/maps/CeladonMart4F.asm b/text/maps/CeladonMart4F.asm new file mode 100644 index 00000000..78fa0b66 --- /dev/null +++ b/text/maps/CeladonMart4F.asm @@ -0,0 +1,26 @@ +_CeladonMart4Text2:: + text "I'm getting a" + line "# DOLL for my" + cont "girl friend!" + done + +_CeladonMart4Text3:: + text "I heard something" + line "useful." + + para "You can run from" + line "wild #MON by" + cont "distracting them" + cont "with a # DOLL!" + done + +_CeladonMart4Text4:: + text "Express yourself" + line "with gifts!" + + para "4F: WISEMAN GIFTS" + + para "Evolution Special!" + line "Element STONEs on" + cont "sale now!" + done diff --git a/text/maps/CeladonMart5F.asm b/text/maps/CeladonMart5F.asm new file mode 100644 index 00000000..1871194b --- /dev/null +++ b/text/maps/CeladonMart5F.asm @@ -0,0 +1,28 @@ +_CeladonMart5Text1:: + text "#MON ability" + line "enhancers can be" + cont "bought only here." + + para "Use CALCIUM to" + line "increase SPECIAL" + cont "abilities." + + para "Use CARBOS to" + line "increase SPEED." + done + +_CeladonMart5Text2:: + text "I'm here for" + line "#MON ability" + cont "enhancers." + + para "PROTEIN increases" + line "ATTACK power." + + para "IRON increases" + line "DEFENSE!" + done + +_CeladonMart5Text5:: + text "5F: DRUG STORE" + done diff --git a/text/maps/CeladonMartRoof.asm b/text/maps/CeladonMartRoof.asm new file mode 100644 index 00000000..1ed52e86 --- /dev/null +++ b/text/maps/CeladonMartRoof.asm @@ -0,0 +1,141 @@ +_CeladonMartRoofText_484ee:: + text "Give her which" + line "drink?" + done + +_CeladonMartRoofText_484f3:: + text "Yay!" + + para "FRESH WATER!" + + para "Thank you!" + + para "You can have this" + line "from me!@@" + +_CeladonMartRoofText_484f9:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_CeladonMartRoofText_484fe:: + text "" + + para "@" + TX_RAM wcf4b + text " contains" + line "ICE BEAM!" + + para "It can freeze the" + line "target sometimes!@@" + +_CeladonMartRoofText_48504:: + text "Yay!" + + para "SODA POP!" + + para "Thank you!" + + para "You can have this" + line "from me!@@" + +_CeladonMartRoofText_4850a:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_CeladonMartRoofText_4850f:: + text "" + + para "@" + TX_RAM wcf4b + text " contains" + line "ROCK SLIDE!" + + para "It can spook the" + line "target sometimes!@@" + +_CeladonMartRoofText_48515:: + text "Yay!" + + para "LEMONADE!" + + para "Thank you!" + + para "You can have this" + line "from me!@@" + +_ReceivedTM49Text:: + text " received" + line "TM49!@@" + +_CeladonMartRoofText_48520:: + text "" + + para "TM49 contains" + line "TRI ATTACK!@@" + +_CeladonMartRoofText_48526:: + text "You don't have" + line "space for this!@@" + +_CeladonMartRoofText_4852c:: + text "No thank you!" + line "I'm not thirsty" + cont "after all!@@" + +_CeladonMartRoofText1:: + text "My sister is a" + line "trainer, believe" + cont "it or not." + + para "But, she's so" + line "immature, she" + cont "drives me nuts!" + done + +_CeladonMartRoofText_48598:: + text "I'm thirsty!" + line "I want something" + cont "to drink!" + done + +_CeladonMartRoofText4:: + text "I'm thirsty!" + line "I want something" + cont "to drink!" + + para "Give her a drink?" + done + +_CeladonMartRoofText6:: + text "ROOFTOP SQUARE:" + line "VENDING MACHINES" + done + +_VendingMachineText1:: + text "A vending machine!" + line "Here's the menu!" + prompt + +_VendingMachineText4:: + text "Oops, not enough" + line "money!" + done + +_VendingMachineText5:: + TX_RAM wcf4b + text "" + line "popped out!" + done + +_VendingMachineText6:: + text "There's no more" + line "room for stuff!" + done + +_VendingMachineText7:: + text "Not thirsty!" + done diff --git a/text/maps/CeladonPokecenter.asm b/text/maps/CeladonPokecenter.asm new file mode 100644 index 00000000..a04f51c9 --- /dev/null +++ b/text/maps/CeladonPokecenter.asm @@ -0,0 +1,12 @@ +_CeladonPokecenterText2:: + text "# FLUTE awakens" + line "#MON with a" + cont "sound that only" + cont "they can hear!" + done + +_CeladonPokecenterText3:: + text "I rode uphill on" + line "CYCLING ROAD from" + cont "FUCHSIA!" + done diff --git a/text/maps/CeruleanBadgeHouse.asm b/text/maps/CeruleanBadgeHouse.asm new file mode 100644 index 00000000..9d701443 --- /dev/null +++ b/text/maps/CeruleanBadgeHouse.asm @@ -0,0 +1,97 @@ +_CeruleanHouse2Text_74e77:: + text "#MON BADGEs" + line "are owned only by" + cont "skilled trainers." + + para "I see you have" + line "at least one." + + para "Those BADGEs have" + line "amazing secrets!" + prompt + +_CeruleanHouse2Text_74e7c:: + text "Now then..." + + para "Which of the 8" + line "BADGEs should I" + cont "describe?" + done + +_CeruleanHouse2Text_74e81:: + text "Come visit me any" + line "time you wish." + done + +_CeruleanHouse2Text_74e96:: + text "The ATTACK of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" + line "use FLASH any" + cont "time you desire." + prompt + +_CeruleanHouse2Text_74e9b:: + text "#MON up to L30" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + + para "It also lets you" + line "use CUT outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74ea0:: + text "The SPEED of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" + line "use FLY outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74ea5:: + text "#MON up to L50" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + + para "It also lets you" + line "use STRENGTH out-" + cont "side of battle." + prompt + +_CeruleanHouse2Text_74eaa:: + text "The DEFENSE of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" + line "use SURF outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74eaf:: + text "#MON up to L70" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + prompt + +_CeruleanHouse2Text_74eb4:: + text "Your #MON's" + line "SPECIAL abilities" + cont "increase a bit." + prompt + +_CeruleanHouse2Text_74eb9:: + text "All #MON will" + line "obey you!" + prompt diff --git a/text/maps/CeruleanCaveB1F.asm b/text/maps/CeruleanCaveB1F.asm new file mode 100644 index 00000000..0918a3ce --- /dev/null +++ b/text/maps/CeruleanCaveB1F.asm @@ -0,0 +1,2 @@ +_MewtwoBattleText:: + text "Mew!@@" diff --git a/text/maps/CeruleanCity.asm b/text/maps/CeruleanCity.asm new file mode 100644 index 00000000..f0d2c29e --- /dev/null +++ b/text/maps/CeruleanCity.asm @@ -0,0 +1,233 @@ +_CeruleanCityText_19668:: + text ": Yo!" + line "!" + + para "You're still" + line "struggling along" + cont "back here?" + + para "I'm doing great!" + line "I caught a bunch" + cont "of strong and" + cont "smart #MON!" + + para "Here, let me see" + line "what you caught," + cont "!" + done + +_CeruleanCityText_1966d:: + text "Hey!" + line "Take it easy!" + cont "You won already!" + prompt + +_CeruleanCityText_19672:: + text "Heh!" + line "You're no match" + cont "for my genius!" + prompt + +_CeruleanCityText_19677:: + text ": Hey," + line "guess what?" + + para "I went to BILL's" + line "and got him to" + cont "show me his rare" + cont "#MON!" + + para "That added a lot" + line "of pages to my" + cont "#DEX!" + + para "After all, BILL's" + line "world famous as a" + cont "#MANIAC!" + + para "He invented the" + line "#MON Storage" + cont "System on PC!" + + para "Since you're using" + line "his system, go" + cont "thank him!" + + para "Well, I better" + line "get rolling!" + cont "Smell ya later!" + done + +_CeruleanCityText_196d9:: + text "Hey! Stay out!" + line "It's not your" + cont "yard! Huh? Me?" + + para "I'm an innocent" + line "bystander! Don't" + cont "you believe me?" + done + +_ReceivedTM28Text:: + text " recovered" + line "TM28!@@" + +_ReceivedTM28Text2:: + text "" + + para "I better get" + line "moving! Bye!@@" + +_TM28NoRoomText:: + text "Make room for" + line "this!" + + para "I can't run until" + line "I give it to you!" + done + +_CeruleanCityText_196ee:: + text "Stop!" + line "I give up! I'll" + cont "leave quietly!" + prompt + +_CeruleanCityText_196f3:: + text "OK! I'll return" + line "the TM I stole!" + prompt + +_CeruleanCityText3:: + text "You're a trainer" + line "too? Collecting," + cont "fighting, it's a" + cont "tough life." + done + +_CeruleanCityText4:: + text "That bush in" + line "front of the shop" + cont "is in the way." + + para "There might be a" + line "way around." + done + +_CeruleanCityText5:: + text "You're making an" + line "encyclopedia on" + cont "#MON? That" + cont "sounds amusing." + done + +_CeruleanCityText6:: + text "The people here" + line "were robbed." + + para "It's obvious that" + line "TEAM ROCKET is" + cont "behind this most" + cont "heinous crime!" + + para "Even our POLICE" + line "force has trouble" + cont "with the ROCKETs!" + done + +_CeruleanCityText_19730:: + text "OK! SLOWBRO!" + line "Use SONICBOOM!" + cont "Come on, SLOWBRO" + cont "pay attention!" + done + +_CeruleanCityText_19735:: + text "SLOWBRO punch!" + line "No! You blew it" + cont "again!" + done + +_CeruleanCityText_1973a:: + text "SLOWBRO, WITHDRAW!" + line "No! That's wrong!" + + para "It's so hard to" + line "control #MON!" + + para "Your #MON's" + line "obedience depends" + cont "on your abilities" + cont "as a trainer!" + done + +_CeruleanCityText_1976f:: + text "SLOWBRO took a" + line "snooze..." + done + +_CeruleanCityText_19774:: + text "SLOWBRO is" + line "loafing around..." + done + +_CeruleanCityText_19779:: + text "SLOWBRO turned" + line "away..." + done + +_CeruleanCityText_1977e:: + text "SLOWBRO" + line "ignored orders..." + done + +_CeruleanCityText9:: + text "I want a bright" + line "red BICYCLE!" + + para "I'll keep it at" + line "home, so it won't" + cont "get dirty!" + done + +_CeruleanCityText10:: + text "This is CERULEAN" + line "CAVE! Horribly" + cont "strong #MON" + cont "live in there!" + + para "The #MON LEAGUE" + line "champion is the" + cont "only person who" + cont "is allowed in!" + done + +_CeruleanCityText12:: + text "CERULEAN CITY" + line "A Mysterious," + cont "Blue Aura" + cont "Surrounds It" + done + +_CeruleanCityText13:: + text "TRAINER TIPS" + + para "Pressing B Button" + line "during evolution" + cont "cancels the whole" + cont "process." + done + +_CeruleanCityText16:: + text "Grass and caves" + line "handled easily!" + cont "BIKE SHOP" + done + +_CeruleanCityText17:: + text "CERULEAN CITY" + line "#MON GYM" + cont "LEADER: MISTY" + + para "The Tomboyish" + line "Mermaid!" + done diff --git a/text/maps/CeruleanGym.asm b/text/maps/CeruleanGym.asm new file mode 100644 index 00000000..1d1d6d1c --- /dev/null +++ b/text/maps/CeruleanGym.asm @@ -0,0 +1,131 @@ +_CeruleanGymText_5c7be:: + text "Hi, you're a new" + line "face!" + + para "Trainers who want" + line "to turn pro have" + cont "to have a policy" + cont "about #MON!" + + para "What is your" + line "approach when you" + cont "catch #MON?" + + para "My policy is an" + line "all-out offensive" + cont "with water-type" + cont "#MON!" + done + +_CeruleanGymText_5c7c3:: + text "TM11 teaches" + line "BUBBLEBEAM!" + + para "Use it on an" + line "aquatic #MON!" + done + +_CeruleanGymText_5c7c8:: + text "The CASCADEBADGE" + line "makes all #MON" + cont "up to L30 obey!" + + para "That includes" + line "even outsiders!" + + para "There's more, you" + line "can now use CUT" + cont "any time!" + + para "You can CUT down" + line "small bushes to" + cont "open new paths!" + + para "You can also have" + line "my favorite TM!" + done + +_ReceivedTM11Text:: + text " received" + line "TM11!@@" + +_CeruleanGymText_5c7d3:: + text "You better make" + line "room for this!" + done + +_CeruleanGymText_5c7d8:: + text "Wow!" + line "You're too much!" + + para "All right!" + + para "You can have the" + line "CASCADEBADGE to" + cont "show you beat me!@@" + +_CeruleanGymBattleText1:: + text "I'm more than good" + line "enough for you!" + + para "MISTY can wait!" + done + +_CeruleanGymEndBattleText1:: + text "You" + line "overwhelmed me!" + prompt + +_CeruleanGymAfterBattleText1:: + text "You have to face" + line "other trainers to" + cont "find out how good" + cont "you really are." + done + +_CeruleanGymBattleText2:: + text "Splash!" + + para "I'm first up!" + line "Let's do it!" + done + +_CeruleanGymEndBattleText2:: + text "That" + line "can't be!" + prompt + +_CeruleanGymAfterBattleText2:: + text "MISTY is going to" + line "keep improving!" + + para "She won't lose to" + line "someone like you!" + done + +_CeruleanGymText_5c82a:: + text "Yo! Champ in" + line "making!" + + para "Here's my advice!" + + para "The LEADER, MISTY," + line "is a pro who uses" + cont "water #MON!" + + para "You can drain all" + line "their water with" + cont "plant #MON!" + + para "Or, zap them with" + line "electricity!" + done + +_CeruleanGymText_5c82f:: + text "You beat MISTY!" + line "What'd I tell ya?" + + para "You and me kid," + line "we make a pretty" + cont "darn good team!" + done diff --git a/text/maps/CeruleanMart.asm b/text/maps/CeruleanMart.asm new file mode 100644 index 00000000..86a74588 --- /dev/null +++ b/text/maps/CeruleanMart.asm @@ -0,0 +1,19 @@ +_CeruleanMartText2:: + text "Use REPEL to keep" + line "bugs and weak" + cont "#MON away." + + para "Put your strongest" + line "#MON at the" + cont "top of the list" + cont "for best results!" + done + +_CeruleanMartText3:: + text "Have you seen any" + line "RARE CANDY?" + + para "It's supposed to" + line "make #MON go" + cont "up one level!" + done diff --git a/text/maps/CeruleanPokecenter.asm b/text/maps/CeruleanPokecenter.asm new file mode 100644 index 00000000..497fbce3 --- /dev/null +++ b/text/maps/CeruleanPokecenter.asm @@ -0,0 +1,24 @@ +_CeruleanPokecenterText2:: + text "That BILL!" + + para "I heard that" + line "he'll do whatever" + cont "it takes to get" + cont "rare #MON!" + done + +_CeruleanPokecenterText3:: + text "Have you heard" + line "about BILL?" + + para "Everyone calls" + line "him a #MANIAC!" + + para "I think people" + line "are just jealous" + cont "of BILL, though." + + para "Who wouldn't want" + line "to boast about" + cont "their #MON?" + done diff --git a/text/maps/CeruleanTradeHouse.asm b/text/maps/CeruleanTradeHouse.asm new file mode 100644 index 00000000..b606613b --- /dev/null +++ b/text/maps/CeruleanTradeHouse.asm @@ -0,0 +1,9 @@ +_CeruleanHouse1Text1:: + text "My husband likes" + line "trading #MON." + + para "If you are a" + line "collector, would" + cont "you please trade" + cont "with him?" + done diff --git a/text/maps/CeruleanTrashedHouse.asm b/text/maps/CeruleanTrashedHouse.asm new file mode 100644 index 00000000..f79540ae --- /dev/null +++ b/text/maps/CeruleanTrashedHouse.asm @@ -0,0 +1,36 @@ +_CeruleanTrashedText_1d6ab:: + text "Those miserable" + line "ROCKETs!" + + para "Look what they" + line "did here!" + + para "They stole a TM" + line "for teaching" + cont "#MON how to" + cont "DIG holes!" + + para "That cost me a" + line "bundle, it did!" + done + +_CeruleanTrashedText_1d6b0:: + text "I figure what's" + line "lost is lost!" + + para "I decided to teach" + line "DIGLETT how to" + cont "DIG without a TM!" + done + +_CeruleanHouseTrashedText2:: + text "TEAM ROCKET must" + line "be trying to DIG" + cont "their way into no" + cont "good!" + done + +_CeruleanHouseTrashedText3:: + text "TEAM ROCKET left" + line "a way out!" + done diff --git a/text/maps/ChampionsRoom.asm b/text/maps/ChampionsRoom.asm new file mode 100644 index 00000000..61050565 --- /dev/null +++ b/text/maps/ChampionsRoom.asm @@ -0,0 +1,146 @@ +_GaryChampionIntroText:: + text ": Hey!" + + para "I was looking" + line "forward to seeing" + cont "you, !" + + para "My rival should" + line "be strong to keep" + cont "me sharp!" + + para "While working on" + line "#DEX, I looked" + cont "all over for" + cont "powerful #MON!" + + para "Not only that, I" + line "assembled teams" + cont "that would beat" + cont "any #MON type!" + + para "And now!" + + para "I'm the #MON" + line "LEAGUE champion!" + + para "! Do you" + line "know what that" + cont "means?" + + para "I'll tell you!" + + para "I am the most" + line "powerful trainer" + cont "in the world!" + done + +_GaryDefeatedText:: + text "NO!" + line "That can't be!" + cont "You beat my best!" + + para "After all that" + line "work to become" + cont "LEAGUE champ?" + + para "My reign is over" + line "already?" + cont "It's not fair!" + prompt + +_GaryVictoryText:: + text "Hahaha!" + line "I won, I won!" + + para "I'm too good for" + line "you, !" + + para "You did well to" + line "even reach me," + cont ", the" + cont "#MON genius!" + + para "Nice try, loser!" + line "Hahaha!" + prompt + +_GaryText_76103:: + text "Why?" + line "Why did I lose?" + + para "I never made any" + line "mistakes raising" + cont "my #MON..." + + para "Darn it! You're" + line "the new #MON" + cont "LEAGUE champion!" + + para "Although I don't" + line "like to admit it." + done + +_GaryText2:: + text "OAK: !" + done + +_GaryText_76120:: + text "OAK: So, you won!" + line "Congratulations!" + cont "You're the new" + cont "#MON LEAGUE" + cont "champion!" + + para "You've grown up so" + line "much since you" + cont "first left with" + cont "@" + TX_RAM wcd6d + text "!" + + para ", you have" + line "come of age!" + done + +_GaryText_76125:: + text "OAK: ! I'm" + line "disappointed!" + + para "I came when I" + line "heard you beat" + cont "the ELITE FOUR!" + + para "But, when I got" + line "here, you had" + cont "already lost!" + + para "! Do you" + line "understand why" + cont "you lost?" + + para "You have forgotten" + line "to treat your" + cont "#MON with" + cont "trust and love!" + + para "Without them, you" + line "will never become" + cont "a champ again!" + done + +_GaryText_7612a:: + text "OAK: !" + + para "You understand" + line "that your victory" + cont "was not just your" + cont "own doing!" + + para "The bond you share" + line "with your #MON" + cont "is marvelous!" + + para "!" + line "Come with me!" + done diff --git a/text/maps/CinnabarGym.asm b/text/maps/CinnabarGym.asm new file mode 100644 index 00000000..1b531571 --- /dev/null +++ b/text/maps/CinnabarGym.asm @@ -0,0 +1,210 @@ +_BlaineBattleText:: + text "Hah!" + + para "I am BLAINE! I" + line "am the LEADER of" + cont "CINNABAR GYM!" + + para "My fiery #MON" + line "will incinerate" + cont "all challengers!" + + para "Hah! You better" + line "have BURN HEAL!" + done + +_BlaineEndBattleText:: + text "I have" + line "burnt out!" + + para "You have earned" + line "the VOLCANOBADGE!@@" + +_BlaineFireBlastText:: + text "FIRE BLAST is the" + line "ultimate fire" + cont "technique!" + + para "Don't waste it on" + line "water #MON!" + done + +_BlaineBadgeText:: + text "Hah!" + + para "The VOLCANOBADGE" + line "heightens the" + cont "SPECIAL abilities" + cont "of your #MON!" + + para "Here, you can" + line "have this too!" + done + +_ReceivedTM38Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM38ExplanationText:: + text "" + + para "TM38 contains" + line "FIRE BLAST!" + + para "Teach it to fire-" + line "type #MON!" + + para "CHARMELEON or" + line "PONYTA would be" + cont "good bets!" + done + +_TM38NoRoomText:: + text "Make room for my" + line "gift!" + done + +_CinnabarGymText_7595f:: + text "Do you know how" + line "hot #MON fire" + cont "breath can get?" + done + +_CinnabarGymText_75964:: + text "Yow!" + line "Hot, hot, hot!" + prompt + +_CinnabarGymText_75969:: + text "Fire, or to be" + line "more precise," + cont "combustion..." + + para "Blah, blah, blah," + line "blah..." + done + +_CinnabarGymText_75994:: + text "I was a thief, but" + line "I became straight" + cont "as a trainer!" + done + +_CinnabarGymText_75999:: + text "I" + line "surrender!" + prompt + +_CinnabarGymText_7599e:: + text "I can't help" + line "stealing other" + cont "people's #MON!" + done + +_CinnabarGymText_759c9:: + text "You can't win!" + line "I have studied" + cont "#MON totally!" + done + +_CinnabarGymText_759ce:: + text "Waah!" + line "My studies!" + prompt + +_CinnabarGymText_759d3:: + text "My theories are" + line "too complicated" + cont "for you!" + done + +_CinnabarGymText_759fe:: + text "I just like using" + line "fire #MON!" + done + +_CinnabarGymText_75a03:: + text "Too hot" + line "to handle!" + prompt + +_CinnabarGymText_75a08:: + text "I wish there was" + line "a thief #MON!" + cont "I'd use that!" + done + +_CinnabarGymText_75a33:: + text "I know why BLAINE" + line "became a trainer!" + done + +_CinnabarGymText_75a38:: + text "Ow!" + prompt + +_CinnabarGymText_75a3d:: + text "BLAINE was lost" + line "in the mountains" + cont "when a fiery bird" + cont "#MON appeared." + + para "Its light enabled" + line "BLAINE to find" + cont "his way down!" + done + +_CinnabarGymText_75a68:: + text "I've been to many" + line "GYMs, but this is" + cont "my favorite!" + done + +_CinnabarGymText_75a6d:: + text "Yowza!" + line "Too hot!" + prompt + +_CinnabarGymText_75a72:: + text "Us fire #MON" + line "fans like PONYTA" + cont "and NINETALES!" + done + +_CinnabarGymText_75a9d:: + text "Fire is weak" + line "against H2O!" + done + +_CinnabarGymText_75aa2:: + text "Oh!" + line "Snuffed out!" + prompt + +_CinnabarGymText_75aa7:: + text "Water beats fire!" + line "But, fire melts" + cont "ice #MON!" + done + +_CinnabarGymText_75ac2:: + text "Yo! Champ in" + line "making!" + + para "The hot-headed" + line "BLAINE is a fire" + cont "#MON pro!" + + para "Douse his spirits" + line "with water!" + + para "You better take" + line "some BURN HEALs!" + done + +_CinnabarGymText_75ac7:: + text "! You beat" + line "that fire brand!" + done diff --git a/text/maps/CinnabarIsland.asm b/text/maps/CinnabarIsland.asm new file mode 100644 index 00000000..352ab8ea --- /dev/null +++ b/text/maps/CinnabarIsland.asm @@ -0,0 +1,37 @@ +_CinnabarIslandText8:: + text "The door is" + line "locked..." + done + +_CinnabarIslandText1:: + text "CINNABAR GYM's" + line "BLAINE is an odd" + cont "man who has lived" + cont "here for decades." + done + +_CinnabarIslandText2:: + text "Scientists conduct" + line "experiments in" + cont "the burned out" + cont "building." + done + +_CinnabarIslandText3:: + text "CINNABAR ISLAND" + line "The Fiery Town of" + cont "Burning Desire" + done + +_CinnabarIslandText6:: + text "#MON LAB" + done + +_CinnabarIslandText7:: + text "CINNABAR ISLAND" + line "#MON GYM" + cont "LEADER: BLAINE" + + para "The Hot-Headed" + line "Quiz Master!" + done diff --git a/text/maps/CinnabarLab.asm b/text/maps/CinnabarLab.asm new file mode 100644 index 00000000..a93a484d --- /dev/null +++ b/text/maps/CinnabarLab.asm @@ -0,0 +1,29 @@ +_Lab1Text1:: + text "We study #MON" + line "extensively here." + + para "People often bring" + line "us rare #MON" + cont "for examination." + done + +_Lab1Text2:: + text "A photo of the" + line "LAB's founder," + cont "DR.FUJI!" + done + +_Lab1Text3:: + text "#MON LAB" + line "Meeting Room" + done + +_Lab1Text4:: + text "#MON LAB" + line "R-and-D Room" + done + +_Lab1Text5:: + text "#MON LAB" + line "Testing Room" + done diff --git a/text/maps/CinnabarLabFossilRoom.asm b/text/maps/CinnabarLabFossilRoom.asm new file mode 100644 index 00000000..95bde685 --- /dev/null +++ b/text/maps/CinnabarLabFossilRoom.asm @@ -0,0 +1,78 @@ +_Lab4Text_75dc6:: + text "Hiya!" + + para "I am important" + line "doctor!" + + para "I study here rare" + line "#MON fossils!" + + para "You! Have you a" + line "fossil for me?" + prompt + +_Lab4Text_75dcb:: + text "No! Is too bad!" + done + +_Lab4Text_75dd0:: + text "I take a little" + line "time!" + + para "You go for walk a" + line "little while!" + done + +_Lab4Text_75dd5:: + text "Where were you?" + + para "Your fossil is" + line "back to life!" + + para "It was @" + TX_RAM wcf4b + text "" + line "like I think!" + prompt + +_Lab4Text_610ae:: + text "Oh! That is" + line "@" + TX_RAM wcd6d + text "!" + + para "It is fossil of" + line "@" + TX_RAM wcf4b + text ", a" + cont "#MON that is" + cont "already extinct!" + + para "My Resurrection" + line "Machine will make" + cont "that #MON live" + cont "again!" + done + +_Lab4Text_610b3:: + text "So! You hurry and" + line "give me that!" + + para " handed" + line "over @" + TX_RAM wcd6d + text "!" + prompt + +_Lab4Text_610b8:: + text "I take a little" + line "time!" + + para "You go for walk a" + line "little while!" + done + +_Lab4Text_610bd:: + text "Aiyah! You come" + line "again!" + done diff --git a/text/maps/CinnabarLabMetronomeRoom.asm b/text/maps/CinnabarLabMetronomeRoom.asm new file mode 100644 index 00000000..fa04677f --- /dev/null +++ b/text/maps/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,63 @@ +_TM35PreReceiveText:: + text "Tch-tch-tch!" + line "I made a cool TM!" + + para "It can cause all" + line "kinds of fun!" + prompt + +_ReceivedTM35Text:: + text " received " + line "@" + TX_RAM wcf4b + text "!@@" + +_TM35ExplanationText:: + text "Tch-tch-tch!" + line "That's the sound" + cont "of a METRONOME!" + + para "It tweaks your" + line "#MON's brain" + cont "into using moves" + cont "it doesn't know!" + done + +_TM35NoRoomText:: + text "Your pack is" + line "crammed full!" + done + +_Lab3Text2:: + text "EEVEE can evolve" + line "into 1 of 3 kinds" + cont "of #MON." + done + +_Lab3Text3:: + text "There's an e-mail" + line "message!" + + para "..." + + para "The 3 legendary" + line "bird #MON are" + cont "ARTICUNO, ZAPDOS" + cont "and MOLTRES." + + para "Their whereabouts" + line "are unknown." + + para "We plan to explore" + line "the cavern close" + cont "to CERULEAN." + + para "From: #MON" + line "RESEARCH TEAM" + + para "..." + done + +_Lab3Text5:: + text "An amber pipe!" + done diff --git a/text/maps/CinnabarLabTradeRoom.asm b/text/maps/CinnabarLabTradeRoom.asm new file mode 100644 index 00000000..196124e7 --- /dev/null +++ b/text/maps/CinnabarLabTradeRoom.asm @@ -0,0 +1,9 @@ +_Lab2Text1:: + text "I found this very" + line "strange fossil in" + cont "MT.MOON!" + + para "I think it's a" + line "rare, prehistoric" + cont "#MON!" + done diff --git a/text/maps/CinnabarMart.asm b/text/maps/CinnabarMart.asm new file mode 100644 index 00000000..42a41d06 --- /dev/null +++ b/text/maps/CinnabarMart.asm @@ -0,0 +1,10 @@ +_CinnabarMartText2:: + text "Don't they have X" + line "ATTACK? It's good" + cont "for battles!" + done + +_CinnabarMartText3:: + text "It never hurts to" + line "have extra items!" + done diff --git a/text/maps/CinnabarPokecenter.asm b/text/maps/CinnabarPokecenter.asm new file mode 100644 index 00000000..cf481764 --- /dev/null +++ b/text/maps/CinnabarPokecenter.asm @@ -0,0 +1,21 @@ +_CinnabarPokecenterText2:: + text "You can cancel" + line "evolution." + + para "When a #MON is" + line "evolving, you can" + cont "stop it and leave" + cont "it the way it is." + done + +_CinnabarPokecenterText3:: + text "Do you have any" + line "friends?" + + para "#MON you get" + line "in trades grow" + cont "very quickly." + + para "I think it's" + line "worth a try!" + done diff --git a/text/maps/CopycatsHouse1F.asm b/text/maps/CopycatsHouse1F.asm new file mode 100644 index 00000000..3ec2b151 --- /dev/null +++ b/text/maps/CopycatsHouse1F.asm @@ -0,0 +1,20 @@ +_CopycatsHouse1FText1:: + text "My daughter is so" + line "self-centered." + cont "She only has a" + cont "few friends." + done + +_CopycatsHouse1FText2:: + text "My daughter likes" + line "to mimic people." + + para "Her mimicry has" + line "earned her the" + cont "nickname COPYCAT" + cont "around here!" + done + +_CopycatsHouse1FText3:: + text "CHANSEY: Chaan!" + line "Sii!@@" diff --git a/text/maps/CopycatsHouse2F.asm b/text/maps/CopycatsHouse2F.asm new file mode 100644 index 00000000..561b2ac5 --- /dev/null +++ b/text/maps/CopycatsHouse2F.asm @@ -0,0 +1,97 @@ +_CopycatsHouse2FText_5ccd4:: + text ": Hi! Do" + line "you like #MON?" + + para ": Uh no, I" + line "just asked you." + + para ": Huh?" + line "You're strange!" + + para "COPYCAT: Hmm?" + line "Quit mimicking?" + + para "But, that's my" + line "favorite hobby!" + prompt + +_TM31PreReceiveText:: + text "Oh wow!" + line "A # DOLL!" + + para "For me?" + line "Thank you!" + + para "You can have" + line "this, then!" + prompt + +_ReceivedTM31Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM31ExplanationText1:: + text "" + + para "TM31 contains my" + line "favorite, MIMIC!" + + para "Use it on a good" + line "#MON!@@" + +_TM31ExplanationText2:: + text ": Hi!" + line "Thanks for TM31!" + + para ": Pardon?" + + para ": Is it" + line "that fun to mimic" + cont "my every move?" + + para "COPYCAT: You bet!" + line "It's a scream!" + done + +_TM31NoRoomText:: + text "Don't you want" + line "this?@@" + +_CopycatsHouse2FText2:: + text "DODUO: Giiih!" + + para "MIRROR MIRROR ON" + line "THE WALL, WHO IS" + cont "THE FAIREST ONE" + cont "OF ALL?" + done + +_CopycatsHouse2FText3:: + text "This is a rare" + line "#MON! Huh?" + cont "It's only a doll!" + done + +_CopycatsHouse2FText6:: + text "A game with MARIO" + line "wearing a bucket" + cont "on his head!" + done + +_CopycatsHouse2FText_5cd17:: + text "..." + + para "My Secrets!" + + para "Skill: Mimicry!" + line "Hobby: Collecting" + cont "dolls!" + cont "Favorite #MON:" + cont "CLEFAIRY!" + done + +_CopycatsHouse2FText_5cd1c:: + text "Huh? Can't see!" + done diff --git a/text/maps/Daycare.asm b/text/maps/Daycare.asm new file mode 100644 index 00000000..2759c798 --- /dev/null +++ b/text/maps/Daycare.asm @@ -0,0 +1,62 @@ +_DayCareIntroText:: + text "I run a DAYCARE." + line "Would you like me" + cont "to raise one of" + cont "your #MON?" + done + +_DayCareWhichMonText:: + text "Which #MON" + line "should I raise?" + prompt + +_DayCareWillLookAfterMonText:: + text "Fine, I'll look" + line "after @" + TX_RAM wcd6d + text "" + cont "for a while." + prompt + +_DayCareComeSeeMeInAWhileText:: + text "Come see me in" + line "a while." + done + +_DayCareMonHasGrownText:: + text "Your @" + TX_RAM wcd6d + text "" + line "has grown a lot!" + + para "By level, it's" + line "grown by @" + TX_NUM wDayCareNumLevelsGrown,$1,$3 + text "!" + + para "Aren't I great?" + prompt + +_DayCareOweMoneyText:: + text "You owe me ¥@" + TX_BCD wDayCareTotalCost, $c2 + text "" + line "for the return" + cont "of this #MON." + done + +_DayCareGotMonBackText:: + text " got" + line "@" + TX_RAM wDayCareMonName + text " back!" + done + +_DayCareMonNeedsMoreTimeText:: + text "Back already?" + line "Your @" + TX_RAM wcd6d + text "" + cont "needs some more" + cont "time with me." + prompt diff --git a/text/maps/Daycare_2.asm b/text/maps/Daycare_2.asm new file mode 100644 index 00000000..20c0e5ad --- /dev/null +++ b/text/maps/Daycare_2.asm @@ -0,0 +1,33 @@ +_DayCareAllRightThenText:: + text "All right then," + line "@@" + +_DayCareComeAgainText:: + text "come again." + done + +_DayCareNoRoomForMonText:: + text "You have no room" + line "for this #MON!" + done + +_DayCareOnlyHaveOneMonText:: + text "You only have one" + line "#MON with you." + done + +_DayCareCantAcceptMonWithHMText:: + text "I can't accept a" + line "#MON that" + cont "knows an HM move." + done + +_DayCareHeresYourMonText:: + text "Thank you! Here's" + line "your #MON!" + prompt + +_DayCareNotEnoughMoneyText:: + text "Hey, you don't" + line "have enough ¥!" + done diff --git a/text/maps/DiglettsCaveRoute11.asm b/text/maps/DiglettsCaveRoute11.asm new file mode 100644 index 00000000..ecd3225e --- /dev/null +++ b/text/maps/DiglettsCaveRoute11.asm @@ -0,0 +1,8 @@ +_DiglettsCaveEntRoute11Text1:: + text "What a surprise!" + line "DIGLETTs dug this" + cont "long tunnel!" + + para "It goes right to" + line "VIRIDIAN CITY!" + done diff --git a/text/maps/DiglettsCaveRoute2.asm b/text/maps/DiglettsCaveRoute2.asm new file mode 100644 index 00000000..a04bbef7 --- /dev/null +++ b/text/maps/DiglettsCaveRoute2.asm @@ -0,0 +1,9 @@ +_DiglettsCaveRoute2Text1:: + text "I went to ROCK" + line "TUNNEL, but it's" + cont "dark and scary." + + para "If a #MON's" + line "FLASH could light" + cont "it up..." + done diff --git a/text/maps/FightingDojo.asm b/text/maps/FightingDojo.asm new file mode 100644 index 00000000..3df069c1 --- /dev/null +++ b/text/maps/FightingDojo.asm @@ -0,0 +1,130 @@ +_FightingDojoText_5ce8e:: + text "Grunt!" + + para "I am the KARATE" + line "MASTER! I am the" + cont "LEADER here!" + + para "You wish to" + line "challenge us?" + cont "Expect no mercy!" + + para "Fwaaa!" + done + +_FightingDojoText_5ce93:: + text "Hwa!" + line "Arrgh! Beaten!" + prompt + +_FightingDojoText_5ce98:: + text "Indeed, I have" + line "lost!" + + para "But, I beseech" + line "you, do not take" + cont "our emblem as" + cont "your trophy!" + + para "In return, I will" + line "give you a prized" + cont "fighting #MON!" + + para "Choose whichever" + line "one you like!" + done + +_FightingDojoText_5ce9d:: + text "Ho!" + + para "Stay and train at" + line "Karate with us!" + done + +_FightingDojoBattleText1:: + text "Hoargh! Take your" + line "shoes off!" + done + +_FightingDojoEndBattleText1:: + text "I give" + line "up!" + prompt + +_FightingDojoAfterBattleText1:: + text "You wait 'til you" + line "see our Master!" + + para "I'm a small fry" + line "compared to him!" + done + +_FightingDojoBattleText2:: + text "I hear you're" + line "good! Show me!" + done + +_FightingDojoEndBattleText2:: + text "Judge!" + line "1 point!" + prompt + +_FightingDojoAfterBattleText2:: + text "Our Master is a" + line "pro fighter!" + done + +_FightingDojoBattleText3:: + text "Nothing tough" + line "frightens me!" + + para "I break boulders" + line "for training!" + done + +_FightingDojoEndBattleText3:: + text "Yow!" + line "Stubbed fingers!" + prompt + +_FightingDojoAfterBattleText3:: + text "The only thing" + line "that frightens us" + cont "is psychic power!" + done + +_FightingDojoBattleText4:: + text "Hoohah!" + + para "You're trespassing" + line "in our FIGHTING" + cont "DOJO!" + done + +_FightingDojoEndBattleText4:: + text "Oof!" + line "I give up!" + prompt + +_FightingDojoAfterBattleText4:: + text "The prime fighters" + line "across the land" + cont "train here." + done + +_WantHitmonleeText:: + text "You want the" + line "hard kicking" + cont "HITMONLEE?" + done + +_WantHitmonchanText:: + text "You want the" + line "piston punching" + cont "HITMONCHAN?" + done + +_OtherHitmonText:: + text "Better not get" + line "greedy..." + done diff --git a/text/maps/FuchsiaBillsGrandpasHouse.asm b/text/maps/FuchsiaBillsGrandpasHouse.asm new file mode 100644 index 00000000..7b6556b1 --- /dev/null +++ b/text/maps/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,27 @@ +_FuchsiaHouse1Text1:: + text "SAFARI ZONE's" + line "WARDEN is old," + cont "but still active!" + + para "All his teeth are" + line "false, though." + done + +_FuchsiaHouse1Text2:: + text "Hmm? You've met" + line "BILL?" + + para "He's my grandson!" + + para "He always liked" + line "collecting things" + cont "even as a child!" + done + +_FuchsiaHouse1Text3:: + text "BILL files his" + line "own #MON data" + cont "on his PC!" + + para "Did he show you?" + done diff --git a/text/maps/FuchsiaCity.asm b/text/maps/FuchsiaCity.asm new file mode 100644 index 00000000..a90d0021 --- /dev/null +++ b/text/maps/FuchsiaCity.asm @@ -0,0 +1,119 @@ +_FuchsiaCityText1:: + text "Did you try the" + line "SAFARI GAME? Some" + cont "#MON can only" + cont "be caught there." + done + +_FuchsiaCityText2:: + text "SAFARI ZONE has a" + line "zoo in front of" + cont "the entrance." + + para "Out back is the" + line "SAFARI GAME for" + cont "catching #MON." + done + +_FuchsiaCityText3:: + text "ERIK: Where's" + line "SARA? I said I'd" + cont "meet her here." + done + +_FuchsiaCityText4:: + text "That item ball in" + line "there is really a" + cont "#MON." + done + +_FuchsiaCityText5:: + text "!" + done + +_FuchsiaCityText11:: + text "FUCHSIA CITY" + line "Behold! It's" + cont "Passion Pink!" + done + +_FuchsiaCityText13:: + text "SAFARI GAME" + line "#MON-U-CATCH!" + done + +_FuchsiaCityText16:: + text "SAFARI ZONE" + line "WARDEN's HOME" + done + +_FuchsiaCityText17:: + text "#MON PARADISE" + line "SAFARI ZONE" + done + +_FuchsiaCityText18:: + text "FUCHSIA CITY" + line "#MON GYM" + cont "LEADER: KOGA" + + para "The Poisonous" + line "Ninja Master" + done + +_FuchsiaCityChanseyText:: + text "Name: CHANSEY" + + para "Catching one is" + line "all up to chance." + prompt + +_FuchsiaCityVoltorbText:: + text "Name: VOLTORB" + + para "The very image of" + line "a # BALL." + prompt + +_FuchsiaCityKangaskhanText:: + text "Name: KANGASKHAN" + + para "A maternal #MON" + line "that raises its" + cont "young in a pouch" + cont "on its belly." + prompt + +_FuchsiaCitySlowpokeText:: + text "Name: SLOWPOKE" + + para "Friendly and very" + line "slow moving." + prompt + +_FuchsiaCityLaprasText:: + text "Name: LAPRAS" + + para "A.K.A. the king" + line "of the seas." + prompt + +_FuchsiaCityOmanyteText:: + text "Name: OMANYTE" + + para "A #MON that" + line "was resurrected" + cont "from a fossil." + prompt + +_FuchsiaCityKabutoText:: + text "Name: KABUTO" + + para "A #MON that" + line "was resurrected" + cont "from a fossil." + prompt + +_FuchsiaCityText_19b2a:: + text "..." + done diff --git a/text/maps/FuchsiaGoodRodHouse.asm b/text/maps/FuchsiaGoodRodHouse.asm new file mode 100644 index 00000000..b1b8b2f2 --- /dev/null +++ b/text/maps/FuchsiaGoodRodHouse.asm @@ -0,0 +1,43 @@ +_FuchsiaHouse3Text_561bd:: + text "I'm the FISHING" + line "GURU's older" + cont "brother!" + + para "I simply Looove" + line "fishing!" + + para "Do you like to" + line "fish?" + done + +_FuchsiaHouse3Text_561c2:: + text "Grand! I like" + line "your style!" + + para "Take this and" + line "fish, young one!" + + para " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_FuchsiaHouse3Text_56212:: + text "Oh... That's so" + line "disappointing..." + done + +_FuchsiaHouse3Text_56217:: + text "Hello there," + line "!" + + para "How are the fish" + line "biting?" + done + +_FuchsiaHouse3Text_5621c:: + text "Oh no!" + + para "You have no room" + line "for my gift!" + done diff --git a/text/maps/FuchsiaGym.asm b/text/maps/FuchsiaGym.asm new file mode 100644 index 00000000..9108fc79 --- /dev/null +++ b/text/maps/FuchsiaGym.asm @@ -0,0 +1,26 @@ +_KogaBeforeBattleText:: + text "KOGA: Fwahahaha!" + + para "A mere child like" + line "you dares to" + cont "challenge me?" + + para "Very well, I" + line "shall show you" + cont "true terror as a" + cont "ninja master!" + + para "You shall feel" + line "the despair of" + cont "poison and sleep" + cont "techniques!" + done + +_KogaAfterBattleText:: + text "Humph!" + line "You have proven" + cont "your worth!" + + para "Here! Take the" + line "SOULBADGE!" + prompt diff --git a/text/maps/FuchsiaGym_2.asm b/text/maps/FuchsiaGym_2.asm new file mode 100644 index 00000000..f7b39d9c --- /dev/null +++ b/text/maps/FuchsiaGym_2.asm @@ -0,0 +1,193 @@ +_KogaExplainToxicText:: + text "When afflicted by" + line "TOXIC, #MON" + cont "suffer more and" + cont "more as battle" + cont "progresses!" + + para "It will surely" + line "terrorize foes!" + done + +_FuchsiaGymText9:: + text "Now that you have" + line "the SOULBADGE," + cont "the DEFENSE of" + cont "your #MON" + cont "increases!" + + para "It also lets you" + line "SURF outside of" + cont "battle!" + + para "Ah! Take this" + line "too!" + done + +_ReceivedTM06Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM06ExplanationText:: + text "" + para "TM06 contains" + line "TOXIC!" + + para "It is a secret" + line "technique over" + cont "400 years old!" + done + +_TM06NoRoomText:: + text "Make space for" + line "this, child!" + done + +_FuchsiaGymBattleText1:: + text "Strength isn't" + line "the key for" + cont "#MON!" + + para "It's strategy!" + + para "I'll show you how" + line "strategy can beat" + cont "brute strength!" + done + +_FuchsiaGymEndBattleText1:: + text "What?" + line "Extraordinary!" + prompt + +_FuchsiaGymAfterBattleText1:: + text "So, you mix brawn" + line "with brains?" + cont "Good strategy!" + done + +_FuchsiaGymBattleText2:: + text "I wanted to become" + line "a ninja, so I" + cont "joined this GYM!" + done + +_FuchsiaGymEndBattleText2:: + text "I'm done" + line "for!" + prompt + +_FuchsiaGymAfterBattleText2:: + text "I will keep on" + line "training under" + cont "KOGA, my ninja" + cont "master!" + done + +_FuchsiaGymBattleText3:: + text "Let's see you" + line "beat my special" + cont "techniques!" + done + +_FuchsiaGymEndBattleText3:: + text "You" + line "had me fooled!" + prompt + +_FuchsiaGymAfterBattleText3:: + text "I like poison and" + line "sleep techniques," + cont "as they linger" + cont "after battle!" + done + +_FuchsiaGymBattleText4:: + text "Stop right there!" + + para "Our invisible" + line "walls have you" + cont "frustrated?" + done + +_FuchsiaGymEndBattleText4:: + text "Whoa!" + line "He's got it!" + prompt + +_FuchsiaGymAfterBattleText4:: + text "You impressed me!" + line "Here's a hint!" + + para "Look very closely" + line "for gaps in the" + cont "invisible walls!" + done + +_FuchsiaGymBattleText5:: + text "I also study the" + line "way of the ninja" + cont "with master KOGA!" + + para "Ninja have a long" + line "history of using" + cont "animals!" + done + +_FuchsiaGymEndBattleText5:: + text "Awoo!" + prompt + +_FuchsiaGymAfterBattleText5:: + text "I still have much" + line "to learn!" + done + +_FuchsiaGymBattleText6:: + text "Master KOGA comes" + line "from a long line" + cont "of ninjas!" + + para "What did you" + line "descend from?" + done + +_FuchsiaGymEndBattleText6:: + text "Dropped" + line "my balls!" + prompt + +_FuchsiaGymAfterBattleText6:: + text "Where there is" + line "light, there is" + cont "shadow!" + + para "Light and shadow!" + line "Which do you" + cont "choose?" + done + +_FuchsiaGymText_7564e:: + text "Yo! Champ in" + line "making!" + + para "FUCHSIA GYM is" + line "riddled with" + cont "invisible walls!" + + para "KOGA might appear" + line "close, but he's" + cont "blocked off!" + + para "You have to find" + line "gaps in the walls" + cont "to reach him!" + done + +_FuchsiaGymText_75653:: + text "It's amazing how" + line "ninja can terrify" + cont "even now!" + done diff --git a/text/maps/FuchsiaMart.asm b/text/maps/FuchsiaMart.asm new file mode 100644 index 00000000..574898ce --- /dev/null +++ b/text/maps/FuchsiaMart.asm @@ -0,0 +1,14 @@ +_FuchsiaMartText2:: + text "Do you have a" + line "SAFARI ZONE flag?" + + para "What about cards" + line "or calendars?" + done + +_FuchsiaMartText3:: + text "Did you try X" + line "SPEED? It speeds" + cont "up a #MON in" + cont "battle!" + done diff --git a/text/maps/FuchsiaMeetingRoom.asm b/text/maps/FuchsiaMeetingRoom.asm new file mode 100644 index 00000000..10675ead --- /dev/null +++ b/text/maps/FuchsiaMeetingRoom.asm @@ -0,0 +1,26 @@ +_FuchsiaMeetingRoomText1:: + text "We nicknamed the" + line "WARDEN SLOWPOKE." + + para "He and SLOWPOKE" + line "both look vacant!" + done + +_FuchsiaMeetingRoomText2:: + text "SLOWPOKE is very" + line "knowledgeable" + cont "about #MON!" + + para "He even has some" + line "fossils of rare," + cont "extinct #MON!" + done + +_FuchsiaMeetingRoomText3:: + text "SLOWPOKE came in," + line "but I couldn't" + cont "understand him." + + para "I think he's got" + line "a speech problem!" + done diff --git a/text/maps/FuchsiaPokecenter.asm b/text/maps/FuchsiaPokecenter.asm new file mode 100644 index 00000000..a0def7eb --- /dev/null +++ b/text/maps/FuchsiaPokecenter.asm @@ -0,0 +1,20 @@ +_FuchsiaPokecenterText1:: + text "You can't win" + line "with just one" + cont "strong #MON." + + para "It's tough, but" + line "you have to raise" + cont "them evenly." + done + +_FuchsiaPokecenterText3:: + text "There's a narrow" + line "trail west of" + cont "VIRIDIAN CITY." + + para "It goes to #MON" + line "LEAGUE HQ." + cont "The HQ governs" + cont "all trainers." + done diff --git a/text/maps/GameCorner.asm b/text/maps/GameCorner.asm new file mode 100644 index 00000000..1e59f83e --- /dev/null +++ b/text/maps/GameCorner.asm @@ -0,0 +1,186 @@ +_CeladonGameCornerText1:: + text "Welcome!" + + para "You can exchange" + line "your coins for" + cont "fabulous prizes" + cont "next door." + done + +_CeladonGameCornerText_48d22:: + text "Welcome to ROCKET" + line "GAME CORNER!" + + para "Do you need some" + line "game coins?" + + para "It's ¥1000 for 50" + line "coins. Would you" + cont "like some?" + done + +_CeladonGameCornerText_48d27:: + text "Thanks! Here are" + line "your 50 coins!" + done + +_CeladonGameCornerText_48d2c:: + text "No? Please come" + line "play sometime!" + done + +_CeladonGameCornerText_48d31:: + text "You can't afford" + line "the coins!" + done + +_CeladonGameCornerText_48d36:: + text "Oops! Your COIN" + line "CASE is full." + done + +_CeladonGameCornerText_48d3b:: + text "You don't have a" + line "COIN CASE!" + done + +_CeladonGameCornerText3:: + text "Keep this quiet." + + para "It's rumored that" + line "this place is run" + cont "by TEAM ROCKET." + done + +_CeladonGameCornerText4:: + text "I think these" + line "machines have" + cont "different odds." + done + +_CeladonGameCornerText_48d9c:: + text "Kid, do you want" + line "to play?" + prompt + +_Received10CoinsText:: + text " received" + line "10 coins!@@" + +_CeladonGameCornerText_48da7:: + text "You don't need my" + line "coins!" + done + +_CeladonGameCornerText_48dac:: + text "Wins seem to come" + line "and go." + done + +_CeladonGameCornerText6:: + text "I'm having a" + line "wonderful time!" + done + +_CeladonGameCornerText_48dca:: + text "Hey!" + + para "You have better" + line "things to do," + cont "champ in making!" + + para "CELADON GYM's" + line "LEADER is ERIKA!" + cont "She uses grass-" + cont "type #MON!" + + para "She might appear" + line "docile, but don't" + cont "be fooled!" + done + +_CeladonGameCornerText_48dcf:: + text "They offer rare" + line "#MON that can" + cont "be exchanged for" + cont "your coins." + + para "But, I just can't" + line "seem to win!" + done + +_CeladonGameCornerText8:: + text "Games are scary!" + line "It's so easy to" + cont "get hooked!" + done + +_CeladonGameCornerText_48e26:: + text "What's up? Want" + line "some coins?" + prompt + +_Received20CoinsText:: + text " received" + line "20 coins!@@" + +_CeladonGameCornerText_48e31:: + text "You have lots of" + line "coins!" + done + +_CeladonGameCornerText_48e36:: + text "Darn! I need more" + line "coins for the" + cont "#MON I want!" + done + +_CeladonGameCornerText_48e88:: + text "Hey, what? You're" + line "throwing me off!" + cont "Here are some" + cont "coins, shoo!" + prompt + +_CeladonGameCornerText_48e8d:: + text " received" + line "20 coins!@@" + +_CeladonGameCornerText_48e93:: + text "You've got your" + line "own coins!" + done + +_CeladonGameCornerText_48e98:: + text "The trick is to" + line "watch the reels" + cont "closely!" + done + +_CeladonGameCornerText_48ece:: + text "I'm guarding this" + line "poster!" + cont "Go away, or else!" + done + +_CeladonGameCornerText_48ed3:: + text "Dang!" + prompt + +_CeladonGameCornerText_48ed8:: + text "Our hideout might" + line "be discovered! I" + cont "better tell BOSS!" + done + +_CeladonGameCornerText_48f09:: + text "Hey!" + + para "A switch behind" + line "the poster!?" + cont "Let's push it!@@" + +_CeladonGameCornerText_48f19:: + text "Oops! Forgot the" + line "COIN CASE!" + done diff --git a/text/maps/GameCornerPrizeRoom.asm b/text/maps/GameCornerPrizeRoom.asm new file mode 100644 index 00000000..6b2bb537 --- /dev/null +++ b/text/maps/GameCornerPrizeRoom.asm @@ -0,0 +1,12 @@ +_CeladonPrizeRoomText1:: + text "I sure do fancy" + line "that PORYGON!" + + para "But, it's hard to" + line "win at slots!" + done + +_CeladonPrizeRoomText2:: + text "I had a major" + line "haul today!" + done diff --git a/text/maps/HallOfFame.asm b/text/maps/HallOfFame.asm new file mode 100644 index 00000000..c799268b --- /dev/null +++ b/text/maps/HallOfFame.asm @@ -0,0 +1,28 @@ +_HallofFameRoomText1:: + text "OAK: Er-hem!" + line "Congratulations" + cont "!" + + para "This floor is the" + line "#MON HALL OF" + cont "FAME!" + + para "#MON LEAGUE" + line "champions are" + cont "honored for their" + cont "exploits here!" + + para "Their #MON are" + line "also recorded in" + cont "the HALL OF FAME!" + + para "! You have" + line "endeavored hard" + cont "to become the new" + cont "LEAGUE champion!" + + para "Congratulations," + line ", you and" + cont "your #MON are" + cont "HALL OF FAMERs!" + done diff --git a/text/maps/IndigoPlateauLobby.asm b/text/maps/IndigoPlateauLobby.asm new file mode 100644 index 00000000..8487e29a --- /dev/null +++ b/text/maps/IndigoPlateauLobby.asm @@ -0,0 +1,25 @@ +_IndigoPlateauLobbyText2:: + text "Yo! Champ in" + line "making!" + + para "At #MON LEAGUE," + line "you have to face" + cont "the ELITE FOUR in" + cont "succession." + + para "If you lose, you" + line "have to start all" + cont "over again! This" + cont "is it! Go for it!" + done + +_IndigoPlateauLobbyText3:: + text "From here on, you" + line "face the ELITE" + cont "FOUR one by one!" + + para "If you win, a" + line "door opens to the" + cont "next trainer!" + cont "Good luck!" + done diff --git a/text/maps/LancesRoom.asm b/text/maps/LancesRoom.asm new file mode 100644 index 00000000..ed3dcada --- /dev/null +++ b/text/maps/LancesRoom.asm @@ -0,0 +1,63 @@ +_LanceBeforeBattleText:: + text "Ah! I heard about" + line "you !" + + para "I lead the ELITE" + line "FOUR! You can" + cont "call me LANCE the" + cont "dragon trainer!" + + para "You know that" + line "dragons are" + cont "mythical #MON!" + + para "They're hard to" + line "catch and raise," + cont "but their powers" + cont "are superior!" + + para "They're virtually" + line "indestructible!" + + para "Well, are you" + line "ready to lose?" + + para "Your LEAGUE" + line "challenge ends" + cont "with me, !" + done + +_LanceEndBattleText:: + text "That's it!" + + para "I hate to admit" + line "it, but you are a" + cont "#MON master!" + prompt + +_LanceAfterBattleText:: + text "I still can't" + line "believe my" + cont "dragons lost to" + cont "you, !" + + para "You are now the" + line "#MON LEAGUE" + cont "champion!" + + para "...Or, you would" + line "have been, but" + cont "you have one more" + cont "challenge ahead." + + para "You have to face" + line "another trainer!" + cont "His name is..." + + para "!" + line "He beat the ELITE" + cont "FOUR before you!" + + para "He is the real" + line "#MON LEAGUE" + cont "champion!@@" diff --git a/text/maps/LavenderCuboneHouse.asm b/text/maps/LavenderCuboneHouse.asm new file mode 100644 index 00000000..66cc85a5 --- /dev/null +++ b/text/maps/LavenderCuboneHouse.asm @@ -0,0 +1,24 @@ +_LavenderHouse2Text1:: + text "CUBONE: Kyarugoo!@@" + +_LavenderHouse2Text_1d9dc:: + text "I hate those" + line "horrible ROCKETs!" + + para "That poor CUBONE's" + line "mother..." + + para "It was killed" + line "trying to escape" + cont "from TEAM ROCKET!" + done + +_LavenderHouse2Text_1d9e1:: + text "The GHOST of" + line "#MON TOWER is" + cont "gone!" + + para "Someone must have" + line "soothed its" + cont "restless soul!" + done diff --git a/text/maps/LavenderMart.asm b/text/maps/LavenderMart.asm new file mode 100644 index 00000000..222712c6 --- /dev/null +++ b/text/maps/LavenderMart.asm @@ -0,0 +1,30 @@ +_LavenderMartText2:: + text "I'm searching for" + line "items that raise" + cont "the abilities of" + cont "#MON during a" + cont "single battle." + + para "X ATTACK, X" + line "DEFEND, X SPEED" + cont "and X SPECIAL are" + cont "what I'm after." + + para "Do you know where" + line "I can get them?" + done + +_LavenderMartReviveText:: + text "You know REVIVE?" + line "It revives any" + cont "fainted #MON!" + done + +_LavenderMartNuggetText:: + text "I found a NUGGET" + line "in the mountains." + + para "I thought it was" + line "useless, but it" + cont "sold for ¥5000!" + done diff --git a/text/maps/LavenderPokecenter.asm b/text/maps/LavenderPokecenter.asm new file mode 100644 index 00000000..3aa7b67d --- /dev/null +++ b/text/maps/LavenderPokecenter.asm @@ -0,0 +1,12 @@ +_LavenderPokecenterText2:: + text "TEAM ROCKET will" + line "do anything for" + cont "the sake of gold!" + done + +_LavenderPokecenterText3:: + text "I saw CUBONE's" + line "mother die trying" + cont "to escape from" + cont "TEAM ROCKET!" + done diff --git a/text/maps/LavenderTown.asm b/text/maps/LavenderTown.asm new file mode 100644 index 00000000..19b6c8c8 --- /dev/null +++ b/text/maps/LavenderTown.asm @@ -0,0 +1,64 @@ +_LavenderTownText_4413c:: + text "Do you believe in" + line "GHOSTs?" + done + +_LavenderTownText_44141:: + text "Really? So there" + line "are believers..." + done + +_LavenderTownText_44146:: + text "Hahaha, I guess" + line "not." + + para "That white hand" + line "on your shoulder," + cont "it's not real." + done + +_LavenderTownText2:: + text "This town is known" + line "as the grave site" + cont "of #MON." + + para "Memorial services" + line "are held in" + cont "#MON TOWER." + done + +_LavenderTownText3:: + text "GHOSTs appeared" + line "in #MON TOWER." + + para "I think they're" + line "the spirits of" + cont "#MON that the" + cont "ROCKETs killed." + done + +_LavenderTownText4:: + text "LAVENDER TOWN" + line "The Noble Purple" + cont "Town" + done + +_LavenderTownText5:: + text "New SILPH SCOPE!" + + para "Make the Invisible" + line "Plain to See!" + + para "SILPH CO." + done + +_LavenderTownText8:: + text "LAVENDER VOLUNTEER" + line "#MON HOUSE" + done + +_LavenderTownText9:: + text "May the Souls of" + line "#MON Rest Easy" + cont "#MON TOWER" + done diff --git a/text/maps/LoreleisRoom.asm b/text/maps/LoreleisRoom.asm new file mode 100644 index 00000000..fdbb55b4 --- /dev/null +++ b/text/maps/LoreleisRoom.asm @@ -0,0 +1,42 @@ +_LoreleiBeforeBattleText:: + text "Welcome to" + line "#MON LEAGUE!" + + para "I am LORELEI of" + line "the ELITE FOUR!" + + para "No one can best" + line "me when it comes" + cont "to icy #MON!" + + para "Freezing moves" + line "are powerful!" + + para "Your #MON will" + line "be at my mercy" + cont "when they are" + cont "frozen solid!" + + para "Hahaha!" + line "Are you ready?" + done + +_LoreleiEndBattleText:: + text "How" + line "dare you!" + prompt + +_LoreleiAfterBattleText:: + text "You're better" + line "than I thought!" + cont "Go on ahead!" + + para "You only got a" + line "taste of #MON" + cont "LEAGUE power!" + done + +_LoreleiDontRunAwayText:: + text "Someone's voice:" + line "Don't run away!" + done diff --git a/text/maps/MrFujisHouse.asm b/text/maps/MrFujisHouse.asm new file mode 100644 index 00000000..f903eb6a --- /dev/null +++ b/text/maps/MrFujisHouse.asm @@ -0,0 +1,86 @@ +_LavenderHouse1Text_1d8d1:: + text "That's odd, MR.FUJI" + line "isn't here." + cont "Where'd he go?" + done + +_LavenderHouse1Text_1d8d6:: + text "MR.FUJI had been" + line "praying alone for" + cont "CUBONE's mother." + done + +_LavenderHouse1Text_1d8f4:: + text "This is really" + line "MR.FUJI's house." + + para "He's really kind!" + + para "He looks after" + line "abandoned and" + cont "orphaned #MON!" + done + +_LavenderHouse1Text_1d8f9:: + text "It's so warm!" + line "#MON are so" + cont "nice to hug!" + done + +_LavenderHouse1Text3:: + text "PSYDUCK: Gwappa!@@" + +_LavenderHouse1Text4:: + text "NIDORINO: Gaoo!@@" + +_LavenderHouse1Text_1d94c:: + text "MR.FUJI: ." + + para "Your #DEX quest" + line "may fail without" + cont "love for your" + cont "#MON." + + para "I think this may" + line "help your quest." + prompt + +_ReceivedFluteText:: + text " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_FluteExplanationText:: + text "" + + para "Upon hearing #" + line "FLUTE, sleeping" + cont "#MON will" + cont "spring awake." + + para "It works on all" + line "sleeping #MON." + done + +_FluteNoRoomText:: + text "You must make" + line "room for this!" + done + +_MrFujiAfterFluteText:: + text "MR.FUJI: Has my" + line "FLUTE helped you?" + done + +_LavenderHouse1Text6:: + text "#MON Monthly" + line "Grand Prize" + cont "Drawing!" + + para "The application" + line "form is..." + + para "Gone! It's been" + line "clipped out!" + done diff --git a/text/maps/MrPsychicsHouse.asm b/text/maps/MrPsychicsHouse.asm new file mode 100644 index 00000000..7be2e11e --- /dev/null +++ b/text/maps/MrPsychicsHouse.asm @@ -0,0 +1,25 @@ +_TM29PreReceiveText:: + text "...Wait! Don't" + line "say a word!" + + para "You wanted this!" + prompt + +_ReceivedTM29Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM29ExplanationText:: + text "TM29 is PSYCHIC!" + + para "It can lower the" + line "target's SPECIAL" + cont "abilities." + done + +_TM29NoRoomText:: + text "Where do you plan" + line "to put this?" + done diff --git a/text/maps/MtMoon1F.asm b/text/maps/MtMoon1F.asm new file mode 100644 index 00000000..761a5240 --- /dev/null +++ b/text/maps/MtMoon1F.asm @@ -0,0 +1,119 @@ +_MtMoon1BattleText2:: + text "WHOA! You shocked" + line "me! Oh, you're" + cont "just a kid!" + done + +_MtMoon1EndBattleText2:: + text "Wow!" + line "Shocked again!" + prompt + +_MtMoon1AfterBattleText2:: + text "Kids like you" + line "shouldn't be" + cont "here!" + done + +_MtMoon1BattleText3:: + text "Did you come to" + line "explore too?" + done + +_MtMoon1EndBattleText3:: + text "Losing" + line "stinks!" + prompt + +_MtMoon1AfterBattleText3:: + text "I came down here" + line "to show off to" + cont "girls." + done + +_MtMoon1BattleText4:: + text "Wow! It's way" + line "bigger in here" + cont "than I thought!" + done + +_MtMoon1EndBattleText4:: + text "Oh!" + line "I lost it!" + prompt + +_MtMoon1AfterBattleText4:: + text "How do you get" + line "out of here?" + done + +_MtMoon1BattleText5:: + text "What! Don't sneak" + line "up on me!" + done + +_MtMoon1EndBattleText5:: + text "My" + line "#MON won't do!" + prompt + +_MtMoon1AfterBattleText5:: + text "I have to find" + line "stronger #MON." + done + +_MtMoon1BattleText6:: + text "What? I'm waiting" + line "for my friends to" + cont "find me here." + done + +_MtMoon1EndBattleText6:: + text "I lost?" + prompt + +_MtMoon1AfterBattleText6:: + text "I heard there are" + line "some very rare" + cont "fossils here." + done + +_MtMoon1BattleText7:: + text "Suspicious men" + line "are in the cave." + cont "What about you?" + done + +_MtMoon1EndBattleText7:: + text "You" + line "got me!" + prompt + +_MtMoon1AfterBattleText7:: + text "I saw them! I'm" + line "sure they're from" + cont "TEAM ROCKET!" + done + +_MtMoon1BattleText8:: + text "Go through this" + line "cave to get to" + cont "CERULEAN CITY!" + done + +_MtMoon1EndBattleText8:: + text "I" + line "lost." + prompt + +_MtMoon1AfterBattleText8:: + text "ZUBAT is tough!" + line "But, it can be" + cont "useful if you" + cont "catch one." + done + +_MtMoon1Text14:: + text "Beware! ZUBAT is" + line "a blood sucker!" + done diff --git a/text/maps/MtMoonB1F.asm b/text/maps/MtMoonB1F.asm new file mode 100644 index 00000000..755fa583 --- /dev/null +++ b/text/maps/MtMoonB1F.asm @@ -0,0 +1,3 @@ +_MtMoonText1:: + text "" + done diff --git a/text/maps/MtMoonB2F.asm b/text/maps/MtMoonB2F.asm new file mode 100644 index 00000000..472649b9 --- /dev/null +++ b/text/maps/MtMoonB2F.asm @@ -0,0 +1,122 @@ +_MtMoon3Text_49f24:: + text "You want the" + line "DOME FOSSIL?" + done + +_MtMoon3Text_49f64:: + text "You want the" + line "HELIX FOSSIL?" + done + +_MtMoon3Text_49f6f:: + text " got the" + line "@" + TX_RAM wcf4b + text "!@@" + +_MtMoon3Text_49f7f:: + text "Look, you've got" + line "no room for this.@@" + +_MtMoon3Text_49f85:: + text "Hey, stop!" + + para "I found these" + line "fossils! They're" + cont "both mine!" + done + +_MtMoon3Text_49f8a:: + text "OK!" + line "I'll share!" + prompt + +_MtMoon3Text_49f8f:: + text "We'll each take" + line "one!" + cont "No being greedy!" + done + +_MtMoon3Text_49f94:: + text "Far away, on" + line "CINNABAR ISLAND," + cont "there's a #MON" + cont "LAB." + + para "They do research" + line "on regenerating" + cont "fossils." + done + +_MtMoon3Text_49f99:: + text "All right. Then" + line "this is mine!@@" + +_MtMoon3BattleText2:: + text "TEAM ROCKET will" + line "find the fossils," + cont "revive and sell" + cont "them for cash!" + done + +_MtMoon3EndBattleText2:: + text "Urgh!" + line "Now I'm mad!" + prompt + +_MtMoon3AfterBattleText2:: + text "You made me mad!" + line "TEAM ROCKET will" + cont "blacklist you!" + done + +_MtMoon3BattleText3:: + text "We, TEAM ROCKET," + line "are #MON" + cont "gangsters!" + done + +_MtMoon3EndBattleText3:: + text "I blew" + line "it!" + prompt + +_MtMoon3AfterBattleText3:: + text "Darn it all! My" + line "associates won't" + cont "stand for this!" + done + +_MtMoon3BattleText4:: + text "We're pulling a" + line "big job here!" + cont "Get lost, kid!" + done + +_MtMoon3EndBattleText4:: + text "So, you" + line "are good." + prompt + +_MtMoon3AfterBattleText4:: + text "If you find a" + line "fossil, give it" + cont "to me and scram!" + done + +_MtMoon3BattleText5:: + text "Little kids" + line "should leave" + cont "grown-ups alone!" + done + +_MtMoon3EndBattleText5:: + text "I'm" + line "steamed!" + prompt + +_MtMoon3AfterBattleText5:: + text "#MON lived" + line "here long before" + cont "people came." + done diff --git a/text/maps/MtMoonPokecenter.asm b/text/maps/MtMoonPokecenter.asm new file mode 100644 index 00000000..7bc99dae --- /dev/null +++ b/text/maps/MtMoonPokecenter.asm @@ -0,0 +1,48 @@ +_MtMoonPokecenterText1:: + text "I've 6 # BALLs" + line "set in my belt." + + para "At most, you can" + line "carry 6 #MON." + done + +_MtMoonPokecenterText3:: + text "TEAM ROCKET" + line "attacks CERULEAN" + cont "citizens..." + + para "TEAM ROCKET is" + line "always in the" + cont "news!" + done + +_MagikarpSalesmanText1:: + text "MAN: Hello, there!" + line "Have I got a deal" + cont "just for you!" + + para "I'll let you have" + line "a swell MAGIKARP" + cont "for just ¥500!" + cont "What do you say?" + done + +_MagikarpSalesmanNoText:: + text "No? I'm only" + line "doing this as a" + cont "favor to you!" + done + +_MagikarpSalesmanNoMoneyText:: + text "You'll need more" + line "money than that!" + done + +_MagikarpSalesmanText2:: + text "MAN: Well, I don't" + line "give refunds!" + done + +_MtMoonPokecenterText5:: + text "" + done diff --git a/text/maps/Museum1F.asm b/text/maps/Museum1F.asm new file mode 100644 index 00000000..16431bda --- /dev/null +++ b/text/maps/Museum1F.asm @@ -0,0 +1,107 @@ +_Museum1FText_5c21a:: + text "Come again!" + done + +_Museum1FText_5c21f:: + text "It's ¥50 for a" + line "child's ticket." + + para "Would you like to" + line "come in?" + done + +_Museum1FText_5c224:: + text "Right, ¥50!" + line "Thank you!" + done + +_Museum1FText_5c229:: + text "You don't have" + line "enough money." + prompt + +_Museum1FText_5c22e:: + text "You can't sneak" + line "in the back way!" + + para "Oh, whatever!" + line "Do you know what" + cont "AMBER is?" + done + +_Museum1FText_5c233:: + text "There's a lab" + line "somewhere trying" + cont "to resurrect" + cont "ancient #MON" + cont "from AMBER." + done + +_Museum1FText_5c238:: + text "AMBER is fossil-" + line "ized tree sap." + done + +_Museum1FText_5c23d:: + text "Please go to the" + line "other side!" + done + +_Museum1FText_5c242:: + text "Take plenty of" + line "time to look!" + done + +_Museum1FText_5c251:: + text "That is one" + line "magnificent" + cont "fossil!" + done + +_Museum1FText_5c28e:: + text "Ssh! I think that" + line "this chunk of" + cont "AMBER contains" + cont "#MON DNA!" + + para "It would be great" + line "if #MON could" + cont "be resurrected" + cont "from it!" + + para "But, my colleagues" + line "just ignore me!" + + para "So I have a favor" + line "to ask!" + + para "Take this to a" + line "#MON LAB and" + cont "get it examined!" + prompt + +_ReceivedOldAmberText:: + text " received" + line "OLD AMBER!@@" + +_Museum1FText_5c299:: + text "Ssh! Get the OLD" + line "AMBER checked!" + done + +_Museum1FText_5c29e:: + text "You don't have" + line "space for this!" + done + +_Museum1FText_5c2ad:: + text "We are proud of 2" + line "fossils of very" + cont "rare, prehistoric" + cont "#MON!" + done + +_Museum1FText_5c2bc:: + text "The AMBER is" + line "clear and gold!" + done diff --git a/text/maps/Museum2F.asm b/text/maps/Museum2F.asm new file mode 100644 index 00000000..4f34a249 --- /dev/null +++ b/text/maps/Museum2F.asm @@ -0,0 +1,45 @@ +_Museum2FText1:: + text "MOON STONE?" + + para "What's so special" + line "about it?" + done + +_Museum2FText2:: + text "July 20, 1969!" + + para "The 1st lunar" + line "landing!" + + para "I bought a color" + line "TV to watch it!" + done + +_Museum2FText3:: + text "We have a space" + line "exhibit now." + done + +_Museum2FText4:: + text "I want a PIKACHU!" + line "It's so cute!" + + para "I asked my Daddy" + line "to catch me one!" + done + +_Museum2FText5:: + text "Yeah, a PIKACHU" + line "soon, I promise!" + done + +_Museum2FText6:: + text "SPACE SHUTTLE" + line "COLUMBIA" + done + +_Museum2FText7:: + text "Meteorite that" + line "fell on MT.MOON." + cont "(MOON STONE?)" + done diff --git a/text/maps/NameRatersHouse.asm b/text/maps/NameRatersHouse.asm new file mode 100644 index 00000000..65d3e8a4 --- /dev/null +++ b/text/maps/NameRatersHouse.asm @@ -0,0 +1,60 @@ +_NameRaterText_1dab3:: + text "Hello, hello!" + line "I am the official" + cont "NAME RATER!" + + para "Want me to rate" + line "the nicknames of" + cont "your #MON?" + done + +_NameRaterText_1dab8:: + text "Which #MON" + line "should I look at?" + prompt + +_NameRaterText_1dabd:: + TX_RAM wcd6d + text ", is it?" + line "That is a decent" + cont "nickname!" + + para "But, would you" + line "like me to give" + cont "it a nicer name?" + + para "How about it?" + done + +_NameRaterText_1dac2:: + text "Fine! What should" + line "we name it?" + prompt + +_NameRaterText_1dac7:: + text "OK! This #MON" + line "has been renamed" + cont "@" + TX_RAM wBuffer + text "!" + + para "That's a better" + line "name than before!" + done + +_NameRaterText_1dacc:: + text "Fine! Come any" + line "time you like!" + done + +_NameRaterText_1dad1:: + TX_RAM wcd6d + text ", is it?" + line "That is a truly" + cont "impeccable name!" + + para "Take good care of" + line "@" + TX_RAM wcd6d + text "!" + done diff --git a/text/maps/OaksLab.asm b/text/maps/OaksLab.asm new file mode 100644 index 00000000..7a6f57b7 --- /dev/null +++ b/text/maps/OaksLab.asm @@ -0,0 +1,477 @@ +_OaksLabGaryText1:: + text ": Yo" + line "! Gramps" + cont "isn't around!" + done + +_OaksLabText40:: + text ": Heh, I" + line "don't need to be" + cont "greedy like you!" + + para "Go ahead and" + line "choose, !" + done + +_OaksLabText41:: + text ": My" + line "#MON looks a" + cont "lot stronger." + done + +_OaksLabText39:: + text "Those are #" + line "BALLs. They" + cont "contain #MON!" + done + +_OaksLabCharmanderText:: + text "So! You want the" + line "fire #MON," + cont "CHARMANDER?" + done + +_OaksLabSquirtleText:: + text "So! You want the" + line "water #MON," + cont "SQUIRTLE?" + done + +_OaksLabBulbasaurText:: + text "So! You want the" + line "plant #MON," + cont "BULBASAUR?" + done + +_OaksLabMonEnergeticText:: + text "This #MON is" + line "really energetic!" + prompt + +_OaksLabReceivedMonText:: + text " received" + line "a @" + TX_RAM wcd6d + text "!@@" + +_OaksLabLastMonText:: + text "That's PROF.OAK's" + line "last #MON!" + done + +_OaksLabText_1d2f0:: + text "OAK: Now, ," + line "which #MON do" + cont "you want?" + done + +_OaksLabText_1d2f5:: + text "OAK: If a wild" + line "#MON appears," + cont "your #MON can" + cont "fight against it!" + done + +_OaksLabText_1d2fa:: + text "OAK: ," + line "raise your young" + cont "#MON by making" + cont "it fight!" + done + +_OaksLabDeliverParcelText1:: + text "OAK: Oh, !" + + para "How is my old" + line "#MON?" + + para "Well, it seems to" + line "like you a lot." + + para "You must be" + line "talented as a" + cont "#MON trainer!" + + para "What? You have" + line "something for me?" + + para " delivered" + line "OAK's PARCEL.@@" + +_OaksLabDeliverParcelText2:: + text "" + para "Ah! This is the" + line "custom # BALL" + cont "I ordered!" + cont "Thank you!" + done + +_OaksLabAroundWorldText:: + text "#MON around the" + line "world wait for" + cont "you, !" + done + +_OaksLabGivePokeballsText1:: + text "OAK: You can't get" + line "detailed data on" + cont "#MON by just" + cont "seeing them." + + para "You must catch" + line "them! Use these" + cont "to capture wild" + cont "#MON." + + para " got 5" + line "# BALLs!@@" + +_OaksLabGivePokeballsText2:: + text "" + para "When a wild" + line "#MON appears," + cont "it's fair game." + + para "Just throw a #" + line "BALL at it and try" + line "to catch it!" + + para "This won't always" + line "work, though." + + para "A healthy #MON" + line "could escape. You" + cont "have to be lucky!" + done + +_OaksLabPleaseVisitText:: + text "OAK: Come see me" + line "sometimes." + + para "I want to know how" + line "your #DEX is" + cont "coming along." + done + +_OaksLabText_1d31d:: + text "OAK: Good to see " + line "you! How is your " + cont "#DEX coming? " + cont "Here, let me take" + cont "a look!" + prompt + +_OaksLabText_1d32c:: + text "It's encyclopedia-" + line "like, but the" + cont "pages are blank!" + done + +_OaksLabText8:: + text "?" + done + +_OaksLabText_1d340:: + text "PROF.OAK is the" + line "authority on" + cont "#MON!" + + para "Many #MON" + line "trainers hold him" + cont "in high regard!" + done + +_OaksLabRivalWaitingText:: + text ": Gramps!" + line "I'm fed up with" + cont "waiting!" + done + +_OaksLabChooseMonText:: + text "OAK: ?" + line "Let me think..." + + para "Oh, that's right," + line "I told you to" + cont "come! Just wait!" + + para "Here, !" + + para "There are 3" + line "#MON here!" + + para "Haha!" + + para "They are inside" + line "the # BALLs." + + para "When I was young," + line "I was a serious" + cont "#MON trainer!" + + para "In my old age, I" + line "have only 3 left," + cont "but you can have" + cont "one! Choose!" + done + +_OaksLabRivalInterjectionText:: + text ": Hey!" + line "Gramps! What" + cont "about me?" + done + +_OaksLabBePatientText:: + text "OAK: Be patient!" + line ", you can" + cont "have one too!" + done + +_OaksLabLeavingText:: + text "OAK: Hey! Don't go" + line "away yet!" + done + +_OaksLabRivalPickingMonText:: + text ": I'll take" + line "this one, then!" + done + +_OaksLabRivalReceivedMonText:: + text " received" + line "a @" + TX_RAM wcd6d + text "!@@" + +_OaksLabRivalChallengeText:: + text ": Wait" + line "!" + cont "Let's check out" + cont "our #MON!" + + para "Come on, I'll take" + line "you on!" + done + +_OaksLabText_1d3be:: + text "WHAT?" + line "Unbelievable!" + cont "I picked the" + cont "wrong #MON!" + prompt + +_OaksLabText_1d3c3:: + text ": Yeah! Am" + line "I great or what?" + prompt + +_OaksLabRivalToughenUpText:: + text ": Okay!" + line "I'll make my" + cont "#MON fight to" + cont "toughen it up!" + + para "! Gramps!" + line "Smell you later!" + done + +_OaksLabText21:: + text ": Gramps!" + done + +_OaksLabText22:: + text ": What did" + line "you call me for?" + done + +_OaksLabText23:: + text "OAK: Oh right! I" + line "have a request" + cont "of you two." + done + +_OaksLabText24:: + text "On the desk there" + line "is my invention," + cont "#DEX!" + + para "It automatically" + line "records data on" + cont "#MON you've" + cont "seen or caught!" + + para "It's a hi-tech" + line "encyclopedia!" + done + +_OaksLabText25:: + text "OAK: and" + line "! Take" + cont "these with you!" + + para " got" + line "#DEX from OAK!@@" + +_OaksLabText26:: + text "To make a complete" + line "guide on all the" + cont "#MON in the" + cont "world..." + + para "That was my dream!" + + para "But, I'm too old!" + line "I can't do it!" + + para "So, I want you two" + line "to fulfill my" + cont "dream for me!" + + para "Get moving, you" + line "two!" + + para "This is a great" + line "undertaking in" + cont "#MON history!" + done + +_OaksLabText27:: + text ": Alright" + line "Gramps! Leave it" + cont "all to me!" + + para ", I hate to" + line "say it, but I" + cont "don't need you!" + + para "I know! I'll" + line "borrow a TOWN MAP" + cont "from my sis!" + + para "I'll tell her not" + line "to lend you one," + cont "! Hahaha!" + done + +_OaksLabText_1d405:: + text "I study #MON as" + line "PROF.OAK's AIDE." + done + +_OaksLabText_441cc:: + text "#DEX comp-" + line "letion is:" + + para "@" + TX_NUM hDexRatingNumMonsSeen, 1, 3 + text " #MON seen" + line "@" + TX_NUM hDexRatingNumMonsOwned, 1, 3 + text " #MON owned" + + para "PROF.OAK's" + line "Rating:" + prompt + +_OaksLabText_44201:: + text "You still have" + line "lots to do." + cont "Look for #MON" + cont "in grassy areas!" + done + +_OaksLabText_44206:: + text "You're on the" + line "right track! " + cont "Get a FLASH HM" + cont "from my AIDE!" + done + +_OaksLabText_4420b:: + text "You still need" + line "more #MON!" + cont "Try to catch" + cont "other species!" + done + +_OaksLabText_44210:: + text "Good, you're" + line "trying hard!" + cont "Get an ITEMFINDER" + cont "from my AIDE!" + done + +_OaksLabText_44215:: + text "Looking good!" + line "Go find my AIDE" + cont "when you get 50!" + done + +_OaksLabText_4421a:: + text "You finally got at" + line "least 50 species!" + cont "Be sure to get" + cont "EXP.ALL from my" + cont "AIDE!" + done + +_OaksLabText_4421f:: + text "Ho! This is geting" + line "even better!" + done + +_OaksLabText_44224:: + text "Very good!" + line "Go fish for some" + cont "marine #MON!" + done + +_OaksLabText_44229:: + text "Wonderful!" + line "Do you like to" + cont "collect things?" + done + +_OaksLabText_4422e:: + text "I'm impressed!" + line "It must have been" + cont "difficult to do!" + done + +_OaksLabText_44233:: + text "You finally got at" + line "least 100 species!" + cont "I can't believe" + cont "how good you are!" + done + +_OaksLabText_44238:: + text "You even have the" + line "evolved forms of" + cont "#MON! Super!" + done + +_OaksLabText_4423d:: + text "Excellent! Trade" + line "with friends to" + cont "get some more!" + done + +_OaksLabText_44242:: + text "Outstanding!" + line "You've become a" + cont "real pro at this!" + done + +_OaksLabText_44247:: + text "I have nothing" + line "left to say!" + cont "You're the" + cont "authority now!" + done + +_OaksLabText_4424c:: + text "Your #DEX is" + line "entirely complete!" + cont "Congratulations!" + done diff --git a/text/maps/PalletTown.asm b/text/maps/PalletTown.asm new file mode 100644 index 00000000..d5eda74f --- /dev/null +++ b/text/maps/PalletTown.asm @@ -0,0 +1,55 @@ +_OakAppearsText:: + text "OAK: Hey! Wait!" + line "Don't go out!@@" + +_OakWalksUpText:: + text "OAK: It's unsafe!" + line "Wild #MON live" + cont "in tall grass!" + + para "You need your own" + line "#MON for your" + cont "protection." + cont "I know!" + + para "Here, come with" + line "me!" + done + +_PalletTownText2:: + text "I'm raising" + line "#MON too!" + + para "When they get" + line "strong, they can" + cont "protect me!" + done + +_PalletTownText3:: + text "Technology is" + line "incredible!" + + para "You can now store" + line "and recall items" + cont "and #MON as" + cont "data via PC!" + done + +_PalletTownText4:: + text "OAK #MON" + line "RESEARCH LAB" + done + +_PalletTownText5:: + text "PALLET TOWN" + line "Shades of your" + cont "journey await!" + done + +_PalletTownText6:: + text "'s house " + done + +_PalletTownText7:: + text "'s house " + done diff --git a/text/maps/PewterCity.asm b/text/maps/PewterCity.asm new file mode 100644 index 00000000..14240c9e --- /dev/null +++ b/text/maps/PewterCity.asm @@ -0,0 +1,117 @@ +_PewterCityText1:: + text "It's rumored that" + line "CLEFAIRYs came" + cont "from the moon!" + + para "They appeared " + line "after MOON STONE" + cont "fell on MT.MOON." + done + +_PewterCityText2:: + text "There aren't many" + line "serious #MON" + cont "trainers here!" + + para "They're all like" + line "BUG CATCHERs," + cont "but PEWTER GYM's" + cont "BROCK is totally" + cont "into it!" + done + +_PewterCityText_193f1:: + text "Did you check out" + line "the MUSEUM?" + done + +_PewterCityText_193f6:: + text "Weren't those" + line "fossils from MT." + cont "MOON amazing?" + done + +_PewterCityText_193fb:: + text "Really?" + line "You absolutely" + cont "have to go!" + done + +_PewterCityText13:: + text "It's right here!" + line "You have to pay" + cont "to get in, but" + cont "it's worth it!" + cont "See you around!" + done + +_PewterCityText_19427:: + text "Psssst!" + line "Do you know what" + cont "I'm doing?" + done + +_PewterCityText_1942c:: + text "That's right!" + line "It's hard work!" + done + +_PewterCityText_19431:: + text "I'm spraying REPEL" + line "to keep #MON" + cont "out of my garden!" + done + +_PewterCityText_1945d:: + text "You're a trainer" + line "right? BROCK's" + cont "looking for new" + cont "challengers!" + cont "Follow me!" + done + +_PewterCityText14:: + text "If you have the" + line "right stuff, go" + cont "take on BROCK!" + done + +_PewterCityText6:: + text "TRAINER TIPS" + + para "Any #MON that" + line "takes part in" + cont "battle, however" + cont "short, earns EXP!" + done + +_PewterCityText7:: + text "NOTICE!" + + para "Thieves have been" + line "stealing #MON" + cont "fossils at MT." + cont "MOON! Please call" + cont "PEWTER POLICE" + cont "with any info!" + done + +_PewterCityText10:: + text "PEWTER MUSEUM" + line "OF SCIENCE" + done + +_PewterCityText11:: + text "PEWTER CITY" + line "#MON GYM" + cont "LEADER: BROCK" + + para "The Rock Solid" + line "#MON Trainer!" + done + +_PewterCityText12:: + text "PEWTER CITY" + line "A Stone Gray" + cont "City" + done diff --git a/text/maps/PewterGym.asm b/text/maps/PewterGym.asm new file mode 100644 index 00000000..6426dd72 --- /dev/null +++ b/text/maps/PewterGym.asm @@ -0,0 +1,18 @@ +_PewterGymText_5c49e:: + text "I'm BROCK!" + line "I'm PEWTER's GYM" + cont "LEADER!" + + para "I believe in rock" + line "hard defense and" + cont "determination!" + + para "That's why my" + line "#MON are all" + cont "the rock-type!" + + para "Do you still want" + line "to challenge me?" + cont "Fine then! Show" + cont "me your best!" + done diff --git a/text/maps/PewterGym_2.asm b/text/maps/PewterGym_2.asm new file mode 100644 index 00000000..5312e4f2 --- /dev/null +++ b/text/maps/PewterGym_2.asm @@ -0,0 +1,144 @@ +_PewterGymText_5c4a3:: + text "There are all" + line "kinds of trainers" + cont "in the world!" + + para "You appear to be" + line "very gifted as a" + cont "#MON trainer!" + + para "Go to the GYM in" + line "CERULEAN and test" + cont "your abilities!" + done + +_TM34PreReceiveText:: + text "Wait! Take this" + line "with you!" + done + +_ReceivedTM34Text:: + text " received" + line "TM34!@@" + +_TM34ExplanationText:: + text "" + + para "A TM contains a" + line "technique that" + cont "can be taught to" + cont "#MON!" + + para "A TM is good only" + line "once! So when you" + cont "use one to teach" + cont "a new technique," + cont "pick the #MON" + cont "carefully!" + + para "TM34 contains" + line "BIDE!" + + para "Your #MON will" + line "absorb damage in" + cont "battle then pay" + cont "it back double!" + done + +_TM34NoRoomText:: + text "You don't have" + line "room for this!" + done + +_PewterGymText_5c4bc:: + text "I took" + line "you for granted." + + para "As proof of your" + line "victory, here's" + cont "the BOULDERBADGE!" + + para " received" + line "the BOULDERBADGE!@@" + +_PewterGymText_5c4c1:: + text "" + + para "That's an official" + line "#MON LEAGUE" + cont "BADGE!" + + para "Its bearer's" + line "#MON become" + cont "more powerful!" + + para "The technique" + line "FLASH can now be" + cont "used any time!" + prompt + +_PewterGymBattleText1:: + text "Stop right there," + line "kid!" + + para "You're still light" + line "years from facing" + cont "BROCK!" + done + +_PewterGymEndBattleText1:: + text "Darn!" + + para "Light years isn't" + line "time! It measures" + cont "distance!" + prompt + +_PewterGymAfterBattleText1:: + text "You're pretty hot," + line "but not as hot" + cont "as BROCK!" + done + +_PewterGymText_5c515:: + text "Hiya! I can tell" + line "you have what it" + cont "takes to become a" + cont "#MON champ!" + + para "I'm no trainer," + line "but I can tell" + cont "you how to win!" + + para "Let me take you" + line "to the top!" + done + +_PewterGymText_5c51a:: + text "All right! Let's" + line "get happening!" + prompt + +_PewterGymText_5c51f:: + text "The 1st #MON" + line "out in a match is" + cont "at the top of the" + cont "#MON LIST!" + + para "By changing the" + line "order of #MON," + cont "matches could be" + cont "made easier!" + done + +_PewterGymText_5c524:: + text "It's a free" + line "service! Let's" + cont "get happening!" + prompt + +_PewterGymText_5c529:: + text "Just as I thought!" + line "You're #MON" + cont "champ material!" + done diff --git a/text/maps/PewterMart.asm b/text/maps/PewterMart.asm new file mode 100644 index 00000000..0d5b07a2 --- /dev/null +++ b/text/maps/PewterMart.asm @@ -0,0 +1,17 @@ +_PewterMartText2:: + text "A shady, old man" + line "got me to buy" + cont "this really weird" + cont "fish #MON!" + + para "It's totally weak" + line "and it cost ¥500!" + done + +_PewterMartText3:: + text "Good things can" + line "happen if you" + cont "raise #MON" + cont "diligently, even" + cont "the weak ones!" + done diff --git a/text/maps/PewterNidoranHouse.asm b/text/maps/PewterNidoranHouse.asm new file mode 100644 index 00000000..450e8372 --- /dev/null +++ b/text/maps/PewterNidoranHouse.asm @@ -0,0 +1,24 @@ +_PewterHouse1Text1:: + text "NIDORAN: Bowbow!@@" + +_PewterHouse1Text2:: + text "NIDORAN sit!" + done + +_PewterHouse1Text3:: + text "Our #MON's an" + line "outsider, so it's" + cont "hard to handle." + + para "An outsider is a" + line "#MON that you" + cont "get in a trade." + + para "It grows fast, but" + line "it may ignore an" + cont "unskilled trainer" + cont "in battle!" + + para "If only we had" + line "some BADGEs..." + done diff --git a/text/maps/PewterPokecenter.asm b/text/maps/PewterPokecenter.asm new file mode 100644 index 00000000..6a1b373e --- /dev/null +++ b/text/maps/PewterPokecenter.asm @@ -0,0 +1,14 @@ +_PewterPokecenterText2:: + text "What!?" + + para "TEAM ROCKET is" + line "at MT.MOON? Huh?" + cont "I'm on the phone!" + + para "Scram!" + done + +_PewterJigglypuffText:: + text "JIGGLYPUFF: Puu" + line "pupuu!" + done diff --git a/text/maps/PewterSpeechHouse.asm b/text/maps/PewterSpeechHouse.asm new file mode 100644 index 00000000..615536f7 --- /dev/null +++ b/text/maps/PewterSpeechHouse.asm @@ -0,0 +1,19 @@ +_PewterHouse2Text1:: + text "#MON learn new" + line "techniques as" + cont "they grow!" + + para "But, some moves" + line "must be taught by" + cont "the trainer!" + done + +_PewterHouse2Text2:: + text "#MON become" + line "easier to catch" + cont "when they are" + cont "hurt or asleep!" + + para "But, it's not a" + line "sure thing!" + done diff --git a/text/maps/PokemonFanClub.asm b/text/maps/PokemonFanClub.asm new file mode 100644 index 00000000..4827f2e8 --- /dev/null +++ b/text/maps/PokemonFanClub.asm @@ -0,0 +1,143 @@ +PikachuFanText:: + text "Won't you admire" + line "my PIKACHU's" + cont "adorable tail?" + done + +PikachuFanBetterText:: + text "Humph! My PIKACHU" + line "is twice as cute" + cont "as that one!" + done + +SeelFanText:: + text "I just love my" + line "SEEL!" + + para "It squeals when I" + line "hug it!" + done + +SeelFanBetterText:: + text "Oh dear!" + + para "My SEEL is far" + line "more attractive!" + done + +FanClubPikachuText:: + text "PIKACHU: Chu!" + line "Pikachu!" + done + +FanClubSeelText:: + text "SEEL: Kyuoo!" + done + +FanClubMeetChairText:: + text "I chair the" + line "#MON Fan Club!" + + para "I have collected" + line "over 100 #MON!" + + para "I'm very fussy" + line "when it comes to" + cont "#MON!" + + para "So..." + + para "Did you come" + line "visit to hear" + cont "about my #MON?" + done + +FanClubChairStoryText:: + text "Good!" + line "Then listen up!" + + para "My favorite" + line "RAPIDASH..." + + para "It...cute..." + line "lovely...smart..." + cont "plus...amazing..." + cont "you think so?..." + cont "oh yes...it..." + cont "stunning..." + cont "kindly..." + cont "love it!" + + para "Hug it...when..." + cont "sleeping...warm" + cont "and cuddly..." + cont "spectacular..." + cont "ravishing..." + cont "...Oops! Look at" + cont "the time! I kept" + cont "you too long!" + + para "Thanks for hearing" + line "me out! I want" + cont "you to have this!" + prompt + +ReceivedBikeVoucherText:: + text " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +ExplainBikeVoucherText:: + text "" + para "Exchange that for" + line "a BICYCLE!" + + para "Don't worry, my" + line "FEAROW will FLY" + cont "me anywhere!" + + para "So, I don't need a" + line "BICYCLE!" + + para "I hope you like" + line "cycling!" + done + +FanClubNoStoryText:: + text "Oh. Come back" + line "when you want to" + cont "hear my story!" + done + +FanClubChairFinalText:: + text "Hello, !" + + para "Did you come see" + line "me about my" + cont "#MON again?" + + para "No? Too bad!" + done + +FanClubBagFullText:: + text "Make room for" + line "this!" + done + +_FanClubText6:: + text "Our Chairman is" + line "very vocal about" + cont "#MON." + done + +_FanClubText7:: + text "Let's all listen" + line "politely to other" + cont "trainers!" + done + +_FanClubText8:: + text "If someone brags," + line "brag right back!" + done diff --git a/text/maps/PokemonMansion1F.asm b/text/maps/PokemonMansion1F.asm new file mode 100644 index 00000000..a3c517fb --- /dev/null +++ b/text/maps/PokemonMansion1F.asm @@ -0,0 +1,29 @@ +_Mansion1BattleText2:: + text "Who are you? There" + line "shouldn't be" + cont "anyone here." + done + +_Mansion1EndBattleText2:: + text "Ouch!" + prompt + +_Mansion1AfterBattleText2:: + text "A key? I don't" + line "know what you're" + cont "talking about." + done + +_MansionSwitchText:: + text "A secret switch!" + + para "Press it?" + done + +_MansionSwitchPressedText:: + text "Who wouldn't?" + prompt + +_MansionSwitchNotPressedText:: + text "Not quite yet!" + done diff --git a/text/maps/PokemonMansion2F.asm b/text/maps/PokemonMansion2F.asm new file mode 100644 index 00000000..378efb30 --- /dev/null +++ b/text/maps/PokemonMansion2F.asm @@ -0,0 +1,47 @@ +_Mansion2BattleText1:: + text "I can't get out!" + line "This old place is" + cont "one big puzzle!" + done + +_Mansion2EndBattleText1:: + text "Oh no!" + line "My bag of loot!" + prompt + +_Mansion2AfterBattleText1:: + text "Switches open and" + line "close alternating" + cont "sets of doors!" + done + +_Mansion2Text3:: + text "Diary: July 5" + line "Guyana," + cont "South America" + + para "A new #MON was" + line "discovered deep" + cont "in the jungle." + done + +_Mansion2Text4:: + text "Diary: July 10" + line "We christened the" + cont "newly discovered" + cont "#MON, MEW." + done + +_Mansion2Text_520c2:: + text "A secret switch!" + + para "Press it?" + done + +_Mansion2Text_520c7:: + text "Who wouldn't?" + prompt + +_Mansion2Text_520cc:: + text "Not quite yet!" + done diff --git a/text/maps/PokemonMansion3F.asm b/text/maps/PokemonMansion3F.asm new file mode 100644 index 00000000..70331fdf --- /dev/null +++ b/text/maps/PokemonMansion3F.asm @@ -0,0 +1,37 @@ +_Mansion3BattleText1:: + text "This place is" + line "like, huge!" + done + +_Mansion3EndBattleText1:: + text "Ayah!" + prompt + +_Mansion3AfterBattleText1:: + text "I wonder where" + line "my partner went." + done + +_Mansion3BattleText2:: + text "My mentor once" + line "lived here." + done + +_Mansion3EndBattleText2:: + text "Whew!" + line "Overwhelming!" + prompt + +_Mansion3AfterBattleText2:: + text "So, you're stuck?" + line "Try jumping off" + cont "over there!" + done + +_Mansion3Text5:: + text "Diary: Feb. 6" + line "MEW gave birth." + + para "We named the" + line "newborn MEWTWO." + done diff --git a/text/maps/PokemonMansionB1F.asm b/text/maps/PokemonMansionB1F.asm new file mode 100644 index 00000000..1bc1ef89 --- /dev/null +++ b/text/maps/PokemonMansionB1F.asm @@ -0,0 +1,39 @@ +_Mansion4BattleText1:: + text "Uh-oh. Where am" + line "I now?" + done + +_Mansion4EndBattleText1:: + text "Awooh!" + prompt + +_Mansion4AfterBattleText1:: + text "You can find stuff" + line "lying around." + done + +_Mansion4BattleText2:: + text "This place is" + line "ideal for a lab." + done + +_Mansion4EndBattleText2:: + text "What" + line "was that for?" + prompt + +_Mansion4AfterBattleText2:: + text "I like it here!" + line "It's conducive to" + cont "my studies!" + done + +_Mansion4Text7:: + text "Diary; Sept. 1" + line "MEWTWO is far too" + cont "powerful." + + para "We have failed to" + line "curb its vicious" + cont "tendencies..." + done diff --git a/text/maps/PokemonTower1F.asm b/text/maps/PokemonTower1F.asm new file mode 100644 index 00000000..50a2cd29 --- /dev/null +++ b/text/maps/PokemonTower1F.asm @@ -0,0 +1,31 @@ +_PokemonTower1Text1:: + text "#MON TOWER was" + line "erected in the" + cont "memory of #MON" + cont "that had died." + done + +_PokemonTower1Text2:: + text "Did you come to" + line "pay respects?" + cont "Bless you!" + done + +_PokemonTower1Text3:: + text "I came to pray" + line "for my CLEFAIRY." + + para "Sniff! I can't" + line "stop crying..." + done + +_PokemonTower1Text4:: + text "My GROWLITHE..." + line "Why did you die?" + done + +_PokemonTower1Text5:: + text "I am a CHANNELER!" + line "There are spirits" + cont "up to mischief!" + done diff --git a/text/maps/PokemonTower2F.asm b/text/maps/PokemonTower2F.asm new file mode 100644 index 00000000..79323001 --- /dev/null +++ b/text/maps/PokemonTower2F.asm @@ -0,0 +1,57 @@ +_PokemonTower2Text_6062d:: + text ": Hey," + line "! What" + cont "brings you here?" + cont "Your #MON" + cont "don't look dead!" + + para "I can at least" + line "make them faint!" + cont "Let's go, pal!" + done + +_PokemonTower2Text_60632:: + text "What?" + line "You stinker!" + + para "I took it easy on" + line "you too!" + prompt + +_PokemonTower2Text_60637:: + text ": Well," + line "look at all your" + cont "wimpy #MON!" + + para "Toughen them up a" + line "bit more!" + prompt + +_PokemonTower2Text_6063c:: + text "How's your #DEX" + line "coming, pal?" + cont "I just caught a" + cont "CUBONE!" + + para "I can't find the" + line "grown-up MAROWAK" + cont "yet!" + + para "I doubt there are" + line "any left! Well, I" + cont "better get going!" + cont "I've got a lot to" + cont "accomplish, pal!" + + para "Smell ya later!" + done + +_PokemonTower2Text2:: + text "Even we could not" + line "identify the" + cont "wayward GHOSTs!" + + para "A SILPH SCOPE" + line "might be able to" + cont "unmask them." + done diff --git a/text/maps/PokemonTower3F.asm b/text/maps/PokemonTower3F.asm new file mode 100644 index 00000000..67098e6b --- /dev/null +++ b/text/maps/PokemonTower3F.asm @@ -0,0 +1,45 @@ +_PokemonTower3BattleText1:: + text "Urrg...Awaa..." + line "Huhu...graa.." + done + +_PokemonTower3EndBattleText1:: + text "Hwa!" + line "I'm saved!" + prompt + +_PokemonTower3AfterBattleText1:: + text "The GHOSTs can be" + line "identified by the" + cont "SILPH SCOPE." + done + +_PokemonTower3BattleText2:: + text "Kekeke...." + line "Kwaaah!" + done + +_PokemonTower3EndBattleText2:: + text "Hmm?" + line "What am I doing?" + prompt + +_PokemonTower3AfterBattleText2:: + text "Sorry! I was" + line "possessed!" + done + +_PokemonTower3BattleText3:: + text "Be gone!" + line "Evil spirit!" + done + +_PokemonTower3EndBattleText3:: + text "Whew!" + line "The spirit left!" + prompt + +_PokemonTower3AfterBattleText3:: + text "My friends were" + line "possessed too!" + done diff --git a/text/maps/PokemonTower4F.asm b/text/maps/PokemonTower4F.asm new file mode 100644 index 00000000..771325a0 --- /dev/null +++ b/text/maps/PokemonTower4F.asm @@ -0,0 +1,45 @@ +_PokemonTower4BattleText1:: + text "GHOST! No!" + line "Kwaaah!" + done + +_PokemonTower4EndBattleText1:: + text "Where" + line "is the GHOST?" + prompt + +_PokemonTower4AfterBattleText1:: + text "I must have been" + line "dreaming..." + done + +_PokemonTower4BattleText2:: + text "Be cursed with" + line "me! Kwaaah!" + done + +_PokemonTower4EndBattleText2:: + text "What!" + prompt + +_PokemonTower4AfterBattleText2:: + text "We can't crack" + line "the identity of" + cont "the GHOSTs." + done + +_PokemonTower4BattleText3:: + text "Huhuhu..." + line "Beat me not!" + done + +_PokemonTower4EndBattleText3:: + text "Huh?" + line "Who? What?" + prompt + +_PokemonTower4AfterBattleText3:: + text "May the departed" + line "souls of #MON" + cont "rest in peace..." + done diff --git a/text/maps/PokemonTower5F.asm b/text/maps/PokemonTower5F.asm new file mode 100644 index 00000000..b329118d --- /dev/null +++ b/text/maps/PokemonTower5F.asm @@ -0,0 +1,71 @@ +_PokemonTower5Text1:: + text "Come, child! I" + line "sealed this space" + cont "with white magic!" + + para "You can rest here!" + done + +_PokemonTower5BattleText1:: + text "Give...me..." + line "your...soul..." + done + +_PokemonTower5EndBattleText1:: + text "Gasp!" + prompt + +_PokemonTower5AfterBattleText1:: + text "I was under" + line "possession!" + done + +_PokemonTower5BattleText2:: + text "You...shall..." + line "join...us..." + done + +_PokemonTower5EndBattleText2:: + text "What" + line "a nightmare!" + prompt + +_PokemonTower5AfterBattleText2:: + text "I was possessed!" + done + +_PokemonTower5BattleText3:: + text "Zombies!" + done + +_PokemonTower5EndBattleText3:: + text "Ha?" + prompt + +_PokemonTower5AfterBattleText3:: + text "I regained my" + line "senses!" + done + +_PokemonTower5BattleText4:: + text "Urgah..." + line "Urff...." + done + +_PokemonTower5EndBattleText4:: + text "Whoo!" + prompt + +_PokemonTower5AfterBattleText4:: + text "I fell to evil" + line "spirits despite" + cont "my training!" + done + +_PokemonTower5Text7:: + text "Entered purified," + line "protected zone!" + + para "'s #MON" + line "are fully healed!" + done diff --git a/text/maps/PokemonTower6F.asm b/text/maps/PokemonTower6F.asm new file mode 100644 index 00000000..7532d56d --- /dev/null +++ b/text/maps/PokemonTower6F.asm @@ -0,0 +1,61 @@ +_PokemonTower2Text_60c1f:: + text "The GHOST was the" + line "restless soul of" + cont "CUBONE's mother!" + done + +_PokemonTower2Text_60c24:: + text "The mother's soul" + line "was calmed." + + para "It departed to" + line "the afterlife!" + done + +_PokemonTower6BattleText1:: + text "Give...me..." + line "blood..." + done + +_PokemonTower6EndBattleText1:: + text "Groan!" + prompt + +_PokemonTower6AfterBattleText1:: + text "I feel anemic and" + line "weak..." + done + +_PokemonTower6BattleText2:: + text "Urff... Kwaah!" + done + +_PokemonTower6EndBattleText2:: + text "Some-" + line "thing fell out!" + prompt + +_PokemonTower6AfterBattleText2:: + text "Hair didn't fall" + line "out! It was an" + cont "evil spirit!" + done + +_PokemonTower6BattleText3:: + text "Ke..ke...ke..." + line "ke..ke...ke!!" + done + +_PokemonTower6EndBattleText3:: + text "Keee!" + prompt + +_PokemonTower6AfterBattleText3:: + text "What's going on" + line "here?" + done + +_PokemonTower6Text6:: + text "Be gone..." + line "Intruders..." + done diff --git a/text/maps/PokemonTower7F.asm b/text/maps/PokemonTower7F.asm new file mode 100644 index 00000000..704a71eb --- /dev/null +++ b/text/maps/PokemonTower7F.asm @@ -0,0 +1,78 @@ +_TowerRescueFujiText:: + text "MR.FUJI: Heh? You" + line "came to save me?" + + para "Thank you. But, I" + line "came here of my" + cont "own free will." + + para "I came to calm" + line "the soul of" + cont "CUBONE's mother." + + para "I think MAROWAK's" + line "spirit has gone" + cont "to the afterlife." + + para "I must thank you" + line "for your kind" + cont "concern!" + + para "Follow me to my" + line "home, #MON" + cont "HOUSE at the foot" + cont "of this tower." + done + +_PokemonTower7BattleText1:: + text "What do you want?" + line "Why are you here?" + done + +_PokemonTower7EndBattleText1:: + text "I give up!" + prompt + +_PokemonTower7AfterBattleText1:: + text "I'm not going to" + line "forget this!" + done + +_PokemonTower7BattleText2:: + text "This old guy came" + line "and complained" + cont "about us harming" + cont "useless #MON!" + + para "We're talking it" + line "over as adults!" + done + +_PokemonTower7EndBattleText2:: + text "Please!" + line "No more!" + prompt + +_PokemonTower7AfterBattleText2:: + text "#MON are only" + line "good for making" + cont "money!" + + para "Stay out of our" + line "business!" + done + +_PokemonTower7BattleText3:: + text "You're not saving" + line "anyone, kid!" + done + +_PokemonTower7EndBattleText3:: + text "Don't" + line "fight us ROCKETs!" + prompt + +_PokemonTower7AfterBattleText3:: + text "You're not getting" + line "away with this!" + done diff --git a/text/maps/PowerPlant.asm b/text/maps/PowerPlant.asm new file mode 100644 index 00000000..e5df6674 --- /dev/null +++ b/text/maps/PowerPlant.asm @@ -0,0 +1,6 @@ +_VoltorbBattleText:: + text "Bzzzt!" + done + +_ZapdosBattleText:: + text "Gyaoo!@@" diff --git a/text/maps/RedsHouse1F.asm b/text/maps/RedsHouse1F.asm new file mode 100644 index 00000000..07768af9 --- /dev/null +++ b/text/maps/RedsHouse1F.asm @@ -0,0 +1,37 @@ +_MomWakeUpText:: + text "MOM: Right." + line "All boys leave" + cont "home some day." + cont "It said so on TV." + + para "PROF.OAK, next" + line "door, is looking" + cont "for you." + done + +_MomHealText1:: + text "MOM: !" + line "You should take a" + cont "quick rest." + prompt + +_MomHealText2:: + text "MOM: Oh good!" + line "You and your" + cont "#MON are" + cont "looking great!" + cont "Take care now!" + done + +_StandByMeText:: + text "There's a movie" + line "on TV. Four boys" + cont "are walking on" + cont "railroad tracks." + + para "I better go too." + done + +_TVWrongSideText:: + text "Oops, wrong side." + done diff --git a/text/maps/RockTunnel1F.asm b/text/maps/RockTunnel1F.asm new file mode 100644 index 00000000..472c52f8 --- /dev/null +++ b/text/maps/RockTunnel1F.asm @@ -0,0 +1,115 @@ +_RockTunnel1BattleText1:: + text "This tunnel goes" + line "a long way, kid!" + done + +_RockTunnel1EndBattleText1:: + text "Doh!" + line "You win!" + prompt + +_RockTunnel1AfterBattleText1:: + text "Watch for ONIX!" + line "It can put the" + cont "squeeze on you!" + done + +_RockTunnel1BattleText2:: + text "Hmm. Maybe I'm" + line "lost in here..." + done + +_RockTunnel1EndBattleText2:: + text "Ease up!" + line "What am I doing?" + cont "Which way is out?" + prompt + +_RockTunnel1AfterBattleText2:: + text "That sleeping" + line "#MON on ROUTE" + cont "12 forced me to" + cont "take this detour." + done + +_RockTunnel1BattleText3:: + text "Outsiders like" + line "you need to show" + cont "me some respect!" + done + +_RockTunnel1EndBattleText3:: + text "I give!" + prompt + +_RockTunnel1AfterBattleText3:: + text "You're talented" + line "enough to hike!" + done + +_RockTunnel1BattleText4:: + text "#MON fight!" + line "Ready, go!" + done + +_RockTunnel1EndBattleText4:: + text "Game" + line "over!" + prompt + +_RockTunnel1AfterBattleText4:: + text "Oh well, I'll get" + line "a ZUBAT as I go!" + done + +_RockTunnel1BattleText5:: + text "Eek! Don't try" + line "anything funny in" + cont "the dark!" + done + +_RockTunnel1EndBattleText5:: + text "It" + line "was too dark!" + prompt + +_RockTunnel1AfterBattleText5:: + text "I saw a MACHOP" + line "in this tunnel!" + done + +_RockTunnel1BattleText6:: + text "I came this far" + line "for #MON!" + done + +_RockTunnel1EndBattleText6:: + text "I'm" + line "out of #MON!" + prompt + +_RockTunnel1AfterBattleText6:: + text "You looked cute" + line "and harmless!" + done + +_RockTunnel1BattleText7:: + text "You have #MON!" + line "Let's start!" + done + +_RockTunnel1EndBattleText7:: + text "You" + line "play hard!" + prompt + +_RockTunnel1AfterBattleText7:: + text "Whew! I'm all" + line "sweaty now!" + done + +_RockTunnel1Text8:: + text "ROCK TUNNEL" + line "CERULEAN CITY -" + cont "LAVENDER TOWN" + done diff --git a/text/maps/RockTunnelB1F.asm b/text/maps/RockTunnelB1F.asm new file mode 100644 index 00000000..1a565eb3 --- /dev/null +++ b/text/maps/RockTunnelB1F.asm @@ -0,0 +1,108 @@ +_RockTunnel2BattleText2:: + text "Hikers leave twigs" + line "as trail markers." + done + +_RockTunnel2EndBattleText2:: + text "Ohhh!" + line "I did my best!" + prompt + +_RockTunnel2AfterBattleText2:: + text "I want to go " + line "home!" + done + +_RockTunnel2BattleText3:: + text "Hahaha! Can you" + line "beat my power?" + done + +_RockTunnel2EndBattleText3:: + text "Oops!" + line "Out-muscled!" + prompt + +_RockTunnel2AfterBattleText3:: + text "I go for power" + line "because I hate" + cont "thinking!" + done + +_RockTunnel2BattleText4:: + text "You have a" + line "#DEX?" + cont "I want one too!" + done + +_RockTunnel2EndBattleText4:: + text "Shoot!" + line "I'm so jealous!" + prompt + +_RockTunnel2AfterBattleText4:: + text "When you finish" + line "your #DEX, can" + cont "I have it?" + done + +_RockTunnel2BattleText5:: + text "Do you know about" + line "costume players?" + done + +_RockTunnel2EndBattleText5:: + text "Well," + line "that's that." + prompt + +_RockTunnel2AfterBattleText5:: + text "Costume players" + line "dress up as" + cont "#MON for fun." + done + +_RockTunnel2BattleText6:: + text "My #MON" + line "techniques will" + cont "leave you crying!" + done + +_RockTunnel2EndBattleText6:: + text "I give!" + line "You're a better" + cont "technician!" + prompt + +_RockTunnel2AfterBattleText6:: + text "In mountains," + line "you'll often find" + cont "rock-type #MON." + done + +_RockTunnel2BattleText7:: + text "I don't often" + line "come here, but I" + cont "will fight you." + done + +_RockTunnel2EndBattleText7:: + text "Oh!" + line "I lost!" + prompt + +_RockTunnel2AfterBattleText7:: + text "I like tiny" + line "#MON, big ones" + cont "are too scary!" + done + +_RockTunnel2BattleText8:: + text "Hit me with your" + line "best shot!" + done + +_RockTunnel2EndBattleText8:: + text "Fired" + line "away!" + prompt diff --git a/text/maps/RockTunnelB1F_2.asm b/text/maps/RockTunnelB1F_2.asm new file mode 100644 index 00000000..e8e45a7f --- /dev/null +++ b/text/maps/RockTunnelB1F_2.asm @@ -0,0 +1,20 @@ +_RockTunnel2AfterBattleText8:: + text "I'll raise my" + line "#MON to beat" + cont "yours, kid!" + done + +_RockTunnel2BattleText9:: + text "I draw #MON" + line "when I'm home." + done + +_RockTunnel2EndBattleText9:: + text "Whew!" + line "I'm exhausted!" + prompt + +_RockTunnel2AfterBattleText9:: + text "I'm an artist," + line "not a fighter." + done diff --git a/text/maps/RockTunnelPokecenter.asm b/text/maps/RockTunnelPokecenter.asm new file mode 100644 index 00000000..0fc249ff --- /dev/null +++ b/text/maps/RockTunnelPokecenter.asm @@ -0,0 +1,13 @@ +_RockTunnelPokecenterText2:: + text "The element types" + line "of #MON make" + cont "them stronger" + cont "than some types" + cont "and weaker than" + cont "others!" + done + +_RockTunnelPokecenterText3:: + text "I sold a useless" + line "NUGGET for ¥5000!" + done diff --git a/text/maps/RocketHideoutB1F.asm b/text/maps/RocketHideoutB1F.asm new file mode 100644 index 00000000..36117804 --- /dev/null +++ b/text/maps/RocketHideoutB1F.asm @@ -0,0 +1,73 @@ +_RocketHideout1EndBattleText6:: + text "Why...?@@" + +_RocketHideout1BattleText2:: + text "Who are you? How" + line "did you get here?" + done + +_RocketHideout1EndBattleText2:: + text "Oww!" + line "Beaten!" + prompt + +_RocketHideout1AfterBattleTxt2:: + text "Are you dissing" + line "TEAM ROCKET?" + done + +_RocketHideout1BattleText3:: + text "You broke into" + line "our operation?" + done + +_RocketHideout1EndBattleText3:: + text "Burnt!" + prompt + +_RocketHideout1AfterBattleTxt3:: + text "You're not going" + line "to get away with" + cont "this, brat!" + done + +_RocketHideout1BattleText4:: + text "Intruder alert!" + done + +_RocketHideout1EndBattleText4:: + text "I" + line "can't do it!" + prompt + +_RocketHideout1AfterBattleTxt4:: + text "SILPH SCOPE?" + line "I don't know" + cont "where it is!" + done + +_RocketHideout1BattleText5:: + text "Why did you come" + line "here?" + done + +_RocketHideout1EndBattleText5:: + text "This" + line "won't do!" + prompt + +_RocketHideout1AfterBattleTxt5:: + text "OK, I'll talk!" + line "Take the elevator" + cont "to see my BOSS!" + done + +_RocketHideout1BattleText6:: + text "Are you lost, you" + line "little rat?" + done + +_RocketHideout1AfterBattleTxt6:: + text "Uh-oh, that fight" + line "opened the door!" + done diff --git a/text/maps/RocketHideoutB2F.asm b/text/maps/RocketHideoutB2F.asm new file mode 100644 index 00000000..c13c3593 --- /dev/null +++ b/text/maps/RocketHideoutB2F.asm @@ -0,0 +1,17 @@ +_RocketHideout2BattleText2:: + text "BOSS said you can" + line "see GHOSTs with" + cont "the SILPH SCOPE!" + done + +_RocketHideout2EndBattleText2:: + text "I" + line "surrender!" + prompt + +_RocketHideout2AfterBattleTxt2:: + text "The TEAM ROCKET" + line "HQ has 4 basement" + cont "floors. Can you" + cont "reach the BOSS?" + done diff --git a/text/maps/RocketHideoutB3F.asm b/text/maps/RocketHideoutB3F.asm new file mode 100644 index 00000000..a146a383 --- /dev/null +++ b/text/maps/RocketHideoutB3F.asm @@ -0,0 +1,35 @@ +_RocketHideout3BattleText2:: + text "Stop meddling in" + line "TEAM ROCKET's" + cont "affairs!" + done + +_RocketHideout3EndBattleText2:: + text "Oof!" + line "Taken down!" + prompt + +_RocketHideout3AfterBattleTxt2:: + text "SILPH SCOPE?" + line "The machine the" + cont "BOSS stole. It's" + cont "here somewhere." + done + +_RocketHideout3BattleTxt:: + text "We got word from" + line "upstairs that you" + cont "were coming!" + done + +_RocketHideout3EndBattleText3:: + text "What?" + line "I lost? No!" + prompt + +_RocketHide3AfterBattleText3:: + text "Go ahead and go!" + line "But, you need the" + cont "LIFT KEY to run" + cont "the elevator!" + done diff --git a/text/maps/RocketHideoutB4F.asm b/text/maps/RocketHideoutB4F.asm new file mode 100644 index 00000000..f3ba43f3 --- /dev/null +++ b/text/maps/RocketHideoutB4F.asm @@ -0,0 +1,74 @@ +_RocketHideout4Text_4557a:: + text "So! I must say, I" + line "am impressed you" + cont "got here!" + done + +_RocketHideout4Text_4557f:: + text "WHAT!" + line "This cannot be!" + prompt + +_RocketHideout4Text_45584:: + text "I see that you" + line "raise #MON" + cont "with utmost care." + + para "A child like you" + line "would never" + cont "understand what I" + cont "hope to achieve." + + para "I shall step" + line "aside this time!" + + para "I hope we meet" + line "again..." + done + +_RocketHideout4BattleText2:: + text "I know you! You" + line "ruined our plans" + cont "at MT.MOON!" + done + +_RocketHideout4EndBattleText2:: + text "Burned" + line "again!" + prompt + +_RocketHide4AfterBattleText2:: + text "Do you have" + line "something against" + cont "TEAM ROCKET?" + done + +_RocketHideout4BattleText3:: + text "How can you not" + line "see the beauty of" + cont "our evil?" + done + +_RocketHideout4EndBattleText3:: + text "Ayaya!" + prompt + +_RocketHide4AfterBattleText3:: + text "BOSS! I'm sorry I" + line "failed you!" + done + +_RocketHideout4BattleText4:: + text "The elevator" + line "doesn't work? Who" + cont "has the LIFT KEY?" + done + +_RocketHideout4EndBattleText4:: + text "No!" + prompt + +_RocketHideout4Text_455ec:: + text "Oh no! I dropped" + line "the LIFT KEY!" + done diff --git a/text/maps/RocketHideoutElevator.asm b/text/maps/RocketHideoutElevator.asm new file mode 100644 index 00000000..6f2aa638 --- /dev/null +++ b/text/maps/RocketHideoutElevator.asm @@ -0,0 +1,3 @@ +_RocketElevatorText_4578b:: + text "It appears to" + line "need a key.@@" diff --git a/text/maps/Route1.asm b/text/maps/Route1.asm new file mode 100644 index 00000000..73188f09 --- /dev/null +++ b/text/maps/Route1.asm @@ -0,0 +1,49 @@ +_Route1ViridianMartSampleText:: + text "Hi! I work at a" + line "#MON MART." + + para "It's a convenient" + line "shop, so please" + cont "visit us in" + cont "VIRIDIAN CITY." + + para "I know, I'll give" + line "you a sample!" + cont "Here you go!" + prompt + +_Route1Text_1cae8:: + text " got" + line "@" + TX_RAM wcf4b + text "!@@" + +_Route1Text_1caee:: + text "We also carry" + line "# BALLs for" + cont "catching #MON!" + done + +_Route1Text_1caf3:: + text "You have too much" + line "stuff with you!" + done + +_Route1Text2:: + text "See those ledges" + line "along the road?" + + para "It's a bit scary," + line "but you can jump" + cont "from them." + + para "You can get back" + line "to PALLET TOWN" + cont "quicker that way." + done + +_Route1Text3:: + text "ROUTE 1" + line "PALLET TOWN -" + cont "VIRIDIAN CITY" + done diff --git a/text/maps/Route10.asm b/text/maps/Route10.asm new file mode 100644 index 00000000..057ddcb5 --- /dev/null +++ b/text/maps/Route10.asm @@ -0,0 +1,109 @@ +_Route10BattleText1:: + text "Wow, are you a" + line "#MANIAC too?" + cont "Want to see my" + cont "collection?" + done + +_Route10EndBattleText1:: + text "Humph." + line "I'm not angry!" + prompt + +_Route10AfterBattleText1:: + text "I have more rare" + line "#MON at home!" + done + +_Route10BattleText2:: + text "Ha-hahah-ah-ha!" + done + +_Route10EndBattleText2:: + text "Ha-haha!" + line "Not laughing!" + cont "Ha-hay fever!" + cont "Haha-ha-choo!" + prompt + +_Route10AfterBattleText2:: + text "Haha-ha-choo!" + line "Ha-choo!" + cont "Snort! Snivel!" + done + +_Route10BattleText3:: + text "Hi kid, want to" + line "see my #MON?" + done + +_Route10EndBattleText3:: + text "Oh no!" + line "My #MON!" + prompt + +_Route10AfterBattleText3:: + text "I don't like you" + line "for beating me!" + done + +_Route10BattleText4:: + text "I've been to a" + line "#MON GYM a few" + cont "times. But, I" + cont "lost each time." + done + +_Route10EndBattleText4:: + text "Ohh!" + line "Blew it again!" + prompt + +_Route10AfterBattleText4:: + text "I noticed some" + line "#MANIACs" + cont "prowling around." + done + +_Route10BattleText5:: + text "Ah! This mountain" + line "air is delicious!" + done + +_Route10EndBattleText5:: + text "That" + line "cleared my head!" + prompt + +_Route10AfterBattleText5:: + text "I feel bloated on" + line "mountain air!" + done + +_Route10BattleText6:: + text "I'm feeling a bit" + line "faint from this" + cont "tough hike." + done + +_Route10EndBattleText6:: + text "I'm" + line "not up to it!" + prompt + +_Route10AfterBattleText6:: + text "The #MON here" + line "are so chunky!" + cont "There should be a" + cont "pink one with a" + cont "floral pattern!" + done + +_Route10Text9:: +_Route10Text7:: + text "ROCK TUNNEL" + done + +_Route10Text10:: + text "POWER PLANT" + done diff --git a/text/maps/Route11.asm b/text/maps/Route11.asm new file mode 100644 index 00000000..13e37bdf --- /dev/null +++ b/text/maps/Route11.asm @@ -0,0 +1,133 @@ +_Route11BattleText1:: + text "Win, lose or draw!" + done + +_Route11EndBattleText1:: + text "Atcha!" + line "Didn't go my way!" + prompt + +_Route11AfterBattleText1:: + text "#MON is life!" + line "And to live is to" + cont "gamble!" + done + +_Route11BattleText2:: + text "Competition! I" + line "can't get enough!" + done + +_Route11EndBattleText2:: + text "I had" + line "a chance!" + prompt + +_Route11AfterBattleText2:: + text "You can't be a" + line "coward in the" + cont "world of #MON!" + done + +_Route11BattleText3:: + text "Let's go, but" + line "don't cheat!" + done + +_Route11EndBattleText3:: + text "Huh?" + line "That's not right!" + prompt + +_Route11AfterBattleText3:: + text "I did my best! I" + line "have no regrets!" + done + +_Route11BattleText4:: + text "Careful!" + line "I'm laying down" + cont "some cables!" + done + +_Route11EndBattleText4:: + text "That" + line "was electric!" + prompt + +_Route11AfterBattleText4:: + text "Spread the word" + line "to save energy!" + done + +_Route11BattleText5:: + text "I just became a" + line "trainer! But, I" + cont "think I can win!" + done + +_Route11EndBattleText5:: + text "My" + line "#MON couldn't!" + prompt + +_Route11AfterBattleText5:: + text "What do you want?" + line "Leave me alone!" + done + +_Route11BattleText6:: + text "Fwahaha! I have" + line "never lost!" + done + +_Route11EndBattleText6:: + text "My" + line "first loss!" + prompt + +_Route11AfterBattleText6:: + text "Luck of the draw!" + line "Just luck!" + done + +_Route11BattleText7:: + text "I have never won" + line "before..." + done + +_Route11EndBattleText7:: + text "I saw" + line "this coming..." + prompt + +_Route11AfterBattleText7:: + text "It's just luck." + line "Luck of the draw." + done + +_Route11BattleText8:: + text "I'm the best in" + line "my class!" + done + +_Route11EndBattleText8:: + text "Darn!" + line "I need to make my" + cont "#MON stronger!" + prompt + +_Route11AfterBattleText8:: + text "There's a fat" + line "#MON that" + cont "comes down from" + cont "the mountains." + + para "It's strong if" + line "you can get it." + done + +_Route11BattleText9:: + text "Watch out for" + line "live wires!" + done diff --git a/text/maps/Route11Gate1F.asm b/text/maps/Route11Gate1F.asm new file mode 100644 index 00000000..ef371d06 --- /dev/null +++ b/text/maps/Route11Gate1F.asm @@ -0,0 +1,14 @@ +_Route11GateText1:: + text "When you catch" + line "lots of #MON," + cont "isn't it hard to" + cont "think up names?" + + para "In LAVENDER TOWN," + line "there's a man who" + cont "rates #MON" + cont "nicknames." + + para "He'll help you" + line "rename them too!" + done diff --git a/text/maps/Route11Gate2F.asm b/text/maps/Route11Gate2F.asm new file mode 100644 index 00000000..10236081 --- /dev/null +++ b/text/maps/Route11Gate2F.asm @@ -0,0 +1,40 @@ +_Route11GateUpstairsText_494a3:: + text "There are items on" + line "the ground that" + cont "can't be seen." + + para "ITEMFINDER will" + line "detect an item" + cont "close to you." + + para "It can't pinpoint" + line "it, so you have" + cont "to look yourself!" + done + +_BinocularsSnorlaxText:: + text "Looked into the" + line "binoculars." + + para "A big #MON is" + line "asleep on a road!" + done + +_BinocularsNoSnorlaxText:: + text "Looked into the" + line "binoculars." + + para "It's a beautiful" + line "view!" + done + +_Route11GateUpstairsText_494d5:: + text "Looked into the" + line "binoculars." + + para "The only way to" + line "get from CERULEAN" + cont "CITY to LAVENDER" + cont "is by way of the" + cont "ROCK TUNNEL." + done diff --git a/text/maps/Route11_2.asm b/text/maps/Route11_2.asm new file mode 100644 index 00000000..b9b68d6d --- /dev/null +++ b/text/maps/Route11_2.asm @@ -0,0 +1,28 @@ +_Route11EndBattleText9:: + text "Whoa!" + line "You spark plug!" + prompt + +_Route11AfterBattleText9:: + text "Well, better get" + line "back to work." + done + +_Route11BattleText10:: + text "My #MON should" + line "be ready by now!" + done + +_Route11EndBattleText10:: + text "Too" + line "much, too young!" + prompt + +_Route11AfterBattleText10:: + text "I better go find" + line "stronger ones!" + done + +_Route11Text11:: + text "DIGLETT's CAVE" + done diff --git a/text/maps/Route12.asm b/text/maps/Route12.asm new file mode 100644 index 00000000..82696fda --- /dev/null +++ b/text/maps/Route12.asm @@ -0,0 +1,139 @@ +_Route12Text1:: + text "A sleeping #MON" + line "blocks the way!" + done + +_Route12Text13:: + text "SNORLAX woke up!" + + para "It attacked in a" + line "grumpy rage!" + done + +_Route12Text14:: + text "SNORLAX calmed" + line "down! With a big" + cont "yawn, it returned" + cont "to the mountains!" + done + +_Route12BattleText1:: + text "Yeah! I got a" + line "bite, here!" + done + +_Route12EndBattleText1:: + text "Tch!" + line "Just a small fry!" + prompt + +_Route12AfterBattleText1:: + text "Hang on! My line's" + line "snagged!" + done + +_Route12BattleText2:: + text "Be patient!" + line "Fishing is a" + cont "waiting game!" + done + +_Route12EndBattleText2:: + text "That" + line "one got away!" + prompt + +_Route12AfterBattleText2:: + text "With a better ROD," + line "I could catch" + cont "better #MON!" + done + +_Route12BattleText3:: + text "Have you found a" + line "MOON STONE?" + done + +_Route12EndBattleText3:: + text "Oww!" + prompt + +_Route12AfterBattleText3:: + text "I could have made" + line "my #MON evolve" + cont "with MOON STONE!" + done + +_Route12BattleText4:: + text "Electricity is my" + line "specialty!" + done + +_Route12EndBattleText4:: + text "Unplugged!" + prompt + +_Route12AfterBattleText4:: + text "Water conducts" + line "electricity, so" + cont "you should zap" + cont "sea #MON!" + done + +_Route12BattleText5:: + text "The FISHING FOOL" + line "vs. #MON KID!" + done + +_Route12EndBattleText5:: + text "Too" + line "much!" + prompt + +_Route12AfterBattleText5:: + text "You beat me at" + line "#MON, but I'm" + cont "good at fishing!" + done + +_Route12BattleText6:: + text "I'd rather be" + line "working!" + done + +_Route12EndBattleText6:: + text "It's" + line "not easy..." + prompt + +_Route12AfterBattleText6:: + text "It's all right." + line "Losing doesn't" + cont "bug me any more." + done + +_Route12BattleText7:: + text "You never know" + line "what you could" + cont "catch!" + done + +_Route12EndBattleText7:: + text "Lost" + line "it!" + prompt + +_Route12AfterBattleText7:: + text "I catch MAGIKARP" + line "all the time, but" + cont "they're so weak!" + done + +_Route12Text11:: + text "ROUTE 12 " + line "North to LAVENDER" + done + +_Route12Text12:: + text "SPORT FISHING AREA" + done diff --git a/text/maps/Route12Gate1F.asm b/text/maps/Route12Gate1F.asm new file mode 100644 index 00000000..51d75539 --- /dev/null +++ b/text/maps/Route12Gate1F.asm @@ -0,0 +1,4 @@ +_Route12GateText1:: + text "There's a lookout" + line "spot upstairs." + done diff --git a/text/maps/Route12Gate2F.asm b/text/maps/Route12Gate2F.asm new file mode 100644 index 00000000..95a89527 --- /dev/null +++ b/text/maps/Route12Gate2F.asm @@ -0,0 +1,42 @@ +_TM39PreReceiveText:: + text "My #MON's" + line "ashes are stored" + cont "in #MON TOWER." + + para "You can have this" + line "TM. I don't need" + cont "it any more..." + prompt + +_ReceivedTM39Text:: + text " received" + line "TM39!@@" + +_TM39ExplanationText:: + text "TM39 is a move" + line "called SWIFT." + + para "It's very accurate," + line "so use it during" + cont "battles you can't" + cont "afford to lose." + done + +_TM39NoRoomText:: + text "You don't have" + line "room for this." + done + +_Route12GateUpstairsText_495b8:: + text "Looked into the" + line "binoculars." + + para "A man fishing!" + done + +_Route12GateUpstairsText_495c4:: + text "Looked into the" + line "binoculars." + + para "It's #MON TOWER!" + done diff --git a/text/maps/Route12SuperRodHouse.asm b/text/maps/Route12SuperRodHouse.asm new file mode 100644 index 00000000..7dfaa74f --- /dev/null +++ b/text/maps/Route12SuperRodHouse.asm @@ -0,0 +1,61 @@ +_Route12HouseText_564c0:: + text "I'm the FISHING" + line "GURU's brother!" + + para "I simply Looove" + line "fishing!" + + para "Do you like to" + line "fish?" + done + +_Route12HouseText_564c5:: + text "Grand! I like" + line "your style!" + + para "Take this and" + line "fish, young one!" + + para " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_Route12HouseText_564ca:: + text "" + + para "Fishing is a way" + line "of life!" + + para "From the seas to" + line "rivers, go out" + cont "and land the big" + cont "one!" + done + +_Route12HouseText_564cf:: + text "Oh... That's so" + line "disappointing..." + done + +_Route12HouseText_564d4:: + text "Hello there," + line "!" + + para "Use the SUPER ROD" + line "in any water!" + cont "You can catch" + cont "different kinds" + cont "of #MON." + + para "Try fishing" + line "wherever you can!" + done + +_Route12HouseText_564d9:: + text "Oh no!" + + para "I had a gift for" + line "you, but you have" + cont "no room for it!" + done diff --git a/text/maps/Route13.asm b/text/maps/Route13.asm new file mode 100644 index 00000000..e2718919 --- /dev/null +++ b/text/maps/Route13.asm @@ -0,0 +1,179 @@ +_Route13BattleText2:: + text "My bird #MON" + line "want to scrap!" + done + +_Route13EndBattleText2:: + text "My" + line "bird combo lost?" + prompt + +_Route13AfterBattleText2:: + text "My #MON look" + line "happy even though" + cont "they lost." + done + +_Route13BattleText3:: + text "I'm told I'm good" + line "for a kid!" + done + +_Route13EndBattleText3:: + text "Ohh!" + line "I lost!" + prompt + +_Route13AfterBattleText3:: + text "I want to become" + line "a good trainer." + cont "I'll train hard." + done + +_Route13BattleText4:: + text "Wow! Your BADGEs" + line "are too cool!" + done + +_Route13EndBattleText4:: + text "Not" + line "enough!" + prompt + +_Route13AfterBattleText4:: + text "You got those" + line "BADGEs from GYM" + cont "LEADERs. I know!" + done + +_Route13BattleText5:: + text "My cute #MON" + line "wish to make your" + cont "acquaintance." + done + +_Route13EndBattleText5:: + text "Wow!" + line "You totally won!" + prompt + +_Route13AfterBattleText5:: + text "You have to make" + line "#MON fight to" + cont "toughen them up!" + done + +_Route13BattleText6:: + text "I found CARBOS in" + line "a cave once." + done + +_Route13EndBattleText6:: + text "Just" + line "messed up!" + prompt + +_Route13AfterBattleText6:: + text "CARBOS boosted" + line "the SPEED of my" + cont "#MON." + done + +_Route13BattleText7:: + text "The wind's blowing" + line "my way!" + done + +_Route13EndBattleText7:: + text "The" + line "wind turned!" + prompt + +_Route13AfterBattleText7:: + text "I'm beat. I guess" + line "I'll FLY home." + done + +_Route13BattleText8:: + text "Sure, I'll play" + line "with you!" + done + +_Route13EndBattleText8:: + text "Oh!" + line "You little brute!" + prompt + +_Route13AfterBattleText8:: + text "I wonder which is" + line "stronger, male or" + cont "female #MON?" + done + +_Route13BattleText9:: + text "Do you want to" + line "#MON with me?" + done + +_Route13EndBattleText9:: + text "It's over" + line "already?" + prompt + +_Route13AfterBattleText9:: + text "I don't know" + line "anything about" + cont "#MON. I just" + cont "like cool ones!" + done + +_Route13BattleText10:: + text "What're you" + line "lookin' at?" + done + +_Route13EndBattleText10:: + text "Dang!" + line "Stripped gears!" + prompt + +_Route13AfterBattleText10:: + text "Get lost!" + done + +_Route13BattleText11:: + text "I always go with" + line "bird #MON!" + done + +_Route13EndBattleText11:: + text "Out" + line "of power!" + prompt + +_Route13AfterBattleText11:: + text "I wish I could" + line "fly like PIDGEY" + cont "and PIDGEOTTO..." + done + +_Route13Text11:: + text "TRAINER TIPS" + + para "Look to the left" + line "of that post!" + done + +_Route13Text12:: + text "TRAINER TIPS" + + para "Use SELECT to" + line "switch items in" + cont "the ITEM window!" + done + +_Route13Text13:: + text "ROUTE 13" + line "North to SILENCE" + cont "BRIDGE" + done diff --git a/text/maps/Route14.asm b/text/maps/Route14.asm new file mode 100644 index 00000000..18e85ed4 --- /dev/null +++ b/text/maps/Route14.asm @@ -0,0 +1,173 @@ +_Route14BattleText1:: + text "You need to use" + line "TMs to teach good" + cont "moves to #MON!" + done + +_Route14EndBattleText1:: + text "Not" + line "good enough!" + prompt + +_Route14AfterBattleText1:: + text "You have some HMs" + line "right? #MON" + cont "can't ever forget" + cont "those moves." + done + +_Route14BattleText2:: + text "My bird #MON" + line "should be ready" + cont "for battle." + done + +_Route14EndBattleText2:: + text "Not" + line "ready yet!" + prompt + +_Route14AfterBattleText2:: + text "They need to learn" + line "better moves." + done + +_Route14BattleText3:: + text "TMs are on sale" + line "in CELADON!" + cont "But, only a few" + cont "people have HMs!" + done + +_Route14EndBattleText3:: + text "Aww," + line "bummer!" + prompt + +_Route14AfterBattleText3:: + text "Teach #MON" + line "moves of the same" + cont "element type for" + cont "more power." + done + +_Route14BattleText4:: + text "Have you taught" + line "your bird #MON" + cont "how to FLY?" + done + +_Route14EndBattleText4:: + text "Shot" + line "down in flames!" + prompt + +_Route14AfterBattleText4:: + text "Bird #MON are" + line "my true love!" + done + +_Route14BattleText5:: + text "Have you heard of" + line "the legendary" + cont "#MON?" + done + +_Route14EndBattleText5:: + text "Why?" + line "Why'd I lose?" + prompt + +_Route14AfterBattleText5:: + text "The 3 legendary" + line "#MON are all" + cont "birds of prey." + done + +_Route14BattleText6:: + text "I'm not into it," + line "but OK! Let's go!" + done + +_Route14EndBattleText6:: + text "I" + line "knew it!" + prompt + +_Route14AfterBattleText6:: + text "Winning, losing," + line "it doesn't matter" + cont "in the long run!" + done + +_Route14BattleText7:: + text "C'mon, c'mon." + line "Let's go, let's" + cont "go, let's go!" + done + +_Route14EndBattleText7:: + text "Arrg!" + line "Lost! Get lost!" + prompt + +_Route14AfterBattleText7:: + text "What, what, what?" + line "What do you want?" + done + +_Route14BattleText8:: + text "Perfect! I need to" + line "burn some time!" + done + +_Route14EndBattleText8:: + text "What?" + line "You!?" + prompt + +_Route14AfterBattleText8:: + text "Raising #MON" + line "is a drag, man." + done + +_Route14BattleText9:: + text "We ride out here" + line "because there's" + cont "more room!" + done + +_Route14EndBattleText9:: + text "Wipe out!" + prompt + +_Route14AfterBattleText9:: + text "It's cool you" + line "made your #MON" + cont "so strong!" + + para "Might is right!" + line "And you know it!" + done + +_Route14BattleText10:: + text "#MON fight?" + line "Cool! Rumble!" + done + +_Route14EndBattleText10:: + text "Blown" + line "away!" + prompt + +_Route14AfterBattleText10:: + text "You know who'd" + line "win, you and me" + cont "one on one!" + done + +_Route14Text11:: + text "ROUTE 14" + line "West to FUCHSIA" + cont "CITY" + done diff --git a/text/maps/Route15.asm b/text/maps/Route15.asm new file mode 100644 index 00000000..a23b8500 --- /dev/null +++ b/text/maps/Route15.asm @@ -0,0 +1,171 @@ +_Route15BattleText1:: + text "Let me try out the" + line "#MON I just" + cont "got in a trade!" + done + +_Route15EndBattleText1:: + text "Not" + line "good enough!" + prompt + +_Route15AfterBattleText1:: + text "You can't change" + line "the nickname of" + cont "any #MON you" + cont "get in a trade." + + para "Only the Original" + line "Trainer can." + done + +_Route15BattleText2:: + text "You look gentle," + line "so I think I can" + cont "beat you!" + done + +_Route15EndBattleText2:: + text "No," + line "wrong!" + prompt + +_Route15AfterBattleText2:: + text "I'm afraid of" + line "BIKERs, they look" + cont "so ugly and mean!" + done + +_Route15BattleText3:: + text "When I whistle, I" + line "can summon bird" + cont "#MON!" + done + +_Route15EndBattleText3:: + text "Ow!" + line "That's tragic!" + prompt + +_Route15AfterBattleText3:: + text "Maybe I'm not cut" + line "out for battles." + done + +_Route15BattleText4:: + text "Hmm? My birds are" + line "shivering! You're" + cont "good, aren't you?" + done + +_Route15EndBattleText4:: + text "Just" + line "as I thought!" + prompt + +_Route15AfterBattleText4:: + text "Did you know moves" + line "like EARTHQUAKE" + cont "don't have any" + cont "effect on birds?" + done + +_Route15BattleText5:: + text "Oh, you're a" + line "little cutie!" + done + +_Route15EndBattleText5:: + text "You looked" + line "so cute too!" + prompt + +_Route15AfterBattleText5:: + text "I forgive you!" + line "I can take it!" + done + +_Route15BattleText6:: + text "I raise #MON" + line "because I live" + cont "alone!" + done + +_Route15EndBattleText6:: + text "I didn't" + line "ask for this!" + prompt + +_Route15AfterBattleText6:: + text "I just like going" + line "home to be with" + cont "my #MON!" + done + +_Route15BattleText7:: + text "Hey kid! C'mon!" + line "I just got these!" + done + +_Route15EndBattleText7:: + text "Why" + line "not?" + prompt + +_Route15AfterBattleText7:: + text "You only live" + line "once, so I live" + cont "as an outlaw!" + cont "TEAM ROCKET RULES!" + done + +_Route15BattleText8:: + text "Fork over all your" + line "cash when you" + cont "lose to me, kid!" + done + +_Route15EndBattleText8:: + text "That" + line "can't be true!" + prompt + +_Route15AfterBattleText8:: + text "I was just joking" + line "about the money!" + done + +_Route15BattleText9:: + text "What's cool?" + line "Trading #MON!" + done + +_Route15EndBattleText9:: + text "I" + line "said trade!" + prompt + +_Route15AfterBattleText9:: + text "I trade #MON" + line "with my friends!" + done + +_Route15BattleText10:: + text "Want to play with" + line "my #MON?" + done + +_Route15EndBattleText10:: + text "I was" + line "too impatient!" + prompt + +_Route15AfterBattleText10:: + text "I'll go train with" + line "weaker people.@@" + +_Route15Text12:: + text "ROUTE 15" + line "West to FUCHSIA" + cont "CITY" + done diff --git a/text/maps/Route15Gate1F.asm b/text/maps/Route15Gate1F.asm new file mode 100644 index 00000000..0a526142 --- /dev/null +++ b/text/maps/Route15Gate1F.asm @@ -0,0 +1,7 @@ +_Route15GateText1:: + text "Are you working" + line "on a #DEX?" + + para "PROF.OAK's AIDE" + line "came by here." + done diff --git a/text/maps/Route15Gate2F.asm b/text/maps/Route15Gate2F.asm new file mode 100644 index 00000000..ade4a358 --- /dev/null +++ b/text/maps/Route15Gate2F.asm @@ -0,0 +1,24 @@ +_Route15GateUpstairsText_4968c:: + text "EXP.ALL gives" + line "EXP points to all" + cont "the #MON with" + cont "you, even if they" + cont "don't fight." + + para "It does, however," + line "reduce the amount" + cont "of EXP for each" + cont "#MON." + + para "If you don't need" + line "it, you should " + cont "store it via PC." + done + +_Route15GateUpstairsText_49698:: + text "Looked into the" + line "binoculars." + + para "It looks like a" + line "small island!" + done diff --git a/text/maps/Route16.asm b/text/maps/Route16.asm new file mode 100644 index 00000000..45265829 --- /dev/null +++ b/text/maps/Route16.asm @@ -0,0 +1,120 @@ +_Route16BattleText1:: + text "What do you want?" + done + +_Route16EndBattleText1:: + text "Don't you" + line "dare laugh!" + prompt + +_Route16AfterBattleText1:: + text "We like just" + line "hanging here," + cont "what's it to you?" + done + +_Route16BattleText2:: + text "Nice BIKE!" + line "Hand it over!" + done + +_Route16EndBattleText2:: + text "Knock" + line "out!" + prompt + +_Route16AfterBattleText2:: + text "Forget it, who" + line "needs your BIKE!" + done + +_Route16BattleText3:: + text "Come out and play," + line "little mouse!" + done + +_Route16EndBattleText3:: + text "You" + line "little rat!" + prompt + +_Route16AfterBattleText3:: + text "I hate losing!" + line "Get away from me!" + done + +_Route16BattleText4:: + text "Hey, you just" + line "bumped me!" + done + +_Route16EndBattleText4:: + text "Kaboom!" + prompt + +_Route16AfterBattleText4:: + text "You can also get" + line "to FUCHSIA from" + cont "VERMILION using a" + cont "coastal road." + done + +_Route16BattleText5:: + text "I'm feeling" + line "hungry and mean!" + done + +_Route16EndBattleText5:: + text "Bad," + line "bad, bad!" + prompt + +_Route16AfterBattleText5:: + text "I like my #MON" + line "ferocious! They" + cont "tear up enemies!" + done + +_Route16BattleText6:: + text "Sure, I'll go!" + done + +_Route16EndBattleText6:: + text "Don't make" + line "me mad!" + prompt + +_Route16AfterBattleText6:: + text "I like harassing" + line "people with my" + cont "vicious #MON!" + done + +_Route16Text7:: + text "A sleeping #MON" + line "blocks the way!" + done + +_Route16Text10:: + text "SNORLAX woke up!" + + para "It attacked in a" + line "grumpy rage!" + done + +_Route16Text11:: + text "With a big yawn," + line "SNORLAX returned" + cont "to the mountains!" + done + +_Route16Text8:: + text "Enjoy the slope!" + line "CYCLING ROAD" + done + +_Route16Text9:: + text "ROUTE 16" + line "CELADON CITY -" + cont "FUCHSIA CITY" + done diff --git a/text/maps/Route16FlyHouse.asm b/text/maps/Route16FlyHouse.asm new file mode 100644 index 00000000..77efde87 --- /dev/null +++ b/text/maps/Route16FlyHouse.asm @@ -0,0 +1,31 @@ +_Route16HouseText3:: + text "Oh, you found my" + line "secret retreat!" + + para "Please don't tell" + line "anyone I'm here." + cont "I'll make it up" + cont "to you with this!" + prompt + +_ReceivedHM02Text:: + text " received" + line "HM02!@@" + +_HM02ExplanationText:: + text "HM02 is FLY." + line "It will take you" + cont "back to any town." + + para "Put it to good" + line "use!" + done + +_HM02NoRoomText:: + text "You don't have any" + line "room for this." + done + +_Route16HouseText_1e652:: + text "FEAROW: Kyueen!" + done diff --git a/text/maps/Route16Gate1F.asm b/text/maps/Route16Gate1F.asm new file mode 100644 index 00000000..f548977f --- /dev/null +++ b/text/maps/Route16Gate1F.asm @@ -0,0 +1,22 @@ +_Route16GateText_49777:: + text "No pedestrians" + line "are allowed on" + cont "CYCLING ROAD!" + done + +_Route16GateText_4977c:: + text "CYCLING ROAD is a" + line "downhill course" + cont "by the sea. It's" + cont "a great ride." + done + +_Route16GateText_49781:: + text "Excuse me! Wait" + line "up please!" + done + +_Route16GateText2:: + text "How'd you get in?" + line "Good effort!" + done diff --git a/text/maps/Route16Gate2F.asm b/text/maps/Route16Gate2F.asm new file mode 100644 index 00000000..d76b70ca --- /dev/null +++ b/text/maps/Route16Gate2F.asm @@ -0,0 +1,26 @@ +_Route16GateUpstairsText_49820:: + text "I'm going for a" + line "ride with my girl" + cont "friend!" + done + +_Route16GateUpstairsText_4982f:: + text "We're going" + line "riding together!" + done + +_Route16GateUpstairsText_4983b:: + text "Looked into the" + line "binoculars." + + para "It's CELADON DEPT." + line "STORE!" + done + +_Route16GateUpstairsText_49847:: + text "Looked into the" + line "binoculars." + + para "There's a long" + line "path over water!" + done diff --git a/text/maps/Route17.asm b/text/maps/Route17.asm new file mode 100644 index 00000000..a0affd90 --- /dev/null +++ b/text/maps/Route17.asm @@ -0,0 +1,195 @@ +_Route17BattleText1:: + text "There's no money" + line "in fighting kids!" + done + +_Route17EndBattleText1:: + text "Burned" + line "out!" + prompt + +_Route17AfterBattleText1:: + text "Good stuff is" + line "lying around on" + cont "CYCLING ROAD!" + done + +_Route17BattleText2:: + text "What do you want," + line "kiddo?" + done + +_Route17EndBattleText2:: + text "Whoo!" + prompt + +_Route17AfterBattleText2:: + text "I could belly-" + line "bump you outta" + cont "here!" + done + +_Route17BattleText3:: + text "You heading to" + line "FUCHSIA?" + done + +_Route17EndBattleText3:: + text "Crash and" + line "burn!" + prompt + +_Route17AfterBattleText3:: + text "I love racing" + line "downhill!" + done + +_Route17BattleText4:: + text "We're BIKERs!" + line "Highway stars!" + done + +_Route17EndBattleText4:: + text "Smoked!" + prompt + +_Route17AfterBattleText4:: + text "Are you looking" + line "for adventure?" + done + +_Route17BattleText5:: + text "Let VOLTORB" + line "electrify you!" + done + +_Route17EndBattleText5:: + text "Grounded" + line "out!" + prompt + +_Route17AfterBattleText5:: + text "I got my VOLTORB" + line "at the abandoned" + cont "POWER PLANT." + done + +_Route17BattleText6:: + text "My #MON won't" + line "evolve! Why?" + done + +_Route17EndBattleText6:: + text "Why," + line "you!" + prompt + +_Route17AfterBattleText6:: + text "Maybe some #MON" + line "need element" + cont "STONEs to evolve." + done + +_Route17BattleText7:: + text "I need a little" + line "exercise!" + done + +_Route17EndBattleText7:: + text "Whew!" + line "Good workout!" + prompt + +_Route17AfterBattleText7:: + text "I'm sure I lost" + line "weight there!" + done + +_Route17BattleText8:: + text "Be a rebel!" + done + +_Route17EndBattleText8:: + text "Aaaargh!" + prompt + +_Route17AfterBattleText8:: + text "Be ready to fight" + line "for your beliefs!" + done + +_Route17BattleText9:: + text "Nice BIKE!" + line "How's it handle?" + done + +_Route17EndBattleText9:: + text "Shoot!" + prompt + +_Route17AfterBattleText9:: + text "The slope makes" + line "it hard to steer!" + done + +_Route17BattleText10:: + text "Get lost kid!" + line "I'm bushed!" + done + +_Route17EndBattleText10:: + text "Are you" + line "satisfied?" + prompt + +_Route17AfterBattleText10:: + text "I need to catch" + line "a few Zs!" + done + +_Route17Text11:: + text "It's a notice!" + + para "Watch out for" + line "discarded items!" + done + +_Route17Text12:: + text "TRAINER TIPS" + + para "All #MON are" + line "unique." + + para "Even #MON of" + line "the same type and" + cont "level grow at" + cont "different rates." + done + +_Route17Text13:: + text "TRAINER TIPS" + + para "Press the A or B" + line "Button to stay in" + cont "place while on a" + cont "slope." + done + +_Route17Text14:: + text "ROUTE 17" + line "CELADON CITY -" + cont "FUCHSIA CITY" + done + +_Route17Text15:: + text "It's a notice!" + + para "Don't throw the" + line "game, throw #" + cont "BALLs instead!" + done + +_Route17Text16:: + text "CYCLING ROAD" + line "Slope ends here!" + done diff --git a/text/maps/Route18.asm b/text/maps/Route18.asm new file mode 100644 index 00000000..d09caf82 --- /dev/null +++ b/text/maps/Route18.asm @@ -0,0 +1,58 @@ +_Route18BattleText1:: + text "I always check" + line "every grassy area" + cont "for new #MON." + done + +_Route18EndBattleText1:: + text "Tch!" + prompt + +_Route18AfterBattleText1:: + text "I wish I had a" + line "BIKE!" + done + +_Route18BattleText2:: + text "Kurukkoo!" + line "How do you like" + cont "my bird call?" + done + +_Route18EndBattleText2:: + text "I" + line "had to bug you!" + prompt + +_Route18AfterBattleText2:: + text "I also collect sea" + line "#MON on" + cont "weekends!" + done + +_Route18BattleText3:: + text "This is my turf!" + line "Get out of here!" + done + +_Route18EndBattleText3:: + text "Darn!" + prompt + +_Route18AfterBattleText3:: + text "This is my fave" + line "#MON hunting" + cont "area!" + done + +_Route18Text4:: + text "ROUTE 18" + line "CELADON CITY -" + cont "FUCHSIA CITY" + done + +_Route18Text5:: + text "CYCLING ROAD" + line "No pedestrians" + cont "permitted!" + done diff --git a/text/maps/Route18Gate1F.asm b/text/maps/Route18Gate1F.asm new file mode 100644 index 00000000..f2f51039 --- /dev/null +++ b/text/maps/Route18Gate1F.asm @@ -0,0 +1,14 @@ +_Route18GateText_49928:: + text "You need a BICYCLE" + line "for CYCLING ROAD!" + done + +_Route18GateText_4992d:: + text "CYCLING ROAD is" + line "all uphill from" + cont "here." + done + +_Route18GateText_49932:: + text "Excuse me!" + done diff --git a/text/maps/Route18Gate2F.asm b/text/maps/Route18Gate2F.asm new file mode 100644 index 00000000..0fd2de09 --- /dev/null +++ b/text/maps/Route18Gate2F.asm @@ -0,0 +1,15 @@ +_Route18GateUpstairsText_49993:: + text "Looked into the" + line "binoculars." + + para "PALLET TOWN is in" + line "the west!" + done + +_Route18GateUpstairsText_4999f:: + text "Looked into the" + line "binoculars." + + para "There are people" + line "swimming!" + done diff --git a/text/maps/Route19.asm b/text/maps/Route19.asm new file mode 100644 index 00000000..244e31d0 --- /dev/null +++ b/text/maps/Route19.asm @@ -0,0 +1,157 @@ +_Route19BattleText1:: + text "Have to warm up" + line "before my swim!" + done + +_Route19EndBattleText1:: + text "All" + line "warmed up!" + prompt + +_Route19AfterBattleText1:: + text "Thanks, kid! I'm" + line "ready for a swim!" + done + +_Route19BattleText2:: + text "Wait! You'll have" + line "a heart attack!" + done + +_Route19EndBattleText2:: + text "Ooh!" + line "That's chilly!" + prompt + +_Route19AfterBattleText2:: + text "Watch out for" + line "TENTACOOL!" + done + +_Route19BattleText3:: + text "I love swimming!" + line "What about you?" + done + +_Route19EndBattleText3:: + text "Belly" + line "flop!" + prompt + +_Route19AfterBattleText3:: + text "I can beat #MON" + line "at swimming!" + done + +_Route19BattleText4:: + text "What's beyond the" + line "horizon?" + done + +_Route19EndBattleText4:: + text "Glub!" + prompt + +_Route19AfterBattleText4:: + text "I see a couple of" + line "islands!" + done + +_Route19BattleText5:: + text "I tried diving" + line "for #MON, but" + cont "it was a no go!" + done + +_Route19EndBattleText5:: + text "Help!" + prompt + +_Route19AfterBattleText5:: + text "You have to fish" + line "for sea #MON!" + done + +_Route19BattleText6:: + text "I look at the" + line "sea to forget!" + done + +_Route19EndBattleText6:: + text "Ooh!" + line "Traumatic!" + prompt + +_Route19AfterBattleText6:: + text "I'm looking at the" + line "sea to forget!" + done + +_Route19BattleText7:: + text "Oh, I just love" + line "your ride! Can I" + cont "have it if I win?" + done + +_Route19EndBattleText7:: + text "Oh!" + line "I lost!" + prompt + +_Route19AfterBattleText7:: + text "It's still a long" + line "way to go to" + cont "SEAFOAM ISLANDS." + done + +_Route19BattleText8:: + text "Swimming's great!" + line "Sunburns aren't!" + done + +_Route19EndBattleText8:: + text "Shocker!" + prompt + +_Route19AfterBattleText8:: + text "My boy friend" + line "wanted to swim to" + cont "SEAFOAM ISLANDS." + done + +_Route19BattleText9:: + text "These waters are" + line "treacherous!" + done + +_Route19EndBattleText9:: + text "Ooh!" + line "Dangerous!" + prompt + +_Route19AfterBattleText9:: + text "I got a cramp!" + line "Glub, glub..." + done + +_Route19BattleText10:: + text "I swam here, but" + line "I'm tired." + done + +_Route19EndBattleText10:: + text "I'm" + line "exhausted..." + prompt + +_Route19AfterBattleText10:: + text "LAPRAS is so big," + line "it must keep you" + cont "dry on water." + done + +_Route19Text11:: + text "SEA ROUTE 19" + line "FUCHSIA CITY -" + cont "SEAFOAM ISLANDS" + done diff --git a/text/maps/Route2.asm b/text/maps/Route2.asm new file mode 100644 index 00000000..dd7becc0 --- /dev/null +++ b/text/maps/Route2.asm @@ -0,0 +1,9 @@ +_Route2Text3:: + text "ROUTE 2" + line "VIRIDIAN CITY -" + cont "PEWTER CITY" + done + +_Route2Text4:: + text "DIGLETT's CAVE" + done diff --git a/text/maps/Route20.asm b/text/maps/Route20.asm new file mode 100644 index 00000000..1ccf0b6c --- /dev/null +++ b/text/maps/Route20.asm @@ -0,0 +1,156 @@ +_Route20BattleText1:: + text "The water is" + line "shallow here." + done + +_Route20EndBattleText1:: + text "Splash!" + prompt + +_Route20AfterBattleText1:: + text "I wish I could" + line "ride my #MON." + done + +_Route20BattleText2:: + text "SEAFOAM is a" + line "quiet getaway!" + done + +_Route20EndBattleText2:: + text "Quit it!" + prompt + +_Route20AfterBattleText2:: + text "There's a huge" + line "cavern underneath" + cont "this island." + done + +_Route20BattleText3:: + text "I love floating" + line "with the fishes!" + done + +_Route20EndBattleText3:: + text "Yowch!" + prompt + +_Route20AfterBattleText3:: + text "Want to float" + line "with me?" + done + +_Route20BattleText4:: + text "Are you on" + line "vacation too?" + done + +_Route20EndBattleText4:: + text "No" + line "mercy at all!" + prompt + +_Route20AfterBattleText4:: + text "SEAFOAM used to" + line "be one island!" + done + +_Route20BattleText5:: + text "Check out my buff" + line "physique!" + done + +_Route20EndBattleText5:: + text "Wimpy!" + prompt + +_Route20AfterBattleText5:: + text "I should've been" + line "buffing up my" + cont "#MON, not me!" + done + +_Route20BattleText6:: + text "Why are you" + line "riding a #MON?" + cont "Can't you swim?" + done + +_Route20EndBattleText6:: + text "Ouch!" + line "Torpedoed!" + prompt + +_Route20AfterBattleText6:: + text "Riding a #MON" + line "sure looks fun!" + done + +_Route20BattleText7:: + text "I rode my bird" + line "#MON here!" + done + +_Route20EndBattleText7:: + text "Oh" + line "no!" + prompt + +_Route20AfterBattleText7:: + text "My birds can't" + line "FLY me back!" + done + +_Route20BattleText8:: + text "My boy friend gave" + line "me big pearls!" + done + +_Route20EndBattleText8:: + text "Don't" + line "touch my pearls!" + prompt + +_Route20AfterBattleText8:: + text "Will my pearls" + line "grow bigger" + cont "inside CLOYSTER?" + done + +_Route20BattleText9:: + text "I swam here from" + line "CINNABAR ISLAND!" + done + +_Route20EndBattleText9:: + text "I'm" + line "so disappointed!" + prompt + +_Route20AfterBattleText9:: + text "#MON have" + line "taken over an" + cont "abandoned mansion" + cont "on CINNABAR!" + done + +_Route20BattleText10:: + text "CINNABAR, in the" + line "west, has a LAB" + cont "for #MON." + done + +_Route20EndBattleText10:: + text "Wait!" + prompt + +_Route20AfterBattleText10:: + text "CINNABAR is a " + line "volcanic island!" + done + +_Route20Text12:: +_Route20Text11:: + text "SEAFOAM ISLANDS" + done diff --git a/text/maps/Route21.asm b/text/maps/Route21.asm new file mode 100644 index 00000000..3451953f --- /dev/null +++ b/text/maps/Route21.asm @@ -0,0 +1,137 @@ +_Route21BattleText1:: + text "You want to know" + line "if the fish are" + cont "biting?" + done + +_Route21EndBattleText1:: + text "Dang!" + prompt + +_Route21AfterBattleText1:: + text "I can't catch" + line "anything good!" + done + +_Route21BattleText2:: + text "I got a big haul!" + line "Wanna go for it?" + done + +_Route21EndBattleText2:: + text "Darn" + line "MAGIKARP!" + prompt + +_Route21AfterBattleText2:: + text "I seem to only" + line "catch MAGIKARP!" + done + +_Route21BattleText3:: + text "The sea cleanses" + line "my body and soul!" + done + +_Route21EndBattleText3:: + text "Ayah!" + prompt + +_Route21AfterBattleText3:: + text "I like the" + line "mountains too!" + done + +_Route21BattleText4:: + text "What's wrong with" + line "me swimming?" + done + +_Route21EndBattleText4:: + text "Cheap" + line "shot!" + prompt + +_Route21AfterBattleText4:: + text "I look like what?" + line "A studded inner" + cont "tube? Get lost!" + done + +_Route21BattleText5:: + text "I caught all my" + line "#MON at sea!" + done + +_Route21EndBattleText5:: + text "Diver!!" + line "Down!!" + prompt + +_Route21AfterBattleText5:: + text "Where'd you catch" + line "your #MON?" + done + +_Route21BattleText6:: + text "Right now, I'm in" + line "a triathlon meet!" + done + +_Route21EndBattleText6:: + text "Pant..." + line "pant...pant..." + prompt + +_Route21AfterBattleText6:: + text "I'm beat!" + line "But, I still have" + cont "the bike race and" + cont "marathon left!" + done + +_Route21BattleText7:: + text "Ahh! Feel the sun" + line "and the wind!" + done + +_Route21EndBattleText7:: + text "Yow!" + line "I lost!" + prompt + +_Route21AfterBattleText7:: + text "I'm sunburnt to a" + line "crisp!" + done + +_Route21BattleText8:: + text "Hey, don't scare" + line "away the fish!" + done + +_Route21EndBattleText8:: + text "Sorry!" + line "I didn't mean it!" + prompt + +_Route21AfterBattleText8:: + text "I was just angry" + line "that I couldn't" + cont "catch anything." + done + +_Route21BattleText9:: + text "Keep me company" + line "'til I get a hit!" + done + +_Route21EndBattleText9:: + text "That" + line "burned some time." + prompt + +_Route21AfterBattleText9:: + text "Oh wait! I got a" + line "bite! Yeah!" + done diff --git a/text/maps/Route22.asm b/text/maps/Route22.asm new file mode 100644 index 00000000..3a1d28f0 --- /dev/null +++ b/text/maps/Route22.asm @@ -0,0 +1,104 @@ +_Route22RivalBeforeBattleText1:: + text ": Hey!" + line "!" + + para "You're going to" + line "#MON LEAGUE?" + + para "Forget it! You" + line "probably don't" + cont "have any BADGEs!" + + para "The guard won't" + line "let you through!" + + para "By the way, did" + line "your #MON" + cont "get any stronger?" + done + +_Route22RivalAfterBattleText1:: + text "I heard #MON" + line "LEAGUE has many" + cont "tough trainers!" + + para "I have to figure" + line "out how to get" + cont "past them!" + + para "You should quit" + line "dawdling and get" + cont "a move on!" + done + +_Route22RivalDefeatedText1:: + text "Awww!" + line "You just lucked" + cont "out!" + prompt + +_Route22Text_511bc:: + text ": What?" + line "Why do I have 2" + cont "#MON?" + + para "You should catch" + cont "some more too!" + prompt + +_Route22RivalBeforeBattleText2:: + text ": What?" + line "! What a" + cont "surprise to see" + cont "you here!" + + para "So you're going to" + line "#MON LEAGUE?" + + para "You collected all" + line "the BADGEs too?" + cont "That's cool!" + + para "Then I'll whip you" + line " as a" + cont "warm up for" + cont "#MON LEAGUE!" + + para "Come on!" + done + +_Route22RivalAfterBattleText2:: + text "That loosened me" + line "up! I'm ready for" + cont "#MON LEAGUE!" + + para ", you need" + line "more practice!" + + para "But hey, you know" + line "that! I'm out of" + cont "here. Smell ya!" + done + +_Route22RivalDefeatedText2:: + text "What!?" + + para "I was just" + line "careless!" + prompt + +_Route22Text_511d0:: + text ": Hahaha!" + line "! That's" + cont "your best? You're" + cont "nowhere near as" + cont "good as me, pal!" + + para "Go train some" + line "more! You loser!" + prompt + +_Route22FrontGateText:: + text "#MON LEAGUE" + line "Front Gate" + done diff --git a/text/maps/Route22Gate.asm b/text/maps/Route22Gate.asm new file mode 100644 index 00000000..ce3f6824 --- /dev/null +++ b/text/maps/Route22Gate.asm @@ -0,0 +1,20 @@ +_Route22GateText_1e704:: + text "Only truly skilled" + line "trainers are" + cont "allowed through." + + para "You don't have the" + line "BOULDERBADGE yet!@@" + +_Route22GateText_1e715:: + text "" + + para "The rules are" + line "rules. I can't" + cont "let you pass." + done + +_Route22GateText_1e71a:: + text "Oh! That is the" + line "BOULDERBADGE!" + cont "Go right ahead!@@" diff --git a/text/maps/Route23.asm b/text/maps/Route23.asm new file mode 100644 index 00000000..a7e534de --- /dev/null +++ b/text/maps/Route23.asm @@ -0,0 +1,39 @@ +_VictoryRoadGuardText1:: + text "You can pass here" + line "only if you have" + cont "the @" + TX_RAM wcd6d + text "!" + + para "You don't have the" + line "@" + TX_RAM wcd6d + text " yet!" + + para "You have to have" + line "it to get to" + cont "#MON LEAGUE!@@" + +_VictoryRoadGuardText2:: + text "You can pass here" + line "only if you have" + cont "the @" + TX_RAM wcd6d + text "!" + + para "Oh! That is the" + line "@" + TX_RAM wcd6d + text "!@@" + +_VictoryRoadGuardText_513a3:: + text "" + + para "OK then! Please," + line "go right ahead!" + done + +_Route23Text8:: + text "VICTORY ROAD GATE" + line "- #MON LEAGUE" + done diff --git a/text/maps/Route24.asm b/text/maps/Route24.asm new file mode 100644 index 00000000..c14b689a --- /dev/null +++ b/text/maps/Route24.asm @@ -0,0 +1,65 @@ +_Route24Text_51510:: + text "Congratulations!" + line "You beat our 5" + cont "contest trainers!@@" + +_Route24Text_51515:: + text "" + + para "You just earned a" + line "fabulous prize!" + prompt + +_Route24Text_5151a:: + text " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_Route24Text_51521:: + text "You don't have" + line "any room!" + done + +_Route24Text_51526:: + text "By the way, would" + line "you like to join" + cont "TEAM ROCKET?" + + para "We're a group" + line "dedicated to evil" + cont "using #MON!" + + para "Want to join?" + + para "Are you sure?" + + para "Come on, join us!" + + para "I'm telling you" + line "to join!" + + para "OK, you need" + line "convincing!" + + para "I'll make you an" + line "offer you can't" + cont "refuse!" + done + +_Route24Text_5152b:: + text "Arrgh!" + line "You are good!" + prompt + +_Route24Text_51530:: + text "With your ability," + line "you could become" + cont "a top leader in" + cont "TEAM ROCKET!" + done + +_Route24BattleText1:: + text "I saw your feat" + line "from the grass!" + done diff --git a/text/maps/Route24_2.asm b/text/maps/Route24_2.asm new file mode 100644 index 00000000..325dea13 --- /dev/null +++ b/text/maps/Route24_2.asm @@ -0,0 +1,90 @@ +_Route24EndBattleText1:: + text "I" + line "thought not!" + prompt + +_Route24AfterBattleText1:: + text "I hid because the" + line "people on the" + cont "bridge scared me!" + done + +_Route24BattleText2:: + text "OK! I'm No. 5!" + line "I'll stomp you!" + done + +_Route24EndBattleText2:: + text "Whoa!" + line "Too much!" + prompt + +_Route24AfterBattleText2:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText3:: + text "I'm No. 4!" + line "Getting tired?" + done + +_Route24EndBattleText3:: + text "I lost" + line "too!" + prompt + +_Route24AfterBattleText3:: + text "I did my best, so" + line "I've no regrets!" + done + +_Route24BattleText4:: + text "Here's No. 3!" + line "I won't be easy!" + done + +_Route24EndBattleText4:: + text "Ow!" + line "Stomped flat!" + prompt + +_Route24AfterBattleText4:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText5:: + text "I'm second!" + line "Now it's serious!" + done + +_Route24EndBattleText5:: + text "How could I" + line "lose?" + prompt + +_Route24AfterBattleText5:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText6:: + text "This is NUGGET" + line "BRIDGE! Beat us 5" + cont "trainers and win" + cont "a fabulous prize!" + + para "Think you got" + line "what it takes?" + done + +_Route24EndBattleText6:: + text "Whoo!" + line "Good stuff!" + prompt + +_Route24AfterBattleText6:: + text "I did my best, I" + line "have no regrets!" + done diff --git a/text/maps/Route25.asm b/text/maps/Route25.asm new file mode 100644 index 00000000..325ab348 --- /dev/null +++ b/text/maps/Route25.asm @@ -0,0 +1,156 @@ +_Route25BattleText1:: + text "Local trainers" + line "come here to" + cont "practice!" + done + +_Route25EndBattleText1:: + text "You're" + line "decent." + prompt + +_Route25AfterBattleText1:: + text "All #MON have" + line "weaknesses. It's" + cont "best to raise" + cont "different kinds." + done + +_Route25BattleText2:: + text "Dad took me to a" + line "great party on" + cont "S.S.ANNE at" + cont "VERMILION CITY!" + done + +_Route25EndBattleText2:: + text "I'm" + line "not mad!" + prompt + +_Route25AfterBattleText2:: + text "On S.S.ANNE, I" + line "saw trainers from" + cont "around the world." + done + +_Route25BattleText3:: + text "I'm a cool guy." + line "I've got a girl" + cont "friend!" + done + +_Route25EndBattleText3:: + text "Aww," + line "darn..." + prompt + +_Route25AfterBattleText3:: + text "Oh well. My girl" + line "will cheer me up." + done + +_Route25BattleText4:: + text "Hi! My boy" + line "friend is cool!" + done + +_Route25EndBattleText4:: + text "I was in" + line "bad condition!" + prompt + +_Route25AfterBattleText4:: + text "I wish my guy was" + line "as good as you!" + done + +_Route25BattleText5:: + text "I knew I had to" + line "fight you!" + done + +_Route25EndBattleText5:: + text "I knew" + line "I'd lose too!" + prompt + +_Route25AfterBattleText5:: + text "If your #MON" + line "gets confused or" + cont "falls asleep," + cont "switch it!" + done + +_Route25BattleText6:: + text "My friend has a" + line "cute #MON." + cont "I'm so jealous!" + done + +_Route25EndBattleText6:: + text "I'm" + line "not so jealous!" + prompt + +_Route25AfterBattleText6:: + text "You came from MT." + line "MOON? May I have" + cont "a CLEFAIRY?" + done + +_Route25BattleText7:: + text "I just got down" + line "from MT.MOON," + cont "but I'm ready!" + done + +_Route25EndBattleText7:: + text "You" + line "worked hard!" + prompt + +_Route25AfterBattleText7:: + text "Drat!" + line "A ZUBAT bit me" + cont "back in there." + done + +_Route25BattleText8:: + text "I'm off to see a" + line "#MON collector" + cont "at the cape!" + done + +_Route25EndBattleText8:: + text "You" + line "got me." + prompt + +_Route25AfterBattleText8:: + text "The collector has" + line "many rare kinds" + cont "of #MON." + done + +_Route25BattleText9:: + text "You're going to" + line "see BILL? First," + cont "let's fight!" + done + +_Route25EndBattleText9:: + text "You're" + line "something." + prompt + +_Route25AfterBattleText9:: + text "The trail below" + line "is a shortcut to" + cont "CERULEAN CITY." + done + +_Route25Text11:: + text "SEA COTTAGE" + line "BILL lives here!" + done diff --git a/text/maps/Route2Gate.asm b/text/maps/Route2Gate.asm new file mode 100644 index 00000000..566830f8 --- /dev/null +++ b/text/maps/Route2Gate.asm @@ -0,0 +1,12 @@ +_Route2GateText_5d616:: + text "The HM FLASH" + line "lights even the" + cont "darkest dungeons." + done + +_Route2GateText2:: + text "Once a #MON" + line "learns FLASH, you" + cont "can get through" + cont "ROCK TUNNEL." + done diff --git a/text/maps/Route2TradeHouse.asm b/text/maps/Route2TradeHouse.asm new file mode 100644 index 00000000..46fc1062 --- /dev/null +++ b/text/maps/Route2TradeHouse.asm @@ -0,0 +1,6 @@ +_Route2HouseText1:: + text "A fainted #MON" + line "can't fight. But, " + cont "it can still use " + cont "moves like CUT!" + done diff --git a/text/maps/Route3.asm b/text/maps/Route3.asm new file mode 100644 index 00000000..966a0786 --- /dev/null +++ b/text/maps/Route3.asm @@ -0,0 +1,145 @@ +_Route3Text1:: + text "Whew... I better" + line "take a rest..." + cont "Groan..." + + para "That tunnel from" + line "CERULEAN takes a" + cont "lot out of you!" + done + +_Route3BattleText1:: + text "Hey! I met you in" + line "VIRIDIAN FOREST!" + done + +_Route3EndBattleText1:: + text "You" + line "beat me again!" + prompt + +_Route3AfterBattleText1:: + text "There are other" + line "kinds of #MON" + cont "than those found" + cont "in the forest!" + done + +_Route3BattleText2:: + text "Hi! I like shorts!" + line "They're comfy and" + cont "easy to wear!" + done + +_Route3EndBattleText2:: + text "I don't" + line "believe it!" + prompt + +_Route3AfterBattleText2:: + text "Are you storing" + line "your #MON on" + cont "PC? Each BOX can" + cont "hold 20 #MON!" + done + +_Route3BattleText3:: + text "You looked at me," + line "didn't you?" + done + +_Route3EndBattleText3:: + text "You're" + line "mean!" + prompt + +_Route3AfterBattleText3:: + text "Quit staring if" + line "you don't want to" + cont "fight!" + done + +_Route3BattleText4:: + text "Are you a trainer?" + line "Let's fight!" + done + +_Route3EndBattleText4:: + text "If I" + line "had new #MON I" + cont "would've won!" + prompt + +_Route3AfterBattleText4:: + text "If a #MON BOX" + line "on the PC gets" + cont "full, just switch" + cont "to another BOX!" + done + +_Route3BattleText5:: + text "That look you" + line "gave me, it's so" + cont "intriguing!" + done + +_Route3EndBattleText5:: + text "Be nice!" + prompt + +_Route3AfterBattleText5:: + text "Avoid fights by" + line "not letting" + cont "people see you!" + done + +_Route3BattleText6:: + text "Hey! You're not" + line "wearing shorts!" + done + +_Route3EndBattleText6:: + text "Lost!" + line "Lost! Lost!" + prompt + +_Route3AfterBattleText6:: + text "I always wear" + line "shorts, even in" + cont "winter!" + done + +_Route3BattleText7:: + text "You can fight my" + line "new #MON!" + done + +_Route3EndBattleText7:: + text "Done" + line "like dinner!" + prompt + +_Route3AfterBattleText7:: + text "Trained #MON" + line "are stronger than" + cont "the wild ones!" + done + +_Route3BattleText8:: + text "Eek! Did you" + line "touch me?" + done + +_Route3EndBattleText8:: + text "That's it?" + prompt + +_Route3AfterBattleText8:: + text "ROUTE 4 is at the" + line "foot of MT.MOON." + done + +_Route3Text10:: + text "ROUTE 3" + line "MT.MOON AHEAD" + done diff --git a/text/maps/Route4.asm b/text/maps/Route4.asm new file mode 100644 index 00000000..0a36f4cd --- /dev/null +++ b/text/maps/Route4.asm @@ -0,0 +1,35 @@ +_Route4Text1:: + text "Ouch! I tripped" + line "over a rocky" + cont "#MON, GEODUDE!" + done + +_Route4BattleText1:: + text "I came to get my" + line "mushroom #MON!" + done + +_Route4EndBattleText1:: + text "Oh! My cute" + line "mushroom #MON!" + prompt + +_Route4AfterBattleText1:: + text "There might not" + line "be any more" + cont "mushrooms here." + + para "I think I got" + line "them all." + done + +_Route4Text5:: + text "MT.MOON" + line "Tunnel Entrance" + done + +_Route4Text6:: + text "ROUTE 4" + line "MT.MOON -" + cont "CERULEAN CITY" + done diff --git a/text/maps/Route5.asm b/text/maps/Route5.asm new file mode 100644 index 00000000..54ff0f84 --- /dev/null +++ b/text/maps/Route5.asm @@ -0,0 +1,5 @@ +_Route5Text1:: + text "UNDERGROUND PATH" + line "CERULEAN CITY -" + cont "VERMILION CITY" + done diff --git a/text/maps/Route6.asm b/text/maps/Route6.asm new file mode 100644 index 00000000..c48b5d3d --- /dev/null +++ b/text/maps/Route6.asm @@ -0,0 +1,97 @@ +_Route6BattleText1:: + text "Who's there?" + line "Quit listening in" + cont "on us!" + done + +_Route6EndBattleText1:: + text "I" + line "just can't win!" + prompt + +_Route6AfterBattleText1:: + text "Whisper..." + line "whisper..." + done + +_Route6BattleText2:: + text "Excuse me! This" + line "is a private" + cont "conversation!" + done + +_Route6EndBattleText2:: + text "Ugh!" + line "I hate losing!" + prompt + +_Route6BattleText3:: + text "There aren't many" + line "bugs out here." + done + +_Route6EndBattleText3:: + text "No!" + line "You're kidding!" + prompt + +_Route6AfterBattleText3:: + text "I like bugs, so" + line "I'm going back to" + cont "VIRIDIAN FOREST." + done + +_Route6BattleText4:: + text "Huh? You want" + line "to talk to me?" + done + +_Route6EndBattleText4:: + text "I" + line "didn't start it!" + prompt + +_Route6AfterBattleText4:: + text "I should carry" + line "more #MON with" + cont "me for safety." + done + +_Route6BattleText5:: + text "Me? Well, OK." + line "I'll play!" + done + +_Route6EndBattleText5:: + text "Just" + line "didn't work!" + prompt + +_Route6AfterBattleText5:: + text "I want to get" + line "stronger! What's" + cont "your secret?" + done + +_Route6BattleText6:: + text "I've never seen" + line "you around!" + cont "Are you good?" + done + +_Route6EndBattleText6:: + text "You" + line "are too good!" + prompt + +_Route6AfterBattleText6:: + text "Are my #MON" + line "weak? Or, am I" + cont "just bad?" + done + +_Route6Text7:: + text "UNDERGROUND PATH" + line "CERULEAN CITY -" + cont "VERMILION CITY" + done diff --git a/text/maps/Route7.asm b/text/maps/Route7.asm new file mode 100644 index 00000000..6500be96 --- /dev/null +++ b/text/maps/Route7.asm @@ -0,0 +1,5 @@ +_Route7Text1:: + text "UNDERGROUND PATH" + line "CELADON CITY -" + cont "LAVENDER TOWN" + done diff --git a/text/maps/Route8.asm b/text/maps/Route8.asm new file mode 100644 index 00000000..57a9a5f9 --- /dev/null +++ b/text/maps/Route8.asm @@ -0,0 +1,154 @@ +_Route8BattleText1:: + text "You look good at" + line "#MON, but" + cont "how's your chem?" + done + +_Route8EndBattleText1:: + text "Ow!" + line "Meltdown!" + prompt + +_Route8AfterBattleText1:: + text "I am better at" + line "school than this!" + done + +_Route8BattleText2:: + text "All right! Let's" + line "roll the dice!" + done + +_Route8EndBattleText2:: + text "Drat!" + line "Came up short!" + prompt + +_Route8AfterBattleText2:: + text "Lady Luck's not" + line "with me today!" + done + +_Route8BattleText3:: + text "You need strategy" + line "to win at this!" + done + +_Route8EndBattleText3:: + text "It's" + line "not logical!" + prompt + +_Route8AfterBattleText3:: + text "Go with GRIMER" + line "first...and..." + cont "...and...then..." + done + +_Route8BattleText4:: + text "I like NIDORAN, so" + line "I collect them!" + done + +_Route8EndBattleText4:: + text "Why? Why??" + prompt + +_Route8AfterBattleText4:: + text "When #MON grow" + line "up they get ugly!" + cont "They shouldn't" + cont "evolve!" + done + +_Route8BattleText5:: + text "School is fun, but" + line "so are #MON." + done + +_Route8EndBattleText5:: + text "I'll" + line "stay with school." + prompt + +_Route8AfterBattleText5:: + text "We're stuck here" + line "because of the" + cont "gates at SAFFRON." + done + +_Route8BattleText6:: + text "MEOWTH is so cute," + line "meow, meow, meow!" + done + +_Route8EndBattleText6:: + text "Meow!" + prompt + +_Route8AfterBattleText6:: + text "I think PIDGEY" + line "and RATTATA" + cont "are cute too!" + done + +_Route8BattleText7:: + text "We must look" + line "silly standing" + cont "here like this!" + done + +_Route8EndBattleText7:: + text "Look what" + line "you did!" + prompt + +_Route8AfterBattleText7:: + text "SAFFRON's gate" + line "keeper won't let" + cont "us through." + cont "He's so mean!" + done + +_Route8BattleText8:: + text "I'm a rambling," + line "gambling dude!" + done + +_Route8EndBattleText8:: + text "Missed" + line "the big score!" + prompt + +_Route8AfterBattleText8:: + text "Gambling and" + line "#MON are like" + cont "eating peanuts!" + cont "Just can't stop!" + done + +_Route8BattleText9:: + text "What's a cute," + line "round and fluffy" + cont "#MON?" + done + +_Route8EndBattleText9:: + text "Stop!" + + para "Don't be so mean" + line "to my CLEFAIRY!" + prompt + +_Route8AfterBattleText9:: + text "I heard that" + line "CLEFAIRY evolves" + cont "when it's exposed" + cont "to a MOON STONE." + done + +_Route8Text10:: + text "UNDERGROUND PATH" + line "CELADON CITY -" + cont "LAVENDER TOWN" + done diff --git a/text/maps/Route9.asm b/text/maps/Route9.asm new file mode 100644 index 00000000..9975000d --- /dev/null +++ b/text/maps/Route9.asm @@ -0,0 +1,157 @@ +_Route9BattleText1:: + text "You have #MON" + line "with you!" + cont "You're mine!" + done + +_Route9EndBattleText1:: + text "You" + line "deceived me!" + prompt + +_Route9AfterBattleText1:: + text "You need light to" + line "get through that" + cont "dark tunnel ahead." + done + +_Route9BattleText2:: + text "Who's that walking" + line "with those good" + cont "looking #MON?" + done + +_Route9EndBattleText2:: + text "Out" + line "like a light!" + prompt + +_Route9AfterBattleText2:: + text "Keep walking!" + done + +_Route9BattleText3:: + text "I'm taking ROCK" + line "TUNNEL to go to" + cont "LAVENDER..." + done + +_Route9EndBattleText3:: + text "Can't" + line "measure up!" + prompt + +_Route9AfterBattleText3:: + text "Are you off to" + line "ROCK TUNNEL too?" + done + +_Route9BattleText4:: + text "Don't you dare" + line "condescend me!" + done + +_Route9EndBattleText4:: + text "No!" + line "You're too much!" + prompt + +_Route9AfterBattleText4:: + text "You're obviously" + line "talented! Good" + cont "luck to you!" + done + +_Route9BattleText5:: + text "Bwahaha!" + line "Great! I was" + cont "bored, eh!" + done + +_Route9EndBattleText5:: + text "Keep it" + line "coming, eh!" + + para "Oh wait. I'm out" + line "of #MON!" + prompt + +_Route9AfterBattleText5:: + text "You sure had guts" + line "standing up to me" + cont "there, eh?" + done + +_Route9BattleText6:: + text "Hahaha!" + line "Aren't you a" + cont "little toughie!" + done + +_Route9EndBattleText6:: + text "What's" + line "that?" + prompt + +_Route9AfterBattleText6:: + text "Hahaha! Kids" + line "should be tough!" + done + +_Route9BattleText7:: + text "I got up early" + line "every day to" + cont "raise my #MON" + cont "from cocoons!" + done + +_Route9EndBattleText7:: + text "WHAT?" + + para "What a total" + line "waste of time!" + prompt + +_Route9AfterBattleText7:: + text "I have to collect" + line "more than bugs to" + cont "get stronger..." + done + +_Route9BattleText8:: + text "Hahahaha!" + line "Come on, dude!" + done + +_Route9EndBattleText8:: + text "Hahahaha!" + line "You beat me fair!" + prompt + +_Route9AfterBattleText8:: + text "Hahahaha!" + line "Us hearty guys" + cont "always laugh!" + done + +_Route9BattleText9:: + text "Go, my super bug" + line "#MON!" + done + +_Route9EndBattleText9:: + text "My" + line "bugs..." + prompt + +_Route9AfterBattleText9:: + text "If you don't like" + line "bug #MON, you" + cont "bug me!" + done + +_Route9Text11:: + text "ROUTE 9" + line "CERULEAN CITY-" + cont "ROCK TUNNEL" + done diff --git a/text/maps/SSAnne1F.asm b/text/maps/SSAnne1F.asm new file mode 100644 index 00000000..2bbdcbac --- /dev/null +++ b/text/maps/SSAnne1F.asm @@ -0,0 +1,21 @@ +_SSAnne1Text1:: + text "Bonjour!" + line "I am le waiter on" + cont "this ship!" + + para "I will be happy" + line "to serve you any-" + cont "thing you please!" + + para "Ah! Le strong" + line "silent type!" + done + +_SSAnne1Text2:: + text "The passengers" + line "are restless!" + + para "You might be" + line "challenged by the" + cont "more bored ones!" + done diff --git a/text/maps/SSAnne1FRooms.asm b/text/maps/SSAnne1FRooms.asm new file mode 100644 index 00000000..7a09303e --- /dev/null +++ b/text/maps/SSAnne1FRooms.asm @@ -0,0 +1,104 @@ +_SSAnne8Text8:: + text "WIGGLYTUFF: Puup" + line "pupuu!@@" + +_SSAnne8BattleText1:: + text "I travel alone" + line "on my journeys!" + + para "My #MON are my" + line "only friends!" + done + +_SSAnne8EndBattleText1:: + text "My, my" + line "friends..." + prompt + +_SSAnne8AfterBattleText1:: + text "You should be" + line "nice to friends!" + done + +_SSAnne8BattleText2:: + text "You pup! How dare" + line "you barge in!" + done + +_SSAnne8EndBattleText2:: + text "Humph!" + line "You rude child!" + prompt + +_SSAnne8AfterBattleText2:: + text "I wish to be left" + line "alone! Get out!" + done + +_SSAnne8BattleText3:: + text "I love #MON!" + line "Do you?" + done + +_SSAnne8EndBattleText3:: + text "Wow! " + line "You're great!" + prompt + +_SSAnne8AfterBattleText3:: + text "Let me be your" + line "friend, OK?" + + para "Then we can trade" + line "#MON!" + done + +_SSAnne8BattleText4:: + text "I collected these" + line "#MON from all" + cont "around the world!" + done + +_SSAnne8EndBattleText4:: + text "Oh no!" + line "I went around the" + cont "world for these!" + prompt + +_SSAnne8AfterBattleText4:: + text "You hurt my poor" + line "worldly #MON!" + + para "I demand that you" + line "heal them at a" + cont "#MON CENTER!" + done + +_SSAnne8Text5:: + text "Waiter, I would" + line "like a cherry pie" + cont "please!" + done + +_SSAnne8Text6:: + text "A cruise is so" + line "elegant yet cozy!" + done + +_SSAnne8Text7:: + text "I always travel" + line "with WIGGLYTUFF!" + done + +_SSAnne8Text9:: + text "We are cruising" + line "around the world." + done + +_SSAnne8Text11:: + text "Ssh! I'm a GLOBAL" + line "POLICE agent!" + + para "I'm on the trail" + line "of TEAM ROCKET!" + done diff --git a/text/maps/SSAnne2F.asm b/text/maps/SSAnne2F.asm new file mode 100644 index 00000000..58d804ba --- /dev/null +++ b/text/maps/SSAnne2F.asm @@ -0,0 +1,63 @@ +_SSAnne2Text1:: + text "This ship, she is" + line "a luxury liner" + cont "for trainers!" + + para "At every port, we" + line "hold parties with" + cont "invited trainers!" + done + +_SSAnneRivalBeforeBattleText:: + text ": Bonjour!" + line "!" + + para "Imagine seeing" + line "you here!" + + para ", were you" + line "really invited?" + + para "So how's your" + line "#DEX coming?" + + para "I already caught" + line "40 kinds, pal!" + + para "Different kinds" + line "are everywhere!" + + para "Crawl around in" + line "grassy areas!" + done + +_SSAnneRivalDefeatedText:: + text "Humph!" + + para "At least you're" + line "raising your" + cont "#MON!" + prompt + +_SSAnneRivalWonText:: + text "! What are" + line "you, seasick?" + + para "You should shape" + line "up, pal!" + prompt + +_SSAnneRivalCaptainText:: + text ": I heard" + line "there was a CUT" + cont "master on board." + + para "But, he was just a" + line "seasick, old man!" + + para "But, CUT itself is" + line "really useful!" + + para "You should go see" + line "him! Smell ya!" + done diff --git a/text/maps/SSAnne2FRooms.asm b/text/maps/SSAnne2FRooms.asm new file mode 100644 index 00000000..a9be8cee --- /dev/null +++ b/text/maps/SSAnne2FRooms.asm @@ -0,0 +1,113 @@ +_SSAnne9Text_61bf2:: + text "In all my travels" + line "I've never seen" + cont "any #MON sleep" + cont "like this one!" + + para "It was something" + line "like this!" + prompt + +_SSAnne9Text_61c01:: + text "Ah yes, I have" + line "seen some #MON" + cont "ferry people" + cont "across the water!" + done + +_SSAnne9Text_61c10:: + text "#MON can CUT" + line "down small bushes." + done + +_SSAnne9Text_61c1f:: + text "Have you gone to" + line "the SAFARI ZONE" + cont "in FUCHSIA CITY?" + + para "It had many rare" + line "kinds of #MON!!" + done + +_SSAnne9Text_61c2e:: + text "Me and my Daddy" + line "think the SAFARI" + cont "ZONE is awesome!" + done + +_SSAnne9Text_61c3d:: + text "The CAPTAIN looked" + line "really sick and" + cont "pale!" + done + +_SSAnne9Text_61c4c:: + text "I hear many people" + line "get seasick!" + done + +_SSAnne9BattleText1:: + text "Competing against" + line "the young keeps" + cont "me youthful." + done + +_SSAnne9EndBattleText1:: + text "Good" + line "fight! Ah, I feel" + cont "young again!" + prompt + +_SSAnne9AfterBattleText1:: + text "15 years ago, I" + line "would have won!" + done + +_SSAnne9BattleText2:: + text "Check out what I" + line "fished up!" + done + +_SSAnne9EndBattleText2:: + text "I'm" + line "all out!" + prompt + +_SSAnne9AfterBattleText2:: + text "Party?" + + para "The cruise ship's" + line "party should be" + cont "over by now." + done + +_SSAnne9BattleText3:: + text "Which do you like," + line "a strong or a" + cont "rare #MON?" + done + +_SSAnne9EndBattleText3:: + text "I must" + line "salute you!" + prompt + +_SSAnne9AfterBattleText3:: + text "I prefer strong" + line "and rare #MON." + done + +_SSAnne9BattleText4:: + text "I never saw you" + line "at the party." + done + +_SSAnne9EndBattleText4:: + text "Take" + line "it easy!" + prompt + +_SSAnne9AfterBattleText4:: + text "Oh, I adore your" + line "strong #MON!" + done diff --git a/text/maps/SSAnne3F.asm b/text/maps/SSAnne3F.asm new file mode 100644 index 00000000..76490594 --- /dev/null +++ b/text/maps/SSAnne3F.asm @@ -0,0 +1,7 @@ +_SSAnne3Text1:: + text "Our CAPTAIN is a" + line "sword master!" + + para "He even teaches" + line "CUT to #MON!" + done diff --git a/text/maps/SSAnneB1FRooms.asm b/text/maps/SSAnneB1FRooms.asm new file mode 100644 index 00000000..7df629b5 --- /dev/null +++ b/text/maps/SSAnneB1FRooms.asm @@ -0,0 +1,112 @@ +_SSAnne10Text8:: + text "MACHOKE: Gwoh!" + line "Goggoh!@@" + +_SSAnne10BattleText1:: + text "You know what they" + line "say about sailors" + cont "and fighting!" + done + +_SSAnne10EndBattleText1:: + text "Right!" + line "Good fight, mate!" + prompt + +_SSAnne10AfterBattleText1:: + text "Haha! Want to be" + line "a sailor, mate?" + done + +_SSAnne10BattleText2:: + text "My sailor's pride" + line "is at stake!" + done + +_SSAnne10EndBattleText2:: + text "Your" + line "spirit sank me!" + prompt + +_SSAnne10AfterBattleText2:: + text "Did you see the" + line "FISHING GURU in" + cont "VERMILION CITY?" + done + +_SSAnne10BattleText3:: + text "Us sailors have" + line "#MON too!" + done + +_SSAnne10EndBattleText3:: + text "OK, " + line "you're not bad." + prompt + +_SSAnne10AfterBattleText3:: + text "We caught all our" + line "#MON while" + cont "out at sea!" + done + +_SSAnne10BattleText4:: + text "I like feisty" + line "kids like you!@@" + +_SSAnne10EndBattleText4:: + text "Argh!" + line "Lost it!" + prompt + +_SSAnne10AfterBattleText4:: + text "Sea #MON live" + line "in deep water." + cont "You'll need a ROD!" + done + +_SSAnne10BattleText5:: + text "Matey, you're" + line "walking the plank" + cont "if you lose!" + done + +_SSAnne10EndBattleText5:: + text "Argh!" + line "Beaten by a kid!" + prompt + +_SSAnne10AfterBattleText5:: + text "Jellyfish some-" + line "times drift into" + cont "the ship." + done + +_SSAnne10BattleText6:: + text "Hello stranger!" + line "Stop and chat!" + + para "All my #MON" + line "are from the sea!" + done + +_SSAnne10EndBattleText6:: + text "Darn!" + line "I let that one" + cont "get away!" + prompt + +_SSAnne10AfterBattleText6:: + text "I was going to" + line "make you my" + cont "assistant too!" + done + +_SSAnne10Text7:: + text "My buddy, MACHOKE," + line "is super strong!" + + para "He has enough" + line "STRENGTH to move" + cont "big rocks!" + done diff --git a/text/maps/SSAnneBow.asm b/text/maps/SSAnneBow.asm new file mode 100644 index 00000000..76cd5631 --- /dev/null +++ b/text/maps/SSAnneBow.asm @@ -0,0 +1,52 @@ +_SSAnne5Text1:: + text "The party's over." + line "The ship will be" + cont "departing soon." + done + +_SSAnne5Text2:: + text "Scrubbing decks" + line "is hard work!" + done + +_SSAnne5Text3:: + text "Urf. I feel ill." + + para "I stepped out to" + line "get some air." + done + +_SSAnne5BattleText1:: + text "Hey matey!" + + para "Let's do a little" + line "jig!" + done + +_SSAnne5EndBattleText1:: + text "You're" + line "impressive!" + prompt + +_SSAnne5AfterBattleText1:: + text "How many kinds of" + line "#MON do you" + cont "think there are?" + done + +_SSAnne5BattleText2:: + text "Ahoy there!" + line "Are you seasick?" + done + +_SSAnne5EndBattleText2:: + text "I was" + line "just careless!" + prompt + +_SSAnne5AfterBattleText2:: + text "My Pa said there" + line "are 100 kinds of" + cont "#MON. I think" + cont "there are more." + done diff --git a/text/maps/SSAnneCaptainsRoom.asm b/text/maps/SSAnneCaptainsRoom.asm new file mode 100644 index 00000000..7bf004da --- /dev/null +++ b/text/maps/SSAnneCaptainsRoom.asm @@ -0,0 +1,62 @@ +_SSAnne7RubText:: + text "CAPTAIN: Ooargh..." + line "I feel hideous..." + cont "Urrp! Seasick..." + + para " rubbed" + line "the CAPTAIN's" + cont "back!" + + para "Rub-rub..." + line "Rub-rub...@@" + +_ReceivingHM01Text:: + text "CAPTAIN: Whew!" + line "Thank you! I" + cont "feel much better!" + + para "You want to see" + line "my CUT technique?" + + para "I could show you" + line "if I wasn't ill..." + + para "I know! You can" + line "have this!" + + para "Teach it to your" + line "#MON and you" + cont "can see it CUT" + cont "any time!" + prompt + +_ReceivedHM01Text:: + text " got" + line "@" + TX_RAM wcf4b + text "!@@" + +_SSAnne7Text_61932:: + text "CAPTAIN: Whew!" + + para "Now that I'm not" + line "sick any more, I" + cont "guess it's time." + done + +_HM01NoRoomText:: + text "Oh no! You have" + line "no room for this!" + done + +_SSAnne7Text2:: + text "Yuck! Shouldn't" + line "have looked!" + done + +_SSAnne7Text3:: + text "How to Conquer" + line "Seasickness..." + cont "The CAPTAIN's" + cont "reading this!" + done diff --git a/text/maps/SSAnneKitchen.asm b/text/maps/SSAnneKitchen.asm new file mode 100644 index 00000000..7fcc9973 --- /dev/null +++ b/text/maps/SSAnneKitchen.asm @@ -0,0 +1,69 @@ +_SSAnne6Text1:: + text "You, mon petit!" + line "We're busy here!" + cont "Out of the way!" + done + +_SSAnne6Text2:: + text "I saw an odd ball" + line "in the trash." + done + +_SSAnne6Text3:: + text "I'm so busy I'm" + line "getting dizzy!" + done + +_SSAnne6Text4:: + text "Hum-de-hum-de-" + line "ho..." + + para "I peel spuds" + line "every day!" + cont "Hum-hum..." + done + +_SSAnne6Text5:: + text "Did you hear about" + line "SNORLAX?" + + para "All it does is" + line "eat and sleep!" + done + +_SSAnne6Text6:: + text "Snivel...Sniff..." + + para "I only get to" + line "peel onions..." + cont "Snivel..." + done + +_SSAnne6Text_61807:: + text "Er-hem! Indeed I" + line "am le CHEF!" + + para "Le main course is" + prompt + +_SSAnne6Text_6180c:: + text "Salmon du Salad!" + + para "Les guests may" + line "gripe it's fish" + cont "again, however!" + done + +_SSAnne6Text_61811:: + text "Eels au Barbecue!" + + para "Les guests will" + line "mutiny, I fear." + done + +_SSAnne6Text_61816:: + text "Prime Beef Steak!" + + para "But, have I enough" + line "fillets du beef?" + done diff --git a/text/maps/SafariZoneCenter.asm b/text/maps/SafariZoneCenter.asm new file mode 100644 index 00000000..09918f93 --- /dev/null +++ b/text/maps/SafariZoneCenter.asm @@ -0,0 +1,11 @@ +_SafariZoneCenterText2:: + text "REST HOUSE" + done + +_SafariZoneCenterText3:: + text "TRAINER TIPS" + + para "Press the START" + line "Button to check" + cont "remaining time!" + done diff --git a/text/maps/SafariZoneCenterRestHouse.asm b/text/maps/SafariZoneCenterRestHouse.asm new file mode 100644 index 00000000..b6c87818 --- /dev/null +++ b/text/maps/SafariZoneCenterRestHouse.asm @@ -0,0 +1,11 @@ +_SafariZoneRestHouse1Text1:: + text "SARA: Where did" + line "my boy friend," + cont "ERIK, go?" + done + +_SafariZoneRestHouse1Text2:: + text "I'm catching" + line "#MON to take" + cont "home as gifts!" + done diff --git a/text/maps/SafariZoneEast.asm b/text/maps/SafariZoneEast.asm new file mode 100644 index 00000000..eebe5de7 --- /dev/null +++ b/text/maps/SafariZoneEast.asm @@ -0,0 +1,16 @@ +_SafariZoneEastText5:: + text "REST HOUSE" + done + +_SafariZoneEastText6:: + text "TRAINER TIPS" + + para "The remaining time" + line "declines only" + cont "while you walk!" + done + +_SafariZoneEastText7:: + text "CENTER AREA" + line "NORTH: AREA 2" + done diff --git a/text/maps/SafariZoneEastRestHouse.asm b/text/maps/SafariZoneEastRestHouse.asm new file mode 100644 index 00000000..d5f7abc8 --- /dev/null +++ b/text/maps/SafariZoneEastRestHouse.asm @@ -0,0 +1,18 @@ +_SafariZoneRestHouse3Text1:: + text "How many did you" + line "catch? I'm bushed" + cont "from the work!" + done + +_SafariZoneRestHouse3Text2:: + text "I caught a" + line "CHANSEY!" + + para "That makes this" + line "all worthwhile!" + done + +_SafariZoneRestHouse3Text3:: + text "Whew! I'm tired" + line "from all the fun!" + done diff --git a/text/maps/SafariZoneGate.asm b/text/maps/SafariZoneGate.asm new file mode 100644 index 00000000..5c143891 --- /dev/null +++ b/text/maps/SafariZoneGate.asm @@ -0,0 +1,94 @@ +_SafariZoneEntranceText1:: + text "Welcome to the" + line "SAFARI ZONE!" + done + +SafariZoneEntranceText_9e6e4:: + text "For just ¥500," + line "you can catch all" + cont "the #MON you" + cont "want in the park!" + + para "Would you like to" + line "join the hunt?@@" + +SafariZoneEntranceText_9e747:: + text "That'll be ¥500" + line "please!" + + para "We only use a" + line "special # BALL" + cont "here." + + para " received" + line "30 SAFARI BALLs!@@" + +_SafariZoneEntranceText_75360:: + text "" + + para "We'll call you on" + line "the PA when you" + cont "run out of time" + cont "or SAFARI BALLs!" + done + +_SafariZoneEntranceText_75365:: + text "OK! Please come" + line "again!" + done + +_SafariZoneEntranceText_7536a:: + text "Oops! Not enough" + line "money!" + done + +SafariZoneEntranceText_9e814:: + text "Leaving early?@@" + +_SafariZoneEntranceText_753bb:: + text "Please return any" + line "SAFARI BALLs you" + cont "have left." + done + +_SafariZoneEntranceText_753c0:: + text "Good Luck!" + done + +_SafariZoneEntranceText_753c5:: + text "Did you get a" + line "good haul?" + cont "Come again!" + done + +_SafariZoneEntranceText_753e6:: + text "Hi! Is it your" + line "first time here?" + done + +_SafariZoneEntranceText_753eb:: + text "SAFARI ZONE has 4" + line "zones in it." + + para "Each zone has" + line "different kinds" + cont "of #MON. Use" + cont "SAFARI BALLs to" + cont "catch them!" + + para "When you run out" + line "of time or SAFARI" + cont "BALLs, it's game" + cont "over for you!" + + para "Before you go," + line "open an unused" + cont "#MON BOX so" + cont "there's room for" + cont "new #MON!" + done + +_SafariZoneEntranceText_753f0:: + text "Sorry, you're a" + line "regular here!" + done diff --git a/text/maps/SafariZoneNorth.asm b/text/maps/SafariZoneNorth.asm new file mode 100644 index 00000000..1e148f0b --- /dev/null +++ b/text/maps/SafariZoneNorth.asm @@ -0,0 +1,33 @@ +_SafariZoneNorthText3:: + text "REST HOUSE" + done + +_SafariZoneNorthText4:: + text "TRAINER TIPS" + + para "The SECRET HOUSE" + line "is still ahead!" + done + +_SafariZoneNorthText5:: + text "AREA 2" + done + +_SafariZoneNorthText6:: + text "TRAINER TIPS" + + para "#MON hide in" + line "tall grass!" + + para "Zigzag through" + line "grassy areas to" + cont "flush them out." + done + +_SafariZoneNorthText7:: + text "TRAINER TIPS" + + para "Win a free HM for" + line "finding the" + cont "SECRET HOUSE!" + done diff --git a/text/maps/SafariZoneNorthRestHouse.asm b/text/maps/SafariZoneNorthRestHouse.asm new file mode 100644 index 00000000..93f02c8f --- /dev/null +++ b/text/maps/SafariZoneNorthRestHouse.asm @@ -0,0 +1,27 @@ +_SafariZoneRestHouse4Text1:: + text "You can keep any" + line "item you find on" + cont "the ground here." + + para "But, you'll run" + line "out of time if" + cont "you try for all" + cont "of them at once!" + done + +_SafariZoneRestHouse4Text2:: + text "Go to the deepest" + line "part of the" + cont "SAFARI ZONE. You" + cont "will win a prize!" + done + +_SafariZoneRestHouse4Text3:: + text "My EEVEE evolved" + line "into FLAREON!" + + para "But, a friend's" + line "EEVEE turned into" + cont "a VAPOREON!" + cont "I wonder why?" + done diff --git a/text/maps/SafariZoneSecretHouse.asm b/text/maps/SafariZoneSecretHouse.asm new file mode 100644 index 00000000..3df79d90 --- /dev/null +++ b/text/maps/SafariZoneSecretHouse.asm @@ -0,0 +1,44 @@ +_SecretHouseText_4a350:: + text "Ah! Finally!" + + para "You're the first" + line "person to reach" + cont "the SECRET HOUSE!" + + para "I was getting" + line "worried that no" + cont "one would win our" + cont "campaign prize." + + para "Congratulations!" + line "You have won!" + prompt + +_ReceivedHM03Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_HM03ExplanationText:: + text "HM03 is SURF!" + + para "#MON will be" + line "able to ferry you" + cont "across water!" + + para "And, this HM isn't" + line "disposable! You" + cont "can use it over" + cont "and over!" + + para "You're super lucky" + line "for winning this" + cont "fabulous prize!" + done + +_HM03NoRoomText:: + text "You don't have" + line "room for this" + cont "fabulous prize!" + done diff --git a/text/maps/SafariZoneWest.asm b/text/maps/SafariZoneWest.asm new file mode 100644 index 00000000..dcb2fe6c --- /dev/null +++ b/text/maps/SafariZoneWest.asm @@ -0,0 +1,31 @@ +_SafariZoneWestText5:: + text "REST HOUSE" + done + +_SafariZoneWestText6:: + text "REQUEST NOTICE" + + para "Please find the" + line "SAFARI WARDEN's" + cont "lost GOLD TEETH." + cont "They're around" + cont "here somewhere." + + para "Reward offered!" + line "Contact: WARDEN" + done + +_SafariZoneWestText7:: + text "TRAINER TIPS" + + para "Zone Exploration" + line "Campaign!" + + para "The Search for" + line "the SECRET HOUSE!" + done + +_SafariZoneWestText8:: + text "AREA 3" + line "EAST: CENTER AREA" + done diff --git a/text/maps/SafariZoneWestRestHouse.asm b/text/maps/SafariZoneWestRestHouse.asm new file mode 100644 index 00000000..94802b13 --- /dev/null +++ b/text/maps/SafariZoneWestRestHouse.asm @@ -0,0 +1,19 @@ +_SafariZoneRestHouse2Text1:: + text "Tossing ROCKs at" + line "#MON might" + cont "make them run," + cont "but they'll be" + cont "easier to catch." + done + +_SafariZoneRestHouse2Text2:: + text "Using BAIT will" + line "make #MON" + cont "easier to catch." + done + +_SafariZoneRestHouse2Text3:: + text "I hiked a lot, but" + line "I didn't see any" + cont "#MON I wanted." + done diff --git a/text/maps/SaffronCity.asm b/text/maps/SaffronCity.asm new file mode 100644 index 00000000..a0422c8c --- /dev/null +++ b/text/maps/SaffronCity.asm @@ -0,0 +1,151 @@ +_SaffronCityText1:: + text "What do you want?" + line "Get lost!" + done + +_SaffronCityText2:: + text "BOSS said he'll" + line "take this town!" + done + +_SaffronCityText3:: + text "Get out of the" + line "way!" + done + +_SaffronCityText4:: + text "SAFFRON belongs" + line "to TEAM ROCKET!" + done + +_SaffronCityText5:: + text "Being evil makes" + line "me feel so alive!" + done + +_SaffronCityText6:: + text "Ow! Watch where" + line "you're walking!" + done + +_SaffronCityText7:: + text "With SILPH under" + line "control, we can" + cont "exploit #MON" + cont "around the world!" + done + +_SaffronCityText8:: + text "You beat TEAM" + line "ROCKET all alone?" + cont "That's amazing!" + done + +_SaffronCityText9:: + text "Yeah! TEAM ROCKET" + line "is gone!" + cont "It's safe to go" + cont "out again!" + done + +_SaffronCityText10:: + text "People should be" + line "flocking back to" + cont "SAFFRON now." + done + +_SaffronCityText11:: + text "I flew here on my" + line "PIDGEOT when I" + cont "read about SILPH." + + para "It's already over?" + line "I missed the" + cont "media action." + done + +_SaffronCityText12:: + text "PIDGEOT: Bi bibii!@@" + +_SaffronCityText13:: + text "I saw ROCKET" + line "BOSS escaping" + cont "SILPH's building." + done + +_SaffronCityText14:: + text "I'm a security" + line "guard." + + para "Suspicious kids I" + line "don't allow in!" + done + +_SaffronCityText15:: + text "..." + line "Snore..." + + para "Hah! He's taking" + line "a snooze!" + done + +_SaffronCityText16:: + text "SAFFRON CITY" + line "Shining, Golden" + cont "Land of Commerce" + done + +_SaffronCityText17:: + text "FIGHTING DOJO" + done + +_SaffronCityText18:: + text "SAFFRON CITY" + line "#MON GYM" + cont "LEADER: SABRINA" + + para "The Master of" + line "Psychic #MON!" + done + +_SaffronCityText20:: + text "TRAINER TIPS" + + para "FULL HEAL cures" + line "all ailments like" + cont "sleep and burns." + + para "It costs a bit" + line "more, but it's" + cont "more convenient." + done + +_SaffronCityText21:: + text "TRAINER TIPS" + + para "New GREAT BALL" + line "offers improved" + cont "capture rates." + + para "Try it on those" + line "hard-to-catch" + cont "#MON." + done + +_SaffronCityText22:: + text "SILPH CO." + line "OFFICE BUILDING" + done + +_SaffronCityText24:: + text "MR.PSYCHIC's" + line "HOUSE" + done + +_SaffronCityText25:: + text "SILPH's latest" + line "product!" + + para "Release to be" + line "determined..." + done diff --git a/text/maps/SaffronGates.asm b/text/maps/SaffronGates.asm new file mode 100644 index 00000000..9bb4601f --- /dev/null +++ b/text/maps/SaffronGates.asm @@ -0,0 +1,37 @@ +_SaffronGateText_1dfe7:: + text "I'm on guard duty." + line "Gee, I'm thirsty," + cont "though!" + + para "Oh wait there," + line "the road's closed." + done + +_SaffronGateText_8aaa9:: + text "Whoa, boy!" + line "I'm parched!" + cont "..." + cont "Huh? I can have" + cont "this drink?" + cont "Gee, thanks!@@" + +_SaffronGateText_1dff1:: + text "" + + para "..." + line "Glug glug..." + cont "..." + cont "Gulp..." + cont "If you want to go" + cont "to SAFFRON CITY..." + cont "..." + cont "You can go on" + cont "through. I'll" + cont "share this with" + cont "the other guards!" + done + +_SaffronGateText_1dff6:: + text "Hi, thanks for" + line "the cool drinks!" + done diff --git a/text/maps/SaffronGym.asm b/text/maps/SaffronGym.asm new file mode 100644 index 00000000..6f49a331 --- /dev/null +++ b/text/maps/SaffronGym.asm @@ -0,0 +1,237 @@ +_SaffronGymText_5d162:: + text "I had a vision of" + line "your arrival!" + + para "I have had psychic" + line "powers since I" + cont "was a child." + + para "I first learned" + line "to bend spoons" + cont "with my mind." + + para "I dislike fight-" + line "ing, but if you" + cont "wish, I will show" + cont "you my powers!" + done + +_SaffronGymText_5d167:: + text "I'm" + line "shocked!" + cont "But, a loss is a" + cont "loss." + + para "I admit I didn't" + line "work hard enough" + cont "to win!" + + para "You earned the" + line "MARSHBADGE!@@" + +_SaffronGymText_5d16e:: + text "Everyone has" + line "psychic power!" + cont "People just don't" + cont "realize it!" + done + +_SaffronGymText_5d173:: + text "The MARSHBADGE" + line "makes #MON up" + cont "to L70 obey you!" + + para "Stronger #MON" + line "will become wild," + cont "ignoring your" + cont "orders in battle!" + + para "Just don't raise" + line "your #MON too" + cont "much!" + + para "Wait, please take" + line "this TM with you!" + done + +ReceivedTM46Text:: + text " received" + line "TM46!@@" + +_TM46ExplanationText:: + text "" + + para "TM46 is PSYWAVE!" + line "It uses powerful" + cont "psychic waves to" + cont "inflict damage!" + done + +_TM46NoRoomText:: + text "Your pack is full" + line "of other items!" + done + +_SaffronGymText_5d1e6:: + text "Yo! Champ in" + line "making!" + + para "SABRINA's #MON" + line "use psychic power" + cont "instead of force!" + + para "Fighting #MON" + line "are weak against" + cont "psychic #MON!" + + para "They get creamed" + line "before they can" + cont "even aim a punch!" + done + +_SaffronGymText_5d1eb:: + text "Psychic power," + line "huh?" + + para "If I had that," + line "I'd make a bundle" + cont "at the slots!" + done + +_SaffronGymBattleText1:: + text "SABRINA is younger" + line "than I, but I" + cont "respect her!" + done + +_SaffronGymEndBattleText1:: + text "Not" + line "good enough!" + prompt + +_SaffronGymAfterBattleText1:: + text "In a battle of" + line "equals, the one" + cont "with the stronger" + cont "will wins!" + + para "If you wish" + line "to beat SABRINA," + cont "focus on winning!" + done + +_SaffronGymBattleText2:: + text "Does our unseen" + line "power scare you?" + done + +_SaffronGymEndBattleText2:: + text "I never" + line "foresaw this!" + prompt + +_SaffronGymAfterBattleText2:: + text "Psychic #MON" + line "fear only ghosts" + cont "and bugs!" + done + +_SaffronGymBattleText3:: + text "#MON take on" + line "the appearance of" + cont "their trainers." + + para "Your #MON must" + line "be tough, then!" + done + +_SaffronGymEndBattleText3:: + text "I knew" + line "it!" + prompt + +_SaffronGymAfterBattleText3:: + text "I must teach" + line "better techniques" + cont "to my #MON!" + done + +_SaffronGymBattleText4:: + text "You know that" + line "power alone isn't" + cont "enough!" + done + +_SaffronGymEndBattleText4:: + text "I don't" + line "believe this!" + prompt + +_SaffronGymAfterBattleText4:: + text "SABRINA just wiped" + line "out the KARATE" + cont "MASTER next door!" + done + +_SaffronGymBattleText5:: + text "You and I, our" + line "#MON shall" + cont "fight!" + done + +_SaffronGymEndBattleText5:: + text "I lost" + line "after all!" + prompt + +_SaffronGymAfterBattleText5:: + text "I knew that this" + line "was going to take" + cont "place." + done + +_SaffronGymBattleText6:: + text "SABRINA is young," + line "but she's also" + cont "our LEADER!" + + para "You won't reach" + line "her easily!" + done + +_SaffronGymEndBattleText6:: + text "I lost" + line "my concentration!" + prompt + +_SaffronGymAfterBattleText6:: + text "There used to be" + line "2 #MON GYMs in" + cont "SAFFRON." + + para "The FIGHTING DOJO" + line "next door lost" + cont "its GYM status" + cont "when we went and" + cont "creamed them!" + done + +_SaffronGymBattleText7:: + text "SAFFRON #MON" + line "GYM is famous for" + cont "its psychics!" + + para "You want to see" + line "SABRINA!" + cont "I can tell!" + done + +_SaffronGymEndBattleText7:: + text "Arrrgh!" + prompt + +_SaffronGymAfterBattleText7:: + text "That's right! I" + line "used telepathy to" + cont "read your mind!" + done diff --git a/text/maps/SaffronMart.asm b/text/maps/SaffronMart.asm new file mode 100644 index 00000000..a43b0d94 --- /dev/null +++ b/text/maps/SaffronMart.asm @@ -0,0 +1,13 @@ +_SaffronMartText2:: + text "MAX REPEL lasts" + line "longer than SUPER" + cont "REPEL for keeping" + cont "weaker #MON" + cont "away!" + done + +_SaffronMartText3:: + text "REVIVE is costly," + line "but it revives" + cont "fainted #MON!" + done diff --git a/text/maps/SaffronPidgeyHouse.asm b/text/maps/SaffronPidgeyHouse.asm new file mode 100644 index 00000000..214bf089 --- /dev/null +++ b/text/maps/SaffronPidgeyHouse.asm @@ -0,0 +1,26 @@ +_SaffronHouse1Text1:: + text "Thank you for" + line "writing. I hope" + cont "to see you soon!" + + para "Hey! Don't look" + line "at my letter!" + done + +_SaffronHouse1Text2:: + text "PIDGEY: Kurukkoo!@@" + +_SaffronHouse1Text3:: + text "The COPYCAT is" + line "cute! I'm getting" + cont "her a # DOLL!" + done + +_SaffronHouse1Text4:: + text "I was given a PP" + line "UP as a gift." + + para "It's used for" + line "increasing the PP" + cont "of techniques!" + done diff --git a/text/maps/SaffronPokecenter.asm b/text/maps/SaffronPokecenter.asm new file mode 100644 index 00000000..6548aff8 --- /dev/null +++ b/text/maps/SaffronPokecenter.asm @@ -0,0 +1,12 @@ +_SaffronPokecenterText2:: + text "#MON growth" + line "rates differ from" + cont "specie to specie." + done + +_SaffronPokecenterText3:: + text "SILPH CO. is very" + line "famous. That's" + cont "why it attracted" + cont "TEAM ROCKET!" + done diff --git a/text/maps/SeafoamIslandsB4F.asm b/text/maps/SeafoamIslandsB4F.asm new file mode 100644 index 00000000..608d165f --- /dev/null +++ b/text/maps/SeafoamIslandsB4F.asm @@ -0,0 +1,13 @@ +_ArticunoBattleText:: + text "Gyaoo!@@" + +_SeafoamIslands5Text4:: + text "Boulders might" + line "change the flow" + cont "of water!" + done + +_SeafoamIslands5Text5:: + text "DANGER" + line "Fast current!" + done diff --git a/text/maps/SilphCo10F.asm b/text/maps/SilphCo10F.asm new file mode 100644 index 00000000..e916c64a --- /dev/null +++ b/text/maps/SilphCo10F.asm @@ -0,0 +1,42 @@ +_SilphCo10Text_5a1d3:: + text "Waaaaa!" + cont "I'm scared!" + done + +_SilphCo10Text_5a1d8:: + text "Please keep quiet" + line "about my crying!" + done + +_SilphCo10BattleText1:: + text "Welcome to the" + line "10F! So good of" + cont "you to join me!" + done + +_SilphCo10EndBattleText1:: + text "I'm" + line "stunned!" + prompt + +_SilphCo10AfterBattleText1:: + text "Nice try, but the" + line "boardroom is up" + cont "one more floor!" + done + +_SilphCo10BattleText2:: + text "Enough of your" + line "silly games!" + done + +_SilphCo10EndBattleText2:: + text "No" + line "continues left!" + prompt + +_SilphCo10AfterBattleText2:: + text "Are you satisfied" + line "with beating me?" + cont "Then go on home!" + done diff --git a/text/maps/SilphCo11F.asm b/text/maps/SilphCo11F.asm new file mode 100644 index 00000000..fbaa6086 --- /dev/null +++ b/text/maps/SilphCo11F.asm @@ -0,0 +1,134 @@ +_SilphCoPresidentText:: + text "PRESIDENT: Thank" + line "you for saving" + cont "SILPH!" + + para "I will never" + line "forget you saved" + cont "us in our moment" + cont "of peril!" + + para "I have to thank" + line "you in some way!" + + para "Because I am rich," + line "I can give you" + cont "anything!" + + para "Here, maybe this" + line "will do!" + prompt + +_ReceivedSilphCoMasterBallText:: + text " got a" + line "@" + TX_RAM wcf4b + text "!@@" + +_SilphCo10Text_6231c:: + text "PRESIDENT: You" + line "can't buy that" + cont "anywhere!" + + para "It's our secret" + line "prototype MASTER" + cont "BALL!" + + para "It will catch any" + line "#MON without" + cont "fail!" + + para "You should be" + line "quiet about using" + cont "it, though." + done + +_SilphCoMasterBallNoRoomText:: + text "You have no" + line "room for this." + done + +_SilphCo11Text2:: + text "SECRETARY: Thank" + line "you for rescuing" + cont "all of us!" + + para "We admire your" + line "courage." + done + +_SilphCo11Text3:: + text "Ah !" + line "So we meet again!" + + para "The PRESIDENT and" + line "I are discussing" + cont "a vital business" + cont "proposition." + + para "Keep your nose" + line "out of grown-up" + cont "matters..." + + para "Or, experience a" + line "world of pain!" + done + +_SilphCo10Text_62330:: + text "Arrgh!!" + line "I lost again!?" + prompt + +_SilphCo10Text_62335:: + text "Blast it all!" + line "You ruined our" + cont "plans for SILPH!" + + para "But, TEAM ROCKET" + line "will never fall!" + + para "! Never" + line "forget that all" + cont "#MON exist" + cont "for TEAM ROCKET!" + + para "I must go, but I" + line "shall return!" + done + +_SilphCo11BattleText1:: + text "Stop right there!" + line "Don't you move!" + done + +_SilphCo11EndBattleText1:: + text "Don't..." + line "Please!" + prompt + +_SilphCo11AfterBattleText1:: + text "So, you want to" + line "see my BOSS?" + done + +_SilphCo11BattleText2:: + text "Halt! Do you have" + line "an appointment" + cont "with my BOSS?" + done + +_SilphCo11EndBattleText2:: + text "Gaah!" + line "Demolished!" + prompt + +_SilphCo11AfterBattleText2:: + text "Watch your step," + line "my BOSS likes his" + cont "#MON tough!" + done + +_SilphCo10Text_6237b:: + text "The monitor has" + line "#MON on it!" + done diff --git a/text/maps/SilphCo1F.asm b/text/maps/SilphCo1F.asm new file mode 100644 index 00000000..1ef80189 --- /dev/null +++ b/text/maps/SilphCo1F.asm @@ -0,0 +1,7 @@ +_SilphCo1Text1:: + text "Welcome!" + + para "The PRESIDENT is" + line "in the boardroom" + cont "on 11F!" + done diff --git a/text/maps/SilphCo2F.asm b/text/maps/SilphCo2F.asm new file mode 100644 index 00000000..bd87630a --- /dev/null +++ b/text/maps/SilphCo2F.asm @@ -0,0 +1,96 @@ +_SilphCo2Text_59ded:: + text "Eeek!" + line "No! Stop! Help!" + + para "Oh, you're not" + line "with TEAM ROCKET." + cont "I thought..." + cont "I'm sorry. Here," + cont "please take this!" + prompt + +_ReceivedTM36Text:: + text " got" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM36ExplanationText:: + text "TM36 is" + line "SELFDESTRUCT!" + + para "It's powerful, but" + line "the #MON that" + cont "uses it faints!" + cont "Be careful." + done + +_TM36NoRoomText:: + text "You don't have any" + line "room for this." + done + +_SilphCo2BattleText1:: + text "Help! I'm a SILPH" + line "employee." + done + +_SilphCo2EndBattleText1:: + text "How" + line "did you know I" + cont "was a ROCKET?" + prompt + +_SilphCo2AfterBattleText1:: + text "I work for both" + line "SILPH and TEAM" + cont "ROCKET!" + done + +_SilphCo2BattleText2:: + text "It's off limits" + line "here! Go home!" + done + +_SilphCo2EndBattleText2:: + text "You're" + line "good." + prompt + +_SilphCo2AfterBattleText2:: + text "Can you solve the" + line "maze in here?" + done + +_SilphCo2BattleText3:: + text "No kids are" + line "allowed in here!" + done + +_SilphCo2EndBattleText3:: + text "Tough!" + prompt + +_SilphCo2AfterBattleText3:: + text "Diamond shaped" + line "tiles are" + cont "teleport blocks!" + + para "They're hi-tech" + line "transporters!" + done + +_SilphCo2BattleText4:: + text "Hey kid! What are" + line "you doing here?" + done + +_SilphCo2EndBattleText4:: + text "I goofed!" + prompt + +_SilphCo2AfterBattleText4:: + text "SILPH CO. will" + line "be merged with" + cont "TEAM ROCKET!" + done diff --git a/text/maps/SilphCo3F.asm b/text/maps/SilphCo3F.asm new file mode 100644 index 00000000..b6a023f9 --- /dev/null +++ b/text/maps/SilphCo3F.asm @@ -0,0 +1,46 @@ +_SilphCo3Text_59ff9:: + text "I work for SILPH." + line "What should I do?" + done + +_SilphCo3Text_59ffe:: + text "! You and" + line "your #MON" + cont "saved us!" + done + +_SilphCo3BattleText1:: + text "Quit messing with" + line "us, kid!" + done + +_SilphCo3EndBattleText1:: + text "I give" + line "up!" + prompt + +_SilphCo3AfterBattleText1:: + text "A hint? You can" + line "open doors with a" + cont "CARD KEY!" + done + +_SilphCo3BattleText2:: + text "I support TEAM" + line "ROCKET more than" + cont "I support SILPH!" + done + +_SilphCo3EndBattleText2:: + text "You" + line "really got me!" + prompt + +_SilphCo3AfterBattleText2:: + text "Humph..." + + para "TEAM ROCKET said" + line "that if I helped" + cont "them, they'd let" + cont "me study #MON!" + done diff --git a/text/maps/SilphCo4F.asm b/text/maps/SilphCo4F.asm new file mode 100644 index 00000000..5b484ec7 --- /dev/null +++ b/text/maps/SilphCo4F.asm @@ -0,0 +1,56 @@ +_SilphCo4Text_19de0:: + text "Sssh! Can't you" + line "see I'm hiding?" + done + +_SilphCo4Text_19de5:: + text "Huh? TEAM ROCKET" + line "is gone?" + done + +_SilphCo4BattleText2:: + text "TEAM ROCKET has" + line "taken command of" + cont "SILPH CO.!" + done + +_SilphCo4EndBattleText2:: + text "Arrgh!" + prompt + +_SilphCo4AfterBattleText2:: + text "Fwahahaha!" + line "My BOSS has been" + cont "after this place!" + done + +_SilphCo4BattleText3:: + text "My #MON are my" + line "loyal soldiers!" + done + +_SilphCo4EndBattleText3:: + text "Darn!" + line "You weak #MON!" + prompt + +_SilphCo4AfterBattleText3:: + text "The doors are" + line "electronically" + cont "locked! A CARD" + cont "KEY opens them!" + done + +_SilphCo4BattleText4:: + text "Intruder spotted!" + done + +_SilphCo4EndBattleText4:: + text "Who" + line "are you?" + prompt + +_SilphCo4AfterBattleText4:: + text "I better tell the" + line "BOSS on 11F!" + done diff --git a/text/maps/SilphCo5F.asm b/text/maps/SilphCo5F.asm new file mode 100644 index 00000000..dab42539 --- /dev/null +++ b/text/maps/SilphCo5F.asm @@ -0,0 +1,51 @@ +_SilphCo5Text_1a010:: + text "TEAM ROCKET is" + line "in an uproar over" + cont "some intruder." + cont "That's you right?" + done + +_SilphCo5Text_1a015:: + text "TEAM ROCKET took" + line "off! You're our" + cont "hero! Thank you!" + done + +_SilphCo5BattleText2:: + text "I heard a kid was" + line "wandering around." + done + +_SilphCo5EndBattleText2:: + text "Boom!" + prompt + +_SilphCo5AfterBattleText2:: + text "It's not smart" + line "to pick a fight" + cont "with TEAM ROCKET!" + done + +_SilphCo5BattleText3:: + text "We study #" + line "BALL technology" + cont "on this floor!" + done + +_SilphCo5EndBattleText3:: + text "Dang!" + line "Blast it!" + prompt + +_SilphCo5AfterBattleText3:: + text "We worked on the" + line "ultimate #" + cont "BALL which would" + cont "catch anything!" + done + +_SilphCo5BattleText4:: + text "Whaaat? There" + line "shouldn't be any" + cont "children here?" + done diff --git a/text/maps/SilphCo5F_2.asm b/text/maps/SilphCo5F_2.asm new file mode 100644 index 00000000..3c1b8ead --- /dev/null +++ b/text/maps/SilphCo5F_2.asm @@ -0,0 +1,55 @@ +_SilphCo5EndBattleText4:: + text "Oh" + line "goodness!" + prompt + +_SilphCo5AfterBattleText4:: + text "You're only on 5F." + line "It's a long way" + cont "to my BOSS!" + done + +_SilphCo5BattleText5:: + text "Show TEAM ROCKET" + line "a little respect!" + done + +_SilphCo5EndBattleText5:: + text "Cough..." + line "Cough..." + prompt + +_SilphCo5AfterBattleText5:: + text "Which reminds me." + + para "KOFFING evolves" + line "into WEEZING!" + done + +_SilphCo5Text9:: + text "It's a #MON" + line "REPORT!" + + para "#MON LAB" + line "created PORYGON," + cont "the first virtual" + cont "reality #MON." + done + +_SilphCo5Text10:: + text "It's a #MON" + line "REPORT!" + + para "Over 160 #MON" + line "techniques have" + cont "been confirmed." + done + +_SilphCo5Text11:: + text "It's a #MON" + line "REPORT!" + + para "4 #MON evolve" + line "only when traded" + cont "by link-cable." + done diff --git a/text/maps/SilphCo6F.asm b/text/maps/SilphCo6F.asm new file mode 100644 index 00000000..90456b5c --- /dev/null +++ b/text/maps/SilphCo6F.asm @@ -0,0 +1,107 @@ +_SilphCo6Text_1a24a:: + text "The ROCKETs came" + line "and took over the" + cont "building!" + done + +_SilphCo6Text_1a24f:: + text "Well, better get" + line "back to work!" + done + +_SilphCo6Text_1a261:: + text "Oh dear, oh dear." + line "Help me please!" + done + +_SilphCo6Text_1a266:: + text "We got engaged!" + line "Heheh!" + done + +_SilphCo6Text_1a278:: + text "Look at him! He's" + line "such a coward!" + done + +_SilphCo6Text_1a27d:: + text "I feel so sorry" + line "for him, I have" + cont "to marry him!" + done + +_SilphCo6Text_1a28f:: + text "TEAM ROCKET is" + line "trying to conquer" + cont "the world with" + cont "#MON!" + done + +_SilphCo6Text_1a294:: + text "TEAM ROCKET ran" + line "because of you!" + done + +_SilphCo6Text_1a2a6:: + text "They must have" + line "targeted SILPH" + cont "for our #MON" + cont "products." + done + +_SilphCo6Text_1a2ab:: + text "Come work for" + line "SILPH when you" + cont "get older!" + done + +_SilphCo6BattleText2:: + text "I am one of the 4" + line "ROCKET BROTHERS!" + done + +_SilphCo6EndBattleText2:: + text "Flame" + line "out!" + prompt + +_SilphCo6AfterBattleText2:: + text "No matter!" + line "My brothers will" + cont "avenge me!" + done + +_SilphCo6BattleText3:: + text "That rotten" + line "PRESIDENT!" + + para "He shouldn't have" + line "sent me to the" + cont "TIKSI BRANCH!" + done + +_SilphCo6EndBattleText3:: + text "Shoot!" + prompt + +_SilphCo6AfterBattleText3:: + text "TIKSI BRANCH?" + line "It's in Russian" + cont "no man's land!" + done + +_SilphCo6BattleText4:: + text "You dare betray" + line "TEAM ROCKET?" + done + +_SilphCo6EndBattleText4:: + text "You" + line "traitor!" + prompt + +_SilphCo6AfterBattleText4:: + text "If you stand for" + line "justice, you" + cont "betray evil!" + done diff --git a/text/maps/SilphCo7F.asm b/text/maps/SilphCo7F.asm new file mode 100644 index 00000000..1cc2bc30 --- /dev/null +++ b/text/maps/SilphCo7F.asm @@ -0,0 +1,209 @@ +_MeetLaprasGuyText:: + text "Oh! Hi! You're" + line "not a ROCKET! You" + cont "came to save us?" + cont "Why, thank you!" + + para "I want you to" + line "have this #MON" + cont "for saving us." + prompt + +_HeresYourLaprasText:: + text "It's LAPRAS. It's" + line "very intelligent." + + para "We kept it in our" + line "lab, but it will" + cont "be much better" + cont "off with you!" + + para "I think you will" + line "be a good trainer" + cont "for LAPRAS!" + + para "It's a good" + line "swimmer. It'll" + cont "give you a lift!" + done + +_LaprasGuyText:: + text "TEAM ROCKET's" + line "BOSS went to the" + cont "boardroom! Is our" + cont "PRESIDENT OK?" + done + +_LaprasGuySavedText:: + text "Saved at last!" + line "Thank you!" + done + +_SilphCo7Text_51e00:: + text "TEAM ROCKET was" + line "after the MASTER" + cont "BALL which will" + cont "catch any #MON!" + done + +_CanceledMasterBallText:: + text "We canceled the" + line "MASTER BALL" + cont "project because" + cont "of TEAM ROCKET." + done + +_SilphCo7Text_51e23:: + text "It would be bad" + line "if TEAM ROCKET" + cont "took over SILPH" + cont "or our #MON!" + done + +_SilphCo7Text_51e28:: + text "Wow! You chased" + line "off TEAM ROCKET" + cont "all by yourself?" + done + +_SilphCo7Text_51e46:: + text "You! It's really" + line "dangerous here!" + cont "You came to save" + cont "me? You can't!" + done + +_SilphCo7Text_51e4b:: + text "Safe at last!" + line "Oh thank you!" + done + +_SilphCo7BattleText1:: + text "Oh ho! I smell a" + line "little rat!" + done + +_SilphCo7EndBattleText1:: + text "Lights" + line "out!" + prompt + +_SilphCo7AfterBattleText1:: + text "You won't find my" + line "BOSS by just" + cont "scurrying around!" + done + +_SilphCo7BattleText2:: + text "Heheh!" + + para "You mistook me for" + line "a SILPH worker?" + done + +_SilphCo7EndBattleText2:: + text "I'm" + line "done!" + prompt + +_SilphCo7AfterBattleText2:: + text "Despite your age," + line "you are a skilled" + cont "trainer!" + done + +_SilphCo7BattleText3:: + text "I am one of the 4" + line "ROCKET BROTHERS!" + done + +_SilphCo7EndBattleText3:: + text "Aack!" + line "Brothers, I lost!" + prompt + +_SilphCo7AfterBattleText3:: + text "Doesn't matter." + line "My brothers will" + cont "repay the favor!" + done + +_SilphCo7BattleText4:: + text "A child intruder?" + line "That must be you!" + done + +_SilphCo7EndBattleText4:: + text "Fine!" + line "I lost!" + prompt + +_SilphCo7AfterBattleText4:: + text "Go on home" + line "before my BOSS" + cont "gets ticked off!" + done + +_SilphCo7Text_51ebe:: + text ": What" + line "kept you ?" + done + +_SilphCo7Text_51ec3:: + text ": Hahaha!" + line "I thought you'd" + cont "turn up if I" + cont "waited here!" + + para "I guess TEAM" + line "ROCKET slowed you" + cont "down! Not that I" + cont "care!" + + para "I saw you in" + line "SAFFRON, so I" + cont "decided to see if" + cont "you got better!" + done + +_SilphCo7Text_51ec8:: + text "Oh ho!" + line "So, you are ready" + cont "for BOSS ROCKET!" + prompt + +_SilphCo7Text_51ecd:: + text ": How can" + line "I put this?" + + para "You're not good" + line "enough to play" + cont "with us big boys!" + prompt + +_SilphCo7Text_51ed2:: + text "Well, !" + + para "I'm moving on up" + line "and ahead!" + + para "By checking my" + line "#DEX, I'm" + cont "starting to see" + cont "what's strong and" + cont "how they evolve!" + + para "I'm going to the" + line "#MON LEAGUE" + cont "to boot out the" + cont "ELITE FOUR!" + + para "I'll become the" + line "world's most" + cont "powerful trainer!" + + para ", well" + line "good luck to you!" + cont "Don't sweat it!" + cont "Smell ya!" + done diff --git a/text/maps/SilphCo8F.asm b/text/maps/SilphCo8F.asm new file mode 100644 index 00000000..fabae5e6 --- /dev/null +++ b/text/maps/SilphCo8F.asm @@ -0,0 +1,56 @@ +_SilphCo8Text_565be:: + text "I wonder if SILPH" + line "is finished..." + done + +_SilphCo8Text_565c3:: + text "Thanks for saving" + line "us!" + done + +_SilphCo8BattleText1:: + text "That's as far as" + line "you'll go!" + done + +_SilphCo8EndBattleText1:: + text "Not" + line "enough grit!" + prompt + +_SilphCo8AfterBattleText1:: + text "If you don't turn" + line "back, I'll call" + cont "for backup!" + done + +_SilphCo8BattleText2:: + text "You're causing us" + line "problems!" + done + +_SilphCo8EndBattleText2:: + text "Huh?" + line "I lost?" + prompt + +_SilphCo8AfterBattleText2:: + text "So, what do you" + line "think of SILPH" + cont "BUILDING's maze?" + done + +_SilphCo8BattleText3:: + text "I am one of the 4" + line "ROCKET BROTHERS!" + done + +_SilphCo8EndBattleText3:: + text "Whoo!" + line "Oh brothers!" + prompt + +_SilphCo8AfterBattleText3:: + text "I'll leave you up" + line "to my brothers!" + done diff --git a/text/maps/SilphCo9F.asm b/text/maps/SilphCo9F.asm new file mode 100644 index 00000000..fd1aa91c --- /dev/null +++ b/text/maps/SilphCo9F.asm @@ -0,0 +1,62 @@ +_SilphCo9Text_5d8e5:: + text "You look tired!" + line "You should take a" + cont "quick nap!" + prompt + +_SilphCo9Text_5d8ea:: + text "Don't give up!" + done + +_SilphCo9Text_5d8ef:: + text "Thank you so" + line "much!" + done + +_SilphCo9BattleText1:: + text "Your #MON seem" + line "to adore you, kid!" + done + +_SilphCo9EndBattleText1:: + text "Ghaaah!" + prompt + +_SilphCo9AfterBattleText1:: + text "If I had started" + line "as a trainer at" + cont "your age..." + done + +_SilphCo9BattleText2:: + text "Your #MON have" + line "weak points! I" + cont "can nail them!" + done + +_SilphCo9EndBattleText2:: + text "You" + line "hammered me!" + prompt + +_SilphCo9AfterBattleText2:: + text "Exploiting weak" + line "spots does work!" + cont "Think about" + cont "element types!" + done + +_SilphCo9BattleText3:: + text "I am one of the 4" + line "ROCKET BROTHERS!" + done + +_SilphCo9EndBattleText3:: + text "Warg!" + line "Brothers, I lost!" + prompt + +_SilphCo9AfterBattleText3:: + text "My brothers will" + line "avenge me!" + done diff --git a/text/maps/UndergroundPathRoute6.asm b/text/maps/UndergroundPathRoute6.asm new file mode 100644 index 00000000..dacc44f7 --- /dev/null +++ b/text/maps/UndergroundPathRoute6.asm @@ -0,0 +1,5 @@ +_UndergrdTunnelEntRoute6Text1:: + text "People often lose" + line "things in that" + cont "UNDERGROUND PATH." + done diff --git a/text/maps/UndergroundPathRoute7.asm b/text/maps/UndergroundPathRoute7.asm new file mode 100644 index 00000000..5cde3614 --- /dev/null +++ b/text/maps/UndergroundPathRoute7.asm @@ -0,0 +1,5 @@ +_UndergroundPathEntRoute7Text1:: + text "I heard a sleepy" + line "#MON appeared" + cont "near CELADON CITY." + done diff --git a/text/maps/UndergroundPathRoute7Copy.asm b/text/maps/UndergroundPathRoute7Copy.asm new file mode 100644 index 00000000..4e0dc3ca --- /dev/null +++ b/text/maps/UndergroundPathRoute7Copy.asm @@ -0,0 +1,35 @@ +_UGPathRoute7EntranceUnusedText_5d773:: + text "I want to shop at" + line "the dept. store" + cont "in CELADON but..." + + para "There are so many" + line "rough looking" + cont "people there." + done + +_UGPathRoute7EntranceUnusedText_5d778:: + text "TEAM ROCKET had a" + line "secret hideout in" + cont "CELADON CITY?" + done + +_UGPathRoute7EntranceUnusedText_5d77d:: + text "You're here to" + line "shop in CELADON?" + + para "Just step outside" + line "and head west!" + done + +_UGPathRoute7EntranceUnusedText_5d782:: + text "The UNDERGROUND" + line "PATH goes beneath" + cont "SAFFRON and leads" + cont "to LAVENDER." + + para "If you're heading" + line "to CERULEAN, go" + cont "to the building" + cont "across the road." + done diff --git a/text/maps/UndergroundPathRoute8.asm b/text/maps/UndergroundPathRoute8.asm new file mode 100644 index 00000000..da785c8e --- /dev/null +++ b/text/maps/UndergroundPathRoute8.asm @@ -0,0 +1,5 @@ +_UndergroundPathEntRoute8Text1:: + text "The dept. store" + line "in CELADON has a" + cont "great selection!" + done diff --git a/text/maps/VermilionCity.asm b/text/maps/VermilionCity.asm new file mode 100644 index 00000000..b060a123 --- /dev/null +++ b/text/maps/VermilionCity.asm @@ -0,0 +1,126 @@ +_VermilionCityText1:: + text "We're careful" + line "about pollution!" + + para "We've heard GRIMER" + line "multiplies in" + cont "toxic sludge!" + done + +_VermilionCityText_198a7:: + text "Did you see S.S." + line "ANNE moored in" + cont "the harbor?" + done + +_VermilionCityText_198ac:: + text "So, S.S.ANNE has" + line "departed!" + + para "She'll be back in" + line "about a year." + done + +_SSAnneWelcomeText4:: + text "Welcome to S.S." + line "ANNE!" + done + +_SSAnneWelcomeText9:: + text "Welcome to S.S." + line "ANNE!" + + para "Excuse me, do you" + line "have a ticket?" + prompt + +_SSAnneFlashedTicketText:: + text " flashed" + line "the S.S.TICKET!" + + para "Great! Welcome to" + line "S.S.ANNE!" + done + +_SSAnneNoTicketText:: + text " doesn't" + line "have the needed" + cont "S.S.TICKET." + + para "Sorry!" + + para "You need a ticket" + line "to get aboard." + done + +_SSAnneNotHereText:: + text "The ship set sail." + done + +_VermilionCityText4:: + text "I'm putting up a" + line "building on this" + cont "plot of land." + + para "My #MON is" + line "tamping the land." + done + +_VermilionCityText5:: + text "MACHOP: Guoh!" + line "Gogogoh!@@" + +_VermilionCityText14:: + text "" + para "A MACHOP is" + line "stomping the land" + cont "flat." + done + +_VermilionCityText6:: + text "S.S.ANNE is a" + line "famous luxury" + cont "cruise ship." + + para "We visit VERMILION" + line "once a year." + done + +_VermilionCityText7:: + text "VERMILION CITY" + line "The Port of" + cont "Exquisite Sunsets" + done + +_VermilionCityText8:: + text "NOTICE!" + + para "ROUTE 12 may be" + line "blocked off by a" + cont "sleeping #MON." + + para "Detour through" + line "ROCK TUNNEL to" + cont "LAVENDER TOWN." + + para "VERMILION POLICE" + done + +_VermilionCityText11:: + text "#MON FAN CLUB" + line "All #MON fans" + cont "welcome!" + done + +_VermilionCityText12:: + text "VERMILION CITY" + line "#MON GYM" + cont "LEADER: LT.SURGE" + + para "The Lightning " + line "American!" + done + +_VermilionCityText13:: + text "VERMILION HARBOR" + done diff --git a/text/maps/VermilionDock.asm b/text/maps/VermilionDock.asm new file mode 100644 index 00000000..5d998e82 --- /dev/null +++ b/text/maps/VermilionDock.asm @@ -0,0 +1,3 @@ +_VermilionDockText1:: + text "" + done diff --git a/text/maps/VermilionGym.asm b/text/maps/VermilionGym.asm new file mode 100644 index 00000000..f718d899 --- /dev/null +++ b/text/maps/VermilionGym.asm @@ -0,0 +1,21 @@ +_VermilionGymText_5cb6d:: + text "Hey, kid! What do" + line "you think you're" + cont "doing here?" + + para "You won't live" + line "long in combat!" + cont "That's for sure!" + + para "I tell you kid," + line "electric #MON" + cont "saved me during" + cont "the war!" + + para "They zapped my" + line "enemies into" + cont "paralysis!" + + para "The same as I'll" + line "do to you!" + done diff --git a/text/maps/VermilionGym_2.asm b/text/maps/VermilionGym_2.asm new file mode 100644 index 00000000..7f645d59 --- /dev/null +++ b/text/maps/VermilionGym_2.asm @@ -0,0 +1,144 @@ +_VermilionGymText_5cb72:: + text "A little word of" + line "advice, kid!" + + para "Electricity is" + line "sure powerful!" + + para "But, it's useless" + line "against ground-" + cont "type #MON!" + done + +_VermilionGymText_5cb77:: + text "The THUNDERBADGE" + line "cranks up your" + cont "#MON's SPEED!" + + para "It also lets your" + line "#MON FLY any" + cont "time, kid!" + + para "You're special," + line "kid! Take this!" + done + +_ReceivedTM24Text:: + text " received " + line "@" + TX_RAM wcf4b + text "!@@" + +_TM24ExplanationText:: + text "" + + para "TM24 contains" + line "THUNDERBOLT!" + + para "Teach it to an" + line "electric #MON!" + done + +_TM24NoRoomText:: + text "Yo kid, make room" + line "in your pack!" + done + +_ReceivedThunderbadgeText:: + text "Whoa!" + + para "You're the real" + line "deal, kid!" + + para "Fine then, take" + line "the THUNDERBADGE!" + prompt + +_VermilionGymBattleText1:: + text "When I was in the" + line "Army, LT.SURGE" + cont "was my strict CO!" + done + +_VermilionGymEndBattleText1:: + text "Stop!" + line "You're very good!" + prompt + +_VermilionGymAfterBattleText1:: + text "The door won't" + line "open?" + + para "LT.SURGE always" + line "was cautious!" + done + +_VermilionGymBattleText2:: + text "I'm a lightweight," + line "but I'm good with" + cont "electricity!" + done + +_VermilionGymEndBattleText2:: + text "Fried!" + prompt + +_VermilionGymAfterBattleText2:: + text "OK, I'll talk!" + + para "LT.SURGE said he" + line "hid door switches" + cont "inside something!" + done + +_VermilionGymBattleText3:: + text "This is no place" + line "for kids!" + done + +_VermilionGymEndBattleText3:: + text "Wow!" + line "Surprised me!" + prompt + +_VermilionGymAfterBattleText3:: + text "LT.SURGE set up" + line "double locks!" + cont "Here's a hint!" + + para "When you open the" + line "1st lock, the 2nd" + cont "lock is right" + cont "next to it!" + done + +_VermilionGymText_5cbf4:: + text "Yo! Champ in" + line "making!" + + para "LT.SURGE has a" + line "nickname. People" + cont "refer to him as" + cont "the Lightning" + cont "American!" + + para "He's an expert on" + line "electric #MON!" + + para "Birds and water" + line "#MON are at" + cont "risk! Beware of" + cont "paralysis too!" + + para "LT.SURGE is very" + line "cautious!" + + para "You'll have to" + line "break a code to" + cont "get to him!" + done + +_VermilionGymText_5cbf9:: + text "Whew! That match" + line "was electric!" + done diff --git a/text/maps/VermilionMart.asm b/text/maps/VermilionMart.asm new file mode 100644 index 00000000..10743989 --- /dev/null +++ b/text/maps/VermilionMart.asm @@ -0,0 +1,23 @@ +_VermilionMartText2:: + text "There are evil" + line "people who will" + cont "use #MON for" + cont "criminal acts." + + para "TEAM ROCKET" + line "traffics in rare" + cont "#MON." + + para "They also abandon" + line "#MON that they" + cont "consider not to" + cont "be popular or" + cont "useful." + done + +_VermilionMartText3:: + text "I think #MON" + line "can be good or" + cont "evil. It depends" + cont "on the trainer." + done diff --git a/text/maps/VermilionOldRodHouse.asm b/text/maps/VermilionOldRodHouse.asm new file mode 100644 index 00000000..32526e36 --- /dev/null +++ b/text/maps/VermilionOldRodHouse.asm @@ -0,0 +1,54 @@ +_VermilionHouse2Text_560b1:: + text "I'm the FISHING" + line "GURU!" + + para "I simply Looove" + line "fishing!" + + para "Do you like to" + line "fish?" + done + +_VermilionHouse2Text_560b6:: + text "Grand! I like" + line "your style!" + + para "Take this and" + line "fish, young one!" + + para " received" + line "an @" + TX_RAM wcf4b + text "!@@" + +_VermilionHouse2Text_560bb:: + text "" + + para "Fishing is a way" + line "of life!" + + para "From the seas to" + line "rivers, go out" + cont "and land the big" + cont "one, young one!" + done + +_VermilionHouse2Text_560c0:: + text "Oh... That's so" + line "disappointing..." + done + +_VermilionHouse2Text_560c5:: + text "Hello there," + line "!" + + para "How are the fish" + line "biting?" + done + +_VermilionHouse2Text_560ca:: + text "Oh no!" + + para "You have no room" + line "for my gift!" + done diff --git a/text/maps/VermilionPidgeyHouse.asm b/text/maps/VermilionPidgeyHouse.asm new file mode 100644 index 00000000..91c18708 --- /dev/null +++ b/text/maps/VermilionPidgeyHouse.asm @@ -0,0 +1,21 @@ +_VermilionHouse1Text1:: + text "I'm getting my" + line "PIDGEY to fly a" + cont "letter to SAFFRON" + cont "in the north!" + done + +_VermilionHouse1Text2:: + text "PIDGEY: Kurukkoo!@@" + +_VermilionHouse1Text3:: + text "Dear PIPPI, I hope" + line "to see you soon." + + para "I heard SAFFRON" + line "has problems with" + cont "TEAM ROCKET." + + para "VERMILION appears" + line "to be safe." + done diff --git a/text/maps/VermilionPokecenter.asm b/text/maps/VermilionPokecenter.asm new file mode 100644 index 00000000..c9e9a581 --- /dev/null +++ b/text/maps/VermilionPokecenter.asm @@ -0,0 +1,19 @@ +_VermilionPokecenterText2:: + text "Even if they are" + line "the same level," + cont "#MON can have" + cont "very different" + cont "abilities." + + para "A #MON raised" + line "by a trainer is" + cont "stronger than one" + cont "in the wild." + done + +_VermilionPokecenterText3:: + text "My #MON was" + line "poisoned! It" + cont "fainted while we" + cont "were walking!" + done diff --git a/text/maps/VictoryRoad1F.asm b/text/maps/VictoryRoad1F.asm new file mode 100644 index 00000000..1523db88 --- /dev/null +++ b/text/maps/VictoryRoad1F.asm @@ -0,0 +1,31 @@ +_VictoryRoad1BattleText1:: + text "I wonder if you" + line "are good enough" + cont "for me!" + done + +_VictoryRoad1EndBattleText1:: + text "I" + line "lost out!" + prompt + +_VictoryRoad1AfterBattleText1:: + text "I never wanted to" + line "lose to anybody!" + done + +_VictoryRoad1BattleText2:: + text "I can see you're" + line "good! Let me see" + cont "exactly how good!" + done + +_VictoryRoad1EndBattleText2:: + text "I" + line "had a chance..." + prompt + +_VictoryRoad1AfterBattleText2:: + text "I concede, you're" + line "better than me!" + done diff --git a/text/maps/VictoryRoad2F.asm b/text/maps/VictoryRoad2F.asm new file mode 100644 index 00000000..ec9dcf4f --- /dev/null +++ b/text/maps/VictoryRoad2F.asm @@ -0,0 +1,85 @@ +_MoltresBattleText:: + text "Gyaoo!@@" + +_VictoryRoad2BattleText1:: + text "VICTORY ROAD is" + line "the final test" + cont "for trainers!" + done + +_VictoryRoad2EndBattleText1:: + text "Aiyah!" + prompt + +_VictoryRoad2AfterBattleText1:: + text "If you get stuck," + line "try moving some" + cont "boulders around!" + done + +_VictoryRoad2BattleText2:: + text "Ah, so you wish" + line "to challenge the" + cont "ELITE FOUR?" + done + +_VictoryRoad2EndBattleText2:: + text "You" + line "got me!" + prompt + +_VictoryRoad2AfterBattleText2:: + text " also came" + line "through here!" + done + +_VictoryRoad2BattleText3:: + text "Come on!" + line "I'll whip you!" + done + +_VictoryRoad2EndBattleText3:: + text "I got" + line "whipped!" + prompt + +_VictoryRoad2AfterBattleText3:: + text "You earned the" + line "right to be on" + cont "VICTORY ROAD!" + done + +_VictoryRoad2BattleText4:: + text "If you can get" + line "through here, you" + cont "can go meet the" + cont "ELITE FOUR!" + done + +_VictoryRoad2EndBattleText4:: + text "No!" + line "Unbelievable!" + prompt + +_VictoryRoad2AfterBattleText4:: + text "I can beat you" + line "when it comes to" + cont "knowledge about" + cont "#MON!" + done + +_VictoryRoad2BattleText5:: + text "Is VICTORY ROAD" + line "too tough?" + done + +_VictoryRoad2EndBattleText5:: + text "Well" + line "done!" + prompt + +_VictoryRoad2AfterBattleText5:: + text "Many trainers give" + line "up the challenge" + cont "here." + done diff --git a/text/maps/VictoryRoad3F.asm b/text/maps/VictoryRoad3F.asm new file mode 100644 index 00000000..07e0be70 --- /dev/null +++ b/text/maps/VictoryRoad3F.asm @@ -0,0 +1,63 @@ +_VictoryRoad3BattleText2:: + text "I heard rumors of" + line "a child prodigy!" + done + +_VictoryRoad3EndBattleText2:: + text "The" + line "rumors were true!" + prompt + +_VictoryRoad3AfterBattleText2:: + text "You beat GIOVANNI" + line "of TEAM ROCKET?" + done + +_VictoryRoad3BattleText3:: + text "I'll show you just" + line "how good you are!" + done + +_VictoryRoad3EndBattleText3:: + text "I'm" + line "furious!" + prompt + +_VictoryRoad3AfterBattleText3:: + text "You showed me just" + line "how good I was!" + done + +_VictoryRoad3BattleText4:: + text "Only the chosen" + line "can pass here!" + done + +_VictoryRoad3EndBattleText4:: + text "I" + line "don't believe it!" + prompt + +_VictoryRoad3AfterBattleText4:: + text "All trainers here" + line "are headed to the" + cont "#MON LEAGUE!" + cont "Be careful!" + done + +_VictoryRoad3BattleText5:: + text "Trainers live to" + line "seek stronger" + cont "opponents!" + done + +_VictoryRoad3EndBattleText5:: + text "Oh!" + line "So strong!" + prompt + +_VictoryRoad3AfterBattleText5:: + text "By fighting tough" + line "battles, you get" + cont "stronger!" + done diff --git a/text/maps/ViridianCity.asm b/text/maps/ViridianCity.asm new file mode 100644 index 00000000..67ab5c40 --- /dev/null +++ b/text/maps/ViridianCity.asm @@ -0,0 +1,180 @@ +_ViridianCityText1:: + text "Those # BALLs" + line "at your waist!" + cont "You have #MON!" + + para "It's great that" + line "you can carry and" + cont "use #MON any" + cont "time, anywhere!" + done + +_ViridianCityText_19122:: + text "This #MON GYM" + line "is always closed." + + para "I wonder who the" + line "LEADER is?" + done + +_ViridianCityText_19127:: + text "VIRIDIAN GYM's" + line "LEADER returned!" + done + +_ViridianCityText_1914d:: + text "You want to know" + line "about the 2 kinds" + cont "of caterpillar" + cont "#MON?" + done + +_ViridianCityText_19152:: + text "Oh, OK then!" + done + +_ViridianCityText_19157:: + text "CATERPIE has no" + line "poison, but" + cont "WEEDLE does." + + para "Watch out for its" + line "POISON STING!" + done + +_ViridianCityText_19175:: + text "Oh Grandpa! Don't" + line "be so mean!" + cont "He hasn't had his" + cont "coffee yet." + done + +_ViridianCityText_1917a:: + text "When I go shop in" + line "PEWTER CITY, I" + cont "have to take the" + cont "winding trail in" + cont "VIRIDIAN FOREST." + done + +_ViridianCityText_19191:: + text "You can't go" + line "through here!" + + para "This is private" + line "property!" + done + +_ViridianCityText_191ca:: + text "Yawn!" + line "I must have dozed" + cont "off in the sun." + + para "I had this dream" + line "about a DROWZEE" + cont "eating my dream." + cont "What's this?" + cont "Where did this TM" + cont "come from?" + + para "This is spooky!" + line "Here, you can" + cont "have this TM." + prompt + +_ReceivedTM42Text:: + text " received" + line "TM42!@@" + +_TM42Explanation:: + text "TM42 contains" + line "DREAM EATER..." + cont "...Snore..." + done + +_TM42NoRoomText:: + text "You have too much" + line "stuff already." + done + +_ViridianCityText_1920a:: + text "Ahh, I've had my" + line "coffee now and I" + cont "feel great!" + + para "Sure you can go" + line "through!" + + para "Are you in a" + line "hurry?" + done + +_ViridianCityText_1920f:: + text "I see you're using" + line "a #DEX." + + para "When you catch a" + line "#MON, #DEX" + cont "is automatically" + cont "updated." + + para "What? Don't you" + line "know how to catch" + cont "#MON?" + + para "I'll show you" + line "how to then." + done + +_ViridianCityText_19214:: + text "Time is money..." + line "Go along then." + done + +_ViridianCityText_19219:: + text "First, you need" + line "to weaken the" + cont "target #MON." + done + +_ViridianCityText8:: + text "VIRIDIAN CITY " + line "The Eternally" + cont "Green Paradise" + done + +_ViridianCityText9:: + text "TRAINER TIPS" + + para "Catch #MON" + line "and expand your" + cont "collection!" + + para "The more you have," + line "the easier it is" + cont "to fight!" + done + +_ViridianCityText10:: + text "TRAINER TIPS" + + para "The battle moves" + line "of #MON are" + cont "limited by their" + cont "POWER POINTs, PP." + + para "To replenish PP," + line "rest your tired" + cont "#MON at a" + cont "#MON CENTER!" + done + +_ViridianCityText13:: + text "VIRIDIAN CITY" + line "#MON GYM" + done + +_ViridianCityText14:: + text "The GYM's doors" + line "are locked..." + done diff --git a/text/maps/ViridianForest.asm b/text/maps/ViridianForest.asm new file mode 100644 index 00000000..813b193a --- /dev/null +++ b/text/maps/ViridianForest.asm @@ -0,0 +1,123 @@ +_ViridianForestText1:: + text "I came here with" + line "some friends!" + + para "They're out for" + line "#MON fights!" + done + +_ViridianForestBattleText1:: + text "Hey! You have" + line "#MON! Come on!" + cont "Let's battle'em!" + done + +_ViridianForestEndBattleText1:: + text "No!" + line "CATERPIE can't" + cont "cut it!" + prompt + +_ViridianFrstAfterBattleText1:: + text "Ssh! You'll scare" + line "the bugs away!" + done + +_ViridianForestBattleText2:: + text "Yo! You can't jam" + line "out if you're a" + cont "#MON trainer!" + done + +_ViridianForestEndBattleText2:: + text "Huh?" + line "I ran out of" + cont "#MON!" + prompt + +_ViridianFrstAfterBattleText2:: + text "Darn! I'm going" + line "to catch some" + cont "stronger ones!" + done + +_ViridianForestBattleText3:: + text "Hey, wait up!" + line "What's the hurry?" + done + +_ViridianForestEndBattleText3:: + text "I" + line "give! You're good" + cont "at this!" + prompt + +_ViridianFrstAfterBattleText3:: + text "Sometimes, you" + line "can find stuff on" + cont "the ground!" + + para "I'm looking for" + line "the stuff I" + cont "dropped!" + done + +_ViridianForestText8:: + text "I ran out of #" + line "BALLs to catch" + cont "#MON with!" + + para "You should carry" + line "extras!" + done + +_ViridianForestText9:: + text "TRAINER TIPS" + + para "If you want to" + line "avoid battles," + cont "stay away from" + cont "grassy areas!" + done + +_ViridianForestText10:: + text "For poison, use" + line "ANTIDOTE! Get it" + cont "at #MON MARTs!" + done + +_ViridianForestText11:: + text "TRAINER TIPS" + + para "Contact PROF.OAK" + line "via PC to get" + cont "your #DEX" + cont "evaluated!" + done + +_ViridianForestText12:: + text "TRAINER TIPS" + + para "No stealing of" + line "#MON from" + cont "other trainers!" + cont "Catch only wild" + cont "#MON!" + done + +_ViridianForestText13:: + text "TRAINER TIPS" + + para "Weaken #MON" + line "before attempting" + cont "capture!" + + para "When healthy," + line "they may escape!" + done + +_ViridianForestText14:: + text "LEAVING" + line "VIRIDIAN FOREST" + cont "PEWTER CITY AHEAD" + done diff --git a/text/maps/ViridianForestNorthGate.asm b/text/maps/ViridianForestNorthGate.asm new file mode 100644 index 00000000..ab6a5a1d --- /dev/null +++ b/text/maps/ViridianForestNorthGate.asm @@ -0,0 +1,19 @@ +_ViridianForestExitText1:: + text "Many #MON live" + line "only in forests " + cont "and caves." + + para "You need to look" + line "everywhere to get" + cont "different kinds!" + done + +_ViridianForestExitText2:: + text "Have you noticed" + line "the bushes on the" + cont "roadside?" + + para "They can be cut" + line "down by a special" + cont "#MON move." + done diff --git a/text/maps/ViridianForestSouthGate.asm b/text/maps/ViridianForestSouthGate.asm new file mode 100644 index 00000000..c1a8df22 --- /dev/null +++ b/text/maps/ViridianForestSouthGate.asm @@ -0,0 +1,13 @@ +_ViridianForestEntranceText1:: + text "Are you going to" + line "VIRIDIAN FOREST?" + cont "Be careful, it's" + cont "a natural maze!" + done + +_ViridianForestEntranceText2:: + text "RATTATA may be" + line "small, but its" + cont "bite is wicked!" + cont "Did you get one?" + done diff --git a/text/maps/ViridianGym.asm b/text/maps/ViridianGym.asm new file mode 100644 index 00000000..4c7b5207 --- /dev/null +++ b/text/maps/ViridianGym.asm @@ -0,0 +1,237 @@ +_ViridianGymText_74ace:: + text "Fwahahaha! This is" + line "my hideout!" + + para "I planned to" + line "resurrect TEAM" + cont "ROCKET here!" + + para "But, you have" + line "caught me again!" + cont "So be it! This" + cont "time, I'm not" + cont "holding back!" + + para "Once more, you" + line "shall face" + cont "GIOVANNI, the" + cont "greatest trainer!" + done + +_ViridianGymText_74ad3:: + text "Ha!" + line "That was a truly" + cont "intense fight!" + cont "You have won!" + cont "As proof, here is" + cont "the EARTHBADGE!@@" + +_ViridianGymText_74ad9:: + text "Having lost, I" + line "cannot face my" + cont "underlings!" + cont "TEAM ROCKET is" + cont "finished forever!" + + para "I will dedicate my" + line "life to the study" + cont "of #MON!" + + para "Let us meet again" + line "some day!" + cont "Farewell!@@" + +_ViridianGymText12:: + text "The EARTHBADGE" + line "makes #MON of" + cont "any level obey!" + + para "It is evidence of" + line "your mastery as a" + cont "#MON trainer!" + + para "With it, you can" + line "enter the #MON" + cont "LEAGUE!" + + para "It is my gift for" + line "your #MON" + cont "LEAGUE challenge!" + done + +_ReceivedTM27Text:: + text " received" + line "TM27!@@" + +_TM27ExplanationText:: + text "" + + para "TM27 is FISSURE!" + line "It will take out" + cont "#MON with just" + cont "one hit!" + + para "I made it when I" + line "ran the GYM here," + cont "too long ago..." + done + +_TM27NoRoomText:: + text "You do not have" + line "space for this!" + done + +_ViridianGymBattleText1:: + text "Heh! You must be" + line "running out of" + cont "steam by now!" + done + +_ViridianGymEndBattleText1:: + text "I" + line "ran out of gas!" + prompt + +_ViridianGymAfterBattleText1:: + text "You need power to" + line "keep up with our" + cont "GYM LEADER!" + done + +_ViridianGymBattleText2:: + text "Rrrroar! I'm" + line "working myself" + cont "into a rage!" + done + +_ViridianGymEndBattleText2:: + text "Wargh!" + prompt + +_ViridianGymAfterBattleText2:: + text "I'm still not" + line "worthy!" + done + +_ViridianGymBattleText3:: + text "#MON and I, we" + line "make wonderful" + cont "music together!" + done + +_ViridianGymEndBattleText3:: + text "You are in" + line "perfect harmony!" + prompt + +_ViridianGymAfterBattleText3:: + text "Do you know the" + line "identity of our" + cont "GYM LEADER?" + done + +_ViridianGymBattleText4:: + text "Karate is the" + line "ultimate form of" + cont "martial arts!" + done + +_ViridianGymEndBattleText4:: + text "Atcho!" + prompt + +_ViridianGymAfterBattleText4:: + text "If my #MON" + line "were as good at" + cont "Karate as I..." + done + +_ViridianGymBattleText5:: + text "The truly talented" + line "win with style!" + done + +_ViridianGymEndBattleText5:: + text "I" + line "lost my grip!" + prompt + +_ViridianGymAfterBattleText5:: + text "The LEADER will" + line "scold me!" + done + +_ViridianGymBattleText6:: + text "I'm the KARATE" + line "KING! Your fate" + cont "rests with me!" + done + +_ViridianGymEndBattleText6:: + text "Ayah!" + prompt + +_ViridianGymAfterBattleText6:: + text "#MON LEAGUE?" + line "You? Don't get" + cont "cocky!" + done + +_ViridianGymBattleText7:: + text "Your #MON will" + line "cower at the" + cont "crack of my whip!" + done + +_ViridianGymEndBattleText7:: + text "Yowch!" + line "Whiplash!" + prompt + +_ViridianGymAfterBattleText7:: + text "Wait! I was just" + line "careless!" + done + +_ViridianGymBattleText8:: + text "VIRIDIAN GYM was" + line "closed for a long" + cont "time, but now our" + cont "LEADER is back!" + done + +_ViridianGymEndBattleText8:: + text "I" + line "was beaten?" + prompt + +_ViridianGymAfterBattleText8:: + text "You can go onto" + line "#MON LEAGUE" + cont "only by defeating" + cont "our GYM LEADER!" + done + +_ViridianGymText_74bd4:: + text "Yo! Champ in" + line "making!" + + para "Even I don't know" + line "VIRIDIAN LEADER's" + cont "identity!" + + para "This will be the" + line "toughest of all" + cont "the GYM LEADERs!" + + para "I heard that the" + line "trainers here" + cont "like ground-type" + cont "#MON!" + done + +_ViridianGymText_74bd9:: + text "Blow me away!" + line "GIOVANNI was the" + cont "GYM LEADER here?" + done diff --git a/text/maps/ViridianMart.asm b/text/maps/ViridianMart.asm new file mode 100644 index 00000000..61750afe --- /dev/null +++ b/text/maps/ViridianMart.asm @@ -0,0 +1,30 @@ +_ViridianMartText1:: + text "Okay! Say hi to" + line "PROF.OAK for me!" + done + +_ViridianMartText4:: + text "Hey! You came from" + line "PALLET TOWN?" + done + +ViridianMartParcelQuestText:: + text "You know PROF." + line "OAK, right?" + + para "His order came in." + line "Will you take it" + cont "to him?" + + para " got" + line "OAK's PARCEL!@@" + +_ViridianMartText2:: + text "This shop sells" + line "many ANTIDOTEs." + done + +_ViridianMartText3:: + text "No! POTIONs are" + line "all sold out." + done diff --git a/text/maps/ViridianNicknameHouse.asm b/text/maps/ViridianNicknameHouse.asm new file mode 100644 index 00000000..757f597a --- /dev/null +++ b/text/maps/ViridianNicknameHouse.asm @@ -0,0 +1,23 @@ +_ViridianHouseText1:: + text "Coming up with" + line "nicknames is fun," + cont "but hard." + + para "Simple names are" + line "the easiest to" + cont "remember." + done + +_ViridianHouseText2:: + text "My Daddy loves" + line "#MON too." + done + +_ViridianHouseText_1d5b1:: + text "SPEARY: Tetweet!" + done + +_ViridianHouseText4:: + text "SPEAROW" + line "Name: SPEARY" + done diff --git a/text/maps/ViridianPokecenter.asm b/text/maps/ViridianPokecenter.asm new file mode 100644 index 00000000..4ac18bf6 --- /dev/null +++ b/text/maps/ViridianPokecenter.asm @@ -0,0 +1,16 @@ +_ViridianPokeCenterText2:: + text "You can use that" + line "PC in the corner." + + para "The receptionist" + line "told me. So kind!" + done + +_ViridianPokeCenterText3:: + text "There's a #MON" + line "CENTER in every" + cont "town ahead." + + para "They don't charge" + line "any money either!" + done diff --git a/text/maps/ViridianSchoolHouse.asm b/text/maps/ViridianSchoolHouse.asm new file mode 100644 index 00000000..f6041e0d --- /dev/null +++ b/text/maps/ViridianSchoolHouse.asm @@ -0,0 +1,13 @@ +_SchoolText1:: + text "Whew! I'm trying" + line "to memorize all" + cont "my notes." + done + +_SchoolText2:: + text "Okay!" + + para "Be sure to read" + line "the blackboard" + cont "carefully!" + done diff --git a/text/maps/WardensHouse.asm b/text/maps/WardensHouse.asm new file mode 100644 index 00000000..7efddb90 --- /dev/null +++ b/text/maps/WardensHouse.asm @@ -0,0 +1,84 @@ +_WardenGibberishText1:: + text "WARDEN: Hif fuff" + line "hefifoo!" + + para "Ha lof ha feef ee" + line "hafahi ho. Heff" + cont "hee fwee!" + done + +_WardenGibberishText2:: + text "Ah howhee ho hoo!" + line "Eef ee hafahi ho!" + done + +_WardenGibberishText3:: + text "Ha? He ohay heh" + line "ha hoo ee haheh!" + done + +_WardenTeethText1:: + text " gave the" + line "GOLD TEETH to the" + cont "WARDEN!@@" + +_WardenTeethText2:: + text "" + + para "The WARDEN popped" + line "in his teeth!" + prompt + +_WardenThankYouText:: + text "WARDEN: Thanks," + line "kid! No one could" + cont "understand a word" + cont "that I said." + + para "I couldn't work" + line "that way." + cont "Let me give you" + cont "something for" + cont "your trouble." + prompt + +_ReceivedHM04Text:: + text " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_HM04ExplanationText:: + text "WARDEN: HM04" + line "teaches STRENGTH!" + + para "It lets #MON" + line "move boulders" + cont "when you're out-" + cont "side of battle." + + para "Oh yes, did you" + line "find SECRET HOUSE" + cont "in SAFARI ZONE?" + + para "If you do, you" + line "win an HM!" + + para "I hear it's the" + line "rare SURF HM." + done + +_HM04NoRoomText:: + text "Your pack is" + line "stuffed full!" + done + +_FuchsiaHouse2Text_75176:: + text "#MON photos" + line "and fossils." + done + +_FuchsiaHouse2Text_7517b:: + text "Old #MON" + line "merchandise." + done diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm deleted file mode 100644 index 9ef5059a..00000000 --- a/text/maps/agatha.asm +++ /dev/null @@ -1,44 +0,0 @@ -_AgathaBeforeBattleText:: - text "I am AGATHA of" - line "the ELITE FOUR!" - - para "OAK's taken a lot" - line "of interest in" - cont "you, child!" - - para "That old duff was" - line "once tough and" - cont "handsome! That" - cont "was decades ago!" - - para "Now he just wants" - line "to fiddle with" - cont "his #DEX! He's" - cont "wrong! #MON" - cont "are for fighting!" - - para "! I'll show" - line "you how a real" - cont "trainer fights!" - done - -_AgathaEndBattleText:: - text "Oh ho!" - line "You're something" - cont "special, child!" - prompt - -_AgathaAfterBattleText:: - text "You win! I see" - line "what the old duff" - cont "sees in you now!" - - para "I have nothing" - line "else to say! Run" - cont "along now, child!" - done - -_AgathaDontRunAwayText:: - text "Someone's voice:" - line "Don't run away!" - done diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm deleted file mode 100644 index 86799865..00000000 --- a/text/maps/bike_shop.asm +++ /dev/null @@ -1,70 +0,0 @@ -_BikeShopText_1d810:: - text "Hi! Welcome to" - line "our BIKE SHOP." - - para "Have we got just" - line "the BIKE for you!" - prompt - -_BikeShopText_1d815:: - text "It's a cool BIKE!" - line "Do you want it?" - done - -_BikeShopCantAffordText:: - text "Sorry! You can't" - line "afford it!" - prompt - -_BikeShopText_1d81f:: - text "Oh, that's..." - - para "A BIKE VOUCHER!" - - para "OK! Here you go!" - prompt - -_BikeShopText_1d824:: - text " exchanged" - line "the BIKE VOUCHER" - cont "for a BICYCLE.@@" - -_BikeShopComeAgainText:: - text "Come back again" - line "some time!" - done - -_BikeShopText_1d82f:: - text "How do you like" - line "your new BICYCLE?" - - para "You can take it" - line "on CYCLING ROAD" - cont "and in caves!" - done - -_BikeShopText_1d834:: - text "You better make" - line "room for this!" - done - -_BikeShopText_1d843:: - text "A plain city BIKE" - line "is good enough" - cont "for me!" - - para "You can't put a" - line "shopping basket" - cont "on an MTB!" - done - -_BikeShopText_1d85c:: - text "These BIKEs are" - line "cool, but they're" - cont "way expensive!" - done - -_BikeShopText_1d861:: - text "Wow. Your BIKE is" - line "really cool!" - done diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm deleted file mode 100644 index 5ece48d7..00000000 --- a/text/maps/bills_house.asm +++ /dev/null @@ -1,87 +0,0 @@ -_BillsHouseText_1e865:: - text "Hiya! I'm a" - line "#MON..." - cont "...No I'm not!" - - para "Call me BILL!" - line "I'm a true blue" - cont "#MANIAC! Hey!" - cont "What's with that" - cont "skeptical look?" - - para "I'm not joshing" - line "you, I screwed up" - cont "an experiment and" - cont "got combined with" - cont "a #MON!" - - para "So, how about it?" - line "Help me out here!" - done - -_BillsHouseText_1e86a:: - text "When I'm in the" - line "TELEPORTER, go to" - cont "my PC and run the" - cont "Cell Separation" - cont "System!" - done - -_BillsHouseText_1e86f:: - text "No!? Come on, you" - line "gotta help a guy" - cont "in deep trouble!" - - para "What do you say," - line "chief? Please?" - cont "OK? All right!" - prompt - -_BillThankYouText:: - text "BILL: Yeehah!" - line "Thanks, bud! I" - cont "owe you one!" - - para "So, did you come" - line "to see my #MON" - cont "collection?" - cont "You didn't?" - cont "That's a bummer." - - para "I've got to thank" - line "you... Oh here," - cont "maybe this'll do." - prompt - -_SSTicketReceivedText:: - text " received" - line "an @" - TX_RAM wcf4b - text "!@@" - -_SSTicketNoRoomText:: - text "You've got too" - line "much stuff, bud!" - done - -_BillsHouseText_1e8cb:: - text "That cruise ship," - line "S.S.ANNE, is in" - cont "VERMILION CITY." - cont "Its passengers" - cont "are all trainers!" - - para "They invited me" - line "to their party," - cont "but I can't stand" - cont "fancy do's. Why" - cont "don't you go" - cont "instead of me?" - done - -_BillsHouseText_1e8da:: - text "BILL: Look, bud," - line "just check out" - cont "some of my rare" - cont "#MON on my PC!" - done diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm deleted file mode 100644 index 1898636a..00000000 --- a/text/maps/blues_house.asm +++ /dev/null @@ -1,41 +0,0 @@ -_DaisyInitialText:: - text "Hi !" - line " is out at" - cont "Grandpa's lab." - done - -_DaisyOfferMapText:: - text "Grandpa asked you" - line "to run an errand?" - cont "Here, this will" - cont "help you!" - prompt - -_GotMapText:: - text " got a" - line "@" - TX_RAM wcf4b - text "!@@" - -_DaisyBagFullText:: - text "You have too much" - line "stuff with you." - done - -_DaisyUseMapText:: - text "Use the TOWN MAP" - line "to find out where" - cont "you are." - done - -_BluesHouseText2:: - text "#MON are living" - line "things! If they" - cont "get tired, give" - cont "them a rest!" - done - -_BluesHouseText3:: - text "It's a big map!" - line "This is useful!" - done diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm deleted file mode 100644 index 9c493c4a..00000000 --- a/text/maps/bruno.asm +++ /dev/null @@ -1,37 +0,0 @@ -_BrunoBeforeBattleText:: - text "I am BRUNO of" - line "the ELITE FOUR!" - - para "Through rigorous" - line "training, people" - cont "and #MON can" - cont "become stronger!" - - para "I've weight" - line "trained with" - cont "my #MON!" - - para "!" - - para "We will grind you" - line "down with our" - cont "superior power!" - - para "Hoo hah!" - done - -_BrunoEndBattleText:: - text "Why?" - line "How could I lose?" - prompt - -_BrunoAfterBattleText:: - text "My job is done!" - line "Go face your next" - cont "challenge!" - done - -_BrunoDontRunAwayText:: - text "Someone's voice:" - line "Don't run away!" - done diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm deleted file mode 100644 index 1dbd5cdf..00000000 --- a/text/maps/celadon_city.asm +++ /dev/null @@ -1,152 +0,0 @@ -_CeladonCityText1:: - text "I got my KOFFING" - line "in CINNABAR!" - - para "It's nice, but it" - line "breathes poison" - cont "when it's angry!" - done - -_CeladonCityText2:: - text "Heheh! This GYM" - line "is great! It's" - cont "full of women!" - done - -_CeladonCityText3:: - text "The GAME CORNER" - line "is bad for our" - cont "city's image!" - done - -_CeladonCityText4:: - text "Moan! I blew it" - line "all at the slots!" - - para "I knew I should" - line "have cashed in my" - cont "coins for prizes!" - done - -_TM41PreText:: - text "Hello, there!" - - para "I've seen you," - line "but I never had a" - cont "chance to talk!" - - para "Here's a gift for" - line "dropping by!" - prompt - -_ReceivedTM41Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM41ExplanationText:: - text "TM41 teaches" - line "SOFTBOILED!" - - para "Only one #MON" - line "can use it!" - - para "That #MON is" - line "CHANSEY!" - done - -_TM41NoRoomText:: - text "Oh, your pack is" - line "full of items!" - done - -_CeladonCityText6:: - text "This is my trusted" - line "pal, POLIWRATH!" - - para "It evolved from" - line "POLIWHIRL when I" - cont "used WATER STONE!" - done - -_CeladonCityText7:: - text "POLIWRATH: Ribi" - line "ribit!@@" - -_CeladonCityText8:: - text "What are you" - line "staring at?" - done - -_CeladonCityText9:: - text "Keep out of TEAM" - line "ROCKET's way!" - done - -_CeladonCityText10:: - text "TRAINER TIPS" - - para "X ACCURACY boosts" - line "the accuracy of" - cont "techniques!" - - para "DIRE HIT jacks up" - line "the likelihood of" - cont "critical hits!" - - para "Get your items at" - line "CELADON DEPT." - cont "STORE!" - done - -_CeladonCityText11:: - text "CELADON CITY" - line "The City of" - cont "Rainbow Dreams" - done - -_CeladonCityText13:: - text "CELADON CITY" - line "#MON GYM" - cont "LEADER: ERIKA" - - para "The Nature Loving" - line "Princess!" - done - -_CeladonCityText14:: - text "CELADON MANSION" - done - -_CeladonCityText15:: - text "Find what you" - line "need at CELADON" - cont "DEPT. STORE!" - done - -_CeladonCityText16:: - text "TRAINER TIPS" - - para "GUARD SPEC." - line "protects #MON" - cont "against SPECIAL" - cont "attacks such as" - cont "fire and water!" - - para "Get your items at" - line "CELADON DEPT." - cont "STORE!" - done - -_CeladonCityText17:: - text "Coins exchanged" - line "for prizes!" - cont "PRIZE EXCHANGE" - done - -_CeladonCityText18:: - text "ROCKET GAME CORNER" - line "The playground" - cont "for grown-ups!" - done diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/celadon_dept_store_1f.asm deleted file mode 100644 index 8d805edc..00000000 --- a/text/maps/celadon_dept_store_1f.asm +++ /dev/null @@ -1,31 +0,0 @@ -_CeladonMart1Text1:: - text "Hello! Welcome to" - line "CELADON DEPT." - cont "STORE." - - para "The board on the" - line "right describes" - cont "the store layout." - done - -_CeladonMart1Text2:: - text "1F: SERVICE" - line " COUNTER" - - para "2F: TRAINER'S" - line " MARKET" - - para "3F: TV GAME SHOP" - - para "4F: WISEMAN GIFTS" - - para "5F: DRUG STORE" - - para "ROOFTOP SQUARE:" - line "VENDING MACHINES" - done - -_CeladonMart1Text3:: - text "1F: SERVICE" - line " COUNTER" - done diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/celadon_dept_store_2f.asm deleted file mode 100644 index 74869902..00000000 --- a/text/maps/celadon_dept_store_2f.asm +++ /dev/null @@ -1,22 +0,0 @@ -_CeladonMart2Text3:: - text "SUPER REPEL keeps" - line "weak #MON at" - cont "bay..." - - para "Hmm, it's a more" - line "powerful REPEL!" - done - -_CeladonMart2Text4:: - text "For long outings," - line "you should buy" - cont "REVIVE." - done - -_CeladonMart2Text5:: - text "Top Grade Items" - line "for Trainers!" - - para "2F: TRAINER'S" - line " MARKET" - done diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm deleted file mode 100644 index 8211750d..00000000 --- a/text/maps/celadon_dept_store_3f.asm +++ /dev/null @@ -1,98 +0,0 @@ -_TM18PreReceiveText:: - text "Oh, hi! I finally" - line "finished #MON!" - - para "Not done yet?" - line "This might be" - cont "useful!" - prompt - -_ReceivedTM18Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM18ExplanationText:: - text "TM18 is COUNTER!" - line "Not like the one" - cont "I'm leaning on," - cont "mind you!" - done - -_TM18NoRoomText:: - text "Your pack is full" - line "of items!" - done - -_CeladonMart3Text2:: - text "Captured #MON" - line "are registered" - cont "with an ID No." - cont "and OT, the name" - cont "of the Original" - cont "Trainer that" - cont "caught it!" - done - -_CeladonMart3Text3:: - text "All right!" - - para "My buddy's going" - line "to trade me his" - cont "KANGASKHAN for my" - cont "GRAVELER!" - done - -_CeladonMart3Text4:: - text "Come on GRAVELER!" - - para "I love GRAVELER!" - line "I collect them!" - - para "Huh?" - - para "GRAVELER turned" - line "into a different" - cont "#MON!" - done - -_CeladonMart3Text5:: - text "You can identify" - line "#MON you got" - cont "in trades by" - cont "their ID Numbers!" - done - -_CeladonMart3Text6:: - text "It's an SNES!" - done - -_CeladonMart3Text7:: - text "An RPG! There's" - line "no time for that!" - done - -_CeladonMart3Text9:: - text "A sports game!" - line "Dad'll like that!" - done - -_CeladonMart3Text11:: - text "A puzzle game!" - line "Looks addictive!" - done - -_CeladonMart3Text13:: - text "A fighting game!" - line "Looks tough!" - done - -_CeladonMart3Text14:: - text "3F: TV GAME SHOP" - done - -_CeladonMart3Text15:: - text "Red and Blue!" - line "Both are #MON!" - done diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm deleted file mode 100644 index 78fa0b66..00000000 --- a/text/maps/celadon_dept_store_4f.asm +++ /dev/null @@ -1,26 +0,0 @@ -_CeladonMart4Text2:: - text "I'm getting a" - line "# DOLL for my" - cont "girl friend!" - done - -_CeladonMart4Text3:: - text "I heard something" - line "useful." - - para "You can run from" - line "wild #MON by" - cont "distracting them" - cont "with a # DOLL!" - done - -_CeladonMart4Text4:: - text "Express yourself" - line "with gifts!" - - para "4F: WISEMAN GIFTS" - - para "Evolution Special!" - line "Element STONEs on" - cont "sale now!" - done diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/celadon_dept_store_5f.asm deleted file mode 100644 index 1871194b..00000000 --- a/text/maps/celadon_dept_store_5f.asm +++ /dev/null @@ -1,28 +0,0 @@ -_CeladonMart5Text1:: - text "#MON ability" - line "enhancers can be" - cont "bought only here." - - para "Use CALCIUM to" - line "increase SPECIAL" - cont "abilities." - - para "Use CARBOS to" - line "increase SPEED." - done - -_CeladonMart5Text2:: - text "I'm here for" - line "#MON ability" - cont "enhancers." - - para "PROTEIN increases" - line "ATTACK power." - - para "IRON increases" - line "DEFENSE!" - done - -_CeladonMart5Text5:: - text "5F: DRUG STORE" - done diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm deleted file mode 100644 index 5d104cf5..00000000 --- a/text/maps/celadon_dept_store_roof.asm +++ /dev/null @@ -1,138 +0,0 @@ -_CeladonMartRoofText_484ee:: - text "Give her which" - line "drink?" - done - -_CeladonMartRoofText_484f3:: - text "Yay!" - - para "FRESH WATER!" - - para "Thank you!" - - para "You can have this" - line "from me!@@" - -_CeladonMartRoofText_484f9:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_CeladonMartRoofText_484fe:: - db $0 - para "@" - TX_RAM wcf4b - text " contains" - line "ICE BEAM!" - - para "It can freeze the" - line "target sometimes!@@" - -_CeladonMartRoofText_48504:: - text "Yay!" - - para "SODA POP!" - - para "Thank you!" - - para "You can have this" - line "from me!@@" - -_CeladonMartRoofText_4850a:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_CeladonMartRoofText_4850f:: - db $0 - para "@" - TX_RAM wcf4b - text " contains" - line "ROCK SLIDE!" - - para "It can spook the" - line "target sometimes!@@" - -_CeladonMartRoofText_48515:: - text "Yay!" - - para "LEMONADE!" - - para "Thank you!" - - para "You can have this" - line "from me!@@" - -_ReceivedTM49Text:: - text " received" - line "TM49!@@" - -_CeladonMartRoofText_48520:: - db $0 - para "TM49 contains" - line "TRI ATTACK!@@" - -_CeladonMartRoofText_48526:: - text "You don't have" - line "space for this!@@" - -_CeladonMartRoofText_4852c:: - text "No thank you!" - line "I'm not thirsty" - cont "after all!@@" - -_CeladonMartRoofText1:: - text "My sister is a" - line "trainer, believe" - cont "it or not." - - para "But, she's so" - line "immature, she" - cont "drives me nuts!" - done - -_CeladonMartRoofText_48598:: - text "I'm thirsty!" - line "I want something" - cont "to drink!" - done - -_CeladonMartRoofText4:: - text "I'm thirsty!" - line "I want something" - cont "to drink!" - - para "Give her a drink?" - done - -_CeladonMartRoofText6:: - text "ROOFTOP SQUARE:" - line "VENDING MACHINES" - done - -_VendingMachineText1:: - text "A vending machine!" - line "Here's the menu!" - prompt - -_VendingMachineText4:: - text "Oops, not enough" - line "money!" - done - -_VendingMachineText5:: - TX_RAM wcf4b - db $0 - line "popped out!" - done - -_VendingMachineText6:: - text "There's no more" - line "room for stuff!" - done - -_VendingMachineText7:: - text "Not thirsty!" - done diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm deleted file mode 100644 index dc5e9350..00000000 --- a/text/maps/celadon_diner.asm +++ /dev/null @@ -1,59 +0,0 @@ -_CeladonDinerText1:: - text "Hi!" - - para "We're taking a" - line "break now." - done - -_CeladonDinerText2:: - text "My #MON are" - line "weak, so I often" - cont "have to go to the" - cont "DRUG STORE." - done - -_CeladonDinerText3:: - text "Psst! There's a" - line "basement under" - cont "the GAME CORNER." - done - -_CeladonDinerText4:: - text "Munch..." - - para "The man at that" - line "table lost it all" - cont "at the slots." - done - -_CeladonDinerText_491a7:: - text "Go ahead! Laugh!" - - para "I'm flat out" - line "busted!" - - para "No more slots for" - line "me! I'm going" - cont "straight!" - - para "Here! I won't be" - line "needing this any-" - cont "more!" - prompt - -_ReceivedCoinCaseText:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_CoinCaseNoRoomText:: - text "Make room for" - line "this!" - done - -_CeladonDinerText_491b7:: - text "I always thought" - line "I was going to" - cont "win it back..." - done diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm deleted file mode 100644 index 1e59f83e..00000000 --- a/text/maps/celadon_game_corner.asm +++ /dev/null @@ -1,186 +0,0 @@ -_CeladonGameCornerText1:: - text "Welcome!" - - para "You can exchange" - line "your coins for" - cont "fabulous prizes" - cont "next door." - done - -_CeladonGameCornerText_48d22:: - text "Welcome to ROCKET" - line "GAME CORNER!" - - para "Do you need some" - line "game coins?" - - para "It's ¥1000 for 50" - line "coins. Would you" - cont "like some?" - done - -_CeladonGameCornerText_48d27:: - text "Thanks! Here are" - line "your 50 coins!" - done - -_CeladonGameCornerText_48d2c:: - text "No? Please come" - line "play sometime!" - done - -_CeladonGameCornerText_48d31:: - text "You can't afford" - line "the coins!" - done - -_CeladonGameCornerText_48d36:: - text "Oops! Your COIN" - line "CASE is full." - done - -_CeladonGameCornerText_48d3b:: - text "You don't have a" - line "COIN CASE!" - done - -_CeladonGameCornerText3:: - text "Keep this quiet." - - para "It's rumored that" - line "this place is run" - cont "by TEAM ROCKET." - done - -_CeladonGameCornerText4:: - text "I think these" - line "machines have" - cont "different odds." - done - -_CeladonGameCornerText_48d9c:: - text "Kid, do you want" - line "to play?" - prompt - -_Received10CoinsText:: - text " received" - line "10 coins!@@" - -_CeladonGameCornerText_48da7:: - text "You don't need my" - line "coins!" - done - -_CeladonGameCornerText_48dac:: - text "Wins seem to come" - line "and go." - done - -_CeladonGameCornerText6:: - text "I'm having a" - line "wonderful time!" - done - -_CeladonGameCornerText_48dca:: - text "Hey!" - - para "You have better" - line "things to do," - cont "champ in making!" - - para "CELADON GYM's" - line "LEADER is ERIKA!" - cont "She uses grass-" - cont "type #MON!" - - para "She might appear" - line "docile, but don't" - cont "be fooled!" - done - -_CeladonGameCornerText_48dcf:: - text "They offer rare" - line "#MON that can" - cont "be exchanged for" - cont "your coins." - - para "But, I just can't" - line "seem to win!" - done - -_CeladonGameCornerText8:: - text "Games are scary!" - line "It's so easy to" - cont "get hooked!" - done - -_CeladonGameCornerText_48e26:: - text "What's up? Want" - line "some coins?" - prompt - -_Received20CoinsText:: - text " received" - line "20 coins!@@" - -_CeladonGameCornerText_48e31:: - text "You have lots of" - line "coins!" - done - -_CeladonGameCornerText_48e36:: - text "Darn! I need more" - line "coins for the" - cont "#MON I want!" - done - -_CeladonGameCornerText_48e88:: - text "Hey, what? You're" - line "throwing me off!" - cont "Here are some" - cont "coins, shoo!" - prompt - -_CeladonGameCornerText_48e8d:: - text " received" - line "20 coins!@@" - -_CeladonGameCornerText_48e93:: - text "You've got your" - line "own coins!" - done - -_CeladonGameCornerText_48e98:: - text "The trick is to" - line "watch the reels" - cont "closely!" - done - -_CeladonGameCornerText_48ece:: - text "I'm guarding this" - line "poster!" - cont "Go away, or else!" - done - -_CeladonGameCornerText_48ed3:: - text "Dang!" - prompt - -_CeladonGameCornerText_48ed8:: - text "Our hideout might" - line "be discovered! I" - cont "better tell BOSS!" - done - -_CeladonGameCornerText_48f09:: - text "Hey!" - - para "A switch behind" - line "the poster!?" - cont "Let's push it!@@" - -_CeladonGameCornerText_48f19:: - text "Oops! Forgot the" - line "COIN CASE!" - done diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm deleted file mode 100644 index d8f9394c..00000000 --- a/text/maps/celadon_gym.asm +++ /dev/null @@ -1,218 +0,0 @@ -_CeladonGymText_48a5e:: - text "Hello. Lovely" - line "weather isn't it?" - cont "It's so pleasant." - - para "...Oh dear..." - line "I must have dozed" - cont "off. Welcome." - - para "My name is ERIKA." - line "I am the LEADER" - cont "of CELADON GYM." - - para "I teach the art of" - line "flower arranging." - cont "My #MON are of" - cont "the grass-type." - - para "Oh, I'm sorry, I" - line "had no idea that" - cont "you wished to" - cont "challenge me." - - para "Very well, but I" - line "shall not lose." - done - -_CeladonGymText_48a63:: - text "Oh!" - line "I concede defeat." - - para "You are remarkably" - line "strong." - - para "I must confer you" - line "the RAINBOWBADGE." - prompt - -_CeladonGymText_48a68:: - text "You are cataloging" - line "#MON? I must" - cont "say I'm impressed." - - para "I would never" - line "collect #MON" - cont "if they were" - cont "unattractive." - done - -_CeladonGymText9:: - text "The RAINBOWBADGE" - line "will make #MON" - cont "up to L50 obey." - - para "It also allows" - line "#MON to use" - cont "STRENGTH in and" - cont "out of battle." - - para "Please also take" - line "this with you." - done - -_ReceivedTM21Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM21ExplanationText:: - db $0 - para "TM21 contains" - line "MEGA DRAIN." - - para "Half the damage" - line "it inflicts is" - cont "drained to heal" - cont "your #MON!" - done - -_TM21NoRoomText:: - text "You should make" - line "room for this." - done - -_CeladonGymBattleText2:: - text "Hey!" - - para "You are not" - line "allowed in here!" - done - -_CeladonGymEndBattleText2:: - text "You're" - line "too rough!" - prompt - -_CeladonGymAfterBattleText2:: - text "Bleaah!" - line "I hope ERIKA" - cont "wipes you out!" - done - -_CeladonGymBattleText3:: - text "I was getting" - line "bored." - done - -_CeladonGymEndBattleText3:: - text "My" - line "makeup!" - prompt - -_CeladonGymAfterBattleText3:: - text "Grass-type #MON" - line "are tough against" - cont "the water-type!" - - para "They also have an" - line "edge on rock and" - cont "ground #MON!" - done - -_CeladonGymBattleText4:: - text "Aren't you the" - line "peeping Tom?" - done - -_CeladonGymEndBattleText4:: - text "I'm" - line "in shock!" - prompt - -_CeladonGymAfterBattleText4:: - text "Oh, you weren't" - line "peeping? We get a" - cont "lot of gawkers!" - done - -_CeladonGymBattleText5:: - text "Look at my grass" - line "#MON!" - - para "They're so easy" - line "to raise!" - done - -_CeladonGymEndBattleText5:: - text "No!" - prompt - -_CeladonGymAfterBattleText5:: - text "We only use grass-" - line "type #MON at" - cont "our GYM!" - - para "We also use them" - line "for making flower" - cont "arrangements!" - done - -_CeladonGymBattleText6:: - text "Don't bring any" - line "bugs or fire" - cont "#MON in here!" - done - -_CeladonGymEndBattleText6:: - text "Oh!" - line "You!" - prompt - -_CeladonGymAfterBattleText6:: - text "Our LEADER, ERIKA," - line "might be quiet," - cont "but she's also" - cont "very skilled!" - done - -_CeladonGymBattleText7:: - text "Pleased to meet" - line "you. My hobby is" - cont "#MON training." - done - -_CeladonGymEndBattleText7:: - text "Oh!" - line "Splendid!" - prompt - -_CeladonGymAfterBattleText7:: - text "I have a blind" - line "date coming up." - cont "I have to learn" - cont "to be polite." - done - -_CeladonGymBattleText8:: - text "Welcome to" - line "CELADON GYM!" - - para "You better not" - line "underestimate" - cont "girl power!" - done - -_CeladonGymEndBattleText8:: - text "Oh!" - line "Beaten!" - prompt - -_CeladonGymAfterBattleText8:: - text "I didn't bring my" - line "best #MON!" - - para "Wait 'til next" - line "time!" - done diff --git a/text/maps/celadon_hotel.asm b/text/maps/celadon_hotel.asm deleted file mode 100644 index f2eb059e..00000000 --- a/text/maps/celadon_hotel.asm +++ /dev/null @@ -1,21 +0,0 @@ -_CeladonHotelText1:: - text "#MON? No, this" - line "is a hotel for" - cont "people." - - para "We're full up." - done - -_CeladonHotelText2:: - text "I'm on vacation" - line "with my brother" - cont "and boy friend." - - para "CELADON is such a" - line "pretty city!" - done - -_CeladonHotelText3:: - text "Why did she bring" - line "her brother?" - done diff --git a/text/maps/celadon_house.asm b/text/maps/celadon_house.asm deleted file mode 100644 index 19e59bd6..00000000 --- a/text/maps/celadon_house.asm +++ /dev/null @@ -1,22 +0,0 @@ -_CeladonHouseText1:: - text "Hehehe! The slots" - line "just reel in the" - cont "dough, big time!" - done - -_CeladonHouseText2:: - text "CHIEF!" - - para "We just shipped" - line "2000 #MON as" - cont "slot prizes!" - done - -_CeladonHouseText3:: - text "Don't touch the" - line "poster at the" - cont "GAME CORNER!" - - para "There's no secret" - line "switch behind it!" - done diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm deleted file mode 100644 index fc175cd5..00000000 --- a/text/maps/celadon_mansion_1f.asm +++ /dev/null @@ -1,23 +0,0 @@ -_CeladonMansion1Text1:: - text "MEOWTH: Meow!@@" - -_CeladonMansion1Text2:: - text "My dear #MON" - line "keep me company." - - para "MEOWTH even brings" - line "money home!" - done - -_CeladonMansion1Text3:: - text "CLEFAIRY: Pi" - line "pippippi!@@" - -_CeladonMansion1Text4:: - text "NIDORAN: Kya" - line "kyaoo!@@" - -_CeladonMansion1Text5:: - text "CELADON MANSION" - line "Manager's Suite" - done diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/celadon_mansion_2f.asm deleted file mode 100644 index b2ecb4fa..00000000 --- a/text/maps/celadon_mansion_2f.asm +++ /dev/null @@ -1,4 +0,0 @@ -_CeladonMansion2Text1:: - text "GAME FREAK" - line "Meeting Room" - done diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm deleted file mode 100644 index c8858281..00000000 --- a/text/maps/celadon_mansion_3f.asm +++ /dev/null @@ -1,66 +0,0 @@ -_ProgrammerText:: - text "Me? I'm the" - line "programmer!" - done - -_GraphicArtistText:: - text "I'm the graphic" - line "artist!" - cont "I drew you!" - done - -_WriterText:: - text "I wrote the story!" - line "Isn't ERIKA cute?" - - para "I like MISTY a" - line "lot too!" - - para "Oh, and SABRINA," - line "I like her!" - done - -_GameDesignerText:: - text "Is that right?" - - para "I'm the game" - line "designer!" - - para "Filling up your" - line "#DEX is tough," - cont "but don't quit!" - - para "When you finish," - line "come tell me!" - done - -_CompletedDexText:: - text "Wow! Excellent!" - line "You completed" - cont "your #DEX!" - cont "Congratulations!" - cont "...@@" - -_CeladonMansion3Text5:: - text "It's the game" - line "program! Messing" - cont "with it could bug" - cont "out the game!" - done - -_CeladonMansion3Text6:: - text "Someone's playing" - line "a game instead of" - cont "working!" - done - -_CeladonMansion3Text7:: - text "It's the script!" - line "Better not look" - cont "at the ending!" - done - -_CeladonMansion3Text8:: - text "GAME FREAK" - line "Development Room" - done diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/celadon_mansion_4f_inside.asm deleted file mode 100644 index dab81a8d..00000000 --- a/text/maps/celadon_mansion_4f_inside.asm +++ /dev/null @@ -1,10 +0,0 @@ -_CeladonMansion5Text1:: - text "I know everything" - line "about the world" - cont "of #MON in" - cont "your GAME BOY!" - - para "Get together with" - line "your friends and" - cont "trade #MON!" - done diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/celadon_mansion_4f_outside.asm deleted file mode 100644 index c8fd7ec8..00000000 --- a/text/maps/celadon_mansion_4f_outside.asm +++ /dev/null @@ -1,3 +0,0 @@ -_CeladonMansion4Text1:: - text "I KNOW EVERYTHING!" - done diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/celadon_pokecenter.asm deleted file mode 100644 index a04f51c9..00000000 --- a/text/maps/celadon_pokecenter.asm +++ /dev/null @@ -1,12 +0,0 @@ -_CeladonPokecenterText2:: - text "# FLUTE awakens" - line "#MON with a" - cont "sound that only" - cont "they can hear!" - done - -_CeladonPokecenterText3:: - text "I rode uphill on" - line "CYCLING ROAD from" - cont "FUCHSIA!" - done diff --git a/text/maps/celadon_prize_room.asm b/text/maps/celadon_prize_room.asm deleted file mode 100644 index 6b2bb537..00000000 --- a/text/maps/celadon_prize_room.asm +++ /dev/null @@ -1,12 +0,0 @@ -_CeladonPrizeRoomText1:: - text "I sure do fancy" - line "that PORYGON!" - - para "But, it's hard to" - line "win at slots!" - done - -_CeladonPrizeRoomText2:: - text "I had a major" - line "haul today!" - done diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/cerulean_badge_house.asm deleted file mode 100644 index 9d701443..00000000 --- a/text/maps/cerulean_badge_house.asm +++ /dev/null @@ -1,97 +0,0 @@ -_CeruleanHouse2Text_74e77:: - text "#MON BADGEs" - line "are owned only by" - cont "skilled trainers." - - para "I see you have" - line "at least one." - - para "Those BADGEs have" - line "amazing secrets!" - prompt - -_CeruleanHouse2Text_74e7c:: - text "Now then..." - - para "Which of the 8" - line "BADGEs should I" - cont "describe?" - done - -_CeruleanHouse2Text_74e81:: - text "Come visit me any" - line "time you wish." - done - -_CeruleanHouse2Text_74e96:: - text "The ATTACK of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" - line "use FLASH any" - cont "time you desire." - prompt - -_CeruleanHouse2Text_74e9b:: - text "#MON up to L30" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - - para "It also lets you" - line "use CUT outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74ea0:: - text "The SPEED of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" - line "use FLY outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74ea5:: - text "#MON up to L50" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - - para "It also lets you" - line "use STRENGTH out-" - cont "side of battle." - prompt - -_CeruleanHouse2Text_74eaa:: - text "The DEFENSE of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" - line "use SURF outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74eaf:: - text "#MON up to L70" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - prompt - -_CeruleanHouse2Text_74eb4:: - text "Your #MON's" - line "SPECIAL abilities" - cont "increase a bit." - prompt - -_CeruleanHouse2Text_74eb9:: - text "All #MON will" - line "obey you!" - prompt diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm deleted file mode 100644 index b5319d04..00000000 --- a/text/maps/cerulean_city.asm +++ /dev/null @@ -1,232 +0,0 @@ -_CeruleanCityText_19668:: - text ": Yo!" - line "!" - - para "You're still" - line "struggling along" - cont "back here?" - - para "I'm doing great!" - line "I caught a bunch" - cont "of strong and" - cont "smart #MON!" - - para "Here, let me see" - line "what you caught," - cont "!" - done - -_CeruleanCityText_1966d:: - text "Hey!" - line "Take it easy!" - cont "You won already!" - prompt - -_CeruleanCityText_19672:: - text "Heh!" - line "You're no match" - cont "for my genius!" - prompt - -_CeruleanCityText_19677:: - text ": Hey," - line "guess what?" - - para "I went to BILL's" - line "and got him to" - cont "show me his rare" - cont "#MON!" - - para "That added a lot" - line "of pages to my" - cont "#DEX!" - - para "After all, BILL's" - line "world famous as a" - cont "#MANIAC!" - - para "He invented the" - line "#MON Storage" - cont "System on PC!" - - para "Since you're using" - line "his system, go" - cont "thank him!" - - para "Well, I better" - line "get rolling!" - cont "Smell ya later!" - done - -_CeruleanCityText_196d9:: - text "Hey! Stay out!" - line "It's not your" - cont "yard! Huh? Me?" - - para "I'm an innocent" - line "bystander! Don't" - cont "you believe me?" - done - -_ReceivedTM28Text:: - text " recovered" - line "TM28!@@" - -_ReceivedTM28Text2:: - db $0 - para "I better get" - line "moving! Bye!@@" - -_TM28NoRoomText:: - text "Make room for" - line "this!" - - para "I can't run until" - line "I give it to you!" - done - -_CeruleanCityText_196ee:: - text "Stop!" - line "I give up! I'll" - cont "leave quietly!" - prompt - -_CeruleanCityText_196f3:: - text "OK! I'll return" - line "the TM I stole!" - prompt - -_CeruleanCityText3:: - text "You're a trainer" - line "too? Collecting," - cont "fighting, it's a" - cont "tough life." - done - -_CeruleanCityText4:: - text "That bush in" - line "front of the shop" - cont "is in the way." - - para "There might be a" - line "way around." - done - -_CeruleanCityText5:: - text "You're making an" - line "encyclopedia on" - cont "#MON? That" - cont "sounds amusing." - done - -_CeruleanCityText6:: - text "The people here" - line "were robbed." - - para "It's obvious that" - line "TEAM ROCKET is" - cont "behind this most" - cont "heinous crime!" - - para "Even our POLICE" - line "force has trouble" - cont "with the ROCKETs!" - done - -_CeruleanCityText_19730:: - text "OK! SLOWBRO!" - line "Use SONICBOOM!" - cont "Come on, SLOWBRO" - cont "pay attention!" - done - -_CeruleanCityText_19735:: - text "SLOWBRO punch!" - line "No! You blew it" - cont "again!" - done - -_CeruleanCityText_1973a:: - text "SLOWBRO, WITHDRAW!" - line "No! That's wrong!" - - para "It's so hard to" - line "control #MON!" - - para "Your #MON's" - line "obedience depends" - cont "on your abilities" - cont "as a trainer!" - done - -_CeruleanCityText_1976f:: - text "SLOWBRO took a" - line "snooze..." - done - -_CeruleanCityText_19774:: - text "SLOWBRO is" - line "loafing around..." - done - -_CeruleanCityText_19779:: - text "SLOWBRO turned" - line "away..." - done - -_CeruleanCityText_1977e:: - text "SLOWBRO" - line "ignored orders..." - done - -_CeruleanCityText9:: - text "I want a bright" - line "red BICYCLE!" - - para "I'll keep it at" - line "home, so it won't" - cont "get dirty!" - done - -_CeruleanCityText10:: - text "This is CERULEAN" - line "CAVE! Horribly" - cont "strong #MON" - cont "live in there!" - - para "The #MON LEAGUE" - line "champion is the" - cont "only person who" - cont "is allowed in!" - done - -_CeruleanCityText12:: - text "CERULEAN CITY" - line "A Mysterious," - cont "Blue Aura" - cont "Surrounds It" - done - -_CeruleanCityText13:: - text "TRAINER TIPS" - - para "Pressing B Button" - line "during evolution" - cont "cancels the whole" - cont "process." - done - -_CeruleanCityText16:: - text "Grass and caves" - line "handled easily!" - cont "BIKE SHOP" - done - -_CeruleanCityText17:: - text "CERULEAN CITY" - line "#MON GYM" - cont "LEADER: MISTY" - - para "The Tomboyish" - line "Mermaid!" - done diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm deleted file mode 100644 index 1d1d6d1c..00000000 --- a/text/maps/cerulean_gym.asm +++ /dev/null @@ -1,131 +0,0 @@ -_CeruleanGymText_5c7be:: - text "Hi, you're a new" - line "face!" - - para "Trainers who want" - line "to turn pro have" - cont "to have a policy" - cont "about #MON!" - - para "What is your" - line "approach when you" - cont "catch #MON?" - - para "My policy is an" - line "all-out offensive" - cont "with water-type" - cont "#MON!" - done - -_CeruleanGymText_5c7c3:: - text "TM11 teaches" - line "BUBBLEBEAM!" - - para "Use it on an" - line "aquatic #MON!" - done - -_CeruleanGymText_5c7c8:: - text "The CASCADEBADGE" - line "makes all #MON" - cont "up to L30 obey!" - - para "That includes" - line "even outsiders!" - - para "There's more, you" - line "can now use CUT" - cont "any time!" - - para "You can CUT down" - line "small bushes to" - cont "open new paths!" - - para "You can also have" - line "my favorite TM!" - done - -_ReceivedTM11Text:: - text " received" - line "TM11!@@" - -_CeruleanGymText_5c7d3:: - text "You better make" - line "room for this!" - done - -_CeruleanGymText_5c7d8:: - text "Wow!" - line "You're too much!" - - para "All right!" - - para "You can have the" - line "CASCADEBADGE to" - cont "show you beat me!@@" - -_CeruleanGymBattleText1:: - text "I'm more than good" - line "enough for you!" - - para "MISTY can wait!" - done - -_CeruleanGymEndBattleText1:: - text "You" - line "overwhelmed me!" - prompt - -_CeruleanGymAfterBattleText1:: - text "You have to face" - line "other trainers to" - cont "find out how good" - cont "you really are." - done - -_CeruleanGymBattleText2:: - text "Splash!" - - para "I'm first up!" - line "Let's do it!" - done - -_CeruleanGymEndBattleText2:: - text "That" - line "can't be!" - prompt - -_CeruleanGymAfterBattleText2:: - text "MISTY is going to" - line "keep improving!" - - para "She won't lose to" - line "someone like you!" - done - -_CeruleanGymText_5c82a:: - text "Yo! Champ in" - line "making!" - - para "Here's my advice!" - - para "The LEADER, MISTY," - line "is a pro who uses" - cont "water #MON!" - - para "You can drain all" - line "their water with" - cont "plant #MON!" - - para "Or, zap them with" - line "electricity!" - done - -_CeruleanGymText_5c82f:: - text "You beat MISTY!" - line "What'd I tell ya?" - - para "You and me kid," - line "we make a pretty" - cont "darn good team!" - done diff --git a/text/maps/cerulean_mart.asm b/text/maps/cerulean_mart.asm deleted file mode 100644 index 86a74588..00000000 --- a/text/maps/cerulean_mart.asm +++ /dev/null @@ -1,19 +0,0 @@ -_CeruleanMartText2:: - text "Use REPEL to keep" - line "bugs and weak" - cont "#MON away." - - para "Put your strongest" - line "#MON at the" - cont "top of the list" - cont "for best results!" - done - -_CeruleanMartText3:: - text "Have you seen any" - line "RARE CANDY?" - - para "It's supposed to" - line "make #MON go" - cont "up one level!" - done diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/cerulean_pokecenter.asm deleted file mode 100644 index 497fbce3..00000000 --- a/text/maps/cerulean_pokecenter.asm +++ /dev/null @@ -1,24 +0,0 @@ -_CeruleanPokecenterText2:: - text "That BILL!" - - para "I heard that" - line "he'll do whatever" - cont "it takes to get" - cont "rare #MON!" - done - -_CeruleanPokecenterText3:: - text "Have you heard" - line "about BILL?" - - para "Everyone calls" - line "him a #MANIAC!" - - para "I think people" - line "are just jealous" - cont "of BILL, though." - - para "Who wouldn't want" - line "to boast about" - cont "their #MON?" - done diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm deleted file mode 100644 index b606613b..00000000 --- a/text/maps/cerulean_trade_house.asm +++ /dev/null @@ -1,9 +0,0 @@ -_CeruleanHouse1Text1:: - text "My husband likes" - line "trading #MON." - - para "If you are a" - line "collector, would" - cont "you please trade" - cont "with him?" - done diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/cerulean_trashed_house.asm deleted file mode 100644 index f79540ae..00000000 --- a/text/maps/cerulean_trashed_house.asm +++ /dev/null @@ -1,36 +0,0 @@ -_CeruleanTrashedText_1d6ab:: - text "Those miserable" - line "ROCKETs!" - - para "Look what they" - line "did here!" - - para "They stole a TM" - line "for teaching" - cont "#MON how to" - cont "DIG holes!" - - para "That cost me a" - line "bundle, it did!" - done - -_CeruleanTrashedText_1d6b0:: - text "I figure what's" - line "lost is lost!" - - para "I decided to teach" - line "DIGLETT how to" - cont "DIG without a TM!" - done - -_CeruleanHouseTrashedText2:: - text "TEAM ROCKET must" - line "be trying to DIG" - cont "their way into no" - cont "good!" - done - -_CeruleanHouseTrashedText3:: - text "TEAM ROCKET left" - line "a way out!" - done diff --git a/text/maps/champion.asm b/text/maps/champion.asm deleted file mode 100644 index 61050565..00000000 --- a/text/maps/champion.asm +++ /dev/null @@ -1,146 +0,0 @@ -_GaryChampionIntroText:: - text ": Hey!" - - para "I was looking" - line "forward to seeing" - cont "you, !" - - para "My rival should" - line "be strong to keep" - cont "me sharp!" - - para "While working on" - line "#DEX, I looked" - cont "all over for" - cont "powerful #MON!" - - para "Not only that, I" - line "assembled teams" - cont "that would beat" - cont "any #MON type!" - - para "And now!" - - para "I'm the #MON" - line "LEAGUE champion!" - - para "! Do you" - line "know what that" - cont "means?" - - para "I'll tell you!" - - para "I am the most" - line "powerful trainer" - cont "in the world!" - done - -_GaryDefeatedText:: - text "NO!" - line "That can't be!" - cont "You beat my best!" - - para "After all that" - line "work to become" - cont "LEAGUE champ?" - - para "My reign is over" - line "already?" - cont "It's not fair!" - prompt - -_GaryVictoryText:: - text "Hahaha!" - line "I won, I won!" - - para "I'm too good for" - line "you, !" - - para "You did well to" - line "even reach me," - cont ", the" - cont "#MON genius!" - - para "Nice try, loser!" - line "Hahaha!" - prompt - -_GaryText_76103:: - text "Why?" - line "Why did I lose?" - - para "I never made any" - line "mistakes raising" - cont "my #MON..." - - para "Darn it! You're" - line "the new #MON" - cont "LEAGUE champion!" - - para "Although I don't" - line "like to admit it." - done - -_GaryText2:: - text "OAK: !" - done - -_GaryText_76120:: - text "OAK: So, you won!" - line "Congratulations!" - cont "You're the new" - cont "#MON LEAGUE" - cont "champion!" - - para "You've grown up so" - line "much since you" - cont "first left with" - cont "@" - TX_RAM wcd6d - text "!" - - para ", you have" - line "come of age!" - done - -_GaryText_76125:: - text "OAK: ! I'm" - line "disappointed!" - - para "I came when I" - line "heard you beat" - cont "the ELITE FOUR!" - - para "But, when I got" - line "here, you had" - cont "already lost!" - - para "! Do you" - line "understand why" - cont "you lost?" - - para "You have forgotten" - line "to treat your" - cont "#MON with" - cont "trust and love!" - - para "Without them, you" - line "will never become" - cont "a champ again!" - done - -_GaryText_7612a:: - text "OAK: !" - - para "You understand" - line "that your victory" - cont "was not just your" - cont "own doing!" - - para "The bond you share" - line "with your #MON" - cont "is marvelous!" - - para "!" - line "Come with me!" - done diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm deleted file mode 100644 index 173f94d2..00000000 --- a/text/maps/cinnabar_gym.asm +++ /dev/null @@ -1,209 +0,0 @@ -_BlaineBattleText:: - text "Hah!" - - para "I am BLAINE! I" - line "am the LEADER of" - cont "CINNABAR GYM!" - - para "My fiery #MON" - line "will incinerate" - cont "all challengers!" - - para "Hah! You better" - line "have BURN HEAL!" - done - -_BlaineEndBattleText:: - text "I have" - line "burnt out!" - - para "You have earned" - line "the VOLCANOBADGE!@@" - -_BlaineFireBlastText:: - text "FIRE BLAST is the" - line "ultimate fire" - cont "technique!" - - para "Don't waste it on" - line "water #MON!" - done - -_BlaineBadgeText:: - text "Hah!" - - para "The VOLCANOBADGE" - line "heightens the" - cont "SPECIAL abilities" - cont "of your #MON!" - - para "Here, you can" - line "have this too!" - done - -_ReceivedTM38Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM38ExplanationText:: - db $0 - para "TM38 contains" - line "FIRE BLAST!" - - para "Teach it to fire-" - line "type #MON!" - - para "CHARMELEON or" - line "PONYTA would be" - cont "good bets!" - done - -_TM38NoRoomText:: - text "Make room for my" - line "gift!" - done - -_CinnabarGymText_7595f:: - text "Do you know how" - line "hot #MON fire" - cont "breath can get?" - done - -_CinnabarGymText_75964:: - text "Yow!" - line "Hot, hot, hot!" - prompt - -_CinnabarGymText_75969:: - text "Fire, or to be" - line "more precise," - cont "combustion..." - - para "Blah, blah, blah," - line "blah..." - done - -_CinnabarGymText_75994:: - text "I was a thief, but" - line "I became straight" - cont "as a trainer!" - done - -_CinnabarGymText_75999:: - text "I" - line "surrender!" - prompt - -_CinnabarGymText_7599e:: - text "I can't help" - line "stealing other" - cont "people's #MON!" - done - -_CinnabarGymText_759c9:: - text "You can't win!" - line "I have studied" - cont "#MON totally!" - done - -_CinnabarGymText_759ce:: - text "Waah!" - line "My studies!" - prompt - -_CinnabarGymText_759d3:: - text "My theories are" - line "too complicated" - cont "for you!" - done - -_CinnabarGymText_759fe:: - text "I just like using" - line "fire #MON!" - done - -_CinnabarGymText_75a03:: - text "Too hot" - line "to handle!" - prompt - -_CinnabarGymText_75a08:: - text "I wish there was" - line "a thief #MON!" - cont "I'd use that!" - done - -_CinnabarGymText_75a33:: - text "I know why BLAINE" - line "became a trainer!" - done - -_CinnabarGymText_75a38:: - text "Ow!" - prompt - -_CinnabarGymText_75a3d:: - text "BLAINE was lost" - line "in the mountains" - cont "when a fiery bird" - cont "#MON appeared." - - para "Its light enabled" - line "BLAINE to find" - cont "his way down!" - done - -_CinnabarGymText_75a68:: - text "I've been to many" - line "GYMs, but this is" - cont "my favorite!" - done - -_CinnabarGymText_75a6d:: - text "Yowza!" - line "Too hot!" - prompt - -_CinnabarGymText_75a72:: - text "Us fire #MON" - line "fans like PONYTA" - cont "and NINETALES!" - done - -_CinnabarGymText_75a9d:: - text "Fire is weak" - line "against H2O!" - done - -_CinnabarGymText_75aa2:: - text "Oh!" - line "Snuffed out!" - prompt - -_CinnabarGymText_75aa7:: - text "Water beats fire!" - line "But, fire melts" - cont "ice #MON!" - done - -_CinnabarGymText_75ac2:: - text "Yo! Champ in" - line "making!" - - para "The hot-headed" - line "BLAINE is a fire" - cont "#MON pro!" - - para "Douse his spirits" - line "with water!" - - para "You better take" - line "some BURN HEALs!" - done - -_CinnabarGymText_75ac7:: - text "! You beat" - line "that fire brand!" - done diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm deleted file mode 100644 index 352ab8ea..00000000 --- a/text/maps/cinnabar_island.asm +++ /dev/null @@ -1,37 +0,0 @@ -_CinnabarIslandText8:: - text "The door is" - line "locked..." - done - -_CinnabarIslandText1:: - text "CINNABAR GYM's" - line "BLAINE is an odd" - cont "man who has lived" - cont "here for decades." - done - -_CinnabarIslandText2:: - text "Scientists conduct" - line "experiments in" - cont "the burned out" - cont "building." - done - -_CinnabarIslandText3:: - text "CINNABAR ISLAND" - line "The Fiery Town of" - cont "Burning Desire" - done - -_CinnabarIslandText6:: - text "#MON LAB" - done - -_CinnabarIslandText7:: - text "CINNABAR ISLAND" - line "#MON GYM" - cont "LEADER: BLAINE" - - para "The Hot-Headed" - line "Quiz Master!" - done diff --git a/text/maps/cinnabar_lab.asm b/text/maps/cinnabar_lab.asm deleted file mode 100644 index a93a484d..00000000 --- a/text/maps/cinnabar_lab.asm +++ /dev/null @@ -1,29 +0,0 @@ -_Lab1Text1:: - text "We study #MON" - line "extensively here." - - para "People often bring" - line "us rare #MON" - cont "for examination." - done - -_Lab1Text2:: - text "A photo of the" - line "LAB's founder," - cont "DR.FUJI!" - done - -_Lab1Text3:: - text "#MON LAB" - line "Meeting Room" - done - -_Lab1Text4:: - text "#MON LAB" - line "R-and-D Room" - done - -_Lab1Text5:: - text "#MON LAB" - line "Testing Room" - done diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm deleted file mode 100644 index 3978814e..00000000 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ /dev/null @@ -1,78 +0,0 @@ -_Lab4Text_75dc6:: - text "Hiya!" - - para "I am important" - line "doctor!" - - para "I study here rare" - line "#MON fossils!" - - para "You! Have you a" - line "fossil for me?" - prompt - -_Lab4Text_75dcb:: - text "No! Is too bad!" - done - -_Lab4Text_75dd0:: - text "I take a little" - line "time!" - - para "You go for walk a" - line "little while!" - done - -_Lab4Text_75dd5:: - text "Where were you?" - - para "Your fossil is" - line "back to life!" - - para "It was @" - TX_RAM wcf4b - db $0 - line "like I think!" - prompt - -_Lab4Text_610ae:: - text "Oh! That is" - line "@" - TX_RAM wcd6d - text "!" - - para "It is fossil of" - line "@" - TX_RAM wcf4b - text ", a" - cont "#MON that is" - cont "already extinct!" - - para "My Resurrection" - line "Machine will make" - cont "that #MON live" - cont "again!" - done - -_Lab4Text_610b3:: - text "So! You hurry and" - line "give me that!" - - para " handed" - line "over @" - TX_RAM wcd6d - text "!" - prompt - -_Lab4Text_610b8:: - text "I take a little" - line "time!" - - para "You go for walk a" - line "little while!" - done - -_Lab4Text_610bd:: - text "Aiyah! You come" - line "again!" - done diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm deleted file mode 100644 index fa04677f..00000000 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ /dev/null @@ -1,63 +0,0 @@ -_TM35PreReceiveText:: - text "Tch-tch-tch!" - line "I made a cool TM!" - - para "It can cause all" - line "kinds of fun!" - prompt - -_ReceivedTM35Text:: - text " received " - line "@" - TX_RAM wcf4b - text "!@@" - -_TM35ExplanationText:: - text "Tch-tch-tch!" - line "That's the sound" - cont "of a METRONOME!" - - para "It tweaks your" - line "#MON's brain" - cont "into using moves" - cont "it doesn't know!" - done - -_TM35NoRoomText:: - text "Your pack is" - line "crammed full!" - done - -_Lab3Text2:: - text "EEVEE can evolve" - line "into 1 of 3 kinds" - cont "of #MON." - done - -_Lab3Text3:: - text "There's an e-mail" - line "message!" - - para "..." - - para "The 3 legendary" - line "bird #MON are" - cont "ARTICUNO, ZAPDOS" - cont "and MOLTRES." - - para "Their whereabouts" - line "are unknown." - - para "We plan to explore" - line "the cavern close" - cont "to CERULEAN." - - para "From: #MON" - line "RESEARCH TEAM" - - para "..." - done - -_Lab3Text5:: - text "An amber pipe!" - done diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/cinnabar_lab_trade_room.asm deleted file mode 100644 index 196124e7..00000000 --- a/text/maps/cinnabar_lab_trade_room.asm +++ /dev/null @@ -1,9 +0,0 @@ -_Lab2Text1:: - text "I found this very" - line "strange fossil in" - cont "MT.MOON!" - - para "I think it's a" - line "rare, prehistoric" - cont "#MON!" - done diff --git a/text/maps/cinnabar_mart.asm b/text/maps/cinnabar_mart.asm deleted file mode 100644 index 42a41d06..00000000 --- a/text/maps/cinnabar_mart.asm +++ /dev/null @@ -1,10 +0,0 @@ -_CinnabarMartText2:: - text "Don't they have X" - line "ATTACK? It's good" - cont "for battles!" - done - -_CinnabarMartText3:: - text "It never hurts to" - line "have extra items!" - done diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm deleted file mode 100644 index cf481764..00000000 --- a/text/maps/cinnabar_pokecenter.asm +++ /dev/null @@ -1,21 +0,0 @@ -_CinnabarPokecenterText2:: - text "You can cancel" - line "evolution." - - para "When a #MON is" - line "evolving, you can" - cont "stop it and leave" - cont "it the way it is." - done - -_CinnabarPokecenterText3:: - text "Do you have any" - line "friends?" - - para "#MON you get" - line "in trades grow" - cont "very quickly." - - para "I think it's" - line "worth a try!" - done diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm deleted file mode 100644 index 3ec2b151..00000000 --- a/text/maps/copycats_house_1f.asm +++ /dev/null @@ -1,20 +0,0 @@ -_CopycatsHouse1FText1:: - text "My daughter is so" - line "self-centered." - cont "She only has a" - cont "few friends." - done - -_CopycatsHouse1FText2:: - text "My daughter likes" - line "to mimic people." - - para "Her mimicry has" - line "earned her the" - cont "nickname COPYCAT" - cont "around here!" - done - -_CopycatsHouse1FText3:: - text "CHANSEY: Chaan!" - line "Sii!@@" diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm deleted file mode 100644 index 44988e58..00000000 --- a/text/maps/copycats_house_2f.asm +++ /dev/null @@ -1,96 +0,0 @@ -_CopycatsHouse2FText_5ccd4:: - text ": Hi! Do" - line "you like #MON?" - - para ": Uh no, I" - line "just asked you." - - para ": Huh?" - line "You're strange!" - - para "COPYCAT: Hmm?" - line "Quit mimicking?" - - para "But, that's my" - line "favorite hobby!" - prompt - -_TM31PreReceiveText:: - text "Oh wow!" - line "A # DOLL!" - - para "For me?" - line "Thank you!" - - para "You can have" - line "this, then!" - prompt - -_ReceivedTM31Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM31ExplanationText1:: - db $0 - para "TM31 contains my" - line "favorite, MIMIC!" - - para "Use it on a good" - line "#MON!@@" - -_TM31ExplanationText2:: - text ": Hi!" - line "Thanks for TM31!" - - para ": Pardon?" - - para ": Is it" - line "that fun to mimic" - cont "my every move?" - - para "COPYCAT: You bet!" - line "It's a scream!" - done - -_TM31NoRoomText:: - text "Don't you want" - line "this?@@" - -_CopycatsHouse2FText2:: - text "DODUO: Giiih!" - - para "MIRROR MIRROR ON" - line "THE WALL, WHO IS" - cont "THE FAIREST ONE" - cont "OF ALL?" - done - -_CopycatsHouse2FText3:: - text "This is a rare" - line "#MON! Huh?" - cont "It's only a doll!" - done - -_CopycatsHouse2FText6:: - text "A game with MARIO" - line "wearing a bucket" - cont "on his head!" - done - -_CopycatsHouse2FText_5cd17:: - text "..." - - para "My Secrets!" - - para "Skill: Mimicry!" - line "Hobby: Collecting" - cont "dolls!" - cont "Favorite #MON:" - cont "CLEFAIRY!" - done - -_CopycatsHouse2FText_5cd1c:: - text "Huh? Can't see!" - done diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm deleted file mode 100644 index f4cec10e..00000000 --- a/text/maps/daycare_1.asm +++ /dev/null @@ -1,62 +0,0 @@ -_DayCareIntroText:: - text "I run a DAYCARE." - line "Would you like me" - cont "to raise one of" - cont "your #MON?" - done - -_DayCareWhichMonText:: - text "Which #MON" - line "should I raise?" - prompt - -_DayCareWillLookAfterMonText:: - text "Fine, I'll look" - line "after @" - TX_RAM wcd6d - db $0 - cont "for a while." - prompt - -_DayCareComeSeeMeInAWhileText:: - text "Come see me in" - line "a while." - done - -_DayCareMonHasGrownText:: - text "Your @" - TX_RAM wcd6d - db $0 - line "has grown a lot!" - - para "By level, it's" - line "grown by @" - TX_NUM wDayCareNumLevelsGrown,$1,$3 - text "!" - - para "Aren't I great?" - prompt - -_DayCareOweMoneyText:: - text "You owe me ¥@" - TX_BCD wDayCareTotalCost, $c2 - db $0 - line "for the return" - cont "of this #MON." - done - -_DayCareGotMonBackText:: - text " got" - line "@" - TX_RAM wDayCareMonName - text " back!" - done - -_DayCareMonNeedsMoreTimeText:: - text "Back already?" - line "Your @" - TX_RAM wcd6d - db $0 - cont "needs some more" - cont "time with me." - prompt diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm deleted file mode 100644 index 20c0e5ad..00000000 --- a/text/maps/daycare_2.asm +++ /dev/null @@ -1,33 +0,0 @@ -_DayCareAllRightThenText:: - text "All right then," - line "@@" - -_DayCareComeAgainText:: - text "come again." - done - -_DayCareNoRoomForMonText:: - text "You have no room" - line "for this #MON!" - done - -_DayCareOnlyHaveOneMonText:: - text "You only have one" - line "#MON with you." - done - -_DayCareCantAcceptMonWithHMText:: - text "I can't accept a" - line "#MON that" - cont "knows an HM move." - done - -_DayCareHeresYourMonText:: - text "Thank you! Here's" - line "your #MON!" - prompt - -_DayCareNotEnoughMoneyText:: - text "Hey, you don't" - line "have enough ¥!" - done diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/digletts_cave_route_11_entrance.asm deleted file mode 100644 index ecd3225e..00000000 --- a/text/maps/digletts_cave_route_11_entrance.asm +++ /dev/null @@ -1,8 +0,0 @@ -_DiglettsCaveEntRoute11Text1:: - text "What a surprise!" - line "DIGLETTs dug this" - cont "long tunnel!" - - para "It goes right to" - line "VIRIDIAN CITY!" - done diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/digletts_cave_route_2_entrance.asm deleted file mode 100644 index a04bbef7..00000000 --- a/text/maps/digletts_cave_route_2_entrance.asm +++ /dev/null @@ -1,9 +0,0 @@ -_DiglettsCaveRoute2Text1:: - text "I went to ROCK" - line "TUNNEL, but it's" - cont "dark and scary." - - para "If a #MON's" - line "FLASH could light" - cont "it up..." - done diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm deleted file mode 100644 index 4827f2e8..00000000 --- a/text/maps/fan_club.asm +++ /dev/null @@ -1,143 +0,0 @@ -PikachuFanText:: - text "Won't you admire" - line "my PIKACHU's" - cont "adorable tail?" - done - -PikachuFanBetterText:: - text "Humph! My PIKACHU" - line "is twice as cute" - cont "as that one!" - done - -SeelFanText:: - text "I just love my" - line "SEEL!" - - para "It squeals when I" - line "hug it!" - done - -SeelFanBetterText:: - text "Oh dear!" - - para "My SEEL is far" - line "more attractive!" - done - -FanClubPikachuText:: - text "PIKACHU: Chu!" - line "Pikachu!" - done - -FanClubSeelText:: - text "SEEL: Kyuoo!" - done - -FanClubMeetChairText:: - text "I chair the" - line "#MON Fan Club!" - - para "I have collected" - line "over 100 #MON!" - - para "I'm very fussy" - line "when it comes to" - cont "#MON!" - - para "So..." - - para "Did you come" - line "visit to hear" - cont "about my #MON?" - done - -FanClubChairStoryText:: - text "Good!" - line "Then listen up!" - - para "My favorite" - line "RAPIDASH..." - - para "It...cute..." - line "lovely...smart..." - cont "plus...amazing..." - cont "you think so?..." - cont "oh yes...it..." - cont "stunning..." - cont "kindly..." - cont "love it!" - - para "Hug it...when..." - cont "sleeping...warm" - cont "and cuddly..." - cont "spectacular..." - cont "ravishing..." - cont "...Oops! Look at" - cont "the time! I kept" - cont "you too long!" - - para "Thanks for hearing" - line "me out! I want" - cont "you to have this!" - prompt - -ReceivedBikeVoucherText:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -ExplainBikeVoucherText:: - text "" - para "Exchange that for" - line "a BICYCLE!" - - para "Don't worry, my" - line "FEAROW will FLY" - cont "me anywhere!" - - para "So, I don't need a" - line "BICYCLE!" - - para "I hope you like" - line "cycling!" - done - -FanClubNoStoryText:: - text "Oh. Come back" - line "when you want to" - cont "hear my story!" - done - -FanClubChairFinalText:: - text "Hello, !" - - para "Did you come see" - line "me about my" - cont "#MON again?" - - para "No? Too bad!" - done - -FanClubBagFullText:: - text "Make room for" - line "this!" - done - -_FanClubText6:: - text "Our Chairman is" - line "very vocal about" - cont "#MON." - done - -_FanClubText7:: - text "Let's all listen" - line "politely to other" - cont "trainers!" - done - -_FanClubText8:: - text "If someone brags," - line "brag right back!" - done diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm deleted file mode 100644 index 3df069c1..00000000 --- a/text/maps/fighting_dojo.asm +++ /dev/null @@ -1,130 +0,0 @@ -_FightingDojoText_5ce8e:: - text "Grunt!" - - para "I am the KARATE" - line "MASTER! I am the" - cont "LEADER here!" - - para "You wish to" - line "challenge us?" - cont "Expect no mercy!" - - para "Fwaaa!" - done - -_FightingDojoText_5ce93:: - text "Hwa!" - line "Arrgh! Beaten!" - prompt - -_FightingDojoText_5ce98:: - text "Indeed, I have" - line "lost!" - - para "But, I beseech" - line "you, do not take" - cont "our emblem as" - cont "your trophy!" - - para "In return, I will" - line "give you a prized" - cont "fighting #MON!" - - para "Choose whichever" - line "one you like!" - done - -_FightingDojoText_5ce9d:: - text "Ho!" - - para "Stay and train at" - line "Karate with us!" - done - -_FightingDojoBattleText1:: - text "Hoargh! Take your" - line "shoes off!" - done - -_FightingDojoEndBattleText1:: - text "I give" - line "up!" - prompt - -_FightingDojoAfterBattleText1:: - text "You wait 'til you" - line "see our Master!" - - para "I'm a small fry" - line "compared to him!" - done - -_FightingDojoBattleText2:: - text "I hear you're" - line "good! Show me!" - done - -_FightingDojoEndBattleText2:: - text "Judge!" - line "1 point!" - prompt - -_FightingDojoAfterBattleText2:: - text "Our Master is a" - line "pro fighter!" - done - -_FightingDojoBattleText3:: - text "Nothing tough" - line "frightens me!" - - para "I break boulders" - line "for training!" - done - -_FightingDojoEndBattleText3:: - text "Yow!" - line "Stubbed fingers!" - prompt - -_FightingDojoAfterBattleText3:: - text "The only thing" - line "that frightens us" - cont "is psychic power!" - done - -_FightingDojoBattleText4:: - text "Hoohah!" - - para "You're trespassing" - line "in our FIGHTING" - cont "DOJO!" - done - -_FightingDojoEndBattleText4:: - text "Oof!" - line "I give up!" - prompt - -_FightingDojoAfterBattleText4:: - text "The prime fighters" - line "across the land" - cont "train here." - done - -_WantHitmonleeText:: - text "You want the" - line "hard kicking" - cont "HITMONLEE?" - done - -_WantHitmonchanText:: - text "You want the" - line "piston punching" - cont "HITMONCHAN?" - done - -_OtherHitmonText:: - text "Better not get" - line "greedy..." - done diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm deleted file mode 100644 index a90d0021..00000000 --- a/text/maps/fuchsia_city.asm +++ /dev/null @@ -1,119 +0,0 @@ -_FuchsiaCityText1:: - text "Did you try the" - line "SAFARI GAME? Some" - cont "#MON can only" - cont "be caught there." - done - -_FuchsiaCityText2:: - text "SAFARI ZONE has a" - line "zoo in front of" - cont "the entrance." - - para "Out back is the" - line "SAFARI GAME for" - cont "catching #MON." - done - -_FuchsiaCityText3:: - text "ERIK: Where's" - line "SARA? I said I'd" - cont "meet her here." - done - -_FuchsiaCityText4:: - text "That item ball in" - line "there is really a" - cont "#MON." - done - -_FuchsiaCityText5:: - text "!" - done - -_FuchsiaCityText11:: - text "FUCHSIA CITY" - line "Behold! It's" - cont "Passion Pink!" - done - -_FuchsiaCityText13:: - text "SAFARI GAME" - line "#MON-U-CATCH!" - done - -_FuchsiaCityText16:: - text "SAFARI ZONE" - line "WARDEN's HOME" - done - -_FuchsiaCityText17:: - text "#MON PARADISE" - line "SAFARI ZONE" - done - -_FuchsiaCityText18:: - text "FUCHSIA CITY" - line "#MON GYM" - cont "LEADER: KOGA" - - para "The Poisonous" - line "Ninja Master" - done - -_FuchsiaCityChanseyText:: - text "Name: CHANSEY" - - para "Catching one is" - line "all up to chance." - prompt - -_FuchsiaCityVoltorbText:: - text "Name: VOLTORB" - - para "The very image of" - line "a # BALL." - prompt - -_FuchsiaCityKangaskhanText:: - text "Name: KANGASKHAN" - - para "A maternal #MON" - line "that raises its" - cont "young in a pouch" - cont "on its belly." - prompt - -_FuchsiaCitySlowpokeText:: - text "Name: SLOWPOKE" - - para "Friendly and very" - line "slow moving." - prompt - -_FuchsiaCityLaprasText:: - text "Name: LAPRAS" - - para "A.K.A. the king" - line "of the seas." - prompt - -_FuchsiaCityOmanyteText:: - text "Name: OMANYTE" - - para "A #MON that" - line "was resurrected" - cont "from a fossil." - prompt - -_FuchsiaCityKabutoText:: - text "Name: KABUTO" - - para "A #MON that" - line "was resurrected" - cont "from a fossil." - prompt - -_FuchsiaCityText_19b2a:: - text "..." - done diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm deleted file mode 100644 index b1b8b2f2..00000000 --- a/text/maps/fuchsia_fishing_house.asm +++ /dev/null @@ -1,43 +0,0 @@ -_FuchsiaHouse3Text_561bd:: - text "I'm the FISHING" - line "GURU's older" - cont "brother!" - - para "I simply Looove" - line "fishing!" - - para "Do you like to" - line "fish?" - done - -_FuchsiaHouse3Text_561c2:: - text "Grand! I like" - line "your style!" - - para "Take this and" - line "fish, young one!" - - para " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_FuchsiaHouse3Text_56212:: - text "Oh... That's so" - line "disappointing..." - done - -_FuchsiaHouse3Text_56217:: - text "Hello there," - line "!" - - para "How are the fish" - line "biting?" - done - -_FuchsiaHouse3Text_5621c:: - text "Oh no!" - - para "You have no room" - line "for my gift!" - done diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm deleted file mode 100644 index 9108fc79..00000000 --- a/text/maps/fuchsia_gym_1.asm +++ /dev/null @@ -1,26 +0,0 @@ -_KogaBeforeBattleText:: - text "KOGA: Fwahahaha!" - - para "A mere child like" - line "you dares to" - cont "challenge me?" - - para "Very well, I" - line "shall show you" - cont "true terror as a" - cont "ninja master!" - - para "You shall feel" - line "the despair of" - cont "poison and sleep" - cont "techniques!" - done - -_KogaAfterBattleText:: - text "Humph!" - line "You have proven" - cont "your worth!" - - para "Here! Take the" - line "SOULBADGE!" - prompt diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm deleted file mode 100644 index 2913fb8f..00000000 --- a/text/maps/fuchsia_gym_2.asm +++ /dev/null @@ -1,193 +0,0 @@ -_KogaExplainToxicText:: - text "When afflicted by" - line "TOXIC, #MON" - cont "suffer more and" - cont "more as battle" - cont "progresses!" - - para "It will surely" - line "terrorize foes!" - done - -_FuchsiaGymText9:: - text "Now that you have" - line "the SOULBADGE," - cont "the DEFENSE of" - cont "your #MON" - cont "increases!" - - para "It also lets you" - line "SURF outside of" - cont "battle!" - - para "Ah! Take this" - line "too!" - done - -_ReceivedTM06Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM06ExplanationText:: - db $0 - para "TM06 contains" - line "TOXIC!" - - para "It is a secret" - line "technique over" - cont "400 years old!" - done - -_TM06NoRoomText:: - text "Make space for" - line "this, child!" - done - -_FuchsiaGymBattleText1:: - text "Strength isn't" - line "the key for" - cont "#MON!" - - para "It's strategy!" - - para "I'll show you how" - line "strategy can beat" - cont "brute strength!" - done - -_FuchsiaGymEndBattleText1:: - text "What?" - line "Extraordinary!" - prompt - -_FuchsiaGymAfterBattleText1:: - text "So, you mix brawn" - line "with brains?" - cont "Good strategy!" - done - -_FuchsiaGymBattleText2:: - text "I wanted to become" - line "a ninja, so I" - cont "joined this GYM!" - done - -_FuchsiaGymEndBattleText2:: - text "I'm done" - line "for!" - prompt - -_FuchsiaGymAfterBattleText2:: - text "I will keep on" - line "training under" - cont "KOGA, my ninja" - cont "master!" - done - -_FuchsiaGymBattleText3:: - text "Let's see you" - line "beat my special" - cont "techniques!" - done - -_FuchsiaGymEndBattleText3:: - text "You" - line "had me fooled!" - prompt - -_FuchsiaGymAfterBattleText3:: - text "I like poison and" - line "sleep techniques," - cont "as they linger" - cont "after battle!" - done - -_FuchsiaGymBattleText4:: - text "Stop right there!" - - para "Our invisible" - line "walls have you" - cont "frustrated?" - done - -_FuchsiaGymEndBattleText4:: - text "Whoa!" - line "He's got it!" - prompt - -_FuchsiaGymAfterBattleText4:: - text "You impressed me!" - line "Here's a hint!" - - para "Look very closely" - line "for gaps in the" - cont "invisible walls!" - done - -_FuchsiaGymBattleText5:: - text "I also study the" - line "way of the ninja" - cont "with master KOGA!" - - para "Ninja have a long" - line "history of using" - cont "animals!" - done - -_FuchsiaGymEndBattleText5:: - text "Awoo!" - prompt - -_FuchsiaGymAfterBattleText5:: - text "I still have much" - line "to learn!" - done - -_FuchsiaGymBattleText6:: - text "Master KOGA comes" - line "from a long line" - cont "of ninjas!" - - para "What did you" - line "descend from?" - done - -_FuchsiaGymEndBattleText6:: - text "Dropped" - line "my balls!" - prompt - -_FuchsiaGymAfterBattleText6:: - text "Where there is" - line "light, there is" - cont "shadow!" - - para "Light and shadow!" - line "Which do you" - cont "choose?" - done - -_FuchsiaGymText_7564e:: - text "Yo! Champ in" - line "making!" - - para "FUCHSIA GYM is" - line "riddled with" - cont "invisible walls!" - - para "KOGA might appear" - line "close, but he's" - cont "blocked off!" - - para "You have to find" - line "gaps in the walls" - cont "to reach him!" - done - -_FuchsiaGymText_75653:: - text "It's amazing how" - line "ninja can terrify" - cont "even now!" - done diff --git a/text/maps/fuchsia_house.asm b/text/maps/fuchsia_house.asm deleted file mode 100644 index 7b6556b1..00000000 --- a/text/maps/fuchsia_house.asm +++ /dev/null @@ -1,27 +0,0 @@ -_FuchsiaHouse1Text1:: - text "SAFARI ZONE's" - line "WARDEN is old," - cont "but still active!" - - para "All his teeth are" - line "false, though." - done - -_FuchsiaHouse1Text2:: - text "Hmm? You've met" - line "BILL?" - - para "He's my grandson!" - - para "He always liked" - line "collecting things" - cont "even as a child!" - done - -_FuchsiaHouse1Text3:: - text "BILL files his" - line "own #MON data" - cont "on his PC!" - - para "Did he show you?" - done diff --git a/text/maps/fuchsia_mart.asm b/text/maps/fuchsia_mart.asm deleted file mode 100644 index 574898ce..00000000 --- a/text/maps/fuchsia_mart.asm +++ /dev/null @@ -1,14 +0,0 @@ -_FuchsiaMartText2:: - text "Do you have a" - line "SAFARI ZONE flag?" - - para "What about cards" - line "or calendars?" - done - -_FuchsiaMartText3:: - text "Did you try X" - line "SPEED? It speeds" - cont "up a #MON in" - cont "battle!" - done diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/fuchsia_meeting_room.asm deleted file mode 100644 index 10675ead..00000000 --- a/text/maps/fuchsia_meeting_room.asm +++ /dev/null @@ -1,26 +0,0 @@ -_FuchsiaMeetingRoomText1:: - text "We nicknamed the" - line "WARDEN SLOWPOKE." - - para "He and SLOWPOKE" - line "both look vacant!" - done - -_FuchsiaMeetingRoomText2:: - text "SLOWPOKE is very" - line "knowledgeable" - cont "about #MON!" - - para "He even has some" - line "fossils of rare," - cont "extinct #MON!" - done - -_FuchsiaMeetingRoomText3:: - text "SLOWPOKE came in," - line "but I couldn't" - cont "understand him." - - para "I think he's got" - line "a speech problem!" - done diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/fuchsia_pokecenter.asm deleted file mode 100644 index a0def7eb..00000000 --- a/text/maps/fuchsia_pokecenter.asm +++ /dev/null @@ -1,20 +0,0 @@ -_FuchsiaPokecenterText1:: - text "You can't win" - line "with just one" - cont "strong #MON." - - para "It's tough, but" - line "you have to raise" - cont "them evenly." - done - -_FuchsiaPokecenterText3:: - text "There's a narrow" - line "trail west of" - cont "VIRIDIAN CITY." - - para "It goes to #MON" - line "LEAGUE HQ." - cont "The HQ governs" - cont "all trainers." - done diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm deleted file mode 100644 index 86cade68..00000000 --- a/text/maps/fujis_house.asm +++ /dev/null @@ -1,85 +0,0 @@ -_LavenderHouse1Text_1d8d1:: - text "That's odd, MR.FUJI" - line "isn't here." - cont "Where'd he go?" - done - -_LavenderHouse1Text_1d8d6:: - text "MR.FUJI had been" - line "praying alone for" - cont "CUBONE's mother." - done - -_LavenderHouse1Text_1d8f4:: - text "This is really" - line "MR.FUJI's house." - - para "He's really kind!" - - para "He looks after" - line "abandoned and" - cont "orphaned #MON!" - done - -_LavenderHouse1Text_1d8f9:: - text "It's so warm!" - line "#MON are so" - cont "nice to hug!" - done - -_LavenderHouse1Text3:: - text "PSYDUCK: Gwappa!@@" - -_LavenderHouse1Text4:: - text "NIDORINO: Gaoo!@@" - -_LavenderHouse1Text_1d94c:: - text "MR.FUJI: ." - - para "Your #DEX quest" - line "may fail without" - cont "love for your" - cont "#MON." - - para "I think this may" - line "help your quest." - prompt - -_ReceivedFluteText:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_FluteExplanationText:: - db $0 - para "Upon hearing #" - line "FLUTE, sleeping" - cont "#MON will" - cont "spring awake." - - para "It works on all" - line "sleeping #MON." - done - -_FluteNoRoomText:: - text "You must make" - line "room for this!" - done - -_MrFujiAfterFluteText:: - text "MR.FUJI: Has my" - line "FLUTE helped you?" - done - -_LavenderHouse1Text6:: - text "#MON Monthly" - line "Grand Prize" - cont "Drawing!" - - para "The application" - line "form is..." - - para "Gone! It's been" - line "clipped out!" - done diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm deleted file mode 100644 index c799268b..00000000 --- a/text/maps/hall_of_fame.asm +++ /dev/null @@ -1,28 +0,0 @@ -_HallofFameRoomText1:: - text "OAK: Er-hem!" - line "Congratulations" - cont "!" - - para "This floor is the" - line "#MON HALL OF" - cont "FAME!" - - para "#MON LEAGUE" - line "champions are" - cont "honored for their" - cont "exploits here!" - - para "Their #MON are" - line "also recorded in" - cont "the HALL OF FAME!" - - para "! You have" - line "endeavored hard" - cont "to become the new" - cont "LEAGUE champion!" - - para "Congratulations," - line ", you and" - cont "your #MON are" - cont "HALL OF FAMERs!" - done diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm deleted file mode 100644 index 8487e29a..00000000 --- a/text/maps/indigo_plateau_lobby.asm +++ /dev/null @@ -1,25 +0,0 @@ -_IndigoPlateauLobbyText2:: - text "Yo! Champ in" - line "making!" - - para "At #MON LEAGUE," - line "you have to face" - cont "the ELITE FOUR in" - cont "succession." - - para "If you lose, you" - line "have to start all" - cont "over again! This" - cont "is it! Go for it!" - done - -_IndigoPlateauLobbyText3:: - text "From here on, you" - line "face the ELITE" - cont "FOUR one by one!" - - para "If you win, a" - line "door opens to the" - cont "next trainer!" - cont "Good luck!" - done diff --git a/text/maps/lance.asm b/text/maps/lance.asm deleted file mode 100644 index ed3dcada..00000000 --- a/text/maps/lance.asm +++ /dev/null @@ -1,63 +0,0 @@ -_LanceBeforeBattleText:: - text "Ah! I heard about" - line "you !" - - para "I lead the ELITE" - line "FOUR! You can" - cont "call me LANCE the" - cont "dragon trainer!" - - para "You know that" - line "dragons are" - cont "mythical #MON!" - - para "They're hard to" - line "catch and raise," - cont "but their powers" - cont "are superior!" - - para "They're virtually" - line "indestructible!" - - para "Well, are you" - line "ready to lose?" - - para "Your LEAGUE" - line "challenge ends" - cont "with me, !" - done - -_LanceEndBattleText:: - text "That's it!" - - para "I hate to admit" - line "it, but you are a" - cont "#MON master!" - prompt - -_LanceAfterBattleText:: - text "I still can't" - line "believe my" - cont "dragons lost to" - cont "you, !" - - para "You are now the" - line "#MON LEAGUE" - cont "champion!" - - para "...Or, you would" - line "have been, but" - cont "you have one more" - cont "challenge ahead." - - para "You have to face" - line "another trainer!" - cont "His name is..." - - para "!" - line "He beat the ELITE" - cont "FOUR before you!" - - para "He is the real" - line "#MON LEAGUE" - cont "champion!@@" diff --git a/text/maps/lavender_house.asm b/text/maps/lavender_house.asm deleted file mode 100644 index 66cc85a5..00000000 --- a/text/maps/lavender_house.asm +++ /dev/null @@ -1,24 +0,0 @@ -_LavenderHouse2Text1:: - text "CUBONE: Kyarugoo!@@" - -_LavenderHouse2Text_1d9dc:: - text "I hate those" - line "horrible ROCKETs!" - - para "That poor CUBONE's" - line "mother..." - - para "It was killed" - line "trying to escape" - cont "from TEAM ROCKET!" - done - -_LavenderHouse2Text_1d9e1:: - text "The GHOST of" - line "#MON TOWER is" - cont "gone!" - - para "Someone must have" - line "soothed its" - cont "restless soul!" - done diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm deleted file mode 100644 index 222712c6..00000000 --- a/text/maps/lavender_mart.asm +++ /dev/null @@ -1,30 +0,0 @@ -_LavenderMartText2:: - text "I'm searching for" - line "items that raise" - cont "the abilities of" - cont "#MON during a" - cont "single battle." - - para "X ATTACK, X" - line "DEFEND, X SPEED" - cont "and X SPECIAL are" - cont "what I'm after." - - para "Do you know where" - line "I can get them?" - done - -_LavenderMartReviveText:: - text "You know REVIVE?" - line "It revives any" - cont "fainted #MON!" - done - -_LavenderMartNuggetText:: - text "I found a NUGGET" - line "in the mountains." - - para "I thought it was" - line "useless, but it" - cont "sold for ¥5000!" - done diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm deleted file mode 100644 index 3aa7b67d..00000000 --- a/text/maps/lavender_pokecenter.asm +++ /dev/null @@ -1,12 +0,0 @@ -_LavenderPokecenterText2:: - text "TEAM ROCKET will" - line "do anything for" - cont "the sake of gold!" - done - -_LavenderPokecenterText3:: - text "I saw CUBONE's" - line "mother die trying" - cont "to escape from" - cont "TEAM ROCKET!" - done diff --git a/text/maps/lavender_town.asm b/text/maps/lavender_town.asm deleted file mode 100644 index 19b6c8c8..00000000 --- a/text/maps/lavender_town.asm +++ /dev/null @@ -1,64 +0,0 @@ -_LavenderTownText_4413c:: - text "Do you believe in" - line "GHOSTs?" - done - -_LavenderTownText_44141:: - text "Really? So there" - line "are believers..." - done - -_LavenderTownText_44146:: - text "Hahaha, I guess" - line "not." - - para "That white hand" - line "on your shoulder," - cont "it's not real." - done - -_LavenderTownText2:: - text "This town is known" - line "as the grave site" - cont "of #MON." - - para "Memorial services" - line "are held in" - cont "#MON TOWER." - done - -_LavenderTownText3:: - text "GHOSTs appeared" - line "in #MON TOWER." - - para "I think they're" - line "the spirits of" - cont "#MON that the" - cont "ROCKETs killed." - done - -_LavenderTownText4:: - text "LAVENDER TOWN" - line "The Noble Purple" - cont "Town" - done - -_LavenderTownText5:: - text "New SILPH SCOPE!" - - para "Make the Invisible" - line "Plain to See!" - - para "SILPH CO." - done - -_LavenderTownText8:: - text "LAVENDER VOLUNTEER" - line "#MON HOUSE" - done - -_LavenderTownText9:: - text "May the Souls of" - line "#MON Rest Easy" - cont "#MON TOWER" - done diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm deleted file mode 100644 index fdbb55b4..00000000 --- a/text/maps/lorelei.asm +++ /dev/null @@ -1,42 +0,0 @@ -_LoreleiBeforeBattleText:: - text "Welcome to" - line "#MON LEAGUE!" - - para "I am LORELEI of" - line "the ELITE FOUR!" - - para "No one can best" - line "me when it comes" - cont "to icy #MON!" - - para "Freezing moves" - line "are powerful!" - - para "Your #MON will" - line "be at my mercy" - cont "when they are" - cont "frozen solid!" - - para "Hahaha!" - line "Are you ready?" - done - -_LoreleiEndBattleText:: - text "How" - line "dare you!" - prompt - -_LoreleiAfterBattleText:: - text "You're better" - line "than I thought!" - cont "Go on ahead!" - - para "You only got a" - line "taste of #MON" - cont "LEAGUE power!" - done - -_LoreleiDontRunAwayText:: - text "Someone's voice:" - line "Don't run away!" - done diff --git a/text/maps/mansion_1f.asm b/text/maps/mansion_1f.asm deleted file mode 100644 index a3c517fb..00000000 --- a/text/maps/mansion_1f.asm +++ /dev/null @@ -1,29 +0,0 @@ -_Mansion1BattleText2:: - text "Who are you? There" - line "shouldn't be" - cont "anyone here." - done - -_Mansion1EndBattleText2:: - text "Ouch!" - prompt - -_Mansion1AfterBattleText2:: - text "A key? I don't" - line "know what you're" - cont "talking about." - done - -_MansionSwitchText:: - text "A secret switch!" - - para "Press it?" - done - -_MansionSwitchPressedText:: - text "Who wouldn't?" - prompt - -_MansionSwitchNotPressedText:: - text "Not quite yet!" - done diff --git a/text/maps/mansion_2f.asm b/text/maps/mansion_2f.asm deleted file mode 100644 index 378efb30..00000000 --- a/text/maps/mansion_2f.asm +++ /dev/null @@ -1,47 +0,0 @@ -_Mansion2BattleText1:: - text "I can't get out!" - line "This old place is" - cont "one big puzzle!" - done - -_Mansion2EndBattleText1:: - text "Oh no!" - line "My bag of loot!" - prompt - -_Mansion2AfterBattleText1:: - text "Switches open and" - line "close alternating" - cont "sets of doors!" - done - -_Mansion2Text3:: - text "Diary: July 5" - line "Guyana," - cont "South America" - - para "A new #MON was" - line "discovered deep" - cont "in the jungle." - done - -_Mansion2Text4:: - text "Diary: July 10" - line "We christened the" - cont "newly discovered" - cont "#MON, MEW." - done - -_Mansion2Text_520c2:: - text "A secret switch!" - - para "Press it?" - done - -_Mansion2Text_520c7:: - text "Who wouldn't?" - prompt - -_Mansion2Text_520cc:: - text "Not quite yet!" - done diff --git a/text/maps/mansion_3f.asm b/text/maps/mansion_3f.asm deleted file mode 100644 index 70331fdf..00000000 --- a/text/maps/mansion_3f.asm +++ /dev/null @@ -1,37 +0,0 @@ -_Mansion3BattleText1:: - text "This place is" - line "like, huge!" - done - -_Mansion3EndBattleText1:: - text "Ayah!" - prompt - -_Mansion3AfterBattleText1:: - text "I wonder where" - line "my partner went." - done - -_Mansion3BattleText2:: - text "My mentor once" - line "lived here." - done - -_Mansion3EndBattleText2:: - text "Whew!" - line "Overwhelming!" - prompt - -_Mansion3AfterBattleText2:: - text "So, you're stuck?" - line "Try jumping off" - cont "over there!" - done - -_Mansion3Text5:: - text "Diary: Feb. 6" - line "MEW gave birth." - - para "We named the" - line "newborn MEWTWO." - done diff --git a/text/maps/mansion_b1f.asm b/text/maps/mansion_b1f.asm deleted file mode 100644 index 1bc1ef89..00000000 --- a/text/maps/mansion_b1f.asm +++ /dev/null @@ -1,39 +0,0 @@ -_Mansion4BattleText1:: - text "Uh-oh. Where am" - line "I now?" - done - -_Mansion4EndBattleText1:: - text "Awooh!" - prompt - -_Mansion4AfterBattleText1:: - text "You can find stuff" - line "lying around." - done - -_Mansion4BattleText2:: - text "This place is" - line "ideal for a lab." - done - -_Mansion4EndBattleText2:: - text "What" - line "was that for?" - prompt - -_Mansion4AfterBattleText2:: - text "I like it here!" - line "It's conducive to" - cont "my studies!" - done - -_Mansion4Text7:: - text "Diary; Sept. 1" - line "MEWTWO is far too" - cont "powerful." - - para "We have failed to" - line "curb its vicious" - cont "tendencies..." - done diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm deleted file mode 100644 index 7be2e11e..00000000 --- a/text/maps/mr_psychics_house.asm +++ /dev/null @@ -1,25 +0,0 @@ -_TM29PreReceiveText:: - text "...Wait! Don't" - line "say a word!" - - para "You wanted this!" - prompt - -_ReceivedTM29Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM29ExplanationText:: - text "TM29 is PSYCHIC!" - - para "It can lower the" - line "target's SPECIAL" - cont "abilities." - done - -_TM29NoRoomText:: - text "Where do you plan" - line "to put this?" - done diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm deleted file mode 100644 index 761a5240..00000000 --- a/text/maps/mt_moon_1f.asm +++ /dev/null @@ -1,119 +0,0 @@ -_MtMoon1BattleText2:: - text "WHOA! You shocked" - line "me! Oh, you're" - cont "just a kid!" - done - -_MtMoon1EndBattleText2:: - text "Wow!" - line "Shocked again!" - prompt - -_MtMoon1AfterBattleText2:: - text "Kids like you" - line "shouldn't be" - cont "here!" - done - -_MtMoon1BattleText3:: - text "Did you come to" - line "explore too?" - done - -_MtMoon1EndBattleText3:: - text "Losing" - line "stinks!" - prompt - -_MtMoon1AfterBattleText3:: - text "I came down here" - line "to show off to" - cont "girls." - done - -_MtMoon1BattleText4:: - text "Wow! It's way" - line "bigger in here" - cont "than I thought!" - done - -_MtMoon1EndBattleText4:: - text "Oh!" - line "I lost it!" - prompt - -_MtMoon1AfterBattleText4:: - text "How do you get" - line "out of here?" - done - -_MtMoon1BattleText5:: - text "What! Don't sneak" - line "up on me!" - done - -_MtMoon1EndBattleText5:: - text "My" - line "#MON won't do!" - prompt - -_MtMoon1AfterBattleText5:: - text "I have to find" - line "stronger #MON." - done - -_MtMoon1BattleText6:: - text "What? I'm waiting" - line "for my friends to" - cont "find me here." - done - -_MtMoon1EndBattleText6:: - text "I lost?" - prompt - -_MtMoon1AfterBattleText6:: - text "I heard there are" - line "some very rare" - cont "fossils here." - done - -_MtMoon1BattleText7:: - text "Suspicious men" - line "are in the cave." - cont "What about you?" - done - -_MtMoon1EndBattleText7:: - text "You" - line "got me!" - prompt - -_MtMoon1AfterBattleText7:: - text "I saw them! I'm" - line "sure they're from" - cont "TEAM ROCKET!" - done - -_MtMoon1BattleText8:: - text "Go through this" - line "cave to get to" - cont "CERULEAN CITY!" - done - -_MtMoon1EndBattleText8:: - text "I" - line "lost." - prompt - -_MtMoon1AfterBattleText8:: - text "ZUBAT is tough!" - line "But, it can be" - cont "useful if you" - cont "catch one." - done - -_MtMoon1Text14:: - text "Beware! ZUBAT is" - line "a blood sucker!" - done diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/mt_moon_b1f.asm deleted file mode 100644 index cd995ed5..00000000 --- a/text/maps/mt_moon_b1f.asm +++ /dev/null @@ -1,3 +0,0 @@ -_MtMoonText1:: - db $0 - done diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm deleted file mode 100644 index 472649b9..00000000 --- a/text/maps/mt_moon_b2f.asm +++ /dev/null @@ -1,122 +0,0 @@ -_MtMoon3Text_49f24:: - text "You want the" - line "DOME FOSSIL?" - done - -_MtMoon3Text_49f64:: - text "You want the" - line "HELIX FOSSIL?" - done - -_MtMoon3Text_49f6f:: - text " got the" - line "@" - TX_RAM wcf4b - text "!@@" - -_MtMoon3Text_49f7f:: - text "Look, you've got" - line "no room for this.@@" - -_MtMoon3Text_49f85:: - text "Hey, stop!" - - para "I found these" - line "fossils! They're" - cont "both mine!" - done - -_MtMoon3Text_49f8a:: - text "OK!" - line "I'll share!" - prompt - -_MtMoon3Text_49f8f:: - text "We'll each take" - line "one!" - cont "No being greedy!" - done - -_MtMoon3Text_49f94:: - text "Far away, on" - line "CINNABAR ISLAND," - cont "there's a #MON" - cont "LAB." - - para "They do research" - line "on regenerating" - cont "fossils." - done - -_MtMoon3Text_49f99:: - text "All right. Then" - line "this is mine!@@" - -_MtMoon3BattleText2:: - text "TEAM ROCKET will" - line "find the fossils," - cont "revive and sell" - cont "them for cash!" - done - -_MtMoon3EndBattleText2:: - text "Urgh!" - line "Now I'm mad!" - prompt - -_MtMoon3AfterBattleText2:: - text "You made me mad!" - line "TEAM ROCKET will" - cont "blacklist you!" - done - -_MtMoon3BattleText3:: - text "We, TEAM ROCKET," - line "are #MON" - cont "gangsters!" - done - -_MtMoon3EndBattleText3:: - text "I blew" - line "it!" - prompt - -_MtMoon3AfterBattleText3:: - text "Darn it all! My" - line "associates won't" - cont "stand for this!" - done - -_MtMoon3BattleText4:: - text "We're pulling a" - line "big job here!" - cont "Get lost, kid!" - done - -_MtMoon3EndBattleText4:: - text "So, you" - line "are good." - prompt - -_MtMoon3AfterBattleText4:: - text "If you find a" - line "fossil, give it" - cont "to me and scram!" - done - -_MtMoon3BattleText5:: - text "Little kids" - line "should leave" - cont "grown-ups alone!" - done - -_MtMoon3EndBattleText5:: - text "I'm" - line "steamed!" - prompt - -_MtMoon3AfterBattleText5:: - text "#MON lived" - line "here long before" - cont "people came." - done diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm deleted file mode 100644 index 90fd811e..00000000 --- a/text/maps/mt_moon_pokecenter.asm +++ /dev/null @@ -1,48 +0,0 @@ -_MtMoonPokecenterText1:: - text "I've 6 # BALLs" - line "set in my belt." - - para "At most, you can" - line "carry 6 #MON." - done - -_MtMoonPokecenterText3:: - text "TEAM ROCKET" - line "attacks CERULEAN" - cont "citizens..." - - para "TEAM ROCKET is" - line "always in the" - cont "news!" - done - -_MagikarpSalesmanText1:: - text "MAN: Hello, there!" - line "Have I got a deal" - cont "just for you!" - - para "I'll let you have" - line "a swell MAGIKARP" - cont "for just ¥500!" - cont "What do you say?" - done - -_MagikarpSalesmanNoText:: - text "No? I'm only" - line "doing this as a" - cont "favor to you!" - done - -_MagikarpSalesmanNoMoneyText:: - text "You'll need more" - line "money than that!" - done - -_MagikarpSalesmanText2:: - text "MAN: Well, I don't" - line "give refunds!" - done - -_MtMoonPokecenterText5:: - db $0 - done diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm deleted file mode 100644 index 16431bda..00000000 --- a/text/maps/museum_1f.asm +++ /dev/null @@ -1,107 +0,0 @@ -_Museum1FText_5c21a:: - text "Come again!" - done - -_Museum1FText_5c21f:: - text "It's ¥50 for a" - line "child's ticket." - - para "Would you like to" - line "come in?" - done - -_Museum1FText_5c224:: - text "Right, ¥50!" - line "Thank you!" - done - -_Museum1FText_5c229:: - text "You don't have" - line "enough money." - prompt - -_Museum1FText_5c22e:: - text "You can't sneak" - line "in the back way!" - - para "Oh, whatever!" - line "Do you know what" - cont "AMBER is?" - done - -_Museum1FText_5c233:: - text "There's a lab" - line "somewhere trying" - cont "to resurrect" - cont "ancient #MON" - cont "from AMBER." - done - -_Museum1FText_5c238:: - text "AMBER is fossil-" - line "ized tree sap." - done - -_Museum1FText_5c23d:: - text "Please go to the" - line "other side!" - done - -_Museum1FText_5c242:: - text "Take plenty of" - line "time to look!" - done - -_Museum1FText_5c251:: - text "That is one" - line "magnificent" - cont "fossil!" - done - -_Museum1FText_5c28e:: - text "Ssh! I think that" - line "this chunk of" - cont "AMBER contains" - cont "#MON DNA!" - - para "It would be great" - line "if #MON could" - cont "be resurrected" - cont "from it!" - - para "But, my colleagues" - line "just ignore me!" - - para "So I have a favor" - line "to ask!" - - para "Take this to a" - line "#MON LAB and" - cont "get it examined!" - prompt - -_ReceivedOldAmberText:: - text " received" - line "OLD AMBER!@@" - -_Museum1FText_5c299:: - text "Ssh! Get the OLD" - line "AMBER checked!" - done - -_Museum1FText_5c29e:: - text "You don't have" - line "space for this!" - done - -_Museum1FText_5c2ad:: - text "We are proud of 2" - line "fossils of very" - cont "rare, prehistoric" - cont "#MON!" - done - -_Museum1FText_5c2bc:: - text "The AMBER is" - line "clear and gold!" - done diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm deleted file mode 100644 index 4f34a249..00000000 --- a/text/maps/museum_2f.asm +++ /dev/null @@ -1,45 +0,0 @@ -_Museum2FText1:: - text "MOON STONE?" - - para "What's so special" - line "about it?" - done - -_Museum2FText2:: - text "July 20, 1969!" - - para "The 1st lunar" - line "landing!" - - para "I bought a color" - line "TV to watch it!" - done - -_Museum2FText3:: - text "We have a space" - line "exhibit now." - done - -_Museum2FText4:: - text "I want a PIKACHU!" - line "It's so cute!" - - para "I asked my Daddy" - line "to catch me one!" - done - -_Museum2FText5:: - text "Yeah, a PIKACHU" - line "soon, I promise!" - done - -_Museum2FText6:: - text "SPACE SHUTTLE" - line "COLUMBIA" - done - -_Museum2FText7:: - text "Meteorite that" - line "fell on MT.MOON." - cont "(MOON STONE?)" - done diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm deleted file mode 100644 index 65d3e8a4..00000000 --- a/text/maps/name_rater.asm +++ /dev/null @@ -1,60 +0,0 @@ -_NameRaterText_1dab3:: - text "Hello, hello!" - line "I am the official" - cont "NAME RATER!" - - para "Want me to rate" - line "the nicknames of" - cont "your #MON?" - done - -_NameRaterText_1dab8:: - text "Which #MON" - line "should I look at?" - prompt - -_NameRaterText_1dabd:: - TX_RAM wcd6d - text ", is it?" - line "That is a decent" - cont "nickname!" - - para "But, would you" - line "like me to give" - cont "it a nicer name?" - - para "How about it?" - done - -_NameRaterText_1dac2:: - text "Fine! What should" - line "we name it?" - prompt - -_NameRaterText_1dac7:: - text "OK! This #MON" - line "has been renamed" - cont "@" - TX_RAM wBuffer - text "!" - - para "That's a better" - line "name than before!" - done - -_NameRaterText_1dacc:: - text "Fine! Come any" - line "time you like!" - done - -_NameRaterText_1dad1:: - TX_RAM wcd6d - text ", is it?" - line "That is a truly" - cont "impeccable name!" - - para "Take good care of" - line "@" - TX_RAM wcd6d - text "!" - done diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm deleted file mode 100644 index 7a6f57b7..00000000 --- a/text/maps/oaks_lab.asm +++ /dev/null @@ -1,477 +0,0 @@ -_OaksLabGaryText1:: - text ": Yo" - line "! Gramps" - cont "isn't around!" - done - -_OaksLabText40:: - text ": Heh, I" - line "don't need to be" - cont "greedy like you!" - - para "Go ahead and" - line "choose, !" - done - -_OaksLabText41:: - text ": My" - line "#MON looks a" - cont "lot stronger." - done - -_OaksLabText39:: - text "Those are #" - line "BALLs. They" - cont "contain #MON!" - done - -_OaksLabCharmanderText:: - text "So! You want the" - line "fire #MON," - cont "CHARMANDER?" - done - -_OaksLabSquirtleText:: - text "So! You want the" - line "water #MON," - cont "SQUIRTLE?" - done - -_OaksLabBulbasaurText:: - text "So! You want the" - line "plant #MON," - cont "BULBASAUR?" - done - -_OaksLabMonEnergeticText:: - text "This #MON is" - line "really energetic!" - prompt - -_OaksLabReceivedMonText:: - text " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabLastMonText:: - text "That's PROF.OAK's" - line "last #MON!" - done - -_OaksLabText_1d2f0:: - text "OAK: Now, ," - line "which #MON do" - cont "you want?" - done - -_OaksLabText_1d2f5:: - text "OAK: If a wild" - line "#MON appears," - cont "your #MON can" - cont "fight against it!" - done - -_OaksLabText_1d2fa:: - text "OAK: ," - line "raise your young" - cont "#MON by making" - cont "it fight!" - done - -_OaksLabDeliverParcelText1:: - text "OAK: Oh, !" - - para "How is my old" - line "#MON?" - - para "Well, it seems to" - line "like you a lot." - - para "You must be" - line "talented as a" - cont "#MON trainer!" - - para "What? You have" - line "something for me?" - - para " delivered" - line "OAK's PARCEL.@@" - -_OaksLabDeliverParcelText2:: - text "" - para "Ah! This is the" - line "custom # BALL" - cont "I ordered!" - cont "Thank you!" - done - -_OaksLabAroundWorldText:: - text "#MON around the" - line "world wait for" - cont "you, !" - done - -_OaksLabGivePokeballsText1:: - text "OAK: You can't get" - line "detailed data on" - cont "#MON by just" - cont "seeing them." - - para "You must catch" - line "them! Use these" - cont "to capture wild" - cont "#MON." - - para " got 5" - line "# BALLs!@@" - -_OaksLabGivePokeballsText2:: - text "" - para "When a wild" - line "#MON appears," - cont "it's fair game." - - para "Just throw a #" - line "BALL at it and try" - line "to catch it!" - - para "This won't always" - line "work, though." - - para "A healthy #MON" - line "could escape. You" - cont "have to be lucky!" - done - -_OaksLabPleaseVisitText:: - text "OAK: Come see me" - line "sometimes." - - para "I want to know how" - line "your #DEX is" - cont "coming along." - done - -_OaksLabText_1d31d:: - text "OAK: Good to see " - line "you! How is your " - cont "#DEX coming? " - cont "Here, let me take" - cont "a look!" - prompt - -_OaksLabText_1d32c:: - text "It's encyclopedia-" - line "like, but the" - cont "pages are blank!" - done - -_OaksLabText8:: - text "?" - done - -_OaksLabText_1d340:: - text "PROF.OAK is the" - line "authority on" - cont "#MON!" - - para "Many #MON" - line "trainers hold him" - cont "in high regard!" - done - -_OaksLabRivalWaitingText:: - text ": Gramps!" - line "I'm fed up with" - cont "waiting!" - done - -_OaksLabChooseMonText:: - text "OAK: ?" - line "Let me think..." - - para "Oh, that's right," - line "I told you to" - cont "come! Just wait!" - - para "Here, !" - - para "There are 3" - line "#MON here!" - - para "Haha!" - - para "They are inside" - line "the # BALLs." - - para "When I was young," - line "I was a serious" - cont "#MON trainer!" - - para "In my old age, I" - line "have only 3 left," - cont "but you can have" - cont "one! Choose!" - done - -_OaksLabRivalInterjectionText:: - text ": Hey!" - line "Gramps! What" - cont "about me?" - done - -_OaksLabBePatientText:: - text "OAK: Be patient!" - line ", you can" - cont "have one too!" - done - -_OaksLabLeavingText:: - text "OAK: Hey! Don't go" - line "away yet!" - done - -_OaksLabRivalPickingMonText:: - text ": I'll take" - line "this one, then!" - done - -_OaksLabRivalReceivedMonText:: - text " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabRivalChallengeText:: - text ": Wait" - line "!" - cont "Let's check out" - cont "our #MON!" - - para "Come on, I'll take" - line "you on!" - done - -_OaksLabText_1d3be:: - text "WHAT?" - line "Unbelievable!" - cont "I picked the" - cont "wrong #MON!" - prompt - -_OaksLabText_1d3c3:: - text ": Yeah! Am" - line "I great or what?" - prompt - -_OaksLabRivalToughenUpText:: - text ": Okay!" - line "I'll make my" - cont "#MON fight to" - cont "toughen it up!" - - para "! Gramps!" - line "Smell you later!" - done - -_OaksLabText21:: - text ": Gramps!" - done - -_OaksLabText22:: - text ": What did" - line "you call me for?" - done - -_OaksLabText23:: - text "OAK: Oh right! I" - line "have a request" - cont "of you two." - done - -_OaksLabText24:: - text "On the desk there" - line "is my invention," - cont "#DEX!" - - para "It automatically" - line "records data on" - cont "#MON you've" - cont "seen or caught!" - - para "It's a hi-tech" - line "encyclopedia!" - done - -_OaksLabText25:: - text "OAK: and" - line "! Take" - cont "these with you!" - - para " got" - line "#DEX from OAK!@@" - -_OaksLabText26:: - text "To make a complete" - line "guide on all the" - cont "#MON in the" - cont "world..." - - para "That was my dream!" - - para "But, I'm too old!" - line "I can't do it!" - - para "So, I want you two" - line "to fulfill my" - cont "dream for me!" - - para "Get moving, you" - line "two!" - - para "This is a great" - line "undertaking in" - cont "#MON history!" - done - -_OaksLabText27:: - text ": Alright" - line "Gramps! Leave it" - cont "all to me!" - - para ", I hate to" - line "say it, but I" - cont "don't need you!" - - para "I know! I'll" - line "borrow a TOWN MAP" - cont "from my sis!" - - para "I'll tell her not" - line "to lend you one," - cont "! Hahaha!" - done - -_OaksLabText_1d405:: - text "I study #MON as" - line "PROF.OAK's AIDE." - done - -_OaksLabText_441cc:: - text "#DEX comp-" - line "letion is:" - - para "@" - TX_NUM hDexRatingNumMonsSeen, 1, 3 - text " #MON seen" - line "@" - TX_NUM hDexRatingNumMonsOwned, 1, 3 - text " #MON owned" - - para "PROF.OAK's" - line "Rating:" - prompt - -_OaksLabText_44201:: - text "You still have" - line "lots to do." - cont "Look for #MON" - cont "in grassy areas!" - done - -_OaksLabText_44206:: - text "You're on the" - line "right track! " - cont "Get a FLASH HM" - cont "from my AIDE!" - done - -_OaksLabText_4420b:: - text "You still need" - line "more #MON!" - cont "Try to catch" - cont "other species!" - done - -_OaksLabText_44210:: - text "Good, you're" - line "trying hard!" - cont "Get an ITEMFINDER" - cont "from my AIDE!" - done - -_OaksLabText_44215:: - text "Looking good!" - line "Go find my AIDE" - cont "when you get 50!" - done - -_OaksLabText_4421a:: - text "You finally got at" - line "least 50 species!" - cont "Be sure to get" - cont "EXP.ALL from my" - cont "AIDE!" - done - -_OaksLabText_4421f:: - text "Ho! This is geting" - line "even better!" - done - -_OaksLabText_44224:: - text "Very good!" - line "Go fish for some" - cont "marine #MON!" - done - -_OaksLabText_44229:: - text "Wonderful!" - line "Do you like to" - cont "collect things?" - done - -_OaksLabText_4422e:: - text "I'm impressed!" - line "It must have been" - cont "difficult to do!" - done - -_OaksLabText_44233:: - text "You finally got at" - line "least 100 species!" - cont "I can't believe" - cont "how good you are!" - done - -_OaksLabText_44238:: - text "You even have the" - line "evolved forms of" - cont "#MON! Super!" - done - -_OaksLabText_4423d:: - text "Excellent! Trade" - line "with friends to" - cont "get some more!" - done - -_OaksLabText_44242:: - text "Outstanding!" - line "You've become a" - cont "real pro at this!" - done - -_OaksLabText_44247:: - text "I have nothing" - line "left to say!" - cont "You're the" - cont "authority now!" - done - -_OaksLabText_4424c:: - text "Your #DEX is" - line "entirely complete!" - cont "Congratulations!" - done diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm deleted file mode 100644 index d5eda74f..00000000 --- a/text/maps/pallet_town.asm +++ /dev/null @@ -1,55 +0,0 @@ -_OakAppearsText:: - text "OAK: Hey! Wait!" - line "Don't go out!@@" - -_OakWalksUpText:: - text "OAK: It's unsafe!" - line "Wild #MON live" - cont "in tall grass!" - - para "You need your own" - line "#MON for your" - cont "protection." - cont "I know!" - - para "Here, come with" - line "me!" - done - -_PalletTownText2:: - text "I'm raising" - line "#MON too!" - - para "When they get" - line "strong, they can" - cont "protect me!" - done - -_PalletTownText3:: - text "Technology is" - line "incredible!" - - para "You can now store" - line "and recall items" - cont "and #MON as" - cont "data via PC!" - done - -_PalletTownText4:: - text "OAK #MON" - line "RESEARCH LAB" - done - -_PalletTownText5:: - text "PALLET TOWN" - line "Shades of your" - cont "journey await!" - done - -_PalletTownText6:: - text "'s house " - done - -_PalletTownText7:: - text "'s house " - done diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm deleted file mode 100644 index 14240c9e..00000000 --- a/text/maps/pewter_city.asm +++ /dev/null @@ -1,117 +0,0 @@ -_PewterCityText1:: - text "It's rumored that" - line "CLEFAIRYs came" - cont "from the moon!" - - para "They appeared " - line "after MOON STONE" - cont "fell on MT.MOON." - done - -_PewterCityText2:: - text "There aren't many" - line "serious #MON" - cont "trainers here!" - - para "They're all like" - line "BUG CATCHERs," - cont "but PEWTER GYM's" - cont "BROCK is totally" - cont "into it!" - done - -_PewterCityText_193f1:: - text "Did you check out" - line "the MUSEUM?" - done - -_PewterCityText_193f6:: - text "Weren't those" - line "fossils from MT." - cont "MOON amazing?" - done - -_PewterCityText_193fb:: - text "Really?" - line "You absolutely" - cont "have to go!" - done - -_PewterCityText13:: - text "It's right here!" - line "You have to pay" - cont "to get in, but" - cont "it's worth it!" - cont "See you around!" - done - -_PewterCityText_19427:: - text "Psssst!" - line "Do you know what" - cont "I'm doing?" - done - -_PewterCityText_1942c:: - text "That's right!" - line "It's hard work!" - done - -_PewterCityText_19431:: - text "I'm spraying REPEL" - line "to keep #MON" - cont "out of my garden!" - done - -_PewterCityText_1945d:: - text "You're a trainer" - line "right? BROCK's" - cont "looking for new" - cont "challengers!" - cont "Follow me!" - done - -_PewterCityText14:: - text "If you have the" - line "right stuff, go" - cont "take on BROCK!" - done - -_PewterCityText6:: - text "TRAINER TIPS" - - para "Any #MON that" - line "takes part in" - cont "battle, however" - cont "short, earns EXP!" - done - -_PewterCityText7:: - text "NOTICE!" - - para "Thieves have been" - line "stealing #MON" - cont "fossils at MT." - cont "MOON! Please call" - cont "PEWTER POLICE" - cont "with any info!" - done - -_PewterCityText10:: - text "PEWTER MUSEUM" - line "OF SCIENCE" - done - -_PewterCityText11:: - text "PEWTER CITY" - line "#MON GYM" - cont "LEADER: BROCK" - - para "The Rock Solid" - line "#MON Trainer!" - done - -_PewterCityText12:: - text "PEWTER CITY" - line "A Stone Gray" - cont "City" - done diff --git a/text/maps/pewter_gym_1.asm b/text/maps/pewter_gym_1.asm deleted file mode 100644 index 6426dd72..00000000 --- a/text/maps/pewter_gym_1.asm +++ /dev/null @@ -1,18 +0,0 @@ -_PewterGymText_5c49e:: - text "I'm BROCK!" - line "I'm PEWTER's GYM" - cont "LEADER!" - - para "I believe in rock" - line "hard defense and" - cont "determination!" - - para "That's why my" - line "#MON are all" - cont "the rock-type!" - - para "Do you still want" - line "to challenge me?" - cont "Fine then! Show" - cont "me your best!" - done diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm deleted file mode 100644 index 86b97018..00000000 --- a/text/maps/pewter_gym_2.asm +++ /dev/null @@ -1,142 +0,0 @@ -_PewterGymText_5c4a3:: - text "There are all" - line "kinds of trainers" - cont "in the world!" - - para "You appear to be" - line "very gifted as a" - cont "#MON trainer!" - - para "Go to the GYM in" - line "CERULEAN and test" - cont "your abilities!" - done - -_TM34PreReceiveText:: - text "Wait! Take this" - line "with you!" - done - -_ReceivedTM34Text:: - text " received" - line "TM34!@@" - -_TM34ExplanationText:: - db $0 - para "A TM contains a" - line "technique that" - cont "can be taught to" - cont "#MON!" - - para "A TM is good only" - line "once! So when you" - cont "use one to teach" - cont "a new technique," - cont "pick the #MON" - cont "carefully!" - - para "TM34 contains" - line "BIDE!" - - para "Your #MON will" - line "absorb damage in" - cont "battle then pay" - cont "it back double!" - done - -_TM34NoRoomText:: - text "You don't have" - line "room for this!" - done - -_PewterGymText_5c4bc:: - text "I took" - line "you for granted." - - para "As proof of your" - line "victory, here's" - cont "the BOULDERBADGE!" - - para " received" - line "the BOULDERBADGE!@@" - -_PewterGymText_5c4c1:: - db $0 - para "That's an official" - line "#MON LEAGUE" - cont "BADGE!" - - para "Its bearer's" - line "#MON become" - cont "more powerful!" - - para "The technique" - line "FLASH can now be" - cont "used any time!" - prompt - -_PewterGymBattleText1:: - text "Stop right there," - line "kid!" - - para "You're still light" - line "years from facing" - cont "BROCK!" - done - -_PewterGymEndBattleText1:: - text "Darn!" - - para "Light years isn't" - line "time! It measures" - cont "distance!" - prompt - -_PewterGymAfterBattleText1:: - text "You're pretty hot," - line "but not as hot" - cont "as BROCK!" - done - -_PewterGymText_5c515:: - text "Hiya! I can tell" - line "you have what it" - cont "takes to become a" - cont "#MON champ!" - - para "I'm no trainer," - line "but I can tell" - cont "you how to win!" - - para "Let me take you" - line "to the top!" - done - -_PewterGymText_5c51a:: - text "All right! Let's" - line "get happening!" - prompt - -_PewterGymText_5c51f:: - text "The 1st #MON" - line "out in a match is" - cont "at the top of the" - cont "#MON LIST!" - - para "By changing the" - line "order of #MON," - cont "matches could be" - cont "made easier!" - done - -_PewterGymText_5c524:: - text "It's a free" - line "service! Let's" - cont "get happening!" - prompt - -_PewterGymText_5c529:: - text "Just as I thought!" - line "You're #MON" - cont "champ material!" - done diff --git a/text/maps/pewter_house_1.asm b/text/maps/pewter_house_1.asm deleted file mode 100644 index 450e8372..00000000 --- a/text/maps/pewter_house_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -_PewterHouse1Text1:: - text "NIDORAN: Bowbow!@@" - -_PewterHouse1Text2:: - text "NIDORAN sit!" - done - -_PewterHouse1Text3:: - text "Our #MON's an" - line "outsider, so it's" - cont "hard to handle." - - para "An outsider is a" - line "#MON that you" - cont "get in a trade." - - para "It grows fast, but" - line "it may ignore an" - cont "unskilled trainer" - cont "in battle!" - - para "If only we had" - line "some BADGEs..." - done diff --git a/text/maps/pewter_house_2.asm b/text/maps/pewter_house_2.asm deleted file mode 100644 index 615536f7..00000000 --- a/text/maps/pewter_house_2.asm +++ /dev/null @@ -1,19 +0,0 @@ -_PewterHouse2Text1:: - text "#MON learn new" - line "techniques as" - cont "they grow!" - - para "But, some moves" - line "must be taught by" - cont "the trainer!" - done - -_PewterHouse2Text2:: - text "#MON become" - line "easier to catch" - cont "when they are" - cont "hurt or asleep!" - - para "But, it's not a" - line "sure thing!" - done diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm deleted file mode 100644 index 0d5b07a2..00000000 --- a/text/maps/pewter_mart.asm +++ /dev/null @@ -1,17 +0,0 @@ -_PewterMartText2:: - text "A shady, old man" - line "got me to buy" - cont "this really weird" - cont "fish #MON!" - - para "It's totally weak" - line "and it cost ¥500!" - done - -_PewterMartText3:: - text "Good things can" - line "happen if you" - cont "raise #MON" - cont "diligently, even" - cont "the weak ones!" - done diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm deleted file mode 100644 index 6a1b373e..00000000 --- a/text/maps/pewter_pokecenter.asm +++ /dev/null @@ -1,14 +0,0 @@ -_PewterPokecenterText2:: - text "What!?" - - para "TEAM ROCKET is" - line "at MT.MOON? Huh?" - cont "I'm on the phone!" - - para "Scram!" - done - -_PewterJigglypuffText:: - text "JIGGLYPUFF: Puu" - line "pupuu!" - done diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/pokemon_league_gate.asm deleted file mode 100644 index ac92f4b0..00000000 --- a/text/maps/pokemon_league_gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -_Route22GateText_1e704:: - text "Only truly skilled" - line "trainers are" - cont "allowed through." - - para "You don't have the" - line "BOULDERBADGE yet!@@" - -_Route22GateText_1e715:: - db $0 - para "The rules are" - line "rules. I can't" - cont "let you pass." - done - -_Route22GateText_1e71a:: - text "Oh! That is the" - line "BOULDERBADGE!" - cont "Go right ahead!@@" diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/pokemon_tower_1f.asm deleted file mode 100644 index 50a2cd29..00000000 --- a/text/maps/pokemon_tower_1f.asm +++ /dev/null @@ -1,31 +0,0 @@ -_PokemonTower1Text1:: - text "#MON TOWER was" - line "erected in the" - cont "memory of #MON" - cont "that had died." - done - -_PokemonTower1Text2:: - text "Did you come to" - line "pay respects?" - cont "Bless you!" - done - -_PokemonTower1Text3:: - text "I came to pray" - line "for my CLEFAIRY." - - para "Sniff! I can't" - line "stop crying..." - done - -_PokemonTower1Text4:: - text "My GROWLITHE..." - line "Why did you die?" - done - -_PokemonTower1Text5:: - text "I am a CHANNELER!" - line "There are spirits" - cont "up to mischief!" - done diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm deleted file mode 100644 index 79323001..00000000 --- a/text/maps/pokemon_tower_2f.asm +++ /dev/null @@ -1,57 +0,0 @@ -_PokemonTower2Text_6062d:: - text ": Hey," - line "! What" - cont "brings you here?" - cont "Your #MON" - cont "don't look dead!" - - para "I can at least" - line "make them faint!" - cont "Let's go, pal!" - done - -_PokemonTower2Text_60632:: - text "What?" - line "You stinker!" - - para "I took it easy on" - line "you too!" - prompt - -_PokemonTower2Text_60637:: - text ": Well," - line "look at all your" - cont "wimpy #MON!" - - para "Toughen them up a" - line "bit more!" - prompt - -_PokemonTower2Text_6063c:: - text "How's your #DEX" - line "coming, pal?" - cont "I just caught a" - cont "CUBONE!" - - para "I can't find the" - line "grown-up MAROWAK" - cont "yet!" - - para "I doubt there are" - line "any left! Well, I" - cont "better get going!" - cont "I've got a lot to" - cont "accomplish, pal!" - - para "Smell ya later!" - done - -_PokemonTower2Text2:: - text "Even we could not" - line "identify the" - cont "wayward GHOSTs!" - - para "A SILPH SCOPE" - line "might be able to" - cont "unmask them." - done diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/pokemon_tower_3f.asm deleted file mode 100644 index 67098e6b..00000000 --- a/text/maps/pokemon_tower_3f.asm +++ /dev/null @@ -1,45 +0,0 @@ -_PokemonTower3BattleText1:: - text "Urrg...Awaa..." - line "Huhu...graa.." - done - -_PokemonTower3EndBattleText1:: - text "Hwa!" - line "I'm saved!" - prompt - -_PokemonTower3AfterBattleText1:: - text "The GHOSTs can be" - line "identified by the" - cont "SILPH SCOPE." - done - -_PokemonTower3BattleText2:: - text "Kekeke...." - line "Kwaaah!" - done - -_PokemonTower3EndBattleText2:: - text "Hmm?" - line "What am I doing?" - prompt - -_PokemonTower3AfterBattleText2:: - text "Sorry! I was" - line "possessed!" - done - -_PokemonTower3BattleText3:: - text "Be gone!" - line "Evil spirit!" - done - -_PokemonTower3EndBattleText3:: - text "Whew!" - line "The spirit left!" - prompt - -_PokemonTower3AfterBattleText3:: - text "My friends were" - line "possessed too!" - done diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/pokemon_tower_4f.asm deleted file mode 100644 index 771325a0..00000000 --- a/text/maps/pokemon_tower_4f.asm +++ /dev/null @@ -1,45 +0,0 @@ -_PokemonTower4BattleText1:: - text "GHOST! No!" - line "Kwaaah!" - done - -_PokemonTower4EndBattleText1:: - text "Where" - line "is the GHOST?" - prompt - -_PokemonTower4AfterBattleText1:: - text "I must have been" - line "dreaming..." - done - -_PokemonTower4BattleText2:: - text "Be cursed with" - line "me! Kwaaah!" - done - -_PokemonTower4EndBattleText2:: - text "What!" - prompt - -_PokemonTower4AfterBattleText2:: - text "We can't crack" - line "the identity of" - cont "the GHOSTs." - done - -_PokemonTower4BattleText3:: - text "Huhuhu..." - line "Beat me not!" - done - -_PokemonTower4EndBattleText3:: - text "Huh?" - line "Who? What?" - prompt - -_PokemonTower4AfterBattleText3:: - text "May the departed" - line "souls of #MON" - cont "rest in peace..." - done diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm deleted file mode 100644 index b329118d..00000000 --- a/text/maps/pokemon_tower_5f.asm +++ /dev/null @@ -1,71 +0,0 @@ -_PokemonTower5Text1:: - text "Come, child! I" - line "sealed this space" - cont "with white magic!" - - para "You can rest here!" - done - -_PokemonTower5BattleText1:: - text "Give...me..." - line "your...soul..." - done - -_PokemonTower5EndBattleText1:: - text "Gasp!" - prompt - -_PokemonTower5AfterBattleText1:: - text "I was under" - line "possession!" - done - -_PokemonTower5BattleText2:: - text "You...shall..." - line "join...us..." - done - -_PokemonTower5EndBattleText2:: - text "What" - line "a nightmare!" - prompt - -_PokemonTower5AfterBattleText2:: - text "I was possessed!" - done - -_PokemonTower5BattleText3:: - text "Zombies!" - done - -_PokemonTower5EndBattleText3:: - text "Ha?" - prompt - -_PokemonTower5AfterBattleText3:: - text "I regained my" - line "senses!" - done - -_PokemonTower5BattleText4:: - text "Urgah..." - line "Urff...." - done - -_PokemonTower5EndBattleText4:: - text "Whoo!" - prompt - -_PokemonTower5AfterBattleText4:: - text "I fell to evil" - line "spirits despite" - cont "my training!" - done - -_PokemonTower5Text7:: - text "Entered purified," - line "protected zone!" - - para "'s #MON" - line "are fully healed!" - done diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/pokemon_tower_6f.asm deleted file mode 100644 index 7532d56d..00000000 --- a/text/maps/pokemon_tower_6f.asm +++ /dev/null @@ -1,61 +0,0 @@ -_PokemonTower2Text_60c1f:: - text "The GHOST was the" - line "restless soul of" - cont "CUBONE's mother!" - done - -_PokemonTower2Text_60c24:: - text "The mother's soul" - line "was calmed." - - para "It departed to" - line "the afterlife!" - done - -_PokemonTower6BattleText1:: - text "Give...me..." - line "blood..." - done - -_PokemonTower6EndBattleText1:: - text "Groan!" - prompt - -_PokemonTower6AfterBattleText1:: - text "I feel anemic and" - line "weak..." - done - -_PokemonTower6BattleText2:: - text "Urff... Kwaah!" - done - -_PokemonTower6EndBattleText2:: - text "Some-" - line "thing fell out!" - prompt - -_PokemonTower6AfterBattleText2:: - text "Hair didn't fall" - line "out! It was an" - cont "evil spirit!" - done - -_PokemonTower6BattleText3:: - text "Ke..ke...ke..." - line "ke..ke...ke!!" - done - -_PokemonTower6EndBattleText3:: - text "Keee!" - prompt - -_PokemonTower6AfterBattleText3:: - text "What's going on" - line "here?" - done - -_PokemonTower6Text6:: - text "Be gone..." - line "Intruders..." - done diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm deleted file mode 100644 index 704a71eb..00000000 --- a/text/maps/pokemon_tower_7f.asm +++ /dev/null @@ -1,78 +0,0 @@ -_TowerRescueFujiText:: - text "MR.FUJI: Heh? You" - line "came to save me?" - - para "Thank you. But, I" - line "came here of my" - cont "own free will." - - para "I came to calm" - line "the soul of" - cont "CUBONE's mother." - - para "I think MAROWAK's" - line "spirit has gone" - cont "to the afterlife." - - para "I must thank you" - line "for your kind" - cont "concern!" - - para "Follow me to my" - line "home, #MON" - cont "HOUSE at the foot" - cont "of this tower." - done - -_PokemonTower7BattleText1:: - text "What do you want?" - line "Why are you here?" - done - -_PokemonTower7EndBattleText1:: - text "I give up!" - prompt - -_PokemonTower7AfterBattleText1:: - text "I'm not going to" - line "forget this!" - done - -_PokemonTower7BattleText2:: - text "This old guy came" - line "and complained" - cont "about us harming" - cont "useless #MON!" - - para "We're talking it" - line "over as adults!" - done - -_PokemonTower7EndBattleText2:: - text "Please!" - line "No more!" - prompt - -_PokemonTower7AfterBattleText2:: - text "#MON are only" - line "good for making" - cont "money!" - - para "Stay out of our" - line "business!" - done - -_PokemonTower7BattleText3:: - text "You're not saving" - line "anyone, kid!" - done - -_PokemonTower7EndBattleText3:: - text "Don't" - line "fight us ROCKETs!" - prompt - -_PokemonTower7AfterBattleText3:: - text "You're not getting" - line "away with this!" - done diff --git a/text/maps/power_plant.asm b/text/maps/power_plant.asm deleted file mode 100644 index e5df6674..00000000 --- a/text/maps/power_plant.asm +++ /dev/null @@ -1,6 +0,0 @@ -_VoltorbBattleText:: - text "Bzzzt!" - done - -_ZapdosBattleText:: - text "Gyaoo!@@" diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm deleted file mode 100644 index 07768af9..00000000 --- a/text/maps/reds_house_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -_MomWakeUpText:: - text "MOM: Right." - line "All boys leave" - cont "home some day." - cont "It said so on TV." - - para "PROF.OAK, next" - line "door, is looking" - cont "for you." - done - -_MomHealText1:: - text "MOM: !" - line "You should take a" - cont "quick rest." - prompt - -_MomHealText2:: - text "MOM: Oh good!" - line "You and your" - cont "#MON are" - cont "looking great!" - cont "Take care now!" - done - -_StandByMeText:: - text "There's a movie" - line "on TV. Four boys" - cont "are walking on" - cont "railroad tracks." - - para "I better go too." - done - -_TVWrongSideText:: - text "Oops, wrong side." - done diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/rock_tunnel_b1f.asm deleted file mode 100644 index 472c52f8..00000000 --- a/text/maps/rock_tunnel_b1f.asm +++ /dev/null @@ -1,115 +0,0 @@ -_RockTunnel1BattleText1:: - text "This tunnel goes" - line "a long way, kid!" - done - -_RockTunnel1EndBattleText1:: - text "Doh!" - line "You win!" - prompt - -_RockTunnel1AfterBattleText1:: - text "Watch for ONIX!" - line "It can put the" - cont "squeeze on you!" - done - -_RockTunnel1BattleText2:: - text "Hmm. Maybe I'm" - line "lost in here..." - done - -_RockTunnel1EndBattleText2:: - text "Ease up!" - line "What am I doing?" - cont "Which way is out?" - prompt - -_RockTunnel1AfterBattleText2:: - text "That sleeping" - line "#MON on ROUTE" - cont "12 forced me to" - cont "take this detour." - done - -_RockTunnel1BattleText3:: - text "Outsiders like" - line "you need to show" - cont "me some respect!" - done - -_RockTunnel1EndBattleText3:: - text "I give!" - prompt - -_RockTunnel1AfterBattleText3:: - text "You're talented" - line "enough to hike!" - done - -_RockTunnel1BattleText4:: - text "#MON fight!" - line "Ready, go!" - done - -_RockTunnel1EndBattleText4:: - text "Game" - line "over!" - prompt - -_RockTunnel1AfterBattleText4:: - text "Oh well, I'll get" - line "a ZUBAT as I go!" - done - -_RockTunnel1BattleText5:: - text "Eek! Don't try" - line "anything funny in" - cont "the dark!" - done - -_RockTunnel1EndBattleText5:: - text "It" - line "was too dark!" - prompt - -_RockTunnel1AfterBattleText5:: - text "I saw a MACHOP" - line "in this tunnel!" - done - -_RockTunnel1BattleText6:: - text "I came this far" - line "for #MON!" - done - -_RockTunnel1EndBattleText6:: - text "I'm" - line "out of #MON!" - prompt - -_RockTunnel1AfterBattleText6:: - text "You looked cute" - line "and harmless!" - done - -_RockTunnel1BattleText7:: - text "You have #MON!" - line "Let's start!" - done - -_RockTunnel1EndBattleText7:: - text "You" - line "play hard!" - prompt - -_RockTunnel1AfterBattleText7:: - text "Whew! I'm all" - line "sweaty now!" - done - -_RockTunnel1Text8:: - text "ROCK TUNNEL" - line "CERULEAN CITY -" - cont "LAVENDER TOWN" - done diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/rock_tunnel_b2f_1.asm deleted file mode 100644 index 1a565eb3..00000000 --- a/text/maps/rock_tunnel_b2f_1.asm +++ /dev/null @@ -1,108 +0,0 @@ -_RockTunnel2BattleText2:: - text "Hikers leave twigs" - line "as trail markers." - done - -_RockTunnel2EndBattleText2:: - text "Ohhh!" - line "I did my best!" - prompt - -_RockTunnel2AfterBattleText2:: - text "I want to go " - line "home!" - done - -_RockTunnel2BattleText3:: - text "Hahaha! Can you" - line "beat my power?" - done - -_RockTunnel2EndBattleText3:: - text "Oops!" - line "Out-muscled!" - prompt - -_RockTunnel2AfterBattleText3:: - text "I go for power" - line "because I hate" - cont "thinking!" - done - -_RockTunnel2BattleText4:: - text "You have a" - line "#DEX?" - cont "I want one too!" - done - -_RockTunnel2EndBattleText4:: - text "Shoot!" - line "I'm so jealous!" - prompt - -_RockTunnel2AfterBattleText4:: - text "When you finish" - line "your #DEX, can" - cont "I have it?" - done - -_RockTunnel2BattleText5:: - text "Do you know about" - line "costume players?" - done - -_RockTunnel2EndBattleText5:: - text "Well," - line "that's that." - prompt - -_RockTunnel2AfterBattleText5:: - text "Costume players" - line "dress up as" - cont "#MON for fun." - done - -_RockTunnel2BattleText6:: - text "My #MON" - line "techniques will" - cont "leave you crying!" - done - -_RockTunnel2EndBattleText6:: - text "I give!" - line "You're a better" - cont "technician!" - prompt - -_RockTunnel2AfterBattleText6:: - text "In mountains," - line "you'll often find" - cont "rock-type #MON." - done - -_RockTunnel2BattleText7:: - text "I don't often" - line "come here, but I" - cont "will fight you." - done - -_RockTunnel2EndBattleText7:: - text "Oh!" - line "I lost!" - prompt - -_RockTunnel2AfterBattleText7:: - text "I like tiny" - line "#MON, big ones" - cont "are too scary!" - done - -_RockTunnel2BattleText8:: - text "Hit me with your" - line "best shot!" - done - -_RockTunnel2EndBattleText8:: - text "Fired" - line "away!" - prompt diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/rock_tunnel_b2f_2.asm deleted file mode 100644 index e8e45a7f..00000000 --- a/text/maps/rock_tunnel_b2f_2.asm +++ /dev/null @@ -1,20 +0,0 @@ -_RockTunnel2AfterBattleText8:: - text "I'll raise my" - line "#MON to beat" - cont "yours, kid!" - done - -_RockTunnel2BattleText9:: - text "I draw #MON" - line "when I'm home." - done - -_RockTunnel2EndBattleText9:: - text "Whew!" - line "I'm exhausted!" - prompt - -_RockTunnel2AfterBattleText9:: - text "I'm an artist," - line "not a fighter." - done diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm deleted file mode 100644 index 0fc249ff..00000000 --- a/text/maps/rock_tunnel_pokecenter.asm +++ /dev/null @@ -1,13 +0,0 @@ -_RockTunnelPokecenterText2:: - text "The element types" - line "of #MON make" - cont "them stronger" - cont "than some types" - cont "and weaker than" - cont "others!" - done - -_RockTunnelPokecenterText3:: - text "I sold a useless" - line "NUGGET for ¥5000!" - done diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm deleted file mode 100644 index 36117804..00000000 --- a/text/maps/rocket_hideout_b1f.asm +++ /dev/null @@ -1,73 +0,0 @@ -_RocketHideout1EndBattleText6:: - text "Why...?@@" - -_RocketHideout1BattleText2:: - text "Who are you? How" - line "did you get here?" - done - -_RocketHideout1EndBattleText2:: - text "Oww!" - line "Beaten!" - prompt - -_RocketHideout1AfterBattleTxt2:: - text "Are you dissing" - line "TEAM ROCKET?" - done - -_RocketHideout1BattleText3:: - text "You broke into" - line "our operation?" - done - -_RocketHideout1EndBattleText3:: - text "Burnt!" - prompt - -_RocketHideout1AfterBattleTxt3:: - text "You're not going" - line "to get away with" - cont "this, brat!" - done - -_RocketHideout1BattleText4:: - text "Intruder alert!" - done - -_RocketHideout1EndBattleText4:: - text "I" - line "can't do it!" - prompt - -_RocketHideout1AfterBattleTxt4:: - text "SILPH SCOPE?" - line "I don't know" - cont "where it is!" - done - -_RocketHideout1BattleText5:: - text "Why did you come" - line "here?" - done - -_RocketHideout1EndBattleText5:: - text "This" - line "won't do!" - prompt - -_RocketHideout1AfterBattleTxt5:: - text "OK, I'll talk!" - line "Take the elevator" - cont "to see my BOSS!" - done - -_RocketHideout1BattleText6:: - text "Are you lost, you" - line "little rat?" - done - -_RocketHideout1AfterBattleTxt6:: - text "Uh-oh, that fight" - line "opened the door!" - done diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm deleted file mode 100644 index c13c3593..00000000 --- a/text/maps/rocket_hideout_b2f.asm +++ /dev/null @@ -1,17 +0,0 @@ -_RocketHideout2BattleText2:: - text "BOSS said you can" - line "see GHOSTs with" - cont "the SILPH SCOPE!" - done - -_RocketHideout2EndBattleText2:: - text "I" - line "surrender!" - prompt - -_RocketHideout2AfterBattleTxt2:: - text "The TEAM ROCKET" - line "HQ has 4 basement" - cont "floors. Can you" - cont "reach the BOSS?" - done diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm deleted file mode 100644 index a146a383..00000000 --- a/text/maps/rocket_hideout_b3f.asm +++ /dev/null @@ -1,35 +0,0 @@ -_RocketHideout3BattleText2:: - text "Stop meddling in" - line "TEAM ROCKET's" - cont "affairs!" - done - -_RocketHideout3EndBattleText2:: - text "Oof!" - line "Taken down!" - prompt - -_RocketHideout3AfterBattleTxt2:: - text "SILPH SCOPE?" - line "The machine the" - cont "BOSS stole. It's" - cont "here somewhere." - done - -_RocketHideout3BattleTxt:: - text "We got word from" - line "upstairs that you" - cont "were coming!" - done - -_RocketHideout3EndBattleText3:: - text "What?" - line "I lost? No!" - prompt - -_RocketHide3AfterBattleText3:: - text "Go ahead and go!" - line "But, you need the" - cont "LIFT KEY to run" - cont "the elevator!" - done diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm deleted file mode 100644 index f3ba43f3..00000000 --- a/text/maps/rocket_hideout_b4f.asm +++ /dev/null @@ -1,74 +0,0 @@ -_RocketHideout4Text_4557a:: - text "So! I must say, I" - line "am impressed you" - cont "got here!" - done - -_RocketHideout4Text_4557f:: - text "WHAT!" - line "This cannot be!" - prompt - -_RocketHideout4Text_45584:: - text "I see that you" - line "raise #MON" - cont "with utmost care." - - para "A child like you" - line "would never" - cont "understand what I" - cont "hope to achieve." - - para "I shall step" - line "aside this time!" - - para "I hope we meet" - line "again..." - done - -_RocketHideout4BattleText2:: - text "I know you! You" - line "ruined our plans" - cont "at MT.MOON!" - done - -_RocketHideout4EndBattleText2:: - text "Burned" - line "again!" - prompt - -_RocketHide4AfterBattleText2:: - text "Do you have" - line "something against" - cont "TEAM ROCKET?" - done - -_RocketHideout4BattleText3:: - text "How can you not" - line "see the beauty of" - cont "our evil?" - done - -_RocketHideout4EndBattleText3:: - text "Ayaya!" - prompt - -_RocketHide4AfterBattleText3:: - text "BOSS! I'm sorry I" - line "failed you!" - done - -_RocketHideout4BattleText4:: - text "The elevator" - line "doesn't work? Who" - cont "has the LIFT KEY?" - done - -_RocketHideout4EndBattleText4:: - text "No!" - prompt - -_RocketHideout4Text_455ec:: - text "Oh no! I dropped" - line "the LIFT KEY!" - done diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/rocket_hideout_elevator.asm deleted file mode 100644 index 6f2aa638..00000000 --- a/text/maps/rocket_hideout_elevator.asm +++ /dev/null @@ -1,3 +0,0 @@ -_RocketElevatorText_4578b:: - text "It appears to" - line "need a key.@@" diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm deleted file mode 100644 index 73188f09..00000000 --- a/text/maps/route_1.asm +++ /dev/null @@ -1,49 +0,0 @@ -_Route1ViridianMartSampleText:: - text "Hi! I work at a" - line "#MON MART." - - para "It's a convenient" - line "shop, so please" - cont "visit us in" - cont "VIRIDIAN CITY." - - para "I know, I'll give" - line "you a sample!" - cont "Here you go!" - prompt - -_Route1Text_1cae8:: - text " got" - line "@" - TX_RAM wcf4b - text "!@@" - -_Route1Text_1caee:: - text "We also carry" - line "# BALLs for" - cont "catching #MON!" - done - -_Route1Text_1caf3:: - text "You have too much" - line "stuff with you!" - done - -_Route1Text2:: - text "See those ledges" - line "along the road?" - - para "It's a bit scary," - line "but you can jump" - cont "from them." - - para "You can get back" - line "to PALLET TOWN" - cont "quicker that way." - done - -_Route1Text3:: - text "ROUTE 1" - line "PALLET TOWN -" - cont "VIRIDIAN CITY" - done diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm deleted file mode 100644 index 057ddcb5..00000000 --- a/text/maps/route_10.asm +++ /dev/null @@ -1,109 +0,0 @@ -_Route10BattleText1:: - text "Wow, are you a" - line "#MANIAC too?" - cont "Want to see my" - cont "collection?" - done - -_Route10EndBattleText1:: - text "Humph." - line "I'm not angry!" - prompt - -_Route10AfterBattleText1:: - text "I have more rare" - line "#MON at home!" - done - -_Route10BattleText2:: - text "Ha-hahah-ah-ha!" - done - -_Route10EndBattleText2:: - text "Ha-haha!" - line "Not laughing!" - cont "Ha-hay fever!" - cont "Haha-ha-choo!" - prompt - -_Route10AfterBattleText2:: - text "Haha-ha-choo!" - line "Ha-choo!" - cont "Snort! Snivel!" - done - -_Route10BattleText3:: - text "Hi kid, want to" - line "see my #MON?" - done - -_Route10EndBattleText3:: - text "Oh no!" - line "My #MON!" - prompt - -_Route10AfterBattleText3:: - text "I don't like you" - line "for beating me!" - done - -_Route10BattleText4:: - text "I've been to a" - line "#MON GYM a few" - cont "times. But, I" - cont "lost each time." - done - -_Route10EndBattleText4:: - text "Ohh!" - line "Blew it again!" - prompt - -_Route10AfterBattleText4:: - text "I noticed some" - line "#MANIACs" - cont "prowling around." - done - -_Route10BattleText5:: - text "Ah! This mountain" - line "air is delicious!" - done - -_Route10EndBattleText5:: - text "That" - line "cleared my head!" - prompt - -_Route10AfterBattleText5:: - text "I feel bloated on" - line "mountain air!" - done - -_Route10BattleText6:: - text "I'm feeling a bit" - line "faint from this" - cont "tough hike." - done - -_Route10EndBattleText6:: - text "I'm" - line "not up to it!" - prompt - -_Route10AfterBattleText6:: - text "The #MON here" - line "are so chunky!" - cont "There should be a" - cont "pink one with a" - cont "floral pattern!" - done - -_Route10Text9:: -_Route10Text7:: - text "ROCK TUNNEL" - done - -_Route10Text10:: - text "POWER PLANT" - done diff --git a/text/maps/route_11_1.asm b/text/maps/route_11_1.asm deleted file mode 100644 index 13e37bdf..00000000 --- a/text/maps/route_11_1.asm +++ /dev/null @@ -1,133 +0,0 @@ -_Route11BattleText1:: - text "Win, lose or draw!" - done - -_Route11EndBattleText1:: - text "Atcha!" - line "Didn't go my way!" - prompt - -_Route11AfterBattleText1:: - text "#MON is life!" - line "And to live is to" - cont "gamble!" - done - -_Route11BattleText2:: - text "Competition! I" - line "can't get enough!" - done - -_Route11EndBattleText2:: - text "I had" - line "a chance!" - prompt - -_Route11AfterBattleText2:: - text "You can't be a" - line "coward in the" - cont "world of #MON!" - done - -_Route11BattleText3:: - text "Let's go, but" - line "don't cheat!" - done - -_Route11EndBattleText3:: - text "Huh?" - line "That's not right!" - prompt - -_Route11AfterBattleText3:: - text "I did my best! I" - line "have no regrets!" - done - -_Route11BattleText4:: - text "Careful!" - line "I'm laying down" - cont "some cables!" - done - -_Route11EndBattleText4:: - text "That" - line "was electric!" - prompt - -_Route11AfterBattleText4:: - text "Spread the word" - line "to save energy!" - done - -_Route11BattleText5:: - text "I just became a" - line "trainer! But, I" - cont "think I can win!" - done - -_Route11EndBattleText5:: - text "My" - line "#MON couldn't!" - prompt - -_Route11AfterBattleText5:: - text "What do you want?" - line "Leave me alone!" - done - -_Route11BattleText6:: - text "Fwahaha! I have" - line "never lost!" - done - -_Route11EndBattleText6:: - text "My" - line "first loss!" - prompt - -_Route11AfterBattleText6:: - text "Luck of the draw!" - line "Just luck!" - done - -_Route11BattleText7:: - text "I have never won" - line "before..." - done - -_Route11EndBattleText7:: - text "I saw" - line "this coming..." - prompt - -_Route11AfterBattleText7:: - text "It's just luck." - line "Luck of the draw." - done - -_Route11BattleText8:: - text "I'm the best in" - line "my class!" - done - -_Route11EndBattleText8:: - text "Darn!" - line "I need to make my" - cont "#MON stronger!" - prompt - -_Route11AfterBattleText8:: - text "There's a fat" - line "#MON that" - cont "comes down from" - cont "the mountains." - - para "It's strong if" - line "you can get it." - done - -_Route11BattleText9:: - text "Watch out for" - line "live wires!" - done diff --git a/text/maps/route_11_2.asm b/text/maps/route_11_2.asm deleted file mode 100644 index b9b68d6d..00000000 --- a/text/maps/route_11_2.asm +++ /dev/null @@ -1,28 +0,0 @@ -_Route11EndBattleText9:: - text "Whoa!" - line "You spark plug!" - prompt - -_Route11AfterBattleText9:: - text "Well, better get" - line "back to work." - done - -_Route11BattleText10:: - text "My #MON should" - line "be ready by now!" - done - -_Route11EndBattleText10:: - text "Too" - line "much, too young!" - prompt - -_Route11AfterBattleText10:: - text "I better go find" - line "stronger ones!" - done - -_Route11Text11:: - text "DIGLETT's CAVE" - done diff --git a/text/maps/route_11_gate.asm b/text/maps/route_11_gate.asm deleted file mode 100644 index ef371d06..00000000 --- a/text/maps/route_11_gate.asm +++ /dev/null @@ -1,14 +0,0 @@ -_Route11GateText1:: - text "When you catch" - line "lots of #MON," - cont "isn't it hard to" - cont "think up names?" - - para "In LAVENDER TOWN," - line "there's a man who" - cont "rates #MON" - cont "nicknames." - - para "He'll help you" - line "rename them too!" - done diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm deleted file mode 100644 index 10236081..00000000 --- a/text/maps/route_11_gate_upstairs.asm +++ /dev/null @@ -1,40 +0,0 @@ -_Route11GateUpstairsText_494a3:: - text "There are items on" - line "the ground that" - cont "can't be seen." - - para "ITEMFINDER will" - line "detect an item" - cont "close to you." - - para "It can't pinpoint" - line "it, so you have" - cont "to look yourself!" - done - -_BinocularsSnorlaxText:: - text "Looked into the" - line "binoculars." - - para "A big #MON is" - line "asleep on a road!" - done - -_BinocularsNoSnorlaxText:: - text "Looked into the" - line "binoculars." - - para "It's a beautiful" - line "view!" - done - -_Route11GateUpstairsText_494d5:: - text "Looked into the" - line "binoculars." - - para "The only way to" - line "get from CERULEAN" - cont "CITY to LAVENDER" - cont "is by way of the" - cont "ROCK TUNNEL." - done diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm deleted file mode 100644 index 82696fda..00000000 --- a/text/maps/route_12.asm +++ /dev/null @@ -1,139 +0,0 @@ -_Route12Text1:: - text "A sleeping #MON" - line "blocks the way!" - done - -_Route12Text13:: - text "SNORLAX woke up!" - - para "It attacked in a" - line "grumpy rage!" - done - -_Route12Text14:: - text "SNORLAX calmed" - line "down! With a big" - cont "yawn, it returned" - cont "to the mountains!" - done - -_Route12BattleText1:: - text "Yeah! I got a" - line "bite, here!" - done - -_Route12EndBattleText1:: - text "Tch!" - line "Just a small fry!" - prompt - -_Route12AfterBattleText1:: - text "Hang on! My line's" - line "snagged!" - done - -_Route12BattleText2:: - text "Be patient!" - line "Fishing is a" - cont "waiting game!" - done - -_Route12EndBattleText2:: - text "That" - line "one got away!" - prompt - -_Route12AfterBattleText2:: - text "With a better ROD," - line "I could catch" - cont "better #MON!" - done - -_Route12BattleText3:: - text "Have you found a" - line "MOON STONE?" - done - -_Route12EndBattleText3:: - text "Oww!" - prompt - -_Route12AfterBattleText3:: - text "I could have made" - line "my #MON evolve" - cont "with MOON STONE!" - done - -_Route12BattleText4:: - text "Electricity is my" - line "specialty!" - done - -_Route12EndBattleText4:: - text "Unplugged!" - prompt - -_Route12AfterBattleText4:: - text "Water conducts" - line "electricity, so" - cont "you should zap" - cont "sea #MON!" - done - -_Route12BattleText5:: - text "The FISHING FOOL" - line "vs. #MON KID!" - done - -_Route12EndBattleText5:: - text "Too" - line "much!" - prompt - -_Route12AfterBattleText5:: - text "You beat me at" - line "#MON, but I'm" - cont "good at fishing!" - done - -_Route12BattleText6:: - text "I'd rather be" - line "working!" - done - -_Route12EndBattleText6:: - text "It's" - line "not easy..." - prompt - -_Route12AfterBattleText6:: - text "It's all right." - line "Losing doesn't" - cont "bug me any more." - done - -_Route12BattleText7:: - text "You never know" - line "what you could" - cont "catch!" - done - -_Route12EndBattleText7:: - text "Lost" - line "it!" - prompt - -_Route12AfterBattleText7:: - text "I catch MAGIKARP" - line "all the time, but" - cont "they're so weak!" - done - -_Route12Text11:: - text "ROUTE 12 " - line "North to LAVENDER" - done - -_Route12Text12:: - text "SPORT FISHING AREA" - done diff --git a/text/maps/route_12_gate.asm b/text/maps/route_12_gate.asm deleted file mode 100644 index 51d75539..00000000 --- a/text/maps/route_12_gate.asm +++ /dev/null @@ -1,4 +0,0 @@ -_Route12GateText1:: - text "There's a lookout" - line "spot upstairs." - done diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm deleted file mode 100644 index 95a89527..00000000 --- a/text/maps/route_12_gate_upstairs.asm +++ /dev/null @@ -1,42 +0,0 @@ -_TM39PreReceiveText:: - text "My #MON's" - line "ashes are stored" - cont "in #MON TOWER." - - para "You can have this" - line "TM. I don't need" - cont "it any more..." - prompt - -_ReceivedTM39Text:: - text " received" - line "TM39!@@" - -_TM39ExplanationText:: - text "TM39 is a move" - line "called SWIFT." - - para "It's very accurate," - line "so use it during" - cont "battles you can't" - cont "afford to lose." - done - -_TM39NoRoomText:: - text "You don't have" - line "room for this." - done - -_Route12GateUpstairsText_495b8:: - text "Looked into the" - line "binoculars." - - para "A man fishing!" - done - -_Route12GateUpstairsText_495c4:: - text "Looked into the" - line "binoculars." - - para "It's #MON TOWER!" - done diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm deleted file mode 100644 index e04ce5fb..00000000 --- a/text/maps/route_12_house.asm +++ /dev/null @@ -1,60 +0,0 @@ -_Route12HouseText_564c0:: - text "I'm the FISHING" - line "GURU's brother!" - - para "I simply Looove" - line "fishing!" - - para "Do you like to" - line "fish?" - done - -_Route12HouseText_564c5:: - text "Grand! I like" - line "your style!" - - para "Take this and" - line "fish, young one!" - - para " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_Route12HouseText_564ca:: - db $0 - para "Fishing is a way" - line "of life!" - - para "From the seas to" - line "rivers, go out" - cont "and land the big" - cont "one!" - done - -_Route12HouseText_564cf:: - text "Oh... That's so" - line "disappointing..." - done - -_Route12HouseText_564d4:: - text "Hello there," - line "!" - - para "Use the SUPER ROD" - line "in any water!" - cont "You can catch" - cont "different kinds" - cont "of #MON." - - para "Try fishing" - line "wherever you can!" - done - -_Route12HouseText_564d9:: - text "Oh no!" - - para "I had a gift for" - line "you, but you have" - cont "no room for it!" - done diff --git a/text/maps/route_13.asm b/text/maps/route_13.asm deleted file mode 100644 index e2718919..00000000 --- a/text/maps/route_13.asm +++ /dev/null @@ -1,179 +0,0 @@ -_Route13BattleText2:: - text "My bird #MON" - line "want to scrap!" - done - -_Route13EndBattleText2:: - text "My" - line "bird combo lost?" - prompt - -_Route13AfterBattleText2:: - text "My #MON look" - line "happy even though" - cont "they lost." - done - -_Route13BattleText3:: - text "I'm told I'm good" - line "for a kid!" - done - -_Route13EndBattleText3:: - text "Ohh!" - line "I lost!" - prompt - -_Route13AfterBattleText3:: - text "I want to become" - line "a good trainer." - cont "I'll train hard." - done - -_Route13BattleText4:: - text "Wow! Your BADGEs" - line "are too cool!" - done - -_Route13EndBattleText4:: - text "Not" - line "enough!" - prompt - -_Route13AfterBattleText4:: - text "You got those" - line "BADGEs from GYM" - cont "LEADERs. I know!" - done - -_Route13BattleText5:: - text "My cute #MON" - line "wish to make your" - cont "acquaintance." - done - -_Route13EndBattleText5:: - text "Wow!" - line "You totally won!" - prompt - -_Route13AfterBattleText5:: - text "You have to make" - line "#MON fight to" - cont "toughen them up!" - done - -_Route13BattleText6:: - text "I found CARBOS in" - line "a cave once." - done - -_Route13EndBattleText6:: - text "Just" - line "messed up!" - prompt - -_Route13AfterBattleText6:: - text "CARBOS boosted" - line "the SPEED of my" - cont "#MON." - done - -_Route13BattleText7:: - text "The wind's blowing" - line "my way!" - done - -_Route13EndBattleText7:: - text "The" - line "wind turned!" - prompt - -_Route13AfterBattleText7:: - text "I'm beat. I guess" - line "I'll FLY home." - done - -_Route13BattleText8:: - text "Sure, I'll play" - line "with you!" - done - -_Route13EndBattleText8:: - text "Oh!" - line "You little brute!" - prompt - -_Route13AfterBattleText8:: - text "I wonder which is" - line "stronger, male or" - cont "female #MON?" - done - -_Route13BattleText9:: - text "Do you want to" - line "#MON with me?" - done - -_Route13EndBattleText9:: - text "It's over" - line "already?" - prompt - -_Route13AfterBattleText9:: - text "I don't know" - line "anything about" - cont "#MON. I just" - cont "like cool ones!" - done - -_Route13BattleText10:: - text "What're you" - line "lookin' at?" - done - -_Route13EndBattleText10:: - text "Dang!" - line "Stripped gears!" - prompt - -_Route13AfterBattleText10:: - text "Get lost!" - done - -_Route13BattleText11:: - text "I always go with" - line "bird #MON!" - done - -_Route13EndBattleText11:: - text "Out" - line "of power!" - prompt - -_Route13AfterBattleText11:: - text "I wish I could" - line "fly like PIDGEY" - cont "and PIDGEOTTO..." - done - -_Route13Text11:: - text "TRAINER TIPS" - - para "Look to the left" - line "of that post!" - done - -_Route13Text12:: - text "TRAINER TIPS" - - para "Use SELECT to" - line "switch items in" - cont "the ITEM window!" - done - -_Route13Text13:: - text "ROUTE 13" - line "North to SILENCE" - cont "BRIDGE" - done diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm deleted file mode 100644 index 18e85ed4..00000000 --- a/text/maps/route_14.asm +++ /dev/null @@ -1,173 +0,0 @@ -_Route14BattleText1:: - text "You need to use" - line "TMs to teach good" - cont "moves to #MON!" - done - -_Route14EndBattleText1:: - text "Not" - line "good enough!" - prompt - -_Route14AfterBattleText1:: - text "You have some HMs" - line "right? #MON" - cont "can't ever forget" - cont "those moves." - done - -_Route14BattleText2:: - text "My bird #MON" - line "should be ready" - cont "for battle." - done - -_Route14EndBattleText2:: - text "Not" - line "ready yet!" - prompt - -_Route14AfterBattleText2:: - text "They need to learn" - line "better moves." - done - -_Route14BattleText3:: - text "TMs are on sale" - line "in CELADON!" - cont "But, only a few" - cont "people have HMs!" - done - -_Route14EndBattleText3:: - text "Aww," - line "bummer!" - prompt - -_Route14AfterBattleText3:: - text "Teach #MON" - line "moves of the same" - cont "element type for" - cont "more power." - done - -_Route14BattleText4:: - text "Have you taught" - line "your bird #MON" - cont "how to FLY?" - done - -_Route14EndBattleText4:: - text "Shot" - line "down in flames!" - prompt - -_Route14AfterBattleText4:: - text "Bird #MON are" - line "my true love!" - done - -_Route14BattleText5:: - text "Have you heard of" - line "the legendary" - cont "#MON?" - done - -_Route14EndBattleText5:: - text "Why?" - line "Why'd I lose?" - prompt - -_Route14AfterBattleText5:: - text "The 3 legendary" - line "#MON are all" - cont "birds of prey." - done - -_Route14BattleText6:: - text "I'm not into it," - line "but OK! Let's go!" - done - -_Route14EndBattleText6:: - text "I" - line "knew it!" - prompt - -_Route14AfterBattleText6:: - text "Winning, losing," - line "it doesn't matter" - cont "in the long run!" - done - -_Route14BattleText7:: - text "C'mon, c'mon." - line "Let's go, let's" - cont "go, let's go!" - done - -_Route14EndBattleText7:: - text "Arrg!" - line "Lost! Get lost!" - prompt - -_Route14AfterBattleText7:: - text "What, what, what?" - line "What do you want?" - done - -_Route14BattleText8:: - text "Perfect! I need to" - line "burn some time!" - done - -_Route14EndBattleText8:: - text "What?" - line "You!?" - prompt - -_Route14AfterBattleText8:: - text "Raising #MON" - line "is a drag, man." - done - -_Route14BattleText9:: - text "We ride out here" - line "because there's" - cont "more room!" - done - -_Route14EndBattleText9:: - text "Wipe out!" - prompt - -_Route14AfterBattleText9:: - text "It's cool you" - line "made your #MON" - cont "so strong!" - - para "Might is right!" - line "And you know it!" - done - -_Route14BattleText10:: - text "#MON fight?" - line "Cool! Rumble!" - done - -_Route14EndBattleText10:: - text "Blown" - line "away!" - prompt - -_Route14AfterBattleText10:: - text "You know who'd" - line "win, you and me" - cont "one on one!" - done - -_Route14Text11:: - text "ROUTE 14" - line "West to FUCHSIA" - cont "CITY" - done diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm deleted file mode 100644 index a23b8500..00000000 --- a/text/maps/route_15.asm +++ /dev/null @@ -1,171 +0,0 @@ -_Route15BattleText1:: - text "Let me try out the" - line "#MON I just" - cont "got in a trade!" - done - -_Route15EndBattleText1:: - text "Not" - line "good enough!" - prompt - -_Route15AfterBattleText1:: - text "You can't change" - line "the nickname of" - cont "any #MON you" - cont "get in a trade." - - para "Only the Original" - line "Trainer can." - done - -_Route15BattleText2:: - text "You look gentle," - line "so I think I can" - cont "beat you!" - done - -_Route15EndBattleText2:: - text "No," - line "wrong!" - prompt - -_Route15AfterBattleText2:: - text "I'm afraid of" - line "BIKERs, they look" - cont "so ugly and mean!" - done - -_Route15BattleText3:: - text "When I whistle, I" - line "can summon bird" - cont "#MON!" - done - -_Route15EndBattleText3:: - text "Ow!" - line "That's tragic!" - prompt - -_Route15AfterBattleText3:: - text "Maybe I'm not cut" - line "out for battles." - done - -_Route15BattleText4:: - text "Hmm? My birds are" - line "shivering! You're" - cont "good, aren't you?" - done - -_Route15EndBattleText4:: - text "Just" - line "as I thought!" - prompt - -_Route15AfterBattleText4:: - text "Did you know moves" - line "like EARTHQUAKE" - cont "don't have any" - cont "effect on birds?" - done - -_Route15BattleText5:: - text "Oh, you're a" - line "little cutie!" - done - -_Route15EndBattleText5:: - text "You looked" - line "so cute too!" - prompt - -_Route15AfterBattleText5:: - text "I forgive you!" - line "I can take it!" - done - -_Route15BattleText6:: - text "I raise #MON" - line "because I live" - cont "alone!" - done - -_Route15EndBattleText6:: - text "I didn't" - line "ask for this!" - prompt - -_Route15AfterBattleText6:: - text "I just like going" - line "home to be with" - cont "my #MON!" - done - -_Route15BattleText7:: - text "Hey kid! C'mon!" - line "I just got these!" - done - -_Route15EndBattleText7:: - text "Why" - line "not?" - prompt - -_Route15AfterBattleText7:: - text "You only live" - line "once, so I live" - cont "as an outlaw!" - cont "TEAM ROCKET RULES!" - done - -_Route15BattleText8:: - text "Fork over all your" - line "cash when you" - cont "lose to me, kid!" - done - -_Route15EndBattleText8:: - text "That" - line "can't be true!" - prompt - -_Route15AfterBattleText8:: - text "I was just joking" - line "about the money!" - done - -_Route15BattleText9:: - text "What's cool?" - line "Trading #MON!" - done - -_Route15EndBattleText9:: - text "I" - line "said trade!" - prompt - -_Route15AfterBattleText9:: - text "I trade #MON" - line "with my friends!" - done - -_Route15BattleText10:: - text "Want to play with" - line "my #MON?" - done - -_Route15EndBattleText10:: - text "I was" - line "too impatient!" - prompt - -_Route15AfterBattleText10:: - text "I'll go train with" - line "weaker people.@@" - -_Route15Text12:: - text "ROUTE 15" - line "West to FUCHSIA" - cont "CITY" - done diff --git a/text/maps/route_15_gate.asm b/text/maps/route_15_gate.asm deleted file mode 100644 index 0a526142..00000000 --- a/text/maps/route_15_gate.asm +++ /dev/null @@ -1,7 +0,0 @@ -_Route15GateText1:: - text "Are you working" - line "on a #DEX?" - - para "PROF.OAK's AIDE" - line "came by here." - done diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/route_15_gate_upstairs.asm deleted file mode 100644 index ade4a358..00000000 --- a/text/maps/route_15_gate_upstairs.asm +++ /dev/null @@ -1,24 +0,0 @@ -_Route15GateUpstairsText_4968c:: - text "EXP.ALL gives" - line "EXP points to all" - cont "the #MON with" - cont "you, even if they" - cont "don't fight." - - para "It does, however," - line "reduce the amount" - cont "of EXP for each" - cont "#MON." - - para "If you don't need" - line "it, you should " - cont "store it via PC." - done - -_Route15GateUpstairsText_49698:: - text "Looked into the" - line "binoculars." - - para "It looks like a" - line "small island!" - done diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm deleted file mode 100644 index 45265829..00000000 --- a/text/maps/route_16.asm +++ /dev/null @@ -1,120 +0,0 @@ -_Route16BattleText1:: - text "What do you want?" - done - -_Route16EndBattleText1:: - text "Don't you" - line "dare laugh!" - prompt - -_Route16AfterBattleText1:: - text "We like just" - line "hanging here," - cont "what's it to you?" - done - -_Route16BattleText2:: - text "Nice BIKE!" - line "Hand it over!" - done - -_Route16EndBattleText2:: - text "Knock" - line "out!" - prompt - -_Route16AfterBattleText2:: - text "Forget it, who" - line "needs your BIKE!" - done - -_Route16BattleText3:: - text "Come out and play," - line "little mouse!" - done - -_Route16EndBattleText3:: - text "You" - line "little rat!" - prompt - -_Route16AfterBattleText3:: - text "I hate losing!" - line "Get away from me!" - done - -_Route16BattleText4:: - text "Hey, you just" - line "bumped me!" - done - -_Route16EndBattleText4:: - text "Kaboom!" - prompt - -_Route16AfterBattleText4:: - text "You can also get" - line "to FUCHSIA from" - cont "VERMILION using a" - cont "coastal road." - done - -_Route16BattleText5:: - text "I'm feeling" - line "hungry and mean!" - done - -_Route16EndBattleText5:: - text "Bad," - line "bad, bad!" - prompt - -_Route16AfterBattleText5:: - text "I like my #MON" - line "ferocious! They" - cont "tear up enemies!" - done - -_Route16BattleText6:: - text "Sure, I'll go!" - done - -_Route16EndBattleText6:: - text "Don't make" - line "me mad!" - prompt - -_Route16AfterBattleText6:: - text "I like harassing" - line "people with my" - cont "vicious #MON!" - done - -_Route16Text7:: - text "A sleeping #MON" - line "blocks the way!" - done - -_Route16Text10:: - text "SNORLAX woke up!" - - para "It attacked in a" - line "grumpy rage!" - done - -_Route16Text11:: - text "With a big yawn," - line "SNORLAX returned" - cont "to the mountains!" - done - -_Route16Text8:: - text "Enjoy the slope!" - line "CYCLING ROAD" - done - -_Route16Text9:: - text "ROUTE 16" - line "CELADON CITY -" - cont "FUCHSIA CITY" - done diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm deleted file mode 100644 index f548977f..00000000 --- a/text/maps/route_16_gate.asm +++ /dev/null @@ -1,22 +0,0 @@ -_Route16GateText_49777:: - text "No pedestrians" - line "are allowed on" - cont "CYCLING ROAD!" - done - -_Route16GateText_4977c:: - text "CYCLING ROAD is a" - line "downhill course" - cont "by the sea. It's" - cont "a great ride." - done - -_Route16GateText_49781:: - text "Excuse me! Wait" - line "up please!" - done - -_Route16GateText2:: - text "How'd you get in?" - line "Good effort!" - done diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/route_16_gate_upstairs.asm deleted file mode 100644 index d76b70ca..00000000 --- a/text/maps/route_16_gate_upstairs.asm +++ /dev/null @@ -1,26 +0,0 @@ -_Route16GateUpstairsText_49820:: - text "I'm going for a" - line "ride with my girl" - cont "friend!" - done - -_Route16GateUpstairsText_4982f:: - text "We're going" - line "riding together!" - done - -_Route16GateUpstairsText_4983b:: - text "Looked into the" - line "binoculars." - - para "It's CELADON DEPT." - line "STORE!" - done - -_Route16GateUpstairsText_49847:: - text "Looked into the" - line "binoculars." - - para "There's a long" - line "path over water!" - done diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm deleted file mode 100644 index 77efde87..00000000 --- a/text/maps/route_16_house.asm +++ /dev/null @@ -1,31 +0,0 @@ -_Route16HouseText3:: - text "Oh, you found my" - line "secret retreat!" - - para "Please don't tell" - line "anyone I'm here." - cont "I'll make it up" - cont "to you with this!" - prompt - -_ReceivedHM02Text:: - text " received" - line "HM02!@@" - -_HM02ExplanationText:: - text "HM02 is FLY." - line "It will take you" - cont "back to any town." - - para "Put it to good" - line "use!" - done - -_HM02NoRoomText:: - text "You don't have any" - line "room for this." - done - -_Route16HouseText_1e652:: - text "FEAROW: Kyueen!" - done diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm deleted file mode 100644 index a0affd90..00000000 --- a/text/maps/route_17.asm +++ /dev/null @@ -1,195 +0,0 @@ -_Route17BattleText1:: - text "There's no money" - line "in fighting kids!" - done - -_Route17EndBattleText1:: - text "Burned" - line "out!" - prompt - -_Route17AfterBattleText1:: - text "Good stuff is" - line "lying around on" - cont "CYCLING ROAD!" - done - -_Route17BattleText2:: - text "What do you want," - line "kiddo?" - done - -_Route17EndBattleText2:: - text "Whoo!" - prompt - -_Route17AfterBattleText2:: - text "I could belly-" - line "bump you outta" - cont "here!" - done - -_Route17BattleText3:: - text "You heading to" - line "FUCHSIA?" - done - -_Route17EndBattleText3:: - text "Crash and" - line "burn!" - prompt - -_Route17AfterBattleText3:: - text "I love racing" - line "downhill!" - done - -_Route17BattleText4:: - text "We're BIKERs!" - line "Highway stars!" - done - -_Route17EndBattleText4:: - text "Smoked!" - prompt - -_Route17AfterBattleText4:: - text "Are you looking" - line "for adventure?" - done - -_Route17BattleText5:: - text "Let VOLTORB" - line "electrify you!" - done - -_Route17EndBattleText5:: - text "Grounded" - line "out!" - prompt - -_Route17AfterBattleText5:: - text "I got my VOLTORB" - line "at the abandoned" - cont "POWER PLANT." - done - -_Route17BattleText6:: - text "My #MON won't" - line "evolve! Why?" - done - -_Route17EndBattleText6:: - text "Why," - line "you!" - prompt - -_Route17AfterBattleText6:: - text "Maybe some #MON" - line "need element" - cont "STONEs to evolve." - done - -_Route17BattleText7:: - text "I need a little" - line "exercise!" - done - -_Route17EndBattleText7:: - text "Whew!" - line "Good workout!" - prompt - -_Route17AfterBattleText7:: - text "I'm sure I lost" - line "weight there!" - done - -_Route17BattleText8:: - text "Be a rebel!" - done - -_Route17EndBattleText8:: - text "Aaaargh!" - prompt - -_Route17AfterBattleText8:: - text "Be ready to fight" - line "for your beliefs!" - done - -_Route17BattleText9:: - text "Nice BIKE!" - line "How's it handle?" - done - -_Route17EndBattleText9:: - text "Shoot!" - prompt - -_Route17AfterBattleText9:: - text "The slope makes" - line "it hard to steer!" - done - -_Route17BattleText10:: - text "Get lost kid!" - line "I'm bushed!" - done - -_Route17EndBattleText10:: - text "Are you" - line "satisfied?" - prompt - -_Route17AfterBattleText10:: - text "I need to catch" - line "a few Zs!" - done - -_Route17Text11:: - text "It's a notice!" - - para "Watch out for" - line "discarded items!" - done - -_Route17Text12:: - text "TRAINER TIPS" - - para "All #MON are" - line "unique." - - para "Even #MON of" - line "the same type and" - cont "level grow at" - cont "different rates." - done - -_Route17Text13:: - text "TRAINER TIPS" - - para "Press the A or B" - line "Button to stay in" - cont "place while on a" - cont "slope." - done - -_Route17Text14:: - text "ROUTE 17" - line "CELADON CITY -" - cont "FUCHSIA CITY" - done - -_Route17Text15:: - text "It's a notice!" - - para "Don't throw the" - line "game, throw #" - cont "BALLs instead!" - done - -_Route17Text16:: - text "CYCLING ROAD" - line "Slope ends here!" - done diff --git a/text/maps/route_18.asm b/text/maps/route_18.asm deleted file mode 100644 index d09caf82..00000000 --- a/text/maps/route_18.asm +++ /dev/null @@ -1,58 +0,0 @@ -_Route18BattleText1:: - text "I always check" - line "every grassy area" - cont "for new #MON." - done - -_Route18EndBattleText1:: - text "Tch!" - prompt - -_Route18AfterBattleText1:: - text "I wish I had a" - line "BIKE!" - done - -_Route18BattleText2:: - text "Kurukkoo!" - line "How do you like" - cont "my bird call?" - done - -_Route18EndBattleText2:: - text "I" - line "had to bug you!" - prompt - -_Route18AfterBattleText2:: - text "I also collect sea" - line "#MON on" - cont "weekends!" - done - -_Route18BattleText3:: - text "This is my turf!" - line "Get out of here!" - done - -_Route18EndBattleText3:: - text "Darn!" - prompt - -_Route18AfterBattleText3:: - text "This is my fave" - line "#MON hunting" - cont "area!" - done - -_Route18Text4:: - text "ROUTE 18" - line "CELADON CITY -" - cont "FUCHSIA CITY" - done - -_Route18Text5:: - text "CYCLING ROAD" - line "No pedestrians" - cont "permitted!" - done diff --git a/text/maps/route_18_gate.asm b/text/maps/route_18_gate.asm deleted file mode 100644 index f2f51039..00000000 --- a/text/maps/route_18_gate.asm +++ /dev/null @@ -1,14 +0,0 @@ -_Route18GateText_49928:: - text "You need a BICYCLE" - line "for CYCLING ROAD!" - done - -_Route18GateText_4992d:: - text "CYCLING ROAD is" - line "all uphill from" - cont "here." - done - -_Route18GateText_49932:: - text "Excuse me!" - done diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/route_18_gate_upstairs.asm deleted file mode 100644 index 0fd2de09..00000000 --- a/text/maps/route_18_gate_upstairs.asm +++ /dev/null @@ -1,15 +0,0 @@ -_Route18GateUpstairsText_49993:: - text "Looked into the" - line "binoculars." - - para "PALLET TOWN is in" - line "the west!" - done - -_Route18GateUpstairsText_4999f:: - text "Looked into the" - line "binoculars." - - para "There are people" - line "swimming!" - done diff --git a/text/maps/route_19.asm b/text/maps/route_19.asm deleted file mode 100644 index 244e31d0..00000000 --- a/text/maps/route_19.asm +++ /dev/null @@ -1,157 +0,0 @@ -_Route19BattleText1:: - text "Have to warm up" - line "before my swim!" - done - -_Route19EndBattleText1:: - text "All" - line "warmed up!" - prompt - -_Route19AfterBattleText1:: - text "Thanks, kid! I'm" - line "ready for a swim!" - done - -_Route19BattleText2:: - text "Wait! You'll have" - line "a heart attack!" - done - -_Route19EndBattleText2:: - text "Ooh!" - line "That's chilly!" - prompt - -_Route19AfterBattleText2:: - text "Watch out for" - line "TENTACOOL!" - done - -_Route19BattleText3:: - text "I love swimming!" - line "What about you?" - done - -_Route19EndBattleText3:: - text "Belly" - line "flop!" - prompt - -_Route19AfterBattleText3:: - text "I can beat #MON" - line "at swimming!" - done - -_Route19BattleText4:: - text "What's beyond the" - line "horizon?" - done - -_Route19EndBattleText4:: - text "Glub!" - prompt - -_Route19AfterBattleText4:: - text "I see a couple of" - line "islands!" - done - -_Route19BattleText5:: - text "I tried diving" - line "for #MON, but" - cont "it was a no go!" - done - -_Route19EndBattleText5:: - text "Help!" - prompt - -_Route19AfterBattleText5:: - text "You have to fish" - line "for sea #MON!" - done - -_Route19BattleText6:: - text "I look at the" - line "sea to forget!" - done - -_Route19EndBattleText6:: - text "Ooh!" - line "Traumatic!" - prompt - -_Route19AfterBattleText6:: - text "I'm looking at the" - line "sea to forget!" - done - -_Route19BattleText7:: - text "Oh, I just love" - line "your ride! Can I" - cont "have it if I win?" - done - -_Route19EndBattleText7:: - text "Oh!" - line "I lost!" - prompt - -_Route19AfterBattleText7:: - text "It's still a long" - line "way to go to" - cont "SEAFOAM ISLANDS." - done - -_Route19BattleText8:: - text "Swimming's great!" - line "Sunburns aren't!" - done - -_Route19EndBattleText8:: - text "Shocker!" - prompt - -_Route19AfterBattleText8:: - text "My boy friend" - line "wanted to swim to" - cont "SEAFOAM ISLANDS." - done - -_Route19BattleText9:: - text "These waters are" - line "treacherous!" - done - -_Route19EndBattleText9:: - text "Ooh!" - line "Dangerous!" - prompt - -_Route19AfterBattleText9:: - text "I got a cramp!" - line "Glub, glub..." - done - -_Route19BattleText10:: - text "I swam here, but" - line "I'm tired." - done - -_Route19EndBattleText10:: - text "I'm" - line "exhausted..." - prompt - -_Route19AfterBattleText10:: - text "LAPRAS is so big," - line "it must keep you" - cont "dry on water." - done - -_Route19Text11:: - text "SEA ROUTE 19" - line "FUCHSIA CITY -" - cont "SEAFOAM ISLANDS" - done diff --git a/text/maps/route_2.asm b/text/maps/route_2.asm deleted file mode 100644 index dd7becc0..00000000 --- a/text/maps/route_2.asm +++ /dev/null @@ -1,9 +0,0 @@ -_Route2Text3:: - text "ROUTE 2" - line "VIRIDIAN CITY -" - cont "PEWTER CITY" - done - -_Route2Text4:: - text "DIGLETT's CAVE" - done diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm deleted file mode 100644 index 1ccf0b6c..00000000 --- a/text/maps/route_20.asm +++ /dev/null @@ -1,156 +0,0 @@ -_Route20BattleText1:: - text "The water is" - line "shallow here." - done - -_Route20EndBattleText1:: - text "Splash!" - prompt - -_Route20AfterBattleText1:: - text "I wish I could" - line "ride my #MON." - done - -_Route20BattleText2:: - text "SEAFOAM is a" - line "quiet getaway!" - done - -_Route20EndBattleText2:: - text "Quit it!" - prompt - -_Route20AfterBattleText2:: - text "There's a huge" - line "cavern underneath" - cont "this island." - done - -_Route20BattleText3:: - text "I love floating" - line "with the fishes!" - done - -_Route20EndBattleText3:: - text "Yowch!" - prompt - -_Route20AfterBattleText3:: - text "Want to float" - line "with me?" - done - -_Route20BattleText4:: - text "Are you on" - line "vacation too?" - done - -_Route20EndBattleText4:: - text "No" - line "mercy at all!" - prompt - -_Route20AfterBattleText4:: - text "SEAFOAM used to" - line "be one island!" - done - -_Route20BattleText5:: - text "Check out my buff" - line "physique!" - done - -_Route20EndBattleText5:: - text "Wimpy!" - prompt - -_Route20AfterBattleText5:: - text "I should've been" - line "buffing up my" - cont "#MON, not me!" - done - -_Route20BattleText6:: - text "Why are you" - line "riding a #MON?" - cont "Can't you swim?" - done - -_Route20EndBattleText6:: - text "Ouch!" - line "Torpedoed!" - prompt - -_Route20AfterBattleText6:: - text "Riding a #MON" - line "sure looks fun!" - done - -_Route20BattleText7:: - text "I rode my bird" - line "#MON here!" - done - -_Route20EndBattleText7:: - text "Oh" - line "no!" - prompt - -_Route20AfterBattleText7:: - text "My birds can't" - line "FLY me back!" - done - -_Route20BattleText8:: - text "My boy friend gave" - line "me big pearls!" - done - -_Route20EndBattleText8:: - text "Don't" - line "touch my pearls!" - prompt - -_Route20AfterBattleText8:: - text "Will my pearls" - line "grow bigger" - cont "inside CLOYSTER?" - done - -_Route20BattleText9:: - text "I swam here from" - line "CINNABAR ISLAND!" - done - -_Route20EndBattleText9:: - text "I'm" - line "so disappointed!" - prompt - -_Route20AfterBattleText9:: - text "#MON have" - line "taken over an" - cont "abandoned mansion" - cont "on CINNABAR!" - done - -_Route20BattleText10:: - text "CINNABAR, in the" - line "west, has a LAB" - cont "for #MON." - done - -_Route20EndBattleText10:: - text "Wait!" - prompt - -_Route20AfterBattleText10:: - text "CINNABAR is a " - line "volcanic island!" - done - -_Route20Text12:: -_Route20Text11:: - text "SEAFOAM ISLANDS" - done diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm deleted file mode 100644 index 3451953f..00000000 --- a/text/maps/route_21.asm +++ /dev/null @@ -1,137 +0,0 @@ -_Route21BattleText1:: - text "You want to know" - line "if the fish are" - cont "biting?" - done - -_Route21EndBattleText1:: - text "Dang!" - prompt - -_Route21AfterBattleText1:: - text "I can't catch" - line "anything good!" - done - -_Route21BattleText2:: - text "I got a big haul!" - line "Wanna go for it?" - done - -_Route21EndBattleText2:: - text "Darn" - line "MAGIKARP!" - prompt - -_Route21AfterBattleText2:: - text "I seem to only" - line "catch MAGIKARP!" - done - -_Route21BattleText3:: - text "The sea cleanses" - line "my body and soul!" - done - -_Route21EndBattleText3:: - text "Ayah!" - prompt - -_Route21AfterBattleText3:: - text "I like the" - line "mountains too!" - done - -_Route21BattleText4:: - text "What's wrong with" - line "me swimming?" - done - -_Route21EndBattleText4:: - text "Cheap" - line "shot!" - prompt - -_Route21AfterBattleText4:: - text "I look like what?" - line "A studded inner" - cont "tube? Get lost!" - done - -_Route21BattleText5:: - text "I caught all my" - line "#MON at sea!" - done - -_Route21EndBattleText5:: - text "Diver!!" - line "Down!!" - prompt - -_Route21AfterBattleText5:: - text "Where'd you catch" - line "your #MON?" - done - -_Route21BattleText6:: - text "Right now, I'm in" - line "a triathlon meet!" - done - -_Route21EndBattleText6:: - text "Pant..." - line "pant...pant..." - prompt - -_Route21AfterBattleText6:: - text "I'm beat!" - line "But, I still have" - cont "the bike race and" - cont "marathon left!" - done - -_Route21BattleText7:: - text "Ahh! Feel the sun" - line "and the wind!" - done - -_Route21EndBattleText7:: - text "Yow!" - line "I lost!" - prompt - -_Route21AfterBattleText7:: - text "I'm sunburnt to a" - line "crisp!" - done - -_Route21BattleText8:: - text "Hey, don't scare" - line "away the fish!" - done - -_Route21EndBattleText8:: - text "Sorry!" - line "I didn't mean it!" - prompt - -_Route21AfterBattleText8:: - text "I was just angry" - line "that I couldn't" - cont "catch anything." - done - -_Route21BattleText9:: - text "Keep me company" - line "'til I get a hit!" - done - -_Route21EndBattleText9:: - text "That" - line "burned some time." - prompt - -_Route21AfterBattleText9:: - text "Oh wait! I got a" - line "bite! Yeah!" - done diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm deleted file mode 100644 index 3a1d28f0..00000000 --- a/text/maps/route_22.asm +++ /dev/null @@ -1,104 +0,0 @@ -_Route22RivalBeforeBattleText1:: - text ": Hey!" - line "!" - - para "You're going to" - line "#MON LEAGUE?" - - para "Forget it! You" - line "probably don't" - cont "have any BADGEs!" - - para "The guard won't" - line "let you through!" - - para "By the way, did" - line "your #MON" - cont "get any stronger?" - done - -_Route22RivalAfterBattleText1:: - text "I heard #MON" - line "LEAGUE has many" - cont "tough trainers!" - - para "I have to figure" - line "out how to get" - cont "past them!" - - para "You should quit" - line "dawdling and get" - cont "a move on!" - done - -_Route22RivalDefeatedText1:: - text "Awww!" - line "You just lucked" - cont "out!" - prompt - -_Route22Text_511bc:: - text ": What?" - line "Why do I have 2" - cont "#MON?" - - para "You should catch" - cont "some more too!" - prompt - -_Route22RivalBeforeBattleText2:: - text ": What?" - line "! What a" - cont "surprise to see" - cont "you here!" - - para "So you're going to" - line "#MON LEAGUE?" - - para "You collected all" - line "the BADGEs too?" - cont "That's cool!" - - para "Then I'll whip you" - line " as a" - cont "warm up for" - cont "#MON LEAGUE!" - - para "Come on!" - done - -_Route22RivalAfterBattleText2:: - text "That loosened me" - line "up! I'm ready for" - cont "#MON LEAGUE!" - - para ", you need" - line "more practice!" - - para "But hey, you know" - line "that! I'm out of" - cont "here. Smell ya!" - done - -_Route22RivalDefeatedText2:: - text "What!?" - - para "I was just" - line "careless!" - prompt - -_Route22Text_511d0:: - text ": Hahaha!" - line "! That's" - cont "your best? You're" - cont "nowhere near as" - cont "good as me, pal!" - - para "Go train some" - line "more! You loser!" - prompt - -_Route22FrontGateText:: - text "#MON LEAGUE" - line "Front Gate" - done diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm deleted file mode 100644 index 2ecb020e..00000000 --- a/text/maps/route_23.asm +++ /dev/null @@ -1,38 +0,0 @@ -_VictoryRoadGuardText1:: - text "You can pass here" - line "only if you have" - cont "the @" - TX_RAM wcd6d - text "!" - - para "You don't have the" - line "@" - TX_RAM wcd6d - text " yet!" - - para "You have to have" - line "it to get to" - cont "#MON LEAGUE!@@" - -_VictoryRoadGuardText2:: - text "You can pass here" - line "only if you have" - cont "the @" - TX_RAM wcd6d - text "!" - - para "Oh! That is the" - line "@" - TX_RAM wcd6d - text "!@@" - -_VictoryRoadGuardText_513a3:: - db $0 - para "OK then! Please," - line "go right ahead!" - done - -_Route23Text8:: - text "VICTORY ROAD GATE" - line "- #MON LEAGUE" - done diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm deleted file mode 100644 index ae861eda..00000000 --- a/text/maps/route_24_1.asm +++ /dev/null @@ -1,64 +0,0 @@ -_Route24Text_51510:: - text "Congratulations!" - line "You beat our 5" - cont "contest trainers!@@" - -_Route24Text_51515:: - db $0 - para "You just earned a" - line "fabulous prize!" - prompt - -_Route24Text_5151a:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_Route24Text_51521:: - text "You don't have" - line "any room!" - done - -_Route24Text_51526:: - text "By the way, would" - line "you like to join" - cont "TEAM ROCKET?" - - para "We're a group" - line "dedicated to evil" - cont "using #MON!" - - para "Want to join?" - - para "Are you sure?" - - para "Come on, join us!" - - para "I'm telling you" - line "to join!" - - para "OK, you need" - line "convincing!" - - para "I'll make you an" - line "offer you can't" - cont "refuse!" - done - -_Route24Text_5152b:: - text "Arrgh!" - line "You are good!" - prompt - -_Route24Text_51530:: - text "With your ability," - line "you could become" - cont "a top leader in" - cont "TEAM ROCKET!" - done - -_Route24BattleText1:: - text "I saw your feat" - line "from the grass!" - done diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm deleted file mode 100644 index 325dea13..00000000 --- a/text/maps/route_24_2.asm +++ /dev/null @@ -1,90 +0,0 @@ -_Route24EndBattleText1:: - text "I" - line "thought not!" - prompt - -_Route24AfterBattleText1:: - text "I hid because the" - line "people on the" - cont "bridge scared me!" - done - -_Route24BattleText2:: - text "OK! I'm No. 5!" - line "I'll stomp you!" - done - -_Route24EndBattleText2:: - text "Whoa!" - line "Too much!" - prompt - -_Route24AfterBattleText2:: - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText3:: - text "I'm No. 4!" - line "Getting tired?" - done - -_Route24EndBattleText3:: - text "I lost" - line "too!" - prompt - -_Route24AfterBattleText3:: - text "I did my best, so" - line "I've no regrets!" - done - -_Route24BattleText4:: - text "Here's No. 3!" - line "I won't be easy!" - done - -_Route24EndBattleText4:: - text "Ow!" - line "Stomped flat!" - prompt - -_Route24AfterBattleText4:: - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText5:: - text "I'm second!" - line "Now it's serious!" - done - -_Route24EndBattleText5:: - text "How could I" - line "lose?" - prompt - -_Route24AfterBattleText5:: - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText6:: - text "This is NUGGET" - line "BRIDGE! Beat us 5" - cont "trainers and win" - cont "a fabulous prize!" - - para "Think you got" - line "what it takes?" - done - -_Route24EndBattleText6:: - text "Whoo!" - line "Good stuff!" - prompt - -_Route24AfterBattleText6:: - text "I did my best, I" - line "have no regrets!" - done diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm deleted file mode 100644 index 325ab348..00000000 --- a/text/maps/route_25.asm +++ /dev/null @@ -1,156 +0,0 @@ -_Route25BattleText1:: - text "Local trainers" - line "come here to" - cont "practice!" - done - -_Route25EndBattleText1:: - text "You're" - line "decent." - prompt - -_Route25AfterBattleText1:: - text "All #MON have" - line "weaknesses. It's" - cont "best to raise" - cont "different kinds." - done - -_Route25BattleText2:: - text "Dad took me to a" - line "great party on" - cont "S.S.ANNE at" - cont "VERMILION CITY!" - done - -_Route25EndBattleText2:: - text "I'm" - line "not mad!" - prompt - -_Route25AfterBattleText2:: - text "On S.S.ANNE, I" - line "saw trainers from" - cont "around the world." - done - -_Route25BattleText3:: - text "I'm a cool guy." - line "I've got a girl" - cont "friend!" - done - -_Route25EndBattleText3:: - text "Aww," - line "darn..." - prompt - -_Route25AfterBattleText3:: - text "Oh well. My girl" - line "will cheer me up." - done - -_Route25BattleText4:: - text "Hi! My boy" - line "friend is cool!" - done - -_Route25EndBattleText4:: - text "I was in" - line "bad condition!" - prompt - -_Route25AfterBattleText4:: - text "I wish my guy was" - line "as good as you!" - done - -_Route25BattleText5:: - text "I knew I had to" - line "fight you!" - done - -_Route25EndBattleText5:: - text "I knew" - line "I'd lose too!" - prompt - -_Route25AfterBattleText5:: - text "If your #MON" - line "gets confused or" - cont "falls asleep," - cont "switch it!" - done - -_Route25BattleText6:: - text "My friend has a" - line "cute #MON." - cont "I'm so jealous!" - done - -_Route25EndBattleText6:: - text "I'm" - line "not so jealous!" - prompt - -_Route25AfterBattleText6:: - text "You came from MT." - line "MOON? May I have" - cont "a CLEFAIRY?" - done - -_Route25BattleText7:: - text "I just got down" - line "from MT.MOON," - cont "but I'm ready!" - done - -_Route25EndBattleText7:: - text "You" - line "worked hard!" - prompt - -_Route25AfterBattleText7:: - text "Drat!" - line "A ZUBAT bit me" - cont "back in there." - done - -_Route25BattleText8:: - text "I'm off to see a" - line "#MON collector" - cont "at the cape!" - done - -_Route25EndBattleText8:: - text "You" - line "got me." - prompt - -_Route25AfterBattleText8:: - text "The collector has" - line "many rare kinds" - cont "of #MON." - done - -_Route25BattleText9:: - text "You're going to" - line "see BILL? First," - cont "let's fight!" - done - -_Route25EndBattleText9:: - text "You're" - line "something." - prompt - -_Route25AfterBattleText9:: - text "The trail below" - line "is a shortcut to" - cont "CERULEAN CITY." - done - -_Route25Text11:: - text "SEA COTTAGE" - line "BILL lives here!" - done diff --git a/text/maps/route_2_gate.asm b/text/maps/route_2_gate.asm deleted file mode 100644 index 566830f8..00000000 --- a/text/maps/route_2_gate.asm +++ /dev/null @@ -1,12 +0,0 @@ -_Route2GateText_5d616:: - text "The HM FLASH" - line "lights even the" - cont "darkest dungeons." - done - -_Route2GateText2:: - text "Once a #MON" - line "learns FLASH, you" - cont "can get through" - cont "ROCK TUNNEL." - done diff --git a/text/maps/route_2_house.asm b/text/maps/route_2_house.asm deleted file mode 100644 index 46fc1062..00000000 --- a/text/maps/route_2_house.asm +++ /dev/null @@ -1,6 +0,0 @@ -_Route2HouseText1:: - text "A fainted #MON" - line "can't fight. But, " - cont "it can still use " - cont "moves like CUT!" - done diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm deleted file mode 100644 index 966a0786..00000000 --- a/text/maps/route_3.asm +++ /dev/null @@ -1,145 +0,0 @@ -_Route3Text1:: - text "Whew... I better" - line "take a rest..." - cont "Groan..." - - para "That tunnel from" - line "CERULEAN takes a" - cont "lot out of you!" - done - -_Route3BattleText1:: - text "Hey! I met you in" - line "VIRIDIAN FOREST!" - done - -_Route3EndBattleText1:: - text "You" - line "beat me again!" - prompt - -_Route3AfterBattleText1:: - text "There are other" - line "kinds of #MON" - cont "than those found" - cont "in the forest!" - done - -_Route3BattleText2:: - text "Hi! I like shorts!" - line "They're comfy and" - cont "easy to wear!" - done - -_Route3EndBattleText2:: - text "I don't" - line "believe it!" - prompt - -_Route3AfterBattleText2:: - text "Are you storing" - line "your #MON on" - cont "PC? Each BOX can" - cont "hold 20 #MON!" - done - -_Route3BattleText3:: - text "You looked at me," - line "didn't you?" - done - -_Route3EndBattleText3:: - text "You're" - line "mean!" - prompt - -_Route3AfterBattleText3:: - text "Quit staring if" - line "you don't want to" - cont "fight!" - done - -_Route3BattleText4:: - text "Are you a trainer?" - line "Let's fight!" - done - -_Route3EndBattleText4:: - text "If I" - line "had new #MON I" - cont "would've won!" - prompt - -_Route3AfterBattleText4:: - text "If a #MON BOX" - line "on the PC gets" - cont "full, just switch" - cont "to another BOX!" - done - -_Route3BattleText5:: - text "That look you" - line "gave me, it's so" - cont "intriguing!" - done - -_Route3EndBattleText5:: - text "Be nice!" - prompt - -_Route3AfterBattleText5:: - text "Avoid fights by" - line "not letting" - cont "people see you!" - done - -_Route3BattleText6:: - text "Hey! You're not" - line "wearing shorts!" - done - -_Route3EndBattleText6:: - text "Lost!" - line "Lost! Lost!" - prompt - -_Route3AfterBattleText6:: - text "I always wear" - line "shorts, even in" - cont "winter!" - done - -_Route3BattleText7:: - text "You can fight my" - line "new #MON!" - done - -_Route3EndBattleText7:: - text "Done" - line "like dinner!" - prompt - -_Route3AfterBattleText7:: - text "Trained #MON" - line "are stronger than" - cont "the wild ones!" - done - -_Route3BattleText8:: - text "Eek! Did you" - line "touch me?" - done - -_Route3EndBattleText8:: - text "That's it?" - prompt - -_Route3AfterBattleText8:: - text "ROUTE 4 is at the" - line "foot of MT.MOON." - done - -_Route3Text10:: - text "ROUTE 3" - line "MT.MOON AHEAD" - done diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm deleted file mode 100644 index 0a36f4cd..00000000 --- a/text/maps/route_4.asm +++ /dev/null @@ -1,35 +0,0 @@ -_Route4Text1:: - text "Ouch! I tripped" - line "over a rocky" - cont "#MON, GEODUDE!" - done - -_Route4BattleText1:: - text "I came to get my" - line "mushroom #MON!" - done - -_Route4EndBattleText1:: - text "Oh! My cute" - line "mushroom #MON!" - prompt - -_Route4AfterBattleText1:: - text "There might not" - line "be any more" - cont "mushrooms here." - - para "I think I got" - line "them all." - done - -_Route4Text5:: - text "MT.MOON" - line "Tunnel Entrance" - done - -_Route4Text6:: - text "ROUTE 4" - line "MT.MOON -" - cont "CERULEAN CITY" - done diff --git a/text/maps/route_5.asm b/text/maps/route_5.asm deleted file mode 100644 index 54ff0f84..00000000 --- a/text/maps/route_5.asm +++ /dev/null @@ -1,5 +0,0 @@ -_Route5Text1:: - text "UNDERGROUND PATH" - line "CERULEAN CITY -" - cont "VERMILION CITY" - done diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm deleted file mode 100644 index c48b5d3d..00000000 --- a/text/maps/route_6.asm +++ /dev/null @@ -1,97 +0,0 @@ -_Route6BattleText1:: - text "Who's there?" - line "Quit listening in" - cont "on us!" - done - -_Route6EndBattleText1:: - text "I" - line "just can't win!" - prompt - -_Route6AfterBattleText1:: - text "Whisper..." - line "whisper..." - done - -_Route6BattleText2:: - text "Excuse me! This" - line "is a private" - cont "conversation!" - done - -_Route6EndBattleText2:: - text "Ugh!" - line "I hate losing!" - prompt - -_Route6BattleText3:: - text "There aren't many" - line "bugs out here." - done - -_Route6EndBattleText3:: - text "No!" - line "You're kidding!" - prompt - -_Route6AfterBattleText3:: - text "I like bugs, so" - line "I'm going back to" - cont "VIRIDIAN FOREST." - done - -_Route6BattleText4:: - text "Huh? You want" - line "to talk to me?" - done - -_Route6EndBattleText4:: - text "I" - line "didn't start it!" - prompt - -_Route6AfterBattleText4:: - text "I should carry" - line "more #MON with" - cont "me for safety." - done - -_Route6BattleText5:: - text "Me? Well, OK." - line "I'll play!" - done - -_Route6EndBattleText5:: - text "Just" - line "didn't work!" - prompt - -_Route6AfterBattleText5:: - text "I want to get" - line "stronger! What's" - cont "your secret?" - done - -_Route6BattleText6:: - text "I've never seen" - line "you around!" - cont "Are you good?" - done - -_Route6EndBattleText6:: - text "You" - line "are too good!" - prompt - -_Route6AfterBattleText6:: - text "Are my #MON" - line "weak? Or, am I" - cont "just bad?" - done - -_Route6Text7:: - text "UNDERGROUND PATH" - line "CERULEAN CITY -" - cont "VERMILION CITY" - done diff --git a/text/maps/route_7.asm b/text/maps/route_7.asm deleted file mode 100644 index 6500be96..00000000 --- a/text/maps/route_7.asm +++ /dev/null @@ -1,5 +0,0 @@ -_Route7Text1:: - text "UNDERGROUND PATH" - line "CELADON CITY -" - cont "LAVENDER TOWN" - done diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm deleted file mode 100644 index 57a9a5f9..00000000 --- a/text/maps/route_8.asm +++ /dev/null @@ -1,154 +0,0 @@ -_Route8BattleText1:: - text "You look good at" - line "#MON, but" - cont "how's your chem?" - done - -_Route8EndBattleText1:: - text "Ow!" - line "Meltdown!" - prompt - -_Route8AfterBattleText1:: - text "I am better at" - line "school than this!" - done - -_Route8BattleText2:: - text "All right! Let's" - line "roll the dice!" - done - -_Route8EndBattleText2:: - text "Drat!" - line "Came up short!" - prompt - -_Route8AfterBattleText2:: - text "Lady Luck's not" - line "with me today!" - done - -_Route8BattleText3:: - text "You need strategy" - line "to win at this!" - done - -_Route8EndBattleText3:: - text "It's" - line "not logical!" - prompt - -_Route8AfterBattleText3:: - text "Go with GRIMER" - line "first...and..." - cont "...and...then..." - done - -_Route8BattleText4:: - text "I like NIDORAN, so" - line "I collect them!" - done - -_Route8EndBattleText4:: - text "Why? Why??" - prompt - -_Route8AfterBattleText4:: - text "When #MON grow" - line "up they get ugly!" - cont "They shouldn't" - cont "evolve!" - done - -_Route8BattleText5:: - text "School is fun, but" - line "so are #MON." - done - -_Route8EndBattleText5:: - text "I'll" - line "stay with school." - prompt - -_Route8AfterBattleText5:: - text "We're stuck here" - line "because of the" - cont "gates at SAFFRON." - done - -_Route8BattleText6:: - text "MEOWTH is so cute," - line "meow, meow, meow!" - done - -_Route8EndBattleText6:: - text "Meow!" - prompt - -_Route8AfterBattleText6:: - text "I think PIDGEY" - line "and RATTATA" - cont "are cute too!" - done - -_Route8BattleText7:: - text "We must look" - line "silly standing" - cont "here like this!" - done - -_Route8EndBattleText7:: - text "Look what" - line "you did!" - prompt - -_Route8AfterBattleText7:: - text "SAFFRON's gate" - line "keeper won't let" - cont "us through." - cont "He's so mean!" - done - -_Route8BattleText8:: - text "I'm a rambling," - line "gambling dude!" - done - -_Route8EndBattleText8:: - text "Missed" - line "the big score!" - prompt - -_Route8AfterBattleText8:: - text "Gambling and" - line "#MON are like" - cont "eating peanuts!" - cont "Just can't stop!" - done - -_Route8BattleText9:: - text "What's a cute," - line "round and fluffy" - cont "#MON?" - done - -_Route8EndBattleText9:: - text "Stop!" - - para "Don't be so mean" - line "to my CLEFAIRY!" - prompt - -_Route8AfterBattleText9:: - text "I heard that" - line "CLEFAIRY evolves" - cont "when it's exposed" - cont "to a MOON STONE." - done - -_Route8Text10:: - text "UNDERGROUND PATH" - line "CELADON CITY -" - cont "LAVENDER TOWN" - done diff --git a/text/maps/route_9.asm b/text/maps/route_9.asm deleted file mode 100644 index 9975000d..00000000 --- a/text/maps/route_9.asm +++ /dev/null @@ -1,157 +0,0 @@ -_Route9BattleText1:: - text "You have #MON" - line "with you!" - cont "You're mine!" - done - -_Route9EndBattleText1:: - text "You" - line "deceived me!" - prompt - -_Route9AfterBattleText1:: - text "You need light to" - line "get through that" - cont "dark tunnel ahead." - done - -_Route9BattleText2:: - text "Who's that walking" - line "with those good" - cont "looking #MON?" - done - -_Route9EndBattleText2:: - text "Out" - line "like a light!" - prompt - -_Route9AfterBattleText2:: - text "Keep walking!" - done - -_Route9BattleText3:: - text "I'm taking ROCK" - line "TUNNEL to go to" - cont "LAVENDER..." - done - -_Route9EndBattleText3:: - text "Can't" - line "measure up!" - prompt - -_Route9AfterBattleText3:: - text "Are you off to" - line "ROCK TUNNEL too?" - done - -_Route9BattleText4:: - text "Don't you dare" - line "condescend me!" - done - -_Route9EndBattleText4:: - text "No!" - line "You're too much!" - prompt - -_Route9AfterBattleText4:: - text "You're obviously" - line "talented! Good" - cont "luck to you!" - done - -_Route9BattleText5:: - text "Bwahaha!" - line "Great! I was" - cont "bored, eh!" - done - -_Route9EndBattleText5:: - text "Keep it" - line "coming, eh!" - - para "Oh wait. I'm out" - line "of #MON!" - prompt - -_Route9AfterBattleText5:: - text "You sure had guts" - line "standing up to me" - cont "there, eh?" - done - -_Route9BattleText6:: - text "Hahaha!" - line "Aren't you a" - cont "little toughie!" - done - -_Route9EndBattleText6:: - text "What's" - line "that?" - prompt - -_Route9AfterBattleText6:: - text "Hahaha! Kids" - line "should be tough!" - done - -_Route9BattleText7:: - text "I got up early" - line "every day to" - cont "raise my #MON" - cont "from cocoons!" - done - -_Route9EndBattleText7:: - text "WHAT?" - - para "What a total" - line "waste of time!" - prompt - -_Route9AfterBattleText7:: - text "I have to collect" - line "more than bugs to" - cont "get stronger..." - done - -_Route9BattleText8:: - text "Hahahaha!" - line "Come on, dude!" - done - -_Route9EndBattleText8:: - text "Hahahaha!" - line "You beat me fair!" - prompt - -_Route9AfterBattleText8:: - text "Hahahaha!" - line "Us hearty guys" - cont "always laugh!" - done - -_Route9BattleText9:: - text "Go, my super bug" - line "#MON!" - done - -_Route9EndBattleText9:: - text "My" - line "bugs..." - prompt - -_Route9AfterBattleText9:: - text "If you don't like" - line "bug #MON, you" - cont "bug me!" - done - -_Route9Text11:: - text "ROUTE 9" - line "CERULEAN CITY-" - cont "ROCK TUNNEL" - done diff --git a/text/maps/safari_zone_center.asm b/text/maps/safari_zone_center.asm deleted file mode 100644 index 09918f93..00000000 --- a/text/maps/safari_zone_center.asm +++ /dev/null @@ -1,11 +0,0 @@ -_SafariZoneCenterText2:: - text "REST HOUSE" - done - -_SafariZoneCenterText3:: - text "TRAINER TIPS" - - para "Press the START" - line "Button to check" - cont "remaining time!" - done diff --git a/text/maps/safari_zone_east.asm b/text/maps/safari_zone_east.asm deleted file mode 100644 index eebe5de7..00000000 --- a/text/maps/safari_zone_east.asm +++ /dev/null @@ -1,16 +0,0 @@ -_SafariZoneEastText5:: - text "REST HOUSE" - done - -_SafariZoneEastText6:: - text "TRAINER TIPS" - - para "The remaining time" - line "declines only" - cont "while you walk!" - done - -_SafariZoneEastText7:: - text "CENTER AREA" - line "NORTH: AREA 2" - done diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm deleted file mode 100644 index dcc1fd9b..00000000 --- a/text/maps/safari_zone_entrance.asm +++ /dev/null @@ -1,93 +0,0 @@ -_SafariZoneEntranceText1:: - text "Welcome to the" - line "SAFARI ZONE!" - done - -SafariZoneEntranceText_9e6e4:: - text "For just ¥500," - line "you can catch all" - cont "the #MON you" - cont "want in the park!" - - para "Would you like to" - line "join the hunt?@@" - -SafariZoneEntranceText_9e747:: - text "That'll be ¥500" - line "please!" - - para "We only use a" - line "special # BALL" - cont "here." - - para " received" - line "30 SAFARI BALLs!@@" - -_SafariZoneEntranceText_75360:: - db $0 - para "We'll call you on" - line "the PA when you" - cont "run out of time" - cont "or SAFARI BALLs!" - done - -_SafariZoneEntranceText_75365:: - text "OK! Please come" - line "again!" - done - -_SafariZoneEntranceText_7536a:: - text "Oops! Not enough" - line "money!" - done - -SafariZoneEntranceText_9e814:: - text "Leaving early?@@" - -_SafariZoneEntranceText_753bb:: - text "Please return any" - line "SAFARI BALLs you" - cont "have left." - done - -_SafariZoneEntranceText_753c0:: - text "Good Luck!" - done - -_SafariZoneEntranceText_753c5:: - text "Did you get a" - line "good haul?" - cont "Come again!" - done - -_SafariZoneEntranceText_753e6:: - text "Hi! Is it your" - line "first time here?" - done - -_SafariZoneEntranceText_753eb:: - text "SAFARI ZONE has 4" - line "zones in it." - - para "Each zone has" - line "different kinds" - cont "of #MON. Use" - cont "SAFARI BALLs to" - cont "catch them!" - - para "When you run out" - line "of time or SAFARI" - cont "BALLs, it's game" - cont "over for you!" - - para "Before you go," - line "open an unused" - cont "#MON BOX so" - cont "there's room for" - cont "new #MON!" - done - -_SafariZoneEntranceText_753f0:: - text "Sorry, you're a" - line "regular here!" - done diff --git a/text/maps/safari_zone_north.asm b/text/maps/safari_zone_north.asm deleted file mode 100644 index 1e148f0b..00000000 --- a/text/maps/safari_zone_north.asm +++ /dev/null @@ -1,33 +0,0 @@ -_SafariZoneNorthText3:: - text "REST HOUSE" - done - -_SafariZoneNorthText4:: - text "TRAINER TIPS" - - para "The SECRET HOUSE" - line "is still ahead!" - done - -_SafariZoneNorthText5:: - text "AREA 2" - done - -_SafariZoneNorthText6:: - text "TRAINER TIPS" - - para "#MON hide in" - line "tall grass!" - - para "Zigzag through" - line "grassy areas to" - cont "flush them out." - done - -_SafariZoneNorthText7:: - text "TRAINER TIPS" - - para "Win a free HM for" - line "finding the" - cont "SECRET HOUSE!" - done diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/safari_zone_rest_house_1.asm deleted file mode 100644 index b6c87818..00000000 --- a/text/maps/safari_zone_rest_house_1.asm +++ /dev/null @@ -1,11 +0,0 @@ -_SafariZoneRestHouse1Text1:: - text "SARA: Where did" - line "my boy friend," - cont "ERIK, go?" - done - -_SafariZoneRestHouse1Text2:: - text "I'm catching" - line "#MON to take" - cont "home as gifts!" - done diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/safari_zone_rest_house_2.asm deleted file mode 100644 index 94802b13..00000000 --- a/text/maps/safari_zone_rest_house_2.asm +++ /dev/null @@ -1,19 +0,0 @@ -_SafariZoneRestHouse2Text1:: - text "Tossing ROCKs at" - line "#MON might" - cont "make them run," - cont "but they'll be" - cont "easier to catch." - done - -_SafariZoneRestHouse2Text2:: - text "Using BAIT will" - line "make #MON" - cont "easier to catch." - done - -_SafariZoneRestHouse2Text3:: - text "I hiked a lot, but" - line "I didn't see any" - cont "#MON I wanted." - done diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/safari_zone_rest_house_3.asm deleted file mode 100644 index d5f7abc8..00000000 --- a/text/maps/safari_zone_rest_house_3.asm +++ /dev/null @@ -1,18 +0,0 @@ -_SafariZoneRestHouse3Text1:: - text "How many did you" - line "catch? I'm bushed" - cont "from the work!" - done - -_SafariZoneRestHouse3Text2:: - text "I caught a" - line "CHANSEY!" - - para "That makes this" - line "all worthwhile!" - done - -_SafariZoneRestHouse3Text3:: - text "Whew! I'm tired" - line "from all the fun!" - done diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/safari_zone_rest_house_4.asm deleted file mode 100644 index 93f02c8f..00000000 --- a/text/maps/safari_zone_rest_house_4.asm +++ /dev/null @@ -1,27 +0,0 @@ -_SafariZoneRestHouse4Text1:: - text "You can keep any" - line "item you find on" - cont "the ground here." - - para "But, you'll run" - line "out of time if" - cont "you try for all" - cont "of them at once!" - done - -_SafariZoneRestHouse4Text2:: - text "Go to the deepest" - line "part of the" - cont "SAFARI ZONE. You" - cont "will win a prize!" - done - -_SafariZoneRestHouse4Text3:: - text "My EEVEE evolved" - line "into FLAREON!" - - para "But, a friend's" - line "EEVEE turned into" - cont "a VAPOREON!" - cont "I wonder why?" - done diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm deleted file mode 100644 index 3df79d90..00000000 --- a/text/maps/safari_zone_secret_house.asm +++ /dev/null @@ -1,44 +0,0 @@ -_SecretHouseText_4a350:: - text "Ah! Finally!" - - para "You're the first" - line "person to reach" - cont "the SECRET HOUSE!" - - para "I was getting" - line "worried that no" - cont "one would win our" - cont "campaign prize." - - para "Congratulations!" - line "You have won!" - prompt - -_ReceivedHM03Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_HM03ExplanationText:: - text "HM03 is SURF!" - - para "#MON will be" - line "able to ferry you" - cont "across water!" - - para "And, this HM isn't" - line "disposable! You" - cont "can use it over" - cont "and over!" - - para "You're super lucky" - line "for winning this" - cont "fabulous prize!" - done - -_HM03NoRoomText:: - text "You don't have" - line "room for this" - cont "fabulous prize!" - done diff --git a/text/maps/safari_zone_west.asm b/text/maps/safari_zone_west.asm deleted file mode 100644 index dcb2fe6c..00000000 --- a/text/maps/safari_zone_west.asm +++ /dev/null @@ -1,31 +0,0 @@ -_SafariZoneWestText5:: - text "REST HOUSE" - done - -_SafariZoneWestText6:: - text "REQUEST NOTICE" - - para "Please find the" - line "SAFARI WARDEN's" - cont "lost GOLD TEETH." - cont "They're around" - cont "here somewhere." - - para "Reward offered!" - line "Contact: WARDEN" - done - -_SafariZoneWestText7:: - text "TRAINER TIPS" - - para "Zone Exploration" - line "Campaign!" - - para "The Search for" - line "the SECRET HOUSE!" - done - -_SafariZoneWestText8:: - text "AREA 3" - line "EAST: CENTER AREA" - done diff --git a/text/maps/saffron_city.asm b/text/maps/saffron_city.asm deleted file mode 100644 index a0422c8c..00000000 --- a/text/maps/saffron_city.asm +++ /dev/null @@ -1,151 +0,0 @@ -_SaffronCityText1:: - text "What do you want?" - line "Get lost!" - done - -_SaffronCityText2:: - text "BOSS said he'll" - line "take this town!" - done - -_SaffronCityText3:: - text "Get out of the" - line "way!" - done - -_SaffronCityText4:: - text "SAFFRON belongs" - line "to TEAM ROCKET!" - done - -_SaffronCityText5:: - text "Being evil makes" - line "me feel so alive!" - done - -_SaffronCityText6:: - text "Ow! Watch where" - line "you're walking!" - done - -_SaffronCityText7:: - text "With SILPH under" - line "control, we can" - cont "exploit #MON" - cont "around the world!" - done - -_SaffronCityText8:: - text "You beat TEAM" - line "ROCKET all alone?" - cont "That's amazing!" - done - -_SaffronCityText9:: - text "Yeah! TEAM ROCKET" - line "is gone!" - cont "It's safe to go" - cont "out again!" - done - -_SaffronCityText10:: - text "People should be" - line "flocking back to" - cont "SAFFRON now." - done - -_SaffronCityText11:: - text "I flew here on my" - line "PIDGEOT when I" - cont "read about SILPH." - - para "It's already over?" - line "I missed the" - cont "media action." - done - -_SaffronCityText12:: - text "PIDGEOT: Bi bibii!@@" - -_SaffronCityText13:: - text "I saw ROCKET" - line "BOSS escaping" - cont "SILPH's building." - done - -_SaffronCityText14:: - text "I'm a security" - line "guard." - - para "Suspicious kids I" - line "don't allow in!" - done - -_SaffronCityText15:: - text "..." - line "Snore..." - - para "Hah! He's taking" - line "a snooze!" - done - -_SaffronCityText16:: - text "SAFFRON CITY" - line "Shining, Golden" - cont "Land of Commerce" - done - -_SaffronCityText17:: - text "FIGHTING DOJO" - done - -_SaffronCityText18:: - text "SAFFRON CITY" - line "#MON GYM" - cont "LEADER: SABRINA" - - para "The Master of" - line "Psychic #MON!" - done - -_SaffronCityText20:: - text "TRAINER TIPS" - - para "FULL HEAL cures" - line "all ailments like" - cont "sleep and burns." - - para "It costs a bit" - line "more, but it's" - cont "more convenient." - done - -_SaffronCityText21:: - text "TRAINER TIPS" - - para "New GREAT BALL" - line "offers improved" - cont "capture rates." - - para "Try it on those" - line "hard-to-catch" - cont "#MON." - done - -_SaffronCityText22:: - text "SILPH CO." - line "OFFICE BUILDING" - done - -_SaffronCityText24:: - text "MR.PSYCHIC's" - line "HOUSE" - done - -_SaffronCityText25:: - text "SILPH's latest" - line "product!" - - para "Release to be" - line "determined..." - done diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm deleted file mode 100644 index c16e880e..00000000 --- a/text/maps/saffron_gates.asm +++ /dev/null @@ -1,36 +0,0 @@ -_SaffronGateText_1dfe7:: - text "I'm on guard duty." - line "Gee, I'm thirsty," - cont "though!" - - para "Oh wait there," - line "the road's closed." - done - -_SaffronGateText_8aaa9:: - text "Whoa, boy!" - line "I'm parched!" - cont "..." - cont "Huh? I can have" - cont "this drink?" - cont "Gee, thanks!@@" - -_SaffronGateText_1dff1:: - db $0 - para "..." - line "Glug glug..." - cont "..." - cont "Gulp..." - cont "If you want to go" - cont "to SAFFRON CITY..." - cont "..." - cont "You can go on" - cont "through. I'll" - cont "share this with" - cont "the other guards!" - done - -_SaffronGateText_1dff6:: - text "Hi, thanks for" - line "the cool drinks!" - done diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm deleted file mode 100644 index 419b56ac..00000000 --- a/text/maps/saffron_gym.asm +++ /dev/null @@ -1,236 +0,0 @@ -_SaffronGymText_5d162:: - text "I had a vision of" - line "your arrival!" - - para "I have had psychic" - line "powers since I" - cont "was a child." - - para "I first learned" - line "to bend spoons" - cont "with my mind." - - para "I dislike fight-" - line "ing, but if you" - cont "wish, I will show" - cont "you my powers!" - done - -_SaffronGymText_5d167:: - text "I'm" - line "shocked!" - cont "But, a loss is a" - cont "loss." - - para "I admit I didn't" - line "work hard enough" - cont "to win!" - - para "You earned the" - line "MARSHBADGE!@@" - -_SaffronGymText_5d16e:: - text "Everyone has" - line "psychic power!" - cont "People just don't" - cont "realize it!" - done - -_SaffronGymText_5d173:: - text "The MARSHBADGE" - line "makes #MON up" - cont "to L70 obey you!" - - para "Stronger #MON" - line "will become wild," - cont "ignoring your" - cont "orders in battle!" - - para "Just don't raise" - line "your #MON too" - cont "much!" - - para "Wait, please take" - line "this TM with you!" - done - -ReceivedTM46Text:: - text " received" - line "TM46!@@" - -_TM46ExplanationText:: - db $0 - para "TM46 is PSYWAVE!" - line "It uses powerful" - cont "psychic waves to" - cont "inflict damage!" - done - -_TM46NoRoomText:: - text "Your pack is full" - line "of other items!" - done - -_SaffronGymText_5d1e6:: - text "Yo! Champ in" - line "making!" - - para "SABRINA's #MON" - line "use psychic power" - cont "instead of force!" - - para "Fighting #MON" - line "are weak against" - cont "psychic #MON!" - - para "They get creamed" - line "before they can" - cont "even aim a punch!" - done - -_SaffronGymText_5d1eb:: - text "Psychic power," - line "huh?" - - para "If I had that," - line "I'd make a bundle" - cont "at the slots!" - done - -_SaffronGymBattleText1:: - text "SABRINA is younger" - line "than I, but I" - cont "respect her!" - done - -_SaffronGymEndBattleText1:: - text "Not" - line "good enough!" - prompt - -_SaffronGymAfterBattleText1:: - text "In a battle of" - line "equals, the one" - cont "with the stronger" - cont "will wins!" - - para "If you wish" - line "to beat SABRINA," - cont "focus on winning!" - done - -_SaffronGymBattleText2:: - text "Does our unseen" - line "power scare you?" - done - -_SaffronGymEndBattleText2:: - text "I never" - line "foresaw this!" - prompt - -_SaffronGymAfterBattleText2:: - text "Psychic #MON" - line "fear only ghosts" - cont "and bugs!" - done - -_SaffronGymBattleText3:: - text "#MON take on" - line "the appearance of" - cont "their trainers." - - para "Your #MON must" - line "be tough, then!" - done - -_SaffronGymEndBattleText3:: - text "I knew" - line "it!" - prompt - -_SaffronGymAfterBattleText3:: - text "I must teach" - line "better techniques" - cont "to my #MON!" - done - -_SaffronGymBattleText4:: - text "You know that" - line "power alone isn't" - cont "enough!" - done - -_SaffronGymEndBattleText4:: - text "I don't" - line "believe this!" - prompt - -_SaffronGymAfterBattleText4:: - text "SABRINA just wiped" - line "out the KARATE" - cont "MASTER next door!" - done - -_SaffronGymBattleText5:: - text "You and I, our" - line "#MON shall" - cont "fight!" - done - -_SaffronGymEndBattleText5:: - text "I lost" - line "after all!" - prompt - -_SaffronGymAfterBattleText5:: - text "I knew that this" - line "was going to take" - cont "place." - done - -_SaffronGymBattleText6:: - text "SABRINA is young," - line "but she's also" - cont "our LEADER!" - - para "You won't reach" - line "her easily!" - done - -_SaffronGymEndBattleText6:: - text "I lost" - line "my concentration!" - prompt - -_SaffronGymAfterBattleText6:: - text "There used to be" - line "2 #MON GYMs in" - cont "SAFFRON." - - para "The FIGHTING DOJO" - line "next door lost" - cont "its GYM status" - cont "when we went and" - cont "creamed them!" - done - -_SaffronGymBattleText7:: - text "SAFFRON #MON" - line "GYM is famous for" - cont "its psychics!" - - para "You want to see" - line "SABRINA!" - cont "I can tell!" - done - -_SaffronGymEndBattleText7:: - text "Arrrgh!" - prompt - -_SaffronGymAfterBattleText7:: - text "That's right! I" - line "used telepathy to" - cont "read your mind!" - done diff --git a/text/maps/saffron_house.asm b/text/maps/saffron_house.asm deleted file mode 100644 index 214bf089..00000000 --- a/text/maps/saffron_house.asm +++ /dev/null @@ -1,26 +0,0 @@ -_SaffronHouse1Text1:: - text "Thank you for" - line "writing. I hope" - cont "to see you soon!" - - para "Hey! Don't look" - line "at my letter!" - done - -_SaffronHouse1Text2:: - text "PIDGEY: Kurukkoo!@@" - -_SaffronHouse1Text3:: - text "The COPYCAT is" - line "cute! I'm getting" - cont "her a # DOLL!" - done - -_SaffronHouse1Text4:: - text "I was given a PP" - line "UP as a gift." - - para "It's used for" - line "increasing the PP" - cont "of techniques!" - done diff --git a/text/maps/saffron_mart.asm b/text/maps/saffron_mart.asm deleted file mode 100644 index a43b0d94..00000000 --- a/text/maps/saffron_mart.asm +++ /dev/null @@ -1,13 +0,0 @@ -_SaffronMartText2:: - text "MAX REPEL lasts" - line "longer than SUPER" - cont "REPEL for keeping" - cont "weaker #MON" - cont "away!" - done - -_SaffronMartText3:: - text "REVIVE is costly," - line "but it revives" - cont "fainted #MON!" - done diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm deleted file mode 100644 index 6548aff8..00000000 --- a/text/maps/saffron_pokecenter.asm +++ /dev/null @@ -1,12 +0,0 @@ -_SaffronPokecenterText2:: - text "#MON growth" - line "rates differ from" - cont "specie to specie." - done - -_SaffronPokecenterText3:: - text "SILPH CO. is very" - line "famous. That's" - cont "why it attracted" - cont "TEAM ROCKET!" - done diff --git a/text/maps/school.asm b/text/maps/school.asm deleted file mode 100644 index f6041e0d..00000000 --- a/text/maps/school.asm +++ /dev/null @@ -1,13 +0,0 @@ -_SchoolText1:: - text "Whew! I'm trying" - line "to memorize all" - cont "my notes." - done - -_SchoolText2:: - text "Okay!" - - para "Be sure to read" - line "the blackboard" - cont "carefully!" - done diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm deleted file mode 100644 index 608d165f..00000000 --- a/text/maps/seafoam_islands_b4f.asm +++ /dev/null @@ -1,13 +0,0 @@ -_ArticunoBattleText:: - text "Gyaoo!@@" - -_SeafoamIslands5Text4:: - text "Boulders might" - line "change the flow" - cont "of water!" - done - -_SeafoamIslands5Text5:: - text "DANGER" - line "Fast current!" - done diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm deleted file mode 100644 index e916c64a..00000000 --- a/text/maps/silph_co_10f.asm +++ /dev/null @@ -1,42 +0,0 @@ -_SilphCo10Text_5a1d3:: - text "Waaaaa!" - cont "I'm scared!" - done - -_SilphCo10Text_5a1d8:: - text "Please keep quiet" - line "about my crying!" - done - -_SilphCo10BattleText1:: - text "Welcome to the" - line "10F! So good of" - cont "you to join me!" - done - -_SilphCo10EndBattleText1:: - text "I'm" - line "stunned!" - prompt - -_SilphCo10AfterBattleText1:: - text "Nice try, but the" - line "boardroom is up" - cont "one more floor!" - done - -_SilphCo10BattleText2:: - text "Enough of your" - line "silly games!" - done - -_SilphCo10EndBattleText2:: - text "No" - line "continues left!" - prompt - -_SilphCo10AfterBattleText2:: - text "Are you satisfied" - line "with beating me?" - cont "Then go on home!" - done diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm deleted file mode 100644 index fbaa6086..00000000 --- a/text/maps/silph_co_11f.asm +++ /dev/null @@ -1,134 +0,0 @@ -_SilphCoPresidentText:: - text "PRESIDENT: Thank" - line "you for saving" - cont "SILPH!" - - para "I will never" - line "forget you saved" - cont "us in our moment" - cont "of peril!" - - para "I have to thank" - line "you in some way!" - - para "Because I am rich," - line "I can give you" - cont "anything!" - - para "Here, maybe this" - line "will do!" - prompt - -_ReceivedSilphCoMasterBallText:: - text " got a" - line "@" - TX_RAM wcf4b - text "!@@" - -_SilphCo10Text_6231c:: - text "PRESIDENT: You" - line "can't buy that" - cont "anywhere!" - - para "It's our secret" - line "prototype MASTER" - cont "BALL!" - - para "It will catch any" - line "#MON without" - cont "fail!" - - para "You should be" - line "quiet about using" - cont "it, though." - done - -_SilphCoMasterBallNoRoomText:: - text "You have no" - line "room for this." - done - -_SilphCo11Text2:: - text "SECRETARY: Thank" - line "you for rescuing" - cont "all of us!" - - para "We admire your" - line "courage." - done - -_SilphCo11Text3:: - text "Ah !" - line "So we meet again!" - - para "The PRESIDENT and" - line "I are discussing" - cont "a vital business" - cont "proposition." - - para "Keep your nose" - line "out of grown-up" - cont "matters..." - - para "Or, experience a" - line "world of pain!" - done - -_SilphCo10Text_62330:: - text "Arrgh!!" - line "I lost again!?" - prompt - -_SilphCo10Text_62335:: - text "Blast it all!" - line "You ruined our" - cont "plans for SILPH!" - - para "But, TEAM ROCKET" - line "will never fall!" - - para "! Never" - line "forget that all" - cont "#MON exist" - cont "for TEAM ROCKET!" - - para "I must go, but I" - line "shall return!" - done - -_SilphCo11BattleText1:: - text "Stop right there!" - line "Don't you move!" - done - -_SilphCo11EndBattleText1:: - text "Don't..." - line "Please!" - prompt - -_SilphCo11AfterBattleText1:: - text "So, you want to" - line "see my BOSS?" - done - -_SilphCo11BattleText2:: - text "Halt! Do you have" - line "an appointment" - cont "with my BOSS?" - done - -_SilphCo11EndBattleText2:: - text "Gaah!" - line "Demolished!" - prompt - -_SilphCo11AfterBattleText2:: - text "Watch your step," - line "my BOSS likes his" - cont "#MON tough!" - done - -_SilphCo10Text_6237b:: - text "The monitor has" - line "#MON on it!" - done diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm deleted file mode 100644 index 1ef80189..00000000 --- a/text/maps/silph_co_1f.asm +++ /dev/null @@ -1,7 +0,0 @@ -_SilphCo1Text1:: - text "Welcome!" - - para "The PRESIDENT is" - line "in the boardroom" - cont "on 11F!" - done diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm deleted file mode 100644 index bd87630a..00000000 --- a/text/maps/silph_co_2f.asm +++ /dev/null @@ -1,96 +0,0 @@ -_SilphCo2Text_59ded:: - text "Eeek!" - line "No! Stop! Help!" - - para "Oh, you're not" - line "with TEAM ROCKET." - cont "I thought..." - cont "I'm sorry. Here," - cont "please take this!" - prompt - -_ReceivedTM36Text:: - text " got" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM36ExplanationText:: - text "TM36 is" - line "SELFDESTRUCT!" - - para "It's powerful, but" - line "the #MON that" - cont "uses it faints!" - cont "Be careful." - done - -_TM36NoRoomText:: - text "You don't have any" - line "room for this." - done - -_SilphCo2BattleText1:: - text "Help! I'm a SILPH" - line "employee." - done - -_SilphCo2EndBattleText1:: - text "How" - line "did you know I" - cont "was a ROCKET?" - prompt - -_SilphCo2AfterBattleText1:: - text "I work for both" - line "SILPH and TEAM" - cont "ROCKET!" - done - -_SilphCo2BattleText2:: - text "It's off limits" - line "here! Go home!" - done - -_SilphCo2EndBattleText2:: - text "You're" - line "good." - prompt - -_SilphCo2AfterBattleText2:: - text "Can you solve the" - line "maze in here?" - done - -_SilphCo2BattleText3:: - text "No kids are" - line "allowed in here!" - done - -_SilphCo2EndBattleText3:: - text "Tough!" - prompt - -_SilphCo2AfterBattleText3:: - text "Diamond shaped" - line "tiles are" - cont "teleport blocks!" - - para "They're hi-tech" - line "transporters!" - done - -_SilphCo2BattleText4:: - text "Hey kid! What are" - line "you doing here?" - done - -_SilphCo2EndBattleText4:: - text "I goofed!" - prompt - -_SilphCo2AfterBattleText4:: - text "SILPH CO. will" - line "be merged with" - cont "TEAM ROCKET!" - done diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm deleted file mode 100644 index b6a023f9..00000000 --- a/text/maps/silph_co_3f.asm +++ /dev/null @@ -1,46 +0,0 @@ -_SilphCo3Text_59ff9:: - text "I work for SILPH." - line "What should I do?" - done - -_SilphCo3Text_59ffe:: - text "! You and" - line "your #MON" - cont "saved us!" - done - -_SilphCo3BattleText1:: - text "Quit messing with" - line "us, kid!" - done - -_SilphCo3EndBattleText1:: - text "I give" - line "up!" - prompt - -_SilphCo3AfterBattleText1:: - text "A hint? You can" - line "open doors with a" - cont "CARD KEY!" - done - -_SilphCo3BattleText2:: - text "I support TEAM" - line "ROCKET more than" - cont "I support SILPH!" - done - -_SilphCo3EndBattleText2:: - text "You" - line "really got me!" - prompt - -_SilphCo3AfterBattleText2:: - text "Humph..." - - para "TEAM ROCKET said" - line "that if I helped" - cont "them, they'd let" - cont "me study #MON!" - done diff --git a/text/maps/silph_co_4f.asm b/text/maps/silph_co_4f.asm deleted file mode 100644 index 5b484ec7..00000000 --- a/text/maps/silph_co_4f.asm +++ /dev/null @@ -1,56 +0,0 @@ -_SilphCo4Text_19de0:: - text "Sssh! Can't you" - line "see I'm hiding?" - done - -_SilphCo4Text_19de5:: - text "Huh? TEAM ROCKET" - line "is gone?" - done - -_SilphCo4BattleText2:: - text "TEAM ROCKET has" - line "taken command of" - cont "SILPH CO.!" - done - -_SilphCo4EndBattleText2:: - text "Arrgh!" - prompt - -_SilphCo4AfterBattleText2:: - text "Fwahahaha!" - line "My BOSS has been" - cont "after this place!" - done - -_SilphCo4BattleText3:: - text "My #MON are my" - line "loyal soldiers!" - done - -_SilphCo4EndBattleText3:: - text "Darn!" - line "You weak #MON!" - prompt - -_SilphCo4AfterBattleText3:: - text "The doors are" - line "electronically" - cont "locked! A CARD" - cont "KEY opens them!" - done - -_SilphCo4BattleText4:: - text "Intruder spotted!" - done - -_SilphCo4EndBattleText4:: - text "Who" - line "are you?" - prompt - -_SilphCo4AfterBattleText4:: - text "I better tell the" - line "BOSS on 11F!" - done diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/silph_co_5f_1.asm deleted file mode 100644 index dab42539..00000000 --- a/text/maps/silph_co_5f_1.asm +++ /dev/null @@ -1,51 +0,0 @@ -_SilphCo5Text_1a010:: - text "TEAM ROCKET is" - line "in an uproar over" - cont "some intruder." - cont "That's you right?" - done - -_SilphCo5Text_1a015:: - text "TEAM ROCKET took" - line "off! You're our" - cont "hero! Thank you!" - done - -_SilphCo5BattleText2:: - text "I heard a kid was" - line "wandering around." - done - -_SilphCo5EndBattleText2:: - text "Boom!" - prompt - -_SilphCo5AfterBattleText2:: - text "It's not smart" - line "to pick a fight" - cont "with TEAM ROCKET!" - done - -_SilphCo5BattleText3:: - text "We study #" - line "BALL technology" - cont "on this floor!" - done - -_SilphCo5EndBattleText3:: - text "Dang!" - line "Blast it!" - prompt - -_SilphCo5AfterBattleText3:: - text "We worked on the" - line "ultimate #" - cont "BALL which would" - cont "catch anything!" - done - -_SilphCo5BattleText4:: - text "Whaaat? There" - line "shouldn't be any" - cont "children here?" - done diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/silph_co_5f_2.asm deleted file mode 100644 index 3c1b8ead..00000000 --- a/text/maps/silph_co_5f_2.asm +++ /dev/null @@ -1,55 +0,0 @@ -_SilphCo5EndBattleText4:: - text "Oh" - line "goodness!" - prompt - -_SilphCo5AfterBattleText4:: - text "You're only on 5F." - line "It's a long way" - cont "to my BOSS!" - done - -_SilphCo5BattleText5:: - text "Show TEAM ROCKET" - line "a little respect!" - done - -_SilphCo5EndBattleText5:: - text "Cough..." - line "Cough..." - prompt - -_SilphCo5AfterBattleText5:: - text "Which reminds me." - - para "KOFFING evolves" - line "into WEEZING!" - done - -_SilphCo5Text9:: - text "It's a #MON" - line "REPORT!" - - para "#MON LAB" - line "created PORYGON," - cont "the first virtual" - cont "reality #MON." - done - -_SilphCo5Text10:: - text "It's a #MON" - line "REPORT!" - - para "Over 160 #MON" - line "techniques have" - cont "been confirmed." - done - -_SilphCo5Text11:: - text "It's a #MON" - line "REPORT!" - - para "4 #MON evolve" - line "only when traded" - cont "by link-cable." - done diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm deleted file mode 100644 index 90456b5c..00000000 --- a/text/maps/silph_co_6f.asm +++ /dev/null @@ -1,107 +0,0 @@ -_SilphCo6Text_1a24a:: - text "The ROCKETs came" - line "and took over the" - cont "building!" - done - -_SilphCo6Text_1a24f:: - text "Well, better get" - line "back to work!" - done - -_SilphCo6Text_1a261:: - text "Oh dear, oh dear." - line "Help me please!" - done - -_SilphCo6Text_1a266:: - text "We got engaged!" - line "Heheh!" - done - -_SilphCo6Text_1a278:: - text "Look at him! He's" - line "such a coward!" - done - -_SilphCo6Text_1a27d:: - text "I feel so sorry" - line "for him, I have" - cont "to marry him!" - done - -_SilphCo6Text_1a28f:: - text "TEAM ROCKET is" - line "trying to conquer" - cont "the world with" - cont "#MON!" - done - -_SilphCo6Text_1a294:: - text "TEAM ROCKET ran" - line "because of you!" - done - -_SilphCo6Text_1a2a6:: - text "They must have" - line "targeted SILPH" - cont "for our #MON" - cont "products." - done - -_SilphCo6Text_1a2ab:: - text "Come work for" - line "SILPH when you" - cont "get older!" - done - -_SilphCo6BattleText2:: - text "I am one of the 4" - line "ROCKET BROTHERS!" - done - -_SilphCo6EndBattleText2:: - text "Flame" - line "out!" - prompt - -_SilphCo6AfterBattleText2:: - text "No matter!" - line "My brothers will" - cont "avenge me!" - done - -_SilphCo6BattleText3:: - text "That rotten" - line "PRESIDENT!" - - para "He shouldn't have" - line "sent me to the" - cont "TIKSI BRANCH!" - done - -_SilphCo6EndBattleText3:: - text "Shoot!" - prompt - -_SilphCo6AfterBattleText3:: - text "TIKSI BRANCH?" - line "It's in Russian" - cont "no man's land!" - done - -_SilphCo6BattleText4:: - text "You dare betray" - line "TEAM ROCKET?" - done - -_SilphCo6EndBattleText4:: - text "You" - line "traitor!" - prompt - -_SilphCo6AfterBattleText4:: - text "If you stand for" - line "justice, you" - cont "betray evil!" - done diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm deleted file mode 100644 index 1cc2bc30..00000000 --- a/text/maps/silph_co_7f.asm +++ /dev/null @@ -1,209 +0,0 @@ -_MeetLaprasGuyText:: - text "Oh! Hi! You're" - line "not a ROCKET! You" - cont "came to save us?" - cont "Why, thank you!" - - para "I want you to" - line "have this #MON" - cont "for saving us." - prompt - -_HeresYourLaprasText:: - text "It's LAPRAS. It's" - line "very intelligent." - - para "We kept it in our" - line "lab, but it will" - cont "be much better" - cont "off with you!" - - para "I think you will" - line "be a good trainer" - cont "for LAPRAS!" - - para "It's a good" - line "swimmer. It'll" - cont "give you a lift!" - done - -_LaprasGuyText:: - text "TEAM ROCKET's" - line "BOSS went to the" - cont "boardroom! Is our" - cont "PRESIDENT OK?" - done - -_LaprasGuySavedText:: - text "Saved at last!" - line "Thank you!" - done - -_SilphCo7Text_51e00:: - text "TEAM ROCKET was" - line "after the MASTER" - cont "BALL which will" - cont "catch any #MON!" - done - -_CanceledMasterBallText:: - text "We canceled the" - line "MASTER BALL" - cont "project because" - cont "of TEAM ROCKET." - done - -_SilphCo7Text_51e23:: - text "It would be bad" - line "if TEAM ROCKET" - cont "took over SILPH" - cont "or our #MON!" - done - -_SilphCo7Text_51e28:: - text "Wow! You chased" - line "off TEAM ROCKET" - cont "all by yourself?" - done - -_SilphCo7Text_51e46:: - text "You! It's really" - line "dangerous here!" - cont "You came to save" - cont "me? You can't!" - done - -_SilphCo7Text_51e4b:: - text "Safe at last!" - line "Oh thank you!" - done - -_SilphCo7BattleText1:: - text "Oh ho! I smell a" - line "little rat!" - done - -_SilphCo7EndBattleText1:: - text "Lights" - line "out!" - prompt - -_SilphCo7AfterBattleText1:: - text "You won't find my" - line "BOSS by just" - cont "scurrying around!" - done - -_SilphCo7BattleText2:: - text "Heheh!" - - para "You mistook me for" - line "a SILPH worker?" - done - -_SilphCo7EndBattleText2:: - text "I'm" - line "done!" - prompt - -_SilphCo7AfterBattleText2:: - text "Despite your age," - line "you are a skilled" - cont "trainer!" - done - -_SilphCo7BattleText3:: - text "I am one of the 4" - line "ROCKET BROTHERS!" - done - -_SilphCo7EndBattleText3:: - text "Aack!" - line "Brothers, I lost!" - prompt - -_SilphCo7AfterBattleText3:: - text "Doesn't matter." - line "My brothers will" - cont "repay the favor!" - done - -_SilphCo7BattleText4:: - text "A child intruder?" - line "That must be you!" - done - -_SilphCo7EndBattleText4:: - text "Fine!" - line "I lost!" - prompt - -_SilphCo7AfterBattleText4:: - text "Go on home" - line "before my BOSS" - cont "gets ticked off!" - done - -_SilphCo7Text_51ebe:: - text ": What" - line "kept you ?" - done - -_SilphCo7Text_51ec3:: - text ": Hahaha!" - line "I thought you'd" - cont "turn up if I" - cont "waited here!" - - para "I guess TEAM" - line "ROCKET slowed you" - cont "down! Not that I" - cont "care!" - - para "I saw you in" - line "SAFFRON, so I" - cont "decided to see if" - cont "you got better!" - done - -_SilphCo7Text_51ec8:: - text "Oh ho!" - line "So, you are ready" - cont "for BOSS ROCKET!" - prompt - -_SilphCo7Text_51ecd:: - text ": How can" - line "I put this?" - - para "You're not good" - line "enough to play" - cont "with us big boys!" - prompt - -_SilphCo7Text_51ed2:: - text "Well, !" - - para "I'm moving on up" - line "and ahead!" - - para "By checking my" - line "#DEX, I'm" - cont "starting to see" - cont "what's strong and" - cont "how they evolve!" - - para "I'm going to the" - line "#MON LEAGUE" - cont "to boot out the" - cont "ELITE FOUR!" - - para "I'll become the" - line "world's most" - cont "powerful trainer!" - - para ", well" - line "good luck to you!" - cont "Don't sweat it!" - cont "Smell ya!" - done diff --git a/text/maps/silph_co_8f.asm b/text/maps/silph_co_8f.asm deleted file mode 100644 index fabae5e6..00000000 --- a/text/maps/silph_co_8f.asm +++ /dev/null @@ -1,56 +0,0 @@ -_SilphCo8Text_565be:: - text "I wonder if SILPH" - line "is finished..." - done - -_SilphCo8Text_565c3:: - text "Thanks for saving" - line "us!" - done - -_SilphCo8BattleText1:: - text "That's as far as" - line "you'll go!" - done - -_SilphCo8EndBattleText1:: - text "Not" - line "enough grit!" - prompt - -_SilphCo8AfterBattleText1:: - text "If you don't turn" - line "back, I'll call" - cont "for backup!" - done - -_SilphCo8BattleText2:: - text "You're causing us" - line "problems!" - done - -_SilphCo8EndBattleText2:: - text "Huh?" - line "I lost?" - prompt - -_SilphCo8AfterBattleText2:: - text "So, what do you" - line "think of SILPH" - cont "BUILDING's maze?" - done - -_SilphCo8BattleText3:: - text "I am one of the 4" - line "ROCKET BROTHERS!" - done - -_SilphCo8EndBattleText3:: - text "Whoo!" - line "Oh brothers!" - prompt - -_SilphCo8AfterBattleText3:: - text "I'll leave you up" - line "to my brothers!" - done diff --git a/text/maps/silph_co_9f.asm b/text/maps/silph_co_9f.asm deleted file mode 100644 index fd1aa91c..00000000 --- a/text/maps/silph_co_9f.asm +++ /dev/null @@ -1,62 +0,0 @@ -_SilphCo9Text_5d8e5:: - text "You look tired!" - line "You should take a" - cont "quick nap!" - prompt - -_SilphCo9Text_5d8ea:: - text "Don't give up!" - done - -_SilphCo9Text_5d8ef:: - text "Thank you so" - line "much!" - done - -_SilphCo9BattleText1:: - text "Your #MON seem" - line "to adore you, kid!" - done - -_SilphCo9EndBattleText1:: - text "Ghaaah!" - prompt - -_SilphCo9AfterBattleText1:: - text "If I had started" - line "as a trainer at" - cont "your age..." - done - -_SilphCo9BattleText2:: - text "Your #MON have" - line "weak points! I" - cont "can nail them!" - done - -_SilphCo9EndBattleText2:: - text "You" - line "hammered me!" - prompt - -_SilphCo9AfterBattleText2:: - text "Exploiting weak" - line "spots does work!" - cont "Think about" - cont "element types!" - done - -_SilphCo9BattleText3:: - text "I am one of the 4" - line "ROCKET BROTHERS!" - done - -_SilphCo9EndBattleText3:: - text "Warg!" - line "Brothers, I lost!" - prompt - -_SilphCo9AfterBattleText3:: - text "My brothers will" - line "avenge me!" - done diff --git a/text/maps/ss_anne_1.asm b/text/maps/ss_anne_1.asm deleted file mode 100644 index 2bbdcbac..00000000 --- a/text/maps/ss_anne_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -_SSAnne1Text1:: - text "Bonjour!" - line "I am le waiter on" - cont "this ship!" - - para "I will be happy" - line "to serve you any-" - cont "thing you please!" - - para "Ah! Le strong" - line "silent type!" - done - -_SSAnne1Text2:: - text "The passengers" - line "are restless!" - - para "You might be" - line "challenged by the" - cont "more bored ones!" - done diff --git a/text/maps/ss_anne_10.asm b/text/maps/ss_anne_10.asm deleted file mode 100644 index 7df629b5..00000000 --- a/text/maps/ss_anne_10.asm +++ /dev/null @@ -1,112 +0,0 @@ -_SSAnne10Text8:: - text "MACHOKE: Gwoh!" - line "Goggoh!@@" - -_SSAnne10BattleText1:: - text "You know what they" - line "say about sailors" - cont "and fighting!" - done - -_SSAnne10EndBattleText1:: - text "Right!" - line "Good fight, mate!" - prompt - -_SSAnne10AfterBattleText1:: - text "Haha! Want to be" - line "a sailor, mate?" - done - -_SSAnne10BattleText2:: - text "My sailor's pride" - line "is at stake!" - done - -_SSAnne10EndBattleText2:: - text "Your" - line "spirit sank me!" - prompt - -_SSAnne10AfterBattleText2:: - text "Did you see the" - line "FISHING GURU in" - cont "VERMILION CITY?" - done - -_SSAnne10BattleText3:: - text "Us sailors have" - line "#MON too!" - done - -_SSAnne10EndBattleText3:: - text "OK, " - line "you're not bad." - prompt - -_SSAnne10AfterBattleText3:: - text "We caught all our" - line "#MON while" - cont "out at sea!" - done - -_SSAnne10BattleText4:: - text "I like feisty" - line "kids like you!@@" - -_SSAnne10EndBattleText4:: - text "Argh!" - line "Lost it!" - prompt - -_SSAnne10AfterBattleText4:: - text "Sea #MON live" - line "in deep water." - cont "You'll need a ROD!" - done - -_SSAnne10BattleText5:: - text "Matey, you're" - line "walking the plank" - cont "if you lose!" - done - -_SSAnne10EndBattleText5:: - text "Argh!" - line "Beaten by a kid!" - prompt - -_SSAnne10AfterBattleText5:: - text "Jellyfish some-" - line "times drift into" - cont "the ship." - done - -_SSAnne10BattleText6:: - text "Hello stranger!" - line "Stop and chat!" - - para "All my #MON" - line "are from the sea!" - done - -_SSAnne10EndBattleText6:: - text "Darn!" - line "I let that one" - cont "get away!" - prompt - -_SSAnne10AfterBattleText6:: - text "I was going to" - line "make you my" - cont "assistant too!" - done - -_SSAnne10Text7:: - text "My buddy, MACHOKE," - line "is super strong!" - - para "He has enough" - line "STRENGTH to move" - cont "big rocks!" - done diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm deleted file mode 100644 index 58d804ba..00000000 --- a/text/maps/ss_anne_2.asm +++ /dev/null @@ -1,63 +0,0 @@ -_SSAnne2Text1:: - text "This ship, she is" - line "a luxury liner" - cont "for trainers!" - - para "At every port, we" - line "hold parties with" - cont "invited trainers!" - done - -_SSAnneRivalBeforeBattleText:: - text ": Bonjour!" - line "!" - - para "Imagine seeing" - line "you here!" - - para ", were you" - line "really invited?" - - para "So how's your" - line "#DEX coming?" - - para "I already caught" - line "40 kinds, pal!" - - para "Different kinds" - line "are everywhere!" - - para "Crawl around in" - line "grassy areas!" - done - -_SSAnneRivalDefeatedText:: - text "Humph!" - - para "At least you're" - line "raising your" - cont "#MON!" - prompt - -_SSAnneRivalWonText:: - text "! What are" - line "you, seasick?" - - para "You should shape" - line "up, pal!" - prompt - -_SSAnneRivalCaptainText:: - text ": I heard" - line "there was a CUT" - cont "master on board." - - para "But, he was just a" - line "seasick, old man!" - - para "But, CUT itself is" - line "really useful!" - - para "You should go see" - line "him! Smell ya!" - done diff --git a/text/maps/ss_anne_3.asm b/text/maps/ss_anne_3.asm deleted file mode 100644 index 76490594..00000000 --- a/text/maps/ss_anne_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -_SSAnne3Text1:: - text "Our CAPTAIN is a" - line "sword master!" - - para "He even teaches" - line "CUT to #MON!" - done diff --git a/text/maps/ss_anne_5.asm b/text/maps/ss_anne_5.asm deleted file mode 100644 index 76cd5631..00000000 --- a/text/maps/ss_anne_5.asm +++ /dev/null @@ -1,52 +0,0 @@ -_SSAnne5Text1:: - text "The party's over." - line "The ship will be" - cont "departing soon." - done - -_SSAnne5Text2:: - text "Scrubbing decks" - line "is hard work!" - done - -_SSAnne5Text3:: - text "Urf. I feel ill." - - para "I stepped out to" - line "get some air." - done - -_SSAnne5BattleText1:: - text "Hey matey!" - - para "Let's do a little" - line "jig!" - done - -_SSAnne5EndBattleText1:: - text "You're" - line "impressive!" - prompt - -_SSAnne5AfterBattleText1:: - text "How many kinds of" - line "#MON do you" - cont "think there are?" - done - -_SSAnne5BattleText2:: - text "Ahoy there!" - line "Are you seasick?" - done - -_SSAnne5EndBattleText2:: - text "I was" - line "just careless!" - prompt - -_SSAnne5AfterBattleText2:: - text "My Pa said there" - line "are 100 kinds of" - cont "#MON. I think" - cont "there are more." - done diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm deleted file mode 100644 index 7fcc9973..00000000 --- a/text/maps/ss_anne_6.asm +++ /dev/null @@ -1,69 +0,0 @@ -_SSAnne6Text1:: - text "You, mon petit!" - line "We're busy here!" - cont "Out of the way!" - done - -_SSAnne6Text2:: - text "I saw an odd ball" - line "in the trash." - done - -_SSAnne6Text3:: - text "I'm so busy I'm" - line "getting dizzy!" - done - -_SSAnne6Text4:: - text "Hum-de-hum-de-" - line "ho..." - - para "I peel spuds" - line "every day!" - cont "Hum-hum..." - done - -_SSAnne6Text5:: - text "Did you hear about" - line "SNORLAX?" - - para "All it does is" - line "eat and sleep!" - done - -_SSAnne6Text6:: - text "Snivel...Sniff..." - - para "I only get to" - line "peel onions..." - cont "Snivel..." - done - -_SSAnne6Text_61807:: - text "Er-hem! Indeed I" - line "am le CHEF!" - - para "Le main course is" - prompt - -_SSAnne6Text_6180c:: - text "Salmon du Salad!" - - para "Les guests may" - line "gripe it's fish" - cont "again, however!" - done - -_SSAnne6Text_61811:: - text "Eels au Barbecue!" - - para "Les guests will" - line "mutiny, I fear." - done - -_SSAnne6Text_61816:: - text "Prime Beef Steak!" - - para "But, have I enough" - line "fillets du beef?" - done diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm deleted file mode 100644 index 7bf004da..00000000 --- a/text/maps/ss_anne_7.asm +++ /dev/null @@ -1,62 +0,0 @@ -_SSAnne7RubText:: - text "CAPTAIN: Ooargh..." - line "I feel hideous..." - cont "Urrp! Seasick..." - - para " rubbed" - line "the CAPTAIN's" - cont "back!" - - para "Rub-rub..." - line "Rub-rub...@@" - -_ReceivingHM01Text:: - text "CAPTAIN: Whew!" - line "Thank you! I" - cont "feel much better!" - - para "You want to see" - line "my CUT technique?" - - para "I could show you" - line "if I wasn't ill..." - - para "I know! You can" - line "have this!" - - para "Teach it to your" - line "#MON and you" - cont "can see it CUT" - cont "any time!" - prompt - -_ReceivedHM01Text:: - text " got" - line "@" - TX_RAM wcf4b - text "!@@" - -_SSAnne7Text_61932:: - text "CAPTAIN: Whew!" - - para "Now that I'm not" - line "sick any more, I" - cont "guess it's time." - done - -_HM01NoRoomText:: - text "Oh no! You have" - line "no room for this!" - done - -_SSAnne7Text2:: - text "Yuck! Shouldn't" - line "have looked!" - done - -_SSAnne7Text3:: - text "How to Conquer" - line "Seasickness..." - cont "The CAPTAIN's" - cont "reading this!" - done diff --git a/text/maps/ss_anne_8.asm b/text/maps/ss_anne_8.asm deleted file mode 100644 index 7a09303e..00000000 --- a/text/maps/ss_anne_8.asm +++ /dev/null @@ -1,104 +0,0 @@ -_SSAnne8Text8:: - text "WIGGLYTUFF: Puup" - line "pupuu!@@" - -_SSAnne8BattleText1:: - text "I travel alone" - line "on my journeys!" - - para "My #MON are my" - line "only friends!" - done - -_SSAnne8EndBattleText1:: - text "My, my" - line "friends..." - prompt - -_SSAnne8AfterBattleText1:: - text "You should be" - line "nice to friends!" - done - -_SSAnne8BattleText2:: - text "You pup! How dare" - line "you barge in!" - done - -_SSAnne8EndBattleText2:: - text "Humph!" - line "You rude child!" - prompt - -_SSAnne8AfterBattleText2:: - text "I wish to be left" - line "alone! Get out!" - done - -_SSAnne8BattleText3:: - text "I love #MON!" - line "Do you?" - done - -_SSAnne8EndBattleText3:: - text "Wow! " - line "You're great!" - prompt - -_SSAnne8AfterBattleText3:: - text "Let me be your" - line "friend, OK?" - - para "Then we can trade" - line "#MON!" - done - -_SSAnne8BattleText4:: - text "I collected these" - line "#MON from all" - cont "around the world!" - done - -_SSAnne8EndBattleText4:: - text "Oh no!" - line "I went around the" - cont "world for these!" - prompt - -_SSAnne8AfterBattleText4:: - text "You hurt my poor" - line "worldly #MON!" - - para "I demand that you" - line "heal them at a" - cont "#MON CENTER!" - done - -_SSAnne8Text5:: - text "Waiter, I would" - line "like a cherry pie" - cont "please!" - done - -_SSAnne8Text6:: - text "A cruise is so" - line "elegant yet cozy!" - done - -_SSAnne8Text7:: - text "I always travel" - line "with WIGGLYTUFF!" - done - -_SSAnne8Text9:: - text "We are cruising" - line "around the world." - done - -_SSAnne8Text11:: - text "Ssh! I'm a GLOBAL" - line "POLICE agent!" - - para "I'm on the trail" - line "of TEAM ROCKET!" - done diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm deleted file mode 100644 index a9be8cee..00000000 --- a/text/maps/ss_anne_9.asm +++ /dev/null @@ -1,113 +0,0 @@ -_SSAnne9Text_61bf2:: - text "In all my travels" - line "I've never seen" - cont "any #MON sleep" - cont "like this one!" - - para "It was something" - line "like this!" - prompt - -_SSAnne9Text_61c01:: - text "Ah yes, I have" - line "seen some #MON" - cont "ferry people" - cont "across the water!" - done - -_SSAnne9Text_61c10:: - text "#MON can CUT" - line "down small bushes." - done - -_SSAnne9Text_61c1f:: - text "Have you gone to" - line "the SAFARI ZONE" - cont "in FUCHSIA CITY?" - - para "It had many rare" - line "kinds of #MON!!" - done - -_SSAnne9Text_61c2e:: - text "Me and my Daddy" - line "think the SAFARI" - cont "ZONE is awesome!" - done - -_SSAnne9Text_61c3d:: - text "The CAPTAIN looked" - line "really sick and" - cont "pale!" - done - -_SSAnne9Text_61c4c:: - text "I hear many people" - line "get seasick!" - done - -_SSAnne9BattleText1:: - text "Competing against" - line "the young keeps" - cont "me youthful." - done - -_SSAnne9EndBattleText1:: - text "Good" - line "fight! Ah, I feel" - cont "young again!" - prompt - -_SSAnne9AfterBattleText1:: - text "15 years ago, I" - line "would have won!" - done - -_SSAnne9BattleText2:: - text "Check out what I" - line "fished up!" - done - -_SSAnne9EndBattleText2:: - text "I'm" - line "all out!" - prompt - -_SSAnne9AfterBattleText2:: - text "Party?" - - para "The cruise ship's" - line "party should be" - cont "over by now." - done - -_SSAnne9BattleText3:: - text "Which do you like," - line "a strong or a" - cont "rare #MON?" - done - -_SSAnne9EndBattleText3:: - text "I must" - line "salute you!" - prompt - -_SSAnne9AfterBattleText3:: - text "I prefer strong" - line "and rare #MON." - done - -_SSAnne9BattleText4:: - text "I never saw you" - line "at the party." - done - -_SSAnne9EndBattleText4:: - text "Take" - line "it easy!" - prompt - -_SSAnne9AfterBattleText4:: - text "Oh, I adore your" - line "strong #MON!" - done diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/underground_path_route_6_entrance.asm deleted file mode 100644 index dacc44f7..00000000 --- a/text/maps/underground_path_route_6_entrance.asm +++ /dev/null @@ -1,5 +0,0 @@ -_UndergrdTunnelEntRoute6Text1:: - text "People often lose" - line "things in that" - cont "UNDERGROUND PATH." - done diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/underground_path_route_7_entrance.asm deleted file mode 100644 index 5cde3614..00000000 --- a/text/maps/underground_path_route_7_entrance.asm +++ /dev/null @@ -1,5 +0,0 @@ -_UndergroundPathEntRoute7Text1:: - text "I heard a sleepy" - line "#MON appeared" - cont "near CELADON CITY." - done diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm deleted file mode 100644 index 4e0dc3ca..00000000 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ /dev/null @@ -1,35 +0,0 @@ -_UGPathRoute7EntranceUnusedText_5d773:: - text "I want to shop at" - line "the dept. store" - cont "in CELADON but..." - - para "There are so many" - line "rough looking" - cont "people there." - done - -_UGPathRoute7EntranceUnusedText_5d778:: - text "TEAM ROCKET had a" - line "secret hideout in" - cont "CELADON CITY?" - done - -_UGPathRoute7EntranceUnusedText_5d77d:: - text "You're here to" - line "shop in CELADON?" - - para "Just step outside" - line "and head west!" - done - -_UGPathRoute7EntranceUnusedText_5d782:: - text "The UNDERGROUND" - line "PATH goes beneath" - cont "SAFFRON and leads" - cont "to LAVENDER." - - para "If you're heading" - line "to CERULEAN, go" - cont "to the building" - cont "across the road." - done diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/underground_path_route_8_entrance.asm deleted file mode 100644 index da785c8e..00000000 --- a/text/maps/underground_path_route_8_entrance.asm +++ /dev/null @@ -1,5 +0,0 @@ -_UndergroundPathEntRoute8Text1:: - text "The dept. store" - line "in CELADON has a" - cont "great selection!" - done diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm deleted file mode 100644 index 0918a3ce..00000000 --- a/text/maps/unknown_dungeon_b1f.asm +++ /dev/null @@ -1,2 +0,0 @@ -_MewtwoBattleText:: - text "Mew!@@" diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm deleted file mode 100644 index b060a123..00000000 --- a/text/maps/vermilion_city.asm +++ /dev/null @@ -1,126 +0,0 @@ -_VermilionCityText1:: - text "We're careful" - line "about pollution!" - - para "We've heard GRIMER" - line "multiplies in" - cont "toxic sludge!" - done - -_VermilionCityText_198a7:: - text "Did you see S.S." - line "ANNE moored in" - cont "the harbor?" - done - -_VermilionCityText_198ac:: - text "So, S.S.ANNE has" - line "departed!" - - para "She'll be back in" - line "about a year." - done - -_SSAnneWelcomeText4:: - text "Welcome to S.S." - line "ANNE!" - done - -_SSAnneWelcomeText9:: - text "Welcome to S.S." - line "ANNE!" - - para "Excuse me, do you" - line "have a ticket?" - prompt - -_SSAnneFlashedTicketText:: - text " flashed" - line "the S.S.TICKET!" - - para "Great! Welcome to" - line "S.S.ANNE!" - done - -_SSAnneNoTicketText:: - text " doesn't" - line "have the needed" - cont "S.S.TICKET." - - para "Sorry!" - - para "You need a ticket" - line "to get aboard." - done - -_SSAnneNotHereText:: - text "The ship set sail." - done - -_VermilionCityText4:: - text "I'm putting up a" - line "building on this" - cont "plot of land." - - para "My #MON is" - line "tamping the land." - done - -_VermilionCityText5:: - text "MACHOP: Guoh!" - line "Gogogoh!@@" - -_VermilionCityText14:: - text "" - para "A MACHOP is" - line "stomping the land" - cont "flat." - done - -_VermilionCityText6:: - text "S.S.ANNE is a" - line "famous luxury" - cont "cruise ship." - - para "We visit VERMILION" - line "once a year." - done - -_VermilionCityText7:: - text "VERMILION CITY" - line "The Port of" - cont "Exquisite Sunsets" - done - -_VermilionCityText8:: - text "NOTICE!" - - para "ROUTE 12 may be" - line "blocked off by a" - cont "sleeping #MON." - - para "Detour through" - line "ROCK TUNNEL to" - cont "LAVENDER TOWN." - - para "VERMILION POLICE" - done - -_VermilionCityText11:: - text "#MON FAN CLUB" - line "All #MON fans" - cont "welcome!" - done - -_VermilionCityText12:: - text "VERMILION CITY" - line "#MON GYM" - cont "LEADER: LT.SURGE" - - para "The Lightning " - line "American!" - done - -_VermilionCityText13:: - text "VERMILION HARBOR" - done diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm deleted file mode 100644 index 5d998e82..00000000 --- a/text/maps/vermilion_dock.asm +++ /dev/null @@ -1,3 +0,0 @@ -_VermilionDockText1:: - text "" - done diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm deleted file mode 100644 index 6857bb5b..00000000 --- a/text/maps/vermilion_fishing_house.asm +++ /dev/null @@ -1,53 +0,0 @@ -_VermilionHouse2Text_560b1:: - text "I'm the FISHING" - line "GURU!" - - para "I simply Looove" - line "fishing!" - - para "Do you like to" - line "fish?" - done - -_VermilionHouse2Text_560b6:: - text "Grand! I like" - line "your style!" - - para "Take this and" - line "fish, young one!" - - para " received" - line "an @" - TX_RAM wcf4b - text "!@@" - -_VermilionHouse2Text_560bb:: - db $0 - para "Fishing is a way" - line "of life!" - - para "From the seas to" - line "rivers, go out" - cont "and land the big" - cont "one, young one!" - done - -_VermilionHouse2Text_560c0:: - text "Oh... That's so" - line "disappointing..." - done - -_VermilionHouse2Text_560c5:: - text "Hello there," - line "!" - - para "How are the fish" - line "biting?" - done - -_VermilionHouse2Text_560ca:: - text "Oh no!" - - para "You have no room" - line "for my gift!" - done diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/vermilion_gym_1.asm deleted file mode 100644 index f718d899..00000000 --- a/text/maps/vermilion_gym_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -_VermilionGymText_5cb6d:: - text "Hey, kid! What do" - line "you think you're" - cont "doing here?" - - para "You won't live" - line "long in combat!" - cont "That's for sure!" - - para "I tell you kid," - line "electric #MON" - cont "saved me during" - cont "the war!" - - para "They zapped my" - line "enemies into" - cont "paralysis!" - - para "The same as I'll" - line "do to you!" - done diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm deleted file mode 100644 index d0a01932..00000000 --- a/text/maps/vermilion_gym_2.asm +++ /dev/null @@ -1,143 +0,0 @@ -_VermilionGymText_5cb72:: - text "A little word of" - line "advice, kid!" - - para "Electricity is" - line "sure powerful!" - - para "But, it's useless" - line "against ground-" - cont "type #MON!" - done - -_VermilionGymText_5cb77:: - text "The THUNDERBADGE" - line "cranks up your" - cont "#MON's SPEED!" - - para "It also lets your" - line "#MON FLY any" - cont "time, kid!" - - para "You're special," - line "kid! Take this!" - done - -_ReceivedTM24Text:: - text " received " - line "@" - TX_RAM wcf4b - text "!@@" - -_TM24ExplanationText:: - db $0 - para "TM24 contains" - line "THUNDERBOLT!" - - para "Teach it to an" - line "electric #MON!" - done - -_TM24NoRoomText:: - text "Yo kid, make room" - line "in your pack!" - done - -_ReceivedThunderbadgeText:: - text "Whoa!" - - para "You're the real" - line "deal, kid!" - - para "Fine then, take" - line "the THUNDERBADGE!" - prompt - -_VermilionGymBattleText1:: - text "When I was in the" - line "Army, LT.SURGE" - cont "was my strict CO!" - done - -_VermilionGymEndBattleText1:: - text "Stop!" - line "You're very good!" - prompt - -_VermilionGymAfterBattleText1:: - text "The door won't" - line "open?" - - para "LT.SURGE always" - line "was cautious!" - done - -_VermilionGymBattleText2:: - text "I'm a lightweight," - line "but I'm good with" - cont "electricity!" - done - -_VermilionGymEndBattleText2:: - text "Fried!" - prompt - -_VermilionGymAfterBattleText2:: - text "OK, I'll talk!" - - para "LT.SURGE said he" - line "hid door switches" - cont "inside something!" - done - -_VermilionGymBattleText3:: - text "This is no place" - line "for kids!" - done - -_VermilionGymEndBattleText3:: - text "Wow!" - line "Surprised me!" - prompt - -_VermilionGymAfterBattleText3:: - text "LT.SURGE set up" - line "double locks!" - cont "Here's a hint!" - - para "When you open the" - line "1st lock, the 2nd" - cont "lock is right" - cont "next to it!" - done - -_VermilionGymText_5cbf4:: - text "Yo! Champ in" - line "making!" - - para "LT.SURGE has a" - line "nickname. People" - cont "refer to him as" - cont "the Lightning" - cont "American!" - - para "He's an expert on" - line "electric #MON!" - - para "Birds and water" - line "#MON are at" - cont "risk! Beware of" - cont "paralysis too!" - - para "LT.SURGE is very" - line "cautious!" - - para "You'll have to" - line "break a code to" - cont "get to him!" - done - -_VermilionGymText_5cbf9:: - text "Whew! That match" - line "was electric!" - done diff --git a/text/maps/vermilion_house.asm b/text/maps/vermilion_house.asm deleted file mode 100644 index 91c18708..00000000 --- a/text/maps/vermilion_house.asm +++ /dev/null @@ -1,21 +0,0 @@ -_VermilionHouse1Text1:: - text "I'm getting my" - line "PIDGEY to fly a" - cont "letter to SAFFRON" - cont "in the north!" - done - -_VermilionHouse1Text2:: - text "PIDGEY: Kurukkoo!@@" - -_VermilionHouse1Text3:: - text "Dear PIPPI, I hope" - line "to see you soon." - - para "I heard SAFFRON" - line "has problems with" - cont "TEAM ROCKET." - - para "VERMILION appears" - line "to be safe." - done diff --git a/text/maps/vermilion_mart.asm b/text/maps/vermilion_mart.asm deleted file mode 100644 index 10743989..00000000 --- a/text/maps/vermilion_mart.asm +++ /dev/null @@ -1,23 +0,0 @@ -_VermilionMartText2:: - text "There are evil" - line "people who will" - cont "use #MON for" - cont "criminal acts." - - para "TEAM ROCKET" - line "traffics in rare" - cont "#MON." - - para "They also abandon" - line "#MON that they" - cont "consider not to" - cont "be popular or" - cont "useful." - done - -_VermilionMartText3:: - text "I think #MON" - line "can be good or" - cont "evil. It depends" - cont "on the trainer." - done diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm deleted file mode 100644 index c9e9a581..00000000 --- a/text/maps/vermilion_pokecenter.asm +++ /dev/null @@ -1,19 +0,0 @@ -_VermilionPokecenterText2:: - text "Even if they are" - line "the same level," - cont "#MON can have" - cont "very different" - cont "abilities." - - para "A #MON raised" - line "by a trainer is" - cont "stronger than one" - cont "in the wild." - done - -_VermilionPokecenterText3:: - text "My #MON was" - line "poisoned! It" - cont "fainted while we" - cont "were walking!" - done diff --git a/text/maps/victory_road_1f.asm b/text/maps/victory_road_1f.asm deleted file mode 100644 index 1523db88..00000000 --- a/text/maps/victory_road_1f.asm +++ /dev/null @@ -1,31 +0,0 @@ -_VictoryRoad1BattleText1:: - text "I wonder if you" - line "are good enough" - cont "for me!" - done - -_VictoryRoad1EndBattleText1:: - text "I" - line "lost out!" - prompt - -_VictoryRoad1AfterBattleText1:: - text "I never wanted to" - line "lose to anybody!" - done - -_VictoryRoad1BattleText2:: - text "I can see you're" - line "good! Let me see" - cont "exactly how good!" - done - -_VictoryRoad1EndBattleText2:: - text "I" - line "had a chance..." - prompt - -_VictoryRoad1AfterBattleText2:: - text "I concede, you're" - line "better than me!" - done diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm deleted file mode 100644 index ec9dcf4f..00000000 --- a/text/maps/victory_road_2f.asm +++ /dev/null @@ -1,85 +0,0 @@ -_MoltresBattleText:: - text "Gyaoo!@@" - -_VictoryRoad2BattleText1:: - text "VICTORY ROAD is" - line "the final test" - cont "for trainers!" - done - -_VictoryRoad2EndBattleText1:: - text "Aiyah!" - prompt - -_VictoryRoad2AfterBattleText1:: - text "If you get stuck," - line "try moving some" - cont "boulders around!" - done - -_VictoryRoad2BattleText2:: - text "Ah, so you wish" - line "to challenge the" - cont "ELITE FOUR?" - done - -_VictoryRoad2EndBattleText2:: - text "You" - line "got me!" - prompt - -_VictoryRoad2AfterBattleText2:: - text " also came" - line "through here!" - done - -_VictoryRoad2BattleText3:: - text "Come on!" - line "I'll whip you!" - done - -_VictoryRoad2EndBattleText3:: - text "I got" - line "whipped!" - prompt - -_VictoryRoad2AfterBattleText3:: - text "You earned the" - line "right to be on" - cont "VICTORY ROAD!" - done - -_VictoryRoad2BattleText4:: - text "If you can get" - line "through here, you" - cont "can go meet the" - cont "ELITE FOUR!" - done - -_VictoryRoad2EndBattleText4:: - text "No!" - line "Unbelievable!" - prompt - -_VictoryRoad2AfterBattleText4:: - text "I can beat you" - line "when it comes to" - cont "knowledge about" - cont "#MON!" - done - -_VictoryRoad2BattleText5:: - text "Is VICTORY ROAD" - line "too tough?" - done - -_VictoryRoad2EndBattleText5:: - text "Well" - line "done!" - prompt - -_VictoryRoad2AfterBattleText5:: - text "Many trainers give" - line "up the challenge" - cont "here." - done diff --git a/text/maps/victory_road_3f.asm b/text/maps/victory_road_3f.asm deleted file mode 100644 index 07e0be70..00000000 --- a/text/maps/victory_road_3f.asm +++ /dev/null @@ -1,63 +0,0 @@ -_VictoryRoad3BattleText2:: - text "I heard rumors of" - line "a child prodigy!" - done - -_VictoryRoad3EndBattleText2:: - text "The" - line "rumors were true!" - prompt - -_VictoryRoad3AfterBattleText2:: - text "You beat GIOVANNI" - line "of TEAM ROCKET?" - done - -_VictoryRoad3BattleText3:: - text "I'll show you just" - line "how good you are!" - done - -_VictoryRoad3EndBattleText3:: - text "I'm" - line "furious!" - prompt - -_VictoryRoad3AfterBattleText3:: - text "You showed me just" - line "how good I was!" - done - -_VictoryRoad3BattleText4:: - text "Only the chosen" - line "can pass here!" - done - -_VictoryRoad3EndBattleText4:: - text "I" - line "don't believe it!" - prompt - -_VictoryRoad3AfterBattleText4:: - text "All trainers here" - line "are headed to the" - cont "#MON LEAGUE!" - cont "Be careful!" - done - -_VictoryRoad3BattleText5:: - text "Trainers live to" - line "seek stronger" - cont "opponents!" - done - -_VictoryRoad3EndBattleText5:: - text "Oh!" - line "So strong!" - prompt - -_VictoryRoad3AfterBattleText5:: - text "By fighting tough" - line "battles, you get" - cont "stronger!" - done diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm deleted file mode 100644 index 67ab5c40..00000000 --- a/text/maps/viridian_city.asm +++ /dev/null @@ -1,180 +0,0 @@ -_ViridianCityText1:: - text "Those # BALLs" - line "at your waist!" - cont "You have #MON!" - - para "It's great that" - line "you can carry and" - cont "use #MON any" - cont "time, anywhere!" - done - -_ViridianCityText_19122:: - text "This #MON GYM" - line "is always closed." - - para "I wonder who the" - line "LEADER is?" - done - -_ViridianCityText_19127:: - text "VIRIDIAN GYM's" - line "LEADER returned!" - done - -_ViridianCityText_1914d:: - text "You want to know" - line "about the 2 kinds" - cont "of caterpillar" - cont "#MON?" - done - -_ViridianCityText_19152:: - text "Oh, OK then!" - done - -_ViridianCityText_19157:: - text "CATERPIE has no" - line "poison, but" - cont "WEEDLE does." - - para "Watch out for its" - line "POISON STING!" - done - -_ViridianCityText_19175:: - text "Oh Grandpa! Don't" - line "be so mean!" - cont "He hasn't had his" - cont "coffee yet." - done - -_ViridianCityText_1917a:: - text "When I go shop in" - line "PEWTER CITY, I" - cont "have to take the" - cont "winding trail in" - cont "VIRIDIAN FOREST." - done - -_ViridianCityText_19191:: - text "You can't go" - line "through here!" - - para "This is private" - line "property!" - done - -_ViridianCityText_191ca:: - text "Yawn!" - line "I must have dozed" - cont "off in the sun." - - para "I had this dream" - line "about a DROWZEE" - cont "eating my dream." - cont "What's this?" - cont "Where did this TM" - cont "come from?" - - para "This is spooky!" - line "Here, you can" - cont "have this TM." - prompt - -_ReceivedTM42Text:: - text " received" - line "TM42!@@" - -_TM42Explanation:: - text "TM42 contains" - line "DREAM EATER..." - cont "...Snore..." - done - -_TM42NoRoomText:: - text "You have too much" - line "stuff already." - done - -_ViridianCityText_1920a:: - text "Ahh, I've had my" - line "coffee now and I" - cont "feel great!" - - para "Sure you can go" - line "through!" - - para "Are you in a" - line "hurry?" - done - -_ViridianCityText_1920f:: - text "I see you're using" - line "a #DEX." - - para "When you catch a" - line "#MON, #DEX" - cont "is automatically" - cont "updated." - - para "What? Don't you" - line "know how to catch" - cont "#MON?" - - para "I'll show you" - line "how to then." - done - -_ViridianCityText_19214:: - text "Time is money..." - line "Go along then." - done - -_ViridianCityText_19219:: - text "First, you need" - line "to weaken the" - cont "target #MON." - done - -_ViridianCityText8:: - text "VIRIDIAN CITY " - line "The Eternally" - cont "Green Paradise" - done - -_ViridianCityText9:: - text "TRAINER TIPS" - - para "Catch #MON" - line "and expand your" - cont "collection!" - - para "The more you have," - line "the easier it is" - cont "to fight!" - done - -_ViridianCityText10:: - text "TRAINER TIPS" - - para "The battle moves" - line "of #MON are" - cont "limited by their" - cont "POWER POINTs, PP." - - para "To replenish PP," - line "rest your tired" - cont "#MON at a" - cont "#MON CENTER!" - done - -_ViridianCityText13:: - text "VIRIDIAN CITY" - line "#MON GYM" - done - -_ViridianCityText14:: - text "The GYM's doors" - line "are locked..." - done diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm deleted file mode 100644 index 813b193a..00000000 --- a/text/maps/viridian_forest.asm +++ /dev/null @@ -1,123 +0,0 @@ -_ViridianForestText1:: - text "I came here with" - line "some friends!" - - para "They're out for" - line "#MON fights!" - done - -_ViridianForestBattleText1:: - text "Hey! You have" - line "#MON! Come on!" - cont "Let's battle'em!" - done - -_ViridianForestEndBattleText1:: - text "No!" - line "CATERPIE can't" - cont "cut it!" - prompt - -_ViridianFrstAfterBattleText1:: - text "Ssh! You'll scare" - line "the bugs away!" - done - -_ViridianForestBattleText2:: - text "Yo! You can't jam" - line "out if you're a" - cont "#MON trainer!" - done - -_ViridianForestEndBattleText2:: - text "Huh?" - line "I ran out of" - cont "#MON!" - prompt - -_ViridianFrstAfterBattleText2:: - text "Darn! I'm going" - line "to catch some" - cont "stronger ones!" - done - -_ViridianForestBattleText3:: - text "Hey, wait up!" - line "What's the hurry?" - done - -_ViridianForestEndBattleText3:: - text "I" - line "give! You're good" - cont "at this!" - prompt - -_ViridianFrstAfterBattleText3:: - text "Sometimes, you" - line "can find stuff on" - cont "the ground!" - - para "I'm looking for" - line "the stuff I" - cont "dropped!" - done - -_ViridianForestText8:: - text "I ran out of #" - line "BALLs to catch" - cont "#MON with!" - - para "You should carry" - line "extras!" - done - -_ViridianForestText9:: - text "TRAINER TIPS" - - para "If you want to" - line "avoid battles," - cont "stay away from" - cont "grassy areas!" - done - -_ViridianForestText10:: - text "For poison, use" - line "ANTIDOTE! Get it" - cont "at #MON MARTs!" - done - -_ViridianForestText11:: - text "TRAINER TIPS" - - para "Contact PROF.OAK" - line "via PC to get" - cont "your #DEX" - cont "evaluated!" - done - -_ViridianForestText12:: - text "TRAINER TIPS" - - para "No stealing of" - line "#MON from" - cont "other trainers!" - cont "Catch only wild" - cont "#MON!" - done - -_ViridianForestText13:: - text "TRAINER TIPS" - - para "Weaken #MON" - line "before attempting" - cont "capture!" - - para "When healthy," - line "they may escape!" - done - -_ViridianForestText14:: - text "LEAVING" - line "VIRIDIAN FOREST" - cont "PEWTER CITY AHEAD" - done diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm deleted file mode 100644 index c1a8df22..00000000 --- a/text/maps/viridian_forest_entrance.asm +++ /dev/null @@ -1,13 +0,0 @@ -_ViridianForestEntranceText1:: - text "Are you going to" - line "VIRIDIAN FOREST?" - cont "Be careful, it's" - cont "a natural maze!" - done - -_ViridianForestEntranceText2:: - text "RATTATA may be" - line "small, but its" - cont "bite is wicked!" - cont "Did you get one?" - done diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm deleted file mode 100644 index ab6a5a1d..00000000 --- a/text/maps/viridian_forest_exit.asm +++ /dev/null @@ -1,19 +0,0 @@ -_ViridianForestExitText1:: - text "Many #MON live" - line "only in forests " - cont "and caves." - - para "You need to look" - line "everywhere to get" - cont "different kinds!" - done - -_ViridianForestExitText2:: - text "Have you noticed" - line "the bushes on the" - cont "roadside?" - - para "They can be cut" - line "down by a special" - cont "#MON move." - done diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm deleted file mode 100644 index f87d8d58..00000000 --- a/text/maps/viridian_gym.asm +++ /dev/null @@ -1,236 +0,0 @@ -_ViridianGymText_74ace:: - text "Fwahahaha! This is" - line "my hideout!" - - para "I planned to" - line "resurrect TEAM" - cont "ROCKET here!" - - para "But, you have" - line "caught me again!" - cont "So be it! This" - cont "time, I'm not" - cont "holding back!" - - para "Once more, you" - line "shall face" - cont "GIOVANNI, the" - cont "greatest trainer!" - done - -_ViridianGymText_74ad3:: - text "Ha!" - line "That was a truly" - cont "intense fight!" - cont "You have won!" - cont "As proof, here is" - cont "the EARTHBADGE!@@" - -_ViridianGymText_74ad9:: - text "Having lost, I" - line "cannot face my" - cont "underlings!" - cont "TEAM ROCKET is" - cont "finished forever!" - - para "I will dedicate my" - line "life to the study" - cont "of #MON!" - - para "Let us meet again" - line "some day!" - cont "Farewell!@@" - -_ViridianGymText12:: - text "The EARTHBADGE" - line "makes #MON of" - cont "any level obey!" - - para "It is evidence of" - line "your mastery as a" - cont "#MON trainer!" - - para "With it, you can" - line "enter the #MON" - cont "LEAGUE!" - - para "It is my gift for" - line "your #MON" - cont "LEAGUE challenge!" - done - -_ReceivedTM27Text:: - text " received" - line "TM27!@@" - -_TM27ExplanationText:: - db $0 - para "TM27 is FISSURE!" - line "It will take out" - cont "#MON with just" - cont "one hit!" - - para "I made it when I" - line "ran the GYM here," - cont "too long ago..." - done - -_TM27NoRoomText:: - text "You do not have" - line "space for this!" - done - -_ViridianGymBattleText1:: - text "Heh! You must be" - line "running out of" - cont "steam by now!" - done - -_ViridianGymEndBattleText1:: - text "I" - line "ran out of gas!" - prompt - -_ViridianGymAfterBattleText1:: - text "You need power to" - line "keep up with our" - cont "GYM LEADER!" - done - -_ViridianGymBattleText2:: - text "Rrrroar! I'm" - line "working myself" - cont "into a rage!" - done - -_ViridianGymEndBattleText2:: - text "Wargh!" - prompt - -_ViridianGymAfterBattleText2:: - text "I'm still not" - line "worthy!" - done - -_ViridianGymBattleText3:: - text "#MON and I, we" - line "make wonderful" - cont "music together!" - done - -_ViridianGymEndBattleText3:: - text "You are in" - line "perfect harmony!" - prompt - -_ViridianGymAfterBattleText3:: - text "Do you know the" - line "identity of our" - cont "GYM LEADER?" - done - -_ViridianGymBattleText4:: - text "Karate is the" - line "ultimate form of" - cont "martial arts!" - done - -_ViridianGymEndBattleText4:: - text "Atcho!" - prompt - -_ViridianGymAfterBattleText4:: - text "If my #MON" - line "were as good at" - cont "Karate as I..." - done - -_ViridianGymBattleText5:: - text "The truly talented" - line "win with style!" - done - -_ViridianGymEndBattleText5:: - text "I" - line "lost my grip!" - prompt - -_ViridianGymAfterBattleText5:: - text "The LEADER will" - line "scold me!" - done - -_ViridianGymBattleText6:: - text "I'm the KARATE" - line "KING! Your fate" - cont "rests with me!" - done - -_ViridianGymEndBattleText6:: - text "Ayah!" - prompt - -_ViridianGymAfterBattleText6:: - text "#MON LEAGUE?" - line "You? Don't get" - cont "cocky!" - done - -_ViridianGymBattleText7:: - text "Your #MON will" - line "cower at the" - cont "crack of my whip!" - done - -_ViridianGymEndBattleText7:: - text "Yowch!" - line "Whiplash!" - prompt - -_ViridianGymAfterBattleText7:: - text "Wait! I was just" - line "careless!" - done - -_ViridianGymBattleText8:: - text "VIRIDIAN GYM was" - line "closed for a long" - cont "time, but now our" - cont "LEADER is back!" - done - -_ViridianGymEndBattleText8:: - text "I" - line "was beaten?" - prompt - -_ViridianGymAfterBattleText8:: - text "You can go onto" - line "#MON LEAGUE" - cont "only by defeating" - cont "our GYM LEADER!" - done - -_ViridianGymText_74bd4:: - text "Yo! Champ in" - line "making!" - - para "Even I don't know" - line "VIRIDIAN LEADER's" - cont "identity!" - - para "This will be the" - line "toughest of all" - cont "the GYM LEADERs!" - - para "I heard that the" - line "trainers here" - cont "like ground-type" - cont "#MON!" - done - -_ViridianGymText_74bd9:: - text "Blow me away!" - line "GIOVANNI was the" - cont "GYM LEADER here?" - done diff --git a/text/maps/viridian_house.asm b/text/maps/viridian_house.asm deleted file mode 100644 index 757f597a..00000000 --- a/text/maps/viridian_house.asm +++ /dev/null @@ -1,23 +0,0 @@ -_ViridianHouseText1:: - text "Coming up with" - line "nicknames is fun," - cont "but hard." - - para "Simple names are" - line "the easiest to" - cont "remember." - done - -_ViridianHouseText2:: - text "My Daddy loves" - line "#MON too." - done - -_ViridianHouseText_1d5b1:: - text "SPEARY: Tetweet!" - done - -_ViridianHouseText4:: - text "SPEAROW" - line "Name: SPEARY" - done diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm deleted file mode 100644 index 61750afe..00000000 --- a/text/maps/viridian_mart.asm +++ /dev/null @@ -1,30 +0,0 @@ -_ViridianMartText1:: - text "Okay! Say hi to" - line "PROF.OAK for me!" - done - -_ViridianMartText4:: - text "Hey! You came from" - line "PALLET TOWN?" - done - -ViridianMartParcelQuestText:: - text "You know PROF." - line "OAK, right?" - - para "His order came in." - line "Will you take it" - cont "to him?" - - para " got" - line "OAK's PARCEL!@@" - -_ViridianMartText2:: - text "This shop sells" - line "many ANTIDOTEs." - done - -_ViridianMartText3:: - text "No! POTIONs are" - line "all sold out." - done diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/viridian_pokecenter.asm deleted file mode 100644 index 4ac18bf6..00000000 --- a/text/maps/viridian_pokecenter.asm +++ /dev/null @@ -1,16 +0,0 @@ -_ViridianPokeCenterText2:: - text "You can use that" - line "PC in the corner." - - para "The receptionist" - line "told me. So kind!" - done - -_ViridianPokeCenterText3:: - text "There's a #MON" - line "CENTER in every" - cont "town ahead." - - para "They don't charge" - line "any money either!" - done diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm deleted file mode 100644 index 9d40cace..00000000 --- a/text/maps/wardens_house.asm +++ /dev/null @@ -1,83 +0,0 @@ -_WardenGibberishText1:: - text "WARDEN: Hif fuff" - line "hefifoo!" - - para "Ha lof ha feef ee" - line "hafahi ho. Heff" - cont "hee fwee!" - done - -_WardenGibberishText2:: - text "Ah howhee ho hoo!" - line "Eef ee hafahi ho!" - done - -_WardenGibberishText3:: - text "Ha? He ohay heh" - line "ha hoo ee haheh!" - done - -_WardenTeethText1:: - text " gave the" - line "GOLD TEETH to the" - cont "WARDEN!@@" - -_WardenTeethText2:: - db $0 - para "The WARDEN popped" - line "in his teeth!" - prompt - -_WardenThankYouText:: - text "WARDEN: Thanks," - line "kid! No one could" - cont "understand a word" - cont "that I said." - - para "I couldn't work" - line "that way." - cont "Let me give you" - cont "something for" - cont "your trouble." - prompt - -_ReceivedHM04Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_HM04ExplanationText:: - text "WARDEN: HM04" - line "teaches STRENGTH!" - - para "It lets #MON" - line "move boulders" - cont "when you're out-" - cont "side of battle." - - para "Oh yes, did you" - line "find SECRET HOUSE" - cont "in SAFARI ZONE?" - - para "If you do, you" - line "win an HM!" - - para "I hear it's the" - line "rare SURF HM." - done - -_HM04NoRoomText:: - text "Your pack is" - line "stuffed full!" - done - -_FuchsiaHouse2Text_75176:: - text "#MON photos" - line "and fossils." - done - -_FuchsiaHouse2Text_7517b:: - text "Old #MON" - line "merchandise." - done diff --git a/wram.asm b/wram.asm index b59cfaad..42485b1c 100755 --- a/wram.asm +++ b/wram.asm @@ -1,4 +1,3 @@ - INCLUDE "constants.asm" flag_array: MACRO @@ -2672,8 +2671,6 @@ wMissableObjectList:: ; d5ce wGameProgressFlags:: ; d5f0 ; $c8 bytes - ds 0 - wOaksLabCurScript:: ; d5f0 ds 1 wPalletTownCurScript:: ; d5f1 @@ -2713,31 +2710,31 @@ wRoute9CurScript:: ; d604 ds 1 wRoute10CurScript:: ; d605 ds 1 -wMtMoon1CurScript:: ; d606 +wMtMoon1FCurScript:: ; d606 ds 1 -wMtMoon3CurScript:: ; d607 +wMtMoonB2FCurScript:: ; d607 ds 1 -wSSAnne8CurScript:: ; d608 +wSSAnne1FRoomsCurScript:: ; d608 ds 1 -wSSAnne9CurScript:: ; d609 +wSSAnne2FRoomsCurScript:: ; d609 ds 1 wRoute22CurScript:: ; d60a ds 1 ds 1 -wRedsHouse2CurScript:: ; d60c +wRedsHouse2FCurScript:: ; d60c ds 1 -wViridianMarketCurScript:: ; d60d +wViridianMartCurScript:: ; d60d ds 1 wRoute22GateCurScript:: ; d60e ds 1 wCeruleanCityCurScript:: ; d60f ds 1 ds 7 -wSSAnne5CurScript:: ; d617 +wSSAnneBowCurScript:: ; d617 ds 1 wViridianForestCurScript:: ; d618 ds 1 -wMuseum1fCurScript:: ; d619 +wMuseum1FCurScript:: ; d619 ds 1 wRoute13CurScript:: ; d61a ds 1 @@ -2749,11 +2746,11 @@ wRoute19CurScript:: ; d61d ds 1 wRoute21CurScript:: ; d61e ds 1 -wSafariZoneEntranceCurScript:: ; d61f +wSafariZoneGateCurScript:: ; d61f ds 1 -wRockTunnel2CurScript:: ; d620 +wRockTunnelB1FCurScript:: ; d620 ds 1 -wRockTunnel1CurScript:: ; d621 +wRockTunnel1FCurScript:: ; d621 ds 1 ds 1 wRoute11CurScript:: ; d623 @@ -2768,29 +2765,29 @@ wRoute18CurScript:: ; d627 ds 1 wRoute20CurScript:: ; d628 ds 1 -wSSAnne10CurScript:: ; d629 +wSSAnneB1FRoomsCurScript:: ; d629 ds 1 wVermilionCityCurScript:: ; d62a ds 1 -wPokemonTower2CurScript:: ; d62b +wPokemonTower2FCurScript:: ; d62b ds 1 -wPokemonTower3CurScript:: ; d62c +wPokemonTower3FCurScript:: ; d62c ds 1 -wPokemonTower4CurScript:: ; d62d +wPokemonTower4FCurScript:: ; d62d ds 1 -wPokemonTower5CurScript:: ; d62e +wPokemonTower5FCurScript:: ; d62e ds 1 -wPokemonTower6CurScript:: ; d62f +wPokemonTower6FCurScript:: ; d62f ds 1 -wPokemonTower7CurScript:: ; d630 +wPokemonTower7FCurScript:: ; d630 ds 1 -wRocketHideout1CurScript:: ; d631 +wRocketHideoutB1FCurScript:: ; d631 ds 1 -wRocketHideout2CurScript:: ; d632 +wRocketHideoutB2FCurScript:: ; d632 ds 1 -wRocketHideout3CurScript:: ; d633 +wRocketHideoutB3FCurScript:: ; d633 ds 1 -wRocketHideout4CurScript:: ; d634 +wRocketHideoutB4FCurScript:: ; d634 ds 2 wRoute6GateCurScript:: ; d636 ds 1 @@ -2798,57 +2795,57 @@ wRoute8GateCurScript:: ; d637 ds 2 wCinnabarIslandCurScript:: ; d639 ds 1 -wMansion1CurScript:: ; d63a +wPokemonMansion1FCurScript:: ; d63a ds 2 -wMansion2CurScript:: ; d63c +wPokemonMansion2FCurScript:: ; d63c ds 1 -wMansion3CurScript:: ; d63d +wPokemonMansion3FCurScript:: ; d63d ds 1 -wMansion4CurScript:: ; d63e +wPokemonMansionB1FCurScript:: ; d63e ds 1 -wVictoryRoad2CurScript:: ; d63f +wVictoryRoad2FCurScript:: ; d63f ds 1 -wVictoryRoad3CurScript:: ; d640 +wVictoryRoad3FCurScript:: ; d640 ds 2 wFightingDojoCurScript:: ; d642 ds 1 -wSilphCo2CurScript:: ; d643 +wSilphCo2FCurScript:: ; d643 ds 1 -wSilphCo3CurScript:: ; d644 +wSilphCo3FCurScript:: ; d644 ds 1 -wSilphCo4CurScript:: ; d645 +wSilphCo4FCurScript:: ; d645 ds 1 -wSilphCo5CurScript:: ; d646 +wSilphCo5FCurScript:: ; d646 ds 1 -wSilphCo6CurScript:: ; d647 +wSilphCo6FCurScript:: ; d647 ds 1 -wSilphCo7CurScript:: ; d648 +wSilphCo7FCurScript:: ; d648 ds 1 -wSilphCo8CurScript:: ; d649 +wSilphCo8FCurScript:: ; d649 ds 1 -wSilphCo9CurScript:: ; d64a +wSilphCo9FCurScript:: ; d64a ds 1 -wHallOfFameRoomCurScript:: ; d64b +wHallOfFameCurScript:: ; d64b ds 1 -wGaryCurScript:: ; d64c +wChampionsRoomCurScript:: ; d64c ds 1 -wLoreleiCurScript:: ; d64d +wLoreleisRoomCurScript:: ; d64d ds 1 -wBrunoCurScript:: ; d64e +wBrunosRoomCurScript:: ; d64e ds 1 -wAgathaCurScript:: ; d64f +wAgathasRoomCurScript:: ; d64f ds 1 -wUnknownDungeon3CurScript:: ; d650 +wCeruleanCaveB1FCurScript:: ; d650 ds 1 -wVictoryRoad1CurScript:: ; d651 +wVictoryRoad1FCurScript:: ; d651 ds 1 ds 1 -wLanceCurScript:: ; d653 +wLancesRoomCurScript:: ; d653 ds 1 ds 4 -wSilphCo10CurScript:: ; d658 +wSilphCo10FCurScript:: ; d658 ds 1 -wSilphCo11CurScript:: ; d659 +wSilphCo11FCurScript:: ; d659 ds 1 ds 1 wFuchsiaGymCurScript:: ; d65b @@ -2858,30 +2855,28 @@ wSaffronGymCurScript:: ; d65c ds 1 wCinnabarGymCurScript:: ; d65e ds 1 -wCeladonGameCornerCurScript:: ; d65f +wGameCornerCurScript:: ; d65f ds 1 -wRoute16GateCurScript:: ; d660 +wRoute16Gate1FCurScript:: ; d660 ds 1 wBillsHouseCurScript:: ; d661 ds 1 wRoute5GateCurScript:: ; d662 ds 1 wPowerPlantCurScript:: ; d663 -; overload - ds 0 wRoute7GateCurScript:: ; d663 ; overload ds 1 ds 1 -wSSAnne2CurScript:: ; d665 +wSSAnne2FCurScript:: ; d665 ds 1 -wSeafoamIslands4CurScript:: ; d666 +wSeafoamIslandsB3FCurScript:: ; d666 ds 1 wRoute23CurScript:: ; d667 ds 1 -wSeafoamIslands5CurScript:: ; d668 +wSeafoamIslandsB4FCurScript:: ; d668 ds 1 -wRoute18GateCurScript:: ; d669 +wRoute18Gate1FCurScript:: ; d669 ds 1 ds 78 -- cgit v1.2.3 From df2a68d6de7a57aeae782efc7755abbcfb8005d6 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Mon, 8 Apr 2019 18:47:31 +0100 Subject: Replace the few instances of Unknown Dungeon with Cerulean Cave --- audio/headers/musicheaders3.asm | 2 +- constants/hide_show_constants.asm | 2 +- data/hidden_objects.asm | 8 ++++---- data/wildPokemon/ceruleancave1.asm | 18 ++++++++++++++++++ data/wildPokemon/ceruleancave2.asm | 13 +++++++++++++ data/wildPokemon/ceruleancaveb1.asm | 18 ++++++++++++++++++ data/wildPokemon/unknowndungeon1.asm | 18 ------------------ data/wildPokemon/unknowndungeon2.asm | 13 ------------- data/wildPokemon/unknowndungeonb1.asm | 18 ------------------ data/wild_mons.asm | 6 +++--- scripts/HallOfFame.asm | 2 +- 11 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 data/wildPokemon/ceruleancave1.asm create mode 100644 data/wildPokemon/ceruleancave2.asm create mode 100644 data/wildPokemon/ceruleancaveb1.asm delete mode 100755 data/wildPokemon/unknowndungeon1.asm delete mode 100755 data/wildPokemon/unknowndungeon2.asm delete mode 100755 data/wildPokemon/unknowndungeonb1.asm diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 90798882..03dd7777 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -25,7 +25,7 @@ Music_GameCorner:: Music_IntroBattle:: audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3 -; Power Plant, Unknown Dungeon, Rocket HQ +; Power Plant, Cerulean Cave, Rocket HQ Music_Dungeon1:: audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index d2077629..805d16ec 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -14,7 +14,7 @@ const_value = 0 const HS_CERULEAN_RIVAL ; 05 const HS_CERULEAN_ROCKET ; 06 const HS_CERULEAN_GUARD_1 ; 07 - const HS_UNKNOWN_DUNGEON_GUY ; 08 + const HS_CERULEAN_CAVE_GUY ; 08 const HS_CERULEAN_GUARD_2 ; 09 const HS_SAFFRON_CITY_1 ; 0A const HS_SAFFRON_CITY_2 ; 0B diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index b1bfd844..737947a7 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -137,8 +137,8 @@ HiddenObjectPointers: dw SilphCo5FHiddenObjects dw SilphCo9FHiddenObjects dw CopycatsHouse2FHiddenObjects - dw UnknownDungeon1HiddenObjects - dw UnknownDungeon3HiddenObjects + dw CeruleanCave1HiddenObjects + dw CeruleanCave3HiddenObjects dw PowerPlantHiddenObjects dw SeafoamIslands3HiddenObjects dw SeafoamIslands5HiddenObjects @@ -625,11 +625,11 @@ CopycatsHouse2FHiddenObjects: db $01,$01,NUGGET dbw BANK(HiddenItems),HiddenItems db $FF -UnknownDungeon1HiddenObjects: +CeruleanCave1HiddenObjects: db $0b,$0e,RARE_CANDY dbw BANK(HiddenItems),HiddenItems db $FF -UnknownDungeon3HiddenObjects: +CeruleanCave3HiddenObjects: db $03,$1b,ULTRA_BALL dbw BANK(HiddenItems),HiddenItems db $FF diff --git a/data/wildPokemon/ceruleancave1.asm b/data/wildPokemon/ceruleancave1.asm new file mode 100644 index 00000000..20e8643a --- /dev/null +++ b/data/wildPokemon/ceruleancave1.asm @@ -0,0 +1,18 @@ +DungeonMons1: + db $0A + db 46,GOLBAT + db 46,HYPNO + db 46,MAGNETON + db 49,DODRIO + db 49,VENOMOTH + IF DEF(_RED) + db 52,ARBOK + ENDC + IF DEF(_BLUE) + db 52,SANDSLASH + ENDC + db 49,KADABRA + db 52,PARASECT + db 53,RAICHU + db 53,DITTO + db $00 diff --git a/data/wildPokemon/ceruleancave2.asm b/data/wildPokemon/ceruleancave2.asm new file mode 100644 index 00000000..5afe55ac --- /dev/null +++ b/data/wildPokemon/ceruleancave2.asm @@ -0,0 +1,13 @@ +DungeonMons2: + db $0F + db 51,DODRIO + db 51,VENOMOTH + db 51,KADABRA + db 52,RHYDON + db 52,MAROWAK + db 52,ELECTRODE + db 56,CHANSEY + db 54,WIGGLYTUFF + db 55,DITTO + db 60,DITTO + db $00 diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/wildPokemon/ceruleancaveb1.asm new file mode 100644 index 00000000..245d5912 --- /dev/null +++ b/data/wildPokemon/ceruleancaveb1.asm @@ -0,0 +1,18 @@ +DungeonMonsB1: + db $19 + db 55,RHYDON + db 55,MAROWAK + db 55,ELECTRODE + db 64,CHANSEY + db 64,PARASECT + db 64,RAICHU + IF DEF(_RED) + db 57,ARBOK + ENDC + IF DEF(_BLUE) + db 57,SANDSLASH + ENDC + db 65,DITTO + db 63,DITTO + db 67,DITTO + db $00 diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm deleted file mode 100755 index 20e8643a..00000000 --- a/data/wildPokemon/unknowndungeon1.asm +++ /dev/null @@ -1,18 +0,0 @@ -DungeonMons1: - db $0A - db 46,GOLBAT - db 46,HYPNO - db 46,MAGNETON - db 49,DODRIO - db 49,VENOMOTH - IF DEF(_RED) - db 52,ARBOK - ENDC - IF DEF(_BLUE) - db 52,SANDSLASH - ENDC - db 49,KADABRA - db 52,PARASECT - db 53,RAICHU - db 53,DITTO - db $00 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm deleted file mode 100755 index 5afe55ac..00000000 --- a/data/wildPokemon/unknowndungeon2.asm +++ /dev/null @@ -1,13 +0,0 @@ -DungeonMons2: - db $0F - db 51,DODRIO - db 51,VENOMOTH - db 51,KADABRA - db 52,RHYDON - db 52,MAROWAK - db 52,ELECTRODE - db 56,CHANSEY - db 54,WIGGLYTUFF - db 55,DITTO - db 60,DITTO - db $00 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm deleted file mode 100755 index 245d5912..00000000 --- a/data/wildPokemon/unknowndungeonb1.asm +++ /dev/null @@ -1,18 +0,0 @@ -DungeonMonsB1: - db $19 - db 55,RHYDON - db 55,MAROWAK - db 55,ELECTRODE - db 64,CHANSEY - db 64,PARASECT - db 64,RAICHU - IF DEF(_RED) - db 57,ARBOK - ENDC - IF DEF(_BLUE) - db 57,SANDSLASH - ENDC - db 65,DITTO - db 63,DITTO - db 67,DITTO - db $00 diff --git a/data/wild_mons.asm b/data/wild_mons.asm index a2c9d6b2..e089a582 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -310,9 +310,9 @@ INCLUDE "data/wildPokemon/mansion2.asm" INCLUDE "data/wildPokemon/mansion3.asm" INCLUDE "data/wildPokemon/mansionb1.asm" INCLUDE "data/wildPokemon/route21.asm" -INCLUDE "data/wildPokemon/unknowndungeon1.asm" -INCLUDE "data/wildPokemon/unknowndungeon2.asm" -INCLUDE "data/wildPokemon/unknowndungeonb1.asm" +INCLUDE "data/wildPokemon/ceruleancave1.asm" +INCLUDE "data/wildPokemon/ceruleancave2.asm" +INCLUDE "data/wildPokemon/ceruleancaveb1.asm" INCLUDE "data/wildPokemon/powerplant.asm" INCLUDE "data/wildPokemon/route23.asm" INCLUDE "data/wildPokemon/victoryroad2.asm" diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 511c9754..af424089 100755 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -94,7 +94,7 @@ HallofFameRoomScript1: call DisplayTextID ld a, $ff ld [wJoyIgnore], a - ld a, HS_UNKNOWN_DUNGEON_GUY + ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject ld a, $2 -- cgit v1.2.3 From a8133da3ee11a2f52e1b18170189260872f6bc7e Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 21 Apr 2019 18:38:26 -0500 Subject: A few missed SFX constant IDs --- engine/menu/bills_pc.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 85a546e1..0864828a 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -106,7 +106,7 @@ BillsPC_:: bit 3, a ; accessing Bill's PC through another PC? jr nz, BillsPCMenu ; accessing it directly - ld a, $99 + ld a, SFX_TURN_ON_PC call PlaySound ld hl, SwitchOnText call PrintText @@ -191,7 +191,7 @@ ExitBillsPC: jr nz, .next ; accessing it directly call LoadTextBoxTilePatterns - ld a, $9a + ld a, SFX_TURN_OFF_PC call PlaySound call WaitForSoundToFinish .next -- cgit v1.2.3 From f99a715fae311d2611ec4a714b002e103c4642ca Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 7 Jul 2019 00:44:21 -0400 Subject: Replace some hard-coded values with constants --- audio.asm | 2 +- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 ++ constants/trainer_constants.asm | 4 +++- engine/battle/battle_transitions.asm | 2 +- engine/battle/core.asm | 2 +- engine/battle/read_trainer_party.asm | 2 +- engine/overworld/movement.asm | 16 +++++++++------- engine/palettes.asm | 2 +- engine/pokedex_rating.asm | 2 +- home.asm | 4 ++-- home/overworld.asm | 2 +- scripts/PokemonMansion3F.asm | 12 ++++++------ scripts/SeafoamIslands1F.asm | 2 +- scripts/SeafoamIslandsB1F.asm | 2 +- scripts/SeafoamIslandsB2F.asm | 2 +- scripts/SeafoamIslandsB3F.asm | 2 +- wram.asm | 5 +++-- 18 files changed, 37 insertions(+), 30 deletions(-) diff --git a/audio.asm b/audio.asm index 70cf06fc..ff7b721d 100644 --- a/audio.asm +++ b/audio.asm @@ -371,7 +371,7 @@ PlayBattleMusic:: jr .playSong .notGymLeaderBattle ld a, [wCurOpponent] - cp 200 + cp OPP_ID_OFFSET jr c, .wildBattle cp OPP_SONY3 jr z, .finalBattle diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 360fbb4c..b80547f7 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -152,4 +152,4 @@ const_value = 1 const DEX_MEWTWO ; 150 const DEX_MEW ; 151 -NUM_POKEMON EQU 151 +NUM_POKEMON EQU const_value + -1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index c4189911..f8a38731 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -190,3 +190,5 @@ const_value = 1 const BELLSPROUT ; $BC const WEEPINBELL ; $BD const VICTREEBEL ; $BE + +NUM_POKEMON_INDEXES EQU const_value + -1 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index ee890282..d936aa06 100755 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,6 +1,8 @@ +OPP_ID_OFFSET EQU 200 + trainer_const: MACRO \1 EQU const_value -OPP_\1 EQU const_value + 200 +OPP_\1 EQU const_value + OPP_ID_OFFSET const_value = const_value + 1 ENDM diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 1967d33b..436e38b5 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -82,7 +82,7 @@ BattleTransitions: GetBattleTransitionID_WildOrTrainer: ld a, [wCurOpponent] - cp 200 + cp OPP_ID_OFFSET jr nc, .trainer res 0, c ret diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 056a9588..04336810 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6867,7 +6867,7 @@ InitBattleCommon: res 1, [hl] callab InitBattleVariables ld a, [wEnemyMonSpecies2] - sub 200 + sub OPP_ID_OFFSET jp c, InitWildBattle ld [wTrainerClass], a call GetTrainerInformation diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index ba00083b..ba4f6f8e 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -101,7 +101,7 @@ ReadTrainer: ; get trainer class number ld a, [wCurOpponent] - sub 200 + sub OPP_ID_OFFSET ld b, a ld hl, TeamMoves diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index bbfbbc39..b561df7d 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,3 +1,5 @@ +MAP_TILESET_SIZE EQU $60 + UpdatePlayerSprite: ld a, [wSpriteStateData2] and a @@ -13,7 +15,7 @@ UpdatePlayerSprite: .checkIfTextBoxInFrontOfSprite aCoord 8, 9 ld [hTilePlayerStandingOn], a - cp $60 + cp MAP_TILESET_SIZE jr c, .lowerLeftTileIsMapTile .disableSprite ld a, $ff @@ -127,7 +129,7 @@ UpdateNPCSprite: and a jp z, InitializeSpriteStatus call CheckSpriteAvailability - ret c ; if sprite is invisible, on tile >=$60, in grass or player is currently walking + ret c ; if sprite is invisible, on tile >=MAP_TILESET_SIZE, in grass or player is currently walking ld h, $c1 ld a, [H_CURRENTSPRITEOFFSET] ld l, a @@ -508,21 +510,21 @@ CheckSpriteAvailability: ; make the sprite invisible if a text box is in front of it ; $5F is the maximum number for map tiles call GetTileSpriteStandsOn - ld d, $60 + ld d, MAP_TILESET_SIZE ld a, [hli] cp d - jr nc, .spriteInvisible ; standing on tile with ID >=$60 (bottom left tile) + jr nc, .spriteInvisible ; standing on tile with ID >=MAP_TILESET_SIZE (bottom left tile) ld a, [hld] cp d - jr nc, .spriteInvisible ; standing on tile with ID >=$60 (bottom right tile) + jr nc, .spriteInvisible ; standing on tile with ID >=MAP_TILESET_SIZE (bottom right tile) ld bc, -20 add hl, bc ; go back one row of tiles ld a, [hli] cp d - jr nc, .spriteInvisible ; standing on tile with ID >=$60 (top left tile) + jr nc, .spriteInvisible ; standing on tile with ID >=MAP_TILESET_SIZE (top left tile) ld a, [hl] cp d - jr c, .spriteVisible ; standing on tile with ID >=$60 (top right tile) + jr c, .spriteVisible ; standing on tile with ID >=MAP_TILESET_SIZE (top right tile) .spriteInvisible ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] diff --git a/engine/palettes.asm b/engine/palettes.asm index 4ab83f36..39991d48 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -70,7 +70,7 @@ SetPal_StatusScreen: ld bc, $10 call CopyData ld a, [wcf91] - cp VICTREEBEL + 1 + cp NUM_POKEMON_INDEXES + 1 jr c, .pokemon ld a, $1 ; not pokemon .pokemon diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm index aff9769e..f1aaf618 100755 --- a/engine/pokedex_rating.asm +++ b/engine/pokedex_rating.asm @@ -86,7 +86,7 @@ DexRatingsTable: dw PokedexRatingText_44242 db 150 dw PokedexRatingText_44247 - db 152 + db NUM_POKEMON + 1 dw PokedexRatingText_4424c PokedexRatingText_44201: diff --git a/home.asm b/home.asm index 70dab701..0397cb08 100644 --- a/home.asm +++ b/home.asm @@ -2390,7 +2390,7 @@ EndTrainerBattle:: ld b, FLAG_SET call TrainerFlagAction ; flag trainer as fought ld a, [wEnemyMonOrTrainerClass] - cp 200 + cp OPP_ID_OFFSET jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) ld hl, wMissableObjectList ld de, $2 @@ -2424,7 +2424,7 @@ InitBattleEnemyParameters:: ld a, [wEngagedTrainerClass] ld [wCurOpponent], a ld [wEnemyMonOrTrainerClass], a - cp 200 + cp OPP_ID_OFFSET ld a, [wEngagedTrainerSet] jr c, .noTrainer ld [wTrainerNo], a diff --git a/home/overworld.asm b/home/overworld.asm index 66bf73a7..9404a713 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -887,7 +887,7 @@ LoadTileBlockMap:: ld hl, wOverworldMap ld a, [wMapBackgroundTile] ld d, a - ld bc, $0514 + ld bc, wOverworldMapEnd - wOverworldMap .backgroundTileLoop ld a, d ld [hli], a diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index 3edc7bfd..ff172413 100755 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -16,18 +16,18 @@ Mansion3Script_52204: CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_52224 ld a, $e - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $5f - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret .asm_52224 ld a, $5f - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $e - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret @@ -43,9 +43,9 @@ Mansion3Script0: and a jp z, CheckFightingMapTrainers cp $3 - ld a, $a5 + ld a, POKEMON_MANSION_1F jr nz, .asm_52250 - ld a, $d6 + ld a, POKEMON_MANSION_2F .asm_52250 ld [wDungeonWarpDestinationMap], a ret diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm index dc3b8599..b024a6bd 100755 --- a/scripts/SeafoamIslands1F.asm +++ b/scripts/SeafoamIslands1F.asm @@ -32,7 +32,7 @@ SeafoamIslands1F_Script: ld [wMissableObjectIndex], a predef_jump ShowObject .asm_4483b - ld a, $9f + ld a, SEAFOAM_ISLANDS_B1F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam1HolesCoords jp IsPlayerOnDungeonWarp diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm index 876c0837..a4c5767b 100755 --- a/scripts/SeafoamIslandsB1F.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -31,7 +31,7 @@ SeafoamIslandsB1F_Script: ld [wMissableObjectIndex], a predef_jump ShowObject .asm_46362 - ld a, $a0 + ld a, SEAFOAM_ISLANDS_B2F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam2HolesCoords jp IsPlayerOnDungeonWarp diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm index c0141a3e..eb6d2437 100755 --- a/scripts/SeafoamIslandsB2F.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -31,7 +31,7 @@ SeafoamIslandsB2F_Script: ld [wMissableObjectIndex], a predef_jump ShowObject .asm_4649e - ld a, $a1 + ld a, SEAFOAM_ISLANDS_B3F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam3HolesCoords jp IsPlayerOnDungeonWarp diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index 7343b17d..c8fec338 100755 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -32,7 +32,7 @@ SeafoamIslandsB3F_Script: predef ShowObject jr .asm_465ed .asm_465dc - ld a, $a2 + ld a, SEAFOAM_ISLANDS_B4F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam4HolesCoords call IsPlayerOnDungeonWarp diff --git a/wram.asm b/wram.asm index 42485b1c..75331a61 100755 --- a/wram.asm +++ b/wram.asm @@ -346,6 +346,7 @@ wSerialEnemyMonsPatchList:: ; c5d0 wTempPic:: wOverworldMap:: ; c6e8 ds 1300 +wOverworldMapEnd:: wRedrawRowOrColumnSrcTiles:: ; cbfc ; the tiles of the row or column to be redrawn by RedrawRowOrColumn @@ -1638,7 +1639,7 @@ wPartyGainExpFlags:: ; d058 wCurOpponent:: ; d059 ; in a wild battle, this is the species of pokemon -; in a trainer battle, this is the trainer class + 200 +; in a trainer battle, this is the trainer class + OPP_ID_OFFSET ds 1 wBattleType:: ; d05a @@ -2916,7 +2917,7 @@ wFossilMon:: ; d710 ds 2 wEnemyMonOrTrainerClass:: ; d713 -; trainer classes start at 200 +; trainer classes start at OPP_ID_OFFSET ds 1 wPlayerJumpingYScreenCoordsIndex:: ; d714 -- cgit v1.2.3 From 20c4116788d4d29b14c85ffce77e65faf89716b7 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 27 Jul 2019 23:21:39 -0500 Subject: Update audio macro names change audio channel numbers from 0-7 back to 1-8 change all note macros back to single note macro todo: fix comments with old macro names, update noise macros/instrument names --- audio.asm | 16 +- audio/engine_1.asm | 84 +- audio/engine_2.asm | 92 +- audio/engine_3.asm | 80 +- audio/headers/musicheaders1.asm | 40 +- audio/headers/musicheaders2.asm | 14 +- audio/headers/musicheaders3.asm | 36 +- audio/headers/sfxheaders1.asm | 192 +-- audio/headers/sfxheaders2.asm | 238 ++-- audio/headers/sfxheaders3.asm | 206 +-- audio/music/bikeriding.asm | 852 +++++------ audio/music/celadon.asm | 666 ++++----- audio/music/cinnabar.asm | 472 +++---- audio/music/cinnabarmansion.asm | 176 +-- audio/music/cities1.asm | 950 ++++++------- audio/music/cities2.asm | 684 ++++----- audio/music/credits.asm | 1416 +++++++++---------- audio/music/defeatedgymleader.asm | 966 ++++++------- audio/music/defeatedtrainer.asm | 364 ++--- audio/music/defeatedwildmon.asm | 356 ++--- audio/music/dungeon1.asm | 864 ++++++------ audio/music/dungeon2.asm | 396 +++--- audio/music/dungeon3.asm | 926 ++++++------ audio/music/finalbattle.asm | 2074 +++++++++++++-------------- audio/music/gamecorner.asm | 880 ++++++------ audio/music/gym.asm | 592 ++++---- audio/music/gymleaderbattle.asm | 1750 +++++++++++------------ audio/music/halloffame.asm | 136 +- audio/music/indigoplateau.asm | 346 ++--- audio/music/introbattle.asm | 334 ++--- audio/music/jigglypuffsong.asm | 64 +- audio/music/lavender.asm | 282 ++-- audio/music/meeteviltrainer.asm | 112 +- audio/music/meetfemaletrainer.asm | 142 +- audio/music/meetmaletrainer.asm | 196 +-- audio/music/meetprofoak.asm | 532 +++---- audio/music/meetrival.asm | 492 +++---- audio/music/museumguy.asm | 360 ++--- audio/music/oakslab.asm | 426 +++--- audio/music/pallettown.asm | 506 +++---- audio/music/pkmnhealed.asm | 66 +- audio/music/pokecenter.asm | 644 ++++----- audio/music/pokemontower.asm | 550 ++++---- audio/music/routes1.asm | 468 +++---- audio/music/routes2.asm | 440 +++--- audio/music/routes3.asm | 506 +++---- audio/music/routes4.asm | 752 +++++----- audio/music/safarizone.asm | 136 +- audio/music/silphco.asm | 1308 ++++++++--------- audio/music/ssanne.asm | 528 +++---- audio/music/surfing.asm | 548 ++++---- audio/music/titlescreen.asm | 682 ++++----- audio/music/trainerbattle.asm | 2634 +++++++++++++++++------------------ audio/music/unusedsong.asm | 368 ++--- audio/music/vermilion.asm | 498 +++---- audio/music/wildbattle.asm | 1284 ++++++++--------- audio/sfx/59_1.asm | 18 +- audio/sfx/59_3.asm | 18 +- audio/sfx/arrow_tiles_1.asm | 12 +- audio/sfx/arrow_tiles_3.asm | 12 +- audio/sfx/ball_poof.asm | 18 +- audio/sfx/ball_toss.asm | 18 +- audio/sfx/battle_09.asm | 12 +- audio/sfx/battle_0b.asm | 6 +- audio/sfx/battle_0c.asm | 10 +- audio/sfx/battle_0d.asm | 10 +- audio/sfx/battle_0e.asm | 8 +- audio/sfx/battle_0f.asm | 12 +- audio/sfx/battle_12.asm | 12 +- audio/sfx/battle_13.asm | 12 +- audio/sfx/battle_14.asm | 12 +- audio/sfx/battle_16.asm | 10 +- audio/sfx/battle_17.asm | 12 +- audio/sfx/battle_18.asm | 8 +- audio/sfx/battle_19.asm | 10 +- audio/sfx/battle_1b.asm | 8 +- audio/sfx/battle_1c.asm | 10 +- audio/sfx/battle_1e.asm | 28 +- audio/sfx/battle_20.asm | 8 +- audio/sfx/battle_21.asm | 14 +- audio/sfx/battle_22.asm | 8 +- audio/sfx/battle_23.asm | 14 +- audio/sfx/battle_24.asm | 20 +- audio/sfx/battle_25.asm | 14 +- audio/sfx/battle_26.asm | 18 +- audio/sfx/battle_27.asm | 38 +- audio/sfx/battle_28.asm | 34 +- audio/sfx/battle_29.asm | 32 +- audio/sfx/battle_2a.asm | 48 +- audio/sfx/battle_2b.asm | 38 +- audio/sfx/battle_2c.asm | 42 +- audio/sfx/battle_2e.asm | 46 +- audio/sfx/battle_2f.asm | 34 +- audio/sfx/battle_31.asm | 32 +- audio/sfx/battle_32.asm | 20 +- audio/sfx/battle_33.asm | 32 +- audio/sfx/battle_34.asm | 36 +- audio/sfx/battle_35.asm | 38 +- audio/sfx/battle_36.asm | 82 +- audio/sfx/caught_mon.asm | 94 +- audio/sfx/collision_1.asm | 12 +- audio/sfx/collision_3.asm | 12 +- audio/sfx/cry00_1.asm | 34 +- audio/sfx/cry00_2.asm | 34 +- audio/sfx/cry00_3.asm | 34 +- audio/sfx/cry01_1.asm | 40 +- audio/sfx/cry01_2.asm | 40 +- audio/sfx/cry01_3.asm | 40 +- audio/sfx/cry02_1.asm | 26 +- audio/sfx/cry02_2.asm | 26 +- audio/sfx/cry02_3.asm | 26 +- audio/sfx/cry03_1.asm | 52 +- audio/sfx/cry03_2.asm | 52 +- audio/sfx/cry03_3.asm | 52 +- audio/sfx/cry04_1.asm | 56 +- audio/sfx/cry04_2.asm | 56 +- audio/sfx/cry04_3.asm | 56 +- audio/sfx/cry05_1.asm | 30 +- audio/sfx/cry05_2.asm | 30 +- audio/sfx/cry05_3.asm | 30 +- audio/sfx/cry06_1.asm | 36 +- audio/sfx/cry06_2.asm | 36 +- audio/sfx/cry06_3.asm | 36 +- audio/sfx/cry07_1.asm | 34 +- audio/sfx/cry07_2.asm | 34 +- audio/sfx/cry07_3.asm | 34 +- audio/sfx/cry08_1.asm | 38 +- audio/sfx/cry08_2.asm | 38 +- audio/sfx/cry08_3.asm | 38 +- audio/sfx/cry09_1.asm | 62 +- audio/sfx/cry09_2.asm | 62 +- audio/sfx/cry09_3.asm | 62 +- audio/sfx/cry0a_1.asm | 62 +- audio/sfx/cry0a_2.asm | 62 +- audio/sfx/cry0a_3.asm | 62 +- audio/sfx/cry0b_1.asm | 66 +- audio/sfx/cry0b_2.asm | 66 +- audio/sfx/cry0b_3.asm | 66 +- audio/sfx/cry0c_1.asm | 50 +- audio/sfx/cry0c_2.asm | 50 +- audio/sfx/cry0c_3.asm | 50 +- audio/sfx/cry0d_1.asm | 72 +- audio/sfx/cry0d_2.asm | 72 +- audio/sfx/cry0d_3.asm | 72 +- audio/sfx/cry0e_1.asm | 38 +- audio/sfx/cry0e_2.asm | 38 +- audio/sfx/cry0e_3.asm | 38 +- audio/sfx/cry0f_1.asm | 50 +- audio/sfx/cry0f_2.asm | 50 +- audio/sfx/cry0f_3.asm | 50 +- audio/sfx/cry10_1.asm | 54 +- audio/sfx/cry10_2.asm | 54 +- audio/sfx/cry10_3.asm | 54 +- audio/sfx/cry11_1.asm | 60 +- audio/sfx/cry11_2.asm | 60 +- audio/sfx/cry11_3.asm | 60 +- audio/sfx/cry12_1.asm | 40 +- audio/sfx/cry12_2.asm | 40 +- audio/sfx/cry12_3.asm | 40 +- audio/sfx/cry13_1.asm | 52 +- audio/sfx/cry13_2.asm | 52 +- audio/sfx/cry13_3.asm | 52 +- audio/sfx/cry14_1.asm | 34 +- audio/sfx/cry14_2.asm | 34 +- audio/sfx/cry14_3.asm | 34 +- audio/sfx/cry15_1.asm | 52 +- audio/sfx/cry15_2.asm | 52 +- audio/sfx/cry15_3.asm | 52 +- audio/sfx/cry16_1.asm | 34 +- audio/sfx/cry16_2.asm | 34 +- audio/sfx/cry16_3.asm | 34 +- audio/sfx/cry17_1.asm | 40 +- audio/sfx/cry17_2.asm | 40 +- audio/sfx/cry17_3.asm | 40 +- audio/sfx/cry18_1.asm | 60 +- audio/sfx/cry18_2.asm | 60 +- audio/sfx/cry18_3.asm | 60 +- audio/sfx/cry19_1.asm | 28 +- audio/sfx/cry19_2.asm | 28 +- audio/sfx/cry19_3.asm | 28 +- audio/sfx/cry1a_1.asm | 52 +- audio/sfx/cry1a_2.asm | 52 +- audio/sfx/cry1a_3.asm | 52 +- audio/sfx/cry1b_1.asm | 44 +- audio/sfx/cry1b_2.asm | 44 +- audio/sfx/cry1b_3.asm | 44 +- audio/sfx/cry1c_1.asm | 54 +- audio/sfx/cry1c_2.asm | 54 +- audio/sfx/cry1c_3.asm | 54 +- audio/sfx/cry1d_1.asm | 50 +- audio/sfx/cry1d_2.asm | 50 +- audio/sfx/cry1d_3.asm | 50 +- audio/sfx/cry1e_1.asm | 68 +- audio/sfx/cry1e_2.asm | 68 +- audio/sfx/cry1e_3.asm | 68 +- audio/sfx/cry1f_1.asm | 40 +- audio/sfx/cry1f_2.asm | 40 +- audio/sfx/cry1f_3.asm | 40 +- audio/sfx/cry20_1.asm | 40 +- audio/sfx/cry20_2.asm | 40 +- audio/sfx/cry20_3.asm | 40 +- audio/sfx/cry21_1.asm | 46 +- audio/sfx/cry21_2.asm | 46 +- audio/sfx/cry21_3.asm | 46 +- audio/sfx/cry22_1.asm | 40 +- audio/sfx/cry22_2.asm | 40 +- audio/sfx/cry22_3.asm | 40 +- audio/sfx/cry23_1.asm | 42 +- audio/sfx/cry23_2.asm | 42 +- audio/sfx/cry23_3.asm | 42 +- audio/sfx/cry24_1.asm | 58 +- audio/sfx/cry24_2.asm | 58 +- audio/sfx/cry24_3.asm | 58 +- audio/sfx/cry25_1.asm | 44 +- audio/sfx/cry25_2.asm | 44 +- audio/sfx/cry25_3.asm | 44 +- audio/sfx/cut_1.asm | 14 +- audio/sfx/cut_3.asm | 14 +- audio/sfx/cymbal1_1.asm | 6 +- audio/sfx/cymbal1_2.asm | 6 +- audio/sfx/cymbal1_3.asm | 6 +- audio/sfx/cymbal2_1.asm | 6 +- audio/sfx/cymbal2_2.asm | 6 +- audio/sfx/cymbal2_3.asm | 6 +- audio/sfx/cymbal3_1.asm | 6 +- audio/sfx/cymbal3_2.asm | 6 +- audio/sfx/cymbal3_3.asm | 6 +- audio/sfx/damage.asm | 10 +- audio/sfx/denied_1.asm | 32 +- audio/sfx/denied_3.asm | 32 +- audio/sfx/dex_page_added.asm | 26 +- audio/sfx/doubleslap.asm | 8 +- audio/sfx/enter_pc_1.asm | 14 +- audio/sfx/enter_pc_3.asm | 14 +- audio/sfx/faint_fall.asm | 12 +- audio/sfx/faint_thud.asm | 18 +- audio/sfx/fly_1.asm | 36 +- audio/sfx/fly_3.asm | 36 +- audio/sfx/get_item1_1.asm | 60 +- audio/sfx/get_item1_3.asm | 60 +- audio/sfx/get_item2_1.asm | 98 +- audio/sfx/get_item2_2.asm | 98 +- audio/sfx/get_item2_3.asm | 98 +- audio/sfx/get_key_item_1.asm | 94 +- audio/sfx/get_key_item_3.asm | 94 +- audio/sfx/go_inside_1.asm | 8 +- audio/sfx/go_inside_3.asm | 8 +- audio/sfx/go_outside_1.asm | 14 +- audio/sfx/go_outside_3.asm | 14 +- audio/sfx/heal_ailment_1.asm | 18 +- audio/sfx/heal_ailment_2.asm | 18 +- audio/sfx/heal_ailment_3.asm | 18 +- audio/sfx/heal_hp_1.asm | 14 +- audio/sfx/heal_hp_2.asm | 14 +- audio/sfx/heal_hp_3.asm | 14 +- audio/sfx/healing_machine_1.asm | 18 +- audio/sfx/healing_machine_3.asm | 18 +- audio/sfx/horn_drill.asm | 12 +- audio/sfx/intro_crash.asm | 8 +- audio/sfx/intro_hip.asm | 12 +- audio/sfx/intro_hop.asm | 12 +- audio/sfx/intro_lunge.asm | 20 +- audio/sfx/intro_raise.asm | 10 +- audio/sfx/intro_whoosh.asm | 14 +- audio/sfx/ledge_1.asm | 12 +- audio/sfx/ledge_3.asm | 12 +- audio/sfx/level_up.asm | 94 +- audio/sfx/muted_snare1_1.asm | 8 +- audio/sfx/muted_snare1_2.asm | 8 +- audio/sfx/muted_snare1_3.asm | 8 +- audio/sfx/muted_snare2_1.asm | 6 +- audio/sfx/muted_snare2_2.asm | 6 +- audio/sfx/muted_snare2_3.asm | 6 +- audio/sfx/muted_snare3_1.asm | 6 +- audio/sfx/muted_snare3_2.asm | 6 +- audio/sfx/muted_snare3_3.asm | 6 +- audio/sfx/muted_snare4_1.asm | 6 +- audio/sfx/muted_snare4_2.asm | 6 +- audio/sfx/muted_snare4_3.asm | 6 +- audio/sfx/not_very_effective.asm | 12 +- audio/sfx/peck.asm | 6 +- audio/sfx/poisoned_1.asm | 16 +- audio/sfx/poisoned_3.asm | 16 +- audio/sfx/pokedex_rating_1.asm | 94 +- audio/sfx/pokedex_rating_3.asm | 94 +- audio/sfx/pokeflute.asm | 32 +- audio/sfx/pokeflute_ch4_ch5.asm | 14 - audio/sfx/pokeflute_ch5_ch6.asm | 14 + audio/sfx/pokeflute_ch6.asm | 13 - audio/sfx/pokeflute_ch7.asm | 13 + audio/sfx/pound.asm | 6 +- audio/sfx/press_ab_1.asm | 14 +- audio/sfx/press_ab_2.asm | 14 +- audio/sfx/press_ab_3.asm | 14 +- audio/sfx/psybeam.asm | 42 +- audio/sfx/psychic_m.asm | 56 +- audio/sfx/purchase_1.asm | 22 +- audio/sfx/purchase_3.asm | 22 +- audio/sfx/push_boulder_1.asm | 20 +- audio/sfx/push_boulder_3.asm | 20 +- audio/sfx/run.asm | 26 +- audio/sfx/safari_zone_pa.asm | 18 +- audio/sfx/save_1.asm | 42 +- audio/sfx/save_3.asm | 56 +- audio/sfx/shooting_star.asm | 28 +- audio/sfx/shrink_1.asm | 20 +- audio/sfx/shrink_3.asm | 20 +- audio/sfx/silph_scope.asm | 18 +- audio/sfx/slots_new_spin.asm | 24 +- audio/sfx/slots_reward.asm | 10 +- audio/sfx/slots_stop_wheel.asm | 12 +- audio/sfx/snare1_1.asm | 6 +- audio/sfx/snare1_2.asm | 6 +- audio/sfx/snare1_3.asm | 6 +- audio/sfx/snare2_1.asm | 6 +- audio/sfx/snare2_2.asm | 6 +- audio/sfx/snare2_3.asm | 6 +- audio/sfx/snare3_1.asm | 6 +- audio/sfx/snare3_2.asm | 6 +- audio/sfx/snare3_3.asm | 6 +- audio/sfx/snare4_1.asm | 6 +- audio/sfx/snare4_2.asm | 6 +- audio/sfx/snare4_3.asm | 6 +- audio/sfx/snare5_1.asm | 16 +- audio/sfx/snare5_2.asm | 16 +- audio/sfx/snare5_3.asm | 16 +- audio/sfx/snare6_1.asm | 6 +- audio/sfx/snare6_2.asm | 6 +- audio/sfx/snare6_3.asm | 6 +- audio/sfx/snare7_1.asm | 6 +- audio/sfx/snare7_2.asm | 6 +- audio/sfx/snare7_3.asm | 6 +- audio/sfx/snare8_1.asm | 6 +- audio/sfx/snare8_2.asm | 6 +- audio/sfx/snare8_3.asm | 6 +- audio/sfx/snare9_1.asm | 6 +- audio/sfx/snare9_2.asm | 6 +- audio/sfx/snare9_3.asm | 6 +- audio/sfx/ss_anne_horn_1.asm | 40 +- audio/sfx/ss_anne_horn_3.asm | 40 +- audio/sfx/start_menu_1.asm | 8 +- audio/sfx/start_menu_2.asm | 8 +- audio/sfx/start_menu_3.asm | 8 +- audio/sfx/super_effective.asm | 8 +- audio/sfx/swap_1.asm | 18 +- audio/sfx/swap_3.asm | 18 +- audio/sfx/switch_1.asm | 16 +- audio/sfx/switch_3.asm | 16 +- audio/sfx/teleport_enter1_1.asm | 20 +- audio/sfx/teleport_enter1_3.asm | 20 +- audio/sfx/teleport_enter2_1.asm | 12 +- audio/sfx/teleport_enter2_3.asm | 12 +- audio/sfx/teleport_exit1_1.asm | 20 +- audio/sfx/teleport_exit1_3.asm | 20 +- audio/sfx/teleport_exit2_1.asm | 12 +- audio/sfx/teleport_exit2_3.asm | 12 +- audio/sfx/tink_1.asm | 16 +- audio/sfx/tink_2.asm | 16 +- audio/sfx/tink_3.asm | 16 +- audio/sfx/trade_machine_1.asm | 14 +- audio/sfx/trade_machine_3.asm | 14 +- audio/sfx/triangle1_1.asm | 6 +- audio/sfx/triangle1_2.asm | 6 +- audio/sfx/triangle1_3.asm | 6 +- audio/sfx/triangle2_1.asm | 8 +- audio/sfx/triangle2_2.asm | 8 +- audio/sfx/triangle2_3.asm | 8 +- audio/sfx/triangle3_1.asm | 8 +- audio/sfx/triangle3_2.asm | 8 +- audio/sfx/triangle3_3.asm | 8 +- audio/sfx/turn_off_pc_1.asm | 14 +- audio/sfx/turn_off_pc_3.asm | 14 +- audio/sfx/turn_on_pc_1.asm | 26 +- audio/sfx/turn_on_pc_3.asm | 28 +- audio/sfx/unused2_2.asm | 72 +- audio/sfx/unused_1.asm | 54 +- audio/sfx/unused_2.asm | 54 +- audio/sfx/unused_3.asm | 54 +- audio/sfx/vine_whip.asm | 20 +- audio/sfx/withdraw_deposit_1.asm | 24 +- audio/sfx/withdraw_deposit_3.asm | 24 +- engine/battle/core.asm | 6 +- engine/battle/end_of_battle.asm | 2 +- engine/evolution.asm | 2 +- engine/hidden_object_functions7.asm | 2 +- engine/items/items.asm | 6 +- engine/overworld/elevator.asm | 2 +- home.asm | 2 +- home/audio.asm | 2 +- home/overworld.asm | 4 +- macros/audio_macros.asm | 107 +- scripts/PewterPokecenter.asm | 2 +- 392 files changed, 20220 insertions(+), 20251 deletions(-) delete mode 100644 audio/sfx/pokeflute_ch4_ch5.asm create mode 100644 audio/sfx/pokeflute_ch5_ch6.asm delete mode 100644 audio/sfx/pokeflute_ch6.asm create mode 100644 audio/sfx/pokeflute_ch7.asm diff --git a/audio.asm b/audio.asm index ff7b721d..4305657c 100644 --- a/audio.asm +++ b/audio.asm @@ -155,7 +155,7 @@ 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/pokeflute_ch6.asm" +INCLUDE "audio/sfx/pokeflute_ch7.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -470,7 +470,7 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 - ld [wChannelSoundIDs + Ch4], a ;disable sound channel? + ld [wChannelSoundIDs + Ch5], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a @@ -484,7 +484,7 @@ Music_DoLowHealthAlarm:: .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + Ch4], a ;re-enable sound channel? + ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -535,12 +535,12 @@ Music_PokeFluteInBattle:: ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrite the channel pointers - ld hl, wChannelCommandPointers + Ch4 * 2 - ld de, SFX_08_PokeFlute_Ch4 + ld hl, wChannelCommandPointers + Ch5 * 2 + ld de, SFX_Pokeflute_Ch5 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch5 + ld de, SFX_Pokeflute_Ch6 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch6 + ld de, SFX_Pokeflute_Ch7 Audio2_OverwriteChannelPointer: ld a, e @@ -625,7 +625,7 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX ; BANK $08 -INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" +INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm" INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" diff --git a/audio/engine_1.asm b/audio/engine_1.asm index bab1be55..8b021acf 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,7 +1,7 @@ ; The first of three duplicated sound engines. Audio1_UpdateMusic:: - ld c, Ch0 + ld c, Ch1 .loop ld b, 0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio1_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp Ch4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio1_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp Ch7 + cp Ch8 jr nz, .loop ret @@ -46,9 +46,9 @@ Audio1_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp Ch4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -171,7 +171,7 @@ Audio1_endchannel: bit BIT_CHANNEL_CALL, [hl] jr nz, .returnFromCall ld a, c - cp Ch3 + cp Ch4 jr nc, .noiseOrSfxChannel jr .disableChannelOutput .noiseOrSfxChannel @@ -179,7 +179,7 @@ Audio1_endchannel: ld hl, wChannelFlags2 add hl, bc res BIT_EXECUTE_MUSIC, [hl] - cp Ch6 + cp Ch7 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output ld a, $0 @@ -223,19 +223,19 @@ Audio1_endchannel: and [hl] ld [rNR51], a .asm_9248 - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START jr nc, .asm_9251 jr .skipCry .asm_9251 - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_END jr z, .skipCry jr c, .cry jr .skipCry .cry ld a, c - cp Ch4 + cp Ch5 jr z, .asm_9265 call Audio1_GoBackOneCommandIfCry ret c @@ -336,14 +336,14 @@ Audio1_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp Ch3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio1_GetNextMusicByte ld d, a ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 + cp Ch7 jr nz, .skipChannel3 ld hl, wSfxWaveInstrument jr .channel3 @@ -477,7 +477,7 @@ Audio1_tempo: cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel call Audio1_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -520,10 +520,10 @@ Audio1_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .skip jp Audio1_endchannel @@ -577,7 +577,7 @@ Audio1_sfxnote: cp $20 ; is this command a sfxnote? jr nz, Audio1_pitchenvelope ld a, c - cp Ch3 ; is this a noise or sfx channel? + cp Ch4 ; is this a noise or sfx channel? jr c, Audio1_pitchenvelope ; no ld b, 0 ld hl, wChannelFlags2 @@ -607,7 +607,7 @@ Audio1_sfxnote: call Audio1_GetNextMusicByte ld e, a ld a, c - cp Ch7 + cp Ch8 ld a, 0 jr z, .skip ; Channels 1 through 3 have 2 registers that control frequency, but the noise @@ -627,7 +627,7 @@ Audio1_sfxnote: Audio1_pitchenvelope: ld a, c - cp Ch4 + cp Ch5 jr c, Audio1_note ; if not a sfx ld a, d cp $10 ; is this command a pitchenvelope? @@ -643,7 +643,7 @@ Audio1_pitchenvelope: Audio1_note: ld a, c - cp Ch3 + cp Ch4 jr nz, Audio1_notelength ; if not noise channel ld a, d and $f0 @@ -691,7 +691,7 @@ Audio1_notelength: ld l, b call Audio1_MultiplyAdd ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -701,7 +701,7 @@ Audio1_notelength: .sfxChannel ld d, $1 ld e, $0 - cp Ch7 + cp Ch8 jr z, .skip ; if noise channel call Audio1_SetSfxTempo ld a, [wSfxTempo] @@ -741,10 +741,10 @@ Audio1_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp Ch4 + cp Ch5 jr nc, .next ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -752,9 +752,9 @@ Audio1_notepitch: ; fall through .next ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 + cp Ch7 jr nz, .notChannel3 .channel3 ld b, 0 @@ -790,10 +790,10 @@ Audio1_notepitch: .skipPitchBend push de ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld d, 0 ld e, a add hl, de @@ -838,12 +838,12 @@ Audio1_EnableChannelOutput: or [hl] ; set this channel's bits ld d, a ld a, c - cp Ch7 + cp Ch8 jr z, .noiseChannelOrNoSfx - cp Ch4 + cp Ch5 jr nc, .skip ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -873,9 +873,9 @@ Audio1_ApplyDutyAndSoundLength: add hl, bc ld d, [hl] ld a, c - cp Ch2 + cp Ch3 jr z, .skipDuty ; if music channel 3 - cp Ch6 + cp Ch7 jr z, .skipDuty ; if sfx channel 3 ; include duty (except on channel 3 which doesn't have it) ld a, d @@ -894,15 +894,15 @@ Audio1_ApplyDutyAndSoundLength: Audio1_ApplyWavePatternAndFrequency: ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 + cp Ch7 jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp Ch2 + cp Ch3 jr z, .next ld de, wSfxWaveInstrument .next @@ -1006,7 +1006,7 @@ Audio1_GoBackOneCommandIfCry: Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START jr nc, .next jr .no @@ -1542,7 +1542,7 @@ Audio1_PlaySound:: add hl, de ld [hl], a ld a, e - cp Ch4 + cp Ch5 jr nz, .asm_9a2b ld a, $8 ld [rNR10], a ; sweep off @@ -1644,7 +1644,7 @@ Audio1_PlaySound:: ld a, [wSoundID] ld [hl], a pop af - cp Ch3 + cp Ch4 jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc @@ -1676,12 +1676,12 @@ Audio1_PlaySound:: jr c, .cry jr .done .cry - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx wave channel pointer + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer ld de, Audio1_CryEndchannel ld [hl], e inc hl @@ -1697,7 +1697,7 @@ Audio1_PlaySound:: ret Audio1_CryEndchannel: - endchannel + sound_ret Audio1_HWChannelBaseAddresses: ; the low bytes of each HW channel's base address diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 2ca5cbe8..4f7f6277 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,7 +1,7 @@ ; The second of three duplicated sound engines. Audio2_UpdateMusic:: - ld c, Ch0 + ld c, Ch1 .loop ld b, $0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio2_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp Ch4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio2_UpdateMusic:: .nextChannel ld a, c inc c - cp Ch7 + cp Ch8 jr nz, .loop ret @@ -52,9 +52,9 @@ Audio2_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp Ch4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -160,7 +160,7 @@ Audio2_PlayNextNote: res 4, [hl] res 5, [hl] ld a, c - cp Ch4 + cp Ch5 jr nz, .beginChecks ld a, [wLowHealthAlarm] ;low health alarm enabled? bit 7, a @@ -180,7 +180,7 @@ Audio2_endchannel: bit 1, [hl] jr nz, .returnFromCall ld a, c - cp Ch3 + cp Ch4 jr nc, .noiseOrSfxChannel jr .asm_219c0 .noiseOrSfxChannel @@ -188,7 +188,7 @@ Audio2_endchannel: ld hl, wChannelFlags2 add hl, bc res 0, [hl] - cp Ch6 + cp Ch7 jr nz, .notSfxChannel3 ld a, $0 ld [rNR30], a @@ -231,19 +231,19 @@ Audio2_endchannel: and [hl] ld [rNR51], a .asm_219c9 - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp $14 jr nc, .asm_219d2 jr .asm_219ef .asm_219d2 - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp $86 jr z, .asm_219ef jr c, .asm_219dd jr .asm_219ef .asm_219dd ld a, c - cp Ch4 + cp Ch5 jr z, .asm_219e6 call Audio2_21e6d ret c @@ -344,14 +344,14 @@ Audio2_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp Ch3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio2_GetNextMusicByte ld d, a ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 + cp Ch7 jr nz, .notChannel3 ld hl, wSfxWaveInstrument jr .sfxChannel3 @@ -471,7 +471,7 @@ Audio2_tempo: cp $ed ; is this command a tempo? jr nz, Audio2_stereopanning ; no ld a, c ; yes - cp Ch4 + cp Ch5 jr nc, .sfxChannel call Audio2_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -514,10 +514,10 @@ Audio2_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .skip jp Audio2_endchannel @@ -571,7 +571,7 @@ Audio2_sfxnote: cp $20 ; is this command an sfxnote? jr nz, Audio2_pitchenvelope ; no ld a, c - cp Ch3 ; is this a noise or sfx channel? + cp Ch4 ; is this a noise or sfx channel? jr c, Audio2_pitchenvelope ; no ld b, $0 ld hl, wChannelFlags2 @@ -597,7 +597,7 @@ Audio2_sfxnote: call Audio2_GetNextMusicByte ld e, a ld a, c - cp Ch7 + cp Ch8 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de @@ -614,7 +614,7 @@ Audio2_sfxnote: Audio2_pitchenvelope: ld a, c - cp Ch4 + cp Ch5 jr c, Audio2_note ; if not a sfx ld a, d cp $10 ; is this command a pitchenvelope? @@ -630,7 +630,7 @@ Audio2_pitchenvelope: Audio2_note: ld a, c - cp Ch3 + cp Ch4 jr nz, Audio2_notelength ; if not noise channel ld a, d and $f0 @@ -678,7 +678,7 @@ Audio2_notelength: ld l, b call Audio2_22006 ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -688,7 +688,7 @@ Audio2_notelength: .sfxChannel ld d, $1 ld e, $0 - cp Ch7 + cp Ch8 jr z, .skip ; if noise channel call Audio2_21e2f ld a, [wSfxTempo] @@ -728,9 +728,9 @@ Audio2_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -738,9 +738,9 @@ Audio2_notepitch: ; fall through .sfxChannel ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 + cp Ch7 jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 @@ -776,9 +776,9 @@ Audio2_notepitch: .asm_21d39 push de ld a, c - cp Ch4 + cp Ch5 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld d, $0 ld e, a add hl, de @@ -823,11 +823,11 @@ Audio2_21d79: or [hl] ld d, a ld a, c - cp Ch7 + cp Ch8 jr z, .sfxNoiseChannel - cp Ch4 + cp Ch5 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -855,9 +855,9 @@ Audio2_21daa: add hl, bc ld d, [hl] ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 ; if music channel 3 - cp Ch6 + cp Ch7 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -875,15 +875,15 @@ Audio2_21daa: Audio2_21dcc: ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 + cp Ch7 jr nz, .notSfxChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp Ch2 + cp Ch3 jr z, .musicChannel3 ld de, wSfxWaveInstrument .musicChannel3 @@ -922,7 +922,7 @@ Audio2_21dcc: inc hl ld [hl], d ld a, c - cp Ch4 + cp Ch5 jr c, .musicChannel call Audio2_21e56 .musicChannel @@ -930,7 +930,7 @@ Audio2_21dcc: Audio2_21e19: ld a, c - cp Ch4 + cp Ch5 jr nz, .asm_21e2e ld a, [wLowHealthAlarm] bit 7, a @@ -1009,7 +1009,7 @@ Audio2_21e6d: ret Audio2_21e8b: - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp $14 jr nc, .asm_21e94 jr .asm_21e9a @@ -1026,9 +1026,9 @@ Audio2_21e8b: ret Audio2_21e9f: - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld b, a - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] or b cp $9d jr nc, .asm_21ead @@ -1314,7 +1314,7 @@ Audio2_22017: ld d, [hl] ld a, b .loop - cp Ch7 + cp Ch8 jr z, .done sra d rr e @@ -1683,12 +1683,12 @@ Audio2_2224e: jr c, .asm_222b5 jr .asm_222d4 .asm_222b5 - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer ld de, Noise2_endchannel ld [hl], e inc hl @@ -1704,7 +1704,7 @@ Audio2_2224e: ret Noise2_endchannel: - endchannel + sound_ret Unknown_222d6: db $10, $15, $1A, $1F ; channels 0-3 diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 9a95f3e1..cf435740 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,7 +1,7 @@ ; The third of three duplicated sound engines. Audio3_UpdateMusic:: - ld c, Ch0 + ld c, Ch1 .loop ld b, $0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio3_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp Ch4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio3_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp Ch7 + cp Ch8 jr nz, .loop ret @@ -52,9 +52,9 @@ Audio3_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp Ch4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -173,7 +173,7 @@ Audio3_endchannel: bit 1, [hl] jr nz, .returnFromCall ld a, c - cp Ch3 + cp Ch4 jr nc, .noiseOrSfxChannel jr .asm_7d2b3 .noiseOrSfxChannel @@ -181,7 +181,7 @@ Audio3_endchannel: ld hl, wChannelFlags2 add hl, bc res 0, [hl] - cp Ch6 + cp Ch7 jr nz, .notSfxChannel3 ld a, $0 ld [rNR30], a @@ -224,19 +224,19 @@ Audio3_endchannel: and [hl] ld [rNR51], a .asm_7d2bc - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp $14 jr nc, .asm_7d2c5 jr .asm_7d2e2 .asm_7d2c5 - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp $86 jr z, .asm_7d2e2 jr c, .asm_7d2d0 jr .asm_7d2e2 .asm_7d2d0 ld a, c - cp Ch4 + cp Ch5 jr z, .asm_7d2d9 call Audio3_7d73b ret c @@ -337,14 +337,14 @@ Audio3_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp Ch3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio3_GetNextMusicByte ld d, a ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 + cp Ch7 jr nz, .notChannel3 ld hl, wSfxWaveInstrument jr .sfxChannel3 @@ -464,7 +464,7 @@ Audio3_tempo: cp $ed ; is this command a tempo? jr nz, Audio3_stereopanning ; no ld a, c ; yes - cp Ch4 + cp Ch5 jr nc, .sfxChannel call Audio3_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -507,10 +507,10 @@ Audio3_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .skip jp Audio3_endchannel @@ -564,7 +564,7 @@ Audio3_sfxnote: cp $20 ; is this command an sfxnote? jr nz, Audio3_pitchenvelope ; no ld a, c - cp Ch3 ; is this a noise or sfx channel? + cp Ch4 ; is this a noise or sfx channel? jr c, Audio3_pitchenvelope ; no ld b, $0 ld hl, wChannelFlags2 @@ -590,7 +590,7 @@ Audio3_sfxnote: call Audio3_GetNextMusicByte ld e, a ld a, c - cp Ch7 + cp Ch8 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de @@ -607,7 +607,7 @@ Audio3_sfxnote: Audio3_pitchenvelope: ld a, c - cp Ch4 + cp Ch5 jr c, Audio3_note ; if not a sfx ld a, d cp $10 ; is this command an pitchenvelope? @@ -623,7 +623,7 @@ Audio3_pitchenvelope: Audio3_note: ld a, c - cp Ch3 + cp Ch4 jr nz, Audio3_notelength ; if not noise channel ld a, d and $f0 @@ -671,7 +671,7 @@ Audio3_notelength: ld l, b call Audio3_7d8bb ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -681,7 +681,7 @@ Audio3_notelength: .sfxChannel ld d, $1 ld e, $0 - cp Ch7 + cp Ch8 jr z, .skip ; if noise channel call Audio3_7d707 ld a, [wSfxTempo] @@ -721,9 +721,9 @@ Audio3_notepitch: cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -731,9 +731,9 @@ Audio3_notepitch: ; fall through .sfxChannel ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 + cp Ch7 jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 @@ -769,9 +769,9 @@ Audio3_notepitch: .asm_7d62c push de ld a, c - cp Ch4 + cp Ch5 jr nc, .skip ; if sfx Channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld d, $0 ld e, a add hl, de @@ -816,11 +816,11 @@ Audio3_7d66c: or [hl] ld d, a ld a, c - cp Ch7 + cp Ch8 jr z, .sfxNoiseChannel - cp Ch4 + cp Ch5 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -848,9 +848,9 @@ Audio3_7d69d: add hl, bc ld d, [hl] ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 ; if music channel 3 - cp Ch6 + cp Ch7 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -868,15 +868,15 @@ Audio3_7d69d: Audio3_7d6bf: ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 + cp Ch7 jr nz, .notSfxChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp Ch2 + cp Ch3 jr z, .musicChannel3 ld de, wSfxWaveInstrument .musicChannel3 @@ -978,7 +978,7 @@ Audio3_7d73b: ret Audio3_7d759: - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp $14 jr nc, .asm_7d762 jr .asm_7d768 @@ -1632,12 +1632,12 @@ Audio3_7db03: jr c, .asm_7db6a jr .asm_7db89 .asm_7db6a - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer ld de, Noise3_endchannel ld [hl], e inc hl @@ -1653,7 +1653,7 @@ Audio3_7db03: ret Noise3_endchannel: - endchannel + sound_ret Unknown_7db8b: db $10, $15, $1A, $1F ; channels 0-3 diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 38594d41..ef85eae6 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,66 +1,66 @@ Music_PalletTown:: - audio Music_PalletTown, Ch0, Ch1, Ch2 + audio_header Music_PalletTown, Ch1, Ch2, Ch3 Music_Pokecenter:: - audio Music_Pokecenter, Ch0, Ch1, Ch2 + audio_header Music_Pokecenter, Ch1, Ch2, Ch3 Music_Gym:: - audio Music_Gym, Ch0, Ch1, Ch2 + audio_header Music_Gym, Ch1, Ch2, Ch3 ; Viridian City, Pewter City, Saffron City Music_Cities1:: - audio Music_Cities1, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4 ; Cerulean City, Fuchsia City Music_Cities2:: - audio Music_Cities2, Ch0, Ch1, Ch2 + audio_header Music_Cities2, Ch1, Ch2, Ch3 Music_Celadon:: - audio Music_Celadon, Ch0, Ch1, Ch2 + audio_header Music_Celadon, Ch1, Ch2, Ch3 Music_Cinnabar:: - audio Music_Cinnabar, Ch0, Ch1, Ch2 + audio_header Music_Cinnabar, Ch1, Ch2, Ch3 Music_Vermilion:: - audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4 Music_Lavender:: - audio Music_Lavender, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4 Music_SSAnne:: - audio Music_SSAnne, Ch0, Ch1, Ch2 + audio_header Music_SSAnne, Ch1, Ch2, Ch3 Music_MeetProfOak:: - audio Music_MeetProfOak, Ch0, Ch1, Ch2 + audio_header Music_MeetProfOak, Ch1, Ch2, Ch3 Music_MeetRival:: - audio Music_MeetRival, Ch0, Ch1, Ch2 + audio_header Music_MeetRival, Ch1, Ch2, Ch3 Music_MuseumGuy:: - audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3 + audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4 Music_SafariZone:: - audio Music_SafariZone, Ch0, Ch1, Ch2 + audio_header Music_SafariZone, Ch1, Ch2, Ch3 Music_PkmnHealed:: - audio Music_PkmnHealed, Ch0, Ch1, Ch2 + audio_header Music_PkmnHealed, Ch1, Ch2, Ch3 ; Routes 1 and 2 Music_Routes1:: - audio Music_Routes1, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4 ; Routes 24 and 25 Music_Routes2:: - audio Music_Routes2, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - audio Music_Routes3, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - audio Music_Routes4, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4 ; Route 23, Indigo Plateau Music_IndigoPlateau:: - audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3 + audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 45557420..d6cca9a9 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,20 +1,20 @@ Music_GymLeaderBattle:: - audio Music_GymLeaderBattle, Ch0, Ch1, Ch2 + audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3 Music_TrainerBattle:: - audio Music_TrainerBattle, Ch0, Ch1, Ch2 + audio_header Music_TrainerBattle, Ch1, Ch2, Ch3 Music_WildBattle:: - audio Music_WildBattle, Ch0, Ch1, Ch2 + audio_header Music_WildBattle, Ch1, Ch2, Ch3 Music_FinalBattle:: - audio Music_FinalBattle, Ch0, Ch1, Ch2 + audio_header Music_FinalBattle, Ch1, Ch2, Ch3 Music_DefeatedTrainer:: - audio Music_DefeatedTrainer, Ch0, Ch1, Ch2 + audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3 Music_DefeatedWildMon:: - audio Music_DefeatedWildMon, Ch0, Ch1, Ch2 + audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3 Music_DefeatedGymLeader:: - audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2 + audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 03dd7777..ca21b419 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,56 +1,56 @@ Music_TitleScreen:: - audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3 + audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4 Music_Credits:: - audio Music_Credits, Ch0, Ch1, Ch2 + audio_header Music_Credits, Ch1, Ch2, Ch3 Music_HallOfFame:: - audio Music_HallOfFame, Ch0, Ch1, Ch2 + audio_header Music_HallOfFame, Ch1, Ch2, Ch3 Music_OaksLab:: - audio Music_OaksLab, Ch0, Ch1, Ch2 + audio_header Music_OaksLab, Ch1, Ch2, Ch3 Music_JigglypuffSong:: - audio Music_JigglypuffSong, Ch0, Ch1 + audio_header Music_JigglypuffSong, Ch1, Ch2 Music_BikeRiding:: - audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3 + audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4 Music_Surfing:: - audio Music_Surfing, Ch0, Ch1, Ch2 + audio_header Music_Surfing, Ch1, Ch2, Ch3 Music_GameCorner:: - audio Music_GameCorner, Ch0, Ch1, Ch2 + audio_header Music_GameCorner, Ch1, Ch2, Ch3 Music_IntroBattle:: - audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3 + audio_header Music_IntroBattle, Ch1, Ch2, Ch3, Ch4 ; Power Plant, Cerulean Cave, Rocket HQ Music_Dungeon1:: - audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4 Music_CinnabarMansion:: - audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3 + audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4 Music_PokemonTower:: - audio Music_PokemonTower, Ch0, Ch1, Ch2 + audio_header Music_PokemonTower, Ch1, Ch2, Ch3 Music_SilphCo:: - audio Music_SilphCo, Ch0, Ch1, Ch2 + audio_header Music_SilphCo, Ch1, Ch2, Ch3 Music_MeetEvilTrainer:: - audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2 + audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3 Music_MeetFemaleTrainer:: - audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2 + audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3 Music_MeetMaleTrainer:: - audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2 + audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 72a69646..cc50dddd 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -2,287 +2,287 @@ SFX_Headers_1:: db $ff, $ff, $ff ; padding SFX_Snare1_1:: - audio SFX_Snare1_1, Ch7 + audio_header SFX_Snare1_1, Ch8 SFX_Snare2_1:: - audio SFX_Snare2_1, Ch7 + audio_header SFX_Snare2_1, Ch8 SFX_Snare3_1:: - audio SFX_Snare3_1, Ch7 + audio_header SFX_Snare3_1, Ch8 SFX_Snare4_1:: - audio SFX_Snare4_1, Ch7 + audio_header SFX_Snare4_1, Ch8 SFX_Snare5_1:: - audio SFX_Snare5_1, Ch7 + audio_header SFX_Snare5_1, Ch8 SFX_Triangle1_1:: - audio SFX_Triangle1_1, Ch7 + audio_header SFX_Triangle1_1, Ch8 SFX_Triangle2_1:: - audio SFX_Triangle2_1, Ch7 + audio_header SFX_Triangle2_1, Ch8 SFX_Snare6_1:: - audio SFX_Snare6_1, Ch7 + audio_header SFX_Snare6_1, Ch8 SFX_Snare7_1:: - audio SFX_Snare7_1, Ch7 + audio_header SFX_Snare7_1, Ch8 SFX_Snare8_1:: - audio SFX_Snare8_1, Ch7 + audio_header SFX_Snare8_1, Ch8 SFX_Snare9_1:: - audio SFX_Snare9_1, Ch7 + audio_header SFX_Snare9_1, Ch8 SFX_Cymbal1_1:: - audio SFX_Cymbal1_1, Ch7 + audio_header SFX_Cymbal1_1, Ch8 SFX_Cymbal2_1:: - audio SFX_Cymbal2_1, Ch7 + audio_header SFX_Cymbal2_1, Ch8 SFX_Cymbal3_1:: - audio SFX_Cymbal3_1, Ch7 + audio_header SFX_Cymbal3_1, Ch8 SFX_Muted_Snare1_1:: - audio SFX_Muted_Snare1_1, Ch7 + audio_header SFX_Muted_Snare1_1, Ch8 SFX_Triangle3_1:: - audio SFX_Triangle3_1, Ch7 + audio_header SFX_Triangle3_1, Ch8 SFX_Muted_Snare2_1:: - audio SFX_Muted_Snare2_1, Ch7 + audio_header SFX_Muted_Snare2_1, Ch8 SFX_Muted_Snare3_1:: - audio SFX_Muted_Snare3_1, Ch7 + audio_header SFX_Muted_Snare3_1, Ch8 SFX_Muted_Snare4_1:: - audio SFX_Muted_Snare4_1, Ch7 + audio_header SFX_Muted_Snare4_1, Ch8 SFX_Cry00_1:: - audio SFX_Cry00_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry00_1, Ch5, Ch6, Ch8 SFX_Cry01_1:: - audio SFX_Cry01_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry01_1, Ch5, Ch6, Ch8 SFX_Cry02_1:: - audio SFX_Cry02_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry02_1, Ch5, Ch6, Ch8 SFX_Cry03_1:: - audio SFX_Cry03_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry03_1, Ch5, Ch6, Ch8 SFX_Cry04_1:: - audio SFX_Cry04_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry04_1, Ch5, Ch6, Ch8 SFX_Cry05_1:: - audio SFX_Cry05_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry05_1, Ch5, Ch6, Ch8 SFX_Cry06_1:: - audio SFX_Cry06_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry06_1, Ch5, Ch6, Ch8 SFX_Cry07_1:: - audio SFX_Cry07_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry07_1, Ch5, Ch6, Ch8 SFX_Cry08_1:: - audio SFX_Cry08_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry08_1, Ch5, Ch6, Ch8 SFX_Cry09_1:: - audio SFX_Cry09_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry09_1, Ch5, Ch6, Ch8 SFX_Cry0A_1:: - audio SFX_Cry0A_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8 SFX_Cry0B_1:: - audio SFX_Cry0B_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8 SFX_Cry0C_1:: - audio SFX_Cry0C_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8 SFX_Cry0D_1:: - audio SFX_Cry0D_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8 SFX_Cry0E_1:: - audio SFX_Cry0E_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8 SFX_Cry0F_1:: - audio SFX_Cry0F_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8 SFX_Cry10_1:: - audio SFX_Cry10_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry10_1, Ch5, Ch6, Ch8 SFX_Cry11_1:: - audio SFX_Cry11_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry11_1, Ch5, Ch6, Ch8 SFX_Cry12_1:: - audio SFX_Cry12_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry12_1, Ch5, Ch6, Ch8 SFX_Cry13_1:: - audio SFX_Cry13_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry13_1, Ch5, Ch6, Ch8 SFX_Cry14_1:: - audio SFX_Cry14_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry14_1, Ch5, Ch6, Ch8 SFX_Cry15_1:: - audio SFX_Cry15_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry15_1, Ch5, Ch6, Ch8 SFX_Cry16_1:: - audio SFX_Cry16_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry16_1, Ch5, Ch6, Ch8 SFX_Cry17_1:: - audio SFX_Cry17_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry17_1, Ch5, Ch6, Ch8 SFX_Cry18_1:: - audio SFX_Cry18_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry18_1, Ch5, Ch6, Ch8 SFX_Cry19_1:: - audio SFX_Cry19_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry19_1, Ch5, Ch6, Ch8 SFX_Cry1A_1:: - audio SFX_Cry1A_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8 SFX_Cry1B_1:: - audio SFX_Cry1B_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8 SFX_Cry1C_1:: - audio SFX_Cry1C_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8 SFX_Cry1D_1:: - audio SFX_Cry1D_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8 SFX_Cry1E_1:: - audio SFX_Cry1E_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8 SFX_Cry1F_1:: - audio SFX_Cry1F_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8 SFX_Cry20_1:: - audio SFX_Cry20_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry20_1, Ch5, Ch6, Ch8 SFX_Cry21_1:: - audio SFX_Cry21_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry21_1, Ch5, Ch6, Ch8 SFX_Cry22_1:: - audio SFX_Cry22_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry22_1, Ch5, Ch6, Ch8 SFX_Cry23_1:: - audio SFX_Cry23_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry23_1, Ch5, Ch6, Ch8 SFX_Cry24_1:: - audio SFX_Cry24_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry24_1, Ch5, Ch6, Ch8 SFX_Cry25_1:: - audio SFX_Cry25_1, Ch4, Ch5, Ch7 + audio_header SFX_Cry25_1, Ch5, Ch6, Ch8 SFX_Get_Item1_1:: - audio SFX_Get_Item1_1, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7 SFX_Get_Item2_1:: - audio SFX_Get_Item2_1, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7 SFX_Tink_1:: - audio SFX_Tink_1, Ch4 + audio_header SFX_Tink_1, Ch5 SFX_Heal_HP_1:: - audio SFX_Heal_HP_1, Ch4 + audio_header SFX_Heal_HP_1, Ch5 SFX_Heal_Ailment_1:: - audio SFX_Heal_Ailment_1, Ch4 + audio_header SFX_Heal_Ailment_1, Ch5 SFX_Start_Menu_1:: - audio SFX_Start_Menu_1, Ch7 + audio_header SFX_Start_Menu_1, Ch8 SFX_Press_AB_1:: - audio SFX_Press_AB_1, Ch4 + audio_header SFX_Press_AB_1, Ch5 SFX_Pokedex_Rating_1:: - audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6 + audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7 SFX_Get_Key_Item_1:: - audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6 + audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7 SFX_Poisoned_1:: - audio SFX_Poisoned_1, Ch4 + audio_header SFX_Poisoned_1, Ch5 SFX_Trade_Machine_1:: - audio SFX_Trade_Machine_1, Ch4 + audio_header SFX_Trade_Machine_1, Ch5 SFX_Turn_On_PC_1:: - audio SFX_Turn_On_PC_1, Ch4 + audio_header SFX_Turn_On_PC_1, Ch5 SFX_Turn_Off_PC_1:: - audio SFX_Turn_Off_PC_1, Ch4 + audio_header SFX_Turn_Off_PC_1, Ch5 SFX_Enter_PC_1:: - audio SFX_Enter_PC_1, Ch4 + audio_header SFX_Enter_PC_1, Ch5 SFX_Shrink_1:: - audio SFX_Shrink_1, Ch4 + audio_header SFX_Shrink_1, Ch5 SFX_Switch_1:: - audio SFX_Switch_1, Ch4 + audio_header SFX_Switch_1, Ch5 SFX_Healing_Machine_1:: - audio SFX_Healing_Machine_1, Ch4 + audio_header SFX_Healing_Machine_1, Ch5 SFX_Teleport_Exit1_1:: - audio SFX_Teleport_Exit1_1, Ch4 + audio_header SFX_Teleport_Exit1_1, Ch5 SFX_Teleport_Enter1_1:: - audio SFX_Teleport_Enter1_1, Ch4 + audio_header SFX_Teleport_Enter1_1, Ch5 SFX_Teleport_Exit2_1:: - audio SFX_Teleport_Exit2_1, Ch4 + audio_header SFX_Teleport_Exit2_1, Ch5 SFX_Ledge_1:: - audio SFX_Ledge_1, Ch4 + audio_header SFX_Ledge_1, Ch5 SFX_Teleport_Enter2_1:: - audio SFX_Teleport_Enter2_1, Ch7 + audio_header SFX_Teleport_Enter2_1, Ch8 SFX_Fly_1:: - audio SFX_Fly_1, Ch7 + audio_header SFX_Fly_1, Ch8 SFX_Denied_1:: - audio SFX_Denied_1, Ch4, Ch5 + audio_header SFX_Denied_1, Ch5, Ch6 SFX_Arrow_Tiles_1:: - audio SFX_Arrow_Tiles_1, Ch4 + audio_header SFX_Arrow_Tiles_1, Ch5 SFX_Push_Boulder_1:: - audio SFX_Push_Boulder_1, Ch7 + audio_header SFX_Push_Boulder_1, Ch8 SFX_SS_Anne_Horn_1:: - audio SFX_SS_Anne_Horn_1, Ch4, Ch5 + audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6 SFX_Withdraw_Deposit_1:: - audio SFX_Withdraw_Deposit_1, Ch4 + audio_header SFX_Withdraw_Deposit_1, Ch5 SFX_Cut_1:: - audio SFX_Cut_1, Ch7 + audio_header SFX_Cut_1, Ch8 SFX_Go_Inside_1:: - audio SFX_Go_Inside_1, Ch7 + audio_header SFX_Go_Inside_1, Ch8 SFX_Swap_1:: - audio SFX_Swap_1, Ch4, Ch5 + audio_header SFX_Swap_1, Ch5, Ch6 SFX_59_1:: - audio SFX_59_1, Ch4, Ch5 + audio_header SFX_59_1, Ch5, Ch6 SFX_Purchase_1:: - audio SFX_Purchase_1, Ch4, Ch5 + audio_header SFX_Purchase_1, Ch5, Ch6 SFX_Collision_1:: - audio SFX_Collision_1, Ch4 + audio_header SFX_Collision_1, Ch5 SFX_Go_Outside_1:: - audio SFX_Go_Outside_1, Ch7 + audio_header SFX_Go_Outside_1, Ch8 SFX_Save_1:: - audio SFX_Save_1, Ch4, Ch5 + audio_header SFX_Save_1, Ch5, Ch6 -; the Pokeflute sound effect directly hijacks channel 2 +; the Pokeflute sound effect directly hijacks channel 3 SFX_Pokeflute:: - audio SFX_Pokeflute, Ch2 + audio_header SFX_Pokeflute, Ch3 SFX_Safari_Zone_PA:: - audio SFX_Safari_Zone_PA, Ch4 + audio_header SFX_Safari_Zone_PA, Ch5 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index b96a764f..7e76325d 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -2,358 +2,358 @@ SFX_Headers_2:: db $ff, $ff, $ff ; padding SFX_Snare1_2:: - audio SFX_Snare1_2, Ch7 + audio_header SFX_Snare1_2, Ch8 SFX_Snare2_2:: - audio SFX_Snare2_2, Ch7 + audio_header SFX_Snare2_2, Ch8 SFX_Snare3_2:: - audio SFX_Snare3_2, Ch7 + audio_header SFX_Snare3_2, Ch8 SFX_Snare4_2:: - audio SFX_Snare4_2, Ch7 + audio_header SFX_Snare4_2, Ch8 SFX_Snare5_2:: - audio SFX_Snare5_2, Ch7 + audio_header SFX_Snare5_2, Ch8 SFX_Triangle1_2:: - audio SFX_Triangle1_2, Ch7 + audio_header SFX_Triangle1_2, Ch8 SFX_Triangle2_2:: - audio SFX_Triangle2_2, Ch7 + audio_header SFX_Triangle2_2, Ch8 SFX_Snare6_2:: - audio SFX_Snare6_2, Ch7 + audio_header SFX_Snare6_2, Ch8 SFX_Snare7_2:: - audio SFX_Snare7_2, Ch7 + audio_header SFX_Snare7_2, Ch8 SFX_Snare8_2:: - audio SFX_Snare8_2, Ch7 + audio_header SFX_Snare8_2, Ch8 SFX_Snare9_2:: - audio SFX_Snare9_2, Ch7 + audio_header SFX_Snare9_2, Ch8 SFX_Cymbal1_2:: - audio SFX_Cymbal1_2, Ch7 + audio_header SFX_Cymbal1_2, Ch8 SFX_Cymbal2_2:: - audio SFX_Cymbal2_2, Ch7 + audio_header SFX_Cymbal2_2, Ch8 SFX_Cymbal3_2:: - audio SFX_Cymbal3_2, Ch7 + audio_header SFX_Cymbal3_2, Ch8 SFX_Muted_Snare1_2:: - audio SFX_Muted_Snare1_2, Ch7 + audio_header SFX_Muted_Snare1_2, Ch8 SFX_Triangle3_2:: - audio SFX_Triangle3_2, Ch7 + audio_header SFX_Triangle3_2, Ch8 SFX_Muted_Snare2_2:: - audio SFX_Muted_Snare2_2, Ch7 + audio_header SFX_Muted_Snare2_2, Ch8 SFX_Muted_Snare3_2:: - audio SFX_Muted_Snare3_2, Ch7 + audio_header SFX_Muted_Snare3_2, Ch8 SFX_Muted_Snare4_2:: - audio SFX_Muted_Snare4_2, Ch7 + audio_header SFX_Muted_Snare4_2, Ch8 SFX_Cry00_2:: - audio SFX_Cry00_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry00_2, Ch5, Ch6, Ch8 SFX_Cry01_2:: - audio SFX_Cry01_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry01_2, Ch5, Ch6, Ch8 SFX_Cry02_2:: - audio SFX_Cry02_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry02_2, Ch5, Ch6, Ch8 SFX_Cry03_2:: - audio SFX_Cry03_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry03_2, Ch5, Ch6, Ch8 SFX_Cry04_2:: - audio SFX_Cry04_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry04_2, Ch5, Ch6, Ch8 SFX_Cry05_2:: - audio SFX_Cry05_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry05_2, Ch5, Ch6, Ch8 SFX_Cry06_2:: - audio SFX_Cry06_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry06_2, Ch5, Ch6, Ch8 SFX_Cry07_2:: - audio SFX_Cry07_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry07_2, Ch5, Ch6, Ch8 SFX_Cry08_2:: - audio SFX_Cry08_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry08_2, Ch5, Ch6, Ch8 SFX_Cry09_2:: - audio SFX_Cry09_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry09_2, Ch5, Ch6, Ch8 SFX_Cry0A_2:: - audio SFX_Cry0A_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry0A_2, Ch5, Ch6, Ch8 SFX_Cry0B_2:: - audio SFX_Cry0B_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry0B_2, Ch5, Ch6, Ch8 SFX_Cry0C_2:: - audio SFX_Cry0C_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry0C_2, Ch5, Ch6, Ch8 SFX_Cry0D_2:: - audio SFX_Cry0D_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry0D_2, Ch5, Ch6, Ch8 SFX_Cry0E_2:: - audio SFX_Cry0E_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry0E_2, Ch5, Ch6, Ch8 SFX_Cry0F_2:: - audio SFX_Cry0F_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry0F_2, Ch5, Ch6, Ch8 SFX_Cry10_2:: - audio SFX_Cry10_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry10_2, Ch5, Ch6, Ch8 SFX_Cry11_2:: - audio SFX_Cry11_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry11_2, Ch5, Ch6, Ch8 SFX_Cry12_2:: - audio SFX_Cry12_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry12_2, Ch5, Ch6, Ch8 SFX_Cry13_2:: - audio SFX_Cry13_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry13_2, Ch5, Ch6, Ch8 SFX_Cry14_2:: - audio SFX_Cry14_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry14_2, Ch5, Ch6, Ch8 SFX_Cry15_2:: - audio SFX_Cry15_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry15_2, Ch5, Ch6, Ch8 SFX_Cry16_2:: - audio SFX_Cry16_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry16_2, Ch5, Ch6, Ch8 SFX_Cry17_2:: - audio SFX_Cry17_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry17_2, Ch5, Ch6, Ch8 SFX_Cry18_2:: - audio SFX_Cry18_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry18_2, Ch5, Ch6, Ch8 SFX_Cry19_2:: - audio SFX_Cry19_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry19_2, Ch5, Ch6, Ch8 SFX_Cry1A_2:: - audio SFX_Cry1A_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry1A_2, Ch5, Ch6, Ch8 SFX_Cry1B_2:: - audio SFX_Cry1B_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry1B_2, Ch5, Ch6, Ch8 SFX_Cry1C_2:: - audio SFX_Cry1C_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry1C_2, Ch5, Ch6, Ch8 SFX_Cry1D_2:: - audio SFX_Cry1D_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry1D_2, Ch5, Ch6, Ch8 SFX_Cry1E_2:: - audio SFX_Cry1E_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry1E_2, Ch5, Ch6, Ch8 SFX_Cry1F_2:: - audio SFX_Cry1F_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry1F_2, Ch5, Ch6, Ch8 SFX_Cry20_2:: - audio SFX_Cry20_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry20_2, Ch5, Ch6, Ch8 SFX_Cry21_2:: - audio SFX_Cry21_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry21_2, Ch5, Ch6, Ch8 SFX_Cry22_2:: - audio SFX_Cry22_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry22_2, Ch5, Ch6, Ch8 SFX_Cry23_2:: - audio SFX_Cry23_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry23_2, Ch5, Ch6, Ch8 SFX_Cry24_2:: - audio SFX_Cry24_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry24_2, Ch5, Ch6, Ch8 SFX_Cry25_2:: - audio SFX_Cry25_2, Ch4, Ch5, Ch7 + audio_header SFX_Cry25_2, Ch5, Ch6, Ch8 SFX_Level_Up:: - audio SFX_Level_Up, Ch4, Ch5, Ch6 + audio_header SFX_Level_Up, Ch5, Ch6, Ch7 SFX_Get_Item2_2:: - audio SFX_Get_Item2_2, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item2_2, Ch5, Ch6, Ch7 SFX_Tink_2:: - audio SFX_Tink_2, Ch4 + audio_header SFX_Tink_2, Ch5 SFX_Heal_HP_2:: - audio SFX_Heal_HP_2, Ch4 + audio_header SFX_Heal_HP_2, Ch5 SFX_Heal_Ailment_2:: - audio SFX_Heal_Ailment_2, Ch4 + audio_header SFX_Heal_Ailment_2, Ch5 SFX_Start_Menu_2:: - audio SFX_Start_Menu_2, Ch7 + audio_header SFX_Start_Menu_2, Ch8 SFX_Press_AB_2:: - audio SFX_Press_AB_2, Ch4 + audio_header SFX_Press_AB_2, Ch5 SFX_Ball_Toss:: - audio SFX_Ball_Toss, Ch4, Ch5 + audio_header SFX_Ball_Toss, Ch5, Ch6 SFX_Ball_Poof:: - audio SFX_Ball_Poof, Ch4, Ch7 + audio_header SFX_Ball_Poof, Ch5, Ch8 SFX_Faint_Thud:: - audio SFX_Faint_Thud, Ch4, Ch7 + audio_header SFX_Faint_Thud, Ch5, Ch8 SFX_Run:: - audio SFX_Run, Ch7 + audio_header SFX_Run, Ch8 SFX_Dex_Page_Added:: - audio SFX_Dex_Page_Added, Ch4, Ch5 + audio_header SFX_Dex_Page_Added, Ch5, Ch6 SFX_Caught_Mon:: - audio SFX_Caught_Mon, Ch4, Ch5, Ch6 + audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7 SFX_Peck:: - audio SFX_Peck, Ch7 + audio_header SFX_Peck, Ch8 SFX_Faint_Fall:: - audio SFX_Faint_Fall, Ch4 + audio_header SFX_Faint_Fall, Ch5 SFX_Battle_09:: - audio SFX_Battle_09, Ch4 + audio_header SFX_Battle_09, Ch5 SFX_Pound:: - audio SFX_Pound, Ch7 + audio_header SFX_Pound, Ch8 SFX_Battle_0B:: - audio SFX_Battle_0B, Ch7 + audio_header SFX_Battle_0B, Ch8 SFX_Battle_0C:: - audio SFX_Battle_0C, Ch7 + audio_header SFX_Battle_0C, Ch8 SFX_Battle_0D:: - audio SFX_Battle_0D, Ch7 + audio_header SFX_Battle_0D, Ch8 SFX_Battle_0E:: - audio SFX_Battle_0E, Ch7 + audio_header SFX_Battle_0E, Ch8 SFX_Battle_0F:: - audio SFX_Battle_0F, Ch7 + audio_header SFX_Battle_0F, Ch8 SFX_Damage:: - audio SFX_Damage, Ch7 + audio_header SFX_Damage, Ch8 SFX_Not_Very_Effective:: - audio SFX_Not_Very_Effective, Ch7 + audio_header SFX_Not_Very_Effective, Ch8 SFX_Battle_12:: - audio SFX_Battle_12, Ch7 + audio_header SFX_Battle_12, Ch8 SFX_Battle_13:: - audio SFX_Battle_13, Ch7 + audio_header SFX_Battle_13, Ch8 SFX_Battle_14:: - audio SFX_Battle_14, Ch7 + audio_header SFX_Battle_14, Ch8 SFX_Vine_Whip:: - audio SFX_Vine_Whip, Ch7 + audio_header SFX_Vine_Whip, Ch8 SFX_Battle_16:: - audio SFX_Battle_16, Ch7 + audio_header SFX_Battle_16, Ch8 SFX_Battle_17:: - audio SFX_Battle_17, Ch7 + audio_header SFX_Battle_17, Ch8 SFX_Battle_18:: - audio SFX_Battle_18, Ch7 + audio_header SFX_Battle_18, Ch8 SFX_Battle_19:: - audio SFX_Battle_19, Ch7 + audio_header SFX_Battle_19, Ch8 SFX_Super_Effective:: - audio SFX_Super_Effective, Ch7 + audio_header SFX_Super_Effective, Ch8 SFX_Battle_1B:: - audio SFX_Battle_1B, Ch7 + audio_header SFX_Battle_1B, Ch8 SFX_Battle_1C:: - audio SFX_Battle_1C, Ch7 + audio_header SFX_Battle_1C, Ch8 SFX_Doubleslap:: - audio SFX_Doubleslap, Ch7 + audio_header SFX_Doubleslap, Ch8 SFX_Battle_1E:: - audio SFX_Battle_1E, Ch4, Ch7 + audio_header SFX_Battle_1E, Ch5, Ch8 SFX_Horn_Drill:: - audio SFX_Horn_Drill, Ch7 + audio_header SFX_Horn_Drill, Ch8 SFX_Battle_20:: - audio SFX_Battle_20, Ch7 + audio_header SFX_Battle_20, Ch8 SFX_Battle_21:: - audio SFX_Battle_21, Ch7 + audio_header SFX_Battle_21, Ch8 SFX_Battle_22:: - audio SFX_Battle_22, Ch7 + audio_header SFX_Battle_22, Ch8 SFX_Battle_23:: - audio SFX_Battle_23, Ch7 + audio_header SFX_Battle_23, Ch8 SFX_Battle_24:: - audio SFX_Battle_24, Ch4, Ch7 + audio_header SFX_Battle_24, Ch5, Ch8 SFX_Battle_25:: - audio SFX_Battle_25, Ch7 + audio_header SFX_Battle_25, Ch8 SFX_Battle_26:: - audio SFX_Battle_26, Ch7 + audio_header SFX_Battle_26, Ch8 SFX_Battle_27:: - audio SFX_Battle_27, Ch4, Ch5, Ch7 + audio_header SFX_Battle_27, Ch5, Ch6, Ch8 SFX_Battle_28:: - audio SFX_Battle_28, Ch4, Ch5, Ch7 + audio_header SFX_Battle_28, Ch5, Ch6, Ch8 SFX_Battle_29:: - audio SFX_Battle_29, Ch4, Ch7 + audio_header SFX_Battle_29, Ch5, Ch8 SFX_Battle_2A:: - audio SFX_Battle_2A, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2A, Ch5, Ch6, Ch8 SFX_Battle_2B:: - audio SFX_Battle_2B, Ch4, Ch7 + audio_header SFX_Battle_2B, Ch5, Ch8 SFX_Battle_2C:: - audio SFX_Battle_2C, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2C, Ch5, Ch6, Ch8 SFX_Psybeam:: - audio SFX_Psybeam, Ch4, Ch5, Ch7 + audio_header SFX_Psybeam, Ch5, Ch6, Ch8 SFX_Battle_2E:: - audio SFX_Battle_2E, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2E, Ch5, Ch6, Ch8 SFX_Battle_2F:: - audio SFX_Battle_2F, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2F, Ch5, Ch6, Ch8 SFX_Psychic_M:: - audio SFX_Psychic_M, Ch4, Ch5, Ch7 + audio_header SFX_Psychic_M, Ch5, Ch6, Ch8 SFX_Battle_31:: - audio SFX_Battle_31, Ch4, Ch5 + audio_header SFX_Battle_31, Ch5, Ch6 SFX_Battle_32:: - audio SFX_Battle_32, Ch4, Ch5 + audio_header SFX_Battle_32, Ch5, Ch6 SFX_Battle_33:: - audio SFX_Battle_33, Ch4, Ch5 + audio_header SFX_Battle_33, Ch5, Ch6 SFX_Battle_34:: - audio SFX_Battle_34, Ch4, Ch5, Ch7 + audio_header SFX_Battle_34, Ch5, Ch6, Ch8 SFX_Battle_35:: - audio SFX_Battle_35, Ch4, Ch5 + audio_header SFX_Battle_35, Ch5, Ch6 SFX_Battle_36:: - audio SFX_Battle_36, Ch4, Ch5, Ch7 + audio_header SFX_Battle_36, Ch5, Ch6, Ch8 SFX_Silph_Scope:: - audio SFX_Silph_Scope, Ch4 + audio_header SFX_Silph_Scope, Ch5 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 19a19272..6fb67546 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -2,310 +2,310 @@ SFX_Headers_3:: db $ff, $ff, $ff ; padding SFX_Snare1_3:: - audio SFX_Snare1_3, Ch7 + audio_header SFX_Snare1_3, Ch8 SFX_Snare2_3:: - audio SFX_Snare2_3, Ch7 + audio_header SFX_Snare2_3, Ch8 SFX_Snare3_3:: - audio SFX_Snare3_3, Ch7 + audio_header SFX_Snare3_3, Ch8 SFX_Snare4_3:: - audio SFX_Snare4_3, Ch7 + audio_header SFX_Snare4_3, Ch8 SFX_Snare5_3:: - audio SFX_Snare5_3, Ch7 + audio_header SFX_Snare5_3, Ch8 SFX_Triangle1_3:: - audio SFX_Triangle1_3, Ch7 + audio_header SFX_Triangle1_3, Ch8 SFX_Triangle2_3:: - audio SFX_Triangle2_3, Ch7 + audio_header SFX_Triangle2_3, Ch8 SFX_Snare6_3:: - audio SFX_Snare6_3, Ch7 + audio_header SFX_Snare6_3, Ch8 SFX_Snare7_3:: - audio SFX_Snare7_3, Ch7 + audio_header SFX_Snare7_3, Ch8 SFX_Snare8_3:: - audio SFX_Snare8_3, Ch7 + audio_header SFX_Snare8_3, Ch8 SFX_Snare9_3:: - audio SFX_Snare9_3, Ch7 + audio_header SFX_Snare9_3, Ch8 SFX_Cymbal1_3:: - audio SFX_Cymbal1_3, Ch7 + audio_header SFX_Cymbal1_3, Ch8 SFX_Cymbal2_3:: - audio SFX_Cymbal2_3, Ch7 + audio_header SFX_Cymbal2_3, Ch8 SFX_Cymbal3_3:: - audio SFX_Cymbal3_3, Ch7 + audio_header SFX_Cymbal3_3, Ch8 SFX_Muted_Snare1_3:: - audio SFX_Muted_Snare1_3, Ch7 + audio_header SFX_Muted_Snare1_3, Ch8 SFX_Triangle3_3:: - audio SFX_Triangle3_3, Ch7 + audio_header SFX_Triangle3_3, Ch8 SFX_Muted_Snare2_3:: - audio SFX_Muted_Snare2_3, Ch7 + audio_header SFX_Muted_Snare2_3, Ch8 SFX_Muted_Snare3_3:: - audio SFX_Muted_Snare3_3, Ch7 + audio_header SFX_Muted_Snare3_3, Ch8 SFX_Muted_Snare4_3:: - audio SFX_Muted_Snare4_3, Ch7 + audio_header SFX_Muted_Snare4_3, Ch8 SFX_Cry00_3:: - audio SFX_Cry00_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry00_3, Ch5, Ch6, Ch8 SFX_Cry01_3:: - audio SFX_Cry01_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry01_3, Ch5, Ch6, Ch8 SFX_Cry02_3:: - audio SFX_Cry02_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry02_3, Ch5, Ch6, Ch8 SFX_Cry03_3:: - audio SFX_Cry03_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry03_3, Ch5, Ch6, Ch8 SFX_Cry04_3:: - audio SFX_Cry04_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry04_3, Ch5, Ch6, Ch8 SFX_Cry05_3:: - audio SFX_Cry05_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry05_3, Ch5, Ch6, Ch8 SFX_Cry06_3:: - audio SFX_Cry06_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry06_3, Ch5, Ch6, Ch8 SFX_Cry07_3:: - audio SFX_Cry07_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry07_3, Ch5, Ch6, Ch8 SFX_Cry08_3:: - audio SFX_Cry08_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry08_3, Ch5, Ch6, Ch8 SFX_Cry09_3:: - audio SFX_Cry09_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry09_3, Ch5, Ch6, Ch8 SFX_Cry0A_3:: - audio SFX_Cry0A_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8 SFX_Cry0B_3:: - audio SFX_Cry0B_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8 SFX_Cry0C_3:: - audio SFX_Cry0C_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8 SFX_Cry0D_3:: - audio SFX_Cry0D_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8 SFX_Cry0E_3:: - audio SFX_Cry0E_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8 SFX_Cry0F_3:: - audio SFX_Cry0F_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8 SFX_Cry10_3:: - audio SFX_Cry10_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry10_3, Ch5, Ch6, Ch8 SFX_Cry11_3:: - audio SFX_Cry11_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry11_3, Ch5, Ch6, Ch8 SFX_Cry12_3:: - audio SFX_Cry12_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry12_3, Ch5, Ch6, Ch8 SFX_Cry13_3:: - audio SFX_Cry13_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry13_3, Ch5, Ch6, Ch8 SFX_Cry14_3:: - audio SFX_Cry14_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry14_3, Ch5, Ch6, Ch8 SFX_Cry15_3:: - audio SFX_Cry15_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry15_3, Ch5, Ch6, Ch8 SFX_Cry16_3:: - audio SFX_Cry16_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry16_3, Ch5, Ch6, Ch8 SFX_Cry17_3:: - audio SFX_Cry17_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry17_3, Ch5, Ch6, Ch8 SFX_Cry18_3:: - audio SFX_Cry18_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry18_3, Ch5, Ch6, Ch8 SFX_Cry19_3:: - audio SFX_Cry19_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry19_3, Ch5, Ch6, Ch8 SFX_Cry1A_3:: - audio SFX_Cry1A_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8 SFX_Cry1B_3:: - audio SFX_Cry1B_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8 SFX_Cry1C_3:: - audio SFX_Cry1C_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8 SFX_Cry1D_3:: - audio SFX_Cry1D_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8 SFX_Cry1E_3:: - audio SFX_Cry1E_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8 SFX_Cry1F_3:: - audio SFX_Cry1F_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8 SFX_Cry20_3:: - audio SFX_Cry20_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry20_3, Ch5, Ch6, Ch8 SFX_Cry21_3:: - audio SFX_Cry21_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry21_3, Ch5, Ch6, Ch8 SFX_Cry22_3:: - audio SFX_Cry22_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry22_3, Ch5, Ch6, Ch8 SFX_Cry23_3:: - audio SFX_Cry23_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry23_3, Ch5, Ch6, Ch8 SFX_Cry24_3:: - audio SFX_Cry24_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry24_3, Ch5, Ch6, Ch8 SFX_Cry25_3:: - audio SFX_Cry25_3, Ch4, Ch5, Ch7 + audio_header SFX_Cry25_3, Ch5, Ch6, Ch8 SFX_Get_Item1_3:: - audio SFX_Get_Item1_3, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7 SFX_Get_Item2_3:: - audio SFX_Get_Item2_3, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7 SFX_Tink_3:: - audio SFX_Tink_3, Ch4 + audio_header SFX_Tink_3, Ch5 SFX_Heal_HP_3:: - audio SFX_Heal_HP_3, Ch4 + audio_header SFX_Heal_HP_3, Ch5 SFX_Heal_Ailment_3:: - audio SFX_Heal_Ailment_3, Ch4 + audio_header SFX_Heal_Ailment_3, Ch5 SFX_Start_Menu_3:: - audio SFX_Start_Menu_3, Ch7 + audio_header SFX_Start_Menu_3, Ch8 SFX_Press_AB_3:: - audio SFX_Press_AB_3, Ch4 + audio_header SFX_Press_AB_3, Ch5 SFX_Pokedex_Rating_3:: - audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6 + audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7 SFX_Get_Key_Item_3:: - audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6 + audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7 SFX_Poisoned_3:: - audio SFX_Poisoned_3, Ch4 + audio_header SFX_Poisoned_3, Ch5 SFX_Trade_Machine_3:: - audio SFX_Trade_Machine_3, Ch4 + audio_header SFX_Trade_Machine_3, Ch5 SFX_Turn_On_PC_3:: - audio SFX_Turn_On_PC_3, Ch4 + audio_header SFX_Turn_On_PC_3, Ch5 SFX_Turn_Off_PC_3:: - audio SFX_Turn_Off_PC_3, Ch4 + audio_header SFX_Turn_Off_PC_3, Ch5 SFX_Enter_PC_3:: - audio SFX_Enter_PC_3, Ch4 + audio_header SFX_Enter_PC_3, Ch5 SFX_Shrink_3:: - audio SFX_Shrink_3, Ch4 + audio_header SFX_Shrink_3, Ch5 SFX_Switch_3:: - audio SFX_Switch_3, Ch4 + audio_header SFX_Switch_3, Ch5 SFX_Healing_Machine_3:: - audio SFX_Healing_Machine_3, Ch4 + audio_header SFX_Healing_Machine_3, Ch5 SFX_Teleport_Exit1_3:: - audio SFX_Teleport_Exit1_3, Ch4 + audio_header SFX_Teleport_Exit1_3, Ch5 SFX_Teleport_Enter1_3:: - audio SFX_Teleport_Enter1_3, Ch4 + audio_header SFX_Teleport_Enter1_3, Ch5 SFX_Teleport_Exit2_3:: - audio SFX_Teleport_Exit2_3, Ch4 + audio_header SFX_Teleport_Exit2_3, Ch5 SFX_Ledge_3:: - audio SFX_Ledge_3, Ch4 + audio_header SFX_Ledge_3, Ch5 SFX_Teleport_Enter2_3:: - audio SFX_Teleport_Enter2_3, Ch7 + audio_header SFX_Teleport_Enter2_3, Ch8 SFX_Fly_3:: - audio SFX_Fly_3, Ch7 + audio_header SFX_Fly_3, Ch8 SFX_Denied_3:: - audio SFX_Denied_3, Ch4, Ch5 + audio_header SFX_Denied_3, Ch5, Ch6 SFX_Arrow_Tiles_3:: - audio SFX_Arrow_Tiles_3, Ch4 + audio_header SFX_Arrow_Tiles_3, Ch5 SFX_Push_Boulder_3:: - audio SFX_Push_Boulder_3, Ch7 + audio_header SFX_Push_Boulder_3, Ch8 SFX_SS_Anne_Horn_3:: - audio SFX_SS_Anne_Horn_3, Ch4, Ch5 + audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6 SFX_Withdraw_Deposit_3:: - audio SFX_Withdraw_Deposit_3, Ch4 + audio_header SFX_Withdraw_Deposit_3, Ch5 SFX_Cut_3:: - audio SFX_Cut_3, Ch7 + audio_header SFX_Cut_3, Ch8 SFX_Go_Inside_3:: - audio SFX_Go_Inside_3, Ch7 + audio_header SFX_Go_Inside_3, Ch8 SFX_Swap_3:: - audio SFX_Swap_3, Ch4, Ch5 + audio_header SFX_Swap_3, Ch5, Ch6 SFX_59_3:: - audio SFX_59_3, Ch4, Ch5 + audio_header SFX_59_3, Ch5, Ch6 SFX_Purchase_3:: - audio SFX_Purchase_3, Ch4, Ch5 + audio_header SFX_Purchase_3, Ch5, Ch6 SFX_Collision_3:: - audio SFX_Collision_3, Ch4 + audio_header SFX_Collision_3, Ch5 SFX_Go_Outside_3:: - audio SFX_Go_Outside_3, Ch7 + audio_header SFX_Go_Outside_3, Ch8 SFX_Save_3:: - audio SFX_Save_3, Ch4, Ch5 + audio_header SFX_Save_3, Ch5, Ch6 SFX_Intro_Lunge:: - audio SFX_Intro_Lunge, Ch7 + audio_header SFX_Intro_Lunge, Ch8 SFX_Intro_Hip:: - audio SFX_Intro_Hip, Ch4 + audio_header SFX_Intro_Hip, Ch5 SFX_Intro_Hop:: - audio SFX_Intro_Hop, Ch4 + audio_header SFX_Intro_Hop, Ch5 SFX_Intro_Raise:: - audio SFX_Intro_Raise, Ch7 + audio_header SFX_Intro_Raise, Ch8 SFX_Intro_Crash:: - audio SFX_Intro_Crash, Ch7 + audio_header SFX_Intro_Crash, Ch8 SFX_Intro_Whoosh:: - audio SFX_Intro_Whoosh, Ch7 + audio_header SFX_Intro_Whoosh, Ch8 SFX_Slots_Stop_Wheel:: - audio SFX_Slots_Stop_Wheel, Ch4 + audio_header SFX_Slots_Stop_Wheel, Ch5 SFX_Slots_Reward:: - audio SFX_Slots_Reward, Ch4 + audio_header SFX_Slots_Reward, Ch5 SFX_Slots_New_Spin:: - audio SFX_Slots_New_Spin, Ch4, Ch5 + audio_header SFX_Slots_New_Spin, Ch5, Ch6 SFX_Shooting_Star:: - audio SFX_Shooting_Star, Ch4 + audio_header SFX_Shooting_Star, Ch5 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 87c7b5c2..58f1b7a5 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,673 +1,673 @@ -Music_BikeRiding_Ch0:: +Music_BikeRiding_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - G_ 2 + note G_, 2 Music_BikeRiding_branch_7dbc9:: octave 4 - C_ 4 - D_ 4 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 4 - E_ 2 - D_ 2 - F_ 4 - D_ 4 + note C_, 4 + note D_, 4 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 4 + note D_, 4 octave 3 - B_ 2 - octave 4 - F_ 4 - D_ 4 - E_ 2 - F_ 2 - G_ 2 - C_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - notetype 12, 11, 6 - F_ 10 - notetype 12, 10, 6 - F_ 2 - E_ 2 - F_ 2 - G_ 10 - E_ 2 - D_ 2 - E_ 2 - F_ 6 - toggleperfectpitch - notetype 12, 11, 3 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 2 - E_ 1 - F_ 1 - toggleperfectpitch - notetype 12, 11, 5 - G_ 6 - G_ 6 - A_ 2 - F_ 2 - G_ 6 - notetype 12, 11, 4 - G_ 2 - F_ 4 - notetype 12, 10, 4 - E_ 2 - D_ 2 - notetype 12, 9, 3 + note B_, 2 + octave 4 + note F_, 4 + note D_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 6 + note F_, 10 + note_type 12, 10, 6 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 10 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + toggle_perfect_pitch + note_type 12, 11, 3 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 2 + note E_, 1 + note F_, 1 + toggle_perfect_pitch + note_type 12, 11, 5 + note G_, 6 + note G_, 6 + note A_, 2 + note F_, 2 + note G_, 6 + note_type 12, 11, 4 + note G_, 2 + note F_, 4 + note_type 12, 10, 4 + note E_, 2 + note D_, 2 + note_type 12, 9, 3 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 3 - B_ 2 - A_ 1 - B_ 1 - A_ 2 - B_ 2 - octave 4 - C_ 2 - C_ 4 - C_ 2 + note B_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note C_, 4 + note C_, 2 octave 3 - A_ 2 - B_ 2 - B_ 2 - A_ 2 + note A_, 2 + note B_, 2 + note B_, 2 + note A_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 2 - B_ 1 + note A_, 2 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 1 + note C_, 1 + note D_, 1 octave 3 - B_ 1 - octave 4 - C_ 4 - notetype 12, 3, 13 - C_ 4 - notetype 12, 11, 4 - F_ 6 - G_ 4 - F_ 1 - G_ 1 - F_ 4 - E_ 6 - F_ 2 - E_ 2 - D_ 1 - E_ 1 - D_ 2 - C_ 2 - notetype 12, 11, 5 + note B_, 1 + octave 4 + note C_, 4 + note_type 12, 3, 13 + note C_, 4 + note_type 12, 11, 4 + note F_, 6 + note G_, 4 + note F_, 1 + note G_, 1 + note F_, 4 + note E_, 6 + note F_, 2 + note E_, 2 + note D_, 1 + note E_, 1 + note D_, 2 + note C_, 2 + note_type 12, 11, 5 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - C_ 4 - F_ 4 - D_ 4 - F# 4 + note E_, 4 + note C_, 4 + note F_, 4 + note D_, 4 + note F#, 4 vibrato 10, 2, 6 - notetype 12, 8, 0 - G_ 16 - G_ 4 - notetype 12, 8, 7 - G_ 12 - notetype 12, 11, 5 + note_type 12, 8, 0 + note G_, 16 + note G_, 4 + note_type 12, 8, 7 + note G_, 12 + note_type 12, 11, 5 vibrato 8, 1, 4 - loopchannel 0, Music_BikeRiding_branch_7dbc9 + sound_loop 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch1:: - duty 2 +Music_BikeRiding_Ch2:: + duty_cycle 2 vibrato 6, 1, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - C_ 2 + note C_, 2 Music_BikeRiding_branch_7dc75:: - E_ 4 - F_ 4 - G_ 4 + note E_, 4 + note F_, 4 + note G_, 4 octave 5 - C_ 4 - octave 4 - B_ 6 - A_ 1 - B_ 1 - A_ 10 - F_ 2 - G_ 2 - A_ 2 + note C_, 4 + octave 4 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 10 + note F_, 2 + note G_, 2 + note A_, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 1 - B_ 1 + note B_, 2 + note A_, 1 + note B_, 1 octave 5 - C_ 6 - octave 4 - A_ 2 - G_ 4 - duty 3 - notetype 12, 8, 4 - A# 6 - duty 2 - notetype 12, 12, 5 + note C_, 6 + octave 4 + note A_, 2 + note G_, 4 + duty_cycle 3 + note_type 12, 8, 4 + note A#, 6 + duty_cycle 2 + note_type 12, 12, 5 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 10 + note A_, 10 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 10 - notetype 12, 12, 3 + note G_, 10 + note_type 12, 12, 3 octave 5 - C_ 4 - E_ 2 - D_ 2 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 4 - notetype 12, 12, 7 - D_ 10 - D_ 1 - C_ 1 - notetype 12, 11, 0 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 4 - F_ 6 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 6 - E_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - F_ 2 - E_ 2 - D_ 2 - F_ 2 - G_ 4 - A_ 2 - F_ 2 - E_ 2 - G_ 4 - F_ 2 - E_ 6 - notetype 6, 12, 2 - F_ 1 - G_ 1 - A_ 1 - B_ 1 - notetype 12, 12, 3 + note C_, 2 + note_type 12, 11, 0 + note D_, 4 + note_type 12, 12, 7 + note D_, 10 + note D_, 1 + note C_, 1 + note_type 12, 11, 0 + octave 4 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 4 + note F_, 6 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note F_, 2 + note E_, 2 + note G_, 4 + note F_, 2 + note E_, 6 + note_type 6, 12, 2 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 3 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 - octave 4 - B_ 4 - A_ 4 - G_ 2 - A# 4 - A_ 2 - G_ 4 - F_ 2 - E_ 2 - notetype 8, 12, 4 - A_ 4 - G_ 4 - F_ 4 - B_ 4 - A_ 4 - G_ 4 + note C_, 2 + octave 4 + note B_, 4 + note A_, 4 + note G_, 2 + note A#, 4 + note A_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note_type 8, 12, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note B_, 4 + note A_, 4 + note G_, 4 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 5 - D_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 7 - D_ 12 - C_ 4 - notetype 12, 11, 0 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 3 - loopchannel 0, Music_BikeRiding_branch_7dc75 + note D_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 7 + note D_, 12 + note C_, 4 + note_type 12, 11, 0 + octave 4 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 3 + sound_loop 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch2:: - notetype 12, 1, 3 +Music_BikeRiding_Ch3:: + note_type 12, 1, 3 rest 2 Music_BikeRiding_branch_7dd17:: octave 4 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - loopchannel 0, Music_BikeRiding_branch_7dd17 + sound_loop 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch3:: +Music_BikeRiding_Ch4:: dspeed 12 rest 2 Music_BikeRiding_branch_7de6a:: - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - loopchannel 0, Music_BikeRiding_branch_7de6a + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dec2 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dec2 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_loop 0, Music_BikeRiding_branch_7de6a Music_BikeRiding_branch_7dea7:: rest 2 @@ -678,7 +678,7 @@ Music_BikeRiding_branch_7dea7:: triangle3 2 rest 2 triangle3 2 - endchannel + sound_ret Music_BikeRiding_branch_7deb4:: rest 2 @@ -689,7 +689,7 @@ Music_BikeRiding_branch_7deb4:: triangle3 2 triangle3 2 triangle3 2 - endchannel + sound_ret Music_BikeRiding_branch_7dec2:: rest 2 @@ -701,4 +701,4 @@ Music_BikeRiding_branch_7dec2:: rest 2 triangle3 1 triangle3 1 - endchannel + sound_ret diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index a1699301..b64fc6dd 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,411 +1,411 @@ -Music_Celadon_Ch0:: +Music_Celadon_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 2, 15 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 2, 15 rest 8 octave 3 - D_ 8 + note D_, 8 Music_Celadon_branch_b6d4:: - duty 2 - notetype 12, 11, 2 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - E_ 1 - G_ 1 - E_ 1 - B_ 2 - octave 4 - C_ 2 + duty_cycle 2 + note_type 12, 11, 2 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note B_, 2 + octave 4 + note C_, 2 octave 3 - A_ 8 - F# 4 - A_ 4 - F# 2 - A_ 6 - A_ 1 - B_ 1 - octave 4 - C_ 1 + note A_, 8 + note F#, 4 + note A_, 4 + note F#, 2 + note A_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 octave 3 - B_ 1 - A_ 2 - B_ 2 - G_ 4 + note B_, 1 + note A_, 2 + note B_, 2 + note G_, 4 octave 4 - G_ 4 + note G_, 4 octave 3 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - F# 1 - G_ 1 - A_ 1 - B_ 2 - octave 4 - C_ 2 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 2 + octave 4 + note C_, 2 octave 3 - A_ 8 - A_ 2 - B_ 2 + note A_, 8 + note A_, 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 2 - F# 4 - D_ 1 - E_ 1 - F# 1 - G_ 1 - A_ 8 - notetype 12, 9, 4 - B_ 8 - G_ 4 - D_ 4 - G_ 4 - A_ 2 - octave 4 - C_ 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 8 + note_type 12, 9, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 octave 3 - B_ 8 - A_ 8 - F# 4 - G_ 4 - A_ 4 - G_ 4 - F# 4 - A_ 4 - B_ 8 - G_ 4 - D_ 4 - G_ 4 - A_ 2 - octave 4 - C_ 2 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 octave 3 - B_ 8 - A_ 8 - F# 4 - G_ 4 - A_ 4 - G_ 4 - F# 4 - A_ 4 - loopchannel 0, Music_Celadon_branch_b6d4 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + sound_loop 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch1:: - duty 3 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 10, 0 - A_ 8 +Music_Celadon_Ch2:: + duty_cycle 3 + note_type 12, 12, 2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 12, 10, 0 + note A_, 8 Music_Celadon_branch_b74a:: - duty 2 - notetype 12, 12, 2 - octave 4 - B_ 4 - G_ 4 - B_ 2 - G_ 6 - B_ 1 - G_ 1 - A_ 1 - B_ 1 + duty_cycle 2 + note_type 12, 12, 2 + octave 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 6 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 5 - C_ 2 - octave 4 - B_ 2 - A_ 8 - A_ 4 - F# 4 - A_ 2 - F# 6 - A_ 1 - G_ 1 - F# 1 - G_ 1 - A_ 2 - B_ 2 - G_ 4 - B_ 4 - B_ 4 - G_ 4 - B_ 2 - G_ 4 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 4 + note F#, 4 + note A_, 2 + note F#, 6 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + note B_, 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - B_ 1 - G_ 1 - A_ 1 - B_ 1 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 5 - C_ 2 - octave 4 - B_ 2 - A_ 8 - A_ 2 - G_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 - D_ 8 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 8 octave 5 - D_ 8 - notetype 12, 11, 4 + note D_, 8 + note_type 12, 11, 4 octave 4 - D_ 8 - C_ 2 + note D_, 8 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - octave 4 - E_ 4 - F# 4 - D_ 8 - C_ 8 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note F#, 4 + note D_, 8 + note C_, 8 octave 3 - A_ 2 - B_ 2 - octave 4 - C_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - D_ 8 - D_ 8 - C_ 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + note D_, 8 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - octave 4 - E_ 4 - D_ 2 - E_ 2 - D_ 8 - C_ 8 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - D_ 8 - loopchannel 0, Music_Celadon_branch_b74a + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 8 + note C_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + sound_loop 0, Music_Celadon_branch_b74a -Music_Celadon_Ch2:: - notetype 12, 1, 3 +Music_Celadon_Ch3:: + note_type 12, 1, 3 rest 8 octave 5 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 Music_Celadon_branch_b7c1:: octave 4 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - C# 2 - D_ 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note C#, 2 + note D_, 2 rest 6 - F# 2 + note F#, 2 rest 4 - F# 2 - G_ 2 + note F#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 - C_ 2 - octave 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - loopchannel 0, Music_Celadon_branch_b7c1 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + sound_loop 0, Music_Celadon_branch_b7c1 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index c6b3564d..69496af5 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,354 +1,354 @@ -Music_Cinnabar_Ch0:: +Music_Cinnabar_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Cinnabar_branch_b878:: - notetype 12, 11, 5 + note_type 12, 11, 5 rest 4 octave 3 - D_ 4 - E_ 6 - C# 2 - notetype 12, 11, 1 - D_ 4 - notetype 12, 11, 5 - B_ 4 + note D_, 4 + note E_, 6 + note C#, 2 + note_type 12, 11, 1 + note D_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - notetype 12, 11, 1 - B_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 2 - F# 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 4 - D_ 4 - E_ 4 - F# 6 - A_ 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - B_ 4 + note A_, 2 + note_type 12, 11, 1 + note B_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - B_ 4 - G_ 4 - F# 3 - E_ 1 - F# 2 - A_ 2 - notetype 12, 10, 2 - G_ 4 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + note_type 12, 10, 2 + note G_, 4 octave 4 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 7, 2 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 10, 7 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 7, 2 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 10, 7 octave 3 - B_ 6 - G_ 2 - E_ 8 + note B_, 6 + note G_, 2 + note E_, 8 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - F# 8 + note A_, 2 + note F#, 8 octave 4 - F# 6 - D_ 2 + note F#, 6 + note D_, 2 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 8 - F# 4 - E_ 4 - loopchannel 0, Music_Cinnabar_branch_b878 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + sound_loop 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch1:: - duty 3 +Music_Cinnabar_Ch2:: + duty_cycle 3 vibrato 10, 2, 3 Music_Cinnabar_branch_b8d9:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - G_ 6 - A_ 1 - B_ 1 + note G_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 octave 3 - B_ 8 - A_ 4 - G_ 6 - A_ 1 - B_ 1 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 octave 3 - A_ 4 - G_ 4 - F# 4 - notetype 12, 11, 0 + note A_, 4 + note G_, 4 + note F#, 4 + note_type 12, 11, 0 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 2 - G_ 8 + note B_, 2 + note G_, 8 octave 4 - E_ 6 - C_ 2 + note E_, 6 + note C_, 2 octave 3 - A_ 8 + note A_, 8 octave 4 - A_ 6 - F# 2 - D_ 2 - C_ 2 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 4 + note B_, 2 + note A_, 2 + note B_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 - A_ 6 - loopchannel 0, Music_Cinnabar_branch_b8d9 + note B_, 2 + note A_, 6 + sound_loop 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch2:: - notetype 12, 1, 0 +Music_Cinnabar_Ch3:: + note_type 12, 1, 0 Music_Cinnabar_branch_b93f:: octave 4 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 4 - A_ 1 + note B_, 4 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 + note D_, 2 octave 4 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 octave 5 - E_ 2 - C_ 1 - C_ 1 - C_ 1 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 2 - C_ 1 + note E_, 2 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 3 octave 5 - A_ 2 - F# 1 - F# 1 - D_ 1 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 - C_ 1 - C_ 1 + note D_, 2 + note C_, 1 + note C_, 1 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 2 + note A_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 - loopchannel 0, Music_Cinnabar_branch_b93f + sound_loop 0, Music_Cinnabar_branch_b93f diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index bb54a456..ff3de714 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,149 +1,149 @@ -Music_CinnabarMansion_Ch0:: +Music_CinnabarMansion_Ch1:: tempo 144 volume 7, 7 vibrato 11, 2, 5 - duty 2 + duty_cycle 2 Music_CinnabarMansion_branch_7ed19:: - notetype 12, 6, 2 + note_type 12, 6, 2 octave 5 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - B_ 1 - B_ 1 - C_ 1 + note B_, 1 + note B_, 1 + note C_, 1 rest 2 octave 5 - B_ 2 - E_ 2 + note B_, 2 + note E_, 2 octave 4 - C_ 2 - B_ 2 - E_ 2 - C_ 1 + note C_, 2 + note B_, 2 + note E_, 2 + note C_, 1 octave 5 - B_ 1 + note B_, 1 rest 2 - loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, 10, 5 + sound_loop 14, Music_CinnabarMansion_branch_7ed19 + note_type 12, 10, 5 rest 16 rest 16 rest 15 octave 4 - C_ 1 + note C_, 1 octave 5 - B_ 1 - B_ 2 - loopchannel 0, Music_CinnabarMansion_branch_7ed19 + note B_, 1 + note B_, 2 + sound_loop 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch1:: - duty 2 - toggleperfectpitch +Music_CinnabarMansion_Ch2:: + duty_cycle 2 + toggle_perfect_pitch vibrato 10, 2, 4 - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed48:: rest 16 rest 16 - loopchannel 4, Music_CinnabarMansion_branch_7ed48 + sound_loop 4, Music_CinnabarMansion_branch_7ed48 Music_CinnabarMansion_branch_7ed4e:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed50:: - callchannel Music_CinnabarMansion_branch_7ed6c - loopchannel 3, Music_CinnabarMansion_branch_7ed50 + sound_call Music_CinnabarMansion_branch_7ed6c + sound_loop 3, Music_CinnabarMansion_branch_7ed50 octave 3 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 rest 4 - A# 4 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 - G_ 4 - D# 4 - loopchannel 0, Music_CinnabarMansion_branch_7ed4e + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note D#, 4 + sound_loop 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 - A_ 4 - A# 4 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 rest 4 - A# 4 - endchannel + note A#, 4 + sound_ret -Music_CinnabarMansion_Ch2:: - notetype 12, 1, 1 +Music_CinnabarMansion_Ch3:: + note_type 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: octave 2 - B_ 2 + note B_, 2 rest 2 octave 3 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 3 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - loopchannel 8, Music_CinnabarMansion_branch_7ed80 - E_ 16 - D# 16 - G_ 16 - G# 8 - D# 8 - loopchannel 0, Music_CinnabarMansion_branch_7ed80 + sound_loop 8, Music_CinnabarMansion_branch_7ed80 + note E_, 16 + note D#, 16 + note G_, 16 + note G#, 8 + note D#, 8 + sound_loop 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch3:: +Music_CinnabarMansion_Ch4:: dspeed 6 rest 16 rest 16 @@ -169,4 +169,4 @@ Music_CinnabarMansion_branch_7edb5:: rest 10 rest 8 cymbal3 8 - loopchannel 0, Music_CinnabarMansion_branch_7edb5 + sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 984202f6..3aef872b 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -1,604 +1,604 @@ Music_Cities1_branch_aa6f:: tempo 232 - loopchannel 0, Music_Cities1_branch_aa79 + sound_loop 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch0:: +Music_Cities1_Ch1:: tempo 144 Music_Cities1_branch_aa79:: volume 7, 7 vibrato 8, 2, 4 - duty 3 + duty_cycle 3 Music_Cities1_branch_aa80:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - G# 4 - F# 4 - E_ 2 - E_ 2 - F# 2 - D# 2 - E_ 2 - E_ 2 - D# 2 - C# 4 - D# 4 - E_ 2 - D# 4 - C# 2 - E_ 2 - E_ 4 - notetype 12, 10, 5 - C# 4 + note G#, 4 + note F#, 4 + note E_, 2 + note E_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 2 + note E_, 2 + note E_, 4 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 6 + note B_, 6 octave 3 - C# 2 - C# 4 + note C#, 2 + note C#, 4 octave 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 6 - E_ 2 + note D#, 6 + note E_, 2 octave 2 - B_ 4 - notetype 12, 10, 5 + note B_, 4 + note_type 12, 10, 5 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 - A_ 4 - B_ 4 - B_ 2 + note B_, 2 + note A_, 4 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 5 - G# 2 - E_ 2 - F# 2 - E_ 2 - E_ 4 - F# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - C# 2 - E_ 2 - E_ 4 - notetype 12, 10, 5 - C# 2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 12, 12, 5 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note E_, 2 + note E_, 4 + note_type 12, 10, 5 + note C#, 2 octave 2 - A_ 2 - B_ 6 + note A_, 2 + note B_, 6 octave 3 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 2 - B_ 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 2 + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 4 - D# 2 - E_ 2 + note D#, 4 + note D#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - E_ 4 + note C#, 2 + note G#, 2 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - notetype 12, 10, 5 - C# 4 + note E_, 2 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - C# 2 - E_ 4 - notetype 12, 11, 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 4 - F# 4 - G# 2 - E_ 2 + note D#, 4 + note C#, 2 + note E_, 4 + note_type 12, 11, 3 + sound_call Music_Cities1_branch_ab8a + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 4 - G# 2 + note E_, 4 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 Music_Cities1_branch_ab12:: - C# 2 - D# 2 - C# 2 + note C#, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 4 - B_ 2 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - loopchannel 2, Music_Cities1_branch_ab12 - E_ 2 + note C#, 2 + note D#, 2 + sound_loop 2, Music_Cities1_branch_ab12 + note E_, 2 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - G# 2 + note C#, 2 + note G#, 2 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - E_ 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - F# 2 - G# 2 - E_ 2 + sound_call Music_Cities1_branch_ab8a + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - C# 2 - G# 2 - C# 2 - D# 2 - B_ 2 - E_ 2 - G# 2 - E_ 2 - F# 2 - E_ 4 - G# 2 - F# 2 - D# 2 + note E_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note D#, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note G#, 2 + note F#, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - F# 2 - D# 2 - D# 2 - F# 2 + note D#, 4 + note F#, 2 + note D#, 2 + note D#, 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D# 2 - notetype 12, 11, 6 - F# 8 - F# 4 - D# 4 - E_ 8 - notetype 12, 8, 4 + note D#, 2 + note_type 12, 11, 6 + note F#, 8 + note F#, 4 + note D#, 4 + note E_, 8 + note_type 12, 8, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - F# 2 - loopchannel 0, Music_Cities1_branch_aa80 + note E_, 2 + note F#, 2 + sound_loop 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 - F# 2 - D# 4 - E_ 2 - D# 4 - C# 4 + note F#, 2 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 - D# 2 - C# 2 - endchannel + note C#, 2 + note D#, 2 + note C#, 2 + sound_ret Music_Cities1_branch_ab8a:: - A_ 2 - E_ 2 - C# 2 - E_ 4 - A_ 2 - C# 2 - E_ 2 - endchannel + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + sound_ret -Music_Cities1_Ch1:: +Music_Cities1_Ch2:: vibrato 5, 1, 5 - callchannel Music_Cities1_branch_ac00 + sound_call Music_Cities1_branch_ac00 octave 4 - G# 2 - notetype 12, 12, 4 - E_ 6 - notetype 12, 12, 5 - duty 3 + note G#, 2 + note_type 12, 12, 4 + note E_, 6 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - C# 4 - D# 4 - E_ 6 - F# 6 - G# 4 - callchannel Music_Cities1_branch_ac00 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + sound_call Music_Cities1_branch_ac00 octave 4 - G# 2 - notetype 12, 12, 4 - E_ 14 - duty 3 + note G#, 2 + note_type 12, 12, 4 + note E_, 14 + duty_cycle 3 octave 3 - E_ 6 - F# 6 - G# 4 - notetype 12, 11, 7 - duty 2 + note E_, 6 + note F#, 6 + note G#, 4 + note_type 12, 11, 7 + duty_cycle 2 vibrato 8, 1, 7 octave 5 - C# 12 + note C#, 12 octave 4 - A_ 4 + note A_, 4 octave 5 - E_ 8 - F# 2 - E_ 2 - D# 2 - C# 2 + note E_, 8 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 4 - B_ 12 - G# 4 - B_ 16 - F# 12 - G# 2 - A_ 2 - B_ 4 - A_ 4 - G# 4 - F# 4 - G# 12 - E_ 4 - B_ 16 + note B_, 12 + note G#, 4 + note B_, 16 + note F#, 12 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note G#, 12 + note E_, 4 + note B_, 16 octave 5 - C# 12 - D# 2 - E_ 2 - F# 4 - E_ 4 - D# 4 - C# 4 + note C#, 12 + note D#, 2 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 octave 4 - B_ 12 + note B_, 12 octave 5 - C# 2 - D# 2 - C# 4 + note C#, 2 + note D#, 2 + note C#, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - A_ 12 - B_ 2 + note B_, 4 + note A_, 4 + note G#, 4 + note A_, 12 + note B_, 2 octave 5 - C_ 2 - C_ 4 + note C_, 2 + note C_, 4 octave 4 - B_ 4 - A_ 4 - F# 4 - notetype 12, 11, 7 - A_ 8 + note B_, 4 + note A_, 4 + note F#, 4 + note_type 12, 11, 7 + note A_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 14 - notetype 12, 8, 4 - G# 1 - notetype 12, 10, 4 - A_ 1 - loopchannel 0, Music_Cities1_Ch1 + note B_, 14 + note_type 12, 8, 4 + note G#, 1 + note_type 12, 10, 4 + note A_, 1 + sound_loop 0, Music_Cities1_Ch2 Music_Cities1_branch_ac00:: - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 - B_ 4 - A_ 4 - notetype 12, 12, 4 - G# 10 - notetype 12, 12, 3 - G# 2 - A_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 5 - duty 3 + note B_, 4 + note A_, 4 + note_type 12, 12, 4 + note G#, 10 + note_type 12, 12, 3 + note G#, 2 + note A_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - E_ 4 - D# 8 - E_ 4 - F# 4 - notetype 12, 12, 3 - duty 2 + note E_, 4 + note D#, 8 + note E_, 4 + note F#, 4 + note_type 12, 12, 3 + duty_cycle 2 octave 4 - A_ 4 - G# 4 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 3 - F# 2 - G# 2 - A_ 4 - A_ 2 - G# 2 - F# 2 - endchannel + note A_, 4 + note G#, 4 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 3 + note F#, 2 + note G#, 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + sound_ret -Music_Cities1_Ch2:: - notetype 12, 1, 1 - toggleperfectpitch +Music_Cities1_Ch3:: + note_type 12, 1, 1 + toggle_perfect_pitch Music_Cities1_branch_ac35:: vibrato 0, 0, 0 octave 4 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - B_ 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - G# 2 - E_ 2 - B_ 2 + note G#, 2 + note E_, 2 + note B_, 2 rest 2 - E_ 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - B_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 vibrato 8, 2, 5 - A_ 8 - E_ 8 - A_ 8 - F# 8 - G# 8 - E_ 8 - G# 12 - E_ 4 - F# 2 - F# 2 - D# 2 - E_ 4 - F# 2 - D# 2 - E_ 2 - F# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - G# 2 - G# 2 - E_ 2 - G# 2 + note A_, 8 + note E_, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note E_, 8 + note G#, 12 + note E_, 4 + note F#, 2 + note F#, 2 + note D#, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - A_ 8 - E_ 8 - A_ 8 - B_ 2 - A_ 2 - G# 2 - F# 2 - G# 8 - E_ 8 - B_ 4 - E_ 4 - F# 4 - G# 4 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 8 + note E_, 8 + note A_, 8 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 8 + note E_, 8 + note B_, 4 + note E_, 4 + note F#, 4 + note G#, 4 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - F# 2 - B_ 2 - A_ 2 - A_ 4 - G# 4 - F# 2 - D# 2 - A_ 2 - F# 2 + note F#, 2 + note B_, 2 + note A_, 2 + note A_, 4 + note G#, 4 + note F#, 2 + note D#, 2 + note A_, 2 + note F#, 2 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 1 - G# 1 - E_ 1 - F# 1 - G# 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - loopchannel 0, Music_Cities1_branch_ac35 + note E_, 2 + note F#, 1 + note G#, 1 + note E_, 1 + note F#, 1 + note G#, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + sound_loop 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - endchannel + note E_, 2 + note F#, 2 + note G#, 2 + sound_ret Music_Cities1_branch_acce:: - A_ 2 - F# 2 - G# 2 - A_ 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 rest 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 - D# 2 - D# 2 - E_ 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 - endchannel + note D#, 2 + note E_, 2 + note F#, 2 + sound_ret -Music_Cities1_Ch3:: +Music_Cities1_Ch4:: dspeed 12 - callchannel Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad45 - callchannel Music_Cities1_branch_ad45 - loopchannel 2, Music_Cities1_branch_acf3 - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 + sound_call Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad45 + sound_call Music_Cities1_branch_ad45 + sound_loop 2, Music_Cities1_branch_acf3 + sound_call Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad5f + sound_call Music_Cities1_branch_ad52 triangle1 6 triangle1 6 triangle2 4 - callchannel Music_Cities1_branch_ad6e - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 - callchannel Music_Cities1_branch_ad6e - callchannel Music_Cities1_branch_ad52 + sound_call Music_Cities1_branch_ad6e + sound_call Music_Cities1_branch_ad5f + sound_call Music_Cities1_branch_ad52 + sound_call Music_Cities1_branch_ad6e + sound_call Music_Cities1_branch_ad52 triangle1 6 triangle1 6 triangle2 2 @@ -609,7 +609,7 @@ Music_Cities1_branch_acf3:: triangle1 6 snare6 6 snare6 4 - loopchannel 0, Music_Cities1_Ch3 + sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: snare6 6 @@ -619,7 +619,7 @@ Music_Cities1_branch_ad36:: snare6 6 snare6 2 snare6 2 - endchannel + sound_ret Music_Cities1_branch_ad45:: snare6 6 @@ -628,7 +628,7 @@ Music_Cities1_branch_ad45:: snare6 6 snare6 6 snare6 4 - endchannel + sound_ret Music_Cities1_branch_ad52:: triangle1 6 @@ -637,7 +637,7 @@ Music_Cities1_branch_ad52:: triangle1 6 triangle1 6 triangle2 4 - endchannel + sound_ret Music_Cities1_branch_ad5f:: triangle1 6 @@ -647,11 +647,11 @@ Music_Cities1_branch_ad5f:: triangle1 6 triangle2 2 triangle1 2 - endchannel + sound_ret Music_Cities1_branch_ad6e:: triangle1 6 triangle1 6 triangle2 2 triangle2 2 - endchannel + sound_ret diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index fb167999..6397f965 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,416 +1,416 @@ -Music_Cities2_Ch0:: +Music_Cities2_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 2 - toggleperfectpitch - notetype 12, 11, 6 + toggle_perfect_pitch + note_type 12, 11, 6 rest 8 octave 3 - E_ 2 - D# 2 - C# 2 - C_ 2 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 octave 2 - B_ 2 + note B_, 2 rest 14 Music_Cities2_branch_b51a:: octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 - D# 1 - D_ 1 - C# 4 + note C#, 2 + note D#, 1 + note D_, 1 + note C#, 4 octave 3 - B_ 4 - G# 8 - E_ 8 - A_ 4 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note B_, 4 + note G#, 8 + note E_, 8 + note A_, 4 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 rest 16 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 1 - D# 1 - C# 4 + note C#, 1 + note D#, 1 + note C#, 4 octave 3 - B_ 4 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 3 - G# 8 - B_ 4 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - E_ 2 - F# 2 - G# 2 + note G#, 8 + note B_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - F# 2 - G# 2 - A_ 2 + note B_, 4 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 octave 4 - F# 4 - D# 4 + note F#, 4 + note D#, 4 octave 3 - E_ 2 + note E_, 2 rest 4 - F# 2 + note F#, 2 rest 4 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 16 rest 16 rest 14 - E_ 16 - F# 8 - G# 4 - F# 4 - E_ 2 + note E_, 16 + note F#, 8 + note G#, 4 + note F#, 4 + note E_, 2 rest 14 - loopchannel 0, Music_Cities2_branch_b51a + sound_loop 0, Music_Cities2_branch_b51a -Music_Cities2_Ch1:: - duty 3 +Music_Cities2_Ch2:: + duty_cycle 3 vibrato 8, 2, 3 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 6 - notetype 12, 12, 2 - duty 2 + note C#, 2 + note D#, 2 + note E_, 6 + note_type 12, 12, 2 + duty_cycle 2 octave 4 - E_ 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 Music_Cities2_branch_b58b:: - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 14 - notetype 12, 12, 2 - E_ 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 14 + note_type 12, 12, 2 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - notetype 12, 12, 2 - E_ 1 - G# 1 - notetype 12, 12, 5 - B_ 14 - notetype 12, 12, 2 - E_ 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note_type 12, 12, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 5 + note B_, 14 + note_type 12, 12, 2 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 8 - notetype 12, 10, 1 - duty 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 8 + note_type 12, 10, 1 + duty_cycle 1 octave 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - notetype 12, 12, 2 - duty 2 + note_type 12, 12, 2 + duty_cycle 2 octave 4 - E_ 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - E_ 1 - G# 1 - notetype 12, 12, 6 - B_ 8 - notetype 12, 12, 2 - C# 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note E_, 1 + note G#, 1 + note_type 12, 12, 6 + note B_, 8 + note_type 12, 12, 2 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - E_ 4 - notetype 12, 12, 7 - G# 4 - E_ 4 - notetype 12, 12, 2 - D# 1 - C# 1 - D# 1 - E_ 1 - F# 4 - notetype 12, 12, 7 - B_ 4 - F# 4 - notetype 12, 12, 2 - C# 1 + note C#, 1 + note D#, 1 + note E_, 4 + note_type 12, 12, 7 + note G#, 4 + note E_, 4 + note_type 12, 12, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 4 + note_type 12, 12, 7 + note B_, 4 + note F#, 4 + note_type 12, 12, 2 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - E_ 2 - E_ 1 - D# 1 - E_ 1 - F# 1 - G# 2 - G# 1 - A_ 1 - G# 1 - A_ 1 - B_ 1 - F# 1 - D# 1 - C# 1 + note C#, 1 + note D#, 1 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note G#, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - F# 1 - notetype 12, 12, 2 - B_ 8 - notetype 12, 11, 7 + note C#, 1 + note D#, 1 + note F#, 1 + note_type 12, 12, 2 + note B_, 8 + note_type 12, 11, 7 octave 3 - E_ 8 + note E_, 8 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - G# 4 - A_ 4 - B_ 8 - B_ 8 - G# 4 + note F#, 4 + note G#, 4 + note A_, 4 + note B_, 8 + note B_, 8 + note G#, 4 octave 4 - D# 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 2 - E_ 6 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 12, 12, 2 + note E_, 6 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - loopchannel 0, Music_Cities2_branch_b58b + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + sound_loop 0, Music_Cities2_branch_b58b -Music_Cities2_Ch2:: - notetype 12, 1, 1 +Music_Cities2_Ch3:: + note_type 12, 1, 1 rest 16 octave 4 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 Music_Cities2_branch_b64c:: - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 rest 2 - E_ 4 - G# 4 - F# 2 - A_ 2 - F# 2 + note E_, 4 + note G#, 4 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - F# 4 - A_ 4 - C# 2 + note F#, 4 + note A_, 4 + note C#, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - G# 2 - A_ 2 - B_ 2 + note G#, 2 + note A_, 2 + note B_, 2 rest 8 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - loopchannel 0, Music_Cities2_branch_b64c + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + sound_loop 0, Music_Cities2_branch_b64c diff --git a/audio/music/credits.asm b/audio/music/credits.asm index f092326b..b8a6d7dd 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,820 +1,820 @@ -Music_Credits_Ch0:: +Music_Credits_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 4 - E_ 6 + note E_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - E_ 1 - D_ 6 + note E_, 1 + note D_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - D_ 1 - C# 6 + note D_, 1 + note C#, 6 octave 3 - F# 1 - octave 4 - C# 1 - D_ 4 - E_ 2 - C# 1 - E_ 1 - C# 1 + note F#, 1 + octave 4 + note C#, 1 + note D_, 4 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 1 rest 1 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 11, 6 - A_ 4 - E_ 2 - A_ 2 - G_ 4 - A_ 2 - G_ 2 - B_ 4 - A_ 4 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 6 - E_ 2 - A_ 4 - C# 4 - E_ 4 - D_ 2 - C# 2 - E_ 2 - F# 2 - G_ 2 - F# 2 - A_ 4 - E_ 2 - A_ 2 - G_ 4 - A_ 2 - G_ 2 - B_ 4 - A_ 4 - G_ 2 - A_ 2 - F# 2 - D_ 2 - E_ 6 - C# 2 - A_ 4 - C# 4 - E_ 4 - D_ 2 - C# 2 - E_ 2 - F# 2 - G_ 2 - F# 2 - G_ 4 - D_ 2 - G_ 2 - B_ 2 - A_ 2 - G_ 2 - A_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 6 - A_ 2 - G_ 4 - F# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - G_ 4 - D_ 2 - G_ 2 - B_ 2 - octave 4 - C# 2 + note E_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 12, 11, 6 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 6 + note E_, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note E_, 6 + note C#, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + octave 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - notetype 12, 11, 7 - E_ 6 - A_ 2 - G_ 4 - F# 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - octave 4 - C# 4 - D_ 4 + note B_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note_type 12, 11, 7 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 9, 0 - G_ 8 - F# 8 - E_ 8 - D_ 8 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note_type 12, 9, 0 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 rest 16 rest 16 rest 8 - notetype 12, 11, 6 - E_ 6 - D# 1 - D_ 1 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 + note_type 12, 11, 6 + note E_, 6 + note D#, 1 + note D_, 1 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 rest 16 rest 16 rest 8 - E_ 6 - C# 1 - E_ 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 11, 6 - G_ 6 - D_ 4 - G_ 2 - B_ 4 - notetype 12, 11, 7 - G_ 8 - F# 4 - G# 4 - notetype 12, 9, 0 - A_ 8 - F# 8 - E_ 8 - C# 8 - notetype 12, 11, 7 - D_ 8 - C# 8 + note E_, 6 + note C#, 1 + note E_, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 11, 6 + note G_, 6 + note D_, 4 + note G_, 2 + note B_, 4 + note_type 12, 11, 7 + note G_, 8 + note F#, 4 + note G#, 4 + note_type 12, 9, 0 + note A_, 8 + note F#, 8 + note E_, 8 + note C#, 8 + note_type 12, 11, 7 + note D_, 8 + note C#, 8 octave 2 - B_ 8 + note B_, 8 octave 3 - D_ 8 - notetype 12, 9, 0 - E_ 8 - D_ 8 - F# 8 - E_ 8 - notetype 12, 10, 0 - D_ 8 - E_ 8 - D_ 8 - C_ 8 - G_ 8 - F_ 8 - E_ 8 - D_ 8 - notetype 12, 10, 0 - C# 6 - notetype 12, 10, 7 - C# 6 - notetype 12, 11, 7 - D_ 4 - E_ 8 - G_ 6 - F# 1 - F_ 1 - notetype 12, 10, 0 - E_ 6 - notetype 12, 10, 7 - E_ 6 - notetype 12, 11, 7 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 7 - E_ 6 - D_ 2 - G_ 4 - F# 4 - E_ 4 - F# 4 - E_ 4 - D_ 4 - E_ 4 - D_ 4 - C# 4 - D_ 4 - C# 4 - C# 4 - E_ 4 - F# 4 - notetype 12, 10, 0 - E_ 6 - notetype 12, 11, 7 - D_ 2 - G_ 4 - F# 4 - E_ 4 - F# 4 - A_ 4 - B_ 4 - notetype 12, 10, 0 - octave 4 - C# 16 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 5 + note D_, 8 + note_type 12, 9, 0 + note E_, 8 + note D_, 8 + note F#, 8 + note E_, 8 + note_type 12, 10, 0 + note D_, 8 + note E_, 8 + note D_, 8 + note C_, 8 + note G_, 8 + note F_, 8 + note E_, 8 + note D_, 8 + note_type 12, 10, 0 + note C#, 6 + note_type 12, 10, 7 + note C#, 6 + note_type 12, 11, 7 + note D_, 4 + note E_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 10, 7 + note E_, 6 + note_type 12, 11, 7 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 11, 7 + note E_, 6 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 4 + note C#, 4 + note E_, 4 + note F#, 4 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 11, 7 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note_type 12, 10, 0 + octave 4 + note C#, 16 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 11, 5 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - notetype 12, 11, 1 - A_ 8 - endchannel + note A_, 1 + note A_, 1 + note_type 12, 11, 1 + note A_, 8 + sound_ret -Music_Credits_Ch1:: - duty 3 +Music_Credits_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 5 - octave 4 - A_ 6 - E_ 1 - A_ 1 - G_ 6 - D_ 1 - G_ 1 - notetype 12, 12, 7 - F# 12 - G# 2 - E_ 1 - G# 1 - notetype 12, 12, 2 - A_ 2 - notetype 12, 12, 1 + note_type 12, 12, 5 + octave 4 + note A_, 6 + note E_, 1 + note A_, 1 + note G_, 6 + note D_, 1 + note G_, 1 + note_type 12, 12, 7 + note F#, 12 + note G#, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 2 + note A_, 2 + note_type 12, 12, 1 octave 3 - A_ 4 - A_ 1 - A_ 1 - A_ 2 - A_ 2 - A_ 4 - A_ 2 - A_ 4 - A_ 1 - A_ 1 - A_ 2 - A_ 2 - notetype 12, 12, 4 - A_ 1 - F# 1 - A_ 1 - B_ 1 - notetype 12, 12, 7 - octave 4 - C# 6 - C# 1 - D_ 1 - E_ 4 - C# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - C# 6 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note_type 12, 12, 4 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 7 + octave 4 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 8 + note E_, 8 octave 3 - A_ 6 - E_ 2 - octave 4 - C# 8 - C# 6 - C# 1 - D_ 1 - E_ 4 - C# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - C# 6 + note A_, 6 + note E_, 2 + octave 4 + note C#, 8 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 8 + note E_, 8 octave 3 - A_ 6 - E_ 2 - notetype 12, 11, 0 + note A_, 6 + note E_, 2 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 12, 7 - D_ 6 + note C#, 8 + note_type 12, 12, 7 + note D_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 8 + note G_, 8 octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 - octave 4 - C# 6 - notetype 12, 11, 7 - C# 6 - D_ 4 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 8 - notetype 12, 12, 7 - D_ 6 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note D_, 4 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 8 + note G_, 8 octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 - octave 4 - E_ 7 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 3 - E_ 1 - G# 1 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 6 - G_ 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 9, 0 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note E_, 7 + note_type 12, 11, 7 + note E_, 7 + note_type 12, 12, 3 + note E_, 1 + note G#, 1 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 6 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 9, 0 octave 3 - A_ 8 - notetype 12, 9, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 12, 7 - D_ 8 - G_ 6 - F# 1 - F_ 1 - E_ 8 - notetype 12, 11, 7 - G_ 6 - F# 1 - F_ 1 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 + note A_, 8 + note_type 12, 9, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note_type 12, 11, 7 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 octave 2 - B_ 8 + note B_, 8 octave 3 - F# 6 - D_ 1 - F# 1 - E_ 8 - B_ 6 - G_ 1 - B_ 1 - notetype 12, 11, 0 - octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 + note F#, 6 + note D_, 1 + note F#, 1 + note E_, 8 + note B_, 6 + note G_, 1 + note B_, 1 + note_type 12, 11, 0 + octave 4 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 8 + note B_, 8 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 1 - octave 4 - D_ 1 - notetype 12, 11, 0 - C# 6 - notetype 12, 11, 7 - C# 6 - notetype 12, 12, 7 + note B_, 1 + octave 4 + note D_, 1 + note_type 12, 11, 0 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 12, 7 octave 3 - B_ 4 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - F# 6 - notetype 12, 11, 7 - F# 6 - notetype 12, 12, 7 - G# 4 - A_ 8 - F# 8 - notetype 12, 11, 0 - G# 6 - notetype 12, 11, 7 - G# 6 - notetype 12, 12, 7 - A_ 4 - B_ 8 - G# 8 - notetype 12, 11, 0 - A_ 6 - notetype 12, 11, 7 - A_ 6 - notetype 12, 12, 7 - B_ 4 - octave 4 - C_ 8 + note B_, 4 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note F#, 6 + note_type 12, 11, 7 + note F#, 6 + note_type 12, 12, 7 + note G#, 4 + note A_, 8 + note F#, 8 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 11, 7 + note G#, 6 + note_type 12, 12, 7 + note A_, 4 + note B_, 8 + note G#, 8 + note_type 12, 11, 0 + note A_, 6 + note_type 12, 11, 7 + note A_, 6 + note_type 12, 12, 7 + note B_, 4 + octave 4 + note C_, 8 octave 3 - A_ 8 - notetype 12, 11, 0 - B_ 6 - notetype 12, 11, 7 - B_ 6 - notetype 12, 12, 7 - octave 4 - C_ 4 - notetype 12, 11, 0 - D_ 8 + note A_, 8 + note_type 12, 11, 0 + note B_, 6 + note_type 12, 11, 7 + note B_, 6 + note_type 12, 12, 7 + octave 4 + note C_, 4 + note_type 12, 11, 0 + note D_, 8 octave 3 - B_ 8 - notetype 12, 11, 0 - octave 4 - C# 16 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note C#, 16 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 octave 3 - A_ 16 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - G_ 6 - B_ 2 - octave 4 - D_ 8 + note A_, 16 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 2 - G_ 6 - F# 1 - F_ 1 - E_ 8 + note D_, 2 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 octave 3 - G_ 6 - F# 1 - F_ 1 - E_ 8 - C# 4 - D_ 4 - G_ 6 - B_ 2 - octave 4 - D_ 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note C#, 4 + note D_, 4 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 octave 3 - B_ 6 - octave 4 - D_ 2 - G_ 8 - notetype 12, 11, 0 - A_ 16 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 12, 1 - A_ 2 - A_ 4 - A_ 1 - A_ 1 - notetype 12, 12, 1 - A_ 8 - endchannel + note B_, 6 + octave 4 + note D_, 2 + note G_, 8 + note_type 12, 11, 0 + note A_, 16 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 12, 1 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note_type 12, 12, 1 + note A_, 8 + sound_ret -Music_Credits_Ch2:: - notetype 12, 1, 0 +Music_Credits_Ch3:: + note_type 12, 1, 0 octave 5 - C# 6 + note C#, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - C# 1 - D_ 6 + note C#, 1 + note D_, 6 octave 4 - B_ 1 + note B_, 1 octave 5 - D_ 1 - F# 6 - D_ 1 - F# 1 - A_ 4 - G# 2 - E_ 1 - G# 1 - A_ 1 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 4 + note G#, 2 + note E_, 1 + note G#, 1 + note A_, 1 rest 15 rest 16 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - octave 4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 - octave 4 - A_ 2 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + octave 4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffc1 + octave 4 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 - octave 4 - B_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 - callchannel Music_Credits_branch_7ffc1 - octave 4 - G_ 4 - A_ 4 - B_ 4 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffc1 + sound_call Music_Credits_branch_7ffc1 + octave 4 + note G_, 4 + note A_, 4 + note B_, 4 octave 5 - D_ 4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - E_ 4 - A_ 2 - E_ 4 - A_ 2 - E_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - G# 2 - A_ 2 - callchannel Music_Credits_branch_7ffd2 - callchannel Music_Credits_branch_7ffd2 - callchannel Music_Credits_branch_7ffdb - callchannel Music_Credits_branch_7ffdb - F_ 2 - A_ 2 - F_ 2 - A_ 2 - F_ 2 - A_ 2 - F_ 2 - A_ 2 - F_ 2 - A_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - E_ 4 - A_ 4 - E_ 4 - A_ 4 - E_ 4 - A_ 4 - E_ 4 - A_ 4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffe4 - callchannel Music_Credits_branch_7ffe4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffed - callchannel Music_Credits_branch_7ffed - A_ 1 + note D_, 4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + note E_, 4 + note A_, 2 + note E_, 4 + note A_, 2 + note E_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffd2 + sound_call Music_Credits_branch_7ffd2 + sound_call Music_Credits_branch_7ffdb + sound_call Music_Credits_branch_7ffdb + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffe4 + sound_call Music_Credits_branch_7ffe4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffed + sound_call Music_Credits_branch_7ffed + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 7 - endchannel + sound_ret Music_Credits_branch_7ffa4:: octave 4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffae:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - endchannel + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_ret Music_Credits_branch_7ffb8:: - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - endchannel + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffc1:: octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_Credits_branch_7ffd2:: - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - endchannel + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffdb:: - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + sound_ret Music_Credits_branch_7ffe4:: - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - endchannel + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffed:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 1ea6c1ff..94c9eae3 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,607 +1,607 @@ -Music_DefeatedGymLeader_Ch0:: +Music_DefeatedGymLeader_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 18, 3, 1 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 10, 6 + note_type 12, 10, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - D_ 1 - F# 6 - D_ 1 - F# 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 Music_DefeatedGymLeader_branch_23ccc:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - E_ 2 - D_ 4 - D_ 4 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - C# 2 - notetype 12, 11, 1 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 11, 2 + note B_, 8 + note_type 12, 11, 2 octave 3 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - E_ 2 - D_ 4 - D_ 4 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - C# 2 - notetype 12, 11, 1 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 9, 7 + note B_, 8 + note_type 12, 9, 7 octave 3 - D_ 6 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 0 - F# 8 - E_ 8 - D_ 8 - C# 8 - notetype 12, 9, 7 - D_ 6 + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 0 + note F#, 8 + note E_, 8 + note D_, 8 + note C#, 8 + note_type 12, 9, 7 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 7 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 10, 7 - G_ 8 - E_ 8 - loopchannel 0, Music_DefeatedGymLeader_branch_23ccc + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 7 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 10, 7 + note G_, 8 + note E_, 8 + sound_loop 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch1:: - duty 2 +Music_DefeatedGymLeader_Ch2:: + duty_cycle 2 vibrato 24, 2, 4 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - A_ 6 - F# 1 - A_ 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 + note D_, 1 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 Music_DefeatedGymLeader_branch_23d84:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 4 - notetype 12, 12, 2 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 4 + note_type 12, 12, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 6 - notetype 6, 12, 2 - G_ 1 - A_ 1 - B_ 1 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 6 + note_type 6, 12, 2 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 3 - notetype 6, 12, 2 - B_ 1 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 3 + note_type 6, 12, 2 + note B_, 1 octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 8, 0 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 8, 0 octave 4 - E_ 8 - notetype 12, 10, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 + note E_, 8 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 6, 15 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 6, 15 octave 4 - C# 8 - notetype 12, 12, 7 - C# 8 - F# 4 - E_ 4 - notetype 12, 11, 0 - D_ 14 + note C#, 8 + note_type 12, 12, 7 + note C#, 8 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note D_, 14 octave 3 - B_ 2 - notetype 12, 10, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 + note B_, 2 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 4, 15 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 4, 15 octave 4 - E_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 + note E_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 11, 0 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 4 - notetype 12, 11, 0 - D_ 14 - E_ 2 - D_ 12 - notetype 12, 12, 2 + note C#, 4 + note_type 12, 11, 0 + note D_, 14 + note E_, 2 + note D_, 12 + note_type 12, 12, 2 octave 3 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + note C#, 1 + sound_loop 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch2:: - notetype 12, 1, 0 +Music_DefeatedGymLeader_Ch3:: + note_type 12, 1, 0 vibrato 16, 1, 2 octave 4 - F# 6 - D_ 1 - F# 1 - A_ 6 - F# 1 - A_ 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - F# 8 + note D_, 1 + note F#, 8 Music_DefeatedGymLeader_branch_23e65:: octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F# 3 + note F#, 3 rest 1 - F# 3 + note F#, 3 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 5 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 3 + note G_, 3 rest 1 - D_ 3 + note D_, 3 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 7 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G_ 2 - A_ 2 - G_ 2 - E_ 2 - loopchannel 0, Music_DefeatedGymLeader_branch_23e65 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note E_, 2 + sound_loop 0, Music_DefeatedGymLeader_branch_23e65 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 87c5d2c9..158d755c 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,266 +1,266 @@ -Music_DefeatedTrainer_Ch0:: +Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch tempo 224 - notetype 4, 10, 2 + note_type 4, 10, 2 octave 4 - D_ 2 + note D_, 2 tempo 224 - notetype 4, 10, 2 - D_ 2 - D_ 2 - D_ 2 + note_type 4, 10, 2 + note D_, 2 + note D_, 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 4, 11, 3 - F# 12 - duty 1 + note D_, 2 + note_type 4, 11, 3 + note F#, 12 + duty_cycle 1 tempo 224 Music_DefeatedTrainer_branch_23a76:: - notetype 4, 6, 3 + note_type 4, 6, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 - G_ 3 - A_ 3 - B_ 3 - A_ 3 - G_ 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C# 3 - D_ 3 - E_ 3 - F# 3 - C# 3 + note C#, 3 + note D_, 3 + note E_, 3 + note F#, 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 + note B_, 3 + note A_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - C_ 3 - D_ 3 + note C_, 3 + note D_, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - D_ 6 - C# 3 + note D_, 6 + note C#, 3 octave 3 - B_ 3 - A_ 3 - G_ 3 - F# 3 - G_ 3 - A_ 3 - B_ 3 - A_ 3 - G_ 3 - F# 3 - E_ 3 - F# 3 - G_ 3 - A_ 3 - B_ 3 - loopchannel 0, Music_DefeatedTrainer_branch_23a76 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + sound_loop 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch1:: - duty 2 - notetype 4, 12, 3 +Music_DefeatedTrainer_Ch2:: + duty_cycle 2 + note_type 4, 12, 3 octave 4 - A_ 2 - notetype 4, 12, 3 - A_ 2 - A_ 2 - A_ 2 - B_ 2 + note A_, 2 + note_type 4, 12, 3 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 octave 5 - C# 2 - notetype 4, 12, 4 - D_ 12 + note C#, 2 + note_type 4, 12, 4 + note D_, 12 Music_DefeatedTrainer_branch_23ad2:: - notetype 4, 8, 5 + note_type 4, 8, 5 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - E_ 3 - F# 3 - G_ 6 - D_ 6 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note E_, 3 + note F#, 3 + note G_, 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - F# 3 - G_ 3 - A_ 6 - D_ 6 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note G_, 3 + note A_, 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F_ 6 - C_ 3 - F_ 3 - G_ 3 - D_ 3 - G_ 6 - notetype 4, 7, 0 - F# 12 - notetype 4, 7, 7 - F# 12 - notetype 4, 6, 0 - E_ 12 - notetype 4, 6, 7 - E_ 12 - loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + note E_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note G_, 3 + note D_, 3 + note G_, 6 + note_type 4, 7, 0 + note F#, 12 + note_type 4, 7, 7 + note F#, 12 + note_type 4, 6, 0 + note E_, 12 + note_type 4, 6, 7 + note E_, 12 + sound_loop 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch2:: - notetype 4, 1, 0 +Music_DefeatedTrainer_Ch3:: + note_type 4, 1, 0 octave 5 - D_ 2 - notetype 4, 1, 0 - D_ 2 - D_ 2 + note D_, 2 + note_type 4, 1, 0 + note D_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 - A_ 12 - notetype 4, 2, 1 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 12 + note_type 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 octave 5 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - F# 3 + note A_, 3 + note F#, 3 octave 5 - D_ 3 + note D_, 3 octave 4 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 octave 5 - E_ 3 + note E_, 3 octave 4 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - F_ 3 + note F_, 3 octave 4 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 octave 5 - G_ 3 + note G_, 3 octave 4 - B_ 3 - A# 3 - A_ 3 + note B_, 3 + note A#, 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - C_ 3 - C# 3 + note C_, 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - loopchannel 0, Music_DefeatedTrainer_branch_23b24 + note A_, 3 + sound_loop 0, Music_DefeatedTrainer_branch_23b24 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index ea3f733f..364f548e 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,302 +1,302 @@ -Music_DefeatedWildMon_Ch0:: +Music_DefeatedWildMon_Ch1:: tempo 112 volume 7, 7 - executemusic - duty 3 + execute_music + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - E_ 12 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 12 Music_DefeatedWildMon_branch_23b8b:: - notetype 12, 6, 2 - E_ 2 - F# 2 - E_ 2 - F# 2 - G# 2 - G# 2 - G# 4 - A_ 2 - A_ 2 - A_ 4 - G# 2 - G# 2 - G# 4 - E_ 2 - F# 2 - E_ 2 - F# 2 - G# 2 - G# 2 - G# 4 - A_ 2 - A_ 2 - A_ 4 - G# 8 - F_ 2 - G_ 2 - F_ 2 - G_ 2 - A_ 2 - A_ 2 - A_ 4 - A# 2 - A# 2 - A# 4 - A_ 2 - A_ 2 - A_ 4 - F_ 2 - G_ 2 - F_ 2 - G_ 2 - A_ 2 - A_ 2 - A_ 4 - A# 2 - A# 2 - A# 4 - A_ 8 - loopchannel 0, Music_DefeatedWildMon_branch_23b8b + note_type 12, 6, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 2 + note G#, 4 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 8 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 8 + sound_loop 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch1:: - executemusic - duty 2 - notetype 12, 12, 3 +Music_DefeatedWildMon_Ch2:: + execute_music + duty_cycle 2 + note_type 12, 12, 3 octave 4 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 7 - B_ 12 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 7 + note B_, 12 Music_DefeatedWildMon_branch_23bce:: - notetype 12, 8, 2 + note_type 12, 8, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 octave 4 - C# 2 - C# 2 - C# 4 + note C#, 2 + note C#, 2 + note C#, 4 octave 3 - B_ 2 - B_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 octave 4 - C# 2 - C# 2 - C# 4 + note C#, 2 + note C#, 2 + note C#, 4 octave 3 - B_ 8 + note B_, 8 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - A# 2 + note A#, 2 + note A_, 2 + note A#, 2 octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 2 - C_ 2 - C_ 4 - C_ 2 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 2 + note C_, 2 + note C_, 4 + note C_, 2 octave 3 - A# 2 - A_ 2 - A# 2 + note A#, 2 + note A_, 2 + note A#, 2 octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 8 - loopchannel 0, Music_DefeatedWildMon_branch_23bce + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + sound_loop 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch2:: - executemusic - notetype 12, 2, 0 +Music_DefeatedWildMon_Ch3:: + execute_music + note_type 12, 2, 0 octave 5 - E_ 1 + note E_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 octave 5 - D# 1 + note D#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - D# 4 + note D#, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - D# 4 - loopchannel 0, Music_DefeatedWildMon_branch_23c21 + note D#, 4 + sound_loop 0, Music_DefeatedWildMon_branch_23c21 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c6f6b105..a28b31e6 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,610 +1,610 @@ -Music_Dungeon1_Ch0:: +Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 - notetype 12, 4, 13 + note_type 12, 4, 13 rest 8 - stereopanning 237 + stereo_panning 237 octave 4 - F# 8 - stereopanning 255 + note F#, 8 + stereo_panning 255 Music_Dungeon1_branch_7dee5:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 Music_Dungeon1_branch_7dee8:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 3, Music_Dungeon1_branch_7dee8 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 3, Music_Dungeon1_branch_7dee8 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 Music_Dungeon1_branch_7deff:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 4, Music_Dungeon1_branch_7deff - callchannel Music_Dungeon1_branch_7dfd5 - octave 3 - G_ 1 - F# 1 - E_ 1 - G_ 1 - callchannel Music_Dungeon1_branch_7dfd5 - octave 3 - A_ 1 - G_ 1 - E_ 1 - A_ 1 - callchannel Music_Dungeon1_branch_7dfd5 - octave 3 - B_ 1 - A_ 1 - G_ 1 - F# 1 - notetype 12, 12, 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 - octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 3 - octave 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - E_ 4 - D# 4 - C_ 4 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 4, Music_Dungeon1_branch_7deff + sound_call Music_Dungeon1_branch_7dfd5 + octave 3 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + sound_call Music_Dungeon1_branch_7dfd5 + octave 3 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + sound_call Music_Dungeon1_branch_7dfd5 + octave 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note_type 12, 12, 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 3 + octave 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 2 - B_ 4 - notetype 12, 12, 2 - B_ 1 - A# 1 - G_ 1 - A# 1 - B_ 1 - A# 1 - G_ 1 - A# 1 - octave 3 - C_ 1 + note B_, 4 + note_type 12, 12, 2 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - D_ 1 - C# 1 + note C_, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 - D_ 1 - C# 1 + note C#, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 + note C#, 1 Music_Dungeon1_branch_7df6e:: rest 16 - loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, 12, 3 - callchannel Music_Dungeon1_branch_7dfbb - B_ 2 - G_ 2 + sound_loop 8, Music_Dungeon1_branch_7df6e + note_type 12, 12, 3 + sound_call Music_Dungeon1_branch_7dfbb + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - callchannel Music_Dungeon1_branch_7dfbb - A# 2 - G_ 2 - B_ 4 - G_ 2 - F# 2 - G_ 2 - D# 2 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 - octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 7 - octave 3 - F# 8 - D# 8 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfaa - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 0, Music_Dungeon1_branch_7dee5 + note G_, 2 + note A_, 4 + note F#, 2 + sound_call Music_Dungeon1_branch_7dfbb + note A#, 2 + note G_, 2 + note B_, 4 + note G_, 2 + note F#, 2 + note G_, 2 + note D#, 2 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 7 + octave 3 + note F#, 8 + note D#, 8 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfaa + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 0, Music_Dungeon1_branch_7dee5 Music_Dungeon1_branch_7dfaa:: - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - endchannel + note A#, 1 + sound_ret Music_Dungeon1_branch_7dfbb:: octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - endchannel + note G_, 2 + note A#, 2 + sound_ret Music_Dungeon1_branch_7dfc5:: octave 3 - E_ 1 - E_ 1 - F_ 1 - E_ 1 - G_ 1 - E_ 1 - A_ 1 - E_ 1 - A# 1 - E_ 1 - B_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note A#, 1 + note E_, 1 + note B_, 1 + note E_, 1 octave 4 - C_ 1 - endchannel + note C_, 1 + sound_ret Music_Dungeon1_branch_7dfd5:: - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel + sound_ret -Music_Dungeon1_Ch1:: +Music_Dungeon1_Ch2:: vibrato 11, 1, 5 - duty 3 - notetype 12, 0, 15 + duty_cycle 3 + note_type 12, 0, 15 octave 4 - G# 8 - notetype 12, 4, 13 + note G#, 8 + note_type 12, 4, 13 octave 5 - D_ 8 + note D_, 8 Music_Dungeon1_branch_7dfeb:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_Dungeon1_branch_7dfed:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 3, Music_Dungeon1_branch_7dfed + sound_call Music_Dungeon1_branch_7e097 + sound_loop 3, Music_Dungeon1_branch_7dfed octave 2 - E_ 1 - E_ 1 - B_ 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - E_ 1 - E_ 1 - A_ 1 - G_ 1 - F_ 1 - F# 1 - G_ 1 - D# 1 + note B_, 1 + note E_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note D#, 1 Music_Dungeon1_branch_7e006:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 4, Music_Dungeon1_branch_7e006 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 4, Music_Dungeon1_branch_7e006 rest 2 - callchannel Music_Dungeon1_branch_7e0ab + sound_call Music_Dungeon1_branch_7e0ab octave 3 - C_ 4 - callchannel Music_Dungeon1_branch_7e0ab + note C_, 4 + sound_call Music_Dungeon1_branch_7e0ab octave 3 - C# 4 - callchannel Music_Dungeon1_branch_7e0ab + note C#, 4 + sound_call Music_Dungeon1_branch_7e0ab octave 3 - D# 4 - notetype 12, 13, 3 + note D#, 4 + note_type 12, 13, 3 octave 4 - E_ 4 - D# 4 - C_ 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 3 - B_ 4 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0b5 + note B_, 4 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - F# 4 - callchannel Music_Dungeon1_branch_7e0b5 + note F#, 4 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0b5 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - A# 4 - notetype 12, 13, 3 + note A#, 4 + note_type 12, 13, 3 octave 4 - E_ 4 - D# 4 - C_ 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 - octave 3 - B_ 4 - G_ 4 - F# 2 - notetype 12, 13, 6 - E_ 8 - F_ 8 - F# 8 - G_ 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0ba + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + note_type 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0ba rest 10 - E_ 1 + note E_, 1 rest 1 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 12 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 12 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 14 - notetype 12, 13, 3 - callchannel Music_Dungeon1_branch_7e0cd - D# 4 - callchannel Music_Dungeon1_branch_7e0cd - D# 2 + note_type 12, 13, 3 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 4 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 2 rest 2 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0c0 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0c0 rest 2 octave 3 - F# 4 + note F#, 4 octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 1 + note C_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 rest 2 octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0c0 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0c0 octave 3 - A# 4 - notetype 12, 13, 6 - B_ 8 + note A#, 4 + note_type 12, 13, 6 + note B_, 8 octave 4 - D# 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e097 - callchannel Music_Dungeon1_branch_7e097 - loopchannel 0, Music_Dungeon1_branch_7dfeb + note D#, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e097 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 0, Music_Dungeon1_branch_7dfeb Music_Dungeon1_branch_7e097:: octave 2 - E_ 1 - E_ 1 - B_ 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - E_ 1 - E_ 1 - B_ 1 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - endchannel + note B_, 1 + sound_ret Music_Dungeon1_branch_7e0ab:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - endchannel + sound_ret Music_Dungeon1_branch_7e0b5:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 10 - endchannel + sound_ret Music_Dungeon1_branch_7e0ba:: octave 1 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret Music_Dungeon1_branch_7e0c0:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - C# 1 - C_ 1 - endchannel + note C#, 1 + note C_, 1 + sound_ret Music_Dungeon1_branch_7e0cd:: octave 3 - E_ 6 - G_ 6 - E_ 4 - A_ 6 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 4 - G_ 6 - A# 6 - F# 4 - E_ 6 - F# 6 - endchannel + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + sound_ret -Music_Dungeon1_Ch2:: - notetype 12, 1, 1 +Music_Dungeon1_Ch3:: + note_type 12, 1, 1 vibrato 8, 2, 6 rest 14 octave 4 - D_ 1 - D# 1 + note D_, 1 + note D#, 1 Music_Dungeon1_branch_7e0e5:: - callchannel Music_Dungeon1_branch_7e140 - callchannel Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 octave 5 - E_ 2 + note E_, 2 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 octave 4 - F# 4 - callchannel Music_Dungeon1_branch_7e154 + note F#, 4 + sound_call Music_Dungeon1_branch_7e154 octave 4 - G_ 4 - callchannel Music_Dungeon1_branch_7e154 + note G_, 4 + sound_call Music_Dungeon1_branch_7e154 octave 4 - A_ 4 - B_ 4 - A# 4 - G_ 4 - F# 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 rest 6 - callchannel Music_Dungeon1_branch_7e177 - B_ 4 - A# 4 - G_ 4 - F# 4 - G_ 4 - F# 4 - E_ 4 - D# 4 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e177 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 10 - E_ 1 + note E_, 1 rest 1 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 10 - D_ 1 - D# 1 - callchannel Music_Dungeon1_branch_7e164 - callchannel Music_Dungeon1_branch_7e164 - E_ 2 + note D_, 1 + note D#, 1 + sound_call Music_Dungeon1_branch_7e164 + sound_call Music_Dungeon1_branch_7e164 + note E_, 2 rest 4 - callchannel Music_Dungeon1_branch_7e177 - B_ 8 - F# 6 - D_ 1 - D# 1 + sound_call Music_Dungeon1_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 rest 16 rest 16 - loopchannel 0, Music_Dungeon1_branch_7e0e5 + sound_loop 0, Music_Dungeon1_branch_7e0e5 Music_Dungeon1_branch_7e140:: octave 5 - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 6 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 5 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - endchannel + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret Music_Dungeon1_branch_7e154:: octave 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel + sound_ret Music_Dungeon1_branch_7e15e:: octave 3 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret Music_Dungeon1_branch_7e164:: - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 4 - D_ 4 - C# 4 - octave 3 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - endchannel + note D_, 4 + note C#, 4 + octave 3 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret Music_Dungeon1_branch_7e177:: octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 4 + note F#, 4 rest 6 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - G_ 4 + note G_, 4 rest 6 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - A# 4 - endchannel + note E_, 1 + note E_, 1 + note A#, 4 + sound_ret -Music_Dungeon1_Ch3:: +Music_Dungeon1_Ch4:: dspeed 12 rest 14 cymbal1 1 cymbal1 1 Music_Dungeon1_branch_7e190:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e190 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e190 cymbal2 4 cymbal1 4 cymbal2 4 @@ -612,22 +612,22 @@ Music_Dungeon1_branch_7e190:: cymbal1 2 Music_Dungeon1_branch_7e1a1:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e1a1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e1a1 cymbal2 4 cymbal1 4 cymbal2 4 cymbal2 4 Music_Dungeon1_branch_7e1b0:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1b0 - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1b0 + sound_call Music_Dungeon1_branch_7e202 Music_Dungeon1_branch_7e1ba:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1ba - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1ba + sound_call Music_Dungeon1_branch_7e202 snare7 4 snare8 4 snare8 4 @@ -637,39 +637,39 @@ Music_Dungeon1_branch_7e1ba:: Music_Dungeon1_branch_7e1cf:: rest 16 - loopchannel 13, Music_Dungeon1_branch_7e1cf + sound_loop 13, Music_Dungeon1_branch_7e1cf rest 12 Music_Dungeon1_branch_7e1d5:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1d5 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1d5 cymbal1 4 cymbal1 4 cymbal1 4 rest 2 cymbal1 1 cymbal1 1 - callchannel Music_Dungeon1_branch_7e1f1 - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 0, Music_Dungeon1_branch_7e190 + sound_call Music_Dungeon1_branch_7e1f1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: cymbal2 4 cymbal1 4 cymbal2 4 cymbal1 4 - endchannel + sound_ret Music_Dungeon1_branch_7e1fa:: cymbal1 1 cymbal1 1 rest 10 cymbal3 4 - endchannel + sound_ret Music_Dungeon1_branch_7e202:: snare7 4 snare8 4 snare8 4 snare9 4 - endchannel + sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index d5f459fb..807c2f40 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,64 +1,64 @@ -Music_Dungeon2_Ch0:: +Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - A# 4 - A# 4 - A# 4 - A# 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 octave 5 - C# 4 - C# 4 - C# 4 - C# 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 octave 3 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - A# 4 - A# 4 - A# 4 - A# 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, 1, 15 + note G_, 2 + note A_, 4 + note F#, 2 + sound_loop 2, Music_Dungeon2_branch_7e892 + note_type 12, 1, 15 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 rest 16 rest 16 rest 16 @@ -67,242 +67,242 @@ Music_Dungeon2_branch_7e892:: rest 16 rest 16 rest 16 - loopchannel 0, Music_Dungeon2_branch_7e892 + sound_loop 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch1:: +Music_Dungeon2_Ch2:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: - duty 3 - notetype 12, 12, 2 + duty_cycle 3 + note_type 12, 12, 2 octave 3 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - C_ 4 - C_ 4 - C_ 4 - C_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - C_ 4 - C_ 4 - C_ 4 - C_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 octave 4 - F# 4 - F# 4 - F# 4 - F# 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - G_ 4 - G_ 4 - G_ 4 - F# 4 - loopchannel 2, Music_Dungeon2_branch_7e8db + note F#, 4 + note F#, 4 + note F#, 4 + note F#, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + sound_loop 2, Music_Dungeon2_branch_7e8db octave 3 - E_ 2 - G_ 2 - E_ 2 - D# 2 - E_ 2 - E_ 2 + note E_, 2 + note G_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note E_, 2 octave 5 - E_ 2 + note E_, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - C# 2 - C_ 2 + note C#, 2 + note C_, 2 octave 4 - E_ 2 - G_ 2 + note E_, 2 + note G_, 2 octave 3 - A# 2 - C# 2 - A# 2 - A_ 2 - A# 2 - G_ 2 + note A#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 5 - G_ 2 + note G_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - F_ 2 + note F_, 2 rest 2 - E_ 2 - D# 2 - D_ 2 - C# 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 rest 16 rest 16 rest 16 rest 16 - notetype 12, 12, 7 - duty 1 + note_type 12, 12, 7 + duty_cycle 1 octave 4 - E_ 16 - D_ 16 - C_ 16 - D_ 16 - loopchannel 0, Music_Dungeon2_branch_7e8db + note E_, 16 + note D_, 16 + note C_, 16 + note D_, 16 + sound_loop 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch2:: - notetype 12, 1, 3 +Music_Dungeon2_Ch3:: + note_type 12, 1, 3 vibrato 8, 2, 6 Music_Dungeon2_branch_7e940:: - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 16, Music_Dungeon2_branch_7e940 - E_ 4 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 16, Music_Dungeon2_branch_7e940 + note E_, 4 rest 4 rest 4 - E_ 4 - C_ 4 + note E_, 4 + note C_, 4 rest 4 rest 4 - C_ 4 - D_ 4 + note C_, 4 + note D_, 4 rest 4 rest 4 - D_ 4 + note D_, 4 octave 3 - A# 4 + note A#, 4 rest 4 rest 4 - A# 4 + note A#, 4 Music_Dungeon2_branch_7e958:: octave 5 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - A# 2 + note A#, 2 rest 2 octave 6 - D_ 2 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - A# 2 + note A#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - D# 2 + note D#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - loopchannel 3, Music_Dungeon2_branch_7e958 + sound_loop 3, Music_Dungeon2_branch_7e958 octave 4 - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 5 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 4 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 octave 3 - E_ 16 - F_ 16 - G_ 16 + note E_, 16 + note F_, 16 + note G_, 16 octave 3 - B_ 16 + note B_, 16 rest 16 rest 16 rest 16 rest 16 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 0, Music_Dungeon2_branch_7e940 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 0, Music_Dungeon2_branch_7e940 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 2 - A# 2 - G_ 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - endchannel + sound_ret Music_Dungeon2_branch_7e9d1:: octave 4 - E_ 2 + note E_, 2 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 octave 4 - F# 4 - endchannel + note F#, 4 + sound_ret -Music_Dungeon2_Ch3:: +Music_Dungeon2_Ch4:: dspeed 12 Music_Dungeon2_branch_7e9dd:: @@ -314,4 +314,4 @@ Music_Dungeon2_branch_7e9dd:: cymbal2 4 snare9 4 snare7 4 - loopchannel 0, Music_Dungeon2_branch_7e9dd + sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index f9742a26..a72dea34 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,432 +1,432 @@ -Music_Dungeon3_Ch0:: +Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: - notetype 12, 12, 3 + note_type 12, 12, 3 Music_Dungeon3_branch_7e9fe:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 3, Music_Dungeon3_branch_7e9fe + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 3, Music_Dungeon3_branch_7e9fe octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 - D# 2 - E_ 2 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 Music_Dungeon3_branch_7ea11:: - callchannel Music_Dungeon3_branch_7eac1 - loopchannel 4, Music_Dungeon3_branch_7ea11 + sound_call Music_Dungeon3_branch_7eac1 + sound_loop 4, Music_Dungeon3_branch_7ea11 Music_Dungeon3_branch_7ea18:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 4, Music_Dungeon3_branch_7ea18 + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 4, Music_Dungeon3_branch_7ea18 octave 4 - F_ 2 - F_ 2 + note F_, 2 + note F_, 2 rest 2 - F_ 2 - E_ 2 - E_ 2 - D# 2 - D# 2 + note F_, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note D#, 2 rest 2 - D# 2 - D_ 2 - D_ 2 - callchannel Music_Dungeon3_branch_7eafc + note D#, 2 + note D_, 2 + note D_, 2 + sound_call Music_Dungeon3_branch_7eafc octave 4 - D_ 2 - D_ 2 + note D_, 2 + note D_, 2 rest 2 - D_ 2 - D# 2 - D# 2 - E_ 2 - E_ 2 + note D_, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note E_, 2 rest 2 - E_ 2 - F_ 2 - F_ 2 + note E_, 2 + note F_, 2 + note F_, 2 Music_Dungeon3_branch_7ea3c:: - callchannel Music_Dungeon3_branch_7eace - loopchannel 4, Music_Dungeon3_branch_7ea3c + sound_call Music_Dungeon3_branch_7eace + sound_loop 4, Music_Dungeon3_branch_7ea3c Music_Dungeon3_branch_7ea43:: - callchannel Music_Dungeon3_branch_7eadd - loopchannel 3, Music_Dungeon3_branch_7ea43 + sound_call Music_Dungeon3_branch_7eadd + sound_loop 3, Music_Dungeon3_branch_7ea43 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - G# 2 - E_ 2 + note A_, 2 + note F_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - callchannel Music_Dungeon3_branch_7eaea - callchannel Music_Dungeon3_branch_7eaea + note C_, 2 + sound_call Music_Dungeon3_branch_7eaea + sound_call Music_Dungeon3_branch_7eaea octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 rest 16 rest 8 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - D# 2 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + note D#, 2 rest 16 rest 16 - loopchannel 0, Music_Dungeon3_branch_7e9fc + sound_loop 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - endchannel + note D#, 2 + sound_ret Music_Dungeon3_branch_7eac1:: - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + sound_ret Music_Dungeon3_branch_7eace:: octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 - endchannel + note B_, 2 + sound_ret Music_Dungeon3_branch_7eadd:: - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 - endchannel + note A_, 2 + note F_, 2 + sound_ret Music_Dungeon3_branch_7eaea:: octave 3 - G# 2 - E_ 2 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - endchannel + note C_, 2 + sound_ret Music_Dungeon3_branch_7eaf7:: - D# 2 - G_ 2 - D# 2 - C# 6 - endchannel + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + sound_ret Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 176 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 184 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 192 octave 1 - A_ 1 - A# 1 - B_ 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 tempo 200 octave 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 tempo 208 octave 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 + note C_, 1 + note C#, 1 + note D_, 1 tempo 216 octave 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 tempo 224 octave 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 + note C_, 1 tempo 160 - endchannel + sound_ret -Music_Dungeon3_Ch1:: +Music_Dungeon3_Ch2:: vibrato 11, 1, 5 - duty 3 + duty_cycle 3 Music_Dungeon3_branch_7eb6d:: - notetype 12, 13, 3 + note_type 12, 13, 3 octave 4 - D# 6 - C# 6 + note D#, 6 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 - A# 2 - B_ 6 + note B_, 2 + note A#, 2 + note B_, 6 octave 4 - C# 8 + note C#, 8 rest 2 - G# 6 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 - octave 4 - G# 2 - F# 6 - E_ 2 - D# 2 - E_ 6 - F# 6 - E_ 4 - D# 6 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - A# 2 - B_ 6 - octave 4 - C# 8 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 6 + note F#, 6 + note E_, 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 rest 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 rest 2 - G# 2 - A_ 2 - A_ 2 - A# 2 - A# 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A#, 2 + note A#, 2 rest 2 - A# 2 - B_ 2 - B_ 2 + note A#, 2 + note B_, 2 + note B_, 2 rest 8 rest 8 rest 8 @@ -436,179 +436,179 @@ Music_Dungeon3_branch_7eb6d:: rest 8 rest 8 octave 4 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 rest 2 - B_ 2 - A# 2 - A# 2 - A_ 2 - A_ 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A_, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - G# 2 - C# 8 + note A_, 2 + note G#, 2 + note G#, 2 + note C#, 8 rest 2 octave 3 - B_ 6 - A# 2 - B_ 2 + note B_, 6 + note A#, 2 + note B_, 2 octave 4 - D# 2 - G_ 2 - D# 2 - C# 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 6 - G_ 6 + note C#, 2 + note D#, 6 + note G_, 6 octave 3 - G_ 8 + note G_, 8 rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - G_ 6 - F_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 6 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - G_ 6 - A_ 6 + note A_, 2 + note G_, 6 + note A_, 6 octave 4 - C# 6 - G_ 8 + note C#, 6 + note G_, 8 rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G_ 6 - A_ 2 + note A_, 2 + note G_, 6 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G_ 6 - A_ 6 + note A_, 2 + note G_, 6 + note A_, 6 octave 5 - C# 6 + note C#, 6 octave 4 - F# 8 + note F#, 8 rest 2 - E_ 6 - D# 2 - E_ 2 - G# 2 + note E_, 6 + note D#, 2 + note E_, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - G# 6 + note G#, 2 + note F#, 6 + note G#, 6 octave 5 - C_ 6 - octave 3 - D# 2 - G_ 2 - D# 2 - C# 6 - D# 2 - G_ 2 - D# 2 - C# 6 + note C_, 6 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 2 - E_ 2 - G# 2 - octave 3 - C_ 2 - E_ 2 - G# 2 - octave 4 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - D# 2 + note E_, 2 + note G#, 2 + octave 3 + note C_, 2 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - loopchannel 0, Music_Dungeon3_branch_7eb6d + note D#, 2 + sound_loop 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch2:: - notetype 12, 1, 2 +Music_Dungeon3_Ch3:: + note_type 12, 1, 2 rest 16 rest 16 rest 16 @@ -621,71 +621,71 @@ Music_Dungeon3_Ch2:: rest 16 rest 16 rest 12 - notetype 6, 1, 0 + note_type 6, 1, 0 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 rest 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 rest 16 rest 16 rest 10 octave 5 - E_ 8 + note E_, 8 octave 4 - B_ 8 + note B_, 8 octave 5 - D# 8 + note D#, 8 octave 4 - A# 8 + note A#, 8 octave 5 - D_ 8 + note D_, 8 octave 4 - A_ 8 + note A_, 8 octave 5 - C# 8 + note C#, 8 octave 4 - G# 8 + note G#, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - G_ 8 - B_ 8 - F# 8 - A# 8 - F_ 8 - A_ 8 - E_ 8 + note G_, 8 + note B_, 8 + note F#, 8 + note A#, 8 + note F_, 8 + note A_, 8 + note E_, 8 rest 16 rest 16 rest 8 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 rest 2 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 + note B_, 1 rest 10 rest 16 - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 rest 16 rest 16 @@ -707,10 +707,10 @@ Music_Dungeon3_Ch2:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch2 + sound_loop 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch3:: +Music_Dungeon3_Ch4:: dspeed 12 rest 16 rest 16 @@ -753,4 +753,4 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - endchannel + sound_ret diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index adb0f8b9..19fc01e5 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,1344 +1,1344 @@ -Music_FinalBattle_Ch0:: +Music_FinalBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - F# 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - G_ 1 - G# 1 - G_ 1 - notetype 12, 10, 2 - G# 1 - A_ 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - notetype 12, 9, 2 - A# 1 - B_ 1 - octave 4 - C_ 1 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note_type 12, 10, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note_type 12, 9, 2 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 octave 3 - B_ 1 - octave 4 - C_ 1 - C# 1 - C_ 1 - C# 1 - notetype 12, 8, 2 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - notetype 12, 12, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note_type 12, 8, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note_type 12, 12, 1 octave 3 - E_ 1 - E_ 7 - F_ 1 - F_ 7 - G_ 1 - G_ 7 - F_ 1 - F_ 7 - E_ 1 - E_ 7 - F_ 1 - F_ 7 - G_ 1 - G_ 7 - G# 1 - G# 3 - D# 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - G# 1 - G# 3 - notetype 12, 11, 7 - D# 4 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note F_, 1 + note F_, 7 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note G#, 1 + note G#, 3 + note D#, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note G#, 1 + note G#, 3 + note_type 12, 11, 7 + note D#, 4 Music_FinalBattle_branch_23429:: - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 4 - notetype 12, 11, 1 - F# 2 - F_ 1 - F# 1 - A_ 1 - F# 2 - F# 1 - notetype 12, 11, 7 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 12, 11, 1 + note F#, 2 + note F_, 1 + note F#, 1 + note A_, 1 + note F#, 2 + note F#, 1 + note_type 12, 11, 7 octave 2 - B_ 6 - notetype 12, 10, 0 + note B_, 6 + note_type 12, 10, 0 octave 3 - D_ 6 - notetype 12, 11, 7 - F# 4 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note D_, 6 + note_type 12, 11, 7 + note F#, 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - A# 4 - notetype 12, 5, 14 - B_ 12 - notetype 12, 11, 2 - E_ 3 - E_ 3 - E_ 2 - E_ 1 - F# 1 - E_ 1 - B_ 1 - F# 1 - E_ 1 - F# 1 - B_ 1 - F# 1 - E_ 1 - F# 1 - B_ 1 - F# 1 - E_ 1 - F# 1 - B_ 1 - F# 1 - notetype 12, 12, 2 - E_ 1 - F# 1 - B_ 1 - F# 1 - notetype 12, 13, 2 - E_ 1 - F# 1 - B_ 1 - notetype 12, 12, 1 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 1 - E_ 2 - B_ 1 - A_ 1 - E_ 2 - B_ 1 - A_ 1 - E_ 2 - B_ 1 - A_ 1 - E_ 2 - B_ 1 - A_ 3 - E_ 1 - D_ 3 - E_ 1 - D_ 3 - E_ 1 - D_ 3 - E_ 1 - D_ 1 - F_ 2 - octave 4 - C_ 1 + note F#, 4 + note F_, 4 + note F#, 12 + note A#, 4 + note_type 12, 5, 14 + note B_, 12 + note_type 12, 11, 2 + note E_, 3 + note E_, 3 + note E_, 2 + note E_, 1 + note F#, 1 + note E_, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note_type 12, 12, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note_type 12, 13, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note_type 12, 12, 1 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note_type 12, 11, 7 + note E_, 7 + note_type 12, 12, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 1 + note F_, 2 + octave 4 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 1 - F# 2 - octave 4 - C# 1 - C_ 1 + note B_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 1 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 3 + note C#, 1 + note C_, 3 octave 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - notetype 12, 11, 7 - octave 4 - C_ 2 - notetype 12, 11, 0 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 10, 0 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note_type 12, 11, 7 + octave 4 + note C_, 2 + note_type 12, 11, 0 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 10, 0 octave 3 - F# 8 - F# 8 - notetype 12, 11, 0 + note F#, 8 + note F#, 8 + note_type 12, 11, 0 octave 3 - A_ 8 - notetype 12, 11, 7 - A_ 8 - G_ 4 - B_ 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - A# 8 - notetype 12, 11, 7 - A# 8 - octave 4 - F_ 8 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note G_, 4 + note B_, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note A#, 8 + note_type 12, 11, 7 + note A#, 8 + octave 4 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C# 4 - E_ 12 + note C#, 4 + note E_, 12 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 12 - notetype 12, 4, 0 - callchannel Music_FinalBattle_branch_23710 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 7 + note C#, 12 + note_type 12, 4, 0 + sound_call Music_FinalBattle_branch_23710 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - G_ 8 - notetype 12, 11, 7 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note G_, 8 + note_type 12, 11, 7 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - octave 4 - C_ 8 - notetype 12, 11, 0 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + octave 4 + note C_, 8 + note_type 12, 11, 0 octave 3 - B_ 8 - notetype 12, 11, 7 - B_ 8 - notetype 12, 11, 0 - octave 4 - E_ 8 - notetype 12, 11, 7 - E_ 8 - loopchannel 0, Music_FinalBattle_branch_23429 + note B_, 8 + note_type 12, 11, 7 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + sound_loop 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch1:: - duty 3 +Music_FinalBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 5 - C_ 1 + note C_, 1 octave 4 - G# 1 - B_ 1 - F# 1 - A_ 1 - E_ 1 - G_ 1 + note G#, 1 + note B_, 1 + note F#, 1 + note A_, 1 + note E_, 1 + note G_, 1 octave 5 - C_ 1 + note C_, 1 octave 4 - F_ 1 - C# 1 - E_ 1 - C_ 1 - D# 1 + note F_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note D#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - D_ 1 + note D_, 1 octave 5 - C_ 1 + note C_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - G# 1 - B_ 1 - F# 1 - A# 1 - F_ 1 - A_ 1 - octave 5 - C_ 1 + note G#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 octave 3 - G# 1 - D# 1 - G_ 1 - D_ 1 - F_ 1 - C# 1 - E_ 1 - octave 5 - C_ 1 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - D# 4 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 4, 10 + note G#, 1 + note D#, 1 + note G_, 1 + note D_, 1 + note F_, 1 + note C#, 1 + note E_, 1 + octave 5 + note C_, 1 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + note D#, 4 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 4, 10 octave 3 - G# 4 + note G#, 4 Music_FinalBattle_branch_235e6:: - notetype 12, 13, 7 + note_type 12, 13, 7 octave 4 - E_ 8 - D# 8 - D_ 8 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - notetype 12, 11, 1 - F_ 2 - F# 3 - A_ 1 - B_ 1 - A_ 1 - octave 4 - C_ 1 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + note_type 12, 11, 1 + note F_, 2 + note F#, 3 + note A_, 1 + note B_, 1 + note A_, 1 + octave 4 + note C_, 1 octave 3 - B_ 2 - A_ 1 - B_ 1 - B_ 1 - A_ 1 - A# 1 - notetype 12, 13, 7 - octave 4 - E_ 8 - D# 8 - D_ 8 + note B_, 2 + note A_, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note A#, 1 + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - octave 4 - D# 4 - E_ 12 - notetype 12, 10, 0 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + octave 4 + note D#, 4 + note E_, 12 + note_type 12, 10, 0 octave 3 - B_ 8 - octave 4 - D_ 8 - F_ 8 - D_ 8 - notetype 12, 13, 1 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note B_, 8 + octave 4 + note D_, 8 + note F_, 8 + note D_, 8 + note_type 12, 13, 1 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - D_ 4 - notetype 12, 13, 1 + note D_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - F_ 4 - notetype 12, 13, 1 + note F_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - D_ 4 - notetype 12, 13, 1 + note D_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 1 - notetype 12, 12, 4 + note E_, 1 + note E_, 1 + note_type 12, 12, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - D_ 2 - notetype 12, 12, 2 - octave 4 - E_ 1 - E_ 1 - D_ 1 - E_ 1 - F_ 1 - E_ 1 - D_ 1 - F_ 1 - E_ 1 - E_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - F# 1 - E_ 1 - E_ 1 - F_ 1 - E_ 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - E_ 1 - notetype 12, 12, 4 + note D_, 2 + note_type 12, 12, 2 + octave 4 + note E_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note F_, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note E_, 1 + note_type 12, 12, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - D_ 2 - notetype 12, 13, 7 + note D_, 2 + note_type 12, 13, 7 octave 4 - E_ 4 - F_ 2 - F# 12 - notetype 12, 12, 2 + note E_, 4 + note F_, 2 + note F#, 12 + note_type 12, 12, 2 octave 3 - B_ 2 - B_ 4 - B_ 2 - B_ 4 - B_ 2 - notetype 12, 13, 7 - octave 4 - F_ 4 - F# 2 - G_ 12 - notetype 12, 12, 2 - C_ 2 - C_ 4 - C_ 2 - C_ 4 - C_ 2 - notetype 12, 13, 7 - F# 4 - G_ 2 - G# 12 - notetype 12, 8, 2 - C# 2 - C# 4 - notetype 12, 10, 2 - C# 2 - C# 4 - C# 4 - notetype 12, 13, 2 - C# 2 - C# 4 - notetype 12, 15, 2 - C# 2 - C# 4 - notetype 12, 12, 4 - E_ 1 - F_ 1 - notetype 12, 12, 0 - F# 12 - notetype 12, 12, 7 - F# 4 - notetype 12, 1, 15 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 4 + note B_, 2 + note_type 12, 13, 7 + octave 4 + note F_, 4 + note F#, 2 + note G_, 12 + note_type 12, 12, 2 + note C_, 2 + note C_, 4 + note C_, 2 + note C_, 4 + note C_, 2 + note_type 12, 13, 7 + note F#, 4 + note G_, 2 + note G#, 12 + note_type 12, 8, 2 + note C#, 2 + note C#, 4 + note_type 12, 10, 2 + note C#, 2 + note C#, 4 + note C#, 4 + note_type 12, 13, 2 + note C#, 2 + note C#, 4 + note_type 12, 15, 2 + note C#, 2 + note C#, 4 + note_type 12, 12, 4 + note E_, 1 + note F_, 1 + note_type 12, 12, 0 + note F#, 12 + note_type 12, 12, 7 + note F#, 4 + note_type 12, 1, 15 octave 3 - F# 8 - notetype 12, 9, 0 - F# 8 - notetype 12, 12, 7 - octave 4 - C# 4 - notetype 12, 12, 0 - D_ 12 - D_ 8 - notetype 12, 12, 7 - D_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - notetype 12, 12, 0 + note F#, 8 + note_type 12, 9, 0 + note F#, 8 + note_type 12, 12, 7 + octave 4 + note C#, 4 + note_type 12, 12, 0 + note D_, 12 + note D_, 8 + note_type 12, 12, 7 + note D_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note_type 12, 12, 0 octave 3 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 0 - octave 4 - F_ 8 - notetype 12, 12, 7 - F_ 8 - octave 5 - C_ 8 - octave 4 - A# 8 - notetype 12, 12, 0 - A_ 16 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 5 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 1 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 13, 7 - octave 4 - E_ 8 - D# 8 - D_ 8 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 0 + octave 4 + note F_, 8 + note_type 12, 12, 7 + note F_, 8 + octave 5 + note C_, 8 + octave 4 + note A#, 8 + note_type 12, 12, 0 + note A_, 16 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 5 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 1 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 12, 7 - octave 4 - D_ 8 - notetype 12, 4, 12 - C_ 8 - notetype 12, 13, 7 - E_ 8 - D# 8 - D_ 8 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 12, 7 + octave 4 + note D_, 8 + note_type 12, 4, 12 + note C_, 8 + note_type 12, 13, 7 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 5, 13 - octave 4 - D_ 8 - notetype 12, 12, 0 - F_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - A# 4 - B_ 12 - loopchannel 0, Music_FinalBattle_branch_235e6 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 5, 13 + octave 4 + note D_, 8 + note_type 12, 12, 0 + note F_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note A#, 4 + note B_, 12 + sound_loop 0, Music_FinalBattle_branch_235e6 Music_FinalBattle_branch_23704:: octave 4 - E_ 1 - E_ 1 - G_ 1 + note E_, 1 + note E_, 1 + note G_, 1 octave 5 - C_ 1 - E_ 1 - C_ 1 + note C_, 1 + note E_, 1 + note C_, 1 octave 4 - G_ 1 - F_ 1 - endchannel + note G_, 1 + note F_, 1 + sound_ret Music_FinalBattle_branch_23710:: octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - C# 2 - F# 2 - D_ 2 - endchannel + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + note F#, 2 + note D_, 2 + sound_ret -Music_FinalBattle_Ch2:: - notetype 12, 1, 1 +Music_FinalBattle_Ch3:: + note_type 12, 1, 1 octave 4 - E_ 4 + note E_, 4 octave 5 - E_ 4 + note E_, 4 octave 4 - F_ 4 + note F_, 4 octave 5 - D# 4 + note D#, 4 octave 4 - G_ 4 + note G_, 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G# 4 - B_ 4 - E_ 1 - E_ 1 + note G#, 4 + note B_, 4 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D# 4 - E_ 1 - E_ 1 + note D#, 4 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 + note C_, 4 octave 4 - A# 2 - E_ 1 - E_ 1 + note A#, 2 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - E_ 1 - D# 1 - E_ 1 - G_ 1 + note E_, 1 + note D#, 1 + note E_, 1 + note G_, 1 Music_FinalBattle_branch_2377d:: octave 4 - E_ 1 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 - E_ 1 + note F#, 2 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 - octave 4 - F# 2 - E_ 1 - D# 1 - E_ 1 - F# 1 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 1 - E_ 1 + note B_, 2 + octave 4 + note F#, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - B_ 2 - F_ 2 + note B_, 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 + note C_, 2 + note C_, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 - callchannel Music_FinalBattle_branch_2395b - callchannel Music_FinalBattle_branch_2395b + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + sound_call Music_FinalBattle_branch_2395b + sound_call Music_FinalBattle_branch_2395b octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 1 - F# 1 - G_ 1 - G# 1 - callchannel Music_FinalBattle_branch_2396c - callchannel Music_FinalBattle_branch_2396c + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + sound_call Music_FinalBattle_branch_2396c + sound_call Music_FinalBattle_branch_2396c octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C# 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 4 - A# 2 - A_ 2 + note A#, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 1 - F# 1 - G_ 1 - G# 1 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - F_ 2 - F# 2 - G_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - D# 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - F_ 2 - F# 2 - G_ 2 - F# 2 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 - F_ 2 - E_ 2 - B_ 2 - octave 5 - E_ 4 - octave 4 - E_ 2 - B_ 2 - octave 5 - D# 4 - octave 4 - E_ 2 - B_ 2 - octave 5 - D_ 4 - octave 4 - E_ 2 - A_ 2 - B_ 4 - loopchannel 0, Music_FinalBattle_branch_2377d + note F#, 2 + note F_, 2 + note E_, 2 + note B_, 2 + octave 5 + note E_, 4 + octave 4 + note E_, 2 + note B_, 2 + octave 5 + note D#, 4 + octave 4 + note E_, 2 + note B_, 2 + octave 5 + note D_, 4 + octave 4 + note E_, 2 + note A_, 2 + note B_, 4 + sound_loop 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_FinalBattle_branch_2396c:: octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 - endchannel + note E_, 2 + sound_ret diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 832bade6..f152d180 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,627 +1,627 @@ -Music_GameCorner_Ch0:: +Music_GameCorner_Ch1:: tempo 120 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 - octave 3 - A_ 6 - notetype 12, 11, 1 - G# 2 - F# 2 - E_ 2 - D# 2 - C# 2 - D# 16 + toggle_perfect_pitch + note_type 12, 11, 5 + octave 3 + note A_, 6 + note_type 12, 11, 1 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 Music_GameCorner_branch_7e222:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 4 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 - octave 3 - A_ 2 - G# 8 - notetype 12, 10, 7 - G# 2 - A_ 2 - B_ 2 - notetype 12, 11, 5 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - notetype 12, 10, 7 - F# 8 - D# 8 - notetype 12, 11, 5 - D# 4 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + note_type 12, 10, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note_type 12, 11, 5 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note_type 12, 10, 7 + note F#, 8 + note D#, 8 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 - octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 - octave 4 - E_ 2 - D# 2 - E_ 2 - D# 6 - C# 2 - octave 3 - D# 2 - E_ 2 - F# 2 - G_ 2 - G# 2 - notetype 12, 9, 7 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 5 - C# 4 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 12, 11, 7 + octave 4 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 6 + note C#, 2 + octave 3 + note D#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note_type 12, 9, 7 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 5 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 - octave 3 - A_ 2 - G# 8 - notetype 12, 11, 7 - G# 2 - A_ 2 - B_ 2 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - F# 8 - notetype 12, 9, 7 - D# 4 - C# 4 - notetype 12, 11, 5 - D# 4 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + note_type 12, 11, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 8 + note_type 12, 9, 7 + note D#, 4 + note C#, 4 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 - octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 - F# 2 - G# 2 - A_ 2 - B_ 4 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 2 - E_ 4 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 12, 11, 7 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note_type 12, 12, 2 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - E_ 4 - E_ 4 - notetype 12, 11, 7 + note E_, 2 + note E_, 4 + note E_, 4 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 - octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 - octave 4 - D# 4 - octave 3 - B_ 4 - F# 4 - D# 4 - notetype 12, 11, 7 - E_ 3 - D# 1 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 10 - notetype 12, 11, 7 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note D#, 4 + note_type 12, 11, 7 + note E_, 3 + note D#, 1 + note_type 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 10 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 - octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 - octave 4 - D# 4 - octave 3 - B_ 4 - F# 4 - A_ 4 - notetype 12, 11, 7 - G# 2 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 8 - loopchannel 0, Music_GameCorner_branch_7e222 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note A_, 4 + note_type 12, 11, 7 + note G#, 2 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 8 + sound_loop 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch1:: - duty 2 +Music_GameCorner_Ch2:: + duty_cycle 2 vibrato 10, 2, 3 - notetype 12, 12, 6 - octave 4 - C# 6 - notetype 12, 12, 1 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - duty 3 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 8 + note_type 12, 12, 6 + octave 4 + note C#, 6 + note_type 12, 12, 1 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + duty_cycle 3 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 8 Music_GameCorner_branch_7e2fa:: - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 - octave 3 - G# 4 - E_ 4 - octave 4 - C# 2 - octave 3 - B_ 14 - octave 4 - E_ 6 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 16 - F# 4 - D# 4 - A_ 4 - F# 4 - octave 4 - D# 2 - C# 14 - F# 6 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A# 2 - B_ 16 - E_ 4 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 16 + note E_, 4 octave 2 - B_ 4 - octave 3 - G# 4 - E_ 4 - octave 4 - C# 2 - octave 3 - B_ 14 - octave 4 - E_ 6 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 16 - F# 4 - D# 4 - A_ 4 - F# 4 - octave 4 - D# 2 - C# 14 - F# 6 - E_ 2 - D# 2 - E_ 2 - F# 2 - G# 2 - notetype 12, 12, 1 - E_ 2 - notetype 12, 10, 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - D# 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 12, 5 - F# 4 - D# 4 - octave 3 - B_ 4 - octave 4 - A_ 4 - G# 3 - A_ 1 - notetype 12, 12, 2 - G# 2 - F# 2 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - D# 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - F# 4 - D# 4 - A_ 4 - F# 4 - B_ 16 - loopchannel 0, Music_GameCorner_branch_7e2fa + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note_type 12, 12, 1 + note E_, 2 + note_type 12, 10, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 2 + note_type 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 12, 5 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note A_, 4 + note G#, 3 + note A_, 1 + note_type 12, 12, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note_type 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + note B_, 16 + sound_loop 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch2:: - notetype 12, 1, 3 +Music_GameCorner_Ch3:: + note_type 12, 1, 3 octave 5 - C# 1 + note C#, 1 rest 5 octave 4 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - B_ 1 + note B_, 1 rest 9 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 Music_GameCorner_branch_7e3a5:: - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - D# 1 + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e42d + sound_call Music_GameCorner_branch_7e442 + sound_call Music_GameCorner_branch_7e457 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e481 + sound_call Music_GameCorner_branch_7e496 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - E_ 1 + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e42d + sound_call Music_GameCorner_branch_7e442 + sound_call Music_GameCorner_branch_7e457 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e481 + sound_call Music_GameCorner_branch_7e496 + note E_, 1 rest 3 octave 3 - B_ 1 + note B_, 1 rest 3 octave 4 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - E_ 1 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - callchannel Music_GameCorner_branch_7e42d - loopchannel 0, Music_GameCorner_branch_7e3a5 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + sound_call Music_GameCorner_branch_7e42d + sound_loop 0, Music_GameCorner_branch_7e3a5 Music_GameCorner_branch_7e418:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e42d:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e442:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e457:: - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e46c:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e481:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e496:: - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e4ab:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm index ad99bddd..1ffc4930 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,357 +1,357 @@ -Music_Gym_Ch0:: +Music_Gym_Ch1:: tempo 138 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 2, 2 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - G_ 6 - C_ 1 - G_ 1 - F_ 6 + note G_, 6 + note C_, 1 + note G_, 1 + note F_, 6 octave 2 - A# 1 + note A#, 1 octave 3 - F_ 1 - E_ 6 + note F_, 1 + note E_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - E_ 1 - F_ 4 - G_ 4 + note E_, 1 + note F_, 4 + note G_, 4 Music_Gym_branch_bcd8:: - E_ 4 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - notetype 12, 11, 1 - D_ 3 - notetype 12, 11, 5 - E_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - E_ 4 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note_type 12, 11, 1 + note D_, 3 + note_type 12, 11, 5 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - notetype 12, 11, 1 - A# 3 - notetype 12, 11, 5 - F_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note_type 12, 11, 1 + note A#, 3 + note_type 12, 11, 5 + note F_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 4 - A# 2 - F_ 1 - A# 1 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note A#, 2 + note F_, 1 + note A#, 1 octave 4 - D_ 4 + note D_, 4 octave 3 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - C_ 2 - C_ 1 - D_ 1 - E_ 4 - C_ 2 - E_ 2 - D_ 2 - C_ 2 - E_ 2 - C_ 1 - E_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 2 - D_ 2 - F_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - C_ 2 - D_ 2 - C_ 2 - C_ 1 - D_ 1 - E_ 4 - D_ 2 - E_ 2 - F_ 2 - F_ 2 - G_ 2 - E_ 1 - G_ 1 - A# 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note C_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note C_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note D_, 2 + note E_, 2 + note F_, 2 + note F_, 2 + note G_, 2 + note E_, 1 + note G_, 1 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_Gym_branch_bcd8 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_Gym_branch_bcd8 -Music_Gym_Ch1:: - duty 3 +Music_Gym_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - A# 6 - F_ 1 - A# 1 - notetype 12, 10, 0 - A_ 12 - notetype 12, 12, 7 - B_ 4 + note A#, 6 + note F_, 1 + note A#, 1 + note_type 12, 10, 0 + note A_, 12 + note_type 12, 12, 7 + note B_, 4 Music_Gym_branch_bd82:: octave 4 - C_ 12 + note C_, 12 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - notetype 12, 12, 2 - D_ 3 + note C_, 2 + note_type 12, 12, 2 + note D_, 3 octave 3 - A# 1 - notetype 12, 12, 7 - A# 12 + note A#, 1 + note_type 12, 12, 7 + note A#, 12 octave 4 - C_ 12 + note C_, 12 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - notetype 12, 12, 4 + note C_, 2 + note_type 12, 12, 4 octave 3 - A# 2 - notetype 12, 12, 7 - A# 1 + note A#, 2 + note_type 12, 12, 7 + note A#, 1 octave 4 - C_ 1 - D_ 12 - E_ 12 - D_ 2 - E_ 2 - notetype 12, 12, 2 - F_ 3 - D_ 1 - notetype 12, 12, 7 - D_ 4 - notetype 12, 12, 2 - A# 3 - F_ 1 - notetype 12, 12, 7 - F_ 4 - E_ 12 - D_ 2 - E_ 2 - F_ 2 - D_ 1 - F_ 1 - A# 12 + note C_, 1 + note D_, 12 + note E_, 12 + note D_, 2 + note E_, 2 + note_type 12, 12, 2 + note F_, 3 + note D_, 1 + note_type 12, 12, 7 + note D_, 4 + note_type 12, 12, 2 + note A#, 3 + note F_, 1 + note_type 12, 12, 7 + note F_, 4 + note E_, 12 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 1 + note F_, 1 + note A#, 12 octave 3 - G_ 6 + note G_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 6 - G_ 2 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 6 + note G_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - A# 4 - A_ 4 - G_ 4 - C_ 2 - D_ 2 - G_ 6 + note G_, 2 + note A#, 4 + note A_, 4 + note G_, 4 + note C_, 2 + note D_, 2 + note G_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 4 - notetype 12, 12, 3 - G_ 2 - notetype 12, 12, 7 - G_ 1 - A_ 1 - A# 4 - notetype 12, 12, 4 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 4 + note_type 12, 12, 3 + note G_, 2 + note_type 12, 12, 7 + note G_, 1 + note A_, 1 + note A#, 4 + note_type 12, 12, 4 octave 4 - C_ 2 - notetype 12, 12, 7 - C_ 1 - D_ 1 - E_ 12 - loopchannel 0, Music_Gym_branch_bd82 + note C_, 2 + note_type 12, 12, 7 + note C_, 1 + note D_, 1 + note E_, 12 + sound_loop 0, Music_Gym_branch_bd82 -Music_Gym_Ch2:: - notetype 12, 1, 1 +Music_Gym_Ch3:: + note_type 12, 1, 1 rest 16 rest 10 octave 4 - G_ 2 - F_ 2 - D_ 2 + note G_, 2 + note F_, 2 + note D_, 2 Music_Gym_branch_be02:: - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - A_ 2 - F_ 2 - loopchannel 0, Music_Gym_branch_be02 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note F_, 2 + sound_loop 0, Music_Gym_branch_be02 Music_Gym_branch_be3b:: - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - endchannel + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + sound_ret Music_Gym_branch_be44:: - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - endchannel + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + sound_ret Music_Gym_branch_be4d:: - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - endchannel + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + sound_ret diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 6c1cffb5..cebda01b 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,1400 +1,1400 @@ -Music_GymLeaderBattle_Ch0:: +Music_GymLeaderBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 6 octave 3 - F# 1 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - C_ 1 - octave 2 - B_ 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 octave 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - octave 2 - F# 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + octave 2 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - F_ 6 - F# 1 + note F_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - A_ 6 + note A_, 6 Music_GymLeaderBattle_branch_223b0:: - F# 1 - octave 3 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - octave 2 - E_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 - octave 2 - B_ 1 - A_ 1 - octave 3 - C# 1 + note F#, 1 + octave 3 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 2 + note E_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 - F# 1 + note B_, 1 + note A_, 1 + note F#, 1 octave 3 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 octave 2 - E_ 1 - A_ 1 + note E_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 rest 2 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 rest 16 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 12 - notetype 12, 11, 3 + note C#, 12 + note_type 12, 11, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - A_ 12 - notetype 12, 11, 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 + note A_, 12 + note_type 12, 11, 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - F# 2 - B_ 2 - F# 2 - D# 2 - F# 2 + note C#, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note F#, 2 octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 11, 5 - octave 3 - A_ 12 - notetype 12, 11, 3 - C# 1 - octave 2 - B_ 1 - octave 3 - C# 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - F# 1 - A_ 1 - G# 1 - F# 1 - E_ 1 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 5 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - E_ 2 - D# 4 - C# 6 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 11, 5 + octave 3 + note A_, 12 + note_type 12, 11, 3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + note_type 12, 11, 5 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note E_, 2 + note D#, 4 + note C#, 6 rest 16 rest 10 - E_ 6 - D# 4 - E_ 4 - C# 2 - D# 6 - E_ 4 - D# 2 - C# 4 - octave 2 - B_ 6 - octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 - E_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_223b0 + note E_, 6 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note E_, 4 + note D#, 2 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note E_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch1:: - duty 3 +Music_GymLeaderBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 3 - octave 4 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 + note_type 12, 12, 3 + octave 4 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 rest 5 - F# 1 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - B_ 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 - A# 6 + note A#, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C# 6 + note C#, 6 Music_GymLeaderBattle_branch_225e0:: - notetype 12, 12, 5 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - octave 3 - A_ 8 - octave 4 - C# 8 - E_ 8 - C# 8 - notetype 12, 12, 5 - duty 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - C# 8 - octave 3 - B_ 8 - A_ 8 - notetype 12, 12, 3 - octave 4 - E_ 4 - E_ 2 - C# 2 - notetype 12, 12, 5 - duty 3 + note_type 12, 12, 5 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + octave 3 + note A_, 8 + octave 4 + note C#, 8 + note E_, 8 + note C#, 8 + note_type 12, 12, 5 + duty_cycle 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + note_type 12, 12, 3 + octave 4 + note E_, 4 + note E_, 2 + note C#, 2 + note_type 12, 12, 5 + duty_cycle 3 octave 1 - B_ 1 + note B_, 1 rest 3 octave 3 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 rest 4 - E_ 1 - D_ 1 + note E_, 1 + note D_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - E_ 1 + note E_, 1 rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 rest 2 - E_ 1 - C# 1 - E_ 1 + note E_, 1 + note C#, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 rest 4 - E_ 1 - D_ 1 + note E_, 1 + note D_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - E_ 1 + note E_, 1 rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 11, 0 + note_type 12, 11, 0 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 12, 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note A_, 4 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 12, 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - A_ 1 - B_ 1 - notetype 12, 11, 0 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note_type 12, 11, 0 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - notetype 12, 11, 0 + note C_, 4 + note_type 12, 11, 0 octave 3 - B_ 16 - notetype 12, 3, 15 + note B_, 16 + note_type 12, 3, 15 octave 4 - F# 16 - notetype 12, 12, 3 - duty 3 + note F#, 16 + note_type 12, 12, 3 + duty_cycle 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - A_ 12 - notetype 12, 12, 3 + note A_, 12 + note_type 12, 12, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C# 12 - notetype 12, 11, 0 - D# 16 - notetype 12, 11, 7 - D# 16 - notetype 12, 12, 3 + note C#, 12 + note_type 12, 11, 0 + note D#, 16 + note_type 12, 11, 7 + note D#, 16 + note_type 12, 12, 3 octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 12, 7 - octave 4 - C# 12 - notetype 12, 12, 0 - A_ 8 - E_ 8 - B_ 16 - notetype 12, 12, 7 - B_ 16 - notetype 12, 12, 4 - octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 12, 7 + octave 4 + note C#, 12 + note_type 12, 12, 0 + note A_, 8 + note E_, 8 + note B_, 16 + note_type 12, 12, 7 + note B_, 16 + note_type 12, 12, 4 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 rest 2 - B_ 1 - octave 4 - D# 1 - F# 1 - A# 1 - notetype 12, 12, 0 - B_ 16 - F# 16 - A_ 16 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note_type 12, 12, 0 + note B_, 16 + note F#, 16 + note A_, 16 octave 5 - C# 8 + note C#, 8 rest 2 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - A_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_225e0 + note A_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch2:: +Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 12 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - C_ 1 - C# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - F# 1 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 6 + note F_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 6 - notetype 12, 1, 4 + note C#, 6 + note_type 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - C# 12 + note C#, 12 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - D# 16 + note E_, 12 + note D#, 16 octave 3 - B_ 16 - A_ 1 + note B_, 16 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - C# 8 - E_ 8 + note E_, 12 + note C#, 8 + note E_, 8 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_227b1 + note G_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_227b1 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 098c82c8..80dafaa6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,96 +1,96 @@ -Music_HallOfFame_Ch0:: +Music_HallOfFame_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 2, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 16 rest 16 rest 16 rest 12 octave 3 - D_ 1 - E_ 1 - F_ 1 - F# 1 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 Music_HallOfFame_branch_7fbc5:: - notetype 12, 8, 0 + note_type 12, 8, 0 octave 4 - C_ 16 - E_ 16 - F# 16 - notetype 12, 6, 0 - F_ 16 - loopchannel 3, Music_HallOfFame_branch_7fbc5 + note C_, 16 + note E_, 16 + note F#, 16 + note_type 12, 6, 0 + note F_, 16 + sound_loop 3, Music_HallOfFame_branch_7fbc5 rest 16 rest 16 rest 16 rest 16 - loopchannel 0, Music_HallOfFame_branch_7fbc5 + sound_loop 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch1:: +Music_HallOfFame_Ch2:: vibrato 8, 2, 5 - duty 3 + duty_cycle 3 Music_HallOfFame_branch_7fbdf:: - notetype 12, 12, 4 + note_type 12, 12, 4 octave 3 - G_ 2 - D_ 2 - G_ 2 - A_ 10 - G_ 2 - D_ 2 - G_ 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 - A_ 2 - G_ 2 - D_ 2 - G_ 2 - A_ 10 - F_ 2 - C_ 2 - F_ 2 - A# 4 - A_ 4 - F_ 2 - loopchannel 0, Music_HallOfFame_branch_7fbdf + note B_, 4 + note A_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note F_, 2 + note C_, 2 + note F_, 2 + note A#, 4 + note A_, 4 + note F_, 2 + sound_loop 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch2:: - notetype 12, 1, 2 +Music_HallOfFame_Ch3:: + note_type 12, 1, 2 Music_HallOfFame_branch_7fbfe:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - loopchannel 12, Music_HallOfFame_branch_7fbfe - D_ 4 - G_ 4 - D_ 4 - G_ 4 - E_ 4 - G_ 4 - E_ 4 - G_ 4 - F# 4 - A_ 4 - F# 4 - A_ 4 - E_ 4 - G_ 4 - E_ 4 - G_ 4 - loopchannel 0, Music_HallOfFame_Ch2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_loop 12, Music_HallOfFame_branch_7fbfe + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note F#, 4 + note A_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + sound_loop 0, Music_HallOfFame_Ch3 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index f139775b..f2ef8a7e 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,231 +1,231 @@ -Music_IndigoPlateau_Ch0:: +Music_IndigoPlateau_Ch1:: tempo 132 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 2 - A_ 8 - A_ 8 - A_ 8 - A_ 4 - notetype 12, 10, 4 - A# 4 + note A_, 8 + note A_, 8 + note A_, 8 + note A_, 4 + note_type 12, 10, 4 + note A#, 4 Music_IndigoPlateau_branch_a605:: - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 10, 0 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 10, 0 octave 2 - A# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 13, 4 + note D_, 4 + note_type 12, 13, 4 octave 3 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - notetype 12, 11, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 13, 4 + note D#, 4 + note_type 12, 13, 4 octave 3 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - notetype 12, 11, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note_type 12, 11, 4 octave 3 - F_ 2 - notetype 12, 11, 4 + note F_, 2 + note_type 12, 11, 4 octave 3 - G_ 2 - notetype 12, 11, 0 - A_ 8 + note G_, 2 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 14 + note F_, 8 + note_type 12, 4, 14 octave 2 - A# 8 - loopchannel 0, Music_IndigoPlateau_branch_a605 + note A#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a605 Music_IndigoPlateau_branch_a659:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - endchannel + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + sound_ret -Music_IndigoPlateau_Ch1:: - duty 3 +Music_IndigoPlateau_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - D_ 8 - D_ 8 - D_ 8 - D_ 4 - notetype 12, 5, 10 - D# 4 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 4 + note_type 12, 5, 10 + note D#, 4 Music_IndigoPlateau_branch_a673:: - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 7 - C# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 7 + note C#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 octave 4 - C_ 2 - notetype 12, 12, 7 + note C_, 2 + note_type 12, 12, 7 octave 4 - C# 2 - D_ 8 + note C#, 2 + note D_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - C_ 8 - notetype 12, 4, 13 + note C_, 8 + note_type 12, 4, 13 octave 4 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a673 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a673 Music_IndigoPlateau_branch_a6af:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - endchannel + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + sound_ret -Music_IndigoPlateau_Ch2:: - notetype 12, 1, 0 +Music_IndigoPlateau_Ch3:: + note_type 12, 1, 0 octave 4 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 2 - D# 4 + note D#, 4 Music_IndigoPlateau_branch_a6c6:: - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - F# 4 - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 + note F#, 4 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A_ 8 - D_ 8 - A# 8 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a6c6 + note A_, 8 + note D_, 8 + note A#, 8 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a6c6 Music_IndigoPlateau_branch_a6fe:: octave 4 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - A_ 4 - endchannel + note A_, 4 + sound_ret -Music_IndigoPlateau_Ch3:: +Music_IndigoPlateau_Ch4:: dspeed 6 mutedsnare2 16 mutedsnare2 16 @@ -241,20 +241,20 @@ Music_IndigoPlateau_Ch3:: mutedsnare3 1 Music_IndigoPlateau_branch_a728:: - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a7a8 mutedsnare2 16 mutedsnare2 8 mutedsnare3 8 @@ -275,7 +275,7 @@ Music_IndigoPlateau_branch_a728:: mutedsnare2 1 mutedsnare2 1 mutedsnare2 1 - loopchannel 0, Music_IndigoPlateau_branch_a728 + sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: mutedsnare2 4 @@ -287,7 +287,7 @@ Music_IndigoPlateau_branch_a77e:: mutedsnare4 4 mutedsnare4 2 mutedsnare3 2 - endchannel + sound_ret Music_IndigoPlateau_branch_a791:: mutedsnare2 4 @@ -301,7 +301,7 @@ Music_IndigoPlateau_branch_a791:: mutedsnare4 1 mutedsnare3 1 mutedsnare3 1 - endchannel + sound_ret Music_IndigoPlateau_branch_a7a8:: mutedsnare2 4 @@ -318,4 +318,4 @@ Music_IndigoPlateau_branch_a7a8:: mutedsnare3 1 mutedsnare3 1 mutedsnare3 1 - endchannel + sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 2aad0d88..4885e389 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,235 +1,235 @@ -Music_IntroBattle_Ch0:: +Music_IntroBattle_Ch1:: tempo 98 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 1 + toggle_perfect_pitch + note_type 12, 11, 1 rest 8 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 10, 0 - A# 4 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 10, 0 + note A#, 4 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 2, 9 + note A_, 2 + note A_, 2 + note_type 12, 2, 9 octave 3 - G_ 4 - notetype 12, 11, 0 - A_ 8 + note G_, 4 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 15 + note F_, 8 + note_type 12, 4, 15 octave 2 - F_ 8 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note F_, 8 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - F_ 4 - notetype 12, 11, 1 + note F_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - G_ 4 - notetype 12, 11, 0 - F# 16 - notetype 12, 11, 1 + note G_, 4 + note_type 12, 11, 0 + note F#, 16 + note_type 12, 11, 1 octave 4 - D_ 16 - endchannel + note D_, 16 + sound_ret -Music_IntroBattle_Ch1:: - duty 3 +Music_IntroBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 rest 8 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 11, 7 - C# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 11, 7 + note C#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 7 + note D_, 2 + note D_, 2 + note_type 12, 12, 7 octave 4 - C# 4 - D_ 8 + note C#, 4 + note D_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - C_ 8 + note C_, 8 octave 3 - C_ 8 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 + note C_, 8 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 octave 4 - C_ 4 - notetype 12, 12, 2 + note C_, 4 + note_type 12, 12, 2 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 octave 4 - C# 4 - notetype 12, 2, 15 - D_ 16 - notetype 12, 12, 1 + note C#, 4 + note_type 12, 2, 15 + note D_, 16 + note_type 12, 12, 1 octave 5 - D_ 16 - endchannel + note D_, 16 + sound_ret -Music_IntroBattle_Ch2:: - notetype 12, 1, 0 +Music_IntroBattle_Ch3:: + note_type 12, 1, 0 rest 8 octave 4 - D_ 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 4 - D_ 1 + note F#, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - A_ 8 - D_ 8 - A# 8 - D_ 8 - D_ 1 + note A#, 4 + note A_, 8 + note D_, 8 + note A#, 8 + note D_, 8 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - D_ 1 + note A#, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - A_ 16 - D_ 1 + note A#, 4 + note A_, 16 + note D_, 1 rest 15 - endchannel + sound_ret -Music_IntroBattle_Ch3:: +Music_IntroBattle_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 @@ -326,4 +326,4 @@ Music_IntroBattle_Ch3:: mutedsnare2 2 rest 16 rest 14 - endchannel + sound_ret diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 0b791a30..3c0d5234 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,40 +1,40 @@ -Music_JigglypuffSong_Ch0:: +Music_JigglypuffSong_Ch1:: tempo 144 volume 7, 7 vibrato 8, 2, 4 - duty 2 - dutycycle 165 - toggleperfectpitch - notetype 13, 6, 7 + duty_cycle 2 + duty_cycle_pattern 165 + toggle_perfect_pitch + note_type 13, 6, 7 octave 4 - E_ 8 - notetype 12, 6, 7 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + note E_, 8 + note_type 12, 6, 7 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + sound_ret -Music_JigglypuffSong_Ch1:: +Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 - duty 2 - dutycycle 10 - notetype 12, 10, 7 + duty_cycle 2 + duty_cycle_pattern 10 + note_type 12, 10, 7 octave 4 - E_ 8 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + note E_, 8 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index da58e489..671df650 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,192 +1,192 @@ -Music_Lavender_Ch0:: +Music_Lavender_Ch1:: tempo 152 volume 7, 7 - duty 1 - toggleperfectpitch + duty_cycle 1 + toggle_perfect_pitch vibrato 0, 8, 8 - notetype 12, 8, 7 + note_type 12, 8, 7 rest 16 rest 16 rest 16 rest 16 - notetype 12, 10, 7 + note_type 12, 10, 7 Music_Lavender_branch_bb6b:: octave 3 - G_ 8 - G_ 8 - E_ 8 - E_ 8 - G_ 4 - F# 4 - E_ 4 - B_ 4 - C# 8 - C# 8 - G_ 8 - G_ 8 - F# 8 - F# 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - C_ 8 - C_ 8 + note C_, 8 + note C_, 8 octave 3 - G_ 8 - G_ 8 - E_ 8 - E_ 8 - G_ 4 - F# 4 - E_ 4 - B_ 4 - C# 8 - C# 8 - G_ 8 - G_ 8 - F# 8 - F# 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 - C_ 8 - C_ 8 - rest 16 - rest 16 - rest 16 - rest 16 - loopchannel 0, Music_Lavender_branch_bb6b + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note C_, 8 + note C_, 8 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch1:: +Music_Lavender_Ch2:: vibrato 0, 3, 4 - duty 3 - notetype 12, 9, 1 + duty_cycle 3 + note_type 12, 9, 1 Music_Lavender_branch_bba5:: octave 5 - C_ 4 - G_ 4 - B_ 4 - F# 4 - loopchannel 0, Music_Lavender_branch_bba5 + note C_, 4 + note G_, 4 + note B_, 4 + note F#, 4 + sound_loop 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch2:: +Music_Lavender_Ch3:: vibrato 4, 1, 1 - notetype 12, 3, 5 + note_type 12, 3, 5 rest 16 rest 16 rest 16 rest 16 - notetype 12, 2, 5 + note_type 12, 2, 5 Music_Lavender_branch_bbb9:: octave 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - notetype 12, 3, 5 + note E_, 4 + note_type 12, 3, 5 octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 - notetype 12, 2, 5 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note_type 12, 2, 5 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - notetype 12, 2, 5 + note E_, 4 + note_type 12, 2, 5 octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - loopchannel 0, Music_Lavender_branch_bbb9 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + sound_loop 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch3:: +Music_Lavender_Ch4:: dspeed 12 rest 16 rest 16 @@ -196,4 +196,4 @@ Music_Lavender_Ch3:: Music_Lavender_branch_bc26:: triangle2 8 triangle2 8 - loopchannel 0, Music_Lavender_branch_bc26 + sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 941b0c34..eb4f05ae 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,80 +1,80 @@ -Music_MeetEvilTrainer_Ch0:: +Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 rest 4 octave 3 - D_ 2 - C# 2 - notetype 12, 4, 15 - D_ 4 + note D_, 2 + note C#, 2 + note_type 12, 4, 15 + note D_, 4 Music_MeetEvilTrainer_branch_7f6ae:: - notetype 12, 10, 1 - D_ 4 - D_ 4 - D_ 4 - notetype 12, 7, 0 - D_ 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae + note_type 12, 10, 1 + note D_, 4 + note D_, 4 + note D_, 4 + note_type 12, 7, 0 + note D_, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch1:: - duty 1 - notetype 12, 11, 6 +Music_MeetEvilTrainer_Ch2:: + duty_cycle 1 + note_type 12, 11, 6 octave 3 - B_ 2 - A# 2 - B_ 8 + note B_, 2 + note A#, 2 + note B_, 8 Music_MeetEvilTrainer_branch_7f6c2:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D# 2 - D_ 2 - C# 2 - C_ 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 octave 3 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 4, 15 - A# 4 - notetype 12, 12, 2 - G_ 2 - G# 2 - A_ 2 - A# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 3, 15 - A# 4 - notetype 12, 12, 2 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note_type 12, 4, 15 + note A#, 4 + note_type 12, 12, 2 + note G_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note_type 12, 3, 15 + note A#, 4 + note_type 12, 12, 2 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch2:: - notetype 12, 1, 0 +Music_MeetEvilTrainer_Ch3:: + note_type 12, 1, 0 rest 8 octave 4 - F# 1 + note F#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 Music_MeetEvilTrainer_branch_7f6ee:: - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - A# 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee + note A#, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 2a5659b4..c76483e5 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,118 +1,118 @@ -Music_MeetFemaleTrainer_Ch0:: +Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 - duty 1 - toggleperfectpitch - notetype 12, 11, 2 + duty_cycle 1 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - G# 6 + note G#, 6 octave 4 - E_ 2 - D# 2 - C# 2 - C_ 2 - notetype 12, 8, 1 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + note_type 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 - E_ 4 - loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c - E_ 4 + note E_, 4 + sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 octave 2 - B_ 4 - B_ 4 + note B_, 4 + note B_, 4 octave 3 - E_ 4 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch1:: - duty 2 - notetype 12, 12, 2 +Music_MeetFemaleTrainer_Ch2:: + duty_cycle 2 + note_type 12, 12, 2 octave 3 - B_ 2 - notetype 12, 12, 7 + note B_, 2 + note_type 12, 12, 7 octave 4 - B_ 12 + note B_, 12 Music_MeetFemaleTrainer_branch_7f726:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - D# 4 - E_ 4 - D# 4 - C# 2 - C_ 2 + note D#, 4 + note E_, 4 + note D#, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - A# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch2:: - notetype 12, 1, 0 +Music_MeetFemaleTrainer_Ch3:: + note_type 12, 1, 0 rest 8 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 Music_MeetFemaleTrainer_branch_7f756:: - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index c13e40cb..a2786052 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,190 +1,190 @@ -Music_MeetMaleTrainer_Ch0:: +Music_MeetMaleTrainer_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 20, 3, 3 - toggleperfectpitch - notetype 12, 11, 4 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 12 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 - B_ 4 - A_ 4 - G# 2 - F# 2 - E_ 2 - D# 2 - F# 4 - E_ 6 - F_ 2 - F# 4 - G_ 8 - octave 4 - D_ 8 - E_ 16 - loopchannel 0, Music_MeetMaleTrainer_branch_7f78f + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 4 + note E_, 6 + note F_, 2 + note F#, 4 + note G_, 8 + octave 4 + note D_, 8 + note E_, 16 + sound_loop 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch1:: - duty 3 +Music_MeetMaleTrainer_Ch2:: + duty_cycle 3 vibrato 24, 2, 2 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - E_ 1 - D# 1 - D_ 1 - C# 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 octave 3 - B_ 12 + note B_, 12 rest 2 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 9 Music_MeetMaleTrainer_branch_7f7b5:: - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - E_ 6 - D# 6 - C# 4 + note E_, 6 + note D#, 6 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - octave 4 - C# 2 - notetype 12, 12, 7 - F_ 16 - notetype 12, 12, 5 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note_type 12, 12, 7 + note F_, 16 + note_type 12, 12, 5 octave 3 - F# 8 + note F#, 8 octave 4 - C# 8 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + note C#, 8 + sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch2:: - notetype 12, 1, 0 +Music_MeetMaleTrainer_Ch3:: + note_type 12, 1, 0 rest 6 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 1 Music_MeetMaleTrainer_branch_7f7ea:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea + sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 5c6ea13d..24c6741a 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,423 +1,423 @@ -Music_MeetProfOak_Ch0:: +Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 11, 4 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - F# 1 - B_ 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 - E_ 1 - F# 12 - notetype 12, 10, 2 + note D#, 1 + note E_, 1 + note F#, 12 + note_type 12, 10, 2 octave 3 - E_ 6 - B_ 10 - E_ 6 - B_ 10 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - B_ 10 - E_ 6 - B_ 10 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - D# 4 - F# 2 - F# 4 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 Music_MeetProfOak_branch_af85:: - F# 6 - E_ 4 - A_ 2 - A_ 4 - F# 6 - E_ 4 - A_ 2 - A_ 4 - F# 6 - E_ 4 - G# 2 - G# 4 - F# 6 - E_ 4 - G# 2 - G# 4 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - D# 4 - F# 2 - F# 4 - F# 6 - E_ 4 - G# 2 - G# 4 - F# 6 - E_ 4 - G# 2 - G# 4 - loopchannel 0, Music_MeetProfOak_branch_af85 + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + sound_loop 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch1:: +Music_MeetProfOak_Ch2:: vibrato 8, 1, 1 - duty 2 - notetype 12, 12, 4 + duty_cycle 2 + note_type 12, 12, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - D# 1 - F# 1 - A# 1 - B_ 12 - notetype 12, 11, 2 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 12 + note_type 12, 11, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 5 Music_MeetProfOak_branch_b005:: octave 4 - C# 6 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 6 - C# 1 - E_ 1 - F# 4 - E_ 4 - D# 4 - C# 4 + note C#, 1 + note E_, 6 + note C#, 1 + note E_, 1 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 octave 3 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 4 - E_ 8 - notetype 12, 6, 5 + note E_, 8 + note_type 12, 6, 5 octave 4 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 5 - E_ 8 - notetype 12, 11, 5 + note E_, 8 + note_type 12, 11, 5 octave 3 - A_ 6 - F# 1 - A_ 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 4 - D# 8 - E_ 4 - D# 4 - C# 4 - C_ 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 octave 3 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - notetype 12, 11, 7 - G# 16 - loopchannel 0, Music_MeetProfOak_branch_b005 + note E_, 1 + note_type 12, 11, 7 + note G#, 16 + sound_loop 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch2:: - notetype 12, 1, 2 +Music_MeetProfOak_Ch3:: + note_type 12, 1, 2 rest 10 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 rest 6 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G# 1 + note G#, 1 rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0d8 + sound_loop 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0ed + sound_loop 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b101 - loopchannel 0, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b101 + sound_loop 0, Music_MeetProfOak_branch_b0bc diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index a6391247..958db7be 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -1,396 +1,396 @@ Music_MeetRival_branch_b119:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b123 + sound_loop 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch0:: +Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - D_ 1 - C# 1 - C_ 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 2 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 6 - D_ 1 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 2 + note A_, 2 Music_MeetRival_branch_b140:: - B_ 4 - A# 2 - A_ 4 - G_ 2 + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 rest 4 - D_ 4 - C# 2 - C_ 2 + note D_, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 - E_ 2 - D_ 4 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 + note C_, 2 rest 4 - G_ 4 - G_ 2 - F# 2 - E_ 2 - D_ 2 - F# 2 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - F# 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - D_ 2 + note D_, 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - D_ 2 + note D_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 4 - C_ 2 - F_ 2 + note C_, 2 + note F_, 2 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - F_ 2 - D# 2 - C_ 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 octave 3 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 rest 4 - A# 4 + note A#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 - notetype 12, 11, 7 + note C_, 2 + note_type 12, 11, 7 octave 3 - G_ 4 - D_ 2 - F_ 6 - F# 4 - D_ 2 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 rest 4 - D_ 4 - notetype 12, 11, 3 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note D_, 4 + note_type 12, 11, 3 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b1a5 + sound_loop 0, Music_MeetRival_branch_b1a5 Music_MeetRival_branch_b1a2:: tempo 112 Music_MeetRival_branch_b1a5:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch1:: - duty 3 +Music_MeetRival_Ch2:: + duty_cycle 3 vibrato 10, 2, 6 - notetype 12, 12, 7 - octave 4 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 2 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 6 + note_type 12, 12, 7 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 6 octave 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 octave 4 - D_ 2 - F_ 2 - F# 2 + note D_, 2 + note F_, 2 + note F#, 2 Music_MeetRival_branch_b1d8:: - notetype 12, 12, 7 - G_ 4 - D_ 2 - F_ 6 - F# 4 - G_ 2 + note_type 12, 12, 7 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 rest 4 - G_ 4 - G_ 2 - A# 2 - B_ 2 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 2 - A# 6 - B_ 4 + note G_, 2 + note A#, 6 + note B_, 4 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 16 - notetype 12, 11, 5 - D_ 6 - notetype 12, 12, 7 - F_ 4 - D_ 2 - C_ 2 - D_ 2 - notetype 12, 11, 0 - C_ 8 - notetype 12, 12, 7 - C_ 8 - octave 4 - C_ 2 + note C_, 2 + note_type 12, 11, 0 + note D_, 16 + note_type 12, 11, 5 + note D_, 6 + note_type 12, 12, 7 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 + octave 4 + note C_, 2 rest 4 - A# 4 - G_ 2 - F_ 2 - notetype 12, 11, 0 - G_ 16 - notetype 12, 11, 3 - G_ 2 + note A#, 4 + note G_, 2 + note F_, 2 + note_type 12, 11, 0 + note G_, 16 + note_type 12, 11, 3 + note G_, 2 octave 3 - G_ 2 + note G_, 2 rest 4 - G_ 4 + note G_, 4 octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 Music_MeetRival_branch_b21d:: - duty 3 + duty_cycle 3 vibrato 10, 2, 6 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch2:: - notetype 12, 1, 4 +Music_MeetRival_Ch3:: + note_type 12, 1, 4 octave 5 - D_ 2 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 4 - B_ 2 + note B_, 2 rest 2 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 Music_MeetRival_branch_b24b:: - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 - A_ 2 - F# 2 - A_ 2 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - A_ 2 - F# 2 - A_ 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - A_ 2 - E_ 2 + note A_, 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 rest 2 octave 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - E_ 2 - F_ 2 - G_ 2 - E_ 2 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A# 2 - A_ 2 - G_ 2 - A# 2 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 rest 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 - loopchannel 0, Music_MeetRival_branch_b24b + note D_, 2 + sound_loop 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: - notetype 12, 1, 4 + note_type 12, 1, 4 octave 4 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - loopchannel 0, Music_MeetRival_branch_b24b + sound_loop 0, Music_MeetRival_branch_b24b diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index e41b37bd..80e4afd0 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,267 +1,267 @@ -Music_MuseumGuy_Ch0:: +Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 octave 2 - B_ 4 - B_ 1 + note B_, 4 + note B_, 1 octave 3 - D# 1 - E_ 1 - G# 1 - B_ 10 - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 + note D#, 1 + note E_, 1 + note G#, 1 + note B_, 10 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 Music_MuseumGuy_branch_add6:: - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 - loopchannel 0, Music_MuseumGuy_branch_add6 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + sound_loop 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: - E_ 2 - E_ 6 - F# 2 - F# 6 - endchannel + note E_, 2 + note E_, 6 + note F#, 2 + note F#, 6 + sound_ret Music_MuseumGuy_branch_adec:: - E_ 2 - E_ 6 - D_ 2 - D_ 6 - endchannel + note E_, 2 + note E_, 6 + note D_, 2 + note D_, 6 + sound_ret -Music_MuseumGuy_Ch1:: - duty 2 - notetype 12, 12, 1 +Music_MuseumGuy_Ch2:: + duty_cycle 2 + note_type 12, 12, 1 octave 4 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - E_ 4 - E_ 1 - G# 1 - B_ 1 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 octave 4 - D# 1 - E_ 8 + note D#, 1 + note E_, 8 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - F# 2 - A_ 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - C# 2 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 + note B_, 4 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - F# 2 - A_ 2 - A_ 2 - G# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - A_ 2 - A_ 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A_, 4 Music_MuseumGuy_branch_ae26:: octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 3 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 9, 1 - A_ 1 - notetype 12, 12, 1 + note C#, 2 + note E_, 3 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 9, 1 + note A_, 1 + note_type 12, 12, 1 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 1 - C# 1 - C_ 1 + note C#, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - B_ 3 - notetype 12, 10, 1 - G# 1 - notetype 12, 12, 1 - A_ 2 + note B_, 1 + note B_, 3 + note_type 12, 10, 1 + note G#, 1 + note_type 12, 12, 1 + note A_, 2 octave 4 - C# 2 - E_ 3 - notetype 12, 9, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 8, 1 - A_ 1 - notetype 12, 12, 1 - G# 2 - E_ 1 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - F# 2 - notetype 12, 8, 1 - F# 1 - notetype 12, 12, 1 - G# 1 - A_ 2 - A_ 2 - A_ 4 - loopchannel 0, Music_MuseumGuy_branch_ae26 + note C#, 2 + note E_, 3 + note_type 12, 9, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 8, 1 + note A_, 1 + note_type 12, 12, 1 + note G#, 2 + note E_, 1 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note F#, 2 + note_type 12, 8, 1 + note F#, 1 + note_type 12, 12, 1 + note G#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + sound_loop 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch2:: - notetype 12, 1, 0 +Music_MuseumGuy_Ch3:: + note_type 12, 1, 0 rest 16 octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 9 - callchannel Music_MuseumGuy_branch_aeb8 - A_ 1 + sound_call Music_MuseumGuy_branch_aeb8 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 5 - callchannel Music_MuseumGuy_branch_aeb8 - B_ 1 + sound_call Music_MuseumGuy_branch_aeb8 + note B_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 Music_MuseumGuy_branch_ae8e:: - callchannel Music_MuseumGuy_branch_aec1 + sound_call Music_MuseumGuy_branch_aec1 rest 3 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - callchannel Music_MuseumGuy_branch_aec1 + sound_call Music_MuseumGuy_branch_aec1 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - loopchannel 0, Music_MuseumGuy_branch_ae8e + sound_loop 0, Music_MuseumGuy_branch_ae8e Music_MuseumGuy_branch_aeb8:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - endchannel + sound_ret Music_MuseumGuy_branch_aec1:: octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 octave 6 - F# 1 + note F#, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 - endchannel + note A_, 1 + sound_ret -Music_MuseumGuy_Ch3:: +Music_MuseumGuy_Ch4:: dspeed 12 rest 16 rest 16 @@ -334,4 +334,4 @@ Music_MuseumGuy_branch_aee1:: mutedsnare4 1 mutedsnare3 1 mutedsnare3 1 - loopchannel 0, Music_MuseumGuy_branch_aee1 + sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 87245350..5af9f9a9 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,393 +1,393 @@ -Music_OaksLab_Ch0:: +Music_OaksLab_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 16, 1, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 2 - B_ 1 + note B_, 1 octave 3 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 - A_ 1 - B_ 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note B_, 1 Music_OaksLab_branch_7eed0:: octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 4 - G# 2 - A_ 2 - B_ 1 + note A_, 4 + note G#, 2 + note A_, 2 + note B_, 1 rest 3 - A_ 6 - G# 1 - B_ 1 + note A_, 6 + note G#, 1 + note B_, 1 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - G# 2 - A_ 2 - F# 4 - E_ 2 - F# 2 - G# 1 + note A_, 4 + note G#, 2 + note A_, 2 + note F#, 4 + note E_, 2 + note F#, 2 + note G#, 1 rest 3 - F# 8 - E_ 4 - A_ 6 - E_ 1 - A_ 1 + note F#, 8 + note E_, 4 + note A_, 6 + note E_, 1 + note A_, 1 octave 4 - D_ 8 - C# 6 + note D_, 8 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 8 - D_ 4 - C# 4 + note C#, 1 + note E_, 8 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - G# 1 + note B_, 4 + note A_, 4 + note G#, 1 rest 3 - E_ 4 - F# 4 - G# 4 - loopchannel 0, Music_OaksLab_branch_7eed0 + note E_, 4 + note F#, 4 + note G#, 4 + sound_loop 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch1:: - duty 3 +Music_OaksLab_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 3 - G# 1 - A_ 1 - B_ 1 + note G#, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 Music_OaksLab_branch_7ef16:: - A_ 6 - G# 1 - F# 1 - E_ 6 - D# 1 - E_ 1 - F# 1 + note A_, 6 + note G#, 1 + note F#, 1 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 1 rest 3 - E_ 8 - E_ 4 - F# 6 - E_ 1 - D_ 1 - C# 6 + note E_, 8 + note E_, 4 + note F#, 6 + note E_, 1 + note D_, 1 + note C#, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D_ 1 + note C#, 1 + note D_, 1 rest 3 - C# 8 - C# 4 - D_ 6 + note C#, 8 + note C#, 4 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - D_ 1 - F# 8 - E_ 6 - C# 1 - E_ 1 - A_ 8 - G# 4 - A_ 2 - G# 2 - F# 4 - G# 2 - F# 2 - E_ 1 + note D_, 1 + note F#, 8 + note E_, 6 + note C#, 1 + note E_, 1 + note A_, 8 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 4 + note G#, 2 + note F#, 2 + note E_, 1 rest 1 octave 3 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - loopchannel 0, Music_OaksLab_branch_7ef16 + sound_loop 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch2:: - notetype 12, 1, 1 +Music_OaksLab_Ch3:: + note_type 12, 1, 1 rest 2 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 Music_OaksLab_branch_7ef5c:: - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 5 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - loopchannel 0, Music_OaksLab_branch_7ef5c + sound_loop 0, Music_OaksLab_branch_7ef5c diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 5ad31f81..26e5710f 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,314 +1,314 @@ -Music_PalletTown_Ch0:: +Music_PalletTown_Ch1:: tempo 160 volume 7, 7 - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 Music_PalletTown_branch_a7ce:: octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - C_ 2 + note D_, 4 + note D_, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 rest 2 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 8 + note C_, 8 rest 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 - B_ 2 - G_ 2 - A_ 2 - F# 2 - B_ 4 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F#, 2 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - G_ 2 - F# 2 - E_ 4 - D_ 2 - C_ 4 + note D_, 4 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note C_, 4 octave 3 - A_ 2 - B_ 2 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G_ 4 - F# 4 + note B_, 2 + note A_, 2 + note G_, 4 + note F#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - A_ 2 - notetype 12, 11, 3 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 + note A_, 2 + note F#, 2 + note A_, 2 + note_type 12, 11, 3 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - A_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - F# 2 - D_ 2 - C_ 2 - D_ 2 - G_ 2 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - E_ 2 - C_ 2 - E_ 2 - F# 2 - D_ 2 - C_ 2 - D_ 2 - loopchannel 0, Music_PalletTown_branch_a7ce - endchannel + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + sound_loop 0, Music_PalletTown_branch_a7ce + sound_ret -Music_PalletTown_Ch1:: - duty 2 +Music_PalletTown_Ch2:: + duty_cycle 2 Music_PalletTown_branch_a861:: - notetype 12, 13, 3 + note_type 12, 13, 3 octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 octave 4 - B_ 2 - notetype 12, 11, 3 - A_ 2 - notetype 12, 13, 3 + note B_, 2 + note_type 12, 11, 3 + note A_, 2 + note_type 12, 13, 3 octave 5 - G_ 2 - notetype 12, 11, 3 - E_ 2 - notetype 12, 13, 3 - F# 2 - E_ 2 - D_ 6 + note G_, 2 + note_type 12, 11, 3 + note E_, 2 + note_type 12, 13, 3 + note F#, 2 + note E_, 2 + note D_, 6 octave 4 - B_ 2 - G_ 2 - G_ 2 - A_ 2 - B_ 2 + note B_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 10 + note C_, 10 octave 4 - F# 2 - G_ 2 - A_ 2 - B_ 6 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 octave 5 - C_ 1 + note C_, 1 octave 4 - B_ 1 - A_ 8 + note B_, 1 + note A_, 8 octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 octave 4 - B_ 2 - notetype 12, 11, 3 + note B_, 2 + note_type 12, 11, 3 octave 5 - D_ 2 - notetype 12, 13, 3 - G_ 2 - notetype 12, 10, 3 - F# 2 - notetype 12, 11, 3 - F# 2 - notetype 12, 13, 3 - G_ 2 - E_ 6 - D_ 2 - D_ 8 - C_ 2 + note D_, 2 + note_type 12, 13, 3 + note G_, 2 + note_type 12, 10, 3 + note F#, 2 + note_type 12, 11, 3 + note F#, 2 + note_type 12, 13, 3 + note G_, 2 + note E_, 6 + note D_, 2 + note D_, 8 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 10 - G_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 10 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 8 - D_ 6 - C_ 2 + note C_, 8 + note D_, 6 + note C_, 2 octave 4 - B_ 8 + note B_, 8 rest 2 - G_ 2 - A_ 2 - B_ 2 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 4 - C_ 4 - D_ 6 - C_ 1 - D_ 1 + note C_, 4 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 octave 4 - B_ 8 + note B_, 8 rest 2 - B_ 2 - A_ 2 - G_ 2 - A_ 8 - E_ 4 - B_ 4 - A_ 8 - G_ 4 - E_ 4 - F# 8 - G_ 4 - B_ 4 - B_ 8 - A_ 8 - loopchannel 0, Music_PalletTown_branch_a861 - endchannel + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 8 + note E_, 4 + note B_, 4 + note A_, 8 + note G_, 4 + note E_, 4 + note F#, 8 + note G_, 4 + note B_, 4 + note B_, 8 + note A_, 8 + sound_loop 0, Music_PalletTown_branch_a861 + sound_ret -Music_PalletTown_Ch2:: +Music_PalletTown_Ch3:: vibrato 24, 2, 8 - notetype 12, 1, 2 + note_type 12, 1, 2 Music_PalletTown_branch_a8e3:: octave 4 - G_ 6 - E_ 6 - F# 4 - G_ 6 - A_ 6 - G_ 4 - E_ 6 - F# 6 - E_ 4 - G_ 6 - E_ 6 - D_ 4 - G_ 6 - E_ 6 - F# 4 - G_ 6 - A_ 6 - G_ 4 - E_ 6 - F# 6 - A_ 4 - G_ 6 - E_ 6 - D_ 4 - C_ 8 - D_ 8 - G_ 8 - E_ 4 - D_ 4 - C_ 8 - D_ 8 - G_ 8 - A_ 4 - G_ 4 - E_ 8 - A_ 8 - E_ 8 - G_ 8 - F# 8 - E_ 8 - E_ 8 - F# 8 - loopchannel 0, Music_PalletTown_branch_a8e3 - endchannel + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note A_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note E_, 4 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note A_, 4 + note G_, 4 + note E_, 8 + note A_, 8 + note E_, 8 + note G_, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + sound_loop 0, Music_PalletTown_branch_a8e3 + sound_ret diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 9d3cd3d0..f3b78d38 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,47 +1,47 @@ -Music_PkmnHealed_Ch0:: +Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 8, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 8, 1 rest 2 - pitchbend 0, 75 - B_ 2 - pitchbend 0, 84 - B_ 2 - pitchbend 0, 68 - E_ 2 + pitch_slide 0, 75 + note B_, 2 + pitch_slide 0, 84 + note B_, 2 + pitch_slide 0, 68 + note E_, 2 rest 4 - pitchbend 0, 59 - E_ 4 - pitchbend 0, 75 - B_ 4 - endchannel + pitch_slide 0, 59 + note E_, 4 + pitch_slide 0, 75 + note B_, 4 + sound_ret -Music_PkmnHealed_Ch1:: - duty 2 - notetype 12, 12, 3 +Music_PkmnHealed_Ch2:: + duty_cycle 2 + note_type 12, 12, 3 octave 4 - B_ 4 - B_ 4 - B_ 2 - G# 2 - notetype 12, 12, 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + note_type 12, 12, 4 octave 5 - E_ 8 - endchannel + note E_, 8 + sound_ret -Music_PkmnHealed_Ch2:: - notetype 12, 1, 0 +Music_PkmnHealed_Ch3:: + note_type 12, 1, 0 octave 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 - G# 2 - E_ 6 + note E_, 2 + note G#, 2 + note E_, 6 rest 2 - endchannel + sound_ret diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 83d161d7..a4a3f2bf 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,375 +1,375 @@ -Music_Pokecenter_Ch0:: +Music_Pokecenter_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 2, 2 - toggleperfectpitch + toggle_perfect_pitch Music_Pokecenter_branch_be61:: - notetype 12, 10, 3 + note_type 12, 10, 3 octave 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - notetype 12, 10, 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note_type 12, 10, 3 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - F# 2 - E_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 4 - E_ 2 - F# 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 4 - C# 2 - D_ 2 - E_ 2 - G_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 8 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note F#, 2 + note E_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 8 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 - B_ 2 + note B_, 4 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - D_ 2 - C# 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - C# 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - G_ 2 - A_ 2 - B_ 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - F# 2 - G_ 2 - loopchannel 0, Music_Pokecenter_branch_be61 + note B_, 2 + note A_, 4 + note G_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + sound_loop 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch1:: +Music_Pokecenter_Ch2:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 2 - F# 6 - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 2 + note F#, 6 + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 8 - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 8 + duty_cycle 3 + note_type 12, 10, 5 octave 3 - D_ 4 - E_ 4 - duty 2 - notetype 12, 12, 6 + note D_, 4 + note E_, 4 + duty_cycle 2 + note_type 12, 12, 6 octave 4 - F# 8 - A_ 8 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 8 - C# 8 - E_ 8 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 8 - F# 8 - A_ 8 - G_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 8 - A_ 4 - G_ 2 - F# 2 - G_ 8 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 8 - loopchannel 0, Music_Pokecenter_branch_befc + note F#, 8 + note A_, 8 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 8 + note C#, 8 + note E_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + note F#, 8 + note A_, 8 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 8 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + sound_loop 0, Music_Pokecenter_branch_befc Music_Pokecenter_branch_bf4e:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 12, 12, 3 - A_ 4 - G_ 4 - F# 2 - E_ 2 - C# 6 - endchannel + note D_, 2 + note_type 12, 12, 3 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + sound_ret Music_Pokecenter_branch_bf60:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - notetype 12, 12, 3 - F# 4 - E_ 4 - C# 2 - endchannel + note C#, 2 + note_type 12, 12, 3 + note F#, 4 + note E_, 4 + note C#, 2 + sound_ret -Music_Pokecenter_Ch2:: - notetype 12, 1, 0 +Music_Pokecenter_Ch3:: + note_type 12, 1, 0 Music_Pokecenter_branch_bf72:: octave 4 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - F# 2 - G_ 2 - F# 2 - callchannel Music_Pokecenter_branch_bfd9 - callchannel Music_Pokecenter_branch_bfe2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - G_ 2 - A_ 2 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - F# 2 - G_ 2 - F# 2 - callchannel Music_Pokecenter_branch_bfd9 - callchannel Music_Pokecenter_branch_bfe2 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - B_ 2 - A_ 2 - G_ 2 - callchannel Music_Pokecenter_branch_bfeb - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - G# 2 - A_ 2 - callchannel Music_Pokecenter_branch_bfeb - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - loopchannel 0, Music_Pokecenter_branch_bf72 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call Music_Pokecenter_branch_bfe2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call Music_Pokecenter_branch_bfe2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + sound_call Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + sound_call Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + sound_loop 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfe2:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - G_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfeb:: - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - endchannel + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + sound_ret diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 0f17ddeb..8f78c613 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,458 +1,458 @@ -Music_PokemonTower_Ch0:: +Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 12, 2, 3 - notetype 12, 8, 0 + note_type 12, 8, 0 rest 4 octave 4 - B_ 12 + note B_, 12 Music_PokemonTower_branch_7f05a:: - notetype 12, 11, 4 + note_type 12, 11, 4 octave 4 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 octave 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - F# 1 + note F#, 1 rest 7 - C_ 1 + note C_, 1 octave 3 - B_ 1 - G_ 1 + note B_, 1 + note G_, 1 rest 5 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 3 - notetype 12, 8, 4 - C_ 1 + note_type 12, 8, 4 + note C_, 1 rest 3 - notetype 12, 11, 4 - D_ 1 + note_type 12, 11, 4 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 octave 3 - A_ 1 + note A_, 1 rest 7 - A_ 1 + note A_, 1 rest 7 - notetype 12, 10, 7 - B_ 8 - B_ 8 + note_type 12, 10, 7 + note B_, 8 + note B_, 8 octave 4 - C_ 8 - C_ 8 - C# 8 - C# 8 - notetype 12, 10, 6 - D_ 16 + note C_, 8 + note C_, 8 + note C#, 8 + note C#, 8 + note_type 12, 10, 6 + note D_, 16 rest 16 rest 16 rest 16 rest 16 - notetype 12, 9, 2 - B_ 4 + note_type 12, 9, 2 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 octave 5 - C_ 16 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f05a + note C_, 16 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch1:: +Music_PokemonTower_Ch2:: vibrato 20, 3, 4 - duty 3 - notetype 12, 10, 0 + duty_cycle 3 + note_type 12, 10, 0 octave 5 - C_ 12 + note C_, 12 octave 4 - E_ 4 + note E_, 4 Music_PokemonTower_branch_7f0ee:: - notetype 12, 12, 1 + note_type 12, 12, 1 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 4 - notetype 12, 12, 4 - G_ 1 - F# 1 - E_ 1 - D# 1 - notetype 12, 11, 0 - G_ 8 + note B_, 4 + note_type 12, 12, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note_type 12, 11, 0 + note G_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 4 - G_ 4 - E_ 4 - G_ 4 + note B_, 4 + note G_, 4 + note E_, 4 + note G_, 4 octave 5 - C_ 8 - notetype 12, 11, 7 - C_ 8 - notetype 12, 12, 2 + note C_, 8 + note_type 12, 11, 7 + note C_, 8 + note_type 12, 12, 2 octave 4 - G_ 1 - F# 1 - E_ 1 + note G_, 1 + note F#, 1 + note E_, 1 rest 1 - notetype 12, 9, 6 + note_type 12, 9, 6 octave 3 - G_ 4 - notetype 12, 12, 7 - G_ 4 - B_ 4 - G_ 4 - B_ 4 + note G_, 4 + note_type 12, 12, 7 + note G_, 4 + note B_, 4 + note G_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 - notetype 12, 11, 0 + note B_, 4 + note_type 12, 11, 0 octave 4 - C_ 16 - E_ 8 - notetype 12, 11, 7 - E_ 12 - notetype 12, 12, 5 + note C_, 16 + note E_, 8 + note_type 12, 11, 7 + note E_, 12 + note_type 12, 12, 5 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 11, 0 - F# 12 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 0 - B_ 4 - G_ 4 - F# 4 - E_ 4 - B_ 16 - notetype 12, 11, 0 + note B_, 4 + note G_, 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note F#, 12 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 0 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 16 + note_type 12, 11, 0 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 9, 0 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 9, 0 octave 5 - C_ 16 - notetype 12, 11, 0 - D_ 4 + note C_, 16 + note_type 12, 11, 0 + note D_, 4 octave 4 - A_ 4 - G# 4 - F# 4 - notetype 12, 2, 15 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 12, 2, 15 octave 5 - D_ 16 - notetype 12, 12, 0 - E_ 4 + note D_, 16 + note_type 12, 12, 0 + note E_, 4 octave 4 - B_ 4 - A_ 4 - G_ 4 + note B_, 4 + note A_, 4 + note G_, 4 octave 5 - F_ 4 - C_ 4 + note F_, 4 + note C_, 4 octave 4 - A# 4 - G# 4 + note A#, 4 + note G#, 4 octave 5 - F# 4 - D_ 4 - C_ 4 + note F#, 4 + note D_, 4 + note C_, 4 octave 4 - A# 4 - G# 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 11, 0 - C_ 8 - notetype 12, 9, 0 - C_ 8 - notetype 12, 8, 0 - C_ 8 - notetype 12, 7, 0 - C_ 8 - notetype 12, 6, 0 - C_ 8 - notetype 12, 6, 7 - C_ 8 + note A#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 9, 0 + note C_, 8 + note_type 12, 8, 0 + note C_, 8 + note_type 12, 7, 0 + note C_, 8 + note_type 12, 6, 0 + note C_, 8 + note_type 12, 6, 7 + note C_, 8 rest 16 - notetype 12, 10, 0 + note_type 12, 10, 0 octave 5 - G_ 16 + note G_, 16 octave 6 - C_ 16 + note C_, 16 octave 5 - B_ 8 - G_ 8 - E_ 8 - G_ 8 + note B_, 8 + note G_, 8 + note E_, 8 + note G_, 8 octave 6 - C_ 16 + note C_, 16 vibrato 0, 3, 4 - notetype 12, 10, 7 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f0ee + note_type 12, 10, 7 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch2:: +Music_PokemonTower_Ch3:: vibrato 4, 1, 1 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 8 octave 5 - G_ 8 + note G_, 8 Music_PokemonTower_branch_7f1a2:: - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - E_ 1 - D# 1 - F# 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - E_ 1 - D# 1 + note E_, 1 + note D#, 1 octave 4 - B_ 1 + note B_, 1 rest 5 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 octave 4 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 15 - notetype 12, 1, 5 + note_type 12, 1, 5 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 7 - notetype 12, 1, 3 + note_type 12, 1, 3 octave 6 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 7 octave 5 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_PokemonTower_branch_7f1a2 + sound_loop 0, Music_PokemonTower_branch_7f1a2 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index fc3227ce..9f326c39 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,315 +1,315 @@ -Music_Routes1_Ch0:: +Music_Routes1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch Music_Routes1_branch_9be9:: - notetype 12, 10, 1 + note_type 12, 10, 1 rest 4 octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - C# 1 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 + note C#, 1 octave 3 - A_ 2 - A_ 2 - A_ 6 - octave 4 - C# 2 - C# 6 - C# 2 - C# 4 + note A_, 2 + note A_, 2 + note A_, 6 + octave 4 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 2 - A_ 6 - octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - E_ 1 - D_ 1 - C# 1 + note A_, 2 + note A_, 6 + octave 4 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 octave 3 - B_ 2 - A_ 2 - A_ 6 + note B_, 2 + note A_, 2 + note A_, 6 octave 4 - C# 2 - C# 6 + note C#, 2 + note C#, 6 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 - notetype 12, 10, 2 + note A_, 2 + note_type 12, 10, 2 octave 4 - G_ 4 - E_ 4 - F# 2 - notetype 12, 10, 1 + note G_, 4 + note E_, 4 + note F#, 2 + note_type 12, 10, 1 octave 3 - A_ 2 - A_ 6 - A_ 2 - F# 2 - A_ 4 - B_ 2 - octave 4 - C# 2 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 + octave 4 + note C#, 2 octave 3 - B_ 4 - A_ 2 - F# 2 - A_ 4 - G_ 2 - E_ 2 - C# 4 - A_ 2 - octave 4 - D_ 2 + note B_, 4 + note A_, 2 + note F#, 2 + note A_, 4 + note G_, 2 + note E_, 2 + note C#, 4 + note A_, 2 + octave 4 + note D_, 2 octave 3 - A_ 4 - B_ 2 - G_ 2 - B_ 4 - octave 4 - D_ 2 - E_ 2 - C# 2 - D_ 2 + note A_, 4 + note B_, 2 + note G_, 2 + note B_, 4 + octave 4 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 octave 3 - A_ 2 - A_ 2 - loopchannel 0, Music_Routes1_branch_9be9 - endchannel + note A_, 2 + note A_, 2 + sound_loop 0, Music_Routes1_branch_9be9 + sound_ret -Music_Routes1_Ch1:: - duty 2 +Music_Routes1_Ch2:: + duty_cycle 2 Music_Routes1_branch_9c53:: - notetype 12, 13, 1 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c78 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c8d - loopchannel 0, Music_Routes1_branch_9c53 + note_type 12, 13, 1 + sound_call Music_Routes1_branch_9c65 + sound_call Music_Routes1_branch_9c78 + sound_call Music_Routes1_branch_9c65 + sound_call Music_Routes1_branch_9c8d + sound_loop 0, Music_Routes1_branch_9c53 Music_Routes1_branch_9c65:: octave 4 - D_ 1 - E_ 1 - F# 2 - F# 2 - F# 2 - D_ 1 - E_ 1 - F# 2 - F# 2 - F# 2 - D_ 1 - E_ 1 - F# 2 - F# 2 - G_ 3 - F# 1 - E_ 6 - endchannel + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note G_, 3 + note F#, 1 + note E_, 6 + sound_ret Music_Routes1_branch_9c78:: - C# 1 - D_ 1 - E_ 2 - E_ 2 - E_ 2 - C# 1 - D_ 1 - E_ 2 - E_ 2 - E_ 2 - C# 1 - D_ 1 - E_ 2 - E_ 2 - F# 1 - E_ 1 - E_ 1 - F# 1 - D_ 4 - F# 2 - endchannel + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note D_, 4 + note F#, 2 + sound_ret Music_Routes1_branch_9c8d:: - C# 1 - D_ 1 - E_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - notetype 12, 13, 2 - B_ 4 - notetype 6, 13, 1 + note C#, 2 + note_type 12, 13, 2 + note B_, 4 + note_type 6, 13, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - notetype 12, 13, 1 + note C#, 1 + note_type 12, 13, 1 octave 3 - B_ 1 - A_ 1 - octave 4 - C# 1 - D_ 6 - notetype 12, 13, 2 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - D_ 2 + note B_, 1 + note A_, 1 + octave 4 + note C#, 1 + note D_, 6 + note_type 12, 13, 2 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 octave 5 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - octave 4 - A_ 2 - F# 2 - D_ 3 - F# 1 - E_ 6 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - A_ 2 + note C#, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 3 + note F#, 1 + note E_, 6 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 octave 5 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 4 - B_ 3 - G_ 1 - A_ 2 + note B_, 3 + note G_, 1 + note A_, 2 octave 5 - D_ 2 - C# 2 - E_ 2 - D_ 2 - notetype 12, 13, 1 - octave 4 - D_ 2 - D_ 2 - endchannel - endchannel + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note_type 12, 13, 1 + octave 4 + note D_, 2 + note D_, 2 + sound_ret + sound_ret -Music_Routes1_Ch2:: +Music_Routes1_Ch3:: vibrato 8, 2, 5 - notetype 12, 1, 3 + note_type 12, 1, 3 Music_Routes1_branch_9cdd:: rest 2 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 - C# 4 + note C_, 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - C# 8 - D_ 8 + note C#, 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - D_ 6 - loopchannel 0, Music_Routes1_branch_9cdd - endchannel + note D_, 6 + sound_loop 0, Music_Routes1_branch_9cdd + sound_ret -Music_Routes1_Ch3:: +Music_Routes1_Ch4:: dspeed 12 rest 4 mutedsnare1 2 @@ -400,5 +400,5 @@ Music_Routes1_Ch3:: rest 2 mutedsnare1 2 mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch3 - endchannel + sound_loop 0, Music_Routes1_Ch4 + sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index ae5b22d1..0115466e 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,330 +1,330 @@ -Music_Routes2_Ch0:: +Music_Routes2_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 - duty 1 + duty_cycle 1 Music_Routes2_branch_9dc3:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - B_ 4 - octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - E_ 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - F# 4 + note E_, 2 + note A_, 2 + note G#, 4 + note F#, 4 octave 2 - B_ 4 - octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - B_ 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note B_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - B_ 4 - notetype 8, 11, 2 + note E_, 2 + note A_, 2 + note G#, 4 + note B_, 4 + note_type 8, 11, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - D# 2 + note E_, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - D# 2 + note D#, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 - octave 3 - B_ 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - G# 2 - A_ 2 - A_ 2 - F# 2 - A_ 2 - G# 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - A_ 2 - B_ 2 - A_ 2 + note C#, 2 + octave 3 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 + note C#, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - loopchannel 0, Music_Routes2_branch_9dc3 - endchannel + note E_, 2 + sound_loop 0, Music_Routes2_branch_9dc3 + sound_ret -Music_Routes2_Ch1:: +Music_Routes2_Ch2:: vibrato 8, 2, 6 - duty 3 + duty_cycle 3 Music_Routes2_branch_9e54:: - notetype 12, 13, 4 + note_type 12, 13, 4 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - F# 8 - octave 3 - D# 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 + octave 3 + note D#, 4 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - B_ 8 - octave 3 - G# 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 + octave 3 + note G#, 4 octave 5 - C# 6 + note C#, 6 octave 4 - B_ 1 - A_ 1 - B_ 6 - A_ 1 - G# 1 - A_ 6 - G# 1 - F# 1 - G# 4 - F# 2 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F# 8 - A_ 4 - G# 3 - F# 1 - E_ 8 - F# 2 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F# 2 - F# 1 - G# 1 - A_ 4 + note B_, 1 + note A_, 1 + note B_, 6 + note A_, 1 + note G#, 1 + note A_, 6 + note G#, 1 + note F#, 1 + note G#, 4 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 8 + note A_, 4 + note G#, 3 + note F#, 1 + note E_, 8 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 octave 5 - C# 4 + note C#, 4 octave 4 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 rest 4 - loopchannel 0, Music_Routes2_branch_9e54 - endchannel + sound_loop 0, Music_Routes2_branch_9e54 + sound_ret -Music_Routes2_Ch2:: +Music_Routes2_Ch3:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: - notetype 12, 1, 1 + note_type 12, 1, 1 octave 3 - E_ 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - A_ 2 + note A_, 2 octave 3 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 rest 2 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 - F# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 rest 2 octave 2 - A_ 2 + note A_, 2 rest 2 octave 3 - D# 2 + note D#, 2 rest 2 octave 2 - G# 2 + note G#, 2 rest 2 octave 3 - C# 2 + note C#, 2 rest 2 octave 2 - F# 2 + note F#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - E_ 2 - G# 2 - F# 2 + note E_, 2 + note G#, 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 octave 3 - C# 2 + note C#, 2 rest 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 rest 2 octave 3 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - loopchannel 0, Music_Routes2_branch_9e9e - endchannel + sound_loop 0, Music_Routes2_branch_9e9e + sound_ret -Music_Routes2_Ch3:: +Music_Routes2_Ch4:: dspeed 12 snare3 2 rest 2 @@ -421,5 +421,5 @@ Music_Routes2_Ch3:: rest 3 snare3 3 rest 3 - loopchannel 0, Music_Routes2_Ch3 - endchannel + sound_loop 0, Music_Routes2_Ch4 + sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index b384308b..96aa2625 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,360 +1,360 @@ -Music_Routes3_Ch0:: +Music_Routes3_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - E_ 1 - F# 1 - G_ 6 - F_ 1 - G_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G_, 6 + note F_, 1 + note G_, 1 + note E_, 1 rest 16 rest 15 Music_Routes3_branch_9fc3:: - notetype 12, 11, 5 - E_ 6 - D_ 1 - E_ 1 - C_ 4 - E_ 4 - C_ 6 - D_ 1 - E_ 1 - F_ 2 - G_ 2 - G_ 2 - A_ 2 - notetype 12, 10, 7 - A# 8 - F_ 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - E_ 6 - D_ 1 - E_ 1 - C_ 4 - E_ 4 - C_ 6 - D_ 1 - E_ 1 - F_ 2 - G_ 2 - G_ 2 - A_ 2 - notetype 12, 10, 7 - A# 8 - A# 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - E_ 4 - E_ 2 - F_ 2 - G_ 4 - F_ 2 - E_ 2 - B_ 2 + note_type 12, 11, 5 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 7 + note A#, 8 + note F_, 8 + note D_, 8 + note F_, 8 + note_type 12, 11, 5 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 7 + note A#, 8 + note A#, 8 + note D_, 8 + note F_, 8 + note_type 12, 11, 5 + note E_, 4 + note E_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note B_, 2 octave 2 - G_ 4 + note G_, 4 octave 3 - B_ 8 - A_ 2 - notetype 8, 12, 3 - A_ 4 - F_ 4 - A_ 4 - notetype 8, 4, 15 - A_ 12 - notetype 8, 9, 0 - F_ 12 - G_ 12 - loopchannel 0, Music_Routes3_branch_9fc3 + note B_, 8 + note A_, 2 + note_type 8, 12, 3 + note A_, 4 + note F_, 4 + note A_, 4 + note_type 8, 4, 15 + note A_, 12 + note_type 8, 9, 0 + note F_, 12 + note G_, 12 + sound_loop 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch1:: +Music_Routes3_Ch2:: vibrato 8, 2, 3 - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - G_ 1 - A# 1 - B_ 6 - A_ 1 - B_ 1 + note G_, 1 + note A#, 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 rest 15 rest 16 Music_Routes3_branch_a01a:: - notetype 12, 12, 7 - duty 2 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 - A_ 8 - notetype 12, 12, 7 - duty 2 + note A#, 8 + note A_, 8 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 + note A#, 8 octave 4 - D_ 6 - notetype 12, 12, 7 - duty 2 - C_ 1 - D_ 1 - E_ 2 - D_ 2 - E_ 2 - C_ 8 + note D_, 6 + note_type 12, 12, 7 + duty_cycle 2 + note C_, 1 + note D_, 1 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 8 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 2 + note C_, 1 + note D_, 2 octave 3 - G_ 4 + note G_, 4 octave 4 - G_ 8 - F_ 1 - E_ 1 - notetype 8, 13, 3 - F_ 4 - E_ 4 - notetype 8, 12, 4 - C_ 4 - notetype 8, 12, 5 - C_ 12 - notetype 12, 10, 0 - duty 3 + note G_, 8 + note F_, 1 + note E_, 1 + note_type 8, 13, 3 + note F_, 4 + note E_, 4 + note_type 8, 12, 4 + note C_, 4 + note_type 8, 12, 5 + note C_, 12 + note_type 12, 10, 0 + duty_cycle 3 octave 3 - A_ 8 - B_ 8 - loopchannel 0, Music_Routes3_branch_a01a + note A_, 8 + note B_, 8 + sound_loop 0, Music_Routes3_branch_a01a -Music_Routes3_Ch2:: +Music_Routes3_Ch3:: vibrato 4, 1, 0 - notetype 6, 1, 2 + note_type 6, 1, 2 octave 4 - G_ 2 - A# 2 - B_ 8 - A_ 8 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 8 + note A_, 8 + note G_, 2 rest 2 - G_ 7 + note G_, 7 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - G_ 8 - G_ 2 + note G_, 8 + note G_, 2 rest 2 - G_ 7 + note G_, 7 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - G_ 8 + note G_, 8 Music_Routes3_branch_a0a3:: - notetype 12, 1, 2 - E_ 1 + note_type 12, 1, 2 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 4 - E_ 1 + note G_, 4 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 2 - A_ 2 - F_ 1 + note G_, 2 + note A_, 2 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 4 - F_ 1 + note A#, 4 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 2 - F_ 2 - E_ 1 + note A#, 2 + note F_, 2 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 4 - E_ 1 + note G_, 4 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 2 - A_ 2 - F_ 1 + note G_, 2 + note A_, 2 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 4 - F_ 1 + note A#, 4 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 2 - A_ 2 - G_ 1 + note A#, 2 + note A_, 2 + note G_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 4 + note D_, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - F_ 1 - F_ 1 - F_ 1 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - F_ 1 + note F_, 1 rest 1 - A_ 4 - F_ 1 - F_ 1 - F_ 1 + note A_, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 4 - loopchannel 0, Music_Routes3_branch_a0a3 + note A_, 4 + sound_loop 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch3:: +Music_Routes3_Ch4:: dspeed 6 mutedsnare4 1 mutedsnare4 1 @@ -512,4 +512,4 @@ Music_Routes3_branch_a17a:: mutedsnare3 1 mutedsnare3 1 mutedsnare3 1 - loopchannel 0, Music_Routes3_branch_a17a + sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index a9149f05..39f2ea89 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,512 +1,512 @@ -Music_Routes4_Ch0:: +Music_Routes4_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 3, 4 - toggleperfectpitch - notetype 12, 10, 2 + toggle_perfect_pitch + note_type 12, 10, 2 octave 2 - G# 4 - G# 4 - G# 4 - notetype 12, 7, 15 - G# 4 - notetype 12, 10, 2 - G# 4 - G# 4 - G# 4 - notetype 12, 11, 7 - B_ 1 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 7, 15 + note G#, 4 + note_type 12, 10, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 11, 7 + note B_, 1 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 Music_Routes4_branch_a28a:: - notetype 12, 11, 7 - B_ 6 - E_ 2 - E_ 4 + note_type 12, 11, 7 + note B_, 6 + note E_, 2 + note E_, 4 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - notetype 12, 11, 1 - G# 3 - notetype 12, 11, 7 - E_ 1 - F# 12 - E_ 8 - D# 4 - F# 4 - B_ 6 - E_ 2 - E_ 4 + note B_, 4 + note A_, 4 + note_type 12, 11, 1 + note G#, 3 + note_type 12, 11, 7 + note E_, 1 + note F#, 12 + note E_, 8 + note D#, 4 + note F#, 4 + note B_, 6 + note E_, 2 + note E_, 4 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 - notetype 12, 11, 1 - E_ 3 - notetype 12, 11, 7 - D# 1 - E_ 12 + note C#, 4 + note_type 12, 11, 1 + note E_, 3 + note_type 12, 11, 7 + note D#, 1 + note E_, 12 octave 3 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 octave 4 - E_ 4 + note E_, 4 octave 3 - D_ 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - D_ 2 + note C#, 2 + note D_, 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - F# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note A_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - D# 2 - E_ 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - notetype 8, 11, 5 - A_ 4 - G# 4 - F# 4 + note B_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note_type 8, 11, 5 + note A_, 4 + note G#, 4 + note F#, 4 octave 4 - E_ 4 - D# 4 - C# 4 - C# 4 + note E_, 4 + note D#, 4 + note C#, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 - D# 4 + note C#, 4 + note D#, 4 octave 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - B_ 4 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 4 octave 4 - C# 4 - D# 4 - E_ 3 + note C#, 4 + note D#, 4 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - loopchannel 0, Music_Routes4_branch_a28a + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + sound_loop 0, Music_Routes4_branch_a28a -Music_Routes4_Ch1:: +Music_Routes4_Ch2:: vibrato 12, 2, 4 - duty 1 - notetype 12, 9, 2 + duty_cycle 1 + note_type 12, 9, 2 octave 3 - E_ 3 - F# 1 - notetype 12, 9, 0 - E_ 12 - notetype 12, 9, 2 + note E_, 3 + note F#, 1 + note_type 12, 9, 0 + note E_, 12 + note_type 12, 9, 2 octave 2 - B_ 3 + note B_, 3 octave 3 - C_ 1 - notetype 12, 9, 0 + note C_, 1 + note_type 12, 9, 0 octave 2 - B_ 8 - duty 3 - notetype 12, 12, 7 + note B_, 8 + duty_cycle 3 + note_type 12, 12, 7 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 + note D#, 1 Music_Routes4_branch_a325:: - notetype 12, 12, 7 - E_ 6 + note_type 12, 12, 7 + note E_, 6 octave 3 - B_ 2 - B_ 4 + note B_, 2 + note B_, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - F# 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - G# 3 - E_ 1 - notetype 12, 10, 0 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note_type 12, 12, 2 + note G#, 3 + note E_, 1 + note_type 12, 10, 0 octave 3 - B_ 12 - duty 0 - notetype 12, 12, 2 + note B_, 12 + duty_cycle 0 + note_type 12, 12, 2 octave 2 - B_ 3 - notetype 12, 12, 7 + note B_, 3 + note_type 12, 12, 7 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 8 + note B_, 8 octave 3 - D# 4 - duty 3 + note D#, 4 + duty_cycle 3 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 - B_ 4 + note B_, 2 + note B_, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - A_ 1 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 1 octave 5 - C# 1 + note C#, 1 octave 4 - B_ 1 - A_ 1 - notetype 12, 12, 2 - B_ 3 - notetype 12, 12, 7 - A_ 1 - notetype 12, 11, 0 - G# 6 - notetype 12, 9, 0 - G# 6 - notetype 12, 7, 0 - G# 6 - notetype 12, 6, 15 - G# 6 - notetype 12, 12, 7 - G# 4 - notetype 8, 12, 3 - A_ 4 - G# 4 - F# 4 - notetype 8, 9, 0 - F# 6 - notetype 8, 7, 15 - F# 6 - duty 0 - notetype 8, 9, 0 + note B_, 1 + note A_, 1 + note_type 12, 12, 2 + note B_, 3 + note_type 12, 12, 7 + note A_, 1 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 9, 0 + note G#, 6 + note_type 12, 7, 0 + note G#, 6 + note_type 12, 6, 15 + note G#, 6 + note_type 12, 12, 7 + note G#, 4 + note_type 8, 12, 3 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 8, 9, 0 + note F#, 6 + note_type 8, 7, 15 + note F#, 6 + duty_cycle 0 + note_type 8, 9, 0 octave 3 - F# 4 - E_ 4 - F# 4 - A_ 6 - duty 3 - notetype 8, 12, 7 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 6 + duty_cycle 3 + note_type 8, 12, 7 octave 4 - F# 6 - G# 4 - F# 4 - notetype 8, 12, 4 - E_ 4 - notetype 8, 10, 0 - E_ 12 - duty 0 - notetype 8, 9, 0 + note F#, 6 + note G#, 4 + note F#, 4 + note_type 8, 12, 4 + note E_, 4 + note_type 8, 10, 0 + note E_, 12 + duty_cycle 0 + note_type 8, 9, 0 octave 3 - E_ 4 - D# 4 - E_ 4 - G# 6 - duty 3 - notetype 8, 12, 7 + note E_, 4 + note D#, 4 + note E_, 4 + note G#, 6 + duty_cycle 3 + note_type 8, 12, 7 octave 4 - E_ 6 - F# 4 - D# 4 + note E_, 6 + note F#, 4 + note D#, 4 octave 3 - B_ 4 - notetype 8, 10, 0 + note B_, 4 + note_type 8, 10, 0 octave 4 - B_ 16 - notetype 8, 10, 7 - B_ 8 - notetype 8, 11, 0 - A_ 6 - notetype 8, 11, 7 - A_ 6 - notetype 12, 10, 7 - G# 1 - F# 1 - notetype 12, 11, 0 - E_ 12 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 10 - loopchannel 0, Music_Routes4_branch_a325 + note B_, 16 + note_type 8, 10, 7 + note B_, 8 + note_type 8, 11, 0 + note A_, 6 + note_type 8, 11, 7 + note A_, 6 + note_type 12, 10, 7 + note G#, 1 + note F#, 1 + note_type 12, 11, 0 + note E_, 12 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 10 + sound_loop 0, Music_Routes4_branch_a325 -Music_Routes4_Ch2:: - notetype 12, 1, 0 +Music_Routes4_Ch3:: + note_type 12, 1, 0 octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 Music_Routes4_branch_a3d7:: - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 3 - D_ 1 - D_ 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_Routes4_branch_a3d7 + sound_loop 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch3:: +Music_Routes4_Ch4:: dspeed 12 rest 16 rest 12 @@ -678,4 +678,4 @@ Music_Routes4_branch_a4a8:: mutedsnare2 2 mutedsnare2 2 mutedsnare2 2 - loopchannel 0, Music_Routes4_branch_a4a8 + sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index e2853646..083d077a 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,111 +1,111 @@ -Music_SafariZone_Ch0:: +Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 - toggleperfectpitch - duty 2 - notetype 12, 9, 2 + toggle_perfect_pitch + duty_cycle 2 + note_type 12, 9, 2 octave 3 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 + pitch_slide 0, 73 + note C_, 1 + pitch_slide 0, 73 + note G_, 1 + pitch_slide 0, 73 + note C_, 1 + pitch_slide 0, 73 + note G_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc4f:: - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - loopchannel 0, Music_SafariZone_branch_bc4f + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_loop 0, Music_SafariZone_branch_bc4f Music_SafariZone_branch_bc5f:: - notetype 12, 10, 2 + note_type 12, 10, 2 octave 3 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - endchannel + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + sound_ret -Music_SafariZone_Ch1:: - duty 2 +Music_SafariZone_Ch2:: + duty_cycle 2 vibrato 8, 2, 5 - notetype 12, 10, 2 + note_type 12, 10, 2 octave 4 - G_ 1 - D_ 1 - G_ 1 - D_ 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc79:: - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - A_ 4 - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc79 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note A_, 4 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc79 Music_SafariZone_branch_bc89:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - endchannel + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + sound_ret -Music_SafariZone_Ch2:: - notetype 12, 1, 0 +Music_SafariZone_Ch3:: + note_type 12, 1, 0 rest 8 Music_SafariZone_branch_bc97:: - callchannel Music_SafariZone_branch_bca5 + sound_call Music_SafariZone_branch_bca5 octave 4 - A_ 4 - callchannel Music_SafariZone_branch_bca5 + note A_, 4 + sound_call Music_SafariZone_branch_bca5 octave 4 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc97 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 3e1ff3fc..58af9209 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,323 +1,323 @@ -Music_SilphCo_Ch0:: +Music_SilphCo_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 2, 2 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - E_ 1 - F# 1 - G# 1 - A# 1 - octave 3 - C_ 1 - notetype 6, 10, 0 - C_ 12 - notetype 6, 11, 3 - C_ 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + note_type 6, 10, 0 + note C_, 12 + note_type 6, 11, 3 + note C_, 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 Music_SilphCo_branch_7f26d:: - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 octave 3 - C_ 2 + note C_, 2 rest 2 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 10 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 6, 10, 0 - B_ 12 - notetype 6, 11, 3 - B_ 1 - A_ 1 - G_ 1 - F_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 6, 10, 0 + note B_, 12 + note_type 6, 11, 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 - octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 + octave 3 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - A_ 1 - G_ 1 - F_ 1 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 rest 11 - F# 1 - B_ 1 - octave 3 - C_ 1 - C# 1 - notetype 6, 10, 0 - D_ 12 - notetype 6, 11, 3 - D_ 1 - C_ 1 + note F#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note_type 6, 10, 0 + note D_, 12 + note_type 6, 11, 3 + note D_, 1 + note C_, 1 octave 2 - A# 1 - G_ 1 - F_ 1 + note A#, 1 + note G_, 1 + note F_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 - octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 + octave 3 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - G# 1 - F_ 1 - E_ 1 + note B_, 1 + note G#, 1 + note F_, 1 + note E_, 1 rest 7 - notetype 6, 8, 0 - B_ 16 - notetype 6, 11, 0 + note_type 6, 8, 0 + note B_, 16 + note_type 6, 11, 0 octave 3 - E_ 8 + note E_, 8 tempo 124 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 16 rest 6 - A_ 2 + note A_, 2 rest 6 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - A_ 2 - A# 2 - B_ 2 - A# 2 - callchannel Music_SilphCo_branch_7f3f0 - callchannel Music_SilphCo_branch_7f3f0 - callchannel Music_SilphCo_branch_7f3f0 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 rest 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - E_ 2 + note E_, 2 rest 6 - E_ 2 + note E_, 2 rest 6 - D# 2 + note D#, 2 rest 6 - D# 2 + note D#, 2 rest 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 6, 0 - E_ 16 - E_ 11 - notetype 6, 11, 3 - E_ 1 - F# 1 - G# 1 - A# 1 - octave 3 - C_ 1 - notetype 6, 3, 15 - C_ 16 - notetype 6, 10, 0 - C_ 11 - notetype 6, 9, 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 6, 0 + note E_, 16 + note E_, 11 + note_type 6, 11, 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + note_type 6, 3, 15 + note C_, 16 + note_type 6, 10, 0 + note C_, 11 + note_type 6, 9, 3 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 3, 15 - E_ 16 - notetype 6, 9, 0 - E_ 11 - notetype 6, 11, 3 - F_ 1 - G_ 1 - A# 1 - octave 3 - C_ 1 - D_ 1 - notetype 6, 3, 15 - D_ 16 - notetype 6, 10, 7 - D_ 11 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 3, 15 + note E_, 16 + note_type 6, 9, 0 + note E_, 11 + note_type 6, 11, 3 + note F_, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note_type 6, 3, 15 + note D_, 16 + note_type 6, 10, 7 + note D_, 11 rest 4 rest 4 tempo 128 @@ -344,633 +344,633 @@ Music_SilphCo_branch_7f26d:: rest 4 tempo 160 rest 4 - notetype 6, 4, 3 + note_type 6, 4, 3 octave 2 - B_ 2 + note B_, 2 rest 6 - notetype 6, 6, 3 - B_ 2 + note_type 6, 6, 3 + note B_, 2 rest 6 - notetype 6, 8, 3 - B_ 2 + note_type 6, 8, 3 + note B_, 2 rest 6 - notetype 6, 5, 0 - B_ 8 - notetype 6, 11, 3 - B_ 2 + note_type 6, 5, 0 + note B_, 8 + note_type 6, 11, 3 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f26d + sound_loop 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 - endchannel + note C_, 2 + sound_ret -Music_SilphCo_Ch1:: +Music_SilphCo_Ch2:: vibrato 10, 3, 2 - duty 3 - notetype 6, 12, 3 + duty_cycle 3 + note_type 6, 12, 3 octave 3 - E_ 1 - F# 1 - G# 1 - A# 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 4 - C_ 1 - notetype 6, 11, 0 - C_ 12 - notetype 6, 12, 3 - C_ 2 - octave 3 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note C_, 1 + note_type 6, 11, 0 + note C_, 12 + note_type 6, 12, 3 + note C_, 2 + octave 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 octave 2 - G_ 2 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 Music_SilphCo_branch_7f42e:: - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 2 - notetype 6, 11, 7 - duty 2 + note_type 6, 11, 7 + duty_cycle 2 octave 4 - E_ 8 - D# 8 - E_ 8 - F_ 8 - E_ 8 - D# 8 - D_ 8 - D# 8 - E_ 8 - F_ 8 - F# 8 - G_ 8 - G# 8 - D# 8 - D_ 8 - D# 8 - duty 3 - notetype 6, 6, 15 - E_ 16 - notetype 6, 12, 0 - B_ 16 - notetype 6, 12, 4 - octave 3 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 + note E_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note E_, 8 + note D#, 8 + note D_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note G#, 8 + note D#, 8 + note D_, 8 + note D#, 8 + duty_cycle 3 + note_type 6, 6, 15 + note E_, 16 + note_type 6, 12, 0 + note B_, 16 + note_type 6, 12, 4 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 octave 4 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - notetype 6, 12, 4 - duty 3 - octave 3 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - D# 4 - E_ 4 - notetype 6, 12, 0 - F_ 8 - notetype 6, 11, 7 - F_ 8 - notetype 6, 8, 10 - F_ 4 - notetype 6, 12, 4 - duty 3 - F_ 4 - E_ 4 - F_ 4 - notetype 6, 10, 0 - F# 8 - notetype 6, 11, 0 - F# 8 - notetype 6, 9, 9 - F# 4 - notetype 6, 12, 4 - F# 4 - F_ 4 - F# 4 - notetype 6, 9, 0 - G_ 12 - notetype 6, 5, 9 - G_ 8 - notetype 6, 12, 4 - G_ 4 - F# 4 - G_ 4 - F# 4 - F_ 4 - F# 4 - F_ 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - C# 4 - D_ 4 - D# 4 - D_ 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - A_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - A# 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - B_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note_type 6, 12, 4 + duty_cycle 3 + octave 3 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note_type 6, 12, 0 + note F_, 8 + note_type 6, 11, 7 + note F_, 8 + note_type 6, 8, 10 + note F_, 4 + note_type 6, 12, 4 + duty_cycle 3 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 6, 10, 0 + note F#, 8 + note_type 6, 11, 0 + note F#, 8 + note_type 6, 9, 9 + note F#, 4 + note_type 6, 12, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 6, 9, 0 + note G_, 12 + note_type 6, 5, 9 + note G_, 8 + note_type 6, 12, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note D#, 4 + note D_, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note B_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 octave 4 - C_ 4 - notetype 6, 11, 4 - duty 3 + note C_, 4 + note_type 6, 11, 4 + duty_cycle 3 octave 3 - D# 4 - D_ 4 - D# 4 + note D#, 4 + note D_, 4 + note D#, 4 rest 4 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 2 - duty 0 + duty_cycle 0 octave 4 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - duty 3 + duty_cycle 3 octave 3 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 2 - duty 0 + duty_cycle 0 octave 4 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - duty 3 + duty_cycle 3 octave 3 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - notetype 6, 8, 7 + note_type 6, 8, 7 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - rest 4 - notetype 6, 4, 3 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + rest 4 + note_type 6, 4, 3 octave 2 - G_ 2 + note G_, 2 rest 6 - notetype 6, 6, 3 - F# 2 + note_type 6, 6, 3 + note F#, 2 rest 6 - notetype 6, 8, 3 - G_ 2 + note_type 6, 8, 3 + note G_, 2 rest 6 - notetype 6, 4, 15 - G# 8 - notetype 6, 11, 4 - G_ 2 + note_type 6, 4, 15 + note G#, 8 + note_type 6, 11, 4 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f42e + sound_loop 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch2:: +Music_SilphCo_Ch3:: vibrato 8, 1, 1 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 12 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 Music_SilphCo_branch_7f5c9:: - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - E_ 1 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D_ 8 - F_ 8 - D_ 8 - F# 8 - D_ 8 - G_ 8 - D_ 8 - A_ 8 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note D_, 8 + note F_, 8 + note D_, 8 + note F#, 8 + note D_, 8 + note G_, 8 + note D_, 8 + note A_, 8 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 octave 5 - E_ 2 - D# 2 - E_ 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 4 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 octave 5 - E_ 2 - F_ 2 - F# 2 - G_ 2 - G# 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 6 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - notetype 6, 1, 1 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 1, 1 rest 4 rest 4 rest 4 @@ -987,14 +987,14 @@ Music_SilphCo_branch_7f5c9:: rest 4 rest 4 rest 4 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 4 rest 4 rest 4 rest 4 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 - loopchannel 0, Music_SilphCo_branch_7f5c9 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + sound_loop 0, Music_SilphCo_branch_7f5c9 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 1356c8b1..4dae83bc 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,338 +1,338 @@ -Music_SSAnne_Ch0:: +Music_SSAnne_Ch1:: tempo 128 volume 7, 7 - duty 1 + duty_cycle 1 vibrato 8, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_SSAnne_branch_b3b2:: - notetype 12, 10, 4 + note_type 12, 10, 4 rest 12 octave 3 - E_ 2 - F# 2 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 rest 4 - E_ 4 - G# 4 + note E_, 4 + note G#, 4 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 4 - E_ 4 - F# 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 4 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 8 - G# 4 - E_ 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 8 + note G#, 4 + note E_, 4 rest 4 - E_ 4 - F# 2 - E_ 2 - D_ 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D_, 4 rest 4 - D_ 4 - E_ 4 - C# 4 + note D_, 4 + note E_, 4 + note C#, 4 rest 4 - C# 4 - D_ 2 - C# 2 + note C#, 4 + note D_, 2 + note C#, 2 octave 2 - B_ 4 - E_ 4 - B_ 4 + note B_, 4 + note E_, 4 + note B_, 4 octave 3 - D_ 2 + note D_, 2 octave 2 - B_ 2 - A_ 4 + note B_, 2 + note A_, 4 rest 4 - A_ 4 - B_ 2 - A_ 2 - G# 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 4 rest 4 - C# 4 - G# 4 - A_ 4 + note C#, 4 + note G#, 4 + note A_, 4 rest 4 - A_ 4 - B_ 4 - B_ 4 + note A_, 4 + note B_, 4 + note B_, 4 rest 4 octave 3 - D_ 8 - loopchannel 0, Music_SSAnne_branch_b3b2 + note D_, 8 + sound_loop 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch1:: - duty 0 +Music_SSAnne_Ch2:: + duty_cycle 0 vibrato 12, 2, 4 Music_SSAnne_branch_b41e:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - A_ 2 - E_ 2 - A_ 4 - B_ 4 + note A_, 2 + note E_, 2 + note A_, 4 + note B_, 4 octave 4 - D_ 4 - notetype 8, 12, 5 - C# 2 - D_ 2 - C# 2 + note D_, 4 + note_type 8, 12, 5 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 - E_ 3 - A_ 6 - B_ 6 + note B_, 3 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 12 - A_ 3 - E_ 3 - A_ 6 - B_ 6 + note B_, 12 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 12 + note B_, 12 rest 3 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - C# 3 - C# 3 - D_ 3 - C# 3 - D_ 3 - E_ 3 + note C#, 3 + note C#, 3 + note D_, 3 + note C#, 3 + note D_, 3 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - B_ 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 rest 3 - A_ 3 - G# 3 - A_ 3 - A_ 3 - B_ 3 - A_ 3 - B_ 3 + note A_, 3 + note G#, 3 + note A_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - G# 3 - F# 3 - E_ 3 - E_ 3 - F# 3 - G# 3 - B_ 3 + note G#, 3 + note F#, 3 + note E_, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - F# 3 - G# 3 - A_ 3 - E_ 3 - C# 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note E_, 3 + note C#, 3 octave 2 - B_ 3 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 3 octave 3 - C# 3 - E_ 3 + note C#, 3 + note E_, 3 rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - A_ 3 - B_ 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 3 octave 4 - C# 3 - D_ 3 - C# 3 + note C#, 3 + note D_, 3 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - D_ 3 - C# 3 + note E_, 3 + note D_, 3 + note C#, 3 octave 3 - B_ 3 - loopchannel 0, Music_SSAnne_branch_b41e + note B_, 3 + sound_loop 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch2:: - notetype 12, 1, 3 +Music_SSAnne_Ch3:: + note_type 12, 1, 3 rest 16 rest 12 octave 4 - B_ 2 - G# 2 - A_ 8 - F# 8 - G# 4 + note B_, 2 + note G#, 2 + note A_, 8 + note F#, 8 + note G#, 4 rest 4 - B_ 8 - A_ 8 - B_ 8 - A_ 8 - G# 8 - A_ 8 - F# 8 - G# 8 - B_ 8 - A_ 4 - E_ 4 - B_ 4 - E_ 4 - A_ 4 - E_ 4 - G# 4 - E_ 4 - A_ 4 - E_ 4 - F# 4 - G_ 4 - G# 4 - A_ 4 + note B_, 8 + note A_, 8 + note B_, 8 + note A_, 8 + note G#, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note B_, 8 + note A_, 4 + note E_, 4 + note B_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note G#, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 octave 5 - D_ 8 - C# 8 - C# 8 + note D_, 8 + note C#, 8 + note C#, 8 octave 4 - B_ 8 - B_ 8 - A_ 8 - A_ 8 - G# 8 - G# 8 - F# 8 - F# 8 - E_ 8 - E_ 8 - F# 8 - F# 8 - G# 8 - B_ 8 - loopchannel 0, Music_SSAnne_Ch2 + note B_, 8 + note B_, 8 + note A_, 8 + note A_, 8 + note G#, 8 + note G#, 8 + note F#, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + note F#, 8 + note G#, 8 + note B_, 8 + sound_loop 0, Music_SSAnne_Ch3 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index c4507a55..4765f391 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,335 +1,335 @@ -Music_Surfing_Ch0:: +Music_Surfing_Ch1:: tempo 160 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 rest 6 octave 2 - A_ 2 - G# 3 - F# 1 - E_ 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 octave 3 - G# 2 - F# 2 - G# 4 + note G#, 2 + note F#, 2 + note G#, 4 Music_Surfing_branch_7fa30:: - notetype 12, 11, 2 - E_ 2 - E_ 4 - E_ 2 - E_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - notetype 12, 11, 1 - F# 3 - notetype 12, 11, 2 - D_ 3 - E_ 2 - E_ 4 - E_ 2 - E_ 4 - A_ 2 - A_ 4 - G# 2 - G# 4 - F# 2 - F# 4 - E_ 2 - E_ 4 - G# 2 - G# 4 - notetype 12, 11, 1 - F# 3 - notetype 12, 11, 2 - G# 1 - notetype 12, 11, 4 - A_ 2 - B_ 2 + note_type 12, 11, 2 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note_type 12, 11, 1 + note F#, 3 + note_type 12, 11, 2 + note D_, 3 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 4 + note F#, 2 + note F#, 4 + note E_, 2 + note E_, 4 + note G#, 2 + note G#, 4 + note_type 12, 11, 1 + note F#, 3 + note_type 12, 11, 2 + note G#, 1 + note_type 12, 11, 4 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - notetype 12, 11, 7 - C# 6 - notetype 12, 11, 3 - D_ 2 - C# 2 + note C_, 2 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 11, 3 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - G# 2 - F# 2 - E_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - G# 2 - A_ 2 - E_ 2 - G# 2 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note B_, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 4 - loopchannel 0, Music_Surfing_branch_7fa30 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 4 + sound_loop 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch1:: - duty 3 +Music_Surfing_Ch2:: + duty_cycle 3 vibrato 16, 2, 5 - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - A_ 2 - G# 3 - F# 1 - E_ 6 - G# 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + note G#, 6 octave 4 - E_ 2 - D_ 2 + note E_, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 Music_Surfing_branch_7faae:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 4 - E_ 6 - C# 5 - E_ 1 - D_ 6 + note E_, 6 + note C#, 5 + note E_, 1 + note D_, 6 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 2 - notetype 12, 12, 1 + note B_, 2 + note_type 12, 12, 1 octave 4 - F# 3 - notetype 12, 12, 6 - D_ 1 - E_ 6 - C# 6 - E_ 6 - C# 5 - E_ 1 - F# 6 - D_ 6 - F# 6 - E_ 2 - notetype 12, 12, 1 - F# 3 - notetype 12, 12, 6 - E_ 1 - A_ 6 - A_ 6 - B_ 2 - A_ 3 - D_ 1 - F# 6 - E_ 2 - F# 3 - E_ 1 - C# 6 - D_ 2 - C# 3 + note F#, 3 + note_type 12, 12, 6 + note D_, 1 + note E_, 6 + note C#, 6 + note E_, 6 + note C#, 5 + note E_, 1 + note F#, 6 + note D_, 6 + note F#, 6 + note E_, 2 + note_type 12, 12, 1 + note F#, 3 + note_type 12, 12, 6 + note E_, 1 + note A_, 6 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note E_, 1 + note C#, 6 + note D_, 2 + note C#, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - F# 6 - E_ 2 - D# 3 - E_ 1 - A_ 6 - B_ 2 - A_ 3 - D_ 1 - F# 6 - E_ 2 - F# 3 - G# 1 - A_ 6 - G# 2 - F# 3 - E_ 1 - G# 6 - A_ 2 - G# 3 - A_ 1 + note F#, 6 + note E_, 2 + note D#, 3 + note E_, 1 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note G#, 1 + note A_, 6 + note G#, 2 + note F#, 3 + note E_, 1 + note G#, 6 + note A_, 2 + note G#, 3 + note A_, 1 octave 5 - C# 6 - loopchannel 0, Music_Surfing_branch_7faae + note C#, 6 + sound_loop 0, Music_Surfing_branch_7faae -Music_Surfing_Ch2:: - notetype 12, 1, 0 +Music_Surfing_Ch3:: + note_type 12, 1, 0 rest 12 octave 5 - E_ 6 + note E_, 6 octave 4 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 Music_Surfing_branch_7fb03:: octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 2 - E_ 1 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 2 - E_ 1 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - D_ 2 - E_ 2 - loopchannel 0, Music_Surfing_branch_7fb03 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + sound_loop 0, Music_Surfing_branch_7fb03 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 2d41b082..9483b20d 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,465 +1,465 @@ -Music_TitleScreen_Ch0:: +Music_TitleScreen_Ch1:: tempo 144 volume 7, 7 vibrato 9, 3, 4 - duty 3 - notetype 12, 12, 1 + duty_cycle 3 + note_type 12, 12, 1 octave 2 - E_ 1 - G_ 1 - B_ 1 + note E_, 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 octave 2 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 12, 1 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - F# 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + note_type 8, 12, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 Music_TitleScreen_branch_7e4e2:: - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call Music_TitleScreen_branch_7e541 octave 3 - C_ 8 - notetype 8, 12, 6 - E_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 6 + note C_, 8 + note_type 8, 12, 6 + note E_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 6 octave 2 - B_ 8 - notetype 8, 14, 7 + note B_, 8 + note_type 8, 14, 7 octave 3 - F_ 4 - E_ 4 - C_ 4 - notetype 12, 14, 7 - D_ 10 - notetype 12, 12, 6 + note F_, 4 + note E_, 4 + note C_, 4 + note_type 12, 14, 7 + note D_, 10 + note_type 12, 12, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - C_ 2 - D_ 2 - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 - C_ 6 - C_ 6 - E_ 4 - D_ 6 - F_ 2 - G_ 2 - D_ 4 - G_ 2 - G_ 6 - A_ 4 - F_ 2 - A_ 2 + note C_, 2 + note D_, 2 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call Music_TitleScreen_branch_7e541 + note C_, 6 + note C_, 6 + note E_, 4 + note D_, 6 + note F_, 2 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 6 + note A_, 4 + note F_, 2 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - D_ 12 - E_ 4 - F_ 8 - G_ 4 - F_ 4 - E_ 12 - F_ 4 - G_ 8 - notetype 12, 11, 6 + note D_, 12 + note E_, 4 + note F_, 8 + note G_, 4 + note F_, 4 + note E_, 12 + note F_, 4 + note G_, 8 + note_type 12, 11, 6 octave 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 4 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 2 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 2 octave 3 - E_ 4 - E_ 4 - C# 4 - loopchannel 0, Music_TitleScreen_branch_7e4e2 + note E_, 4 + note E_, 4 + note C#, 4 + sound_loop 0, Music_TitleScreen_branch_7e4e2 Music_TitleScreen_branch_7e541:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - D_ 6 + note D_, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 8 - endchannel + note D_, 8 + sound_ret Music_TitleScreen_branch_7e54a:: - C_ 6 - F_ 6 - C_ 4 - D_ 8 - notetype 12, 14, 7 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 8, 12, 6 - C_ 4 + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 8 + note_type 12, 14, 7 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 8, 12, 6 + note C_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C_ 4 - endchannel + note C_, 4 + sound_ret Music_TitleScreen_branch_7e55c:: - notetype 12, 12, 1 - D_ 1 + note_type 12, 12, 1 + note D_, 1 rest 1 octave 2 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - endchannel + note D_, 1 + note D_, 1 + sound_ret -Music_TitleScreen_Ch1:: +Music_TitleScreen_Ch2:: vibrato 16, 4, 6 - duty 1 - notetype 12, 14, 1 + duty_cycle 1 + note_type 12, 14, 1 octave 2 - G_ 1 - B_ 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 - F# 1 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 14, 1 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F# 2 + note D_, 1 + note F#, 1 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + note_type 8, 14, 1 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 Music_TitleScreen_branch_7e594:: vibrato 16, 4, 6 - callchannel Music_TitleScreen_branch_7e622 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 4 - F_ 4 - callchannel Music_TitleScreen_branch_7e62c + note A_, 4 + note F_, 4 + sound_call Music_TitleScreen_branch_7e62c octave 2 - A_ 8 - B_ 16 - callchannel Music_TitleScreen_branch_7e622 + note A_, 8 + note B_, 16 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 6 - F_ 2 - notetype 8, 14, 7 + note A_, 6 + note F_, 2 + note_type 8, 14, 7 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 - notetype 12, 14, 7 - D_ 8 - notetype 12, 9, 5 + note C_, 4 + note_type 12, 14, 7 + note D_, 8 + note_type 12, 9, 5 octave 2 - D_ 6 - D_ 1 - F# 1 - G_ 16 - callchannel Music_TitleScreen_branch_7e622 + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 2 - F_ 6 - callchannel Music_TitleScreen_branch_7e62c + note A_, 2 + note F_, 6 + sound_call Music_TitleScreen_branch_7e62c octave 3 - C_ 2 + note C_, 2 octave 2 - A_ 6 - B_ 6 - G_ 2 - F_ 8 - callchannel Music_TitleScreen_branch_7e622 - notetype 8, 9, 5 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + sound_call Music_TitleScreen_branch_7e622 + note_type 8, 9, 5 octave 2 - G_ 4 - F_ 5 - A_ 3 - notetype 8, 14, 6 + note G_, 4 + note F_, 5 + note A_, 3 + note_type 8, 14, 6 octave 4 - F_ 4 - E_ 4 - F_ 4 - notetype 12, 14, 7 - G_ 6 - A# 2 - G_ 8 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 12, 14, 7 + note G_, 6 + note A#, 2 + note G_, 8 vibrato 16, 2, 6 - duty 3 - notetype 12, 0, 11 - G_ 8 - notetype 12, 14, 7 - A_ 8 - duty 1 - notetype 12, 14, 7 - A# 6 - F_ 2 - F_ 8 + duty_cycle 3 + note_type 12, 0, 11 + note G_, 8 + note_type 12, 14, 7 + note A_, 8 + duty_cycle 1 + note_type 12, 14, 7 + note A#, 6 + note F_, 2 + note F_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - A# 4 - B_ 4 + note A#, 4 + note B_, 4 octave 5 - C_ 6 + note C_, 6 octave 4 - G_ 2 - G_ 8 + note G_, 2 + note G_, 8 octave 3 - E_ 8 - notetype 12, 13, 7 + note E_, 8 + note_type 12, 13, 7 octave 5 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 - notetype 8, 14, 5 + note D_, 1 + note_type 8, 14, 5 octave 5 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 - D_ 1 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 + note D_, 1 rest 2 - D_ 1 + note D_, 1 rest 3 - D_ 1 - notetype 8, 14, 3 + note D_, 1 + note_type 8, 14, 3 octave 5 - C_ 4 - C_ 4 + note C_, 4 + note C_, 4 octave 4 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e594 + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e594 Music_TitleScreen_branch_7e622:: - notetype 12, 14, 7 + note_type 12, 14, 7 octave 3 - G_ 6 - B_ 2 + note G_, 6 + note B_, 2 octave 4 - D_ 8 - notetype 12, 9, 5 - endchannel + note D_, 8 + note_type 12, 9, 5 + sound_ret Music_TitleScreen_branch_7e62c:: - notetype 12, 14, 7 + note_type 12, 14, 7 octave 4 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 12, 9, 5 - endchannel + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 12, 9, 5 + sound_ret Music_TitleScreen_branch_7e636:: - notetype 12, 14, 1 - D_ 1 + note_type 12, 14, 1 + note D_, 1 rest 2 octave 4 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 - endchannel + note D_, 1 + sound_ret -Music_TitleScreen_Ch2:: - notetype 12, 1, 0 +Music_TitleScreen_Ch3:: + note_type 12, 1, 0 octave 3 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 5 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - notetype 8, 1, 0 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - A_ 2 + note_type 8, 1, 0 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note A_, 2 Music_TitleScreen_branch_7e65e:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6d0 Music_TitleScreen_branch_7e664:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 - loopchannel 3, Music_TitleScreen_branch_7e664 - callchannel Music_TitleScreen_branch_7e6c9 - G_ 6 - D_ 3 - A_ 6 - F_ 3 - A_ 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - A# 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - B_ 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6d0 + sound_loop 3, Music_TitleScreen_branch_7e664 + sound_call Music_TitleScreen_branch_7e6c9 + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note A#, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note B_, 3 + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc octave 4 - C_ 3 + note C_, 3 octave 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc octave 4 - C# 3 + note C#, 3 octave 3 - A_ 3 - callchannel Music_TitleScreen_branch_7e6e5 + note A_, 3 + sound_call Music_TitleScreen_branch_7e6e5 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 0, 66 + note D_, 4 rest 4 octave 6 - pitchbend 0, 50 - D_ 4 + pitch_slide 0, 50 + note D_, 4 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 0, 66 + note D_, 4 rest 2 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e6e5 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e6e5 octave 6 - pitchbend 0, 50 - D_ 4 + pitch_slide 0, 50 + note D_, 4 rest 4 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 0, 66 + note D_, 4 rest 6 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 + note C_, 4 + note C_, 4 octave 3 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e65e + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e65e Music_TitleScreen_branch_7e6c9:: - G_ 6 - D_ 3 - G_ 6 - D_ 3 - G_ 3 - D_ 3 - endchannel + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + sound_ret Music_TitleScreen_branch_7e6d0:: - F_ 6 - C_ 3 - F_ 6 - C_ 3 - F_ 3 - C_ 3 - endchannel + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + sound_ret Music_TitleScreen_branch_7e6d7:: - A# 6 - F_ 3 - A# 6 - F_ 3 - endchannel + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + sound_ret Music_TitleScreen_branch_7e6dc:: octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 3 + note G_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 3 - endchannel + note G_, 3 + sound_ret Music_TitleScreen_branch_7e6e5:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - D_ 1 + note D_, 1 rest 5 - endchannel + sound_ret -Music_TitleScreen_Ch3:: +Music_TitleScreen_Ch4:: dspeed 6 rest 4 snare3 1 @@ -497,8 +497,8 @@ Music_TitleScreen_branch_7e716:: snare2 1 snare3 1 rest 3 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e834 snare2 1 rest 3 snare2 1 @@ -509,7 +509,7 @@ Music_TitleScreen_branch_7e716:: rest 1 snare3 1 snare2 1 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -520,7 +520,7 @@ Music_TitleScreen_branch_7e716:: rest 1 snare2 1 rest 1 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -535,8 +535,8 @@ Music_TitleScreen_branch_7e716:: snare4 1 snare4 1 dspeed 12 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -555,8 +555,8 @@ Music_TitleScreen_branch_7e716:: rest 1 snare3 1 snare2 1 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 snare2 1 rest 3 snare2 1 @@ -652,7 +652,7 @@ Music_TitleScreen_branch_7e716:: snare2 4 snare3 4 snare2 4 - loopchannel 0, Music_TitleScreen_branch_7e716 + sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: snare2 1 @@ -663,7 +663,7 @@ Music_TitleScreen_branch_7e834:: snare3 1 snare2 1 rest 3 - endchannel + sound_ret Music_TitleScreen_branch_7e842:: snare2 1 @@ -674,4 +674,4 @@ Music_TitleScreen_branch_7e842:: snare2 1 snare2 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 5bd2c5f8..17e82ea9 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,1857 +1,1857 @@ -Music_TrainerBattle_Ch0:: +Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 rest 8 octave 3 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - C_ 1 - octave 2 - B_ 1 - octave 3 - C_ 1 - octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - A# 1 - octave 3 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 4 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 2 - C# 2 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 4 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 2 - C# 2 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 Music_TrainerBattle_branch_22962:: - notetype 12, 11, 5 - D_ 2 - E_ 4 - C# 2 - D_ 4 - octave 2 - B_ 4 - F# 4 - octave 3 - E_ 2 - D_ 4 - C# 2 - D_ 2 - E_ 2 - F_ 8 - notetype 12, 11, 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C_ 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C_ 1 - notetype 12, 11, 5 - D_ 2 - E_ 4 - C# 2 - D_ 4 - octave 2 - B_ 4 - F# 4 - octave 3 - E_ 2 - D_ 4 - C# 2 - octave 2 - B_ 2 - octave 3 - C# 2 - notetype 12, 10, 7 - D_ 8 - C# 8 - octave 2 - B_ 8 - octave 3 - C# 8 - notetype 12, 11, 5 - D_ 2 - C# 2 - octave 2 - B_ 2 - A_ 2 - G_ 2 + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 8 + note_type 12, 11, 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note_type 12, 10, 7 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + note_type 12, 11, 5 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - E_ 4 + note C#, 2 + note E_, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 - octave 2 - B_ 2 - A_ 2 - B_ 2 - G_ 2 - octave 3 - D_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - A_ 2 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 rest 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 2 - A_ 2 - E_ 2 - G_ 2 - F# 2 - octave 2 - B_ 1 - octave 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - octave 3 - A_ 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + octave 3 + note A_, 4 octave 4 - D_ 4 - octave 3 - A_ 2 - D_ 1 - E_ 1 - F# 1 - G_ 1 - G# 1 - A# 1 - B_ 2 + note D_, 4 + octave 3 + note A_, 2 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - B_ 2 - F_ 2 - G_ 2 - A_ 2 + note G_, 2 + note B_, 2 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C_ 2 - D_ 2 + note C_, 2 + note D_, 2 rest 2 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 3 - F_ 1 - G_ 1 - A_ 1 - B_ 1 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C_ 1 - D_ 1 - E_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 + note C_, 1 + note D_, 1 + note E_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 octave 3 - B_ 2 - C_ 2 + note B_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - C_ 2 + note D_, 2 + note F_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - D_ 16 - C_ 16 + note D_, 2 + note F_, 2 + note D_, 16 + note C_, 16 octave 2 - A# 16 - G_ 12 + note A#, 16 + note G_, 12 octave 3 - D_ 1 - E_ 1 - G_ 1 + note D_, 1 + note E_, 1 + note G_, 1 octave 4 - C_ 1 - D_ 8 - F_ 8 + note C_, 1 + note D_, 8 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C_ 8 - D_ 8 - E_ 8 - F_ 8 - G_ 8 - E_ 2 + note C_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note G_, 8 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 octave 3 - C_ 2 - D_ 4 + note C_, 2 + note D_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 4 + note C#, 4 rest 2 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 2 - B_ 1 + note B_, 1 rest 1 octave 3 - C# 1 + note C#, 1 rest 9 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 rest 5 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D_ 2 - E_ 2 - F_ 2 - G_ 2 - D# 1 - E_ 1 - F_ 1 - F# 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 rest 9 - F# 2 - E_ 4 - D# 2 - E_ 2 - F# 2 - G# 2 - E_ 8 - F# 8 - G_ 8 + note F#, 2 + note E_, 4 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note E_, 8 + note F#, 8 + note G_, 8 octave 4 - C_ 4 + note C_, 4 octave 3 - G_ 1 - G# 1 - A_ 1 - A# 1 - loopchannel 0, Music_TrainerBattle_branch_22962 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + sound_loop 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch1:: - duty 3 +Music_TrainerBattle_Ch2:: + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - A_ 1 - G# 1 - G_ 1 - F# 1 - A_ 1 - F_ 1 - F# 1 - F_ 1 - A_ 1 - E_ 1 - F_ 1 - E_ 1 - A_ 1 - D# 1 - E_ 1 - D# 1 - A_ 1 - D_ 1 - D# 1 - D_ 1 - A_ 1 - C# 1 - D_ 1 - C# 1 - A_ 1 - C_ 1 - C# 1 - C_ 1 - A_ 1 - octave 3 - B_ 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note A_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note A_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note A_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note A_, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note A_, 1 + octave 3 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - notetype 12, 14, 1 + note B_, 1 + note_type 12, 14, 1 octave 4 - B_ 16 + note B_, 16 rest 16 - notetype 12, 13, 1 - B_ 16 + note_type 12, 13, 1 + note B_, 16 rest 12 - A_ 4 - notetype 12, 12, 2 + note A_, 4 + note_type 12, 12, 2 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 6 - D_ 4 + note C#, 6 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 - D_ 6 - A_ 2 - A# 2 - B_ 6 + note C#, 4 + note D_, 6 + note A_, 2 + note A#, 2 + note B_, 6 octave 5 - C# 6 - D_ 4 + note C#, 6 + note D_, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 4 - D_ 6 + note C#, 4 + note D_, 6 octave 4 - A_ 4 + note A_, 4 Music_TrainerBattle_branch_22bfc:: - notetype 12, 12, 7 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 5, 0 + note_type 12, 12, 7 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 5, 0 octave 4 - C_ 8 - notetype 12, 3, 0 - C_ 8 - notetype 12, 4, 14 - C_ 8 - notetype 12, 12, 7 - C_ 8 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 9, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 3, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 + note C_, 8 + note_type 12, 3, 0 + note C_, 8 + note_type 12, 4, 14 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 9, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 3, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 octave 4 - D_ 8 - octave 3 - G_ 8 - notetype 12, 8, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 6, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 + note D_, 8 + octave 3 + note G_, 8 + note_type 12, 8, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 6, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 octave 4 - E_ 8 - F# 8 - E_ 16 - notetype 12, 12, 5 - G_ 4 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 5, 0 - F# 8 - notetype 12, 6, 0 - F# 8 - notetype 12, 7, 0 - F# 8 - notetype 12, 10, 0 - G_ 8 - notetype 12, 10, 7 - G_ 8 - notetype 12, 11, 7 - G_ 4 - notetype 12, 12, 5 - A_ 2 - G_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - notetype 12, 10, 0 - G# 8 - notetype 12, 7, 0 - G# 8 - notetype 12, 8, 0 - G# 8 - notetype 12, 6, 0 - G# 8 - notetype 12, 10, 0 - A_ 16 - notetype 12, 11, 0 + note E_, 8 + note F#, 8 + note E_, 16 + note_type 12, 12, 5 + note G_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 5, 0 + note F#, 8 + note_type 12, 6, 0 + note F#, 8 + note_type 12, 7, 0 + note F#, 8 + note_type 12, 10, 0 + note G_, 8 + note_type 12, 10, 7 + note G_, 8 + note_type 12, 11, 7 + note G_, 4 + note_type 12, 12, 5 + note A_, 2 + note G_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note_type 12, 10, 0 + note G#, 8 + note_type 12, 7, 0 + note G#, 8 + note_type 12, 8, 0 + note G#, 8 + note_type 12, 6, 0 + note G#, 8 + note_type 12, 10, 0 + note A_, 16 + note_type 12, 11, 0 octave 5 - C# 8 - E_ 8 - notetype 12, 12, 0 - D_ 4 + note C#, 8 + note E_, 8 + note_type 12, 12, 0 + note D_, 4 octave 4 - A_ 4 + note A_, 4 octave 5 - C_ 2 - notetype 12, 12, 7 + note C_, 2 + note_type 12, 12, 7 octave 4 - B_ 8 - notetype 12, 6, 0 - B_ 8 - notetype 12, 6, 9 - B_ 6 - notetype 12, 9, 6 - B_ 6 + note B_, 8 + note_type 12, 6, 0 + note B_, 8 + note_type 12, 6, 9 + note B_, 6 + note_type 12, 9, 6 + note B_, 6 rest 2 - notetype 12, 12, 0 + note_type 12, 12, 0 octave 5 - D_ 4 + note D_, 4 octave 4 - A_ 4 - A# 2 - notetype 12, 11, 0 + note A_, 4 + note A#, 2 + note_type 12, 11, 0 octave 5 - F_ 14 - notetype 12, 6, 0 - G_ 16 - notetype 12, 5, 0 - E_ 16 - notetype 12, 4, 0 - E_ 16 - notetype 12, 12, 7 + note F_, 14 + note_type 12, 6, 0 + note G_, 16 + note_type 12, 5, 0 + note E_, 16 + note_type 12, 4, 0 + note E_, 16 + note_type 12, 12, 7 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 14 + note A_, 14 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 6 + note A#, 6 octave 4 - F_ 14 + note F_, 14 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 4 - D_ 4 - C_ 6 + note F_, 4 + note D_, 4 + note C_, 6 octave 3 - A_ 14 + note A_, 14 octave 4 - C_ 4 - E_ 2 - D_ 2 - C_ 2 - E_ 2 - D_ 2 - octave 3 - A# 4 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A#, 4 octave 4 - F_ 10 - G_ 6 - F_ 6 - D_ 4 - notetype 12, 11, 0 - F_ 16 - E_ 16 - D_ 16 - E_ 16 - notetype 12, 10, 0 + note F_, 10 + note G_, 6 + note F_, 6 + note D_, 4 + note_type 12, 11, 0 + note F_, 16 + note E_, 16 + note D_, 16 + note E_, 16 + note_type 12, 10, 0 octave 5 - F_ 16 - E_ 16 - G_ 16 - F_ 16 - notetype 12, 13, 1 - octave 3 - A# 6 - A# 6 - A# 4 - A_ 6 - A_ 6 - A_ 4 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + note_type 12, 13, 1 + octave 3 + note A#, 6 + note A#, 6 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 4 octave 4 - C_ 6 - C_ 6 - C_ 4 - octave 3 - A# 6 - A# 6 - A_ 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - G_ 2 - A_ 10 - B_ 2 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + note A#, 6 + note A#, 6 + note A_, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 + note G_, 2 + note A_, 10 + note B_, 2 octave 4 - C# 2 - E_ 2 - D_ 2 - C# 2 + note C#, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A# 16 + note B_, 2 + note A#, 16 rest 2 - A# 2 + note A#, 2 octave 4 - C_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - octave 3 - A# 2 - B_ 16 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note B_, 16 rest 2 - B_ 2 + note B_, 2 octave 4 - C# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 + note C#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 16 - E_ 8 - G_ 8 - loopchannel 0, Music_TrainerBattle_branch_22bfc + note C_, 16 + note E_, 8 + note G_, 8 + sound_loop 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch2:: +Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 4 + note_type 12, 1, 4 octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - C_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - G# 1 - A_ 2 - A# 2 - B_ 2 - B_ 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 2 + note A#, 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 Music_TrainerBattle_branch_22d9c:: octave 2 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C_ 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 2 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 - D_ 2 - E_ 2 - F# 2 - E_ 2 - D_ 2 - F# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - D# 2 - F_ 2 - G_ 2 - F_ 2 - D# 2 - G_ 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - E_ 2 - F# 2 - G# 2 - F# 2 - E_ 2 - G# 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - F_ 2 - G_ 2 - A_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 4 + note F#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 4 octave 2 - A_ 4 + note A_, 4 octave 3 - C_ 2 - G_ 2 + note C_, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D_ 4 + note G_, 2 + note D_, 4 octave 2 - A_ 4 - A# 2 + note A_, 4 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - E_ 2 - D_ 2 - C_ 2 - loopchannel 0, Music_TrainerBattle_branch_22d9c + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + sound_loop 0, Music_TrainerBattle_branch_22d9c diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index fb541581..a2291a2a 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,338 +1,338 @@ -Music_UnusedSong_Ch0:: +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 vibrato 5, 1, 6 Music_UnusedSong_branch_a91b:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - D# 4 - C# 4 - D# 1 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - B_ 2 + note B_, 2 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 8 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 3 octave 5 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - E_ 2 - F# 8 + note E_, 2 + note F#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - D# 2 - E_ 8 + note D#, 2 + note E_, 8 rest 2 - D# 2 - C# 2 - D# 2 + note D#, 2 + note C#, 2 + note D#, 2 octave 5 - A_ 2 - G# 2 - A_ 2 - A# 1 - B_ 1 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 1 + note B_, 1 rest 4 - F# 2 + note F#, 2 rest 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 6 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 rest 8 octave 5 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 octave 6 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a91b - endchannel + sound_loop 0, Music_UnusedSong_branch_a91b + sound_ret -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 - toggleperfectpitch + toggle_perfect_pitch vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 8 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 2 + note F#, 2 rest 1 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - D# 8 + note D#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 + note F#, 2 rest 2 - C# 8 + note C#, 8 rest 2 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 1 - F# 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 rest 8 - B_ 2 - A# 2 - B_ 2 - A_ 1 - G# 1 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 rest 4 - G# 2 - rest 2 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 - E_ 2 - C# 2 - E_ 2 - F# 2 + note G#, 2 + rest 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note F#, 2 rest 6 - D# 2 + note D#, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a9d8 - endchannel + sound_loop 0, Music_UnusedSong_branch_a9d8 + sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index c89c9b3b..1858d138 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,292 +1,292 @@ -Music_Vermilion_Ch0:: +Music_Vermilion_Ch1:: tempo 156 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Vermilion_branch_b9f6:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - E_ 4 - C# 1 - D_ 1 - E_ 2 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - A_ 4 - F# 1 - G# 1 - A_ 2 - E_ 4 - C# 2 - E_ 2 - A_ 2 - G# 2 - B_ 2 - A_ 2 - G# 2 - E_ 2 - F# 2 - G# 2 - C# 2 - D_ 2 - E_ 2 - F# 2 - E_ 4 - C# 1 - D_ 1 - E_ 2 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - A_ 4 - F# 1 - G# 1 - A_ 2 - E_ 4 - C# 1 - D_ 1 - E_ 2 - A_ 2 - G# 2 - F# 2 - A_ 2 - G# 2 - E_ 2 - F# 2 - G# 2 - F# 4 - E_ 4 - F# 2 - G# 2 - F# 2 - A_ 2 - G# 2 - B_ 2 - A_ 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 4 + note E_, 4 + note F#, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 1 - A_ 1 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 2 octave 4 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - G# 2 + note G#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - F# 2 - B_ 2 - G# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - loopchannel 0, Music_Vermilion_branch_b9f6 + note F#, 2 + note B_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + sound_loop 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch1:: - duty 3 +Music_Vermilion_Ch2:: + duty_cycle 3 vibrato 10, 2, 3 Music_Vermilion_branch_ba66:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 - A_ 1 - B_ 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C# 8 + note C#, 8 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 1 + note C#, 1 octave 3 - B_ 1 - A_ 8 - A_ 8 + note B_, 1 + note A_, 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 - A_ 1 - B_ 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C# 8 + note C#, 8 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 1 + note C#, 1 octave 3 - B_ 1 - A_ 8 - B_ 4 + note B_, 1 + note A_, 8 + note B_, 4 octave 4 - C# 4 - D_ 4 - E_ 4 - F# 8 - B_ 8 - A_ 4 - G# 4 - F# 4 - E_ 4 - F# 8 - E_ 8 - loopchannel 0, Music_Vermilion_branch_ba66 + note C#, 4 + note D_, 4 + note E_, 4 + note F#, 8 + note B_, 8 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 8 + note E_, 8 + sound_loop 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch2:: - notetype 12, 1, 0 +Music_Vermilion_Ch3:: + note_type 12, 1, 0 Music_Vermilion_branch_baa8:: octave 4 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - B_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - loopchannel 0, Music_Vermilion_branch_baa8 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + sound_loop 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch3:: +Music_Vermilion_Ch4:: dspeed 12 Music_Vermilion_branch_bb0e:: - callchannel Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f triangle1 2 triangle1 1 triangle1 1 @@ -300,12 +300,12 @@ Music_Vermilion_branch_bb0e:: triangle1 1 triangle1 1 triangle1 1 - loopchannel 4, Music_Vermilion_branch_bb0e - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - loopchannel 0, Music_Vermilion_branch_bb0e + sound_loop 4, Music_Vermilion_branch_bb0e + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_loop 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: triangle1 2 @@ -320,4 +320,4 @@ Music_Vermilion_branch_bb3f:: triangle1 2 triangle1 1 triangle1 1 - endchannel + sound_ret diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index e9aad529..582b55eb 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,738 +1,738 @@ -Music_WildBattle_Ch0:: +Music_WildBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - A# 1 - A_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - notetype 12, 4, 15 - C# 10 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - C# 10 + note C_, 1 + note C#, 1 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note_type 12, 4, 15 + note C#, 10 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note C#, 10 Music_WildBattle_branch_230e0:: - notetype 12, 11, 3 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note_type 12, 11, 3 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - notetype 12, 11, 5 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - E_ 6 - D_ 6 - F_ 4 - notetype 12, 11, 7 - A_ 16 - G_ 16 - notetype 12, 11, 5 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - G_ 6 - A_ 6 - B_ 4 - notetype 12, 11, 7 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note E_, 6 + note D_, 6 + note F_, 4 + note_type 12, 11, 7 + note A_, 16 + note G_, 16 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note B_, 4 + note_type 12, 11, 7 octave 4 - C_ 16 - notetype 12, 3, 15 - G_ 16 - notetype 12, 11, 5 + note C_, 16 + note_type 12, 3, 15 + note G_, 16 + note_type 12, 11, 5 octave 3 - C_ 12 - C_ 2 + note C_, 12 + note C_, 2 rest 2 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 rest 12 - C# 12 - C# 2 + note C#, 12 + note C#, 2 rest 2 - F_ 2 - notetype 12, 10, 3 - D# 6 - notetype 12, 10, 7 - C# 8 - loopchannel 0, Music_WildBattle_branch_230e0 + note F_, 2 + note_type 12, 10, 3 + note D#, 6 + note_type 12, 10, 7 + note C#, 8 + sound_loop 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch1:: - duty 3 +Music_WildBattle_Ch2:: + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 - notetype 12, 12, 2 + note G_, 1 + note_type 12, 12, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - notetype 12, 9, 0 - F# 10 - notetype 12, 12, 2 - G_ 6 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - G_ 10 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note_type 12, 9, 0 + note F#, 10 + note_type 12, 12, 2 + note G_, 6 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note G_, 10 Music_WildBattle_branch_23225:: - notetype 12, 12, 5 - G_ 6 - F# 6 - E_ 4 - G_ 6 - A_ 6 - G_ 4 + note_type 12, 12, 5 + note G_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note A_, 6 + note G_, 4 octave 4 - G# 12 - G_ 2 + note G#, 12 + note G_, 2 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 5 - C# 8 - notetype 12, 12, 5 + note C#, 8 + note_type 12, 12, 5 octave 4 - C_ 6 + note C_, 6 octave 3 - A# 6 - G# 4 + note A#, 6 + note G#, 4 octave 4 - C# 6 - C_ 6 + note C#, 6 + note C_, 6 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 6 - E_ 6 - D_ 4 - notetype 12, 12, 7 + note F_, 6 + note E_, 6 + note D_, 4 + note_type 12, 12, 7 octave 3 - A# 4 + note A#, 4 octave 4 - C_ 4 - D_ 4 - F_ 4 - notetype 12, 12, 0 - G# 16 - notetype 12, 11, 0 - G# 16 - notetype 12, 4, 14 - G_ 16 - notetype 12, 12, 7 - G_ 16 + note C_, 4 + note D_, 4 + note F_, 4 + note_type 12, 12, 0 + note G#, 16 + note_type 12, 11, 0 + note G#, 16 + note_type 12, 4, 14 + note G_, 16 + note_type 12, 12, 7 + note G_, 16 octave 3 - F_ 8 - A# 8 + note F_, 8 + note A#, 8 octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - E_ 16 - notetype 12, 12, 7 - E_ 16 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note E_, 16 + note_type 12, 12, 7 + note E_, 16 octave 3 - F_ 8 - A# 8 + note F_, 8 + note A#, 8 octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - G_ 16 - notetype 12, 3, 15 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note G_, 16 + note_type 12, 3, 15 octave 5 - C_ 16 - notetype 12, 12, 5 + note C_, 16 + note_type 12, 12, 5 octave 4 - E_ 12 - E_ 2 + note E_, 12 + note E_, 2 rest 2 - F_ 2 - notetype 12, 12, 1 - E_ 4 - notetype 12, 12, 5 + note F_, 2 + note_type 12, 12, 1 + note E_, 4 + note_type 12, 12, 5 rest 10 - F_ 12 - F_ 2 + note F_, 12 + note F_, 2 rest 2 - G# 2 - notetype 12, 10, 3 - G_ 6 - notetype 12, 12, 7 - F_ 8 - loopchannel 0, Music_WildBattle_branch_23225 + note G#, 2 + note_type 12, 10, 3 + note G_, 6 + note_type 12, 12, 7 + note F_, 8 + sound_loop 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch2:: +Music_WildBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 1 + note_type 12, 1, 1 octave 4 - C# 1 + note C#, 1 rest 1 - C# 1 - C_ 1 - D_ 1 + note C#, 1 + note C_, 1 + note D_, 1 rest 1 - D_ 1 - C_ 1 - D# 1 + note D_, 1 + note C_, 1 + note D#, 1 rest 1 - D# 1 - C_ 1 - E_ 1 + note D#, 1 + note C_, 1 + note E_, 1 rest 1 - E_ 1 - C_ 1 - F_ 1 + note E_, 1 + note C_, 1 + note F_, 1 rest 1 - F_ 1 - C_ 1 - F# 1 + note F_, 1 + note C_, 1 + note F#, 1 rest 1 - F# 1 - C_ 1 - G_ 1 + note F#, 1 + note C_, 1 + note G_, 1 rest 1 - G_ 1 - C_ 1 + note G_, 1 + note C_, 1 octave 3 - A# 2 - B_ 2 + note A#, 2 + note B_, 2 Music_WildBattle_branch_232b5:: octave 4 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C# 2 - G# 2 - C# 4 - G# 2 - A# 2 - G# 2 - G_ 2 - C# 2 - G# 2 - C# 4 - G# 2 - A# 2 - G# 2 - F_ 2 - loopchannel 2, Music_WildBattle_branch_232b5 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note F_, 2 + sound_loop 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - G# 12 - G_ 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G#, 12 + note G_, 2 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - F_ 2 - E_ 2 - D_ 2 - C# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - loopchannel 0, Music_WildBattle_branch_232d8 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + sound_loop 0, Music_WildBattle_branch_232d8 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index c904a18a..ef909832 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ -SFX_59_1_Ch4: - duty 2 - squarenote 4, 15, 1, 1920 - endchannel +SFX_59_1_Ch5: + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret -SFX_59_1_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 10, 1, 1889 - endchannel +SFX_59_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 7331f973..7510842f 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,11 +1,11 @@ -SFX_59_3_Ch4: - duty 2 - squarenote 4, 15, 1, 1920 - endchannel +SFX_59_3_Ch5: + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret -SFX_59_3_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 10, 1, 1889 - endchannel +SFX_59_3_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 0d45f451..0ab4cbe2 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_1_Ch4: - duty 0 - pitchenvelope 1, 7 - squarenote 15, 13, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Arrow_Tiles_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 2ee03ec0..787e431d 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_3_Ch4: - duty 0 - pitchenvelope 1, 7 - squarenote 15, 13, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Arrow_Tiles_3_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index c3fefdd2..9503c570 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ -SFX_Ball_Poof_Ch4: - duty 2 - pitchenvelope 1, 6 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ball_Poof_Ch5: + duty_cycle 2 + pitch_sweep 1, 6 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 0 + sound_ret -SFX_Ball_Poof_Ch7: - noisenote 15, 10, 2, 34 - endchannel +SFX_Ball_Poof_Ch8: + noise_note 15, 10, 2, 34 + sound_ret diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index e4518dfc..207bf720 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch4: - duty 2 - pitchenvelope 2, -7 - squarenote 15, 15, 2, 1920 - endchannel +SFX_Ball_Toss_Ch5: + duty_cycle 2 + pitch_sweep 2, -7 + square_note 15, 15, 2, 1920 + sound_ret -SFX_Ball_Toss_Ch5: - duty 2 - squarenote 15, 12, 2, 1922 - endchannel +SFX_Ball_Toss_Ch6: + duty_cycle 2 + square_note 15, 12, 2, 1922 + sound_ret diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 2ab97942..ef3cf017 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ -SFX_Battle_09_Ch4: - duty 1 - pitchenvelope 9, 7 - squarenote 15, 15, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Battle_09_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 06e2fa14..e60fe9c7 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch7: - noisenote 8, 15, 1, 84 - endchannel +SFX_Battle_0B_Ch8: + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 67e910eb..285e0d52 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ -SFX_Battle_0C_Ch7: - noisenote 15, 8, -7, 17 - noisenote 4, 15, -7, 18 - noisenote 10, 15, 1, 85 - endchannel +SFX_Battle_0C_Ch8: + noise_note 15, 8, -7, 17 + noise_note 4, 15, -7, 18 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 231d324f..293d9743 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ -SFX_Battle_0D_Ch7: - noisenote 15, 8, -7, 52 - noisenote 8, 15, 2, 53 - noisenote 10, 15, 1, 85 - endchannel +SFX_Battle_0D_Ch8: + noise_note 15, 8, -7, 52 + noise_note 8, 15, 2, 53 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index eb67a126..39d971c9 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch7: - noisenote 15, 9, -7, 35 - noisenote 8, 15, 1, 33 - endchannel +SFX_Battle_0E_Ch8: + noise_note 15, 9, -7, 35 + noise_note 8, 15, 1, 33 + sound_ret diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 26386131..ae81e747 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ -SFX_Battle_0F_Ch7: - noisenote 2, 14, 1, 75 - noisenote 10, 15, 1, 68 - noisenote 2, 14, 1, 58 - noisenote 6, 15, 1, 52 - endchannel +SFX_Battle_0F_Ch8: + noise_note 2, 14, 1, 75 + noise_note 10, 15, 1, 68 + noise_note 2, 14, 1, 58 + noise_note 6, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 86d5a815..7a092bd3 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch7: - noisenote 8, 4, -7, 35 - noisenote 4, 12, 4, 34 - noisenote 6, 15, 2, 35 - loopchannel 4, SFX_Battle_12_Ch7 - endchannel +SFX_Battle_12_Ch8: + noise_note 8, 4, -7, 35 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + sound_loop 4, SFX_Battle_12_Ch8 + sound_ret diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 882be8c7..0f910cec 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ -SFX_Battle_13_Ch7: - noisenote 8, 4, -7, 51 - noisenote 4, 12, 4, 34 - noisenote 6, 15, 2, 35 - noisenote 15, 15, 2, 34 - endchannel +SFX_Battle_13_Ch8: + noise_note 8, 4, -7, 51 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + noise_note 15, 15, 2, 34 + sound_ret diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 97a88b95..7c3a7c68 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ -SFX_Battle_14_Ch7: - noisenote 8, 15, -7, 50 - noisenote 8, 15, 4, 67 - noisenote 8, 15, 2, 84 - noisenote 8, 15, 1, 101 - endchannel +SFX_Battle_14_Ch8: + noise_note 8, 15, -7, 50 + noise_note 8, 15, 4, 67 + noise_note 8, 15, 2, 84 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index daa614cd..6e162cce 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ -SFX_Battle_16_Ch7: - noisenote 1, 9, 4, 35 - noisenote 1, 11, 4, 34 - noisenote 8, 15, 1, 68 - endchannel +SFX_Battle_16_Ch8: + noise_note 1, 9, 4, 35 + noise_note 1, 11, 4, 34 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index b6cc787e..f863f8ee 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ -SFX_Battle_17_Ch7: - noisenote 2, 9, 4, 51 - noisenote 4, 11, 4, 34 - noisenote 4, 15, 1, 68 - noisenote 8, 15, 1, 85 - endchannel +SFX_Battle_17_Ch8: + noise_note 2, 9, 4, 51 + noise_note 4, 11, 4, 34 + noise_note 4, 15, 1, 68 + noise_note 8, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index ced87cd8..f8ece58e 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch7: - noisenote 4, 15, -7, 85 - noisenote 8, 15, 1, 101 - endchannel +SFX_Battle_18_Ch8: + noise_note 4, 15, -7, 85 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 53de4341..a7cf5292 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ -SFX_Battle_19_Ch7: - noisenote 2, 8, 4, 67 - noisenote 2, 12, 4, 34 - noisenote 8, 15, 2, 52 - endchannel +SFX_Battle_19_Ch8: + noise_note 2, 8, 4, 67 + noise_note 2, 12, 4, 34 + noise_note 8, 15, 2, 52 + sound_ret diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 06c2b6f1..16ea584d 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch7: - noisenote 2, 15, 1, 34 - noisenote 15, 15, 2, 18 - endchannel +SFX_Battle_1B_Ch8: + noise_note 2, 15, 1, 34 + noise_note 15, 15, 2, 18 + sound_ret diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 7518acd9..3045576b 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ -SFX_Battle_1C_Ch7: - noisenote 2, 12, 2, 1 - noisenote 15, 15, 4, 1 - noisenote 15, 15, 2, 1 - endchannel +SFX_Battle_1C_Ch8: + noise_note 2, 12, 2, 1 + noise_note 15, 15, 4, 1 + noise_note 15, 15, 2, 1 + sound_ret diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index e924414a..ff4b0cbc 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ -SFX_Battle_1E_Ch4: - duty 0 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Battle_1E_Ch5: + duty_cycle 0 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret -SFX_Battle_1E_Ch7: - noisenote 0, 13, 1, 66 - noisenote 4, 10, 1, 50 - noisenote 0, 13, 1, 34 - noisenote 6, 10, 1, 50 - endchannel +SFX_Battle_1E_Ch8: + noise_note 0, 13, 1, 66 + noise_note 4, 10, 1, 50 + noise_note 0, 13, 1, 34 + noise_note 6, 10, 1, 50 + sound_ret diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index 4e5687d8..b73b0a8f 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch7: - noisenote 12, 15, 1, 84 - noisenote 8, 15, 1, 100 - endchannel +SFX_Battle_20_Ch8: + noise_note 12, 15, 1, 84 + noise_note 8, 15, 1, 100 + sound_ret diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 616b0c42..fc1b1186 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ -SFX_Battle_21_Ch7: - noisenote 2, 15, 1, 51 - noisenote 2, 12, 1, 50 - noisenote 2, 10, 1, 49 - noisenote 15, 8, 2, 50 - noisenote 8, 15, 1, 52 - endchannel +SFX_Battle_21_Ch8: + noise_note 2, 15, 1, 51 + noise_note 2, 12, 1, 50 + noise_note 2, 10, 1, 49 + noise_note 15, 8, 2, 50 + noise_note 8, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index e19417e0..3c42996e 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch7: - noisenote 2, 13, 2, 50 - noisenote 15, 15, 2, 67 - endchannel +SFX_Battle_22_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index febce65a..bf546248 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ -SFX_Battle_23_Ch7: - noisenote 2, 15, 2, 67 - noisenote 4, 11, 5, 50 - noisenote 9, 8, 6, 49 - noisenote 7, 6, 4, 0 - noisenote 15, 15, 2, 85 - endchannel +SFX_Battle_23_Ch8: + noise_note 2, 15, 2, 67 + noise_note 4, 11, 5, 50 + noise_note 9, 8, 6, 49 + noise_note 7, 6, 4, 0 + noise_note 15, 15, 2, 85 + sound_ret diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 5a9ab9ca..5b6c8e56 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ -SFX_Battle_24_Ch4: - duty 1 - pitchenvelope 9, 7 - squarenote 15, 15, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Battle_24_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1792 + pitch_sweep 0, 0 + sound_ret -SFX_Battle_24_Ch7: - noisenote 15, 3, -7, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Battle_24_Ch8: + noise_note 15, 3, -7, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 1d50b391..54623b5f 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ -SFX_Battle_25_Ch7: - noisenote 15, 4, -7, 65 - noisenote 8, 8, -7, 65 - noisenote 8, 12, -7, 65 - noisenote 8, 15, 2, 66 - noisenote 15, 15, 2, 65 - endchannel +SFX_Battle_25_Ch8: + noise_note 15, 4, -7, 65 + noise_note 8, 8, -7, 65 + noise_note 8, 12, -7, 65 + noise_note 8, 15, 2, 66 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 0c0e21ae..f3baea99 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ -SFX_Battle_26_Ch7: - noisenote 10, 15, -7, 80 - noisenote 15, 15, -7, 81 - noisenote 8, 15, 2, 81 - noisenote 6, 15, -7, 82 - noisenote 6, 15, -7, 83 - noisenote 8, 15, -7, 84 - noisenote 15, 15, 2, 84 - endchannel +SFX_Battle_26_Ch8: + noise_note 10, 15, -7, 80 + noise_note 15, 15, -7, 81 + noise_note 8, 15, 2, 81 + noise_note 6, 15, -7, 82 + noise_note 6, 15, -7, 83 + noise_note 8, 15, -7, 84 + noise_note 15, 15, 2, 84 + sound_ret diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 4e02cfe9..19ce5bf7 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ -SFX_Battle_27_Ch4: - duty 2 - squarenote 15, 3, -7, 1984 +SFX_Battle_27_Ch5: + duty_cycle 2 + square_note 15, 3, -7, 1984 SFX_Battle_27_branch_2062a: - squarenote 15, 13, -7, 1984 - loopchannel 4, SFX_Battle_27_branch_2062a - squarenote 15, 13, 1, 1984 - endchannel + square_note 15, 13, -7, 1984 + sound_loop 4, SFX_Battle_27_branch_2062a + square_note 15, 13, 1, 1984 + sound_ret -SFX_Battle_27_Ch5: - dutycycle 179 - squarenote 15, 2, -7, 1992 +SFX_Battle_27_Ch6: + duty_cycle_pattern 179 + square_note 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: - squarenote 15, 12, -7, 1991 - loopchannel 4, SFX_Battle_27_branch_2063d - squarenote 15, 12, 1, 1992 - endchannel + square_note 15, 12, -7, 1991 + sound_loop 4, SFX_Battle_27_branch_2063d + square_note 15, 12, 1, 1992 + sound_ret -SFX_Battle_27_Ch7: - noisenote 3, 9, 7, 18 - noisenote 3, 10, 1, 17 - loopchannel 10, SFX_Battle_27_Ch7 - endchannel +SFX_Battle_27_Ch8: + noise_note 3, 9, 7, 18 + noise_note 3, 10, 1, 17 + sound_loop 10, SFX_Battle_27_Ch8 + sound_ret diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index c2f0c511..38646a09 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch4: - duty 0 - squarenote 0, 15, 1, 1984 - squarenote 0, 15, 1, 1792 - loopchannel 12, SFX_Battle_28_Ch4 - endchannel +SFX_Battle_28_Ch5: + duty_cycle 0 + square_note 0, 15, 1, 1984 + square_note 0, 15, 1, 1792 + sound_loop 12, SFX_Battle_28_Ch5 + sound_ret -SFX_Battle_28_Ch5: - dutycycle 179 - squarenote 0, 14, 1, 1985 - squarenote 0, 14, 1, 1793 - loopchannel 12, SFX_Battle_28_Ch5 - endchannel +SFX_Battle_28_Ch6: + duty_cycle_pattern 179 + square_note 0, 14, 1, 1985 + square_note 0, 14, 1, 1793 + sound_loop 12, SFX_Battle_28_Ch6 + sound_ret -SFX_Battle_28_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 6, SFX_Battle_28_Ch7 - endchannel +SFX_Battle_28_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 6, SFX_Battle_28_Ch8 + sound_ret diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index 534826fe..f0d27ca7 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ -SFX_Battle_29_Ch4: - dutycycle 201 - squarenote 11, 15, 3, 288 - squarenote 9, 13, 3, 336 - loopchannel 5, SFX_Battle_29_Ch4 - squarenote 8, 14, 3, 304 - squarenote 15, 12, 2, 272 - endchannel +SFX_Battle_29_Ch5: + duty_cycle_pattern 201 + square_note 11, 15, 3, 288 + square_note 9, 13, 3, 336 + sound_loop 5, SFX_Battle_29_Ch5 + square_note 8, 14, 3, 304 + square_note 15, 12, 2, 272 + sound_ret -SFX_Battle_29_Ch7: - noisenote 10, 15, 3, 53 - noisenote 14, 15, 6, 69 - loopchannel 4, SFX_Battle_29_Ch7 - noisenote 12, 15, 4, 188 - noisenote 12, 15, 5, 156 - noisenote 15, 15, 4, 172 - endchannel +SFX_Battle_29_Ch8: + noise_note 10, 15, 3, 53 + noise_note 14, 15, 6, 69 + sound_loop 4, SFX_Battle_29_Ch8 + noise_note 12, 15, 4, 188 + noise_note 12, 15, 5, 156 + noise_note 15, 15, 4, 172 + sound_ret diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index f4986805..ea4196a8 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch4: - dutycycle 57 - squarenote 4, 15, 4, 1536 - squarenote 3, 12, 4, 1280 - squarenote 5, 11, 5, 1536 - squarenote 13, 14, 2, 1728 - loopchannel 3, SFX_Battle_2A_Ch4 - squarenote 8, 13, 1, 1536 - endchannel +SFX_Battle_2A_Ch5: + duty_cycle_pattern 57 + square_note 4, 15, 4, 1536 + square_note 3, 12, 4, 1280 + square_note 5, 11, 5, 1536 + square_note 13, 14, 2, 1728 + sound_loop 3, SFX_Battle_2A_Ch5 + square_note 8, 13, 1, 1536 + sound_ret -SFX_Battle_2A_Ch5: - dutycycle 141 - squarenote 5, 14, 4, 1504 - squarenote 4, 11, 4, 1248 - squarenote 6, 10, 5, 1512 - squarenote 14, 13, 1, 1696 - loopchannel 3, SFX_Battle_2A_Ch5 - endchannel +SFX_Battle_2A_Ch6: + duty_cycle_pattern 141 + square_note 5, 14, 4, 1504 + square_note 4, 11, 4, 1248 + square_note 6, 10, 5, 1512 + square_note 14, 13, 1, 1696 + sound_loop 3, SFX_Battle_2A_Ch6 + sound_ret -SFX_Battle_2A_Ch7: - noisenote 5, 12, 3, 51 - noisenote 3, 9, 2, 67 - noisenote 10, 11, 5, 51 - noisenote 15, 12, 3, 50 - loopchannel 2, SFX_Battle_2A_Ch7 - endchannel +SFX_Battle_2A_Ch8: + noise_note 5, 12, 3, 51 + noise_note 3, 9, 2, 67 + noise_note 10, 11, 5, 51 + noise_note 15, 12, 3, 50 + sound_loop 2, SFX_Battle_2A_Ch8 + sound_ret diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 418ab5cb..b9b20d1d 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch4: - dutycycle 210 - squarenote 3, 8, 1, 768 - squarenote 3, 12, 1, 1024 - squarenote 3, 15, 1, 1280 - squarenote 3, 11, 1, 1024 - squarenote 3, 7, 1, 768 - loopchannel 5, SFX_Battle_2B_Ch4 - squarenote 8, 8, 1, 1024 - endchannel +SFX_Battle_2B_Ch5: + duty_cycle_pattern 210 + square_note 3, 8, 1, 768 + square_note 3, 12, 1, 1024 + square_note 3, 15, 1, 1280 + square_note 3, 11, 1, 1024 + square_note 3, 7, 1, 768 + sound_loop 5, SFX_Battle_2B_Ch5 + square_note 8, 8, 1, 1024 + sound_ret -SFX_Battle_2B_Ch7: - noisenote 3, 6, 2, 34 - noisenote 3, 10, 2, 50 - noisenote 3, 13, 2, 51 - noisenote 3, 9, 2, 35 - noisenote 3, 5, 2, 18 - loopchannel 5, SFX_Battle_2B_Ch7 - noisenote 8, 8, 1, 18 - endchannel +SFX_Battle_2B_Ch8: + noise_note 3, 6, 2, 34 + noise_note 3, 10, 2, 50 + noise_note 3, 13, 2, 51 + noise_note 3, 9, 2, 35 + noise_note 3, 5, 2, 18 + sound_loop 5, SFX_Battle_2B_Ch8 + noise_note 8, 8, 1, 18 + sound_ret diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index aedb91bd..c6d47413 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch4: - dutycycle 57 - squarenote 15, 15, 4, 1280 - squarenote 15, 12, 4, 1024 - squarenote 15, 14, 2, 1472 - loopchannel 3, SFX_Battle_2C_Ch4 - endchannel +SFX_Battle_2C_Ch5: + duty_cycle_pattern 57 + square_note 15, 15, 4, 1280 + square_note 15, 12, 4, 1024 + square_note 15, 14, 2, 1472 + sound_loop 3, SFX_Battle_2C_Ch5 + sound_ret -SFX_Battle_2C_Ch5: - dutycycle 141 - squarenote 7, 14, 4, 1072 - squarenote 15, 11, 4, 816 - squarenote 15, 10, 2, 1080 - loopchannel 4, SFX_Battle_2C_Ch5 - endchannel +SFX_Battle_2C_Ch6: + duty_cycle_pattern 141 + square_note 7, 14, 4, 1072 + square_note 15, 11, 4, 816 + square_note 15, 10, 2, 1080 + sound_loop 4, SFX_Battle_2C_Ch6 + sound_ret -SFX_Battle_2C_Ch7: - noisenote 9, 15, 4, 68 - noisenote 9, 15, 2, 67 - noisenote 15, 15, 4, 66 - noisenote 15, 15, 4, 65 - loopchannel 3, SFX_Battle_2C_Ch7 - endchannel +SFX_Battle_2C_Ch8: + noise_note 9, 15, 4, 68 + noise_note 9, 15, 2, 67 + noise_note 15, 15, 4, 66 + noise_note 15, 15, 4, 65 + sound_loop 3, SFX_Battle_2C_Ch8 + sound_ret diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index ca1afc42..c509b8d5 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch4: - duty 0 - squarenote 2, 15, 1, 512 - squarenote 3, 15, 1, 1792 - squarenote 4, 15, 1, 1280 - squarenote 5, 15, 1, 2032 - loopchannel 8, SFX_Battle_2E_Ch4 - endchannel +SFX_Battle_2E_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 512 + square_note 3, 15, 1, 1792 + square_note 4, 15, 1, 1280 + square_note 5, 15, 1, 2032 + sound_loop 8, SFX_Battle_2E_Ch5 + sound_ret -SFX_Battle_2E_Ch5: - dutycycle 179 - squarenote 2, 14, 1, 770 - squarenote 3, 14, 1, 2034 - squarenote 4, 14, 1, 1538 - squarenote 5, 14, 1, 1794 - loopchannel 8, SFX_Battle_2E_Ch5 - endchannel +SFX_Battle_2E_Ch6: + duty_cycle_pattern 179 + square_note 2, 14, 1, 770 + square_note 3, 14, 1, 2034 + square_note 4, 14, 1, 1538 + square_note 5, 14, 1, 1794 + sound_loop 8, SFX_Battle_2E_Ch6 + sound_ret -SFX_Battle_2E_Ch7: - noisenote 2, 13, 3, 16 - noisenote 3, 13, 3, 17 - noisenote 2, 13, 2, 16 - noisenote 5, 13, 2, 18 - loopchannel 9, SFX_Battle_2E_Ch7 - endchannel +SFX_Battle_2E_Ch8: + noise_note 2, 13, 3, 16 + noise_note 3, 13, 3, 17 + noise_note 2, 13, 2, 16 + noise_note 5, 13, 2, 18 + sound_loop 9, SFX_Battle_2E_Ch8 + sound_ret diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index d8c2bd91..a3138abb 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch4: - dutycycle 43 - squarenote 3, 15, 1, 2032 - squarenote 4, 15, 2, 512 - loopchannel 8, SFX_Battle_2F_Ch4 - endchannel +SFX_Battle_2F_Ch5: + duty_cycle_pattern 43 + square_note 3, 15, 1, 2032 + square_note 4, 15, 2, 512 + sound_loop 8, SFX_Battle_2F_Ch5 + sound_ret -SFX_Battle_2F_Ch5: - dutycycle 179 - squarenote 4, 14, 2, 514 - squarenote 4, 14, 1, 2018 - loopchannel 9, SFX_Battle_2F_Ch5 - endchannel +SFX_Battle_2F_Ch6: + duty_cycle_pattern 179 + square_note 4, 14, 2, 514 + square_note 4, 14, 1, 2018 + sound_loop 9, SFX_Battle_2F_Ch6 + sound_ret -SFX_Battle_2F_Ch7: - noisenote 4, 15, -7, 67 - noisenote 4, 15, 2, 68 - loopchannel 9, SFX_Battle_2F_Ch7 - endchannel +SFX_Battle_2F_Ch8: + noise_note 4, 15, -7, 67 + noise_note 4, 15, 2, 68 + sound_loop 9, SFX_Battle_2F_Ch8 + sound_ret diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index ee1cc671..83dc96f4 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ -SFX_Battle_31_Ch4: - duty 2 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, 2, 2016 - endchannel +SFX_Battle_31_Ch5: + duty_cycle 2 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Battle_31_Ch5: - duty 3 - squarenote 15, 15, -7, 2018 - squarenote 15, 15, -7, 2017 - squarenote 15, 15, -7, 2018 - squarenote 15, 15, -7, 2017 - squarenote 15, 15, 2, 2018 - endchannel +SFX_Battle_31_Ch6: + duty_cycle 3 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, 2, 2018 + sound_ret diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 92ea4661..53dfac32 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ -SFX_Battle_32_Ch4: - duty 2 - pitchenvelope 10, -7 - squarenote 8, 15, 1, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Battle_32_Ch5: + duty_cycle 2 + pitch_sweep 10, -7 + square_note 8, 15, 1, 1792 + pitch_sweep 0, 0 + sound_ret -SFX_Battle_32_Ch5: - duty 3 - squarenote 8, 15, 1, 1793 - endchannel +SFX_Battle_32_Ch6: + duty_cycle 3 + square_note 8, 15, 1, 1793 + sound_ret diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 5eee7b32..95afe045 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ -SFX_Battle_33_Ch4: - duty 2 - squarenote 6, 15, 1, 1280 - squarenote 6, 15, 1, 1408 - squarenote 6, 15, 1, 1536 - squarenote 6, 15, 1, 1664 - squarenote 8, 15, 1, 1792 - endchannel +SFX_Battle_33_Ch5: + duty_cycle 2 + square_note 6, 15, 1, 1280 + square_note 6, 15, 1, 1408 + square_note 6, 15, 1, 1536 + square_note 6, 15, 1, 1664 + square_note 8, 15, 1, 1792 + sound_ret -SFX_Battle_33_Ch5: - duty 3 - squarenote 6, 14, 1, 1296 - squarenote 6, 14, 1, 1424 - squarenote 6, 14, 1, 1552 - squarenote 6, 14, 1, 1680 - squarenote 8, 14, 1, 1808 - endchannel +SFX_Battle_33_Ch6: + duty_cycle 3 + square_note 6, 14, 1, 1296 + square_note 6, 14, 1, 1424 + square_note 6, 14, 1, 1552 + square_note 6, 14, 1, 1680 + square_note 8, 14, 1, 1808 + sound_ret diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index af9d5b65..4abbdbc3 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ -SFX_Battle_34_Ch4: - dutycycle 237 - squarenote 8, 15, -7, 1016 - squarenote 15, 15, -7, 1024 - squarenote 15, 15, 3, 1024 - endchannel +SFX_Battle_34_Ch5: + duty_cycle_pattern 237 + square_note 8, 15, -7, 1016 + square_note 15, 15, -7, 1024 + square_note 15, 15, 3, 1024 + sound_ret -SFX_Battle_34_Ch5: - dutycycle 180 - squarenote 8, 14, -7, 960 - squarenote 15, 14, -7, 960 - squarenote 15, 14, 3, 960 - endchannel +SFX_Battle_34_Ch6: + duty_cycle_pattern 180 + square_note 8, 14, -7, 960 + square_note 15, 14, -7, 960 + square_note 15, 14, 3, 960 + sound_ret -SFX_Battle_34_Ch7: - noisenote 4, 15, -7, 81 - noisenote 8, 15, -7, 84 - noisenote 15, 15, -7, 85 - noisenote 15, 15, 3, 86 - endchannel +SFX_Battle_34_Ch8: + noise_note 4, 15, -7, 81 + noise_note 8, 15, -7, 84 + noise_note 15, 15, -7, 85 + noise_note 15, 15, 3, 86 + sound_ret diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 7ce3afb4..e9f78657 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,29 +1,29 @@ -SFX_Battle_35_Ch4: - executemusic +SFX_Battle_35_Ch5: + execute_music vibrato 10, 2, 4 - duty 2 - notetype 10, 8, 7 + duty_cycle 2 + note_type 10, 8, 7 octave 5 - G# 8 + note G#, 8 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 - endchannel + note G#, 8 + sound_ret -SFX_Battle_35_Ch5: - executemusic +SFX_Battle_35_Ch6: + execute_music vibrato 10, 2, 3 - duty 2 - notetype 11, 6, 7 + duty_cycle 2 + note_type 11, 6, 7 octave 5 - G# 8 - notetype 10, 6, 7 + note G#, 8 + note_type 10, 6, 7 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 - endchannel + note G#, 8 + sound_ret diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 9d00fad9..2fd40bd3 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ -SFX_Battle_36_Ch4: - duty 0 - squarenote 2, 15, 1, 1920 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1936 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1952 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1968 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1984 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2000 +SFX_Battle_36_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 SFX_Battle_36_branch_20930: - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2016 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1792 - endchannel + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1792 + sound_ret -SFX_Battle_36_Ch5: - dutycycle 179 - squarenote 2, 15, 1, 1921 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1937 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1953 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1969 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1985 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2001 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2017 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1793 - endchannel +SFX_Battle_36_Ch6: + duty_cycle_pattern 179 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2001 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2017 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1793 + sound_ret -SFX_Battle_36_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 26, SFX_Battle_36_Ch7 - endchannel +SFX_Battle_36_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, SFX_Battle_36_Ch8 + sound_ret diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index b844a54a..3fe278f3 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,61 +1,61 @@ -SFX_Caught_Mon_Ch4: - executemusic +SFX_Caught_Mon_Ch5: + execute_music tempo 256 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 6, 11, 2 + duty_cycle 3 + toggle_perfect_pitch + note_type 6, 11, 2 octave 3 - E_ 2 - F# 2 - G# 2 - G# 1 - G# 1 - B_ 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 1 + note G#, 1 + note B_, 2 octave 4 - C# 2 - D# 2 - D# 1 - D# 1 - notetype 6, 11, 5 - E_ 8 - endchannel + note C#, 2 + note D#, 2 + note D#, 1 + note D#, 1 + note_type 6, 11, 5 + note E_, 8 + sound_ret -SFX_Caught_Mon_Ch5: - executemusic - duty 2 - notetype 6, 12, 2 +SFX_Caught_Mon_Ch6: + execute_music + duty_cycle 2 + note_type 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 + note G#, 2 + note G#, 1 + note G#, 1 + note E_, 2 + note E_, 1 + note E_, 1 + note B_, 2 + note B_, 1 + note B_, 1 + note A_, 2 + note A_, 1 + note A_, 1 + note_type 6, 12, 5 + note G#, 8 + sound_ret -SFX_Caught_Mon_Ch6: - executemusic - notetype 6, 1, 0 +SFX_Caught_Mon_Ch7: + execute_music + note_type 6, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 octave 5 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 - G_ 2 - G# 4 - endchannel + note F#, 2 + note G_, 2 + note G#, 4 + sound_ret diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index a58adb8a..a6303265 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ -SFX_Collision_1_Ch4: - duty 2 - pitchenvelope 5, -2 - squarenote 15, 15, 1, 768 - pitchenvelope 0, 0 - endchannel +SFX_Collision_1_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 60e8cde3..ae68314a 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ -SFX_Collision_3_Ch4: - duty 2 - pitchenvelope 5, -2 - squarenote 15, 15, 1, 768 - pitchenvelope 0, 0 - endchannel +SFX_Collision_3_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index c0c128c0..087ea06f 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,21 +1,21 @@ -SFX_Cry00_1_Ch4: - dutycycle 245 - squarenote 4, 15, 3, 1816 - squarenote 15, 14, 5, 1944 - squarenote 8, 9, 1, 1880 - endchannel +SFX_Cry00_1_Ch5: + duty_cycle_pattern 245 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_1_Ch5: - dutycycle 160 - squarenote 5, 11, 3, 1800 - squarenote 15, 12, 5, 1928 - squarenote 8, 7, 1, 1864 - endchannel +SFX_Cry00_1_Ch6: + duty_cycle_pattern 160 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_1_Ch7: - noisenote 3, 10, 1, 28 - noisenote 14, 9, 4, 44 - noisenote 8, 8, 1, 28 - endchannel +SFX_Cry00_1_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index f9f104c0..0469948a 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,21 +1,21 @@ -SFX_Cry00_2_Ch4: - dutycycle 245 - squarenote 4, 15, 3, 1816 - squarenote 15, 14, 5, 1944 - squarenote 8, 9, 1, 1880 - endchannel +SFX_Cry00_2_Ch5: + duty_cycle_pattern 245 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_2_Ch5: - dutycycle 160 - squarenote 5, 11, 3, 1800 - squarenote 15, 12, 5, 1928 - squarenote 8, 7, 1, 1864 - endchannel +SFX_Cry00_2_Ch6: + duty_cycle_pattern 160 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_2_Ch7: - noisenote 3, 10, 1, 28 - noisenote 14, 9, 4, 44 - noisenote 8, 8, 1, 28 - endchannel +SFX_Cry00_2_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 3956e46c..f0389adf 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,21 +1,21 @@ -SFX_Cry00_3_Ch4: - dutycycle 245 - squarenote 4, 15, 3, 1816 - squarenote 15, 14, 5, 1944 - squarenote 8, 9, 1, 1880 - endchannel +SFX_Cry00_3_Ch5: + duty_cycle_pattern 245 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_3_Ch5: - dutycycle 160 - squarenote 5, 11, 3, 1800 - squarenote 15, 12, 5, 1928 - squarenote 8, 7, 1, 1864 - endchannel +SFX_Cry00_3_Ch6: + duty_cycle_pattern 160 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_3_Ch7: - noisenote 3, 10, 1, 28 - noisenote 14, 9, 4, 44 - noisenote 8, 8, 1, 28 - endchannel +SFX_Cry00_3_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 24ebcbc6..4f4ec4fa 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,24 +1,24 @@ -SFX_Cry01_1_Ch4: - dutycycle 160 - squarenote 4, 15, 3, 1536 - squarenote 8, 13, 5, 1888 - squarenote 3, 14, 2, 1824 - squarenote 8, 13, 1, 1808 - endchannel +SFX_Cry01_1_Ch5: + duty_cycle_pattern 160 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_1_Ch5: - dutycycle 90 - squarenote 5, 11, 3, 1777 - squarenote 7, 12, 5, 1874 - squarenote 3, 10, 2, 1809 - squarenote 8, 11, 1, 1537 - endchannel +SFX_Cry01_1_Ch6: + duty_cycle_pattern 90 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_1_Ch7: - noisenote 3, 10, 2, 60 - noisenote 12, 9, 4, 44 - noisenote 3, 8, 2, 28 - noisenote 8, 7, 1, 44 - endchannel +SFX_Cry01_1_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index e226ed44..55be1d01 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,24 +1,24 @@ -SFX_Cry01_2_Ch4: - dutycycle 160 - squarenote 4, 15, 3, 1536 - squarenote 8, 13, 5, 1888 - squarenote 3, 14, 2, 1824 - squarenote 8, 13, 1, 1808 - endchannel +SFX_Cry01_2_Ch5: + duty_cycle_pattern 160 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_2_Ch5: - dutycycle 90 - squarenote 5, 11, 3, 1777 - squarenote 7, 12, 5, 1874 - squarenote 3, 10, 2, 1809 - squarenote 8, 11, 1, 1537 - endchannel +SFX_Cry01_2_Ch6: + duty_cycle_pattern 90 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_2_Ch7: - noisenote 3, 10, 2, 60 - noisenote 12, 9, 4, 44 - noisenote 3, 8, 2, 28 - noisenote 8, 7, 1, 44 - endchannel +SFX_Cry01_2_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 43cf91df..f89ed321 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,24 +1,24 @@ -SFX_Cry01_3_Ch4: - dutycycle 160 - squarenote 4, 15, 3, 1536 - squarenote 8, 13, 5, 1888 - squarenote 3, 14, 2, 1824 - squarenote 8, 13, 1, 1808 - endchannel +SFX_Cry01_3_Ch5: + duty_cycle_pattern 160 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_3_Ch5: - dutycycle 90 - squarenote 5, 11, 3, 1777 - squarenote 7, 12, 5, 1874 - squarenote 3, 10, 2, 1809 - squarenote 8, 11, 1, 1537 - endchannel +SFX_Cry01_3_Ch6: + duty_cycle_pattern 90 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_3_Ch7: - noisenote 3, 10, 2, 60 - noisenote 12, 9, 4, 44 - noisenote 3, 8, 2, 28 - noisenote 8, 7, 1, 44 - endchannel +SFX_Cry01_3_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 1cc710d2..c1eeac36 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,17 +1,17 @@ -SFX_Cry02_1_Ch4: - duty 0 - squarenote 8, 15, 5, 1152 - squarenote 2, 14, 1, 1504 - squarenote 8, 13, 1, 1500 - endchannel +SFX_Cry02_1_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_1_Ch5: - dutycycle 165 - squarenote 7, 9, 5, 1089 - squarenote 2, 8, 1, 1313 - squarenote 8, 6, 1, 1306 +SFX_Cry02_1_Ch6: + duty_cycle_pattern 165 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_1_Ch7: - endchannel +SFX_Cry02_1_Ch8: + sound_ret diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 6e9ff69f..f3718e57 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,17 +1,17 @@ -SFX_Cry02_2_Ch4: - duty 0 - squarenote 8, 15, 5, 1152 - squarenote 2, 14, 1, 1504 - squarenote 8, 13, 1, 1500 - endchannel +SFX_Cry02_2_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_2_Ch5: - dutycycle 165 - squarenote 7, 9, 5, 1089 - squarenote 2, 8, 1, 1313 - squarenote 8, 6, 1, 1306 +SFX_Cry02_2_Ch6: + duty_cycle_pattern 165 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_2_Ch7: - endchannel +SFX_Cry02_2_Ch8: + sound_ret diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 9f369ad7..2334ae7f 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,17 +1,17 @@ -SFX_Cry02_3_Ch4: - duty 0 - squarenote 8, 15, 5, 1152 - squarenote 2, 14, 1, 1504 - squarenote 8, 13, 1, 1500 - endchannel +SFX_Cry02_3_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_3_Ch5: - dutycycle 165 - squarenote 7, 9, 5, 1089 - squarenote 2, 8, 1, 1313 - squarenote 8, 6, 1, 1306 +SFX_Cry02_3_Ch6: + duty_cycle_pattern 165 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_3_Ch7: - endchannel +SFX_Cry02_3_Ch8: + sound_ret diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 5039203d..5cb3de34 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,30 +1,30 @@ -SFX_Cry03_1_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1544 - squarenote 6, 14, 6, 1536 - squarenote 6, 13, 7, 1520 - squarenote 6, 12, 4, 1504 - squarenote 5, 13, 3, 1472 - squarenote 4, 13, 3, 1440 - squarenote 8, 14, 1, 1408 - endchannel +SFX_Cry03_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_1_Ch5: - dutycycle 10 - squarenote 4, 12, 7, 1284 - squarenote 6, 10, 6, 1282 - squarenote 6, 9, 7, 1265 - squarenote 4, 11, 4, 1249 - squarenote 5, 10, 3, 1218 - squarenote 4, 11, 3, 1187 - squarenote 8, 12, 1, 1154 - endchannel +SFX_Cry03_1_Ch6: + duty_cycle_pattern 10 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_1_Ch7: - noisenote 12, 14, 4, 76 - noisenote 10, 12, 7, 92 - noisenote 12, 11, 6, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry03_1_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 54375387..208492c1 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,30 +1,30 @@ -SFX_Cry03_2_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1544 - squarenote 6, 14, 6, 1536 - squarenote 6, 13, 7, 1520 - squarenote 6, 12, 4, 1504 - squarenote 5, 13, 3, 1472 - squarenote 4, 13, 3, 1440 - squarenote 8, 14, 1, 1408 - endchannel +SFX_Cry03_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_2_Ch5: - dutycycle 10 - squarenote 4, 12, 7, 1284 - squarenote 6, 10, 6, 1282 - squarenote 6, 9, 7, 1265 - squarenote 4, 11, 4, 1249 - squarenote 5, 10, 3, 1218 - squarenote 4, 11, 3, 1187 - squarenote 8, 12, 1, 1154 - endchannel +SFX_Cry03_2_Ch6: + duty_cycle_pattern 10 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_2_Ch7: - noisenote 12, 14, 4, 76 - noisenote 10, 12, 7, 92 - noisenote 12, 11, 6, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry03_2_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 83e1bdd1..11ed4afa 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,30 +1,30 @@ -SFX_Cry03_3_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1544 - squarenote 6, 14, 6, 1536 - squarenote 6, 13, 7, 1520 - squarenote 6, 12, 4, 1504 - squarenote 5, 13, 3, 1472 - squarenote 4, 13, 3, 1440 - squarenote 8, 14, 1, 1408 - endchannel +SFX_Cry03_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_3_Ch5: - dutycycle 10 - squarenote 4, 12, 7, 1284 - squarenote 6, 10, 6, 1282 - squarenote 6, 9, 7, 1265 - squarenote 4, 11, 4, 1249 - squarenote 5, 10, 3, 1218 - squarenote 4, 11, 3, 1187 - squarenote 8, 12, 1, 1154 - endchannel +SFX_Cry03_3_Ch6: + duty_cycle_pattern 10 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_3_Ch7: - noisenote 12, 14, 4, 76 - noisenote 10, 12, 7, 92 - noisenote 12, 11, 6, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry03_3_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index c99f9582..7099c7cb 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,32 +1,32 @@ -SFX_Cry04_1_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1696 - squarenote 8, 14, 6, 1700 - squarenote 4, 13, 6, 1696 - squarenote 12, 13, 3, 1568 - squarenote 8, 12, 3, 1572 - squarenote 4, 12, 2, 1568 - squarenote 8, 11, 1, 1552 - endchannel +SFX_Cry04_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_1_Ch5: - dutycycle 90 - squarenote 4, 14, 7, 1537 - squarenote 8, 13, 6, 1539 - squarenote 4, 12, 6, 1537 - squarenote 12, 12, 3, 1409 - squarenote 8, 11, 3, 1411 - squarenote 4, 11, 2, 1410 - squarenote 8, 10, 1, 1393 - endchannel +SFX_Cry04_1_Ch6: + duty_cycle_pattern 90 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_1_Ch7: - noisenote 7, 13, 6, 92 - noisenote 8, 14, 6, 76 - noisenote 4, 13, 4, 92 - noisenote 4, 13, 4, 76 - noisenote 7, 12, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry04_1_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index def5b459..f2f2a0c7 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,32 +1,32 @@ -SFX_Cry04_2_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1696 - squarenote 8, 14, 6, 1700 - squarenote 4, 13, 6, 1696 - squarenote 12, 13, 3, 1568 - squarenote 8, 12, 3, 1572 - squarenote 4, 12, 2, 1568 - squarenote 8, 11, 1, 1552 - endchannel +SFX_Cry04_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_2_Ch5: - dutycycle 90 - squarenote 4, 14, 7, 1537 - squarenote 8, 13, 6, 1539 - squarenote 4, 12, 6, 1537 - squarenote 12, 12, 3, 1409 - squarenote 8, 11, 3, 1411 - squarenote 4, 11, 2, 1410 - squarenote 8, 10, 1, 1393 - endchannel +SFX_Cry04_2_Ch6: + duty_cycle_pattern 90 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_2_Ch7: - noisenote 7, 13, 6, 92 - noisenote 8, 14, 6, 76 - noisenote 4, 13, 4, 92 - noisenote 4, 13, 4, 76 - noisenote 7, 12, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry04_2_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 83e81ead..9e155fb4 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,32 +1,32 @@ -SFX_Cry04_3_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1696 - squarenote 8, 14, 6, 1700 - squarenote 4, 13, 6, 1696 - squarenote 12, 13, 3, 1568 - squarenote 8, 12, 3, 1572 - squarenote 4, 12, 2, 1568 - squarenote 8, 11, 1, 1552 - endchannel +SFX_Cry04_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_3_Ch5: - dutycycle 90 - squarenote 4, 14, 7, 1537 - squarenote 8, 13, 6, 1539 - squarenote 4, 12, 6, 1537 - squarenote 12, 12, 3, 1409 - squarenote 8, 11, 3, 1411 - squarenote 4, 11, 2, 1410 - squarenote 8, 10, 1, 1393 - endchannel +SFX_Cry04_3_Ch6: + duty_cycle_pattern 90 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_3_Ch7: - noisenote 7, 13, 6, 92 - noisenote 8, 14, 6, 76 - noisenote 4, 13, 4, 92 - noisenote 4, 13, 4, 76 - noisenote 7, 12, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry04_3_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 525fdc2d..8db2db6a 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,19 +1,19 @@ -SFX_Cry05_1_Ch4: - dutycycle 10 - squarenote 6, 14, 2, 1280 - squarenote 6, 14, 3, 1408 - squarenote 6, 13, 3, 1392 - squarenote 8, 10, 1, 1376 - endchannel +SFX_Cry05_1_Ch5: + duty_cycle_pattern 10 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_1_Ch5: - dutycycle 245 - squarenote 6, 14, 2, 1154 - squarenote 6, 13, 3, 1281 - squarenote 6, 11, 2, 1250 - squarenote 8, 8, 1, 1217 +SFX_Cry05_1_Ch6: + duty_cycle_pattern 245 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_1_Ch7: - endchannel +SFX_Cry05_1_Ch8: + sound_ret diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 44e8fb21..d9fe5208 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,19 +1,19 @@ -SFX_Cry05_2_Ch4: - dutycycle 10 - squarenote 6, 14, 2, 1280 - squarenote 6, 14, 3, 1408 - squarenote 6, 13, 3, 1392 - squarenote 8, 10, 1, 1376 - endchannel +SFX_Cry05_2_Ch5: + duty_cycle_pattern 10 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_2_Ch5: - dutycycle 245 - squarenote 6, 14, 2, 1154 - squarenote 6, 13, 3, 1281 - squarenote 6, 11, 2, 1250 - squarenote 8, 8, 1, 1217 +SFX_Cry05_2_Ch6: + duty_cycle_pattern 245 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_2_Ch7: - endchannel +SFX_Cry05_2_Ch8: + sound_ret diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 2fcb4e1f..57479f06 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,19 +1,19 @@ -SFX_Cry05_3_Ch4: - dutycycle 10 - squarenote 6, 14, 2, 1280 - squarenote 6, 14, 3, 1408 - squarenote 6, 13, 3, 1392 - squarenote 8, 10, 1, 1376 - endchannel +SFX_Cry05_3_Ch5: + duty_cycle_pattern 10 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_3_Ch5: - dutycycle 245 - squarenote 6, 14, 2, 1154 - squarenote 6, 13, 3, 1281 - squarenote 6, 11, 2, 1250 - squarenote 8, 8, 1, 1217 +SFX_Cry05_3_Ch6: + duty_cycle_pattern 245 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_3_Ch7: - endchannel +SFX_Cry05_3_Ch8: + sound_ret diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index 09099504..5b184121 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,22 +1,22 @@ -SFX_Cry06_1_Ch4: - dutycycle 250 - squarenote 6, 8, 3, 583 - squarenote 15, 6, 2, 550 - squarenote 4, 5, 2, 581 - squarenote 9, 6, 3, 518 - squarenote 15, 8, 2, 549 - squarenote 15, 4, 2, 519 +SFX_Cry06_1_Ch5: + duty_cycle_pattern 250 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_1_Ch5: - endchannel +SFX_Cry06_1_Ch6: + sound_ret -SFX_Cry06_1_Ch7: - noisenote 8, 13, 4, 140 - noisenote 4, 14, 2, 156 - noisenote 15, 12, 6, 140 - noisenote 8, 14, 4, 172 - noisenote 15, 13, 7, 156 - noisenote 15, 15, 2, 172 - endchannel +SFX_Cry06_1_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 75ca8228..3d32921b 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,22 +1,22 @@ -SFX_Cry06_2_Ch4: - dutycycle 250 - squarenote 6, 8, 3, 583 - squarenote 15, 6, 2, 550 - squarenote 4, 5, 2, 581 - squarenote 9, 6, 3, 518 - squarenote 15, 8, 2, 549 - squarenote 15, 4, 2, 519 +SFX_Cry06_2_Ch5: + duty_cycle_pattern 250 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_2_Ch5: - endchannel +SFX_Cry06_2_Ch6: + sound_ret -SFX_Cry06_2_Ch7: - noisenote 8, 13, 4, 140 - noisenote 4, 14, 2, 156 - noisenote 15, 12, 6, 140 - noisenote 8, 14, 4, 172 - noisenote 15, 13, 7, 156 - noisenote 15, 15, 2, 172 - endchannel +SFX_Cry06_2_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 760ca4f1..c847b1ab 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,22 +1,22 @@ -SFX_Cry06_3_Ch4: - dutycycle 250 - squarenote 6, 8, 3, 583 - squarenote 15, 6, 2, 550 - squarenote 4, 5, 2, 581 - squarenote 9, 6, 3, 518 - squarenote 15, 8, 2, 549 - squarenote 15, 4, 2, 519 +SFX_Cry06_3_Ch5: + duty_cycle_pattern 250 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_3_Ch5: - endchannel +SFX_Cry06_3_Ch6: + sound_ret -SFX_Cry06_3_Ch7: - noisenote 8, 13, 4, 140 - noisenote 4, 14, 2, 156 - noisenote 15, 12, 6, 140 - noisenote 8, 14, 4, 172 - noisenote 15, 13, 7, 156 - noisenote 15, 15, 2, 172 - endchannel +SFX_Cry06_3_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index 8a736136..5918d4d8 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,21 +1,21 @@ -SFX_Cry07_1_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1760 - squarenote 15, 14, 4, 1600 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry07_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_1_Ch5: - dutycycle 10 - squarenote 3, 12, 3, 1667 - squarenote 14, 11, 4, 1538 - squarenote 8, 10, 1, 1537 - endchannel +SFX_Cry07_1_Ch6: + duty_cycle_pattern 10 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_1_Ch7: - noisenote 4, 13, 3, 92 - noisenote 15, 14, 6, 76 - noisenote 8, 11, 1, 92 - endchannel +SFX_Cry07_1_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 8ccba10c..fcd82c8d 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,21 +1,21 @@ -SFX_Cry07_2_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1760 - squarenote 15, 14, 4, 1600 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry07_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_2_Ch5: - dutycycle 10 - squarenote 3, 12, 3, 1667 - squarenote 14, 11, 4, 1538 - squarenote 8, 10, 1, 1537 - endchannel +SFX_Cry07_2_Ch6: + duty_cycle_pattern 10 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_2_Ch7: - noisenote 4, 13, 3, 92 - noisenote 15, 14, 6, 76 - noisenote 8, 11, 1, 92 - endchannel +SFX_Cry07_2_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index bb90a016..a92dd02b 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,21 +1,21 @@ -SFX_Cry07_3_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1760 - squarenote 15, 14, 4, 1600 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry07_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_3_Ch5: - dutycycle 10 - squarenote 3, 12, 3, 1667 - squarenote 14, 11, 4, 1538 - squarenote 8, 10, 1, 1537 - endchannel +SFX_Cry07_3_Ch6: + duty_cycle_pattern 10 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_3_Ch7: - noisenote 4, 13, 3, 92 - noisenote 15, 14, 6, 76 - noisenote 8, 11, 1, 92 - endchannel +SFX_Cry07_3_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 18d324f4..044f4add 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,23 +1,23 @@ -SFX_Cry08_1_Ch4: - dutycycle 240 - squarenote 15, 15, 6, 1381 - squarenote 10, 14, 4, 1404 - squarenote 3, 12, 2, 1372 - squarenote 15, 11, 2, 1340 - endchannel +SFX_Cry08_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_1_Ch5: - dutycycle 90 - squarenote 14, 13, 6, 1283 - squarenote 9, 11, 4, 1307 - squarenote 4, 9, 2, 1274 - squarenote 15, 10, 2, 1243 - endchannel +SFX_Cry08_1_Ch6: + duty_cycle_pattern 90 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_1_Ch7: - noisenote 12, 14, 6, 76 - noisenote 11, 13, 7, 92 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry08_1_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 809ab706..50da09d9 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,23 +1,23 @@ -SFX_Cry08_2_Ch4: - dutycycle 240 - squarenote 15, 15, 6, 1381 - squarenote 10, 14, 4, 1404 - squarenote 3, 12, 2, 1372 - squarenote 15, 11, 2, 1340 - endchannel +SFX_Cry08_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_2_Ch5: - dutycycle 90 - squarenote 14, 13, 6, 1283 - squarenote 9, 11, 4, 1307 - squarenote 4, 9, 2, 1274 - squarenote 15, 10, 2, 1243 - endchannel +SFX_Cry08_2_Ch6: + duty_cycle_pattern 90 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_2_Ch7: - noisenote 12, 14, 6, 76 - noisenote 11, 13, 7, 92 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry08_2_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 37e83796..b18c8b75 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,23 +1,23 @@ -SFX_Cry08_3_Ch4: - dutycycle 240 - squarenote 15, 15, 6, 1381 - squarenote 10, 14, 4, 1404 - squarenote 3, 12, 2, 1372 - squarenote 15, 11, 2, 1340 - endchannel +SFX_Cry08_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_3_Ch5: - dutycycle 90 - squarenote 14, 13, 6, 1283 - squarenote 9, 11, 4, 1307 - squarenote 4, 9, 2, 1274 - squarenote 15, 10, 2, 1243 - endchannel +SFX_Cry08_3_Ch6: + duty_cycle_pattern 90 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_3_Ch7: - noisenote 12, 14, 6, 76 - noisenote 11, 13, 7, 92 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry08_3_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 8b0178d6..02206052 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,35 +1,35 @@ -SFX_Cry09_1_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1952 - squarenote 6, 14, 6, 1955 - squarenote 10, 15, 4, 1952 - dutycycle 165 - squarenote 10, 15, 6, 2008 - squarenote 4, 14, 3, 2007 - squarenote 15, 15, 2, 2008 - endchannel +SFX_Cry09_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 165 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_1_Ch5: - dutycycle 5 - squarenote 2, 0, 8, 0 - squarenote 15, 10, 7, 1697 - squarenote 6, 8, 6, 1698 - squarenote 10, 7, 4, 1697 - dutycycle 95 - squarenote 10, 7, 6, 1750 - squarenote 4, 8, 3, 1753 - squarenote 15, 10, 2, 1751 - endchannel +SFX_Cry09_1_Ch6: + duty_cycle_pattern 5 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 95 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_1_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 15, 13, 7, 60 - noisenote 6, 12, 5, 59 - noisenote 6, 14, 4, 61 - noisenote 8, 11, 6, 60 - noisenote 6, 13, 4, 61 - noisenote 8, 12, 1, 59 - endchannel +SFX_Cry09_1_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 378c07bd..545a77cc 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,35 +1,35 @@ -SFX_Cry09_2_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1952 - squarenote 6, 14, 6, 1955 - squarenote 10, 15, 4, 1952 - dutycycle 165 - squarenote 10, 15, 6, 2008 - squarenote 4, 14, 3, 2007 - squarenote 15, 15, 2, 2008 - endchannel +SFX_Cry09_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 165 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_2_Ch5: - dutycycle 5 - squarenote 2, 0, 8, 0 - squarenote 15, 10, 7, 1697 - squarenote 6, 8, 6, 1698 - squarenote 10, 7, 4, 1697 - dutycycle 95 - squarenote 10, 7, 6, 1750 - squarenote 4, 8, 3, 1753 - squarenote 15, 10, 2, 1751 - endchannel +SFX_Cry09_2_Ch6: + duty_cycle_pattern 5 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 95 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_2_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 15, 13, 7, 60 - noisenote 6, 12, 5, 59 - noisenote 6, 14, 4, 61 - noisenote 8, 11, 6, 60 - noisenote 6, 13, 4, 61 - noisenote 8, 12, 1, 59 - endchannel +SFX_Cry09_2_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 7bf098b1..d842066c 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,35 +1,35 @@ -SFX_Cry09_3_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1952 - squarenote 6, 14, 6, 1955 - squarenote 10, 15, 4, 1952 - dutycycle 165 - squarenote 10, 15, 6, 2008 - squarenote 4, 14, 3, 2007 - squarenote 15, 15, 2, 2008 - endchannel +SFX_Cry09_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 165 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_3_Ch5: - dutycycle 5 - squarenote 2, 0, 8, 0 - squarenote 15, 10, 7, 1697 - squarenote 6, 8, 6, 1698 - squarenote 10, 7, 4, 1697 - dutycycle 95 - squarenote 10, 7, 6, 1750 - squarenote 4, 8, 3, 1753 - squarenote 15, 10, 2, 1751 - endchannel +SFX_Cry09_3_Ch6: + duty_cycle_pattern 5 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 95 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_3_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 15, 13, 7, 60 - noisenote 6, 12, 5, 59 - noisenote 6, 14, 4, 61 - noisenote 8, 11, 6, 60 - noisenote 6, 13, 4, 61 - noisenote 8, 12, 1, 59 - endchannel +SFX_Cry09_3_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 45b293ca..fa1a0c31 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_1_Ch4: - dutycycle 240 - squarenote 8, 15, 7, 1760 - squarenote 6, 14, 6, 1765 - squarenote 3, 15, 4, 1760 - squarenote 3, 15, 6, 1744 - squarenote 3, 14, 3, 1728 - squarenote 4, 15, 2, 1712 - squarenote 15, 10, 2, 1736 - endchannel +SFX_Cry0A_1_Ch5: + duty_cycle_pattern 240 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_1_Ch5: - dutycycle 5 - squarenote 3, 0, 8, 0 - squarenote 8, 10, 7, 1697 - squarenote 6, 8, 6, 1699 - squarenote 3, 7, 4, 1697 - squarenote 3, 7, 6, 1681 - squarenote 3, 8, 3, 1666 - squarenote 4, 10, 2, 1649 - squarenote 15, 7, 2, 1673 - endchannel +SFX_Cry0A_1_Ch6: + duty_cycle_pattern 5 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_1_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 8, 13, 7, 60 - noisenote 5, 12, 5, 59 - noisenote 3, 13, 4, 44 - noisenote 2, 11, 6, 60 - noisenote 3, 10, 4, 44 - noisenote 8, 9, 1, 60 - endchannel +SFX_Cry0A_1_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index a4d3b839..af07ff25 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_2_Ch4: - dutycycle 240 - squarenote 8, 15, 7, 1760 - squarenote 6, 14, 6, 1765 - squarenote 3, 15, 4, 1760 - squarenote 3, 15, 6, 1744 - squarenote 3, 14, 3, 1728 - squarenote 4, 15, 2, 1712 - squarenote 15, 10, 2, 1736 - endchannel +SFX_Cry0A_2_Ch5: + duty_cycle_pattern 240 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_2_Ch5: - dutycycle 5 - squarenote 3, 0, 8, 0 - squarenote 8, 10, 7, 1697 - squarenote 6, 8, 6, 1699 - squarenote 3, 7, 4, 1697 - squarenote 3, 7, 6, 1681 - squarenote 3, 8, 3, 1666 - squarenote 4, 10, 2, 1649 - squarenote 15, 7, 2, 1673 - endchannel +SFX_Cry0A_2_Ch6: + duty_cycle_pattern 5 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_2_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 8, 13, 7, 60 - noisenote 5, 12, 5, 59 - noisenote 3, 13, 4, 44 - noisenote 2, 11, 6, 60 - noisenote 3, 10, 4, 44 - noisenote 8, 9, 1, 60 - endchannel +SFX_Cry0A_2_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 5c6617fb..f0bb527a 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_3_Ch4: - dutycycle 240 - squarenote 8, 15, 7, 1760 - squarenote 6, 14, 6, 1765 - squarenote 3, 15, 4, 1760 - squarenote 3, 15, 6, 1744 - squarenote 3, 14, 3, 1728 - squarenote 4, 15, 2, 1712 - squarenote 15, 10, 2, 1736 - endchannel +SFX_Cry0A_3_Ch5: + duty_cycle_pattern 240 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_3_Ch5: - dutycycle 5 - squarenote 3, 0, 8, 0 - squarenote 8, 10, 7, 1697 - squarenote 6, 8, 6, 1699 - squarenote 3, 7, 4, 1697 - squarenote 3, 7, 6, 1681 - squarenote 3, 8, 3, 1666 - squarenote 4, 10, 2, 1649 - squarenote 15, 7, 2, 1673 - endchannel +SFX_Cry0A_3_Ch6: + duty_cycle_pattern 5 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_3_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 8, 13, 7, 60 - noisenote 5, 12, 5, 59 - noisenote 3, 13, 4, 44 - noisenote 2, 11, 6, 60 - noisenote 3, 10, 4, 44 - noisenote 8, 9, 1, 60 - endchannel +SFX_Cry0A_3_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index ba8e1e1b..9b2104aa 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_1_Ch4: - dutycycle 204 - squarenote 4, 15, 1, 1792 - squarenote 4, 14, 1, 1920 - squarenote 4, 13, 1, 1856 - squarenote 4, 14, 1, 1856 - squarenote 4, 15, 1, 1920 - squarenote 4, 13, 1, 1792 - squarenote 4, 15, 1, 1793 - squarenote 4, 13, 1, 1922 - squarenote 4, 12, 1, 1858 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Cry0B_1_Ch5: + duty_cycle_pattern 204 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_1_Ch5: - dutycycle 68 - squarenote 12, 0, 8, 0 - squarenote 4, 15, 1, 1793 - squarenote 4, 14, 1, 1922 - squarenote 4, 13, 1, 1857 - squarenote 4, 14, 1, 1857 - squarenote 4, 15, 1, 1922 - squarenote 8, 13, 1, 1793 - endchannel +SFX_Cry0B_1_Ch6: + duty_cycle_pattern 68 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_1_Ch7: - noisenote 15, 0, 8, 0 - noisenote 4, 0, 8, 0 - noisenote 4, 13, 1, 76 - noisenote 4, 11, 1, 44 - noisenote 4, 13, 1, 60 - noisenote 4, 11, 1, 60 - noisenote 4, 12, 1, 44 - noisenote 8, 10, 1, 76 - endchannel +SFX_Cry0B_1_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 9cbf1ee5..37e17243 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_2_Ch4: - dutycycle 204 - squarenote 4, 15, 1, 1792 - squarenote 4, 14, 1, 1920 - squarenote 4, 13, 1, 1856 - squarenote 4, 14, 1, 1856 - squarenote 4, 15, 1, 1920 - squarenote 4, 13, 1, 1792 - squarenote 4, 15, 1, 1793 - squarenote 4, 13, 1, 1922 - squarenote 4, 12, 1, 1858 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Cry0B_2_Ch5: + duty_cycle_pattern 204 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_2_Ch5: - dutycycle 68 - squarenote 12, 0, 8, 0 - squarenote 4, 15, 1, 1793 - squarenote 4, 14, 1, 1922 - squarenote 4, 13, 1, 1857 - squarenote 4, 14, 1, 1857 - squarenote 4, 15, 1, 1922 - squarenote 8, 13, 1, 1793 - endchannel +SFX_Cry0B_2_Ch6: + duty_cycle_pattern 68 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_2_Ch7: - noisenote 15, 0, 8, 0 - noisenote 4, 0, 8, 0 - noisenote 4, 13, 1, 76 - noisenote 4, 11, 1, 44 - noisenote 4, 13, 1, 60 - noisenote 4, 11, 1, 60 - noisenote 4, 12, 1, 44 - noisenote 8, 10, 1, 76 - endchannel +SFX_Cry0B_2_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index 559fbbe0..9e788f53 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_3_Ch4: - dutycycle 204 - squarenote 4, 15, 1, 1792 - squarenote 4, 14, 1, 1920 - squarenote 4, 13, 1, 1856 - squarenote 4, 14, 1, 1856 - squarenote 4, 15, 1, 1920 - squarenote 4, 13, 1, 1792 - squarenote 4, 15, 1, 1793 - squarenote 4, 13, 1, 1922 - squarenote 4, 12, 1, 1858 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Cry0B_3_Ch5: + duty_cycle_pattern 204 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_3_Ch5: - dutycycle 68 - squarenote 12, 0, 8, 0 - squarenote 4, 15, 1, 1793 - squarenote 4, 14, 1, 1922 - squarenote 4, 13, 1, 1857 - squarenote 4, 14, 1, 1857 - squarenote 4, 15, 1, 1922 - squarenote 8, 13, 1, 1793 - endchannel +SFX_Cry0B_3_Ch6: + duty_cycle_pattern 68 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_3_Ch7: - noisenote 15, 0, 8, 0 - noisenote 4, 0, 8, 0 - noisenote 4, 13, 1, 76 - noisenote 4, 11, 1, 44 - noisenote 4, 13, 1, 60 - noisenote 4, 11, 1, 60 - noisenote 4, 12, 1, 44 - noisenote 8, 10, 1, 76 - endchannel +SFX_Cry0B_3_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 25246488..67f30936 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_1_Ch4: - dutycycle 204 - squarenote 8, 15, 5, 1536 - squarenote 2, 13, 2, 1592 - squarenote 2, 12, 2, 1584 - squarenote 2, 12, 2, 1576 - squarenote 2, 11, 2, 1568 - squarenote 2, 11, 2, 1552 - squarenote 2, 10, 2, 1560 - squarenote 2, 11, 2, 1552 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry0C_1_Ch5: + duty_cycle_pattern 204 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_1_Ch5: - dutycycle 68 - squarenote 12, 12, 3, 1472 - squarenote 3, 11, 1, 1529 - squarenote 2, 10, 1, 1521 - squarenote 2, 10, 1, 1513 - squarenote 2, 9, 1, 1505 - squarenote 2, 9, 1, 1497 - squarenote 2, 8, 1, 1489 - squarenote 2, 9, 1, 1497 - squarenote 8, 9, 1, 1505 +SFX_Cry0C_1_Ch6: + duty_cycle_pattern 68 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_1_Ch7: - endchannel +SFX_Cry0C_1_Ch8: + sound_ret diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index e94609c9..dd1a90c1 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_2_Ch4: - dutycycle 204 - squarenote 8, 15, 5, 1536 - squarenote 2, 13, 2, 1592 - squarenote 2, 12, 2, 1584 - squarenote 2, 12, 2, 1576 - squarenote 2, 11, 2, 1568 - squarenote 2, 11, 2, 1552 - squarenote 2, 10, 2, 1560 - squarenote 2, 11, 2, 1552 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry0C_2_Ch5: + duty_cycle_pattern 204 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_2_Ch5: - dutycycle 68 - squarenote 12, 12, 3, 1472 - squarenote 3, 11, 1, 1529 - squarenote 2, 10, 1, 1521 - squarenote 2, 10, 1, 1513 - squarenote 2, 9, 1, 1505 - squarenote 2, 9, 1, 1497 - squarenote 2, 8, 1, 1489 - squarenote 2, 9, 1, 1497 - squarenote 8, 9, 1, 1505 +SFX_Cry0C_2_Ch6: + duty_cycle_pattern 68 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_2_Ch7: - endchannel +SFX_Cry0C_2_Ch8: + sound_ret diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index ac5296c6..024bab85 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_3_Ch4: - dutycycle 204 - squarenote 8, 15, 5, 1536 - squarenote 2, 13, 2, 1592 - squarenote 2, 12, 2, 1584 - squarenote 2, 12, 2, 1576 - squarenote 2, 11, 2, 1568 - squarenote 2, 11, 2, 1552 - squarenote 2, 10, 2, 1560 - squarenote 2, 11, 2, 1552 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry0C_3_Ch5: + duty_cycle_pattern 204 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_3_Ch5: - dutycycle 68 - squarenote 12, 12, 3, 1472 - squarenote 3, 11, 1, 1529 - squarenote 2, 10, 1, 1521 - squarenote 2, 10, 1, 1513 - squarenote 2, 9, 1, 1505 - squarenote 2, 9, 1, 1497 - squarenote 2, 8, 1, 1489 - squarenote 2, 9, 1, 1497 - squarenote 8, 9, 1, 1505 +SFX_Cry0C_3_Ch6: + duty_cycle_pattern 68 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_3_Ch7: - endchannel +SFX_Cry0C_3_Ch8: + sound_ret diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 9403af3a..ac9963f2 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_1_Ch4: - dutycycle 136 - squarenote 5, 15, 2, 1616 - squarenote 9, 13, 1, 1632 - squarenote 5, 14, 2, 1554 - squarenote 9, 12, 1, 1570 - squarenote 5, 15, 2, 1552 - squarenote 6, 13, 1, 1568 - loopchannel 2, SFX_Cry0D_1_Ch4 - endchannel +SFX_Cry0D_1_Ch5: + duty_cycle_pattern 136 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_1_Ch5 + sound_ret -SFX_Cry0D_1_Ch5: - dutycycle 64 - squarenote 4, 0, 8, 0 - squarenote 5, 15, 2, 1617 - squarenote 9, 13, 1, 1633 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 12, 13, 1, 1569 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 4, 13, 1, 1569 - endchannel +SFX_Cry0D_1_Ch6: + duty_cycle_pattern 64 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_1_Ch7: - noisenote 6, 13, 2, 28 - noisenote 9, 11, 1, 44 - noisenote 8, 12, 2, 44 - noisenote 9, 11, 1, 60 - noisenote 6, 12, 2, 44 - noisenote 9, 10, 2, 60 - noisenote 7, 12, 2, 44 - noisenote 5, 10, 1, 60 - noisenote 9, 12, 2, 44 - noisenote 4, 10, 1, 60 - endchannel +SFX_Cry0D_1_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 9d570892..8c6dd050 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_2_Ch4: - dutycycle 136 - squarenote 5, 15, 2, 1616 - squarenote 9, 13, 1, 1632 - squarenote 5, 14, 2, 1554 - squarenote 9, 12, 1, 1570 - squarenote 5, 15, 2, 1552 - squarenote 6, 13, 1, 1568 - loopchannel 2, SFX_Cry0D_2_Ch4 - endchannel +SFX_Cry0D_2_Ch5: + duty_cycle_pattern 136 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_2_Ch5 + sound_ret -SFX_Cry0D_2_Ch5: - dutycycle 64 - squarenote 4, 0, 8, 0 - squarenote 5, 15, 2, 1617 - squarenote 9, 13, 1, 1633 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 12, 13, 1, 1569 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 4, 13, 1, 1569 - endchannel +SFX_Cry0D_2_Ch6: + duty_cycle_pattern 64 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_2_Ch7: - noisenote 6, 13, 2, 28 - noisenote 9, 11, 1, 44 - noisenote 8, 12, 2, 44 - noisenote 9, 11, 1, 60 - noisenote 6, 12, 2, 44 - noisenote 9, 10, 2, 60 - noisenote 7, 12, 2, 44 - noisenote 5, 10, 1, 60 - noisenote 9, 12, 2, 44 - noisenote 4, 10, 1, 60 - endchannel +SFX_Cry0D_2_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 18125238..487faa53 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_3_Ch4: - dutycycle 136 - squarenote 5, 15, 2, 1616 - squarenote 9, 13, 1, 1632 - squarenote 5, 14, 2, 1554 - squarenote 9, 12, 1, 1570 - squarenote 5, 15, 2, 1552 - squarenote 6, 13, 1, 1568 - loopchannel 2, SFX_Cry0D_3_Ch4 - endchannel +SFX_Cry0D_3_Ch5: + duty_cycle_pattern 136 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_3_Ch5 + sound_ret -SFX_Cry0D_3_Ch5: - dutycycle 64 - squarenote 4, 0, 8, 0 - squarenote 5, 15, 2, 1617 - squarenote 9, 13, 1, 1633 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 12, 13, 1, 1569 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 4, 13, 1, 1569 - endchannel +SFX_Cry0D_3_Ch6: + duty_cycle_pattern 64 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_3_Ch7: - noisenote 6, 13, 2, 28 - noisenote 9, 11, 1, 44 - noisenote 8, 12, 2, 44 - noisenote 9, 11, 1, 60 - noisenote 6, 12, 2, 44 - noisenote 9, 10, 2, 60 - noisenote 7, 12, 2, 44 - noisenote 5, 10, 1, 60 - noisenote 9, 12, 2, 44 - noisenote 4, 10, 1, 60 - endchannel +SFX_Cry0D_3_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index c5a166b7..3067b15a 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_1_Ch4: - dutycycle 165 - squarenote 4, 14, 1, 1792 - squarenote 4, 15, 2, 1920 - squarenote 2, 9, 2, 1856 - squarenote 8, 14, 1, 1536 - endchannel +SFX_Cry0E_1_Ch5: + duty_cycle_pattern 165 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_1_Ch5: - dutycycle 10 - squarenote 4, 11, 1, 1761 - squarenote 3, 12, 2, 1761 - squarenote 3, 6, 2, 1665 - squarenote 8, 11, 1, 1505 - endchannel +SFX_Cry0E_1_Ch6: + duty_cycle_pattern 10 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_1_Ch7: - noisenote 2, 6, 1, 50 - noisenote 2, 6, 1, 33 - noisenote 8, 6, 1, 17 - endchannel +SFX_Cry0E_1_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 943b12f4..b3849fc5 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_2_Ch4: - dutycycle 165 - squarenote 4, 14, 1, 1792 - squarenote 4, 15, 2, 1920 - squarenote 2, 9, 2, 1856 - squarenote 8, 14, 1, 1536 - endchannel +SFX_Cry0E_2_Ch5: + duty_cycle_pattern 165 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_2_Ch5: - dutycycle 10 - squarenote 4, 11, 1, 1761 - squarenote 3, 12, 2, 1761 - squarenote 3, 6, 2, 1665 - squarenote 8, 11, 1, 1505 - endchannel +SFX_Cry0E_2_Ch6: + duty_cycle_pattern 10 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_2_Ch7: - noisenote 2, 6, 1, 50 - noisenote 2, 6, 1, 33 - noisenote 8, 6, 1, 17 - endchannel +SFX_Cry0E_2_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index c500b326..493f91e2 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_3_Ch4: - dutycycle 165 - squarenote 4, 14, 1, 1792 - squarenote 4, 15, 2, 1920 - squarenote 2, 9, 2, 1856 - squarenote 8, 14, 1, 1536 - endchannel +SFX_Cry0E_3_Ch5: + duty_cycle_pattern 165 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_3_Ch5: - dutycycle 10 - squarenote 4, 11, 1, 1761 - squarenote 3, 12, 2, 1761 - squarenote 3, 6, 2, 1665 - squarenote 8, 11, 1, 1505 - endchannel +SFX_Cry0E_3_Ch6: + duty_cycle_pattern 10 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_3_Ch7: - noisenote 2, 6, 1, 50 - noisenote 2, 6, 1, 33 - noisenote 8, 6, 1, 17 - endchannel +SFX_Cry0E_3_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index e959205e..9dbef1fb 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_1_Ch4: - dutycycle 241 - squarenote 4, 15, 7, 1984 - squarenote 12, 14, 6, 1986 - squarenote 6, 11, 5, 1664 - squarenote 4, 12, 4, 1648 - squarenote 4, 11, 5, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry0F_1_Ch5: + duty_cycle_pattern 241 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_1_Ch5: - dutycycle 204 - squarenote 3, 12, 7, 1921 - squarenote 12, 11, 6, 1920 - squarenote 6, 10, 5, 1601 - squarenote 4, 12, 4, 1586 - squarenote 6, 11, 5, 1569 - squarenote 8, 10, 1, 1538 - endchannel +SFX_Cry0F_1_Ch6: + duty_cycle_pattern 204 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_1_Ch7: - noisenote 3, 14, 4, 60 - noisenote 12, 13, 6, 44 - noisenote 4, 14, 4, 60 - noisenote 8, 11, 7, 92 - noisenote 15, 12, 2, 93 - endchannel +SFX_Cry0F_1_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index dc052645..7de545a4 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_2_Ch4: - dutycycle 241 - squarenote 4, 15, 7, 1984 - squarenote 12, 14, 6, 1986 - squarenote 6, 11, 5, 1664 - squarenote 4, 12, 4, 1648 - squarenote 4, 11, 5, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry0F_2_Ch5: + duty_cycle_pattern 241 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_2_Ch5: - dutycycle 204 - squarenote 3, 12, 7, 1921 - squarenote 12, 11, 6, 1920 - squarenote 6, 10, 5, 1601 - squarenote 4, 12, 4, 1586 - squarenote 6, 11, 5, 1569 - squarenote 8, 10, 1, 1538 - endchannel +SFX_Cry0F_2_Ch6: + duty_cycle_pattern 204 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_2_Ch7: - noisenote 3, 14, 4, 60 - noisenote 12, 13, 6, 44 - noisenote 4, 14, 4, 60 - noisenote 8, 11, 7, 92 - noisenote 15, 12, 2, 93 - endchannel +SFX_Cry0F_2_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 2705d73d..0d3d68b0 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_3_Ch4: - dutycycle 241 - squarenote 4, 15, 7, 1984 - squarenote 12, 14, 6, 1986 - squarenote 6, 11, 5, 1664 - squarenote 4, 12, 4, 1648 - squarenote 4, 11, 5, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry0F_3_Ch5: + duty_cycle_pattern 241 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_3_Ch5: - dutycycle 204 - squarenote 3, 12, 7, 1921 - squarenote 12, 11, 6, 1920 - squarenote 6, 10, 5, 1601 - squarenote 4, 12, 4, 1586 - squarenote 6, 11, 5, 1569 - squarenote 8, 10, 1, 1538 - endchannel +SFX_Cry0F_3_Ch6: + duty_cycle_pattern 204 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_3_Ch7: - noisenote 3, 14, 4, 60 - noisenote 12, 13, 6, 44 - noisenote 4, 14, 4, 60 - noisenote 8, 11, 7, 92 - noisenote 15, 12, 2, 93 - endchannel +SFX_Cry0F_3_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 95c72f8a..bcaa75ac 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,31 +1,31 @@ -SFX_Cry10_1_Ch4: - dutycycle 201 - squarenote 8, 15, 7, 1664 - squarenote 2, 15, 7, 1632 - squarenote 1, 14, 7, 1600 - squarenote 1, 14, 7, 1568 - squarenote 15, 13, 1, 1536 - squarenote 4, 12, 7, 1856 - squarenote 4, 10, 7, 1840 - squarenote 15, 9, 1, 1824 - endchannel +SFX_Cry10_1_Ch5: + duty_cycle_pattern 201 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_1_Ch5: - dutycycle 121 - squarenote 10, 14, 7, 1666 - squarenote 2, 14, 7, 1634 - squarenote 1, 13, 7, 1602 - squarenote 1, 13, 7, 1570 - squarenote 15, 12, 1, 1538 - squarenote 4, 11, 7, 1858 - squarenote 2, 9, 7, 1842 - squarenote 15, 8, 1, 1826 - endchannel +SFX_Cry10_1_Ch6: + duty_cycle_pattern 121 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_1_Ch7: - noisenote 4, 7, 4, 33 - noisenote 4, 7, 4, 16 - noisenote 4, 7, 1, 32 - endchannel +SFX_Cry10_1_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 569e50e2..12c8322e 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,31 +1,31 @@ -SFX_Cry10_2_Ch4: - dutycycle 201 - squarenote 8, 15, 7, 1664 - squarenote 2, 15, 7, 1632 - squarenote 1, 14, 7, 1600 - squarenote 1, 14, 7, 1568 - squarenote 15, 13, 1, 1536 - squarenote 4, 12, 7, 1856 - squarenote 4, 10, 7, 1840 - squarenote 15, 9, 1, 1824 - endchannel +SFX_Cry10_2_Ch5: + duty_cycle_pattern 201 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_2_Ch5: - dutycycle 121 - squarenote 10, 14, 7, 1666 - squarenote 2, 14, 7, 1634 - squarenote 1, 13, 7, 1602 - squarenote 1, 13, 7, 1570 - squarenote 15, 12, 1, 1538 - squarenote 4, 11, 7, 1858 - squarenote 2, 9, 7, 1842 - squarenote 15, 8, 1, 1826 - endchannel +SFX_Cry10_2_Ch6: + duty_cycle_pattern 121 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_2_Ch7: - noisenote 4, 7, 4, 33 - noisenote 4, 7, 4, 16 - noisenote 4, 7, 1, 32 - endchannel +SFX_Cry10_2_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 1ac5776b..ac7b4655 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,31 +1,31 @@ -SFX_Cry10_3_Ch4: - dutycycle 201 - squarenote 8, 15, 7, 1664 - squarenote 2, 15, 7, 1632 - squarenote 1, 14, 7, 1600 - squarenote 1, 14, 7, 1568 - squarenote 15, 13, 1, 1536 - squarenote 4, 12, 7, 1856 - squarenote 4, 10, 7, 1840 - squarenote 15, 9, 1, 1824 - endchannel +SFX_Cry10_3_Ch5: + duty_cycle_pattern 201 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_3_Ch5: - dutycycle 121 - squarenote 10, 14, 7, 1666 - squarenote 2, 14, 7, 1634 - squarenote 1, 13, 7, 1602 - squarenote 1, 13, 7, 1570 - squarenote 15, 12, 1, 1538 - squarenote 4, 11, 7, 1858 - squarenote 2, 9, 7, 1842 - squarenote 15, 8, 1, 1826 - endchannel +SFX_Cry10_3_Ch6: + duty_cycle_pattern 121 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_3_Ch7: - noisenote 4, 7, 4, 33 - noisenote 4, 7, 4, 16 - noisenote 4, 7, 1, 32 - endchannel +SFX_Cry10_3_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index 5af0fef3..5616317e 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,34 +1,34 @@ -SFX_Cry11_1_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1952 - squarenote 8, 14, 6, 1956 - squarenote 4, 13, 6, 1952 - squarenote 15, 13, 3, 1824 - squarenote 8, 12, 3, 1827 - squarenote 2, 12, 2, 1832 - squarenote 8, 11, 1, 1840 - endchannel +SFX_Cry11_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_1_Ch5: - dutycycle 10 - squarenote 4, 0, 8, 0 - squarenote 6, 10, 7, 1857 - squarenote 8, 8, 6, 1859 - squarenote 4, 7, 6, 1857 - squarenote 13, 8, 3, 1730 - squarenote 7, 7, 3, 1729 - squarenote 3, 8, 2, 1740 - squarenote 8, 7, 1, 1752 - endchannel +SFX_Cry11_1_Ch6: + duty_cycle_pattern 10 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_1_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 6, 58 - noisenote 4, 13, 7, 58 - noisenote 6, 13, 6, 44 - noisenote 8, 14, 5, 60 - noisenote 12, 13, 2, 61 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry11_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 6000549a..9ff4396d 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,34 +1,34 @@ -SFX_Cry11_2_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1952 - squarenote 8, 14, 6, 1956 - squarenote 4, 13, 6, 1952 - squarenote 15, 13, 3, 1824 - squarenote 8, 12, 3, 1827 - squarenote 2, 12, 2, 1832 - squarenote 8, 11, 1, 1840 - endchannel +SFX_Cry11_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_2_Ch5: - dutycycle 10 - squarenote 4, 0, 8, 0 - squarenote 6, 10, 7, 1857 - squarenote 8, 8, 6, 1859 - squarenote 4, 7, 6, 1857 - squarenote 13, 8, 3, 1730 - squarenote 7, 7, 3, 1729 - squarenote 3, 8, 2, 1740 - squarenote 8, 7, 1, 1752 - endchannel +SFX_Cry11_2_Ch6: + duty_cycle_pattern 10 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_2_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 6, 58 - noisenote 4, 13, 7, 58 - noisenote 6, 13, 6, 44 - noisenote 8, 14, 5, 60 - noisenote 12, 13, 2, 61 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry11_2_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index c877f28a..43b95fe8 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,34 +1,34 @@ -SFX_Cry11_3_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1952 - squarenote 8, 14, 6, 1956 - squarenote 4, 13, 6, 1952 - squarenote 15, 13, 3, 1824 - squarenote 8, 12, 3, 1827 - squarenote 2, 12, 2, 1832 - squarenote 8, 11, 1, 1840 - endchannel +SFX_Cry11_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_3_Ch5: - dutycycle 10 - squarenote 4, 0, 8, 0 - squarenote 6, 10, 7, 1857 - squarenote 8, 8, 6, 1859 - squarenote 4, 7, 6, 1857 - squarenote 13, 8, 3, 1730 - squarenote 7, 7, 3, 1729 - squarenote 3, 8, 2, 1740 - squarenote 8, 7, 1, 1752 - endchannel +SFX_Cry11_3_Ch6: + duty_cycle_pattern 10 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_3_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 6, 58 - noisenote 4, 13, 7, 58 - noisenote 6, 13, 6, 44 - noisenote 8, 14, 5, 60 - noisenote 12, 13, 2, 61 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry11_3_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index a453a110..c87d178d 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,24 +1,24 @@ -SFX_Cry12_1_Ch4: - dutycycle 165 - squarenote 12, 15, 2, 1088 - squarenote 15, 14, 3, 1184 - squarenote 4, 13, 2, 1168 - squarenote 8, 13, 1, 1152 - endchannel +SFX_Cry12_1_Ch5: + duty_cycle_pattern 165 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_1_Ch5: - dutycycle 238 - squarenote 11, 13, 2, 1080 - squarenote 14, 12, 6, 1176 - squarenote 3, 11, 2, 1160 - squarenote 8, 11, 1, 1144 - endchannel +SFX_Cry12_1_Ch6: + duty_cycle_pattern 238 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_1_Ch7: - noisenote 10, 14, 6, 108 - noisenote 15, 13, 2, 92 - noisenote 3, 12, 2, 108 - noisenote 8, 13, 1, 92 - endchannel +SFX_Cry12_1_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4f3d39e4..921b27be 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,24 +1,24 @@ -SFX_Cry12_2_Ch4: - dutycycle 165 - squarenote 12, 15, 2, 1088 - squarenote 15, 14, 3, 1184 - squarenote 4, 13, 2, 1168 - squarenote 8, 13, 1, 1152 - endchannel +SFX_Cry12_2_Ch5: + duty_cycle_pattern 165 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_2_Ch5: - dutycycle 238 - squarenote 11, 13, 2, 1080 - squarenote 14, 12, 6, 1176 - squarenote 3, 11, 2, 1160 - squarenote 8, 11, 1, 1144 - endchannel +SFX_Cry12_2_Ch6: + duty_cycle_pattern 238 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_2_Ch7: - noisenote 10, 14, 6, 108 - noisenote 15, 13, 2, 92 - noisenote 3, 12, 2, 108 - noisenote 8, 13, 1, 92 - endchannel +SFX_Cry12_2_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 033b02bb..98569ea8 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,24 +1,24 @@ -SFX_Cry12_3_Ch4: - dutycycle 165 - squarenote 12, 15, 2, 1088 - squarenote 15, 14, 3, 1184 - squarenote 4, 13, 2, 1168 - squarenote 8, 13, 1, 1152 - endchannel +SFX_Cry12_3_Ch5: + duty_cycle_pattern 165 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_3_Ch5: - dutycycle 238 - squarenote 11, 13, 2, 1080 - squarenote 14, 12, 6, 1176 - squarenote 3, 11, 2, 1160 - squarenote 8, 11, 1, 1144 - endchannel +SFX_Cry12_3_Ch6: + duty_cycle_pattern 238 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_3_Ch7: - noisenote 10, 14, 6, 108 - noisenote 15, 13, 2, 92 - noisenote 3, 12, 2, 108 - noisenote 8, 13, 1, 92 - endchannel +SFX_Cry12_3_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 67db31fe..6392f327 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,30 +1,30 @@ -SFX_Cry13_1_Ch4: - dutycycle 51 - squarenote 15, 15, 6, 1472 - squarenote 8, 14, 3, 1468 - squarenote 6, 13, 2, 1488 - squarenote 6, 11, 2, 1504 - squarenote 6, 12, 2, 1520 - squarenote 8, 11, 1, 1536 - endchannel +SFX_Cry13_1_Ch5: + duty_cycle_pattern 51 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_1_Ch5: - dutycycle 153 - squarenote 14, 12, 6, 1201 - squarenote 7, 12, 3, 1197 - squarenote 5, 11, 2, 1217 - squarenote 8, 9, 2, 1233 - squarenote 6, 10, 2, 1249 - squarenote 8, 9, 1, 1265 - endchannel +SFX_Cry13_1_Ch6: + duty_cycle_pattern 153 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_1_Ch7: - noisenote 10, 14, 6, 92 - noisenote 10, 13, 6, 108 - noisenote 4, 12, 2, 76 - noisenote 6, 13, 3, 92 - noisenote 8, 11, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry13_1_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index f1262bdc..0247bc39 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,30 +1,30 @@ -SFX_Cry13_2_Ch4: - dutycycle 51 - squarenote 15, 15, 6, 1472 - squarenote 8, 14, 3, 1468 - squarenote 6, 13, 2, 1488 - squarenote 6, 11, 2, 1504 - squarenote 6, 12, 2, 1520 - squarenote 8, 11, 1, 1536 - endchannel +SFX_Cry13_2_Ch5: + duty_cycle_pattern 51 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_2_Ch5: - dutycycle 153 - squarenote 14, 12, 6, 1201 - squarenote 7, 12, 3, 1197 - squarenote 5, 11, 2, 1217 - squarenote 8, 9, 2, 1233 - squarenote 6, 10, 2, 1249 - squarenote 8, 9, 1, 1265 - endchannel +SFX_Cry13_2_Ch6: + duty_cycle_pattern 153 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_2_Ch7: - noisenote 10, 14, 6, 92 - noisenote 10, 13, 6, 108 - noisenote 4, 12, 2, 76 - noisenote 6, 13, 3, 92 - noisenote 8, 11, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry13_2_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index f81dbe29..99871861 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,30 +1,30 @@ -SFX_Cry13_3_Ch4: - dutycycle 51 - squarenote 15, 15, 6, 1472 - squarenote 8, 14, 3, 1468 - squarenote 6, 13, 2, 1488 - squarenote 6, 11, 2, 1504 - squarenote 6, 12, 2, 1520 - squarenote 8, 11, 1, 1536 - endchannel +SFX_Cry13_3_Ch5: + duty_cycle_pattern 51 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_3_Ch5: - dutycycle 153 - squarenote 14, 12, 6, 1201 - squarenote 7, 12, 3, 1197 - squarenote 5, 11, 2, 1217 - squarenote 8, 9, 2, 1233 - squarenote 6, 10, 2, 1249 - squarenote 8, 9, 1, 1265 - endchannel +SFX_Cry13_3_Ch6: + duty_cycle_pattern 153 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_3_Ch7: - noisenote 10, 14, 6, 92 - noisenote 10, 13, 6, 108 - noisenote 4, 12, 2, 76 - noisenote 6, 13, 3, 92 - noisenote 8, 11, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry13_3_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index b066f5fc..99d8d8d3 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,21 +1,21 @@ -SFX_Cry14_1_Ch4: - dutycycle 240 - squarenote 8, 14, 4, 1936 - squarenote 15, 15, 5, 1984 - squarenote 8, 13, 1, 2008 - endchannel +SFX_Cry14_1_Ch5: + duty_cycle_pattern 240 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_1_Ch5: - dutycycle 165 - squarenote 10, 12, 4, 1905 - squarenote 15, 11, 6, 1954 - squarenote 8, 10, 1, 1975 - endchannel +SFX_Cry14_1_Ch6: + duty_cycle_pattern 165 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_1_Ch7: - noisenote 8, 14, 4, 76 - noisenote 14, 12, 4, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry14_1_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 36c8e5aa..28062bc7 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,21 +1,21 @@ -SFX_Cry14_2_Ch4: - dutycycle 240 - squarenote 8, 14, 4, 1936 - squarenote 15, 15, 5, 1984 - squarenote 8, 13, 1, 2008 - endchannel +SFX_Cry14_2_Ch5: + duty_cycle_pattern 240 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_2_Ch5: - dutycycle 165 - squarenote 10, 12, 4, 1905 - squarenote 15, 11, 6, 1954 - squarenote 8, 10, 1, 1975 - endchannel +SFX_Cry14_2_Ch6: + duty_cycle_pattern 165 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_2_Ch7: - noisenote 8, 14, 4, 76 - noisenote 14, 12, 4, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry14_2_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index ce4a27b9..81bd63ca 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,21 +1,21 @@ -SFX_Cry14_3_Ch4: - dutycycle 240 - squarenote 8, 14, 4, 1936 - squarenote 15, 15, 5, 1984 - squarenote 8, 13, 1, 2008 - endchannel +SFX_Cry14_3_Ch5: + duty_cycle_pattern 240 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_3_Ch5: - dutycycle 165 - squarenote 10, 12, 4, 1905 - squarenote 15, 11, 6, 1954 - squarenote 8, 10, 1, 1975 - endchannel +SFX_Cry14_3_Ch6: + duty_cycle_pattern 165 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_3_Ch7: - noisenote 8, 14, 4, 76 - noisenote 14, 12, 4, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry14_3_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index d9966782..aaa6656e 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,30 +1,30 @@ -SFX_Cry15_1_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1920 - squarenote 15, 14, 7, 1792 - squarenote 8, 13, 3, 1808 - squarenote 4, 12, 2, 1792 - squarenote 4, 13, 2, 1776 - squarenote 8, 12, 1, 1760 - endchannel +SFX_Cry15_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_1_Ch5: - dutycycle 90 - squarenote 6, 12, 3, 1793 - squarenote 14, 11, 7, 1665 - squarenote 7, 11, 3, 1682 - squarenote 3, 10, 2, 1665 - squarenote 4, 11, 2, 1650 - squarenote 8, 10, 1, 1633 - endchannel +SFX_Cry15_1_Ch6: + duty_cycle_pattern 90 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_1_Ch7: - noisenote 6, 14, 3, 92 - noisenote 14, 13, 6, 76 - noisenote 6, 12, 6, 60 - noisenote 3, 11, 3, 76 - noisenote 3, 10, 2, 92 - noisenote 8, 11, 1, 108 - endchannel +SFX_Cry15_1_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 0fa8daf0..77ac9ffb 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,30 +1,30 @@ -SFX_Cry15_2_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1920 - squarenote 15, 14, 7, 1792 - squarenote 8, 13, 3, 1808 - squarenote 4, 12, 2, 1792 - squarenote 4, 13, 2, 1776 - squarenote 8, 12, 1, 1760 - endchannel +SFX_Cry15_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_2_Ch5: - dutycycle 90 - squarenote 6, 12, 3, 1793 - squarenote 14, 11, 7, 1665 - squarenote 7, 11, 3, 1682 - squarenote 3, 10, 2, 1665 - squarenote 4, 11, 2, 1650 - squarenote 8, 10, 1, 1633 - endchannel +SFX_Cry15_2_Ch6: + duty_cycle_pattern 90 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_2_Ch7: - noisenote 6, 14, 3, 92 - noisenote 14, 13, 6, 76 - noisenote 6, 12, 6, 60 - noisenote 3, 11, 3, 76 - noisenote 3, 10, 2, 92 - noisenote 8, 11, 1, 108 - endchannel +SFX_Cry15_2_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 5c4fe877..2e6a9d71 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,30 +1,30 @@ -SFX_Cry15_3_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1920 - squarenote 15, 14, 7, 1792 - squarenote 8, 13, 3, 1808 - squarenote 4, 12, 2, 1792 - squarenote 4, 13, 2, 1776 - squarenote 8, 12, 1, 1760 - endchannel +SFX_Cry15_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_3_Ch5: - dutycycle 90 - squarenote 6, 12, 3, 1793 - squarenote 14, 11, 7, 1665 - squarenote 7, 11, 3, 1682 - squarenote 3, 10, 2, 1665 - squarenote 4, 11, 2, 1650 - squarenote 8, 10, 1, 1633 - endchannel +SFX_Cry15_3_Ch6: + duty_cycle_pattern 90 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_3_Ch7: - noisenote 6, 14, 3, 92 - noisenote 14, 13, 6, 76 - noisenote 6, 12, 6, 60 - noisenote 3, 11, 3, 76 - noisenote 3, 10, 2, 92 - noisenote 8, 11, 1, 108 - endchannel +SFX_Cry15_3_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index c6dcac1b..e0bf7c61 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,21 +1,21 @@ -SFX_Cry16_1_Ch4: - dutycycle 240 - squarenote 15, 13, 7, 1920 - squarenote 4, 14, 6, 1952 - squarenote 15, 13, 2, 1856 - endchannel +SFX_Cry16_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_1_Ch5: - dutycycle 90 - squarenote 15, 12, 7, 1875 - squarenote 5, 11, 6, 1906 - squarenote 15, 12, 2, 1809 - endchannel +SFX_Cry16_1_Ch6: + duty_cycle_pattern 90 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_1_Ch7: - noisenote 13, 15, 6, 76 - noisenote 4, 14, 6, 60 - noisenote 15, 15, 2, 76 - endchannel +SFX_Cry16_1_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 1946c8f1..da03950f 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,21 +1,21 @@ -SFX_Cry16_2_Ch4: - dutycycle 240 - squarenote 15, 13, 7, 1920 - squarenote 4, 14, 6, 1952 - squarenote 15, 13, 2, 1856 - endchannel +SFX_Cry16_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_2_Ch5: - dutycycle 90 - squarenote 15, 12, 7, 1875 - squarenote 5, 11, 6, 1906 - squarenote 15, 12, 2, 1809 - endchannel +SFX_Cry16_2_Ch6: + duty_cycle_pattern 90 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_2_Ch7: - noisenote 13, 15, 6, 76 - noisenote 4, 14, 6, 60 - noisenote 15, 15, 2, 76 - endchannel +SFX_Cry16_2_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index bc8ff2ba..248163fe 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,21 +1,21 @@ -SFX_Cry16_3_Ch4: - dutycycle 240 - squarenote 15, 13, 7, 1920 - squarenote 4, 14, 6, 1952 - squarenote 15, 13, 2, 1856 - endchannel +SFX_Cry16_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_3_Ch5: - dutycycle 90 - squarenote 15, 12, 7, 1875 - squarenote 5, 11, 6, 1906 - squarenote 15, 12, 2, 1809 - endchannel +SFX_Cry16_3_Ch6: + duty_cycle_pattern 90 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_3_Ch7: - noisenote 13, 15, 6, 76 - noisenote 4, 14, 6, 60 - noisenote 15, 15, 2, 76 - endchannel +SFX_Cry16_3_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 29b6fff2..699de068 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,24 +1,24 @@ -SFX_Cry17_1_Ch4: - dutycycle 15 - squarenote 15, 15, 7, 1280 - squarenote 15, 14, 7, 1288 - squarenote 8, 11, 4, 1152 - squarenote 15, 10, 2, 1120 - endchannel +SFX_Cry17_1_Ch5: + duty_cycle_pattern 15 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_1_Ch5: - dutycycle 68 - squarenote 14, 13, 7, 1153 - squarenote 14, 12, 7, 1161 - squarenote 10, 11, 4, 1025 - squarenote 15, 12, 2, 993 - endchannel +SFX_Cry17_1_Ch6: + duty_cycle_pattern 68 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_1_Ch7: - noisenote 14, 15, 7, 124 - noisenote 12, 15, 6, 108 - noisenote 9, 14, 4, 124 - noisenote 15, 14, 2, 108 - endchannel +SFX_Cry17_1_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index 4a42db48..2f143097 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,24 +1,24 @@ -SFX_Cry17_2_Ch4: - dutycycle 15 - squarenote 15, 15, 7, 1280 - squarenote 15, 14, 7, 1288 - squarenote 8, 11, 4, 1152 - squarenote 15, 10, 2, 1120 - endchannel +SFX_Cry17_2_Ch5: + duty_cycle_pattern 15 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_2_Ch5: - dutycycle 68 - squarenote 14, 13, 7, 1153 - squarenote 14, 12, 7, 1161 - squarenote 10, 11, 4, 1025 - squarenote 15, 12, 2, 993 - endchannel +SFX_Cry17_2_Ch6: + duty_cycle_pattern 68 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_2_Ch7: - noisenote 14, 15, 7, 124 - noisenote 12, 15, 6, 108 - noisenote 9, 14, 4, 124 - noisenote 15, 14, 2, 108 - endchannel +SFX_Cry17_2_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 4340c97f..32bee883 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,24 +1,24 @@ -SFX_Cry17_3_Ch4: - dutycycle 15 - squarenote 15, 15, 7, 1280 - squarenote 15, 14, 7, 1288 - squarenote 8, 11, 4, 1152 - squarenote 15, 10, 2, 1120 - endchannel +SFX_Cry17_3_Ch5: + duty_cycle_pattern 15 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_3_Ch5: - dutycycle 68 - squarenote 14, 13, 7, 1153 - squarenote 14, 12, 7, 1161 - squarenote 10, 11, 4, 1025 - squarenote 15, 12, 2, 993 - endchannel +SFX_Cry17_3_Ch6: + duty_cycle_pattern 68 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_3_Ch7: - noisenote 14, 15, 7, 124 - noisenote 12, 15, 6, 108 - noisenote 9, 14, 4, 124 - noisenote 15, 14, 2, 108 - endchannel +SFX_Cry17_3_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 8249731a..d326c2c3 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,34 +1,34 @@ -SFX_Cry18_1_Ch4: - dutycycle 80 - squarenote 10, 15, 5, 1664 - squarenote 3, 14, 2, 1696 - squarenote 3, 15, 2, 1728 - squarenote 3, 14, 2, 1760 - squarenote 3, 13, 2, 1792 - squarenote 3, 12, 2, 1760 - squarenote 3, 13, 2, 1728 - squarenote 8, 12, 1, 1696 - endchannel +SFX_Cry18_1_Ch5: + duty_cycle_pattern 80 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_1_Ch5: - dutycycle 15 - squarenote 9, 13, 5, 1585 - squarenote 3, 13, 2, 1618 - squarenote 3, 14, 2, 1649 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1714 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1649 - squarenote 8, 11, 1, 1617 - endchannel +SFX_Cry18_1_Ch6: + duty_cycle_pattern 15 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_1_Ch7: - noisenote 6, 14, 3, 76 - noisenote 4, 12, 3, 60 - noisenote 5, 13, 4, 60 - noisenote 4, 12, 4, 44 - noisenote 6, 11, 4, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry18_1_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 39f85b8f..1a81e1d3 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,34 +1,34 @@ -SFX_Cry18_2_Ch4: - dutycycle 80 - squarenote 10, 15, 5, 1664 - squarenote 3, 14, 2, 1696 - squarenote 3, 15, 2, 1728 - squarenote 3, 14, 2, 1760 - squarenote 3, 13, 2, 1792 - squarenote 3, 12, 2, 1760 - squarenote 3, 13, 2, 1728 - squarenote 8, 12, 1, 1696 - endchannel +SFX_Cry18_2_Ch5: + duty_cycle_pattern 80 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_2_Ch5: - dutycycle 15 - squarenote 9, 13, 5, 1585 - squarenote 3, 13, 2, 1618 - squarenote 3, 14, 2, 1649 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1714 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1649 - squarenote 8, 11, 1, 1617 - endchannel +SFX_Cry18_2_Ch6: + duty_cycle_pattern 15 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_2_Ch7: - noisenote 6, 14, 3, 76 - noisenote 4, 12, 3, 60 - noisenote 5, 13, 4, 60 - noisenote 4, 12, 4, 44 - noisenote 6, 11, 4, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry18_2_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 4bcf5b6d..7ca9f2c6 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,34 +1,34 @@ -SFX_Cry18_3_Ch4: - dutycycle 80 - squarenote 10, 15, 5, 1664 - squarenote 3, 14, 2, 1696 - squarenote 3, 15, 2, 1728 - squarenote 3, 14, 2, 1760 - squarenote 3, 13, 2, 1792 - squarenote 3, 12, 2, 1760 - squarenote 3, 13, 2, 1728 - squarenote 8, 12, 1, 1696 - endchannel +SFX_Cry18_3_Ch5: + duty_cycle_pattern 80 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_3_Ch5: - dutycycle 15 - squarenote 9, 13, 5, 1585 - squarenote 3, 13, 2, 1618 - squarenote 3, 14, 2, 1649 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1714 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1649 - squarenote 8, 11, 1, 1617 - endchannel +SFX_Cry18_3_Ch6: + duty_cycle_pattern 15 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_3_Ch7: - noisenote 6, 14, 3, 76 - noisenote 4, 12, 3, 60 - noisenote 5, 13, 4, 60 - noisenote 4, 12, 4, 44 - noisenote 6, 11, 4, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry18_3_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index d0435941..6309f902 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,18 +1,18 @@ -SFX_Cry19_1_Ch4: - dutycycle 27 - squarenote 7, 13, 2, 1856 - squarenote 15, 14, 5, 1888 - squarenote 15, 12, 1, 1840 - endchannel +SFX_Cry19_1_Ch5: + duty_cycle_pattern 27 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_1_Ch5: - dutycycle 129 - squarenote 2, 12, 2, 1793 - squarenote 4, 12, 2, 1800 - squarenote 15, 13, 7, 1857 - squarenote 15, 10, 2, 1793 +SFX_Cry19_1_Ch6: + duty_cycle_pattern 129 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_1_Ch7: - endchannel +SFX_Cry19_1_Ch8: + sound_ret diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index b088c0de..e838612b 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,18 +1,18 @@ -SFX_Cry19_2_Ch4: - dutycycle 27 - squarenote 7, 13, 2, 1856 - squarenote 15, 14, 5, 1888 - squarenote 15, 12, 1, 1840 - endchannel +SFX_Cry19_2_Ch5: + duty_cycle_pattern 27 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_2_Ch5: - dutycycle 129 - squarenote 2, 12, 2, 1793 - squarenote 4, 12, 2, 1800 - squarenote 15, 13, 7, 1857 - squarenote 15, 10, 2, 1793 +SFX_Cry19_2_Ch6: + duty_cycle_pattern 129 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_2_Ch7: - endchannel +SFX_Cry19_2_Ch8: + sound_ret diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index e42489c4..51c113b6 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,18 +1,18 @@ -SFX_Cry19_3_Ch4: - dutycycle 27 - squarenote 7, 13, 2, 1856 - squarenote 15, 14, 5, 1888 - squarenote 15, 12, 1, 1840 - endchannel +SFX_Cry19_3_Ch5: + duty_cycle_pattern 27 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_3_Ch5: - dutycycle 129 - squarenote 2, 12, 2, 1793 - squarenote 4, 12, 2, 1800 - squarenote 15, 13, 7, 1857 - squarenote 15, 10, 2, 1793 +SFX_Cry19_3_Ch6: + duty_cycle_pattern 129 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_3_Ch7: - endchannel +SFX_Cry19_3_Ch8: + sound_ret diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 8bbf8288..3209263a 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_1_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1856 - squarenote 12, 14, 6, 1860 - squarenote 6, 13, 5, 1872 - squarenote 4, 12, 3, 1888 - squarenote 3, 12, 3, 1920 - squarenote 8, 13, 1, 1952 - endchannel +SFX_Cry1A_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_1_Ch5: - dutycycle 10 - squarenote 6, 12, 7, 1793 - squarenote 11, 11, 6, 1794 - squarenote 6, 10, 5, 1809 - squarenote 4, 9, 3, 1825 - squarenote 3, 10, 3, 1857 - squarenote 8, 9, 1, 1890 - endchannel +SFX_Cry1A_1_Ch6: + duty_cycle_pattern 10 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_1_Ch7: - noisenote 3, 14, 2, 60 - noisenote 8, 13, 6, 76 - noisenote 5, 13, 4, 60 - noisenote 12, 12, 7, 76 - noisenote 2, 14, 2, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry1A_1_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index b6ed820b..a8dca4fc 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_2_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1856 - squarenote 12, 14, 6, 1860 - squarenote 6, 13, 5, 1872 - squarenote 4, 12, 3, 1888 - squarenote 3, 12, 3, 1920 - squarenote 8, 13, 1, 1952 - endchannel +SFX_Cry1A_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_2_Ch5: - dutycycle 10 - squarenote 6, 12, 7, 1793 - squarenote 11, 11, 6, 1794 - squarenote 6, 10, 5, 1809 - squarenote 4, 9, 3, 1825 - squarenote 3, 10, 3, 1857 - squarenote 8, 9, 1, 1890 - endchannel +SFX_Cry1A_2_Ch6: + duty_cycle_pattern 10 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_2_Ch7: - noisenote 3, 14, 2, 60 - noisenote 8, 13, 6, 76 - noisenote 5, 13, 4, 60 - noisenote 12, 12, 7, 76 - noisenote 2, 14, 2, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry1A_2_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index aee947cd..0fc9574d 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_3_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1856 - squarenote 12, 14, 6, 1860 - squarenote 6, 13, 5, 1872 - squarenote 4, 12, 3, 1888 - squarenote 3, 12, 3, 1920 - squarenote 8, 13, 1, 1952 - endchannel +SFX_Cry1A_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_3_Ch5: - dutycycle 10 - squarenote 6, 12, 7, 1793 - squarenote 11, 11, 6, 1794 - squarenote 6, 10, 5, 1809 - squarenote 4, 9, 3, 1825 - squarenote 3, 10, 3, 1857 - squarenote 8, 9, 1, 1890 - endchannel +SFX_Cry1A_3_Ch6: + duty_cycle_pattern 10 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_3_Ch7: - noisenote 3, 14, 2, 60 - noisenote 8, 13, 6, 76 - noisenote 5, 13, 4, 60 - noisenote 12, 12, 7, 76 - noisenote 2, 14, 2, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry1A_3_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 86f3d421..8a228ec3 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_1_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1728 - squarenote 15, 14, 7, 1792 - squarenote 4, 15, 4, 1776 - squarenote 4, 14, 4, 1760 - squarenote 8, 13, 1, 1744 - endchannel +SFX_Cry1B_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_1_Ch5: - dutycycle 10 - squarenote 7, 14, 6, 1665 - squarenote 14, 13, 5, 1729 - squarenote 4, 12, 4, 1713 - squarenote 4, 13, 4, 1697 - squarenote 8, 12, 1, 1681 - endchannel +SFX_Cry1B_1_Ch6: + duty_cycle_pattern 10 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_1_Ch7: - noisenote 10, 10, 6, 60 - noisenote 14, 9, 4, 44 - noisenote 5, 10, 3, 60 - noisenote 8, 9, 1, 44 - endchannel +SFX_Cry1B_1_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 1faaf5bb..97f85337 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_2_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1728 - squarenote 15, 14, 7, 1792 - squarenote 4, 15, 4, 1776 - squarenote 4, 14, 4, 1760 - squarenote 8, 13, 1, 1744 - endchannel +SFX_Cry1B_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_2_Ch5: - dutycycle 10 - squarenote 7, 14, 6, 1665 - squarenote 14, 13, 5, 1729 - squarenote 4, 12, 4, 1713 - squarenote 4, 13, 4, 1697 - squarenote 8, 12, 1, 1681 - endchannel +SFX_Cry1B_2_Ch6: + duty_cycle_pattern 10 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_2_Ch7: - noisenote 10, 10, 6, 60 - noisenote 14, 9, 4, 44 - noisenote 5, 10, 3, 60 - noisenote 8, 9, 1, 44 - endchannel +SFX_Cry1B_2_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 09196c26..27b7f633 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_3_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1728 - squarenote 15, 14, 7, 1792 - squarenote 4, 15, 4, 1776 - squarenote 4, 14, 4, 1760 - squarenote 8, 13, 1, 1744 - endchannel +SFX_Cry1B_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_3_Ch5: - dutycycle 10 - squarenote 7, 14, 6, 1665 - squarenote 14, 13, 5, 1729 - squarenote 4, 12, 4, 1713 - squarenote 4, 13, 4, 1697 - squarenote 8, 12, 1, 1681 - endchannel +SFX_Cry1B_3_Ch6: + duty_cycle_pattern 10 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_3_Ch7: - noisenote 10, 10, 6, 60 - noisenote 14, 9, 4, 44 - noisenote 5, 10, 3, 60 - noisenote 8, 9, 1, 44 - endchannel +SFX_Cry1B_3_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 2fd4f7b2..50e29a0e 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_1_Ch4: - dutycycle 245 - squarenote 7, 13, 6, 2017 - squarenote 6, 12, 6, 2018 - squarenote 9, 13, 6, 2017 - squarenote 7, 12, 6, 2016 - squarenote 5, 11, 6, 2018 - squarenote 7, 12, 6, 2017 - squarenote 6, 11, 6, 2016 - squarenote 8, 10, 1, 2015 - endchannel +SFX_Cry1C_1_Ch5: + duty_cycle_pattern 245 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_1_Ch5: - dutycycle 68 - squarenote 6, 12, 3, 1993 - squarenote 6, 11, 3, 1991 - squarenote 10, 12, 4, 1987 - squarenote 8, 11, 4, 1991 - squarenote 6, 12, 3, 1993 - squarenote 15, 10, 2, 1989 - endchannel +SFX_Cry1C_1_Ch6: + duty_cycle_pattern 68 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_1_Ch7: - noisenote 13, 1, -1, 124 - noisenote 13, 15, 7, 140 - noisenote 12, 13, 6, 124 - noisenote 8, 12, 4, 108 - noisenote 15, 11, 3, 92 - endchannel +SFX_Cry1C_1_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 69a08eef..e73f557c 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_2_Ch4: - dutycycle 245 - squarenote 7, 13, 6, 2017 - squarenote 6, 12, 6, 2018 - squarenote 9, 13, 6, 2017 - squarenote 7, 12, 6, 2016 - squarenote 5, 11, 6, 2018 - squarenote 7, 12, 6, 2017 - squarenote 6, 11, 6, 2016 - squarenote 8, 10, 1, 2015 - endchannel +SFX_Cry1C_2_Ch5: + duty_cycle_pattern 245 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_2_Ch5: - dutycycle 68 - squarenote 6, 12, 3, 1993 - squarenote 6, 11, 3, 1991 - squarenote 10, 12, 4, 1987 - squarenote 8, 11, 4, 1991 - squarenote 6, 12, 3, 1993 - squarenote 15, 10, 2, 1989 - endchannel +SFX_Cry1C_2_Ch6: + duty_cycle_pattern 68 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_2_Ch7: - noisenote 13, 1, -1, 124 - noisenote 13, 15, 7, 140 - noisenote 12, 13, 6, 124 - noisenote 8, 12, 4, 108 - noisenote 15, 11, 3, 92 - endchannel +SFX_Cry1C_2_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 59f69402..282804b2 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_3_Ch4: - dutycycle 245 - squarenote 7, 13, 6, 2017 - squarenote 6, 12, 6, 2018 - squarenote 9, 13, 6, 2017 - squarenote 7, 12, 6, 2016 - squarenote 5, 11, 6, 2018 - squarenote 7, 12, 6, 2017 - squarenote 6, 11, 6, 2016 - squarenote 8, 10, 1, 2015 - endchannel +SFX_Cry1C_3_Ch5: + duty_cycle_pattern 245 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_3_Ch5: - dutycycle 68 - squarenote 6, 12, 3, 1993 - squarenote 6, 11, 3, 1991 - squarenote 10, 12, 4, 1987 - squarenote 8, 11, 4, 1991 - squarenote 6, 12, 3, 1993 - squarenote 15, 10, 2, 1989 - endchannel +SFX_Cry1C_3_Ch6: + duty_cycle_pattern 68 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_3_Ch7: - noisenote 13, 1, -1, 124 - noisenote 13, 15, 7, 140 - noisenote 12, 13, 6, 124 - noisenote 8, 12, 4, 108 - noisenote 15, 11, 3, 92 - endchannel +SFX_Cry1C_3_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 4cef3bf0..97fd2d31 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_1_Ch4: - dutycycle 244 - squarenote 15, 15, 0, 1797 - squarenote 10, 14, 0, 1792 - squarenote 6, 11, 4, 1808 - squarenote 4, 13, 3, 1792 - squarenote 6, 11, 2, 1568 - squarenote 8, 10, 1, 1572 - endchannel +SFX_Cry1D_1_Ch5: + duty_cycle_pattern 244 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_1_Ch5: - dutycycle 34 - squarenote 15, 11, 0, 1731 - squarenote 10, 10, 0, 1729 - squarenote 6, 8, 4, 1746 - squarenote 4, 9, 3, 1729 - squarenote 6, 8, 2, 1505 - squarenote 8, 6, 1, 1512 - endchannel +SFX_Cry1D_1_Ch6: + duty_cycle_pattern 34 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_1_Ch7: - noisenote 6, 14, 6, 76 - noisenote 15, 13, 6, 60 - noisenote 10, 12, 5, 74 - noisenote 1, 11, 2, 91 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry1D_1_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 874be61e..5fc0a453 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_2_Ch4: - dutycycle 244 - squarenote 15, 15, 0, 1797 - squarenote 10, 14, 0, 1792 - squarenote 6, 11, 4, 1808 - squarenote 4, 13, 3, 1792 - squarenote 6, 11, 2, 1568 - squarenote 8, 10, 1, 1572 - endchannel +SFX_Cry1D_2_Ch5: + duty_cycle_pattern 244 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_2_Ch5: - dutycycle 34 - squarenote 15, 11, 0, 1731 - squarenote 10, 10, 0, 1729 - squarenote 6, 8, 4, 1746 - squarenote 4, 9, 3, 1729 - squarenote 6, 8, 2, 1505 - squarenote 8, 6, 1, 1512 - endchannel +SFX_Cry1D_2_Ch6: + duty_cycle_pattern 34 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_2_Ch7: - noisenote 6, 14, 6, 76 - noisenote 15, 13, 6, 60 - noisenote 10, 12, 5, 74 - noisenote 1, 11, 2, 91 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry1D_2_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 991e44bb..f86dd102 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_3_Ch4: - dutycycle 244 - squarenote 15, 15, 0, 1797 - squarenote 10, 14, 0, 1792 - squarenote 6, 11, 4, 1808 - squarenote 4, 13, 3, 1792 - squarenote 6, 11, 2, 1568 - squarenote 8, 10, 1, 1572 - endchannel +SFX_Cry1D_3_Ch5: + duty_cycle_pattern 244 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_3_Ch5: - dutycycle 34 - squarenote 15, 11, 0, 1731 - squarenote 10, 10, 0, 1729 - squarenote 6, 8, 4, 1746 - squarenote 4, 9, 3, 1729 - squarenote 6, 8, 2, 1505 - squarenote 8, 6, 1, 1512 - endchannel +SFX_Cry1D_3_Ch6: + duty_cycle_pattern 34 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_3_Ch7: - noisenote 6, 14, 6, 76 - noisenote 15, 13, 6, 60 - noisenote 10, 12, 5, 74 - noisenote 1, 11, 2, 91 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry1D_3_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index b028e616..c3106e7b 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_1_Ch4: - dutycycle 240 - squarenote 6, 15, 2, 1536 - squarenote 6, 14, 2, 1600 - squarenote 6, 13, 2, 1664 - squarenote 6, 14, 2, 1728 - squarenote 6, 13, 2, 1792 - squarenote 6, 12, 2, 1856 - squarenote 6, 11, 2, 1920 - squarenote 8, 10, 1, 1984 - endchannel +SFX_Cry1E_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_1_Ch5: - dutycycle 17 - squarenote 3, 0, 8, 1 - squarenote 6, 12, 2, 1473 - squarenote 6, 11, 2, 1538 - squarenote 6, 10, 2, 1601 - squarenote 6, 11, 2, 1666 - squarenote 6, 10, 2, 1730 - squarenote 6, 9, 2, 1793 - squarenote 6, 10, 2, 1858 - squarenote 8, 8, 1, 1921 - endchannel +SFX_Cry1E_1_Ch6: + duty_cycle_pattern 17 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_1_Ch7: - noisenote 6, 0, 8, 1 - noisenote 5, 14, 2, 92 - noisenote 5, 12, 2, 76 - noisenote 5, 13, 2, 60 - noisenote 5, 11, 2, 44 - noisenote 5, 12, 2, 28 - noisenote 5, 10, 2, 27 - noisenote 5, 9, 2, 26 - noisenote 8, 8, 1, 24 - endchannel +SFX_Cry1E_1_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 783ee324..1c904ce4 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_2_Ch4: - dutycycle 240 - squarenote 6, 15, 2, 1536 - squarenote 6, 14, 2, 1600 - squarenote 6, 13, 2, 1664 - squarenote 6, 14, 2, 1728 - squarenote 6, 13, 2, 1792 - squarenote 6, 12, 2, 1856 - squarenote 6, 11, 2, 1920 - squarenote 8, 10, 1, 1984 - endchannel +SFX_Cry1E_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_2_Ch5: - dutycycle 17 - squarenote 3, 0, 8, 1 - squarenote 6, 12, 2, 1473 - squarenote 6, 11, 2, 1538 - squarenote 6, 10, 2, 1601 - squarenote 6, 11, 2, 1666 - squarenote 6, 10, 2, 1730 - squarenote 6, 9, 2, 1793 - squarenote 6, 10, 2, 1858 - squarenote 8, 8, 1, 1921 - endchannel +SFX_Cry1E_2_Ch6: + duty_cycle_pattern 17 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_2_Ch7: - noisenote 6, 0, 8, 1 - noisenote 5, 14, 2, 92 - noisenote 5, 12, 2, 76 - noisenote 5, 13, 2, 60 - noisenote 5, 11, 2, 44 - noisenote 5, 12, 2, 28 - noisenote 5, 10, 2, 27 - noisenote 5, 9, 2, 26 - noisenote 8, 8, 1, 24 - endchannel +SFX_Cry1E_2_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index f78e6d0a..6fae812c 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_3_Ch4: - dutycycle 240 - squarenote 6, 15, 2, 1536 - squarenote 6, 14, 2, 1600 - squarenote 6, 13, 2, 1664 - squarenote 6, 14, 2, 1728 - squarenote 6, 13, 2, 1792 - squarenote 6, 12, 2, 1856 - squarenote 6, 11, 2, 1920 - squarenote 8, 10, 1, 1984 - endchannel +SFX_Cry1E_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_3_Ch5: - dutycycle 17 - squarenote 3, 0, 8, 1 - squarenote 6, 12, 2, 1473 - squarenote 6, 11, 2, 1538 - squarenote 6, 10, 2, 1601 - squarenote 6, 11, 2, 1666 - squarenote 6, 10, 2, 1730 - squarenote 6, 9, 2, 1793 - squarenote 6, 10, 2, 1858 - squarenote 8, 8, 1, 1921 - endchannel +SFX_Cry1E_3_Ch6: + duty_cycle_pattern 17 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_3_Ch7: - noisenote 6, 0, 8, 1 - noisenote 5, 14, 2, 92 - noisenote 5, 12, 2, 76 - noisenote 5, 13, 2, 60 - noisenote 5, 11, 2, 44 - noisenote 5, 12, 2, 28 - noisenote 5, 10, 2, 27 - noisenote 5, 9, 2, 26 - noisenote 8, 8, 1, 24 - endchannel +SFX_Cry1E_3_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index f4596492..63148b92 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_1_Ch4: - dutycycle 165 - squarenote 3, 15, 4, 1601 - squarenote 13, 13, 6, 1825 - squarenote 8, 15, 4, 1817 - squarenote 8, 12, 1, 1818 - endchannel +SFX_Cry1F_1_Ch5: + duty_cycle_pattern 165 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_1_Ch5: - dutycycle 204 - squarenote 4, 15, 4, 1408 - squarenote 14, 14, 6, 1760 - squarenote 8, 13, 5, 1752 - squarenote 8, 13, 1, 1756 - endchannel +SFX_Cry1F_1_Ch6: + duty_cycle_pattern 204 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_1_Ch7: - noisenote 5, 12, 4, 70 - noisenote 13, 10, 5, 68 - noisenote 8, 12, 4, 69 - noisenote 8, 11, 1, 68 - endchannel +SFX_Cry1F_1_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index dc46f49a..868975f8 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_2_Ch4: - dutycycle 165 - squarenote 3, 15, 4, 1601 - squarenote 13, 13, 6, 1825 - squarenote 8, 15, 4, 1817 - squarenote 8, 12, 1, 1818 - endchannel +SFX_Cry1F_2_Ch5: + duty_cycle_pattern 165 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_2_Ch5: - dutycycle 204 - squarenote 4, 15, 4, 1408 - squarenote 14, 14, 6, 1760 - squarenote 8, 13, 5, 1752 - squarenote 8, 13, 1, 1756 - endchannel +SFX_Cry1F_2_Ch6: + duty_cycle_pattern 204 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_2_Ch7: - noisenote 5, 12, 4, 70 - noisenote 13, 10, 5, 68 - noisenote 8, 12, 4, 69 - noisenote 8, 11, 1, 68 - endchannel +SFX_Cry1F_2_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 41c3b766..cc5a6192 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_3_Ch4: - dutycycle 165 - squarenote 3, 15, 4, 1601 - squarenote 13, 13, 6, 1825 - squarenote 8, 15, 4, 1817 - squarenote 8, 12, 1, 1818 - endchannel +SFX_Cry1F_3_Ch5: + duty_cycle_pattern 165 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_3_Ch5: - dutycycle 204 - squarenote 4, 15, 4, 1408 - squarenote 14, 14, 6, 1760 - squarenote 8, 13, 5, 1752 - squarenote 8, 13, 1, 1756 - endchannel +SFX_Cry1F_3_Ch6: + duty_cycle_pattern 204 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_3_Ch7: - noisenote 5, 12, 4, 70 - noisenote 13, 10, 5, 68 - noisenote 8, 12, 4, 69 - noisenote 8, 11, 1, 68 - endchannel +SFX_Cry1F_3_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index cd0b85ec..888aeb61 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,24 +1,24 @@ -SFX_Cry20_1_Ch4: - dutycycle 240 - squarenote 13, 15, 1, 1297 - squarenote 13, 14, 1, 1301 - squarenote 13, 14, 1, 1297 - squarenote 8, 13, 1, 1297 - endchannel +SFX_Cry20_1_Ch5: + duty_cycle_pattern 240 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_1_Ch5: - dutycycle 21 - squarenote 12, 14, 1, 1292 - squarenote 12, 13, 1, 1296 - squarenote 14, 12, 1, 1292 - squarenote 8, 12, 1, 1290 - endchannel +SFX_Cry20_1_Ch6: + duty_cycle_pattern 21 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_1_Ch7: - noisenote 14, 15, 2, 101 - noisenote 13, 14, 2, 85 - noisenote 14, 13, 2, 86 - noisenote 8, 13, 1, 102 - endchannel +SFX_Cry20_1_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 7bd21c47..ed22a3f0 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,24 +1,24 @@ -SFX_Cry20_2_Ch4: - dutycycle 240 - squarenote 13, 15, 1, 1297 - squarenote 13, 14, 1, 1301 - squarenote 13, 14, 1, 1297 - squarenote 8, 13, 1, 1297 - endchannel +SFX_Cry20_2_Ch5: + duty_cycle_pattern 240 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_2_Ch5: - dutycycle 21 - squarenote 12, 14, 1, 1292 - squarenote 12, 13, 1, 1296 - squarenote 14, 12, 1, 1292 - squarenote 8, 12, 1, 1290 - endchannel +SFX_Cry20_2_Ch6: + duty_cycle_pattern 21 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_2_Ch7: - noisenote 14, 15, 2, 101 - noisenote 13, 14, 2, 85 - noisenote 14, 13, 2, 86 - noisenote 8, 13, 1, 102 - endchannel +SFX_Cry20_2_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 89013d69..6295e936 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,24 +1,24 @@ -SFX_Cry20_3_Ch4: - dutycycle 240 - squarenote 13, 15, 1, 1297 - squarenote 13, 14, 1, 1301 - squarenote 13, 14, 1, 1297 - squarenote 8, 13, 1, 1297 - endchannel +SFX_Cry20_3_Ch5: + duty_cycle_pattern 240 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_3_Ch5: - dutycycle 21 - squarenote 12, 14, 1, 1292 - squarenote 12, 13, 1, 1296 - squarenote 14, 12, 1, 1292 - squarenote 8, 12, 1, 1290 - endchannel +SFX_Cry20_3_Ch6: + duty_cycle_pattern 21 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_3_Ch7: - noisenote 14, 15, 2, 101 - noisenote 13, 14, 2, 85 - noisenote 14, 13, 2, 86 - noisenote 8, 13, 1, 102 - endchannel +SFX_Cry20_3_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 7cfad5d5..d9df1eca 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,27 +1,27 @@ -SFX_Cry21_1_Ch4: - dutycycle 27 - squarenote 3, 15, 3, 1380 - squarenote 2, 14, 2, 1348 - squarenote 5, 13, 1, 1314 - squarenote 2, 11, 2, 1156 - squarenote 8, 13, 1, 1186 - squarenote 3, 15, 3, 1316 - squarenote 4, 14, 4, 1252 - squarenote 8, 13, 1, 1282 - endchannel +SFX_Cry21_1_Ch5: + duty_cycle_pattern 27 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_1_Ch5: - dutycycle 204 - squarenote 3, 13, 3, 1376 - squarenote 2, 12, 2, 1344 - squarenote 5, 12, 1, 1312 - squarenote 2, 9, 2, 1152 - squarenote 8, 12, 1, 1184 - squarenote 3, 13, 3, 1312 - squarenote 3, 12, 4, 1248 - squarenote 8, 12, 1, 1280 +SFX_Cry21_1_Ch6: + duty_cycle_pattern 204 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_1_Ch7: - endchannel +SFX_Cry21_1_Ch8: + sound_ret diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index cb4b80d3..f506e124 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,27 +1,27 @@ -SFX_Cry21_2_Ch4: - dutycycle 27 - squarenote 3, 15, 3, 1380 - squarenote 2, 14, 2, 1348 - squarenote 5, 13, 1, 1314 - squarenote 2, 11, 2, 1156 - squarenote 8, 13, 1, 1186 - squarenote 3, 15, 3, 1316 - squarenote 4, 14, 4, 1252 - squarenote 8, 13, 1, 1282 - endchannel +SFX_Cry21_2_Ch5: + duty_cycle_pattern 27 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_2_Ch5: - dutycycle 204 - squarenote 3, 13, 3, 1376 - squarenote 2, 12, 2, 1344 - squarenote 5, 12, 1, 1312 - squarenote 2, 9, 2, 1152 - squarenote 8, 12, 1, 1184 - squarenote 3, 13, 3, 1312 - squarenote 3, 12, 4, 1248 - squarenote 8, 12, 1, 1280 +SFX_Cry21_2_Ch6: + duty_cycle_pattern 204 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_2_Ch7: - endchannel +SFX_Cry21_2_Ch8: + sound_ret diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 971a85dc..c93a4784 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,27 +1,27 @@ -SFX_Cry21_3_Ch4: - dutycycle 27 - squarenote 3, 15, 3, 1380 - squarenote 2, 14, 2, 1348 - squarenote 5, 13, 1, 1314 - squarenote 2, 11, 2, 1156 - squarenote 8, 13, 1, 1186 - squarenote 3, 15, 3, 1316 - squarenote 4, 14, 4, 1252 - squarenote 8, 13, 1, 1282 - endchannel +SFX_Cry21_3_Ch5: + duty_cycle_pattern 27 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_3_Ch5: - dutycycle 204 - squarenote 3, 13, 3, 1376 - squarenote 2, 12, 2, 1344 - squarenote 5, 12, 1, 1312 - squarenote 2, 9, 2, 1152 - squarenote 8, 12, 1, 1184 - squarenote 3, 13, 3, 1312 - squarenote 3, 12, 4, 1248 - squarenote 8, 12, 1, 1280 +SFX_Cry21_3_Ch6: + duty_cycle_pattern 204 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_3_Ch7: - endchannel +SFX_Cry21_3_Ch8: + sound_ret diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 77ba4679..72ea2db3 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,24 +1,24 @@ -SFX_Cry22_1_Ch4: - dutycycle 17 - squarenote 2, 3, -5, 897 - squarenote 7, 15, 5, 1537 - squarenote 1, 12, 2, 1153 - squarenote 8, 9, 1, 897 - endchannel +SFX_Cry22_1_Ch5: + duty_cycle_pattern 17 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_1_Ch5: - dutycycle 238 - squarenote 2, 3, -6, 1456 - squarenote 7, 13, 5, 1885 - squarenote 1, 11, 2, 1712 - squarenote 8, 6, 1, 1456 - endchannel +SFX_Cry22_1_Ch6: + duty_cycle_pattern 238 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_1_Ch7: - noisenote 2, 9, 2, 73 - noisenote 7, 11, 5, 41 - noisenote 1, 10, 2, 57 - noisenote 8, 9, 1, 73 - endchannel +SFX_Cry22_1_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 05eb17a1..9492f818 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,24 +1,24 @@ -SFX_Cry22_2_Ch4: - dutycycle 17 - squarenote 2, 3, -5, 897 - squarenote 7, 15, 5, 1537 - squarenote 1, 12, 2, 1153 - squarenote 8, 9, 1, 897 - endchannel +SFX_Cry22_2_Ch5: + duty_cycle_pattern 17 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_2_Ch5: - dutycycle 238 - squarenote 2, 3, -6, 1456 - squarenote 7, 13, 5, 1885 - squarenote 1, 11, 2, 1712 - squarenote 8, 6, 1, 1456 - endchannel +SFX_Cry22_2_Ch6: + duty_cycle_pattern 238 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_2_Ch7: - noisenote 2, 9, 2, 73 - noisenote 7, 11, 5, 41 - noisenote 1, 10, 2, 57 - noisenote 8, 9, 1, 73 - endchannel +SFX_Cry22_2_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 01cc5b28..55cce857 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,24 +1,24 @@ -SFX_Cry22_3_Ch4: - dutycycle 17 - squarenote 2, 3, -5, 897 - squarenote 7, 15, 5, 1537 - squarenote 1, 12, 2, 1153 - squarenote 8, 9, 1, 897 - endchannel +SFX_Cry22_3_Ch5: + duty_cycle_pattern 17 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_3_Ch5: - dutycycle 238 - squarenote 2, 3, -6, 1456 - squarenote 7, 13, 5, 1885 - squarenote 1, 11, 2, 1712 - squarenote 8, 6, 1, 1456 - endchannel +SFX_Cry22_3_Ch6: + duty_cycle_pattern 238 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_3_Ch7: - noisenote 2, 9, 2, 73 - noisenote 7, 11, 5, 41 - noisenote 1, 10, 2, 57 - noisenote 8, 9, 1, 73 - endchannel +SFX_Cry22_3_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index e87e2b41..bd93eb67 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,25 +1,25 @@ -SFX_Cry23_1_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1984 - squarenote 6, 14, 4, 1985 - squarenote 10, 15, 6, 1984 - squarenote 4, 13, 3, 1986 - squarenote 8, 12, 1, 1984 - endchannel +SFX_Cry23_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_1_Ch5: - dutycycle 95 - squarenote 15, 9, 7, 1921 - squarenote 6, 8, 4, 1920 - squarenote 10, 9, 6, 1921 - squarenote 15, 8, 3, 1921 - endchannel +SFX_Cry23_1_Ch6: + duty_cycle_pattern 95 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_1_Ch7: - noisenote 3, 15, 2, 60 - noisenote 13, 14, 6, 44 - noisenote 15, 13, 7, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry23_1_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 24dba11c..78932fd9 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,25 +1,25 @@ -SFX_Cry23_2_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1984 - squarenote 6, 14, 4, 1985 - squarenote 10, 15, 6, 1984 - squarenote 4, 13, 3, 1986 - squarenote 8, 12, 1, 1984 - endchannel +SFX_Cry23_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_2_Ch5: - dutycycle 95 - squarenote 15, 9, 7, 1921 - squarenote 6, 8, 4, 1920 - squarenote 10, 9, 6, 1921 - squarenote 15, 8, 3, 1921 - endchannel +SFX_Cry23_2_Ch6: + duty_cycle_pattern 95 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_2_Ch7: - noisenote 3, 15, 2, 60 - noisenote 13, 14, 6, 44 - noisenote 15, 13, 7, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry23_2_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index e3c62be5..14b52850 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,25 +1,25 @@ -SFX_Cry23_3_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1984 - squarenote 6, 14, 4, 1985 - squarenote 10, 15, 6, 1984 - squarenote 4, 13, 3, 1986 - squarenote 8, 12, 1, 1984 - endchannel +SFX_Cry23_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_3_Ch5: - dutycycle 95 - squarenote 15, 9, 7, 1921 - squarenote 6, 8, 4, 1920 - squarenote 10, 9, 6, 1921 - squarenote 15, 8, 3, 1921 - endchannel +SFX_Cry23_3_Ch6: + duty_cycle_pattern 95 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_3_Ch7: - noisenote 3, 15, 2, 60 - noisenote 13, 14, 6, 44 - noisenote 15, 13, 7, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry23_3_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 99218856..36654731 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,33 +1,33 @@ -SFX_Cry24_1_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1664 - squarenote 10, 14, 6, 1668 - squarenote 15, 13, 7, 1680 - squarenote 8, 13, 5, 1680 - squarenote 6, 12, 4, 1672 - squarenote 5, 13, 3, 1648 - squarenote 4, 13, 3, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry24_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_1_Ch5: - dutycycle 5 - squarenote 15, 11, 7, 1601 - squarenote 10, 9, 6, 1602 - squarenote 15, 10, 7, 1617 - squarenote 8, 10, 5, 1617 - squarenote 6, 9, 4, 1607 - squarenote 5, 10, 3, 1585 - squarenote 4, 9, 3, 1570 - squarenote 8, 7, 1, 1537 - endchannel +SFX_Cry24_1_Ch6: + duty_cycle_pattern 5 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_1_Ch7: - noisenote 15, 14, 4, 60 - noisenote 10, 12, 7, 76 - noisenote 10, 12, 7, 60 - noisenote 12, 11, 7, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry24_1_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 9773793c..b23a020e 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,33 +1,33 @@ -SFX_Cry24_2_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1664 - squarenote 10, 14, 6, 1668 - squarenote 15, 13, 7, 1680 - squarenote 8, 13, 5, 1680 - squarenote 6, 12, 4, 1672 - squarenote 5, 13, 3, 1648 - squarenote 4, 13, 3, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry24_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_2_Ch5: - dutycycle 5 - squarenote 15, 11, 7, 1601 - squarenote 10, 9, 6, 1602 - squarenote 15, 10, 7, 1617 - squarenote 8, 10, 5, 1617 - squarenote 6, 9, 4, 1607 - squarenote 5, 10, 3, 1585 - squarenote 4, 9, 3, 1570 - squarenote 8, 7, 1, 1537 - endchannel +SFX_Cry24_2_Ch6: + duty_cycle_pattern 5 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_2_Ch7: - noisenote 15, 14, 4, 60 - noisenote 10, 12, 7, 76 - noisenote 10, 12, 7, 60 - noisenote 12, 11, 7, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry24_2_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 785f6e9b..6a9d5bf6 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,33 +1,33 @@ -SFX_Cry24_3_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1664 - squarenote 10, 14, 6, 1668 - squarenote 15, 13, 7, 1680 - squarenote 8, 13, 5, 1680 - squarenote 6, 12, 4, 1672 - squarenote 5, 13, 3, 1648 - squarenote 4, 13, 3, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry24_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_3_Ch5: - dutycycle 5 - squarenote 15, 11, 7, 1601 - squarenote 10, 9, 6, 1602 - squarenote 15, 10, 7, 1617 - squarenote 8, 10, 5, 1617 - squarenote 6, 9, 4, 1607 - squarenote 5, 10, 3, 1585 - squarenote 4, 9, 3, 1570 - squarenote 8, 7, 1, 1537 - endchannel +SFX_Cry24_3_Ch6: + duty_cycle_pattern 5 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_3_Ch7: - noisenote 15, 14, 4, 60 - noisenote 10, 12, 7, 76 - noisenote 10, 12, 7, 60 - noisenote 12, 11, 7, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry24_3_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index 9733b0f5..670cbaae 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,26 +1,26 @@ -SFX_Cry25_1_Ch4: - dutycycle 165 - squarenote 6, 15, 4, 1856 - squarenote 15, 14, 3, 1840 - squarenote 4, 15, 4, 1856 - squarenote 5, 11, 3, 1864 - squarenote 8, 13, 1, 1872 - endchannel +SFX_Cry25_1_Ch5: + duty_cycle_pattern 165 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_1_Ch5: - dutycycle 119 - squarenote 6, 12, 3, 1810 - squarenote 15, 11, 3, 1796 - squarenote 3, 12, 3, 1810 - squarenote 4, 12, 3, 1825 - squarenote 8, 11, 1, 1842 - endchannel +SFX_Cry25_1_Ch6: + duty_cycle_pattern 119 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_1_Ch7: - noisenote 8, 13, 6, 44 - noisenote 12, 12, 6, 60 - noisenote 10, 11, 6, 44 - noisenote 8, 9, 1, 28 - endchannel +SFX_Cry25_1_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index c38fa988..6b52d9bf 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,26 +1,26 @@ -SFX_Cry25_2_Ch4: - dutycycle 165 - squarenote 6, 15, 4, 1856 - squarenote 15, 14, 3, 1840 - squarenote 4, 15, 4, 1856 - squarenote 5, 11, 3, 1864 - squarenote 8, 13, 1, 1872 - endchannel +SFX_Cry25_2_Ch5: + duty_cycle_pattern 165 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_2_Ch5: - dutycycle 119 - squarenote 6, 12, 3, 1810 - squarenote 15, 11, 3, 1796 - squarenote 3, 12, 3, 1810 - squarenote 4, 12, 3, 1825 - squarenote 8, 11, 1, 1842 - endchannel +SFX_Cry25_2_Ch6: + duty_cycle_pattern 119 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_2_Ch7: - noisenote 8, 13, 6, 44 - noisenote 12, 12, 6, 60 - noisenote 10, 11, 6, 44 - noisenote 8, 9, 1, 28 - endchannel +SFX_Cry25_2_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index 610fa04b..22ce220d 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,26 +1,26 @@ -SFX_Cry25_3_Ch4: - dutycycle 165 - squarenote 6, 15, 4, 1856 - squarenote 15, 14, 3, 1840 - squarenote 4, 15, 4, 1856 - squarenote 5, 11, 3, 1864 - squarenote 8, 13, 1, 1872 - endchannel +SFX_Cry25_3_Ch5: + duty_cycle_pattern 165 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_3_Ch5: - dutycycle 119 - squarenote 6, 12, 3, 1810 - squarenote 15, 11, 3, 1796 - squarenote 3, 12, 3, 1810 - squarenote 4, 12, 3, 1825 - squarenote 8, 11, 1, 1842 - endchannel +SFX_Cry25_3_Ch6: + duty_cycle_pattern 119 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_3_Ch7: - noisenote 8, 13, 6, 44 - noisenote 12, 12, 6, 60 - noisenote 10, 11, 6, 44 - noisenote 8, 9, 1, 28 - endchannel +SFX_Cry25_3_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index b4466ca7..fd53e240 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ -SFX_Cut_1_Ch7: - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Cut_1_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index ff7a0c4d..b223b99b 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ -SFX_Cut_3_Ch7: - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Cut_3_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 81351836..693bb0c5 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch7: - noisenote 0, 10, 1, 16 - endchannel +SFX_Cymbal1_1_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index abae0e01..206d44ae 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch7: - noisenote 0, 10, 1, 16 - endchannel +SFX_Cymbal1_2_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index f76df305..9389cc6f 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch7: - noisenote 0, 10, 1, 16 - endchannel +SFX_Cymbal1_3_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index da3ba376..3f050d96 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch7: - noisenote 0, 10, 2, 17 - endchannel +SFX_Cymbal2_1_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index c8fb1241..ab0a2edd 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch7: - noisenote 0, 10, 2, 17 - endchannel +SFX_Cymbal2_2_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index b34236d0..26f7048a 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch7: - noisenote 0, 10, 2, 17 - endchannel +SFX_Cymbal2_3_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index f9b8733e..179de2f0 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch7: - noisenote 0, 10, 2, 80 - endchannel +SFX_Cymbal3_1_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index d80395a4..09e3b6e1 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch7: - noisenote 0, 10, 2, 80 - endchannel +SFX_Cymbal3_2_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 1a9a07e2..a7af3bb0 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch7: - noisenote 0, 10, 2, 80 - endchannel +SFX_Cymbal3_3_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index c96300fe..5e0665f6 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ -SFX_Damage_Ch7: - noisenote 2, 15, 4, 68 - noisenote 2, 15, 4, 20 - noisenote 15, 15, 1, 50 - endchannel +SFX_Damage_Ch8: + noise_note 2, 15, 4, 68 + noise_note 2, 15, 4, 20 + noise_note 15, 15, 1, 50 + sound_ret diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index b8dabd64..fe822270 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ -SFX_Denied_1_Ch4: - duty 3 - pitchenvelope 5, -2 - squarenote 4, 15, 0, 1280 - pitchenvelope 0, 0 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_1_Ch5: + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 0 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret -SFX_Denied_1_Ch5: - duty 3 - squarenote 4, 15, 0, 1025 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1025 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_1_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 0deb99eb..51b98de4 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,18 +1,18 @@ -SFX_Denied_3_Ch4: - duty 3 - pitchenvelope 5, -2 - squarenote 4, 15, 0, 1280 - pitchenvelope 0, 0 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_3_Ch5: + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 0 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret -SFX_Denied_3_Ch5: - duty 3 - squarenote 4, 15, 0, 1025 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1025 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_3_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 46039163..147c3eb7 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ -SFX_Dex_Page_Added_Ch4: - duty 2 - pitchenvelope 4, 4 - squarenote 15, 15, 0, 1264 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Dex_Page_Added_Ch5: + duty_cycle 2 + pitch_sweep 4, 4 + square_note 15, 15, 0, 1264 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret -SFX_Dex_Page_Added_Ch5: - duty 2 - squarenote 15, 9, 2, 1536 - squarenote 15, 9, 2, 1922 - endchannel +SFX_Dex_Page_Added_Ch6: + duty_cycle 2 + square_note 15, 9, 2, 1536 + square_note 15, 9, 2, 1922 + sound_ret diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 82262b2e..14638602 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch7: - noisenote 8, 15, 1, 50 - noisenote 8, 15, 1, 51 - endchannel +SFX_Doubleslap_Ch8: + noise_note 8, 15, 1, 50 + noise_note 8, 15, 1, 51 + sound_ret diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index dfae7edd..30c3ecd1 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_1_Ch4: - duty 2 - squarenote 6, 15, 0, 1792 - squarenote 4, 0, 0, 0 - squarenote 6, 15, 0, 1792 - squarenote 1, 0, 0, 0 - endchannel +SFX_Enter_PC_1_Ch5: + duty_cycle 2 + square_note 6, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 6, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index e4372af9..9c741798 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_3_Ch4: - duty 2 - squarenote 4, 15, 0, 1792 - squarenote 4, 0, 0, 0 - squarenote 4, 15, 0, 1792 - squarenote 1, 0, 0, 0 - endchannel +SFX_Enter_PC_3_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 4, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index 00e9c255..6ce363e0 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ -SFX_Faint_Fall_Ch4: - duty 1 - pitchenvelope 10, -7 - squarenote 15, 15, 2, 1920 - pitchenvelope 0, 0 - endchannel +SFX_Faint_Fall_Ch5: + duty_cycle 1 + pitch_sweep 10, -7 + square_note 15, 15, 2, 1920 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index d866b588..d7449c84 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ -SFX_Faint_Thud_Ch4: - squarenote 15, 13, 1, 512 - pitchenvelope 0, 0 - endchannel +SFX_Faint_Thud_Ch5: + square_note 15, 13, 1, 512 + pitch_sweep 0, 0 + sound_ret -SFX_Faint_Thud_Ch7: - noisenote 4, 15, 5, 51 - noisenote 8, 15, 4, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Faint_Thud_Ch8: + noise_note 4, 15, 5, 51 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 567485a5..40ebb966 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ -SFX_Fly_1_Ch7: - noisenote 2, 15, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 10, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 13, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 8, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 11, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 6, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 9, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 4, 1, 18 - noisenote 2, 0, 0, 0 - endchannel +SFX_Fly_1_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 30076475..e29b5654 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ -SFX_Fly_3_Ch7: - noisenote 2, 15, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 10, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 13, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 8, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 11, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 6, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 9, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 4, 1, 18 - noisenote 2, 0, 0, 0 - endchannel +SFX_Fly_3_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 2cf5e8c9..09f76c70 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_1_Ch4: - executemusic +SFX_Get_Item1_1_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_Get_Item1_1_Ch5: - executemusic +SFX_Get_Item1_1_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret -SFX_Get_Item1_1_Ch6: - executemusic - notetype 4, 1, 0 +SFX_Get_Item1_1_Ch7: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index 6c4c01b5..dfc1848f 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_3_Ch4: - executemusic +SFX_Get_Item1_3_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_Get_Item1_3_Ch5: - executemusic +SFX_Get_Item1_3_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret -SFX_Get_Item1_3_Ch6: - executemusic - notetype 4, 1, 0 +SFX_Get_Item1_3_Ch7: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 01e66269..04bbdae2 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_1_Ch4: - executemusic +SFX_Get_Item2_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_1_Ch5: - executemusic +SFX_Get_Item2_1_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 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 + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_1_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 27c5864d..f05e0728 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_2_Ch4: - executemusic +SFX_Get_Item2_2_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_2_Ch5: - executemusic +SFX_Get_Item2_2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 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 + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_2_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_2_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 42d74e8e..036d375b 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_3_Ch4: - executemusic +SFX_Get_Item2_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_3_Ch5: - executemusic +SFX_Get_Item2_3_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 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 + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_3_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_3_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index b2ae3d57..a19f1143 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_1_Ch4: - executemusic +SFX_Get_Key_Item_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + note_type 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 + note C_, 2 + note C_, 1 + note C_, 1 + note_type 5, 10, 4 + note D#, 4 + note_type 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note_type 5, 11, 4 + note A#, 8 + sound_ret -SFX_Get_Key_Item_1_Ch5: - executemusic +SFX_Get_Key_Item_1_Ch6: + execute_music vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + duty_cycle 2 + note_type 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 + note G_, 2 + note G_, 1 + note G_, 1 + note_type 5, 12, 4 + note D#, 4 + note_type 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + note_type 5, 12, 4 octave 5 - D# 8 - endchannel + note D#, 8 + sound_ret -SFX_Get_Key_Item_1_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Key_Item_1_Ch7: + execute_music + note_type 5, 1, 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + sound_ret diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index aebae361..c1063a7f 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_3_Ch4: - executemusic +SFX_Get_Key_Item_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + note_type 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 + note C_, 2 + note C_, 1 + note C_, 1 + note_type 5, 10, 4 + note D#, 4 + note_type 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note_type 5, 11, 4 + note A#, 8 + sound_ret -SFX_Get_Key_Item_3_Ch5: - executemusic +SFX_Get_Key_Item_3_Ch6: + execute_music vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + duty_cycle 2 + note_type 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 + note G_, 2 + note G_, 1 + note G_, 1 + note_type 5, 12, 4 + note D#, 4 + note_type 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + note_type 5, 12, 4 octave 5 - D# 8 - endchannel + note D#, 8 + sound_ret -SFX_Get_Key_Item_3_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Key_Item_3_Ch7: + execute_music + note_type 5, 1, 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + sound_ret diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index f45c8399..b41dc94d 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch7: - noisenote 9, 15, 1, 68 - noisenote 8, 13, 1, 67 - endchannel +SFX_Go_Inside_1_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index cf69e4b7..5aab6564 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch7: - noisenote 9, 15, 1, 68 - noisenote 8, 13, 1, 67 - endchannel +SFX_Go_Inside_3_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 3156eba7..2ac3542b 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_1_Ch7: - noisenote 2, 15, 1, 84 - noisenote 12, 7, 1, 35 - noisenote 2, 11, 1, 84 - noisenote 12, 6, 1, 35 - noisenote 6, 4, 1, 84 - endchannel +SFX_Go_Outside_1_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 37952248..cd3543f2 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_3_Ch7: - noisenote 2, 15, 1, 84 - noisenote 12, 7, 1, 35 - noisenote 2, 11, 1, 84 - noisenote 12, 6, 1, 35 - noisenote 6, 4, 1, 84 - endchannel +SFX_Go_Outside_3_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 656babad..a14afe1a 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_1_Ch4: - duty 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index bb06b360..81171c12 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_2_Ch4: - duty 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_2_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index ff1b1304..b1a0a570 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_3_Ch4: - duty 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 1fdbdfea..f6413962 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_1_Ch4: - duty 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index befb3f01..c784c174 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_2_Ch4: - duty 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_2_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index ba4d6739..7ca9d73b 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_3_Ch4: - duty 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 095f7b7a..59d3f21a 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_1_Ch4: - duty 2 - pitchenvelope 2, -4 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 2, 15, 1, 1280 - pitchenvelope 0, 0 - squarenote 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 0 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index a0501d8f..3078dba5 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_3_Ch4: - duty 2 - pitchenvelope 2, -4 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 2, 15, 1, 1280 - pitchenvelope 0, 0 - squarenote 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_3_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 0 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 6f126626..32541241 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ -SFX_Horn_Drill_Ch7: - noisenote 3, 9, 2, 49 - noisenote 3, 11, 2, 50 - noisenote 3, 12, 2, 51 - noisenote 8, 15, 1, 84 - endchannel +SFX_Horn_Drill_Ch8: + noise_note 3, 9, 2, 49 + noise_note 3, 11, 2, 50 + noise_note 3, 12, 2, 51 + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 41a4db84..703edf41 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch7: - noisenote 2, 13, 2, 50 - noisenote 15, 15, 2, 67 - endchannel +SFX_Intro_Crash_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 09af056f..47e37c21 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hip_Ch4: - duty 2 - pitchenvelope 2, 6 - squarenote 12, 12, 2, 1856 - pitchenvelope 0, 0 - endchannel +SFX_Intro_Hip_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1856 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 7dec29ae..1bee7a5c 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hop_Ch4: - duty 2 - pitchenvelope 2, 6 - squarenote 12, 12, 2, 1664 - pitchenvelope 0, 0 - endchannel +SFX_Intro_Hop_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1664 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index ecdd9428..ee41e37c 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ -SFX_Intro_Lunge_Ch7: - noisenote 6, 2, 0, 16 - noisenote 6, 2, -7, 64 - noisenote 6, 4, -7, 65 - noisenote 6, 8, -7, 65 - noisenote 6, 12, -7, 66 - noisenote 8, 13, 7, 66 - noisenote 15, 14, 7, 67 - noisenote 15, 15, 2, 67 - endchannel +SFX_Intro_Lunge_Ch8: + noise_note 6, 2, 0, 16 + noise_note 6, 2, -7, 64 + noise_note 6, 4, -7, 65 + noise_note 6, 8, -7, 65 + noise_note 6, 12, -7, 66 + noise_note 8, 13, 7, 66 + noise_note 15, 14, 7, 67 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index c972283d..1985878b 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ -SFX_Intro_Raise_Ch7: - noisenote 2, 6, -7, 33 - noisenote 2, 10, -7, 49 - noisenote 15, 15, 2, 65 - endchannel +SFX_Intro_Raise_Ch8: + noise_note 2, 6, -7, 33 + noise_note 2, 10, -7, 49 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 647fcbd2..68ba128a 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ -SFX_Intro_Whoosh_Ch7: - noisenote 4, 2, -4, 32 - noisenote 3, 10, 0, 32 - noisenote 3, 11, 0, 33 - noisenote 3, 12, 0, 34 - noisenote 15, 13, 2, 36 - endchannel +SFX_Intro_Whoosh_Ch8: + noise_note 4, 2, -4, 32 + noise_note 3, 10, 0, 32 + noise_note 3, 11, 0, 33 + noise_note 3, 12, 0, 34 + noise_note 15, 13, 2, 36 + sound_ret diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 0b2b478f..6cfb4d26 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ -SFX_Ledge_1_Ch4: - duty 2 - pitchenvelope 9, 5 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ledge_1_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 29b055a9..97627116 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ -SFX_Ledge_3_Ch4: - duty 2 - pitchenvelope 9, 5 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ledge_3_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 5b3da83d..f1af4978 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,63 +1,63 @@ -SFX_Level_Up_Ch4: - executemusic +SFX_Level_Up_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 6, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 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 + note F_, 4 + note_type 4, 11, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note_type 6, 11, 3 + note D#, 2 + note D#, 2 + note E_, 2 + note_type 6, 11, 4 + note F_, 8 + sound_ret -SFX_Level_Up_Ch5: - executemusic +SFX_Level_Up_Ch6: + execute_music vibrato 4, 2, 2 - duty 2 - notetype 6, 12, 4 + duty_cycle 2 + note_type 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 + note A_, 4 + note_type 4, 12, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note_type 6, 12, 4 + note A#, 2 + note A#, 2 + note A#, 2 + note_type 6, 12, 4 + note A_, 8 + sound_ret -SFX_Level_Up_Ch6: - executemusic - notetype 6, 1, 0 +SFX_Level_Up_Ch7: + execute_music + note_type 6, 1, 0 octave 5 - A_ 4 - notetype 4, 1, 0 - F_ 1 + note A_, 4 + note_type 4, 1, 0 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - notetype 6, 1, 0 - G_ 1 + note_type 6, 1, 0 + note G_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index aa7787ff..52eb96d7 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch7: - noisenote 0, 10, 1, 24 - noisenote 0, 3, 1, 51 - endchannel +SFX_Muted_Snare1_1_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index 8b0cbde3..c3e29c16 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch7: - noisenote 0, 10, 1, 24 - noisenote 0, 3, 1, 51 - endchannel +SFX_Muted_Snare1_2_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 7487c98f..a83ecd94 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch7: - noisenote 0, 10, 1, 24 - noisenote 0, 3, 1, 51 - endchannel +SFX_Muted_Snare1_3_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index cca5a93e..a8066238 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch7: - noisenote 0, 9, 1, 34 - endchannel +SFX_Muted_Snare2_1_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index e33c7837..32bb41f5 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch7: - noisenote 0, 9, 1, 34 - endchannel +SFX_Muted_Snare2_2_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index d53965e4..5c3b743e 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch7: - noisenote 0, 9, 1, 34 - endchannel +SFX_Muted_Snare2_3_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 1140a92b..0538f8d5 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch7: - noisenote 0, 7, 1, 34 - endchannel +SFX_Muted_Snare3_1_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 4e5eff53..20c3772c 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch7: - noisenote 0, 7, 1, 34 - endchannel +SFX_Muted_Snare3_2_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index d11099b5..2ac3f874 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch7: - noisenote 0, 7, 1, 34 - endchannel +SFX_Muted_Snare3_3_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index aac775e4..575829ae 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch7: - noisenote 0, 6, 1, 34 - endchannel +SFX_Muted_Snare4_1_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 8cc7e02e..19744539 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch7: - noisenote 0, 6, 1, 34 - endchannel +SFX_Muted_Snare4_2_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index fcc7455b..188f9bff 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch7: - noisenote 0, 6, 1, 34 - endchannel +SFX_Muted_Snare4_3_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 2220bf03..c8dfe725 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ -SFX_Not_Very_Effective_Ch7: - noisenote 4, 8, -7, 85 - noisenote 2, 15, 4, 68 - noisenote 8, 15, 4, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Not_Very_Effective_Ch8: + noise_note 4, 8, -7, 85 + noise_note 2, 15, 4, 68 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c52ce4d0..d478dff6 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch7: - noisenote 2, 10, 1, 18 - endchannel +SFX_Peck_Ch8: + noise_note 2, 10, 1, 18 + sound_ret diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 8deaafe5..2c922df7 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch4: - duty 0 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - loopchannel 4, SFX_Poisoned_1_Ch4 - squarenote 15, 15, 3, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Poisoned_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_1_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index a66aaf7a..2c0b58cc 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_3_Ch4: - duty 0 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - loopchannel 4, SFX_Poisoned_3_Ch4 - squarenote 15, 15, 3, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Poisoned_3_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_3_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 1e0f95f5..0df1138f 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,77 +1,77 @@ -SFX_Pokedex_Rating_1_Ch4: - executemusic +SFX_Pokedex_Rating_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - notetype 5, 11, 1 + duty_cycle 2 + note_type 5, 11, 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 - endchannel + note F_, 4 + sound_ret -SFX_Pokedex_Rating_1_Ch5: - executemusic - duty 2 - notetype 5, 12, 2 +SFX_Pokedex_Rating_1_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 - F_ 2 - E_ 1 + note F_, 2 + note E_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + sound_ret -SFX_Pokedex_Rating_1_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Pokedex_Rating_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A# 1 + note A#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 3 - C_ 1 + note C_, 1 rest 3 octave 4 - F_ 2 + note F_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index 01ac0e1c..18dbcda2 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,77 +1,77 @@ -SFX_Pokedex_Rating_3_Ch4: - executemusic +SFX_Pokedex_Rating_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - notetype 5, 11, 1 + duty_cycle 2 + note_type 5, 11, 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 - endchannel + note F_, 4 + sound_ret -SFX_Pokedex_Rating_3_Ch5: - executemusic - duty 2 - notetype 5, 12, 2 +SFX_Pokedex_Rating_3_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 - F_ 2 - E_ 1 + note F_, 2 + note E_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + sound_ret -SFX_Pokedex_Rating_3_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Pokedex_Rating_3_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A# 1 + note A#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 3 - C_ 1 + note C_, 1 rest 3 octave 4 - F_ 2 + note F_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 272c114f..88f33d0b 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,21 +1,21 @@ -SFX_Pokeflute_Ch2: +SFX_Pokeflute_Ch3: vibrato 16, 1, 4 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 5 - E_ 2 - F_ 2 - G_ 4 - A_ 2 - G_ 2 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 octave 6 - C_ 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 octave 5 - G_ 2 - A_ 2 - F_ 2 - G_ 8 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 8 rest 12 - endchannel + sound_ret diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm deleted file mode 100644 index 146488d8..00000000 --- a/audio/sfx/pokeflute_ch4_ch5.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_08_PokeFlute_Ch4: - tempo 256 - - -SFX_08_PokeFlute_Ch5: - executemusic - notetype 8, 0, 0 - rest 5 - rest 7 - rest 5 - rest 5 - rest 5 - rest 5 - endchannel diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm new file mode 100644 index 00000000..4f0e96a8 --- /dev/null +++ b/audio/sfx/pokeflute_ch5_ch6.asm @@ -0,0 +1,14 @@ +SFX_Pokeflute_Ch5: + tempo 256 + + +SFX_Pokeflute_Ch6: + execute_music + note_type 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + sound_ret diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm deleted file mode 100644 index 4d4e5bae..00000000 --- a/audio/sfx/pokeflute_ch6.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_PokeFlute_Ch6: - executemusic - vibrato 16, 1, 4 - notetype 8, 1, 0 - octave 5 - E_ 3 - F_ 3 - G_ 7 - A_ 3 - G_ 3 - octave 6 - C_ 13 - endchannel diff --git a/audio/sfx/pokeflute_ch7.asm b/audio/sfx/pokeflute_ch7.asm new file mode 100644 index 00000000..4435c0fb --- /dev/null +++ b/audio/sfx/pokeflute_ch7.asm @@ -0,0 +1,13 @@ +SFX_Pokeflute_Ch7: + execute_music + vibrato 16, 1, 4 + note_type 8, 1, 0 + octave 5 + note E_, 3 + note F_, 3 + note G_, 7 + note A_, 3 + note G_, 3 + octave 6 + note C_, 13 + sound_ret diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 3aee5836..d1891751 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch7: - noisenote 2, 10, 1, 34 - endchannel +SFX_Pound_Ch8: + noise_note 2, 10, 1, 34 + sound_ret diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index bfc9635b..7767547c 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_1_Ch4: - duty 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_1_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 9ad03c67..7e01bce5 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_2_Ch4: - duty 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_2_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 67306cbe..4b4c78b9 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_3_Ch4: - duty 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_3_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 71c7119b..3142fca5 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch4: - dutycycle 161 - squarenote 10, 15, 1, 1600 - squarenote 10, 15, 3, 1664 - squarenote 10, 15, 2, 1568 - loopchannel 4, SFX_Psybeam_Ch4 - squarenote 10, 15, 1, 1600 - endchannel +SFX_Psybeam_Ch5: + duty_cycle_pattern 161 + square_note 10, 15, 1, 1600 + square_note 10, 15, 3, 1664 + square_note 10, 15, 2, 1568 + sound_loop 4, SFX_Psybeam_Ch5 + square_note 10, 15, 1, 1600 + sound_ret -SFX_Psybeam_Ch5: - dutycycle 179 - squarenote 10, 15, 3, 1393 - squarenote 7, 14, 3, 1329 - squarenote 10, 15, 1, 1361 - loopchannel 4, SFX_Psybeam_Ch5 - squarenote 10, 15, 1, 1393 - endchannel +SFX_Psybeam_Ch6: + duty_cycle_pattern 179 + square_note 10, 15, 3, 1393 + square_note 7, 14, 3, 1329 + square_note 10, 15, 1, 1361 + sound_loop 4, SFX_Psybeam_Ch6 + square_note 10, 15, 1, 1393 + sound_ret -SFX_Psybeam_Ch7: - noisenote 2, 13, 1, 74 - noisenote 2, 13, 2, 42 - loopchannel 21, SFX_Psybeam_Ch7 - endchannel +SFX_Psybeam_Ch8: + noise_note 2, 13, 1, 74 + noise_note 2, 13, 2, 42 + sound_loop 21, SFX_Psybeam_Ch8 + sound_ret diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index a9cd5ec3..c6e11d42 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ -SFX_Psychic_M_Ch4: - duty 2 - pitchenvelope 15, 7 - squarenote 8, 12, 4, 1981 - squarenote 8, 12, 4, 1982 - squarenote 8, 12, 4, 1983 - squarenote 8, 12, 4, 1984 - squarenote 15, 12, 4, 1985 - squarenote 15, 15, 2, 1984 - pitchenvelope 0, 0 - endchannel +SFX_Psychic_M_Ch5: + duty_cycle 2 + pitch_sweep 15, 7 + square_note 8, 12, 4, 1981 + square_note 8, 12, 4, 1982 + square_note 8, 12, 4, 1983 + square_note 8, 12, 4, 1984 + square_note 15, 12, 4, 1985 + square_note 15, 15, 2, 1984 + pitch_sweep 0, 0 + sound_ret -SFX_Psychic_M_Ch5: - duty 2 - squarenote 8, 12, 4, 1904 - squarenote 8, 12, 4, 1889 - squarenote 8, 12, 4, 1890 - squarenote 8, 12, 4, 1891 - squarenote 15, 12, 4, 1892 - squarenote 15, 15, 2, 1892 - endchannel +SFX_Psychic_M_Ch6: + duty_cycle 2 + square_note 8, 12, 4, 1904 + square_note 8, 12, 4, 1889 + square_note 8, 12, 4, 1890 + square_note 8, 12, 4, 1891 + square_note 15, 12, 4, 1892 + square_note 15, 15, 2, 1892 + sound_ret -SFX_Psychic_M_Ch7: - noisenote 15, 3, -7, 20 - noisenote 15, 12, -7, 19 - noisenote 15, 12, -7, 18 - noisenote 15, 12, -7, 17 - noisenote 15, 12, -7, 16 - noisenote 15, 12, 2, 16 - endchannel +SFX_Psychic_M_Ch8: + noise_note 15, 3, -7, 20 + noise_note 15, 12, -7, 19 + noise_note 15, 12, -7, 18 + noise_note 15, 12, -7, 17 + noise_note 15, 12, -7, 16 + noise_note 15, 12, 2, 16 + sound_ret diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index bb8c3cce..9dc06f0b 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ -SFX_Purchase_1_Ch4: - duty 2 - squarenote 4, 14, 1, 1792 - squarenote 8, 15, 2, 2016 - endchannel +SFX_Purchase_1_Ch5: + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret -SFX_Purchase_1_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 9, 1, 1729 - squarenote 8, 10, 2, 1953 - endchannel +SFX_Purchase_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 454e6f83..eaa4bb60 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,13 +1,13 @@ -SFX_Purchase_3_Ch4: - duty 2 - squarenote 4, 14, 1, 1792 - squarenote 8, 15, 2, 2016 - endchannel +SFX_Purchase_3_Ch5: + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret -SFX_Purchase_3_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 9, 1, 1729 - squarenote 8, 10, 2, 1953 - endchannel +SFX_Purchase_3_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index bf7bf116..c2155ca9 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_1_Ch7: - noisenote 4, 10, 2, 35 - noisenote 8, 15, 1, 52 - noisenote 15, 0, 0, 0 - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Push_Boulder_1_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index f554da55..5f084139 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_3_Ch7: - noisenote 4, 10, 2, 35 - noisenote 8, 15, 1, 52 - noisenote 15, 0, 0, 0 - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Push_Boulder_3_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index b59ceefa..b4ed791b 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ -SFX_Run_Ch7: - noisenote 2, 6, 1, 35 - noisenote 2, 10, 1, 51 - noisenote 2, 12, 1, 51 - noisenote 2, 5, 1, 17 - noisenote 2, 15, 1, 51 - noisenote 2, 4, 1, 17 - noisenote 2, 12, 1, 51 - noisenote 2, 3, 1, 17 - noisenote 2, 8, 1, 51 - noisenote 2, 3, 1, 17 - noisenote 8, 4, 1, 51 - endchannel +SFX_Run_Ch8: + noise_note 2, 6, 1, 35 + noise_note 2, 10, 1, 51 + noise_note 2, 12, 1, 51 + noise_note 2, 5, 1, 17 + noise_note 2, 15, 1, 51 + noise_note 2, 4, 1, 17 + noise_note 2, 12, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 2, 8, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 8, 4, 1, 51 + sound_ret diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index 5692b0d6..6ce7b7c3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ -SFX_Safari_Zone_PA_Ch4: - duty 2 - squarenote 15, 15, 3, 1840 - squarenote 8, 6, 5, 1840 - squarenote 15, 15, 4, 1792 - squarenote 15, 7, 4, 1792 - squarenote 15, 4, 4, 1792 - squarenote 15, 2, 4, 1792 - endchannel +SFX_Safari_Zone_PA_Ch5: + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 07702b4d..d0849ff5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ -SFX_Save_1_Ch4: - duty 2 - squarenote 4, 15, 4, 1792 - squarenote 2, 14, 4, 1536 - squarenote 2, 14, 4, 1664 - squarenote 2, 14, 4, 1728 - squarenote 2, 14, 4, 1792 - squarenote 2, 14, 4, 1952 - squarenote 15, 15, 2, 2016 - endchannel +SFX_Save_1_Ch5: + duty_cycle 2 + square_note 4, 15, 4, 1792 + square_note 2, 14, 4, 1536 + square_note 2, 14, 4, 1664 + square_note 2, 14, 4, 1728 + square_note 2, 14, 4, 1792 + square_note 2, 14, 4, 1952 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Save_1_Ch5: - duty 2 - squarenote 4, 0, 8, 0 - squarenote 2, 13, 4, 1793 - squarenote 2, 12, 4, 1537 - squarenote 2, 12, 4, 1665 - squarenote 2, 12, 4, 1729 - squarenote 2, 12, 4, 1793 - squarenote 2, 12, 4, 1953 - squarenote 15, 13, 2, 2017 - endchannel +SFX_Save_1_Ch6: + duty_cycle 2 + square_note 4, 0, 8, 0 + square_note 2, 13, 4, 1793 + square_note 2, 12, 4, 1537 + square_note 2, 12, 4, 1665 + square_note 2, 12, 4, 1729 + square_note 2, 12, 4, 1793 + square_note 2, 12, 4, 1953 + square_note 15, 13, 2, 2017 + sound_ret diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index eda54e9e..8db092b2 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,36 +1,36 @@ -SFX_Save_3_Ch4: - duty 2 +SFX_Save_3_Ch5: + duty_cycle 2 IF DEF(_RED) - squarenote 4, 15, 4, 1792 - squarenote 3, 14, 4, 1664 - squarenote 3, 14, 4, 1728 - squarenote 3, 14, 4, 1792 - squarenote 2, 14, 4, 1952 + square_note 4, 15, 4, 1792 + square_note 3, 14, 4, 1664 + square_note 3, 14, 4, 1728 + square_note 3, 14, 4, 1792 + square_note 2, 14, 4, 1952 ELSE - squarenote 3, 14, 4, 1536 - squarenote 3, 14, 4, 1664 - squarenote 3, 14, 4, 1728 - squarenote 3, 14, 4, 1792 - squarenote 15, 15, 2, 2016 + square_note 3, 14, 4, 1536 + square_note 3, 14, 4, 1664 + square_note 3, 14, 4, 1728 + square_note 3, 14, 4, 1792 + square_note 15, 15, 2, 2016 ENDC - endchannel + sound_ret -SFX_Save_3_Ch5: - duty 2 +SFX_Save_3_Ch6: + duty_cycle 2 IF DEF(_RED) - squarenote 4, 0, 8, 0 - squarenote 3, 13, 4, 1793 - squarenote 3, 12, 4, 1665 - squarenote 3, 12, 4, 1729 - squarenote 3, 12, 4, 1793 - squarenote 2, 12, 4, 1953 + square_note 4, 0, 8, 0 + square_note 3, 13, 4, 1793 + square_note 3, 12, 4, 1665 + square_note 3, 12, 4, 1729 + square_note 3, 12, 4, 1793 + square_note 2, 12, 4, 1953 ELSE - squarenote 3, 0, 8, 0 - squarenote 3, 12, 4, 1537 - squarenote 3, 12, 4, 1665 - squarenote 3, 12, 4, 1729 - squarenote 3, 12, 4, 1793 - squarenote 15, 13, 2, 2017 + square_note 3, 0, 8, 0 + square_note 3, 12, 4, 1537 + square_note 3, 12, 4, 1665 + square_note 3, 12, 4, 1729 + square_note 3, 12, 4, 1793 + square_note 15, 13, 2, 2017 ENDC - endchannel + sound_ret diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index fbd158fd..796400a4 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ -SFX_Shooting_Star_Ch4: - dutycycle 228 - pitchenvelope 2, -7 - squarenote 4, 4, 0, 2016 - squarenote 4, 6, 0, 2016 - squarenote 4, 8, 0, 2016 - squarenote 8, 10, 0, 2016 - squarenote 8, 10, 0, 2016 - squarenote 8, 8, 0, 2016 - squarenote 8, 6, 0, 2016 - squarenote 8, 3, 0, 2016 - squarenote 15, 1, 2, 2016 - pitchenvelope 0, 0 - endchannel +SFX_Shooting_Star_Ch5: + duty_cycle_pattern 228 + pitch_sweep 2, -7 + square_note 4, 4, 0, 2016 + square_note 4, 6, 0, 2016 + square_note 4, 8, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 8, 0, 2016 + square_note 8, 6, 0, 2016 + square_note 8, 3, 0, 2016 + square_note 15, 1, 2, 2016 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index df1fb338..ae869564 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ -SFX_Shrink_1_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1536 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1280 - squarenote 15, 4, 7, 1152 - squarenote 15, 1, 7, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Shrink_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 37a8b572..b944680f 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ -SFX_Shrink_3_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1536 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1280 - squarenote 15, 4, 7, 1152 - squarenote 15, 1, 7, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Shrink_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index 94914320..4a565740 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ -SFX_Silph_Scope_Ch4: - duty 0 - squarenote 0, 13, 2, 1792 - squarenote 0, 13, 2, 1856 - squarenote 0, 13, 2, 1920 - squarenote 0, 13, 2, 1984 - squarenote 10, 14, 1, 2016 - squarenote 1, 0, 0, 0 - endchannel +SFX_Silph_Scope_Ch5: + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index df897225..a8b668b8 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ -SFX_Slots_New_Spin_Ch4: - duty 3 - squarenote 5, 14, 1, 1792 - squarenote 2, 14, 1, 1920 - squarenote 15, 15, 1, 1984 - endchannel +SFX_Slots_New_Spin_Ch5: + duty_cycle 3 + square_note 5, 14, 1, 1792 + square_note 2, 14, 1, 1920 + square_note 15, 15, 1, 1984 + sound_ret -SFX_Slots_New_Spin_Ch5: - duty 2 - squarenote 4, 12, 1, 1729 - squarenote 2, 12, 1, 1857 - squarenote 15, 13, 1, 1921 - endchannel +SFX_Slots_New_Spin_Ch6: + duty_cycle 2 + square_note 4, 12, 1, 1729 + square_note 2, 12, 1, 1857 + square_note 15, 13, 1, 1921 + sound_ret diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index b82db160..8f2d1829 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ -SFX_Slots_Reward_Ch4: - duty 2 - squarenote 2, 15, 1, 1792 - squarenote 8, 8, 1, 2016 - endchannel +SFX_Slots_Reward_Ch5: + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 8, 8, 1, 2016 + sound_ret diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 6c462c16..b9a69c19 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ -SFX_Slots_Stop_Wheel_Ch4: - duty 2 - squarenote 1, 15, 2, 1696 - squarenote 1, 15, 2, 1760 - squarenote 8, 15, 1, 1792 - endchannel +SFX_Slots_Stop_Wheel_Ch5: + duty_cycle 2 + square_note 1, 15, 2, 1696 + square_note 1, 15, 2, 1760 + square_note 8, 15, 1, 1792 + sound_ret diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 999b91dc..a6e569a5 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch7: - noisenote 0, 12, 1, 51 - endchannel +SFX_Snare1_1_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 994ff3de..336c9f22 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch7: - noisenote 0, 12, 1, 51 - endchannel +SFX_Snare1_2_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 87f4e817..84108aed 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch7: - noisenote 0, 12, 1, 51 - endchannel +SFX_Snare1_3_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 6a9e5cd9..fddcfe01 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch7: - noisenote 0, 11, 1, 51 - endchannel +SFX_Snare2_1_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index e8f7c5f9..522abb40 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch7: - noisenote 0, 11, 1, 51 - endchannel +SFX_Snare2_2_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index 9775a6e9..c41fadbb 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch7: - noisenote 0, 11, 1, 51 - endchannel +SFX_Snare2_3_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index 215eaec4..0c9cfbdb 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch7: - noisenote 0, 10, 1, 51 - endchannel +SFX_Snare3_1_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 18a301b5..d5990157 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch7: - noisenote 0, 10, 1, 51 - endchannel +SFX_Snare3_2_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index decd3ab6..807cfd03 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch7: - noisenote 0, 10, 1, 51 - endchannel +SFX_Snare3_3_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 3cf12af2..fe2552d9 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch7: - noisenote 0, 8, 1, 51 - endchannel +SFX_Snare4_1_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index f97fab11..0913ba2b 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch7: - noisenote 0, 8, 1, 51 - endchannel +SFX_Snare4_2_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 57b70600..3aeeb49b 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch7: - noisenote 0, 8, 1, 51 - endchannel +SFX_Snare4_3_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index deb1bc43..21d4996d 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,8 +1,8 @@ -SFX_Snare5_1_Ch7: - noisenote 7, 8, 4, 55 - noisenote 6, 8, 4, 54 - noisenote 5, 8, 3, 53 - noisenote 4, 8, 3, 52 - noisenote 3, 8, 2, 51 - noisenote 2, 8, 1, 50 - endchannel +SFX_Snare5_1_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 5c45259b..c37865a0 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,8 +1,8 @@ -SFX_Snare5_2_Ch7: - noisenote 7, 8, 4, 55 - noisenote 6, 8, 4, 54 - noisenote 5, 8, 3, 53 - noisenote 4, 8, 3, 52 - noisenote 3, 8, 2, 51 - noisenote 2, 8, 1, 50 - endchannel +SFX_Snare5_2_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 22836d10..d49211d0 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,8 +1,8 @@ -SFX_Snare5_3_Ch7: - noisenote 7, 8, 4, 55 - noisenote 6, 8, 4, 54 - noisenote 5, 8, 3, 53 - noisenote 4, 8, 3, 52 - noisenote 3, 8, 2, 51 - noisenote 2, 8, 1, 50 - endchannel +SFX_Snare5_3_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 5ed7338f..03a63d40 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch7: - noisenote 0, 8, 1, 16 - endchannel +SFX_Snare6_1_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index dc7b6f34..7adad3fb 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch7: - noisenote 0, 8, 1, 16 - endchannel +SFX_Snare6_2_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index 4d061316..9a6b7be3 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch7: - noisenote 0, 8, 1, 16 - endchannel +SFX_Snare6_3_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index 993a35de..1e216fea 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch7: - noisenote 0, 8, 2, 35 - endchannel +SFX_Snare7_1_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 46ed89a5..11a13239 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch7: - noisenote 0, 8, 2, 35 - endchannel +SFX_Snare7_2_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 663fdf0c..c9d96902 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch7: - noisenote 0, 8, 2, 35 - endchannel +SFX_Snare7_3_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 0c64b371..9dcc4381 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch7: - noisenote 0, 8, 2, 37 - endchannel +SFX_Snare8_1_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 88ece7c2..020de92f 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch7: - noisenote 0, 8, 2, 37 - endchannel +SFX_Snare8_2_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 9abaa56e..ecb6a9a7 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch7: - noisenote 0, 8, 2, 37 - endchannel +SFX_Snare8_3_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 58bfca9a..674efb12 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch7: - noisenote 0, 8, 2, 38 - endchannel +SFX_Snare9_1_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index b8f43254..9d8f307d 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch7: - noisenote 0, 8, 2, 38 - endchannel +SFX_Snare9_2_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 001ed29f..6bfd1973 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch7: - noisenote 0, 8, 2, 38 - endchannel +SFX_Snare9_3_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index d2c57bc3..7f5094f4 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_1_Ch4: - duty 2 - squarenote 15, 15, 0, 1280 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 2, 1280 - endchannel +SFX_SS_Anne_Horn_1_Ch5: + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret -SFX_SS_Anne_Horn_1_Ch5: - duty 3 - squarenote 15, 15, 0, 1154 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 2, 1154 - endchannel +SFX_SS_Anne_Horn_1_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 3672d3d5..fda8e346 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_3_Ch4: - duty 2 - squarenote 15, 15, 0, 1280 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 2, 1280 - endchannel +SFX_SS_Anne_Horn_3_Ch5: + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret -SFX_SS_Anne_Horn_3_Ch5: - duty 3 - squarenote 15, 15, 0, 1154 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 2, 1154 - endchannel +SFX_SS_Anne_Horn_3_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 84c28d8a..c82e97e1 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_1_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index a9689acf..9860346d 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_2_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index f437a4c3..d114af51 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_3_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index ebc1e0b7..c6e25dc9 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch7: - noisenote 4, 15, 1, 52 - noisenote 15, 15, 2, 100 - endchannel +SFX_Super_Effective_Ch8: + noise_note 4, 15, 1, 52 + noise_note 15, 15, 2, 100 + sound_ret diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index d200f3b8..98bfff72 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ -SFX_Swap_1_Ch4: - duty 2 - squarenote 8, 14, 1, 1856 - endchannel +SFX_Swap_1_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_1_Ch5: - duty 2 - squarenote 2, 0, 8, 0 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Swap_1_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 04d795b6..8e86ac7c 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,11 +1,11 @@ -SFX_Swap_3_Ch4: - duty 2 - squarenote 8, 14, 1, 1856 - endchannel +SFX_Swap_3_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_3_Ch5: - duty 2 - squarenote 2, 0, 8, 0 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Swap_3_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index 76f64e04..145fd35a 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ -SFX_Switch_1_Ch4: - duty 2 - squarenote 4, 0, 0, 0 - squarenote 2, 15, 1, 1664 - squarenote 1, 0, 0, 0 - squarenote 4, 15, 1, 1920 - squarenote 4, 0, 0, 0 - endchannel +SFX_Switch_1_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 0663b2ed..ce6f1f15 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,8 +1,8 @@ -SFX_Switch_3_Ch4: - duty 2 - squarenote 4, 0, 0, 0 - squarenote 2, 15, 1, 1664 - squarenote 1, 0, 0, 0 - squarenote 4, 15, 1, 1920 - squarenote 4, 0, 0, 0 - endchannel +SFX_Switch_3_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index fd94c086..4f99dae1 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_1_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1792 - squarenote 15, 11, 7, 1664 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1408 - squarenote 15, 1, 7, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Enter1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index d7f8f076..c6502a29 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_3_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1792 - squarenote 15, 11, 7, 1664 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1408 - squarenote 15, 1, 7, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Enter1_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index b0d61646..c7901999 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_1_Ch7: - noisenote 2, 15, 1, 50 - noisenote 2, 0, 0, 0 - noisenote 2, 15, 1, 34 - noisenote 1, 0, 0, 0 - endchannel +SFX_Teleport_Enter2_1_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index cc883000..2c0414f3 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_3_Ch7: - noisenote 2, 15, 1, 50 - noisenote 2, 0, 0, 0 - noisenote 2, 15, 1, 34 - noisenote 1, 0, 0, 0 - endchannel +SFX_Teleport_Enter2_3_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index dd986dca..b2511b1f 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_1_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1280 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1664 - squarenote 15, 1, 7, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index e3460ad2..6a3b2d96 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_3_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1280 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1664 - squarenote 15, 1, 7, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit1_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 47d7c88b..23a6ea85 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_1_Ch4: - duty 1 - pitchenvelope 1, 6 - squarenote 15, 13, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit2_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index dccc1d3c..178a4d78 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_3_Ch4: - duty 1 - pitchenvelope 1, 6 - squarenote 15, 13, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit2_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 8884a204..4e471fab 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ -SFX_Tink_1_Ch4: - duty 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_1_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index f1cc705d..077d93be 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ -SFX_Tink_2_Ch4: - duty 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_2_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index 43d32f5b..e06ed62e 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ -SFX_Tink_3_Ch4: - duty 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_3_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 97c6d007..050182b7 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_1_Ch4: - duty 2 - pitchenvelope 1, 5 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Trade_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 26e58263..d14fc4c1 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_3_Ch4: - duty 2 - pitchenvelope 1, 5 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Trade_Machine_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index f4d08545..df952676 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch7: - noisenote 0, 5, 1, 42 - endchannel +SFX_Triangle1_1_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 0517ba84..a90cec67 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch7: - noisenote 0, 5, 1, 42 - endchannel +SFX_Triangle1_2_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index 1979b3f9..e897dd61 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch7: - noisenote 0, 5, 1, 42 - endchannel +SFX_Triangle1_3_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index aa6b472e..df7e39ed 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch7: - noisenote 1, 4, 1, 43 - noisenote 0, 6, 1, 42 - endchannel +SFX_Triangle2_1_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index b9f31022..39934efa 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch7: - noisenote 1, 4, 1, 43 - noisenote 0, 6, 1, 42 - endchannel +SFX_Triangle2_2_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index 61dcb880..370e13e7 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch7: - noisenote 1, 4, 1, 43 - noisenote 0, 6, 1, 42 - endchannel +SFX_Triangle2_3_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index 13700a11..18b140e2 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch7: - noisenote 2, 9, 1, 40 - noisenote 0, 7, 1, 24 - endchannel +SFX_Triangle3_1_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 5555fc40..c03be804 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch7: - noisenote 2, 9, 1, 40 - noisenote 0, 7, 1, 24 - endchannel +SFX_Triangle3_2_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 1237c952..95a047ae 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch7: - noisenote 2, 9, 1, 40 - noisenote 0, 7, 1, 24 - endchannel +SFX_Triangle3_3_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index ad4ad076..429727b9 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_1_Ch4: - duty 2 - squarenote 4, 15, 0, 1536 - squarenote 4, 15, 0, 1024 - squarenote 4, 15, 0, 512 - squarenote 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_1_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 842d6b9e..b6682ae2 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_3_Ch4: - duty 2 - squarenote 4, 15, 0, 1536 - squarenote 4, 15, 0, 1024 - squarenote 4, 15, 0, 512 - squarenote 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_3_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 6b84b7f3..98c724b5 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ -SFX_Turn_On_PC_1_Ch4: - duty 2 - squarenote 15, 15, 2, 1984 - squarenote 15, 0, 0, 0 - squarenote 3, 10, 1, 1920 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1856 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1920 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1984 - squarenote 8, 10, 1, 1792 - endchannel +SFX_Turn_On_PC_1_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1856 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1984 + square_note 8, 10, 1, 1792 + sound_ret diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index 281f4567..e33aefa1 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,14 +1,14 @@ -SFX_Turn_On_PC_3_Ch4: - duty 2 - squarenote 15, 15, 2, 1984 - squarenote 15, 0, 0, 0 - squarenote 15, 0, 0, 0 - squarenote 3, 8, 1, 1920 - squarenote 3, 8, 1, 1792 - squarenote 3, 8, 1, 1856 - squarenote 3, 8, 1, 1792 - squarenote 3, 8, 1, 1920 - squarenote 3, 8, 1, 1792 - squarenote 3, 8, 1, 1984 - squarenote 3, 8, 1, 1792 - endchannel +SFX_Turn_On_PC_3_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 15, 0, 0, 0 + square_note 3, 8, 1, 1920 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1856 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1920 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1984 + square_note 3, 8, 1, 1792 + sound_ret diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 36c10ba3..aa93f91c 100644 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,56 +1,56 @@ -SFX_08_unused2_Ch4: - executemusic +SFX_Unused2_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 6, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 1 octave 3 - G# 2 - G# 2 - notetype 6, 11, 3 - G# 2 - B_ 2 + note G#, 2 + note G#, 2 + note_type 6, 11, 3 + note G#, 2 + note B_, 2 octave 4 - E_ 8 - endchannel + note E_, 8 + sound_ret -SFX_08_unused2_Ch5: - executemusic +SFX_Unused2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 6, 12, 1 + duty_cycle 2 + note_type 6, 12, 1 octave 4 - E_ 2 - E_ 1 - E_ 1 - notetype 6, 12, 3 - E_ 2 - G# 2 - B_ 8 - endchannel + note E_, 2 + note E_, 1 + note E_, 1 + note_type 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + sound_ret -SFX_08_unused2_Ch6: - executemusic - notetype 6, 1, 0 +SFX_Unused2_Ch7: + execute_music + note_type 6, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - notetype 3, 1, 0 - B_ 1 + note_type 3, 1, 0 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 6, 1, 0 - B_ 1 + note_type 6, 1, 0 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - B_ 4 + note B_, 4 rest 4 - endchannel + sound_ret diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index e805a333..6b237950 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ -SFX_Unused_1_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel +SFX_Unused_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_1_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel +SFX_Unused_1_Ch6: + duty_cycle_pattern 5 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_Unused_1_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index fb86989c..0a8fa9d9 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ -SFX_Unused_2_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel +SFX_Unused_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_2_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel +SFX_Unused_2_Ch6: + duty_cycle_pattern 5 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_Unused_2_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_2_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index 30d8e534..3710e797 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ -SFX_Unused_3_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel +SFX_Unused_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_3_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel +SFX_Unused_3_Ch6: + duty_cycle_pattern 5 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_Unused_3_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_3_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index 7699d841..c53a7d0a 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ -SFX_Vine_Whip_Ch7: - noisenote 1, 12, 2, 51 - noisenote 2, 15, 2, 33 - noisenote 1, 14, 2, 51 - noisenote 1, 12, 2, 50 - noisenote 1, 9, 2, 18 - noisenote 1, 11, 2, 49 - noisenote 12, 9, 1, 16 - noisenote 8, 15, 2, 65 - endchannel +SFX_Vine_Whip_Ch8: + noise_note 1, 12, 2, 51 + noise_note 2, 15, 2, 33 + noise_note 1, 14, 2, 51 + noise_note 1, 12, 2, 50 + noise_note 1, 9, 2, 18 + noise_note 1, 11, 2, 49 + noise_note 12, 9, 1, 16 + noise_note 8, 15, 2, 65 + sound_ret diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index fe1daefb..9c4f2868 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_1_Ch4: - duty 1 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 4, 14, 2, 1280 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1792 - pitchenvelope 2, 2 - squarenote 15, 14, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Withdraw_Deposit_1_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 3ed89f24..cd881753 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_3_Ch4: - duty 1 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 4, 14, 2, 1280 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1792 - pitchenvelope 2, 2 - squarenote 15, 14, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Withdraw_Deposit_3_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 04336810..2b00a812 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -872,7 +872,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -956,7 +956,7 @@ EndLowHealthAlarm: ; the low health alarm and prevents it from reactivating until the next battle. xor a ld [wLowHealthAlarm], a ; turn off low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -1954,7 +1954,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index c77e3b39..830a23a1 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a diff --git a/engine/evolution.asm b/engine/evolution.asm index a2c52765..731735c5 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -8,7 +8,7 @@ EvolveMon: push af xor a ld [wLowHealthAlarm], a - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a dec a ld [wNewSoundID], a call PlaySound diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 491be861..89be94fc 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -71,7 +71,7 @@ SafariZoneGameOver: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .waitForMusicToPlay - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_SAFARI_ZONE_PA jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER diff --git a/engine/items/items.asm b/engine/items/items.asm index 38e8a704..ec51a0d4 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -990,7 +990,7 @@ ItemUseMedicine: .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a push hl push de ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1777,7 +1777,7 @@ ItemUsePokeflute: call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch6] + ld a, [wChannelSoundIDs + Ch7] and a ; music off? jr nz, .musicWaitLoop .skipMusic @@ -1850,7 +1850,7 @@ PlayedFluteHadEffectText: ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch2] + ld a, [wChannelSoundIDs + Ch3] cp SFX_POKEFLUTE jr z, .musicWaitLoop call PlayDefaultMusic ; start playing normal music again diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 7ff4ff71..d68e4f81 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -33,7 +33,7 @@ ShakeElevator: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites diff --git a/home.asm b/home.asm index 0397cb08..62be4371 100644 --- a/home.asm +++ b/home.asm @@ -3211,7 +3211,7 @@ WaitForSoundToFinish:: ret nz push hl .waitLoop - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 xor a or [hl] inc hl diff --git a/home/audio.asm b/home/audio.asm index c982d9d6..242f038b 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -148,10 +148,10 @@ PlaySound:: and a jr z, .next xor a - ld [wChannelSoundIDs + Ch4], a ld [wChannelSoundIDs + Ch5], a ld [wChannelSoundIDs + Ch6], a ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .next ld a, [wAudioFadeOutControl] and a ; has a fade-out length been specified? diff --git a/home/overworld.asm b/home/overworld.asm index 9404a713..b96efcb4 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1244,7 +1244,7 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc, .noCollision .collision - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry ld a, SFX_COLLISION @@ -1948,7 +1948,7 @@ CollisionCheckOnWater:: jr z, .stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry ld a, SFX_COLLISION diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index d4914002..ae67491f 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -4,16 +4,16 @@ StopAllMusic: MACRO call PlaySound ENDM -Ch0 EQU 0 -Ch1 EQU 1 -Ch2 EQU 2 -Ch3 EQU 3 -Ch4 EQU 4 -Ch5 EQU 5 -Ch6 EQU 6 -Ch7 EQU 7 - -audio: MACRO +Ch1 EQU 0 +Ch2 EQU 1 +Ch3 EQU 2 +Ch4 EQU 3 +Ch5 EQU 4 +Ch6 EQU 5 +Ch7 EQU 6 +Ch8 EQU 7 + +audio_header: MACRO db (_NARG - 2) << 6 | \2 dw \1_\2 IF _NARG > 2 @@ -31,7 +31,7 @@ audio: MACRO ENDM ;format: length [0, 7], pitch change [-7, 7] -pitchenvelope: MACRO +pitch_sweep: MACRO db $10 IF \2 > 0 db (\1 << 4) | \2 @@ -41,7 +41,7 @@ pitchenvelope: MACRO ENDM ;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch -squarenote: MACRO +square_note: MACRO db $20 | \1 IF \3 < 0 db (\2 << 4) | (%1000 | (\3 * -1)) @@ -52,7 +52,7 @@ squarenote: MACRO ENDM ;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch -noisenote: MACRO +noise_note: MACRO db $20 | \1 IF \3 < 0 db (\2 << 4) | (%1000 | (\3 * -1)) @@ -62,53 +62,22 @@ noisenote: MACRO db \4 ENDM -;format: pitch length (in 16ths) -C_: MACRO - db $00 | (\1 - 1) -ENDM - -C#: MACRO - db $10 | (\1 - 1) -ENDM - -D_: MACRO - db $20 | (\1 - 1) -ENDM - -D#: MACRO - db $30 | (\1 - 1) -ENDM - -E_: MACRO - db $40 | (\1 - 1) -ENDM - -F_: MACRO - db $50 | (\1 - 1) -ENDM +C_ EQU $0 +C# EQU $1 +D_ EQU $2 +D# EQU $3 +E_ EQU $4 +F_ EQU $5 +F# EQU $6 +G_ EQU $7 +G# EQU $8 +A_ EQU $9 +A# EQU $A +B_ EQU $B -F#: MACRO - db $60 | (\1 - 1) -ENDM - -G_: MACRO - db $70 | (\1 - 1) -ENDM - -G#: MACRO - db $80 | (\1 - 1) -ENDM - -A_: MACRO - db $90 | (\1 - 1) -ENDM - -A#: MACRO - db $A0 | (\1 - 1) -ENDM - -B_: MACRO - db $B0 | (\1 - 1) +;format: pitch length (in 16ths) +note: MACRO + db (\1 << 4) | (\2 - 1) ENDM ;format: instrument length (in 16ths) @@ -213,7 +182,7 @@ rest: MACRO ENDM ; format: notetype speed, volume, fade -notetype: MACRO +note_type: MACRO db $D0 | \1 db (\2 << 4) | \3 ENDM @@ -226,7 +195,7 @@ octave: MACRO db $E8 - \1 ENDM -toggleperfectpitch: MACRO +toggle_perfect_pitch: MACRO db $E8 ENDM @@ -237,13 +206,13 @@ vibrato: MACRO db (\2 << 4) | \3 ENDM -pitchbend: MACRO +pitch_slide: MACRO db $EB db \1 db \2 ENDM -duty: MACRO +duty_cycle: MACRO db $EC db \1 ENDM @@ -254,7 +223,7 @@ tempo: MACRO db \1 % $100 ENDM -stereopanning: MACRO +stereo_panning: MACRO db $EE db \1 ENDM @@ -264,28 +233,28 @@ volume: MACRO db (\1 << 4) | \2 ENDM -executemusic: MACRO +execute_music: MACRO db $F8 ENDM -dutycycle: MACRO +duty_cycle_pattern: MACRO db $FC db \1 ENDM ;format: callchannel address -callchannel: MACRO +sound_call: MACRO db $FD dw \1 ENDM ;format: loopchannel count, address -loopchannel: MACRO +sound_loop: MACRO db $FE db \1 dw \2 ENDM -endchannel: MACRO +sound_ret: MACRO db $FF ENDM diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm index 68115050..22d2fb6b 100755 --- a/scripts/PewterPokecenter.asm +++ b/scripts/PewterPokecenter.asm @@ -60,7 +60,7 @@ PewterJigglypuffText: ld a, [wChannelSoundIDs] ld b, a - ld a, [wChannelSoundIDs + Ch1] + ld a, [wChannelSoundIDs + Ch2] or b jr nz, .loop -- cgit v1.2.3 From 6574881cdac656d23697be57ab048c90b0969949 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 28 Jul 2019 17:29:35 -0500 Subject: Use generic names for noise instruments coming up with satisfactory names is hard, besides this will improve compatibility with crystal --- audio.asm | 114 ++-- audio/headers/sfxheaders1.asm | 76 +-- audio/headers/sfxheaders2.asm | 76 +-- audio/headers/sfxheaders3.asm | 76 +-- audio/music/bikeriding.asm | 28 +- audio/music/cinnabarmansion.asm | 30 +- audio/music/cities1.asm | 86 +-- audio/music/dungeon1.asm | 64 +-- audio/music/dungeon2.asm | 16 +- audio/music/indigoplateau.asm | 132 ++--- audio/music/introbattle.asm | 186 +++---- audio/music/lavender.asm | 4 +- audio/music/museumguy.asm | 124 ++--- audio/music/routes1.asm | 108 ++-- audio/music/routes2.asm | 128 ++--- audio/music/routes3.asm | 308 +++++------ audio/music/routes4.asm | 332 ++++++------ audio/music/titlescreen.asm | 258 ++++----- audio/music/vermilion.asm | 50 +- audio/music/yellow/meetjessiejames.asm | 398 +++++++------- audio/music/yellow/surfingpikachu.asm | 904 ++++++++++++++++---------------- audio/music/yellow/yellowintro.asm | 588 ++++++++++----------- audio/music/yellow/yellowunusedsong.asm | 510 +++++++++--------- 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/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/noise_instrument01_1.asm | 3 + audio/sfx/noise_instrument01_2.asm | 3 + audio/sfx/noise_instrument01_3.asm | 3 + audio/sfx/noise_instrument02_1.asm | 3 + audio/sfx/noise_instrument02_2.asm | 3 + audio/sfx/noise_instrument02_3.asm | 3 + audio/sfx/noise_instrument03_1.asm | 3 + audio/sfx/noise_instrument03_2.asm | 3 + audio/sfx/noise_instrument03_3.asm | 3 + audio/sfx/noise_instrument04_1.asm | 3 + audio/sfx/noise_instrument04_2.asm | 3 + audio/sfx/noise_instrument04_3.asm | 3 + audio/sfx/noise_instrument05_1.asm | 8 + audio/sfx/noise_instrument05_2.asm | 8 + audio/sfx/noise_instrument05_3.asm | 8 + audio/sfx/noise_instrument06_1.asm | 3 + audio/sfx/noise_instrument06_2.asm | 3 + audio/sfx/noise_instrument06_3.asm | 3 + audio/sfx/noise_instrument07_1.asm | 4 + audio/sfx/noise_instrument07_2.asm | 4 + audio/sfx/noise_instrument07_3.asm | 4 + audio/sfx/noise_instrument08_1.asm | 3 + audio/sfx/noise_instrument08_2.asm | 3 + audio/sfx/noise_instrument08_3.asm | 3 + audio/sfx/noise_instrument09_1.asm | 3 + audio/sfx/noise_instrument09_2.asm | 3 + audio/sfx/noise_instrument09_3.asm | 3 + audio/sfx/noise_instrument10_1.asm | 3 + audio/sfx/noise_instrument10_2.asm | 3 + audio/sfx/noise_instrument10_3.asm | 3 + audio/sfx/noise_instrument11_1.asm | 3 + audio/sfx/noise_instrument11_2.asm | 3 + audio/sfx/noise_instrument11_3.asm | 3 + audio/sfx/noise_instrument12_1.asm | 3 + audio/sfx/noise_instrument12_2.asm | 3 + audio/sfx/noise_instrument12_3.asm | 3 + audio/sfx/noise_instrument13_1.asm | 3 + audio/sfx/noise_instrument13_2.asm | 3 + audio/sfx/noise_instrument13_3.asm | 3 + audio/sfx/noise_instrument14_1.asm | 3 + audio/sfx/noise_instrument14_2.asm | 3 + audio/sfx/noise_instrument14_3.asm | 3 + audio/sfx/noise_instrument15_1.asm | 4 + audio/sfx/noise_instrument15_2.asm | 4 + audio/sfx/noise_instrument15_3.asm | 4 + audio/sfx/noise_instrument16_1.asm | 4 + audio/sfx/noise_instrument16_2.asm | 4 + audio/sfx/noise_instrument16_3.asm | 4 + audio/sfx/noise_instrument17_1.asm | 3 + audio/sfx/noise_instrument17_2.asm | 3 + audio/sfx/noise_instrument17_3.asm | 3 + audio/sfx/noise_instrument18_1.asm | 3 + audio/sfx/noise_instrument18_2.asm | 3 + audio/sfx/noise_instrument18_3.asm | 3 + audio/sfx/noise_instrument19_1.asm | 3 + audio/sfx/noise_instrument19_2.asm | 3 + audio/sfx/noise_instrument19_3.asm | 3 + 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/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 - constants/music_constants.asm | 40 +- macros/audio_macros.asm | 112 +--- 139 files changed, 2524 insertions(+), 2614 deletions(-) delete mode 100644 audio/sfx/cymbal1_1.asm delete mode 100644 audio/sfx/cymbal1_2.asm delete mode 100644 audio/sfx/cymbal1_3.asm delete mode 100644 audio/sfx/cymbal2_1.asm delete mode 100644 audio/sfx/cymbal2_2.asm delete mode 100644 audio/sfx/cymbal2_3.asm delete mode 100644 audio/sfx/cymbal3_1.asm delete mode 100644 audio/sfx/cymbal3_2.asm delete mode 100644 audio/sfx/cymbal3_3.asm delete mode 100644 audio/sfx/muted_snare1_1.asm delete mode 100644 audio/sfx/muted_snare1_2.asm delete mode 100644 audio/sfx/muted_snare1_3.asm delete mode 100644 audio/sfx/muted_snare2_1.asm delete mode 100644 audio/sfx/muted_snare2_2.asm delete mode 100644 audio/sfx/muted_snare2_3.asm delete mode 100644 audio/sfx/muted_snare3_1.asm delete mode 100644 audio/sfx/muted_snare3_2.asm delete mode 100644 audio/sfx/muted_snare3_3.asm delete mode 100644 audio/sfx/muted_snare4_1.asm delete mode 100644 audio/sfx/muted_snare4_2.asm delete mode 100644 audio/sfx/muted_snare4_3.asm create mode 100644 audio/sfx/noise_instrument01_1.asm create mode 100644 audio/sfx/noise_instrument01_2.asm create mode 100644 audio/sfx/noise_instrument01_3.asm create mode 100644 audio/sfx/noise_instrument02_1.asm create mode 100644 audio/sfx/noise_instrument02_2.asm create mode 100644 audio/sfx/noise_instrument02_3.asm create mode 100644 audio/sfx/noise_instrument03_1.asm create mode 100644 audio/sfx/noise_instrument03_2.asm create mode 100644 audio/sfx/noise_instrument03_3.asm create mode 100644 audio/sfx/noise_instrument04_1.asm create mode 100644 audio/sfx/noise_instrument04_2.asm create mode 100644 audio/sfx/noise_instrument04_3.asm create mode 100644 audio/sfx/noise_instrument05_1.asm create mode 100644 audio/sfx/noise_instrument05_2.asm create mode 100644 audio/sfx/noise_instrument05_3.asm create mode 100644 audio/sfx/noise_instrument06_1.asm create mode 100644 audio/sfx/noise_instrument06_2.asm create mode 100644 audio/sfx/noise_instrument06_3.asm create mode 100644 audio/sfx/noise_instrument07_1.asm create mode 100644 audio/sfx/noise_instrument07_2.asm create mode 100644 audio/sfx/noise_instrument07_3.asm create mode 100644 audio/sfx/noise_instrument08_1.asm create mode 100644 audio/sfx/noise_instrument08_2.asm create mode 100644 audio/sfx/noise_instrument08_3.asm create mode 100644 audio/sfx/noise_instrument09_1.asm create mode 100644 audio/sfx/noise_instrument09_2.asm create mode 100644 audio/sfx/noise_instrument09_3.asm create mode 100644 audio/sfx/noise_instrument10_1.asm create mode 100644 audio/sfx/noise_instrument10_2.asm create mode 100644 audio/sfx/noise_instrument10_3.asm create mode 100644 audio/sfx/noise_instrument11_1.asm create mode 100644 audio/sfx/noise_instrument11_2.asm create mode 100644 audio/sfx/noise_instrument11_3.asm create mode 100644 audio/sfx/noise_instrument12_1.asm create mode 100644 audio/sfx/noise_instrument12_2.asm create mode 100644 audio/sfx/noise_instrument12_3.asm create mode 100644 audio/sfx/noise_instrument13_1.asm create mode 100644 audio/sfx/noise_instrument13_2.asm create mode 100644 audio/sfx/noise_instrument13_3.asm create mode 100644 audio/sfx/noise_instrument14_1.asm create mode 100644 audio/sfx/noise_instrument14_2.asm create mode 100644 audio/sfx/noise_instrument14_3.asm create mode 100644 audio/sfx/noise_instrument15_1.asm create mode 100644 audio/sfx/noise_instrument15_2.asm create mode 100644 audio/sfx/noise_instrument15_3.asm create mode 100644 audio/sfx/noise_instrument16_1.asm create mode 100644 audio/sfx/noise_instrument16_2.asm create mode 100644 audio/sfx/noise_instrument16_3.asm create mode 100644 audio/sfx/noise_instrument17_1.asm create mode 100644 audio/sfx/noise_instrument17_2.asm create mode 100644 audio/sfx/noise_instrument17_3.asm create mode 100644 audio/sfx/noise_instrument18_1.asm create mode 100644 audio/sfx/noise_instrument18_2.asm create mode 100644 audio/sfx/noise_instrument18_3.asm create mode 100644 audio/sfx/noise_instrument19_1.asm create mode 100644 audio/sfx/noise_instrument19_2.asm create mode 100644 audio/sfx/noise_instrument19_3.asm delete mode 100644 audio/sfx/snare1_1.asm delete mode 100644 audio/sfx/snare1_2.asm delete mode 100644 audio/sfx/snare1_3.asm delete mode 100644 audio/sfx/snare2_1.asm delete mode 100644 audio/sfx/snare2_2.asm delete mode 100644 audio/sfx/snare2_3.asm delete mode 100644 audio/sfx/snare3_1.asm delete mode 100644 audio/sfx/snare3_2.asm delete mode 100644 audio/sfx/snare3_3.asm delete mode 100644 audio/sfx/snare4_1.asm delete mode 100644 audio/sfx/snare4_2.asm delete mode 100644 audio/sfx/snare4_3.asm delete mode 100644 audio/sfx/snare5_1.asm delete mode 100644 audio/sfx/snare5_2.asm delete mode 100644 audio/sfx/snare5_3.asm delete mode 100644 audio/sfx/snare6_1.asm delete mode 100644 audio/sfx/snare6_2.asm delete mode 100644 audio/sfx/snare6_3.asm delete mode 100644 audio/sfx/snare7_1.asm delete mode 100644 audio/sfx/snare7_2.asm delete mode 100644 audio/sfx/snare7_3.asm delete mode 100644 audio/sfx/snare8_1.asm delete mode 100644 audio/sfx/snare8_2.asm delete mode 100644 audio/sfx/snare8_3.asm delete mode 100644 audio/sfx/snare9_1.asm delete mode 100644 audio/sfx/snare9_2.asm delete mode 100644 audio/sfx/snare9_3.asm delete mode 100644 audio/sfx/triangle1_1.asm delete mode 100644 audio/sfx/triangle1_2.asm delete mode 100644 audio/sfx/triangle1_3.asm delete mode 100644 audio/sfx/triangle2_1.asm delete mode 100644 audio/sfx/triangle2_2.asm delete mode 100644 audio/sfx/triangle2_3.asm delete mode 100644 audio/sfx/triangle3_1.asm delete mode 100644 audio/sfx/triangle3_2.asm delete mode 100644 audio/sfx/triangle3_3.asm diff --git a/audio.asm b/audio.asm index 4305657c..70d81649 100644 --- a/audio.asm +++ b/audio.asm @@ -23,25 +23,25 @@ INCLUDE "audio/headers/musicheaders3.asm" SECTION "Sound Effects 1", ROMX ; BANK $02 -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" +INCLUDE "audio/sfx/noise_instrument01_1.asm" +INCLUDE "audio/sfx/noise_instrument02_1.asm" +INCLUDE "audio/sfx/noise_instrument03_1.asm" +INCLUDE "audio/sfx/noise_instrument04_1.asm" +INCLUDE "audio/sfx/noise_instrument05_1.asm" +INCLUDE "audio/sfx/noise_instrument06_1.asm" +INCLUDE "audio/sfx/noise_instrument07_1.asm" +INCLUDE "audio/sfx/noise_instrument08_1.asm" +INCLUDE "audio/sfx/noise_instrument09_1.asm" +INCLUDE "audio/sfx/noise_instrument10_1.asm" +INCLUDE "audio/sfx/noise_instrument11_1.asm" +INCLUDE "audio/sfx/noise_instrument12_1.asm" +INCLUDE "audio/sfx/noise_instrument13_1.asm" +INCLUDE "audio/sfx/noise_instrument14_1.asm" +INCLUDE "audio/sfx/noise_instrument15_1.asm" +INCLUDE "audio/sfx/noise_instrument16_1.asm" +INCLUDE "audio/sfx/noise_instrument17_1.asm" +INCLUDE "audio/sfx/noise_instrument18_1.asm" +INCLUDE "audio/sfx/noise_instrument19_1.asm" Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" @@ -122,25 +122,25 @@ INCLUDE "audio/sfx/cry22_1.asm" SECTION "Sound Effects 2", ROMX ; BANK $08 -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" +INCLUDE "audio/sfx/noise_instrument01_2.asm" +INCLUDE "audio/sfx/noise_instrument02_2.asm" +INCLUDE "audio/sfx/noise_instrument03_2.asm" +INCLUDE "audio/sfx/noise_instrument04_2.asm" +INCLUDE "audio/sfx/noise_instrument05_2.asm" +INCLUDE "audio/sfx/noise_instrument06_2.asm" +INCLUDE "audio/sfx/noise_instrument07_2.asm" +INCLUDE "audio/sfx/noise_instrument08_2.asm" +INCLUDE "audio/sfx/noise_instrument09_2.asm" +INCLUDE "audio/sfx/noise_instrument10_2.asm" +INCLUDE "audio/sfx/noise_instrument11_2.asm" +INCLUDE "audio/sfx/noise_instrument12_2.asm" +INCLUDE "audio/sfx/noise_instrument13_2.asm" +INCLUDE "audio/sfx/noise_instrument14_2.asm" +INCLUDE "audio/sfx/noise_instrument15_2.asm" +INCLUDE "audio/sfx/noise_instrument16_2.asm" +INCLUDE "audio/sfx/noise_instrument17_2.asm" +INCLUDE "audio/sfx/noise_instrument18_2.asm" +INCLUDE "audio/sfx/noise_instrument19_2.asm" Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" @@ -247,25 +247,25 @@ INCLUDE "audio/sfx/cry22_2.asm" SECTION "Sound Effects 3", ROMX ; BANK $1f -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" +INCLUDE "audio/sfx/noise_instrument01_3.asm" +INCLUDE "audio/sfx/noise_instrument02_3.asm" +INCLUDE "audio/sfx/noise_instrument03_3.asm" +INCLUDE "audio/sfx/noise_instrument04_3.asm" +INCLUDE "audio/sfx/noise_instrument05_3.asm" +INCLUDE "audio/sfx/noise_instrument06_3.asm" +INCLUDE "audio/sfx/noise_instrument07_3.asm" +INCLUDE "audio/sfx/noise_instrument08_3.asm" +INCLUDE "audio/sfx/noise_instrument09_3.asm" +INCLUDE "audio/sfx/noise_instrument10_3.asm" +INCLUDE "audio/sfx/noise_instrument11_3.asm" +INCLUDE "audio/sfx/noise_instrument12_3.asm" +INCLUDE "audio/sfx/noise_instrument13_3.asm" +INCLUDE "audio/sfx/noise_instrument14_3.asm" +INCLUDE "audio/sfx/noise_instrument15_3.asm" +INCLUDE "audio/sfx/noise_instrument16_3.asm" +INCLUDE "audio/sfx/noise_instrument17_3.asm" +INCLUDE "audio/sfx/noise_instrument18_3.asm" +INCLUDE "audio/sfx/noise_instrument19_3.asm" Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm" diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index cc50dddd..2d5eca4a 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,62 +1,62 @@ SFX_Headers_1:: db $ff, $ff, $ff ; padding -SFX_Snare1_1:: - audio_header SFX_Snare1_1, Ch8 +SFX_Noise_Instrument01_1:: + audio_header SFX_Noise_Instrument01_1, Ch8 -SFX_Snare2_1:: - audio_header SFX_Snare2_1, Ch8 +SFX_Noise_Instrument02_1:: + audio_header SFX_Noise_Instrument02_1, Ch8 -SFX_Snare3_1:: - audio_header SFX_Snare3_1, Ch8 +SFX_Noise_Instrument03_1:: + audio_header SFX_Noise_Instrument03_1, Ch8 -SFX_Snare4_1:: - audio_header SFX_Snare4_1, Ch8 +SFX_Noise_Instrument04_1:: + audio_header SFX_Noise_Instrument04_1, Ch8 -SFX_Snare5_1:: - audio_header SFX_Snare5_1, Ch8 +SFX_Noise_Instrument05_1:: + audio_header SFX_Noise_Instrument05_1, Ch8 -SFX_Triangle1_1:: - audio_header SFX_Triangle1_1, Ch8 +SFX_Noise_Instrument06_1:: + audio_header SFX_Noise_Instrument06_1, Ch8 -SFX_Triangle2_1:: - audio_header SFX_Triangle2_1, Ch8 +SFX_Noise_Instrument07_1:: + audio_header SFX_Noise_Instrument07_1, Ch8 -SFX_Snare6_1:: - audio_header SFX_Snare6_1, Ch8 +SFX_Noise_Instrument08_1:: + audio_header SFX_Noise_Instrument08_1, Ch8 -SFX_Snare7_1:: - audio_header SFX_Snare7_1, Ch8 +SFX_Noise_Instrument09_1:: + audio_header SFX_Noise_Instrument09_1, Ch8 -SFX_Snare8_1:: - audio_header SFX_Snare8_1, Ch8 +SFX_Noise_Instrument10_1:: + audio_header SFX_Noise_Instrument10_1, Ch8 -SFX_Snare9_1:: - audio_header SFX_Snare9_1, Ch8 +SFX_Noise_Instrument11_1:: + audio_header SFX_Noise_Instrument11_1, Ch8 -SFX_Cymbal1_1:: - audio_header SFX_Cymbal1_1, Ch8 +SFX_Noise_Instrument12_1:: + audio_header SFX_Noise_Instrument12_1, Ch8 -SFX_Cymbal2_1:: - audio_header SFX_Cymbal2_1, Ch8 +SFX_Noise_Instrument13_1:: + audio_header SFX_Noise_Instrument13_1, Ch8 -SFX_Cymbal3_1:: - audio_header SFX_Cymbal3_1, Ch8 +SFX_Noise_Instrument14_1:: + audio_header SFX_Noise_Instrument14_1, Ch8 -SFX_Muted_Snare1_1:: - audio_header SFX_Muted_Snare1_1, Ch8 +SFX_Noise_Instrument15_1:: + audio_header SFX_Noise_Instrument15_1, Ch8 -SFX_Triangle3_1:: - audio_header SFX_Triangle3_1, Ch8 +SFX_Noise_Instrument16_1:: + audio_header SFX_Noise_Instrument16_1, Ch8 -SFX_Muted_Snare2_1:: - audio_header SFX_Muted_Snare2_1, Ch8 +SFX_Noise_Instrument17_1:: + audio_header SFX_Noise_Instrument17_1, Ch8 -SFX_Muted_Snare3_1:: - audio_header SFX_Muted_Snare3_1, Ch8 +SFX_Noise_Instrument18_1:: + audio_header SFX_Noise_Instrument18_1, Ch8 -SFX_Muted_Snare4_1:: - audio_header SFX_Muted_Snare4_1, Ch8 +SFX_Noise_Instrument19_1:: + audio_header SFX_Noise_Instrument19_1, Ch8 SFX_Cry00_1:: audio_header SFX_Cry00_1, Ch5, Ch6, Ch8 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 7e76325d..912d137e 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,62 +1,62 @@ SFX_Headers_2:: db $ff, $ff, $ff ; padding -SFX_Snare1_2:: - audio_header SFX_Snare1_2, Ch8 +SFX_Noise_Instrument01_2:: + audio_header SFX_Noise_Instrument01_2, Ch8 -SFX_Snare2_2:: - audio_header SFX_Snare2_2, Ch8 +SFX_Noise_Instrument02_2:: + audio_header SFX_Noise_Instrument02_2, Ch8 -SFX_Snare3_2:: - audio_header SFX_Snare3_2, Ch8 +SFX_Noise_Instrument03_2:: + audio_header SFX_Noise_Instrument03_2, Ch8 -SFX_Snare4_2:: - audio_header SFX_Snare4_2, Ch8 +SFX_Noise_Instrument04_2:: + audio_header SFX_Noise_Instrument04_2, Ch8 -SFX_Snare5_2:: - audio_header SFX_Snare5_2, Ch8 +SFX_Noise_Instrument05_2:: + audio_header SFX_Noise_Instrument05_2, Ch8 -SFX_Triangle1_2:: - audio_header SFX_Triangle1_2, Ch8 +SFX_Noise_Instrument06_2:: + audio_header SFX_Noise_Instrument06_2, Ch8 -SFX_Triangle2_2:: - audio_header SFX_Triangle2_2, Ch8 +SFX_Noise_Instrument07_2:: + audio_header SFX_Noise_Instrument07_2, Ch8 -SFX_Snare6_2:: - audio_header SFX_Snare6_2, Ch8 +SFX_Noise_Instrument08_2:: + audio_header SFX_Noise_Instrument08_2, Ch8 -SFX_Snare7_2:: - audio_header SFX_Snare7_2, Ch8 +SFX_Noise_Instrument09_2:: + audio_header SFX_Noise_Instrument09_2, Ch8 -SFX_Snare8_2:: - audio_header SFX_Snare8_2, Ch8 +SFX_Noise_Instrument10_2:: + audio_header SFX_Noise_Instrument10_2, Ch8 -SFX_Snare9_2:: - audio_header SFX_Snare9_2, Ch8 +SFX_Noise_Instrument11_2:: + audio_header SFX_Noise_Instrument11_2, Ch8 -SFX_Cymbal1_2:: - audio_header SFX_Cymbal1_2, Ch8 +SFX_Noise_Instrument12_2:: + audio_header SFX_Noise_Instrument12_2, Ch8 -SFX_Cymbal2_2:: - audio_header SFX_Cymbal2_2, Ch8 +SFX_Noise_Instrument13_2:: + audio_header SFX_Noise_Instrument13_2, Ch8 -SFX_Cymbal3_2:: - audio_header SFX_Cymbal3_2, Ch8 +SFX_Noise_Instrument14_2:: + audio_header SFX_Noise_Instrument14_2, Ch8 -SFX_Muted_Snare1_2:: - audio_header SFX_Muted_Snare1_2, Ch8 +SFX_Noise_Instrument15_2:: + audio_header SFX_Noise_Instrument15_2, Ch8 -SFX_Triangle3_2:: - audio_header SFX_Triangle3_2, Ch8 +SFX_Noise_Instrument16_2:: + audio_header SFX_Noise_Instrument16_2, Ch8 -SFX_Muted_Snare2_2:: - audio_header SFX_Muted_Snare2_2, Ch8 +SFX_Noise_Instrument17_2:: + audio_header SFX_Noise_Instrument17_2, Ch8 -SFX_Muted_Snare3_2:: - audio_header SFX_Muted_Snare3_2, Ch8 +SFX_Noise_Instrument18_2:: + audio_header SFX_Noise_Instrument18_2, Ch8 -SFX_Muted_Snare4_2:: - audio_header SFX_Muted_Snare4_2, Ch8 +SFX_Noise_Instrument19_2:: + audio_header SFX_Noise_Instrument19_2, Ch8 SFX_Cry00_2:: audio_header SFX_Cry00_2, Ch5, Ch6, Ch8 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 6fb67546..2732767f 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,62 +1,62 @@ SFX_Headers_3:: db $ff, $ff, $ff ; padding -SFX_Snare1_3:: - audio_header SFX_Snare1_3, Ch8 +SFX_Noise_Instrument01_3:: + audio_header SFX_Noise_Instrument01_3, Ch8 -SFX_Snare2_3:: - audio_header SFX_Snare2_3, Ch8 +SFX_Noise_Instrument02_3:: + audio_header SFX_Noise_Instrument02_3, Ch8 -SFX_Snare3_3:: - audio_header SFX_Snare3_3, Ch8 +SFX_Noise_Instrument03_3:: + audio_header SFX_Noise_Instrument03_3, Ch8 -SFX_Snare4_3:: - audio_header SFX_Snare4_3, Ch8 +SFX_Noise_Instrument04_3:: + audio_header SFX_Noise_Instrument04_3, Ch8 -SFX_Snare5_3:: - audio_header SFX_Snare5_3, Ch8 +SFX_Noise_Instrument05_3:: + audio_header SFX_Noise_Instrument05_3, Ch8 -SFX_Triangle1_3:: - audio_header SFX_Triangle1_3, Ch8 +SFX_Noise_Instrument06_3:: + audio_header SFX_Noise_Instrument06_3, Ch8 -SFX_Triangle2_3:: - audio_header SFX_Triangle2_3, Ch8 +SFX_Noise_Instrument07_3:: + audio_header SFX_Noise_Instrument07_3, Ch8 -SFX_Snare6_3:: - audio_header SFX_Snare6_3, Ch8 +SFX_Noise_Instrument08_3:: + audio_header SFX_Noise_Instrument08_3, Ch8 -SFX_Snare7_3:: - audio_header SFX_Snare7_3, Ch8 +SFX_Noise_Instrument09_3:: + audio_header SFX_Noise_Instrument09_3, Ch8 -SFX_Snare8_3:: - audio_header SFX_Snare8_3, Ch8 +SFX_Noise_Instrument10_3:: + audio_header SFX_Noise_Instrument10_3, Ch8 -SFX_Snare9_3:: - audio_header SFX_Snare9_3, Ch8 +SFX_Noise_Instrument11_3:: + audio_header SFX_Noise_Instrument11_3, Ch8 -SFX_Cymbal1_3:: - audio_header SFX_Cymbal1_3, Ch8 +SFX_Noise_Instrument12_3:: + audio_header SFX_Noise_Instrument12_3, Ch8 -SFX_Cymbal2_3:: - audio_header SFX_Cymbal2_3, Ch8 +SFX_Noise_Instrument13_3:: + audio_header SFX_Noise_Instrument13_3, Ch8 -SFX_Cymbal3_3:: - audio_header SFX_Cymbal3_3, Ch8 +SFX_Noise_Instrument14_3:: + audio_header SFX_Noise_Instrument14_3, Ch8 -SFX_Muted_Snare1_3:: - audio_header SFX_Muted_Snare1_3, Ch8 +SFX_Noise_Instrument15_3:: + audio_header SFX_Noise_Instrument15_3, Ch8 -SFX_Triangle3_3:: - audio_header SFX_Triangle3_3, Ch8 +SFX_Noise_Instrument16_3:: + audio_header SFX_Noise_Instrument16_3, Ch8 -SFX_Muted_Snare2_3:: - audio_header SFX_Muted_Snare2_3, Ch8 +SFX_Noise_Instrument17_3:: + audio_header SFX_Noise_Instrument17_3, Ch8 -SFX_Muted_Snare3_3:: - audio_header SFX_Muted_Snare3_3, Ch8 +SFX_Noise_Instrument18_3:: + audio_header SFX_Noise_Instrument18_3, Ch8 -SFX_Muted_Snare4_3:: - audio_header SFX_Muted_Snare4_3, Ch8 +SFX_Noise_Instrument19_3:: + audio_header SFX_Noise_Instrument19_3, Ch8 SFX_Cry00_3:: audio_header SFX_Cry00_3, Ch5, Ch6, Ch8 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 58f1b7a5..43c8618e 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -671,34 +671,34 @@ Music_BikeRiding_branch_7de6a:: Music_BikeRiding_branch_7dea7:: rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 + dnote 16, 2 sound_ret Music_BikeRiding_branch_7deb4:: rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 - triangle3 2 - triangle3 2 + dnote 16, 2 + dnote 16, 2 + dnote 16, 2 sound_ret Music_BikeRiding_branch_7dec2:: rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 2 + dnote 16, 2 rest 2 - triangle3 1 - triangle3 1 + dnote 16, 1 + dnote 16, 1 sound_ret diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index ff3de714..165c4e98 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -151,22 +151,22 @@ Music_CinnabarMansion_Ch4:: rest 16 Music_CinnabarMansion_branch_7edb5:: - cymbal1 2 - cymbal1 2 - cymbal2 4 - cymbal1 2 - cymbal1 2 - cymbal2 4 - cymbal1 2 - cymbal1 2 - cymbal2 4 - cymbal1 2 - cymbal1 2 - cymbal3 4 - cymbal1 2 - cymbal1 2 + dnote 12, 2 + dnote 12, 2 + dnote 13, 4 + dnote 12, 2 + dnote 12, 2 + dnote 13, 4 + dnote 12, 2 + dnote 12, 2 + dnote 13, 4 + dnote 12, 2 + dnote 12, 2 + dnote 14, 4 + dnote 12, 2 + dnote 12, 2 rest 2 rest 10 rest 8 - cymbal3 8 + dnote 14, 8 sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 3aef872b..006546ef 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -591,67 +591,67 @@ Music_Cities1_branch_acf3:: sound_call Music_Cities1_branch_ad36 sound_call Music_Cities1_branch_ad5f sound_call Music_Cities1_branch_ad52 - triangle1 6 - triangle1 6 - triangle2 4 + dnote 6, 6 + dnote 6, 6 + dnote 7, 4 sound_call Music_Cities1_branch_ad6e sound_call Music_Cities1_branch_ad5f sound_call Music_Cities1_branch_ad52 sound_call Music_Cities1_branch_ad6e sound_call Music_Cities1_branch_ad52 - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 - triangle1 6 - triangle1 6 - triangle1 4 - triangle1 6 - snare6 6 - snare6 4 + dnote 6, 6 + dnote 6, 6 + dnote 7, 2 + dnote 6, 2 + dnote 6, 6 + dnote 6, 6 + dnote 6, 4 + dnote 6, 6 + dnote 8, 6 + dnote 8, 4 sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 2 - snare6 2 + dnote 8, 6 + dnote 8, 6 + dnote 8, 4 + dnote 8, 6 + dnote 8, 6 + dnote 8, 2 + dnote 8, 2 sound_ret Music_Cities1_branch_ad45:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 4 + dnote 8, 6 + dnote 8, 6 + dnote 8, 4 + dnote 8, 6 + dnote 8, 6 + dnote 8, 4 sound_ret Music_Cities1_branch_ad52:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 4 + dnote 6, 6 + dnote 6, 6 + dnote 7, 4 + dnote 6, 6 + dnote 6, 6 + dnote 7, 4 sound_ret Music_Cities1_branch_ad5f:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 + dnote 6, 6 + dnote 6, 6 + dnote 7, 4 + dnote 6, 6 + dnote 6, 6 + dnote 7, 2 + dnote 6, 2 sound_ret Music_Cities1_branch_ad6e:: - triangle1 6 - triangle1 6 - triangle2 2 - triangle2 2 + dnote 6, 6 + dnote 6, 6 + dnote 7, 2 + dnote 7, 2 sound_ret diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index a28b31e6..996a3ea6 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -599,25 +599,25 @@ Music_Dungeon1_branch_7e177:: Music_Dungeon1_Ch4:: dspeed 12 rest 14 - cymbal1 1 - cymbal1 1 + dnote 12, 1 + dnote 12, 1 Music_Dungeon1_branch_7e190:: sound_call Music_Dungeon1_branch_7e1f1 sound_loop 3, Music_Dungeon1_branch_7e190 - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal1 2 - cymbal1 2 + dnote 13, 4 + dnote 12, 4 + dnote 13, 4 + dnote 12, 2 + dnote 12, 2 Music_Dungeon1_branch_7e1a1:: sound_call Music_Dungeon1_branch_7e1f1 sound_loop 3, Music_Dungeon1_branch_7e1a1 - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal2 4 + dnote 13, 4 + dnote 12, 4 + dnote 13, 4 + dnote 13, 4 Music_Dungeon1_branch_7e1b0:: sound_call Music_Dungeon1_branch_7e1fa @@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba:: sound_call Music_Dungeon1_branch_7e1fa sound_loop 3, Music_Dungeon1_branch_7e1ba sound_call Music_Dungeon1_branch_7e202 - snare7 4 - snare8 4 - snare8 4 + dnote 9, 4 + dnote 10, 4 + dnote 10, 4 rest 2 - snare7 2 - cymbal2 4 + dnote 9, 2 + dnote 13, 4 Music_Dungeon1_branch_7e1cf:: rest 16 @@ -643,33 +643,33 @@ Music_Dungeon1_branch_7e1cf:: Music_Dungeon1_branch_7e1d5:: sound_call Music_Dungeon1_branch_7e1fa sound_loop 3, Music_Dungeon1_branch_7e1d5 - cymbal1 4 - cymbal1 4 - cymbal1 4 + dnote 12, 4 + dnote 12, 4 + dnote 12, 4 rest 2 - cymbal1 1 - cymbal1 1 + dnote 12, 1 + dnote 12, 1 sound_call Music_Dungeon1_branch_7e1f1 sound_call Music_Dungeon1_branch_7e1f1 sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal1 4 + dnote 13, 4 + dnote 12, 4 + dnote 13, 4 + dnote 12, 4 sound_ret Music_Dungeon1_branch_7e1fa:: - cymbal1 1 - cymbal1 1 + dnote 12, 1 + dnote 12, 1 rest 10 - cymbal3 4 + dnote 14, 4 sound_ret Music_Dungeon1_branch_7e202:: - snare7 4 - snare8 4 - snare8 4 - snare9 4 + dnote 9, 4 + dnote 10, 4 + dnote 10, 4 + dnote 11, 4 sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 807c2f40..86cb7ad2 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -306,12 +306,12 @@ Music_Dungeon2_Ch4:: dspeed 12 Music_Dungeon2_branch_7e9dd:: - cymbal1 4 - cymbal2 4 - cymbal1 4 - snare8 4 - cymbal1 4 - cymbal2 4 - snare9 4 - snare7 4 + dnote 12, 4 + dnote 13, 4 + dnote 12, 4 + dnote 10, 4 + dnote 12, 4 + dnote 13, 4 + dnote 11, 4 + dnote 9, 4 sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index f2ef8a7e..d237a329 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -227,18 +227,18 @@ Music_IndigoPlateau_branch_a6fe:: Music_IndigoPlateau_Ch4:: dspeed 6 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 17, 16 + dnote 17, 16 + dnote 17, 16 + dnote 17, 8 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 Music_IndigoPlateau_branch_a728:: sound_call Music_IndigoPlateau_branch_a791 @@ -255,67 +255,67 @@ Music_IndigoPlateau_branch_a728:: sound_call Music_IndigoPlateau_branch_a7a8 sound_call Music_IndigoPlateau_branch_a77e sound_call Music_IndigoPlateau_branch_a7a8 - mutedsnare2 16 - mutedsnare2 8 - mutedsnare3 8 - mutedsnare2 16 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 + dnote 17, 16 + dnote 17, 8 + dnote 18, 8 + dnote 17, 16 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 1 + dnote 17, 1 + dnote 17, 1 + dnote 17, 1 sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare4 2 - mutedsnare3 2 + dnote 17, 4 + dnote 18, 4 + dnote 19, 4 + dnote 18, 4 + dnote 17, 4 + dnote 18, 4 + dnote 19, 4 + dnote 19, 2 + dnote 18, 2 sound_ret Music_IndigoPlateau_branch_a791:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 17, 4 + dnote 18, 4 + dnote 19, 4 + dnote 18, 4 + dnote 17, 4 + dnote 18, 4 + dnote 19, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 sound_ret Music_IndigoPlateau_branch_a7a8:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 17, 4 + dnote 18, 4 + dnote 17, 4 + dnote 18, 4 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 4885e389..fdea3ee1 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -231,99 +231,99 @@ Music_IntroBattle_Ch3:: Music_IntroBattle_Ch4:: dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 2 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 1 + dnote 17, 1 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 4 + dnote 17, 8 + dnote 17, 4 + dnote 17, 4 + dnote 17, 8 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 4 + dnote 17, 8 + dnote 17, 4 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 16 + dnote 17, 16 + dnote 17, 16 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 1 + dnote 17, 1 + dnote 17, 1 + dnote 17, 1 + dnote 17, 4 + dnote 17, 4 + dnote 17, 8 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 4 + dnote 17, 8 + dnote 17, 4 + dnote 17, 8 + dnote 17, 4 + dnote 17, 16 + dnote 17, 16 + dnote 17, 2 rest 16 rest 14 sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 671df650..5d9d2ba5 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -194,6 +194,6 @@ Music_Lavender_Ch4:: rest 16 Music_Lavender_branch_bc26:: - triangle2 8 - triangle2 8 + dnote 7, 8 + dnote 7, 8 sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 80e4afd0..54517752 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -270,68 +270,68 @@ Music_MuseumGuy_Ch4:: rest 16 rest 14 dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 Music_MuseumGuy_branch_aee1:: - mutedsnare2 4 - mutedsnare2 6 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare2 6 - mutedsnare2 2 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 6 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 2 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 17, 4 + dnote 17, 6 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 17, 6 + dnote 19, 1 + dnote 19, 1 + dnote 17, 4 + dnote 17, 6 + dnote 17, 2 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 6 + dnote 17, 2 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 17, 2 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 4 + dnote 17, 4 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 6 + dnote 19, 1 + dnote 19, 1 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index 9f326c39..29d0d5ac 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -312,93 +312,93 @@ Music_Routes1_branch_9cdd:: Music_Routes1_Ch4:: dspeed 12 rest 4 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 rest 4 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 rest 4 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 rest 4 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 + dnote 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + dnote 15, 2 + dnote 15, 2 sound_loop 0, Music_Routes1_Ch4 sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 0115466e..94098fc6 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -326,100 +326,100 @@ Music_Routes2_branch_9e9e:: Music_Routes2_Ch4:: dspeed 12 - snare3 2 + dnote 3, 2 rest 2 - snare3 1 + dnote 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 1 + dnote 3, 1 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 rest 2 dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 3 + dnote 3, 3 dspeed 12 - snare3 1 + dnote 3, 1 rest 3 - snare3 2 + dnote 3, 2 rest 2 - snare3 2 + dnote 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 + dnote 3, 1 + dnote 3, 1 + dnote 3, 2 rest 2 - snare3 2 + dnote 3, 2 rest 2 dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 3 + dnote 3, 3 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 3 rest 3 dspeed 12 - snare3 1 + dnote 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 1 + dnote 3, 1 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 rest 2 dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 3 rest 3 dspeed 12 - snare3 1 + dnote 3, 1 rest 3 - snare3 2 + dnote 3, 2 rest 2 - snare3 2 + dnote 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 1 + dnote 3, 1 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 rest 2 dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 3 rest 3 - snare3 3 - snare3 3 - snare3 3 + dnote 3, 3 + dnote 3, 3 + dnote 3, 3 rest 3 dspeed 12 - snare3 1 + dnote 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 1 + dnote 3, 1 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 rest 2 dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 3 rest 3 - snare3 3 + dnote 3, 3 rest 3 sound_loop 0, Music_Routes2_Ch4 sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index 96aa2625..0cd4e769 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -356,160 +356,160 @@ Music_Routes3_branch_a0a3:: Music_Routes3_Ch4:: dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 8 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 18, 2 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 18, 2 + dnote 17, 4 + dnote 18, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 Music_Routes3_branch_a17a:: - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare2 10 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare4 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 10 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 10 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 17, 12 + dnote 17, 2 + dnote 18, 2 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 8 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 18, 2 + dnote 17, 4 + dnote 17, 10 + dnote 19, 1 + dnote 19, 1 + dnote 17, 12 + dnote 17, 2 + dnote 19, 2 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 8 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 10 + dnote 19, 1 + dnote 19, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 8 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 10 + dnote 19, 1 + dnote 19, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 8 + dnote 18, 1 + dnote 19, 1 + dnote 18, 1 + dnote 19, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 8 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 12 + dnote 17, 2 + dnote 17, 2 + dnote 17, 4 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 39f2ea89..41bc9e04 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -510,172 +510,172 @@ Music_Routes4_Ch4:: dspeed 12 rest 16 rest 12 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 Music_Routes4_branch_a4a8:: - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 18, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 2 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 18, 1 + dnote 18, 1 + dnote 19, 1 + dnote 19, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 2 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 2 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 4 + dnote 17, 2 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 19, 1 + dnote 18, 1 + dnote 17, 4 + dnote 19, 1 + dnote 19, 1 + dnote 18, 1 + dnote 18, 1 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 + dnote 17, 2 sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 9483b20d..c12bd1de 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -462,216 +462,216 @@ Music_TitleScreen_branch_7e6e5:: Music_TitleScreen_Ch4:: dspeed 6 rest 4 - snare3 1 - snare3 1 - snare4 1 - snare4 1 + dnote 3, 1 + dnote 3, 1 + dnote 4, 1 + dnote 4, 1 dspeed 12 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare2 1 - snare2 1 + dnote 2, 1 + dnote 2, 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 3 dspeed 8 - snare3 2 - snare4 2 - snare2 2 - snare3 2 - snare2 2 - snare1 2 + dnote 3, 2 + dnote 4, 2 + dnote 2, 2 + dnote 3, 2 + dnote 2, 2 + dnote 1, 2 Music_TitleScreen_branch_7e716:: dspeed 12 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + dnote 2, 1 + dnote 2, 1 + dnote 3, 1 rest 3 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e834 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + dnote 2, 1 + dnote 2, 1 + dnote 3, 1 rest 1 - snare3 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 sound_call Music_TitleScreen_branch_7e842 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + dnote 2, 1 + dnote 3, 1 + dnote 2, 1 rest 1 - snare2 1 + dnote 2, 1 rest 1 sound_call Music_TitleScreen_branch_7e842 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + dnote 2, 1 + dnote 3, 1 + dnote 2, 1 rest 1 dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 + dnote 3, 1 + dnote 3, 1 + dnote 4, 1 + dnote 4, 1 dspeed 12 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e842 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + dnote 2, 1 + dnote 3, 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 + dnote 2, 1 rest 1 - snare3 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e842 - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 + dnote 2, 1 rest 1 - snare4 1 - snare3 1 - snare2 1 + dnote 4, 1 + dnote 3, 1 + dnote 2, 1 rest 3 - snare3 1 + dnote 3, 1 rest 5 - snare2 1 - snare4 1 - snare2 1 + dnote 2, 1 + dnote 4, 1 + dnote 2, 1 rest 1 dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 + dnote 3, 1 + dnote 3, 1 + dnote 4, 1 + dnote 4, 1 dspeed 12 - snare1 1 + dnote 1, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare3 1 - snare2 1 - snare1 1 + dnote 3, 1 + dnote 2, 1 + dnote 1, 1 rest 3 - snare2 1 + dnote 2, 1 rest 3 - snare3 1 + dnote 3, 1 rest 5 - snare3 1 - snare2 1 - snare3 1 + dnote 3, 1 + dnote 2, 1 + dnote 3, 1 rest 3 - snare2 1 + dnote 2, 1 rest 3 - snare3 1 + dnote 3, 1 rest 5 - snare2 1 - snare3 1 - snare4 1 + dnote 2, 1 + dnote 3, 1 + dnote 4, 1 rest 1 - snare3 1 - snare2 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 + dnote 2, 1 rest 3 - snare3 1 + dnote 3, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + dnote 2, 1 + dnote 3, 1 + dnote 2, 1 rest 3 - snare5 1 + dnote 5, 1 rest 5 - snare2 1 + dnote 2, 1 rest 3 - snare3 1 - snare2 1 - snare1 1 + dnote 3, 1 + dnote 2, 1 + dnote 1, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + dnote 2, 1 + dnote 3, 1 + dnote 2, 1 rest 1 - snare1 1 + dnote 1, 1 rest 1 dspeed 8 - snare2 4 - snare3 4 - snare1 4 + dnote 2, 4 + dnote 3, 4 + dnote 1, 4 dspeed 12 - snare5 1 + dnote 5, 1 rest 5 - snare2 1 + dnote 2, 1 rest 3 - snare3 1 - snare2 1 - snare3 1 + dnote 3, 1 + dnote 2, 1 + dnote 3, 1 rest 5 - snare2 1 - snare3 1 - snare1 1 + dnote 2, 1 + dnote 3, 1 + dnote 1, 1 rest 1 - snare3 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 dspeed 8 - snare2 4 - snare3 4 - snare2 4 + dnote 2, 4 + dnote 3, 4 + dnote 2, 4 sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + dnote 2, 1 + dnote 3, 1 + dnote 2, 1 rest 3 sound_ret Music_TitleScreen_branch_7e842:: - snare2 1 + dnote 2, 1 rest 3 - snare2 1 + dnote 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + dnote 3, 1 + dnote 2, 1 + dnote 2, 1 rest 3 sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 1858d138..d45a2b1d 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -287,19 +287,19 @@ Music_Vermilion_Ch4:: Music_Vermilion_branch_bb0e:: sound_call Music_Vermilion_branch_bb3f - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 1 - triangle1 1 - triangle1 1 - triangle1 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 + dnote 6, 1 + dnote 6, 1 + dnote 6, 1 + dnote 6, 1 sound_loop 4, Music_Vermilion_branch_bb0e sound_call Music_Vermilion_branch_bb3f sound_call Music_Vermilion_branch_bb3f @@ -308,16 +308,16 @@ Music_Vermilion_branch_bb0e:: sound_loop 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 + dnote 6, 2 + dnote 6, 1 + dnote 6, 1 sound_ret diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm index 086fef53..7f1f4598 100644 --- a/audio/music/yellow/meetjessiejames.asm +++ b/audio/music/yellow/meetjessiejames.asm @@ -1,309 +1,309 @@ Music_MeetJessieJames_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - G# 1 - G_ 1 - F# 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - C_ 2 - notetype 12, 11, 6 - D# 12 - C_ 4 + note G#, 1 + note G_, 1 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note_type 12, 11, 6 + note D#, 12 + note C_, 4 Music_MeetJessieJames_branch_83187:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 4 - D_ 16 + note D_, 16 rest 12 - notetype 12, 11, 4 + note_type 12, 11, 4 octave 3 - A# 4 + note A#, 4 rest 16 rest 8 - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - A# 2 - A_ 4 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 + note A#, 2 + note A_, 4 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 octave 2 - A# 4 - notetype 12, 11, 4 + note A#, 4 + note_type 12, 11, 4 octave 3 - B_ 4 - notetype 12, 11, 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 + note B_, 4 + note_type 12, 11, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - B_ 2 - notetype 12, 11, 4 - A# 4 - loopchannel 0, Music_MeetJessieJames_branch_83187 + note B_, 2 + note_type 12, 11, 4 + note A#, 4 + sound_loop 0, Music_MeetJessieJames_branch_83187 Music_MeetJessieJames_Ch2:: - duty 3 + duty_cycle 3 vibrato 6, 1, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D_ 1 - C# 1 - C_ 2 + note D_, 1 + note C#, 1 + note C_, 2 octave 3 - B_ 2 - A# 2 - A_ 2 - G# 2 - G_ 2 - F# 2 - notetype 12, 12, 7 - A_ 12 + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 7 + note A_, 12 octave 4 - C# 4 + note C#, 4 Music_MeetJessieJames_branch_831df:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 octave 2 - A_ 4 - notetype 12, 12, 5 + note A_, 4 + note_type 12, 12, 5 octave 4 - C# 4 - notetype 12, 12, 2 - D_ 1 + note C#, 4 + note_type 12, 12, 2 + note D_, 1 octave 3 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - notetype 12, 12, 6 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note_type 12, 12, 6 octave 4 - D_ 8 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 + note D_, 8 + note_type 12, 12, 2 + note D#, 6 + note F_, 4 + note D#, 4 octave 3 - A# 2 + note A#, 2 octave 4 - D# 6 - F_ 4 - D# 2 - notetype 12, 12, 5 - D_ 4 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 + note D#, 6 + note F_, 4 + note D#, 2 + note_type 12, 12, 5 + note D_, 4 + note_type 12, 12, 2 + note D#, 6 + note F_, 4 + note D#, 4 octave 3 - A# 2 + note A#, 2 octave 4 - D# 4 - F_ 4 - notetype 12, 12, 5 - D# 8 - loopchannel 0, Music_MeetJessieJames_branch_831df + note D#, 4 + note F_, 4 + note_type 12, 12, 5 + note D#, 8 + sound_loop 0, Music_MeetJessieJames_branch_831df Music_MeetJessieJames_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 rest 8 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 - D# 2 + note C_, 2 + note D#, 2 Music_MeetJessieJames_branch_83235:: - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 2 - A_ 2 - D# 2 - D_ 1 + note A#, 2 + note A_, 2 + note D#, 2 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 - D_ 2 - D# 1 + note C_, 2 + note D_, 2 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - A# 1 + note A#, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - A# 1 + note A#, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - loopchannel 0, Music_MeetJessieJames_branch_83235 - endchannel + sound_loop 0, Music_MeetJessieJames_branch_83235 + sound_ret diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm index 1ee3f760..8e161443 100644 --- a/audio/music/yellow/surfingpikachu.asm +++ b/audio/music/yellow/surfingpikachu.asm @@ -1,690 +1,690 @@ Music_SurfingPikachu_Ch1:: tempo 117 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 3 - octave 3 - E_ 6 - notetype 12, 11, 2 - F# 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - F# 16 + note_type 12, 11, 3 + octave 3 + note E_, 6 + note_type 12, 11, 2 + note F#, 2 + note_type 12, 11, 3 + note E_, 6 + note_type 12, 11, 2 + note F#, 16 rest 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 14 - notetype 12, 11, 2 - D# 2 - C# 1 - D# 1 + note_type 12, 11, 3 + note E_, 6 + note_type 12, 11, 2 + note A_, 2 + note_type 12, 11, 3 + note E_, 6 + note_type 12, 11, 2 + note A_, 14 + note_type 12, 11, 2 + note D#, 2 + note C#, 1 + note D#, 1 octave 2 - B_ 6 - octave 3 - E_ 4 - E_ 4 - E_ 8 - G# 4 - G# 4 - G# 2 + note B_, 6 + octave 3 + note E_, 4 + note E_, 4 + note E_, 8 + note G#, 4 + note G#, 4 + note G#, 2 Music_SurfingPikachu_branch_82d1a:: - notetype 12, 11, 3 - octave 3 - G# 4 - E_ 4 - F# 4 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 6 - F# 2 - A_ 8 + note_type 12, 11, 3 + octave 3 + note G#, 4 + note E_, 4 + note F#, 4 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 6 + note F#, 2 + note A_, 8 octave 2 - B_ 6 - octave 3 - E_ 2 - G# 8 - G# 4 - E_ 4 - F# 4 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - F# 6 - E_ 2 - F# 1 + note B_, 6 + octave 3 + note E_, 2 + note G#, 8 + note G#, 4 + note E_, 4 + note F#, 4 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 1 rest 3 - A_ 4 - duty 0 - notetype 12, 11, 2 - G# 1 - F# 1 - G# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - F# 2 - F# 2 - D# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - B_ 1 - A# 1 - B_ 2 - G# 2 - E_ 2 - G# 2 - G_ 2 - G# 2 - A_ 2 - octave 4 - C# 2 - C_ 2 - C# 3 - octave 3 - F# 1 - A_ 2 - G# 2 - F# 2 - A_ 2 - E_ 3 - E_ 1 - B_ 2 - A_ 2 - G# 6 - E_ 1 - F_ 1 - F# 2 - F# 2 - D# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - B_ 1 - A# 1 - B_ 2 - G# 2 - E_ 2 - G# 2 - G_ 2 - G# 2 - A_ 2 - octave 4 - C# 2 - C_ 2 - C# 3 - octave 3 - F# 1 - A_ 2 - G# 2 - A_ 2 - octave 4 - D# 2 - E_ 2 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 8 - duty 3 - loopchannel 0, Music_SurfingPikachu_branch_82d1a + note A_, 4 + duty_cycle 0 + note_type 12, 11, 2 + note G#, 1 + note F#, 1 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note B_, 1 + note A#, 1 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 3 + octave 3 + note F#, 1 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note E_, 3 + note E_, 1 + note B_, 2 + note A_, 2 + note G#, 6 + note E_, 1 + note F_, 1 + note F#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note B_, 1 + note A#, 1 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 3 + octave 3 + note F#, 1 + note A_, 2 + note G#, 2 + note A_, 2 + octave 4 + note D#, 2 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 8 + duty_cycle 3 + sound_loop 0, Music_SurfingPikachu_branch_82d1a Music_SurfingPikachu_Ch2:: - duty 3 + duty_cycle 3 vibrato 6, 1, 5 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 11, 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 4 - octave 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 12, 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - notetype 12, 12, 2 - E_ 6 - B_ 4 - B_ 4 - B_ 8 - B_ 4 - B_ 4 - B_ 2 + note_type 12, 12, 4 + octave 3 + note B_, 6 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note_type 12, 12, 4 + octave 3 + note B_, 6 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note_type 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note_type 12, 12, 4 + octave 4 + note C#, 6 + note_type 12, 12, 2 + note F#, 2 + note_type 12, 12, 4 + note C#, 6 + note_type 12, 12, 2 + note F#, 2 + note_type 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note_type 12, 12, 2 + note E_, 6 + note B_, 4 + note B_, 4 + note B_, 8 + note B_, 4 + note B_, 4 + note B_, 2 Music_SurfingPikachu_branch_82de0:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 6 - A_ 2 - G# 8 - F# 6 - A_ 2 + note B_, 6 + note A_, 2 + note G#, 8 + note F#, 6 + note A_, 2 octave 4 - C# 8 + note C#, 8 octave 3 - E_ 6 - G# 2 - B_ 8 + note E_, 6 + note G#, 2 + note B_, 8 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - D# 2 - E_ 8 - D# 6 - C# 2 - D# 1 + note D#, 2 + note E_, 8 + note D#, 6 + note C#, 2 + note D#, 1 rest 3 - F# 4 - E_ 10 - notetype 12, 12, 6 - duty 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 6 - octave 4 - C# 2 - D# 4 - octave 3 - B_ 4 - octave 4 - E_ 6 - F# 2 - G# 8 - A_ 6 - G# 2 - A_ 4 - F# 4 - G# 10 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 6 - octave 4 - C# 2 - D# 4 - octave 3 - B_ 4 - octave 4 - E_ 6 - F# 2 - G# 8 - A_ 4 - F# 4 - D# 4 + note F#, 4 + note E_, 10 + note_type 12, 12, 6 + duty_cycle 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 2 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note F#, 2 + note G#, 8 + note A_, 6 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 10 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 2 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note F#, 2 + note G#, 8 + note A_, 4 + note F#, 4 + note D#, 4 octave 5 - C# 4 + note C#, 4 octave 4 - B_ 8 - notetype 12, 12, 2 + note B_, 8 + note_type 12, 12, 2 octave 5 - E_ 4 - notetype 12, 12, 6 - duty 3 + note E_, 4 + note_type 12, 12, 6 + duty_cycle 3 octave 3 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 octave 4 - C# 1 - loopchannel 0, Music_SurfingPikachu_branch_82de0 + note C#, 1 + sound_loop 0, Music_SurfingPikachu_branch_82de0 Music_SurfingPikachu_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 6 + note B_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 6 + note B_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 6 + note A_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 6 + note A_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 Music_SurfingPikachu_branch_82ea0:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 - C_ 1 - C# 1 + note C#, 1 + note C_, 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note E_, 1 rest 1 octave 4 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_SurfingPikachu_branch_82ea0 + sound_loop 0, Music_SurfingPikachu_branch_82ea0 diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm index c809d10f..bb741a22 100644 --- a/audio/music/yellow/yellowintro.asm +++ b/audio/music/yellow/yellowintro.asm @@ -1,484 +1,484 @@ Music_YellowIntro_Ch1:: tempo 116 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - G# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 3 - A# 1 - B_ 2 - B_ 10 - notetype 12, 11, 6 - octave 4 - C# 1 - C_ 1 - C# 10 + note G#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 3 + note A#, 1 + note B_, 2 + note B_, 10 + note_type 12, 11, 6 + octave 4 + note C#, 1 + note C_, 1 + note C#, 10 octave 3 - G# 1 - G_ 1 - G# 4 - B_ 4 - octave 4 - E_ 4 - F# 8 - E_ 8 + note G#, 1 + note G_, 1 + note G#, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 8 + note E_, 8 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - octave 4 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 + note B_, 4 + note G#, 6 + note_type 12, 11, 2 + note B_, 2 + note_type 12, 11, 6 + note G#, 6 + note_type 12, 11, 2 + note B_, 2 + note_type 12, 11, 6 + octave 4 + note E_, 6 + note_type 12, 11, 2 + note G#, 2 + note_type 12, 11, 6 + note E_, 6 + note_type 12, 11, 2 + note G#, 2 + note_type 12, 11, 6 octave 3 - A_ 4 - F# 4 - A_ 4 - B_ 4 - F# 4 - G# 4 - A_ 2 - G# 2 - F# 2 - D# 2 - notetype 12, 11, 3 - B_ 2 - octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 2 - C# 2 - F# 4 - F# 3 - D# 1 - F# 2 - F# 8 - notetype 12, 11, 6 - F# 1 - F_ 1 - F# 8 + note A_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note F#, 4 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note_type 12, 11, 3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 2 + note C#, 2 + note F#, 4 + note F#, 3 + note D#, 1 + note F#, 2 + note F#, 8 + note_type 12, 11, 6 + note F#, 1 + note F_, 1 + note F#, 8 octave 3 - B_ 1 - A# 1 - B_ 8 - octave 4 - F# 1 - F_ 1 - F# 2 - notetype 12, 11, 3 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 2 + note B_, 1 + note A#, 1 + note B_, 8 + octave 4 + note F#, 1 + note F_, 1 + note F#, 2 + note_type 12, 11, 3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + note_type 12, 11, 2 octave 3 - B_ 16 - endchannel + note B_, 16 + sound_ret Music_YellowIntro_Ch2:: - duty 2 + duty_cycle 2 vibrato 6, 1, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - B_ 2 - octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 3 - D# 1 - E_ 2 - E_ 4 - notetype 12, 12, 5 - G# 1 - G_ 1 - G# 10 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 3 + note D#, 1 + note E_, 2 + note E_, 4 + note_type 12, 12, 5 + note G#, 1 + note G_, 1 + note G#, 10 octave 3 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 7 - octave 4 - E_ 4 - G# 4 - B_ 4 + note B_, 1 + note A#, 1 + note B_, 6 + note_type 12, 12, 7 + octave 4 + note E_, 4 + note G#, 4 + note B_, 4 octave 5 - C# 16 + note C#, 16 octave 4 - A_ 4 - G# 4 - F# 4 - E_ 4 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 octave 3 - B_ 6 - notetype 12, 12, 2 + note B_, 6 + note_type 12, 12, 2 octave 4 - E_ 2 - notetype 12, 12, 7 + note E_, 2 + note_type 12, 12, 7 octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - C# 4 + note B_, 6 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note_type 12, 12, 7 + note G#, 6 + note_type 12, 12, 2 + note B_, 2 + note_type 12, 12, 7 + note G#, 6 + note_type 12, 12, 2 + note B_, 2 + note_type 12, 12, 7 + note C#, 4 octave 3 - A_ 4 - octave 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 4 - D# 2 - C# 2 + note A_, 4 + octave 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 4 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - notetype 12, 12, 3 - octave 4 - E_ 2 - G# 4 - G# 4 - G# 4 - G# 2 - F# 2 - A_ 4 - A_ 3 - F# 1 - A_ 2 - A_ 4 - notetype 12, 12, 7 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - E_ 16 - endchannel + note B_, 2 + note_type 12, 12, 3 + octave 4 + note E_, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 2 + note F#, 2 + note A_, 4 + note A_, 3 + note F#, 1 + note A_, 2 + note A_, 4 + note_type 12, 12, 7 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 6 + note_type 12, 12, 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note_type 12, 12, 2 + note E_, 16 + sound_ret Music_YellowIntro_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 3 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 - G# 1 - A_ 1 + note F#, 1 + note G#, 1 + note A_, 1 octave 5 - C# 1 - E_ 1 + note C#, 1 + note E_, 1 rest 15 - endchannel + sound_ret diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm index f65ca164..111c182d 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellow/yellowunusedsong.asm @@ -1,51 +1,51 @@ Music_YellowUnusedSong_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 8, 11, 2 + note_type 8, 11, 2 octave 3 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - A_ 6 - G_ 6 - A_ 12 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note A_, 6 + note G_, 6 + note A_, 12 Music_YellowUnusedSong_branch_82fde:: - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 octave 4 - D# 6 - D_ 12 + note D#, 6 + note D_, 12 rest 16 rest 16 rest 16 @@ -53,274 +53,274 @@ Music_YellowUnusedSong_branch_82fde:: rest 16 rest 16 octave 3 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - A_ 6 - G_ 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_82fde + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note A_, 6 + note G_, 6 + note A_, 12 + sound_loop 0, Music_YellowUnusedSong_branch_82fde Music_YellowUnusedSong_Ch2:: - duty 2 - notetype 8, 12, 2 + duty_cycle 2 + note_type 8, 12, 2 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 octave 3 - A_ 6 + note A_, 6 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note D_, 6 + note A#, 6 + note A_, 12 Music_YellowUnusedSong_branch_8302a:: - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 octave 3 - A_ 6 + note A_, 6 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - G# 6 - G_ 12 - notetype 8, 9, 0 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note G#, 6 + note G_, 12 + note_type 8, 9, 0 octave 3 - D# 16 - D# 8 - D# 16 - D# 8 + note D#, 16 + note D#, 8 + note D#, 16 + note D#, 8 octave 2 - A# 16 - A# 8 + note A#, 16 + note A#, 8 octave 3 - D# 12 - F_ 12 - notetype 8, 12, 2 + note D#, 12 + note F_, 12 + note_type 8, 12, 2 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 octave 3 - A_ 6 + note A_, 6 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_8302a + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note D_, 6 + note A#, 6 + note A_, 12 + sound_loop 0, Music_YellowUnusedSong_branch_8302a Music_YellowUnusedSong_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 vibrato 2, 1, 5 rest 16 rest 12 octave 4 - C_ 4 - D_ 8 - D# 8 - G_ 8 - A# 8 + note C_, 4 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 Music_YellowUnusedSong_branch_83075:: - A_ 8 - A# 8 - G_ 8 - A_ 4 - D_ 4 - A_ 8 - A# 8 + note A_, 8 + note A#, 8 + note G_, 8 + note A_, 4 + note D_, 4 + note A_, 8 + note A#, 8 octave 5 - C# 8 - D_ 8 - D# 16 - D# 16 + note C#, 8 + note D_, 8 + note D#, 16 + note D#, 16 octave 4 - A# 16 + note A#, 16 octave 5 - D# 8 - F_ 8 + note D#, 8 + note F_, 8 octave 4 - D_ 16 - D_ 16 + note D_, 16 + note D_, 16 octave 4 - D_ 8 - D# 8 - G_ 8 - A# 8 - loopchannel 0, Music_YellowUnusedSong_branch_83075 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 + sound_loop 0, Music_YellowUnusedSong_branch_83075 Music_YellowUnusedSong_Ch4:: dspeed 12 - snare3 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 4 + dnote 3, 4 Music_YellowUnusedSong_branch_830c3:: - snare3 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - snare3 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 2 - snare3 2 - snare3 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 4 + dnote 3, 2 + dnote 3, 2 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 + dnote 3, 4 dspeed 8 - snare3 2 - snare3 2 - snare3 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - loopchannel 0, Music_YellowUnusedSong_branch_830c3 + dnote 3, 4 + dnote 3, 4 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 2 + dnote 3, 4 + dnote 3, 4 + sound_loop 0, Music_YellowUnusedSong_branch_830c3 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm deleted file mode 100644 index 693bb0c5..00000000 --- a/audio/sfx/cymbal1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_1_Ch8: - noise_note 0, 10, 1, 16 - sound_ret diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm deleted file mode 100644 index 206d44ae..00000000 --- a/audio/sfx/cymbal1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_2_Ch8: - noise_note 0, 10, 1, 16 - sound_ret diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm deleted file mode 100644 index 9389cc6f..00000000 --- a/audio/sfx/cymbal1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_3_Ch8: - noise_note 0, 10, 1, 16 - sound_ret diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm deleted file mode 100644 index 3f050d96..00000000 --- a/audio/sfx/cymbal2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_1_Ch8: - noise_note 0, 10, 2, 17 - sound_ret diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm deleted file mode 100644 index ab0a2edd..00000000 --- a/audio/sfx/cymbal2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_2_Ch8: - noise_note 0, 10, 2, 17 - sound_ret diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm deleted file mode 100644 index 26f7048a..00000000 --- a/audio/sfx/cymbal2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_3_Ch8: - noise_note 0, 10, 2, 17 - sound_ret diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm deleted file mode 100644 index 179de2f0..00000000 --- a/audio/sfx/cymbal3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_1_Ch8: - noise_note 0, 10, 2, 80 - sound_ret diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm deleted file mode 100644 index 09e3b6e1..00000000 --- a/audio/sfx/cymbal3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_2_Ch8: - noise_note 0, 10, 2, 80 - sound_ret diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm deleted file mode 100644 index a7af3bb0..00000000 --- a/audio/sfx/cymbal3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_3_Ch8: - noise_note 0, 10, 2, 80 - sound_ret diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm deleted file mode 100644 index 52eb96d7..00000000 --- a/audio/sfx/muted_snare1_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_1_Ch8: - noise_note 0, 10, 1, 24 - noise_note 0, 3, 1, 51 - sound_ret diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm deleted file mode 100644 index c3e29c16..00000000 --- a/audio/sfx/muted_snare1_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_2_Ch8: - noise_note 0, 10, 1, 24 - noise_note 0, 3, 1, 51 - sound_ret diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm deleted file mode 100644 index a83ecd94..00000000 --- a/audio/sfx/muted_snare1_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_3_Ch8: - noise_note 0, 10, 1, 24 - noise_note 0, 3, 1, 51 - sound_ret diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm deleted file mode 100644 index a8066238..00000000 --- a/audio/sfx/muted_snare2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_1_Ch8: - noise_note 0, 9, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm deleted file mode 100644 index 32bb41f5..00000000 --- a/audio/sfx/muted_snare2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_2_Ch8: - noise_note 0, 9, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm deleted file mode 100644 index 5c3b743e..00000000 --- a/audio/sfx/muted_snare2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_3_Ch8: - noise_note 0, 9, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm deleted file mode 100644 index 0538f8d5..00000000 --- a/audio/sfx/muted_snare3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_1_Ch8: - noise_note 0, 7, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm deleted file mode 100644 index 20c3772c..00000000 --- a/audio/sfx/muted_snare3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_2_Ch8: - noise_note 0, 7, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm deleted file mode 100644 index 2ac3f874..00000000 --- a/audio/sfx/muted_snare3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_3_Ch8: - noise_note 0, 7, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm deleted file mode 100644 index 575829ae..00000000 --- a/audio/sfx/muted_snare4_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_1_Ch8: - noise_note 0, 6, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm deleted file mode 100644 index 19744539..00000000 --- a/audio/sfx/muted_snare4_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_2_Ch8: - noise_note 0, 6, 1, 34 - sound_ret diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm deleted file mode 100644 index 188f9bff..00000000 --- a/audio/sfx/muted_snare4_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_3_Ch8: - noise_note 0, 6, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument01_1.asm b/audio/sfx/noise_instrument01_1.asm new file mode 100644 index 00000000..e545b030 --- /dev/null +++ b/audio/sfx/noise_instrument01_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_1_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_2.asm b/audio/sfx/noise_instrument01_2.asm new file mode 100644 index 00000000..3f4d2bb0 --- /dev/null +++ b/audio/sfx/noise_instrument01_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_2_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_3.asm b/audio/sfx/noise_instrument01_3.asm new file mode 100644 index 00000000..ac360f2e --- /dev/null +++ b/audio/sfx/noise_instrument01_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_3_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_1.asm b/audio/sfx/noise_instrument02_1.asm new file mode 100644 index 00000000..12a7d226 --- /dev/null +++ b/audio/sfx/noise_instrument02_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_1_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_2.asm b/audio/sfx/noise_instrument02_2.asm new file mode 100644 index 00000000..354bbdbc --- /dev/null +++ b/audio/sfx/noise_instrument02_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_2_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_3.asm b/audio/sfx/noise_instrument02_3.asm new file mode 100644 index 00000000..2f7f0d6f --- /dev/null +++ b/audio/sfx/noise_instrument02_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_3_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_1.asm b/audio/sfx/noise_instrument03_1.asm new file mode 100644 index 00000000..b75b6479 --- /dev/null +++ b/audio/sfx/noise_instrument03_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_1_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_2.asm b/audio/sfx/noise_instrument03_2.asm new file mode 100644 index 00000000..3551baef --- /dev/null +++ b/audio/sfx/noise_instrument03_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_2_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_3.asm b/audio/sfx/noise_instrument03_3.asm new file mode 100644 index 00000000..c132ab64 --- /dev/null +++ b/audio/sfx/noise_instrument03_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_3_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_1.asm b/audio/sfx/noise_instrument04_1.asm new file mode 100644 index 00000000..303f1f1f --- /dev/null +++ b/audio/sfx/noise_instrument04_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_1_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_2.asm b/audio/sfx/noise_instrument04_2.asm new file mode 100644 index 00000000..b43ae39d --- /dev/null +++ b/audio/sfx/noise_instrument04_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_2_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_3.asm b/audio/sfx/noise_instrument04_3.asm new file mode 100644 index 00000000..fcd27433 --- /dev/null +++ b/audio/sfx/noise_instrument04_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_3_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument05_1.asm b/audio/sfx/noise_instrument05_1.asm new file mode 100644 index 00000000..d119b958 --- /dev/null +++ b/audio/sfx/noise_instrument05_1.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_1_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_2.asm b/audio/sfx/noise_instrument05_2.asm new file mode 100644 index 00000000..1a0e63b5 --- /dev/null +++ b/audio/sfx/noise_instrument05_2.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_2_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_3.asm b/audio/sfx/noise_instrument05_3.asm new file mode 100644 index 00000000..a0fec98f --- /dev/null +++ b/audio/sfx/noise_instrument05_3.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_3_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument06_1.asm b/audio/sfx/noise_instrument06_1.asm new file mode 100644 index 00000000..1412fc39 --- /dev/null +++ b/audio/sfx/noise_instrument06_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_1_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_2.asm b/audio/sfx/noise_instrument06_2.asm new file mode 100644 index 00000000..bb591031 --- /dev/null +++ b/audio/sfx/noise_instrument06_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_2_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_3.asm b/audio/sfx/noise_instrument06_3.asm new file mode 100644 index 00000000..b5110d40 --- /dev/null +++ b/audio/sfx/noise_instrument06_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_3_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_1.asm b/audio/sfx/noise_instrument07_1.asm new file mode 100644 index 00000000..24f481bc --- /dev/null +++ b/audio/sfx/noise_instrument07_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_1_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_2.asm b/audio/sfx/noise_instrument07_2.asm new file mode 100644 index 00000000..87057ed1 --- /dev/null +++ b/audio/sfx/noise_instrument07_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_2_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_3.asm b/audio/sfx/noise_instrument07_3.asm new file mode 100644 index 00000000..3beb3f2c --- /dev/null +++ b/audio/sfx/noise_instrument07_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_3_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument08_1.asm b/audio/sfx/noise_instrument08_1.asm new file mode 100644 index 00000000..60db9e0f --- /dev/null +++ b/audio/sfx/noise_instrument08_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_1_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_2.asm b/audio/sfx/noise_instrument08_2.asm new file mode 100644 index 00000000..89e5b445 --- /dev/null +++ b/audio/sfx/noise_instrument08_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_2_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_3.asm b/audio/sfx/noise_instrument08_3.asm new file mode 100644 index 00000000..c63be9b4 --- /dev/null +++ b/audio/sfx/noise_instrument08_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_3_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument09_1.asm b/audio/sfx/noise_instrument09_1.asm new file mode 100644 index 00000000..047f5469 --- /dev/null +++ b/audio/sfx/noise_instrument09_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_1_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_2.asm b/audio/sfx/noise_instrument09_2.asm new file mode 100644 index 00000000..093f912e --- /dev/null +++ b/audio/sfx/noise_instrument09_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_2_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_3.asm b/audio/sfx/noise_instrument09_3.asm new file mode 100644 index 00000000..2ab061db --- /dev/null +++ b/audio/sfx/noise_instrument09_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_3_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument10_1.asm b/audio/sfx/noise_instrument10_1.asm new file mode 100644 index 00000000..1628fb88 --- /dev/null +++ b/audio/sfx/noise_instrument10_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_1_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_2.asm b/audio/sfx/noise_instrument10_2.asm new file mode 100644 index 00000000..e1ed23ce --- /dev/null +++ b/audio/sfx/noise_instrument10_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_2_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_3.asm b/audio/sfx/noise_instrument10_3.asm new file mode 100644 index 00000000..a175ad17 --- /dev/null +++ b/audio/sfx/noise_instrument10_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_3_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument11_1.asm b/audio/sfx/noise_instrument11_1.asm new file mode 100644 index 00000000..e2f8729e --- /dev/null +++ b/audio/sfx/noise_instrument11_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_1_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_2.asm b/audio/sfx/noise_instrument11_2.asm new file mode 100644 index 00000000..925c421a --- /dev/null +++ b/audio/sfx/noise_instrument11_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_2_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_3.asm b/audio/sfx/noise_instrument11_3.asm new file mode 100644 index 00000000..72f54e99 --- /dev/null +++ b/audio/sfx/noise_instrument11_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_3_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument12_1.asm b/audio/sfx/noise_instrument12_1.asm new file mode 100644 index 00000000..f1e6379a --- /dev/null +++ b/audio/sfx/noise_instrument12_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_1_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_2.asm b/audio/sfx/noise_instrument12_2.asm new file mode 100644 index 00000000..f9c2e1a9 --- /dev/null +++ b/audio/sfx/noise_instrument12_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_2_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_3.asm b/audio/sfx/noise_instrument12_3.asm new file mode 100644 index 00000000..b5347639 --- /dev/null +++ b/audio/sfx/noise_instrument12_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_3_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument13_1.asm b/audio/sfx/noise_instrument13_1.asm new file mode 100644 index 00000000..50569b26 --- /dev/null +++ b/audio/sfx/noise_instrument13_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_1_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_2.asm b/audio/sfx/noise_instrument13_2.asm new file mode 100644 index 00000000..5a5120f6 --- /dev/null +++ b/audio/sfx/noise_instrument13_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_2_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_3.asm b/audio/sfx/noise_instrument13_3.asm new file mode 100644 index 00000000..848746d7 --- /dev/null +++ b/audio/sfx/noise_instrument13_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_3_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument14_1.asm b/audio/sfx/noise_instrument14_1.asm new file mode 100644 index 00000000..9621ef42 --- /dev/null +++ b/audio/sfx/noise_instrument14_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_1_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_2.asm b/audio/sfx/noise_instrument14_2.asm new file mode 100644 index 00000000..d413fb1f --- /dev/null +++ b/audio/sfx/noise_instrument14_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_2_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_3.asm b/audio/sfx/noise_instrument14_3.asm new file mode 100644 index 00000000..bc115181 --- /dev/null +++ b/audio/sfx/noise_instrument14_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_3_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument15_1.asm b/audio/sfx/noise_instrument15_1.asm new file mode 100644 index 00000000..308746c0 --- /dev/null +++ b/audio/sfx/noise_instrument15_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_1_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_2.asm b/audio/sfx/noise_instrument15_2.asm new file mode 100644 index 00000000..c1f63942 --- /dev/null +++ b/audio/sfx/noise_instrument15_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_2_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_3.asm b/audio/sfx/noise_instrument15_3.asm new file mode 100644 index 00000000..f77872ae --- /dev/null +++ b/audio/sfx/noise_instrument15_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_3_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument16_1.asm b/audio/sfx/noise_instrument16_1.asm new file mode 100644 index 00000000..ac830985 --- /dev/null +++ b/audio/sfx/noise_instrument16_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_1_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_2.asm b/audio/sfx/noise_instrument16_2.asm new file mode 100644 index 00000000..e61531bf --- /dev/null +++ b/audio/sfx/noise_instrument16_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_2_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_3.asm b/audio/sfx/noise_instrument16_3.asm new file mode 100644 index 00000000..99dbca77 --- /dev/null +++ b/audio/sfx/noise_instrument16_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_3_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument17_1.asm b/audio/sfx/noise_instrument17_1.asm new file mode 100644 index 00000000..41565402 --- /dev/null +++ b/audio/sfx/noise_instrument17_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_1_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_2.asm b/audio/sfx/noise_instrument17_2.asm new file mode 100644 index 00000000..f89ec777 --- /dev/null +++ b/audio/sfx/noise_instrument17_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_2_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_3.asm b/audio/sfx/noise_instrument17_3.asm new file mode 100644 index 00000000..9330fbc0 --- /dev/null +++ b/audio/sfx/noise_instrument17_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_3_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_1.asm b/audio/sfx/noise_instrument18_1.asm new file mode 100644 index 00000000..e77e331d --- /dev/null +++ b/audio/sfx/noise_instrument18_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_1_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_2.asm b/audio/sfx/noise_instrument18_2.asm new file mode 100644 index 00000000..e937f9f6 --- /dev/null +++ b/audio/sfx/noise_instrument18_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_2_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_3.asm b/audio/sfx/noise_instrument18_3.asm new file mode 100644 index 00000000..59a5d069 --- /dev/null +++ b/audio/sfx/noise_instrument18_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_3_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_1.asm b/audio/sfx/noise_instrument19_1.asm new file mode 100644 index 00000000..2fa183d6 --- /dev/null +++ b/audio/sfx/noise_instrument19_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_1_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_2.asm b/audio/sfx/noise_instrument19_2.asm new file mode 100644 index 00000000..49d09fcc --- /dev/null +++ b/audio/sfx/noise_instrument19_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_2_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_3.asm b/audio/sfx/noise_instrument19_3.asm new file mode 100644 index 00000000..a90b3e4b --- /dev/null +++ b/audio/sfx/noise_instrument19_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_3_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm deleted file mode 100644 index a6e569a5..00000000 --- a/audio/sfx/snare1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_1_Ch8: - noise_note 0, 12, 1, 51 - sound_ret diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm deleted file mode 100644 index 336c9f22..00000000 --- a/audio/sfx/snare1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_2_Ch8: - noise_note 0, 12, 1, 51 - sound_ret diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm deleted file mode 100644 index 84108aed..00000000 --- a/audio/sfx/snare1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_3_Ch8: - noise_note 0, 12, 1, 51 - sound_ret diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm deleted file mode 100644 index fddcfe01..00000000 --- a/audio/sfx/snare2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_1_Ch8: - noise_note 0, 11, 1, 51 - sound_ret diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm deleted file mode 100644 index 522abb40..00000000 --- a/audio/sfx/snare2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_2_Ch8: - noise_note 0, 11, 1, 51 - sound_ret diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm deleted file mode 100644 index c41fadbb..00000000 --- a/audio/sfx/snare2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_3_Ch8: - noise_note 0, 11, 1, 51 - sound_ret diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm deleted file mode 100644 index 0c9cfbdb..00000000 --- a/audio/sfx/snare3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_1_Ch8: - noise_note 0, 10, 1, 51 - sound_ret diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm deleted file mode 100644 index d5990157..00000000 --- a/audio/sfx/snare3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_2_Ch8: - noise_note 0, 10, 1, 51 - sound_ret diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm deleted file mode 100644 index 807cfd03..00000000 --- a/audio/sfx/snare3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_3_Ch8: - noise_note 0, 10, 1, 51 - sound_ret diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm deleted file mode 100644 index fe2552d9..00000000 --- a/audio/sfx/snare4_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_1_Ch8: - noise_note 0, 8, 1, 51 - sound_ret diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm deleted file mode 100644 index 0913ba2b..00000000 --- a/audio/sfx/snare4_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_2_Ch8: - noise_note 0, 8, 1, 51 - sound_ret diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm deleted file mode 100644 index 3aeeb49b..00000000 --- a/audio/sfx/snare4_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_3_Ch8: - noise_note 0, 8, 1, 51 - sound_ret diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm deleted file mode 100644 index 21d4996d..00000000 --- a/audio/sfx/snare5_1.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_1_Ch8: - noise_note 7, 8, 4, 55 - noise_note 6, 8, 4, 54 - noise_note 5, 8, 3, 53 - noise_note 4, 8, 3, 52 - noise_note 3, 8, 2, 51 - noise_note 2, 8, 1, 50 - sound_ret diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm deleted file mode 100644 index c37865a0..00000000 --- a/audio/sfx/snare5_2.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_2_Ch8: - noise_note 7, 8, 4, 55 - noise_note 6, 8, 4, 54 - noise_note 5, 8, 3, 53 - noise_note 4, 8, 3, 52 - noise_note 3, 8, 2, 51 - noise_note 2, 8, 1, 50 - sound_ret diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm deleted file mode 100644 index d49211d0..00000000 --- a/audio/sfx/snare5_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_3_Ch8: - noise_note 7, 8, 4, 55 - noise_note 6, 8, 4, 54 - noise_note 5, 8, 3, 53 - noise_note 4, 8, 3, 52 - noise_note 3, 8, 2, 51 - noise_note 2, 8, 1, 50 - sound_ret diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm deleted file mode 100644 index 03a63d40..00000000 --- a/audio/sfx/snare6_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_1_Ch8: - noise_note 0, 8, 1, 16 - sound_ret diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm deleted file mode 100644 index 7adad3fb..00000000 --- a/audio/sfx/snare6_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_2_Ch8: - noise_note 0, 8, 1, 16 - sound_ret diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm deleted file mode 100644 index 9a6b7be3..00000000 --- a/audio/sfx/snare6_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_3_Ch8: - noise_note 0, 8, 1, 16 - sound_ret diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm deleted file mode 100644 index 1e216fea..00000000 --- a/audio/sfx/snare7_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_1_Ch8: - noise_note 0, 8, 2, 35 - sound_ret diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm deleted file mode 100644 index 11a13239..00000000 --- a/audio/sfx/snare7_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_2_Ch8: - noise_note 0, 8, 2, 35 - sound_ret diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm deleted file mode 100644 index c9d96902..00000000 --- a/audio/sfx/snare7_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_3_Ch8: - noise_note 0, 8, 2, 35 - sound_ret diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm deleted file mode 100644 index 9dcc4381..00000000 --- a/audio/sfx/snare8_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_1_Ch8: - noise_note 0, 8, 2, 37 - sound_ret diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm deleted file mode 100644 index 020de92f..00000000 --- a/audio/sfx/snare8_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_2_Ch8: - noise_note 0, 8, 2, 37 - sound_ret diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm deleted file mode 100644 index ecb6a9a7..00000000 --- a/audio/sfx/snare8_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_3_Ch8: - noise_note 0, 8, 2, 37 - sound_ret diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm deleted file mode 100644 index 674efb12..00000000 --- a/audio/sfx/snare9_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_1_Ch8: - noise_note 0, 8, 2, 38 - sound_ret diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm deleted file mode 100644 index 9d8f307d..00000000 --- a/audio/sfx/snare9_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_2_Ch8: - noise_note 0, 8, 2, 38 - sound_ret diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm deleted file mode 100644 index 6bfd1973..00000000 --- a/audio/sfx/snare9_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_3_Ch8: - noise_note 0, 8, 2, 38 - sound_ret diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm deleted file mode 100644 index df952676..00000000 --- a/audio/sfx/triangle1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_1_Ch8: - noise_note 0, 5, 1, 42 - sound_ret diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm deleted file mode 100644 index a90cec67..00000000 --- a/audio/sfx/triangle1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_2_Ch8: - noise_note 0, 5, 1, 42 - sound_ret diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm deleted file mode 100644 index e897dd61..00000000 --- a/audio/sfx/triangle1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_3_Ch8: - noise_note 0, 5, 1, 42 - sound_ret diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm deleted file mode 100644 index df7e39ed..00000000 --- a/audio/sfx/triangle2_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_1_Ch8: - noise_note 1, 4, 1, 43 - noise_note 0, 6, 1, 42 - sound_ret diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm deleted file mode 100644 index 39934efa..00000000 --- a/audio/sfx/triangle2_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_2_Ch8: - noise_note 1, 4, 1, 43 - noise_note 0, 6, 1, 42 - sound_ret diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm deleted file mode 100644 index 370e13e7..00000000 --- a/audio/sfx/triangle2_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_3_Ch8: - noise_note 1, 4, 1, 43 - noise_note 0, 6, 1, 42 - sound_ret diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm deleted file mode 100644 index 18b140e2..00000000 --- a/audio/sfx/triangle3_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_1_Ch8: - noise_note 2, 9, 1, 40 - noise_note 0, 7, 1, 24 - sound_ret diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm deleted file mode 100644 index c03be804..00000000 --- a/audio/sfx/triangle3_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_2_Ch8: - noise_note 2, 9, 1, 40 - noise_note 0, 7, 1, 24 - sound_ret diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm deleted file mode 100644 index 95a047ae..00000000 --- a/audio/sfx/triangle3_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_3_Ch8: - noise_note 2, 9, 1, 40 - noise_note 0, 7, 1, 24 - sound_ret diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 5eb05b61..9cf72b26 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -95,25 +95,25 @@ ENDM music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer ; AUDIO_1 AUDIO_2 AUDIO_3 - 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_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1 + music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1 + music_const SFX_NOISE_INSTRUMENT03, SFX_Noise_Instrument03_1 + music_const SFX_NOISE_INSTRUMENT04, SFX_Noise_Instrument04_1 + music_const SFX_NOISE_INSTRUMENT05, SFX_Noise_Instrument05_1 + music_const SFX_NOISE_INSTRUMENT06, SFX_Noise_Instrument06_1 + music_const SFX_NOISE_INSTRUMENT07, SFX_Noise_Instrument07_1 + music_const SFX_NOISE_INSTRUMENT08, SFX_Noise_Instrument08_1 + music_const SFX_NOISE_INSTRUMENT09, SFX_Noise_Instrument09_1 + music_const SFX_NOISE_INSTRUMENT10, SFX_Noise_Instrument10_1 + music_const SFX_NOISE_INSTRUMENT11, SFX_Noise_Instrument11_1 + music_const SFX_NOISE_INSTRUMENT12, SFX_Noise_Instrument12_1 + music_const SFX_NOISE_INSTRUMENT13, SFX_Noise_Instrument13_1 + music_const SFX_NOISE_INSTRUMENT14, SFX_Noise_Instrument14_1 + music_const SFX_NOISE_INSTRUMENT15, SFX_Noise_Instrument15_1 + music_const SFX_NOISE_INSTRUMENT16, SFX_Noise_Instrument16_1 + music_const SFX_NOISE_INSTRUMENT17, SFX_Noise_Instrument17_1 + music_const SFX_NOISE_INSTRUMENT18, SFX_Noise_Instrument18_1 + music_const SFX_NOISE_INSTRUMENT19, SFX_Noise_Instrument19_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 @@ -194,7 +194,7 @@ ENDM music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUTE, SFX_Pokeflute + music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index ae67491f..a4cd6c3b 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -40,7 +40,7 @@ pitch_sweep: MACRO ENDC ENDM -;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch +;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency square_note: MACRO db $20 | \1 IF \3 < 0 @@ -51,7 +51,7 @@ square_note: MACRO dw \4 ENDM -;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch +;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency noise_note: MACRO db $20 | \1 IF \3 < 0 @@ -75,113 +75,23 @@ A_ EQU $9 A# EQU $A B_ EQU $B -;format: pitch length (in 16ths) +;format: pitch, length (in 16ths) note: MACRO db (\1 << 4) | (\2 - 1) ENDM -;format: instrument length (in 16ths) -snare1: MACRO - db $B0 | (\1 - 1) - db $01 -ENDM - -snare2: MACRO - db $B0 | (\1 - 1) - db $02 -ENDM - -snare3: MACRO - db $B0 | (\1 - 1) - db $03 -ENDM - -snare4: MACRO - db $B0 | (\1 - 1) - db $04 -ENDM - -snare5: MACRO - db $B0 | (\1 - 1) - db $05 -ENDM - -triangle1: MACRO - db $B0 | (\1 - 1) - db $06 -ENDM - -triangle2: MACRO - db $B0 | (\1 - 1) - db $07 -ENDM - -snare6: MACRO - db $B0 | (\1 - 1) - db $08 -ENDM - -snare7: MACRO - db $B0 | (\1 - 1) - db $09 -ENDM - -snare8: MACRO - db $B0 | (\1 - 1) - db $0A -ENDM - -snare9: MACRO - db $B0 | (\1 - 1) - db $0B -ENDM - -cymbal1: MACRO - db $B0 | (\1 - 1) - db $0C -ENDM - -cymbal2: MACRO - db $B0 | (\1 - 1) - db $0D -ENDM - -cymbal3: MACRO - db $B0 | (\1 - 1) - db $0E -ENDM - -mutedsnare1: MACRO - db $B0 | (\1 - 1) - db $0F -ENDM - -triangle3: MACRO - db $B0 | (\1 - 1) - db $10 -ENDM - -mutedsnare2: MACRO - db $B0 | (\1 - 1) - db $11 -ENDM - -mutedsnare3: MACRO - db $B0 | (\1 - 1) - db $12 -ENDM - -mutedsnare4: MACRO - db $B0 | (\1 - 1) - db $13 +;format: instrument, length (in 16ths) +dnote: MACRO + db $B0 | (\2 - 1) + db \1 ENDM -;format: rest length (in 16ths) +;format: length (in 16ths) rest: MACRO db $C0 | (\1 - 1) ENDM -; format: notetype speed, volume, fade +;format: speed, volume, fade note_type: MACRO db $D0 | \1 db (\2 << 4) | \3 @@ -242,13 +152,13 @@ duty_cycle_pattern: MACRO db \1 ENDM -;format: callchannel address +;format: address sound_call: MACRO db $FD dw \1 ENDM -;format: loopchannel count, address +;format: count, address sound_loop: MACRO db $FE db \1 -- cgit v1.2.3 From 969b43d443090da42a4d0d73129298f6b6d69d5a Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 17 Aug 2019 14:40:34 -0500 Subject: Update labels to match new audio macro names and synchronize engine_2 and engine_3 with engine_1 --- audio/engine_1.asm | 402 +++++------ audio/engine_2.asm | 1163 +++++++++++++++++--------------- audio/engine_3.asm | 1115 +++++++++++++++--------------- audio/music/yellow/meetjessiejames.asm | 1 - constants/music_constants.asm | 28 +- macros/audio_macros.asm | 8 + wram.asm | 20 +- 7 files changed, 1439 insertions(+), 1298 deletions(-) diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 8b021acf..a8389819 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -57,25 +57,25 @@ Audio1_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit BIT_ROTATE_DUTY, [hl] + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio1_ApplyDutyCycle + call Audio1_ApplyDutyCyclePattern .checkForExecuteMusic ld b, 0 ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] - jr nz, .checkForPitchBend + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc bit BIT_NOISE_OR_SFX, [hl] - jr nz, .skipPitchBendVibrato -.checkForPitchBend + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_ON, [hl] + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio1_ApplyPitchBend + jp Audio1_ApplyPitchSlide .checkVibratoDelay ld hl, wChannelVibratoDelayCounters add hl, bc @@ -83,7 +83,7 @@ Audio1_ApplyMusicAffects: and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.skipPitchBendVibrato +.skipPitchSlideVibrato ret .checkForVibrato ld hl, wChannelVibratoExtents @@ -142,7 +142,7 @@ Audio1_ApplyMusicAffects: ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio1_PlayNextNote: ; reload the vibrato delay counter @@ -155,20 +155,20 @@ Audio1_PlayNextNote: ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_ON, [hl] - res BIT_PITCH_BEND_DECREASING, [hl] - call Audio1_endchannel + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] + call Audio1_sound_ret ret -Audio1_endchannel: +Audio1_sound_ret: call Audio1_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio1_callchannel ; no + cp $ff ; is this command a sound_ret? + jp nz, Audio1_sound_call ; no ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit BIT_CHANNEL_CALL, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c cp Ch4 @@ -187,15 +187,15 @@ Audio1_endchannel: ld a, $80 ld [rNR30], a .skipSfxChannel3 - jr nz, .asm_9222 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_9222 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a jr .disableChannelOutput -.asm_9222 - jr .asm_9248 +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -215,19 +215,19 @@ Audio1_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio1_endchannel + jp Audio1_sound_ret .disableChannelOutput ld hl, Audio1_HWChannelDisableMasks add hl, bc ld a, [rNR51] and [hl] ld [rNR51], a -.asm_9248 +.afterDisable ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START - jr nc, .asm_9251 + jr nc, .maybeCry jr .skipCry -.asm_9251 +.maybeCry ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_END jr z, .skipCry @@ -236,10 +236,10 @@ Audio1_endchannel: .cry ld a, c cp Ch5 - jr z, .asm_9265 + jr z, .skipRewind call Audio1_GoBackOneCommandIfCry ret c -.asm_9265 +.skipRewind ld a, [wSavedVolume] ld [rNR50], a xor a @@ -250,9 +250,9 @@ Audio1_endchannel: ld [hl], b ret -Audio1_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio1_loopchannel ; no +Audio1_sound_call: + cp $fd ; is this command a sound_call? + jp nz, Audio1_sound_loop ; no call Audio1_GetNextMusicByte push af call Audio1_GetNextMusicByte @@ -284,12 +284,12 @@ Audio1_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set BIT_CHANNEL_CALL, [hl] ; set the call flag - jp Audio1_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio1_sound_ret -Audio1_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio1_notetype ; no +Audio1_sound_loop: + cp $fe ; is this command a sound_loop? + jp nz, Audio1_note_type ; no call Audio1_GetNextMusicByte ld e, a and a @@ -304,7 +304,7 @@ Audio1_loopchannel: ld [hl], a call Audio1_GetNextMusicByte ; skip pointer call Audio1_GetNextMusicByte - jp Audio1_endchannel + jp Audio1_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -323,12 +323,12 @@ Audio1_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_notetype: +Audio1_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio1_toggleperfectpitch ; no + cp $d0 ; is this command a note_type? + jp nz, Audio1_toggle_perfect_pitch ; no ld a, d and $f ld b, $0 @@ -367,11 +367,11 @@ Audio1_notetype: add hl, bc ld [hl], d .noiseChannel - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_toggleperfectpitch: +Audio1_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? + cp $e8 ; is this command a toggle_perfect_pitch? jr nz, Audio1_vibrato ; no ld b, 0 ld hl, wChannelFlags1 @@ -379,11 +379,11 @@ Audio1_toggleperfectpitch: ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_vibrato: cp $ea ; is this command a vibrato? - jr nz, Audio1_pitchbend ; no + jr nz, Audio1_pitch_slide ; no call Audio1_GetNextMusicByte ld b, 0 ld hl, wChannelVibratoDelayCounters @@ -427,14 +427,14 @@ Audio1_vibrato: or d ld [hl], a - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio1_duty ; no +Audio1_pitch_slide: + cp $eb ; is this command a pitch_slide? + jr nz, Audio1_duty_cycle ; no call Audio1_GetNextMusicByte ld b, 0 - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc ld [hl], a call Audio1_GetNextMusicByte @@ -446,36 +446,36 @@ Audio1_pitchbend: and $f call Audio1_CalculateFrequency ld b, 0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld [hl], e ld b, 0 ld hl, wChannelFlags1 add hl, bc - set BIT_PITCH_BEND_ON, [hl] + set BIT_PITCH_SLIDE_ON, [hl] call Audio1_GetNextMusicByte ld d, a - jp Audio1_notelength + jp Audio1_note_length -Audio1_duty: - cp $ec ; is this command a duty? +Audio1_duty_cycle: + cp $ec ; is this command a duty_cycle? jr nz, Audio1_tempo ; no call Audio1_GetNextMusicByte rrca rrca and $c0 ld b, 0 - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio1_endchannel + ld [hl], a ; store duty cycle + jp Audio1_sound_ret Audio1_tempo: cp $ed ; is this command a tempo? - jr nz, Audio1_stereopanning ; no + jr nz, Audio1_stereo_panning ; no ld a, c cp Ch5 jr nc, .sfxChannel @@ -500,19 +500,19 @@ Audio1_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_stereopanning: - cp $ee ; is this command a stereopanning? +Audio1_stereo_panning: + cp $ee ; is this command a stereo_panning? jr nz, Audio1_unknownmusic0xef ; no call Audio1_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio1_endchannel + jp Audio1_sound_ret ; this appears to never be used Audio1_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio1_dutycycle ; no + jr nz, Audio1_duty_cycle_pattern ; no call Audio1_GetNextMusicByte push bc call Audio1_PlaySound @@ -525,72 +525,72 @@ Audio1_unknownmusic0xef: xor a ld [wChannelSoundIDs + Ch8], a .skip - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_dutycycle: - cp $fc ; is this command a dutycycle? +Audio1_duty_cycle_pattern: + cp $fc ; is this command a duty_cycle_pattern? jr nz, Audio1_volume ; no call Audio1_GetNextMusicByte ld b, 0 - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties + ld [hl], a ; store full pattern + and %11000000 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set BIT_ROTATE_DUTY, [hl] - jp Audio1_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio1_sound_ret Audio1_volume: cp $f0 ; is this command a volume? - jr nz, Audio1_executemusic ; no + jr nz, Audio1_execute_music ; no call Audio1_GetNextMusicByte ld [rNR50], a ; store volume - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_executemusic: - cp $f8 ; is this command an executemusic? +Audio1_execute_music: + cp $f8 ; is this command an execute_music? jr nz, Audio1_octave ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc set BIT_EXECUTE_MUSIC, [hl] - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio1_sfxnote ; no + jr nz, Audio1_sfx_note ; no ld hl, wChannelOctaves ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio1_endchannel + jp Audio1_sound_ret -; sfxnote is either squarenote or noisenote depending on the channel -Audio1_sfxnote: - cp $20 ; is this command a sfxnote? - jr nz, Audio1_pitchenvelope +; sfx_note is either square_note or noise_note depending on the channel +Audio1_sfx_note: + cp $20 ; is this command a sfx_note? + jr nz, Audio1_pitch_sweep ld a, c cp Ch4 ; is this a noise or sfx channel? - jr c, Audio1_pitchenvelope ; no + jr c, Audio1_pitch_sweep ; no ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? - jr nz, Audio1_pitchenvelope ; yes - call Audio1_notelength + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio1_pitch_sweep ; yes + call Audio1_note_length -; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength +; This code seems to do the same thing as what Audio1_ApplyDutyCycleAndSoundLength ; does below. ld d, a ld b, 0 - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d @@ -619,18 +619,18 @@ Audio1_sfxnote: .skip ld d, a push de - call Audio1_ApplyDutyAndSoundLength + call Audio1_ApplyDutyCycleAndSoundLength call Audio1_EnableChannelOutput pop de call Audio1_ApplyWavePatternAndFrequency ret -Audio1_pitchenvelope: +Audio1_pitch_sweep: ld a, c cp Ch5 jr c, Audio1_note ; if not a sfx ld a, d - cp $10 ; is this command a pitchenvelope? + cp $10 ; is this command a pitch_sweep? jr nz, Audio1_note ; no ld b, $0 ld hl, wChannelFlags2 @@ -639,17 +639,27 @@ Audio1_pitchenvelope: jr nz, Audio1_note ; no call Audio1_GetNextMusicByte ld [rNR10], a - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_note: ld a, c cp Ch4 - jr nz, Audio1_notelength ; if not noise channel + jr nz, Audio1_note_length ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Audio1_dnote - jr nc, Audio1_notelength ; no + jr z, .dnote + jr nc, Audio1_note_length ; no + + ; this executes when on the noise channel and + ; the command id is less than $b0 + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a dnote command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -658,26 +668,26 @@ Audio1_note: ld a, b push de push bc - jr asm_94fd + jr .playDnote -Audio1_dnote: +.dnote ld a, d and $f push af push bc call Audio1_GetNextMusicByte ; get dnote instrument -asm_94fd +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_9508 + jr nz, .skipDnote ld a, d call Audio1_PlaySound -.asm_9508 +.skipDnote pop bc pop de -Audio1_notelength: +Audio1_note_length: ld a, d push af and $f @@ -727,15 +737,15 @@ Audio1_notelength: ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio1_notepitch + jr nz, Audio1_note_pitch ld hl, wChannelFlags1 add hl, bc bit BIT_NOISE_OR_SFX, [hl] - jr z, Audio1_notepitch + jr z, Audio1_note_pitch pop hl ret -Audio1_notepitch: +Audio1_note_pitch: pop af and $f0 cp $c0 ; compare to rest @@ -784,10 +794,10 @@ Audio1_notepitch: ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_ON, [hl] - jr z, .skipPitchBend - call Audio1_InitPitchBendVars -.skipPitchBend + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio1_InitPitchSlideVars +.skipPitchSlide push de ld a, c cp Ch5 @@ -812,13 +822,13 @@ Audio1_notepitch: ld b, REG_VOLUME_ENVELOPE call Audio1_GetRegisterPointer ld [hl], d - call Audio1_ApplyDutyAndSoundLength + call Audio1_ApplyDutyCycleAndSoundLength call Audio1_EnableChannelOutput pop de ld b, $0 ld hl, wChannelFlags1 add hl, bc - bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used? + bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? jr z, .skipFrequencyInc inc e ; if yes, increment the frequency by 1 jr nc, .skipFrequencyInc @@ -867,7 +877,7 @@ Audio1_EnableChannelOutput: ld [rNR51], a ret -Audio1_ApplyDutyAndSoundLength: +Audio1_ApplyDutyCycleAndSoundLength: ld b, 0 ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc @@ -877,11 +887,11 @@ Audio1_ApplyDutyAndSoundLength: jr z, .skipDuty ; if music channel 3 cp Ch7 jr z, .skipDuty ; if sfx channel 3 -; include duty (except on channel 3 which doesn't have it) +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d @@ -1022,29 +1032,29 @@ Audio1_IsCry: scf ret -Audio1_ApplyPitchBend: +Audio1_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_DECREASING, [hl] + bit BIT_PITCH_SLIDE_DECREASING, [hl] jp nz, .frequencyDecreasing ; frequency increasing - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1056,26 +1066,26 @@ Audio1_ApplyPitchBend: ld a, 0 adc d ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .reachedTargetFrequency jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .reachedTargetFrequency jr .applyUpdatedFrequency .frequencyDecreasing - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1083,7 +1093,7 @@ Audio1_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1094,22 +1104,22 @@ Audio1_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .reachedTargetFrequency jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .reachedTargetFrequency .applyUpdatedFrequency - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, REG_FREQUENCY_LO @@ -1119,38 +1129,38 @@ Audio1_ApplyPitchBend: ld [hl], d ret .reachedTargetFrequency -; Turn off pitch bend when the target frequency has been reached. +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_ON, [hl] - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio1_InitPitchBendVars: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio1_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] jr nc, .next ld a, 1 .next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .targetFrequencyGreater @@ -1158,18 +1168,18 @@ Audio1_InitPitchBendVars: ld b, 0 ld hl, wChannelFlags1 add hl, bc - set BIT_PITCH_BEND_DECREASING, [hl] + set BIT_PITCH_SLIDE_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 + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1184,7 +1194,7 @@ Audio1_InitPitchBendVars: sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d @@ -1192,10 +1202,10 @@ Audio1_InitPitchBendVars: ld b, 0 ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] .next2 - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc .divideLoop inc b @@ -1214,20 +1224,20 @@ Audio1_InitPitchBendVars: add [hl] ld d, b ; d = quotient + 1 ld b, 0 - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld [hl], d ; store quotient + 1 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld [hl], a ; store remainder - dividend - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc ld [hl], a ; store remainder - dividend ret -Audio1_ApplyDutyCycle: +Audio1_ApplyDutyCyclePattern: ld b, 0 - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1322,7 +1332,7 @@ Audio1_PlaySound:: ld [wSoundID], a cp $ff jp z, .stopAllAudio - cp MAX_SFX_ID + cp MAX_SFX_ID_1 jp z, .playSfx jp c, .playSfx cp $fe @@ -1346,10 +1356,10 @@ Audio1_PlaySound:: call .FillMem ld hl, wChannelFlags1 call .FillMem - ld hl, wChannelDuties - call .FillMem ld hl, wChannelDutyCycles call .FillMem + ld hl, wChannelDutyCyclePatterns + call .FillMem ld hl, wChannelVibratoDelayCounters call .FillMem ld hl, wChannelVibratoExtents @@ -1362,21 +1372,21 @@ Audio1_PlaySound:: call .FillMem ld hl, wChannelFlags2 call .FillMem - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers call .FillMem - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps call .FillMem - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart call .FillMem - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart call .FillMem - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes call .FillMem - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes call .FillMem - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes call .FillMem - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes call .FillMem ld a, $1 ld hl, wChannelLoopCounters @@ -1441,26 +1451,26 @@ Audio1_PlaySound:: add hl, de ld a, [hl] and a - jr z, .asm_99a3 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_999a + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_9993 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_9993 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_99a3 - jr c, .asm_99a3 -.asm_999a + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_99a3 - jr c, .asm_99a3 + jr z, .playChannel + jr c, .playChannel ret -.asm_99a3 +.playChannel xor a push de ld h, d @@ -1483,10 +1493,10 @@ Audio1_PlaySound:: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -1504,28 +1514,28 @@ Audio1_PlaySound:: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -1543,10 +1553,10 @@ Audio1_PlaySound:: ld [hl], a ld a, e cp Ch5 - jr nz, .asm_9a2b + jr nz, .skipSweepDisable ld a, $8 ld [rNR10], a ; sweep off -.asm_9a2b +.skipSweepDisable ld a, c and a jp z, .playSoundCommon @@ -1667,9 +1677,9 @@ Audio1_PlaySound:: jr nz, .commandPointerLoop ld a, [wSoundID] cp CRY_SFX_START - jr nc, .asm_9aeb + jr nc, .maybeCry jr .done -.asm_9aeb +.maybeCry ld a, [wSoundID] cp CRY_SFX_END jr z, .done @@ -1682,10 +1692,10 @@ Audio1_PlaySound:: ld [hli], a ld [hl], a ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer - ld de, Audio1_CryEndchannel + ld de, Audio1_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a jr nz, .done @@ -1696,7 +1706,7 @@ Audio1_PlaySound:: .done ret -Audio1_CryEndchannel: +Audio1_CryRet: sound_ret Audio1_HWChannelBaseAddresses: @@ -1725,5 +1735,3 @@ Audio1_Pitches: dw $FB58 ; A_ dw $FB9B ; A# dw $FBDA ; B_ - - diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 4f7f6277..df719c67 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,9 +1,11 @@ ; The second of three duplicated sound engines. +; This copy has a few differences relating to battle sound effects +; and the low health alarm that plays in battle Audio2_UpdateMusic:: ld c, Ch1 .loop - ld b, $0 + ld b, 0 ld hl, wChannelSoundIDs add hl, bc ld a, [hl] @@ -19,7 +21,7 @@ Audio2_UpdateMusic:: jr nz, .nextChannel set 7, a ld [wMuteAudioAndPauseMusic], a - xor a + xor a ; disable all channels' output ld [rNR51], a ld [rNR30], a ld a, $80 @@ -29,19 +31,13 @@ Audio2_UpdateMusic:: call Audio2_ApplyMusicAffects .nextChannel ld a, c - inc c + inc c ; inc channel number cp Ch8 jr nz, .loop ret ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wChannelFlags1: -; 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 Audio2_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note @@ -63,36 +59,36 @@ Audio2_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit 6, [hl] ; dutycycle + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio2_ApplyDutyCycle + call Audio2_ApplyDutyCyclePattern .checkForExecuteMusic - ld b, $0 + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, .checkForPitchBend + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato -.checkForPitchBend + bit BIT_NOISE_OR_SFX, [hl] + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] ; pitchbend + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio2_ApplyPitchBend + jp Audio2_ApplyPitchSlide .checkVibratoDelay - ld hl, wChannelVibratoDelayCounters ; 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 +.skipPitchSlideVibrato ret .checkForVibrato - ld hl, wChannelVibratoExtents ; vibrato rate + ld hl, wChannelVibratoExtents add hl, bc ld a, [hl] and a @@ -105,33 +101,35 @@ Audio2_ApplyMusicAffects: 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], a ; reload the counter ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch 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,70 +138,75 @@ Audio2_ApplyMusicAffects: ld a, $ff .done ld d, a - ld b, $3 - call Audio2_21ff7 + ld b, REG_FREQUENCY_LO + call Audio2_GetRegisterPointer ld [hl], d ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio2_PlayNextNote: +; reload the vibrato delay counter ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] + ; --- this section is only present in this copy of the sound engine ld a, c cp Ch5 jr nz, .beginChecks - ld a, [wLowHealthAlarm] ;low health alarm enabled? + ld a, [wLowHealthAlarm] ; low health alarm enabled? bit 7, a ret nz .beginChecks - call Audio2_endchannel + ; --- + call Audio2_sound_ret ret -Audio2_endchannel: +Audio2_sound_ret: call Audio2_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio2_callchannel ; no - ld b, $0 ; yes + cp $ff ; is this command a sound_ret? + jp nz, Audio2_sound_call ; no + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 1, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c cp Ch4 jr nc, .noiseOrSfxChannel - jr .asm_219c0 + jr .disableChannelOutput .noiseOrSfxChannel - res 2, [hl] + res BIT_NOISE_OR_SFX, [hl] ld hl, wChannelFlags2 add hl, bc - res 0, [hl] + res BIT_EXECUTE_MUSIC, [hl] cp Ch7 - jr nz, .notSfxChannel3 + jr nz, .skipSfxChannel3 +; restart hardware channel 3 (wave channel) output ld a, $0 ld [rNR30], a ld a, $80 ld [rNR30], a -.notSfxChannel3 - jr nz, .asm_219a3 +.skipSfxChannel3 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_219a3 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a - jr .asm_219c0 -.asm_219a3 - jr .asm_219c9 + jr .disableChannelOutput +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -223,45 +226,45 @@ Audio2_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio2_endchannel -.asm_219c0 - ld hl, Unknown_222de + jp Audio2_sound_ret +.disableChannelOutput + ld hl, Audio2_HWChannelDisableMasks add hl, bc ld a, [rNR51] and [hl] ld [rNR51], a -.asm_219c9 +.afterDisable ld a, [wChannelSoundIDs + Ch5] - cp $14 - jr nc, .asm_219d2 - jr .asm_219ef -.asm_219d2 + cp CRY_SFX_START + jr nc, .maybeCry + jr .skipCry +.maybeCry ld a, [wChannelSoundIDs + Ch5] - cp $86 - jr z, .asm_219ef - jr c, .asm_219dd - jr .asm_219ef -.asm_219dd + cp CRY_SFX_END + jr z, .skipCry + jr c, .cry + jr .skipCry +.cry ld a, c cp Ch5 - jr z, .asm_219e6 - call Audio2_21e6d + jr z, .skipRewind + call Audio2_GoBackOneCommandIfCry ret c -.asm_219e6 +.skipRewind ld a, [wSavedVolume] ld [rNR50], a xor a ld [wSavedVolume], a -.asm_219ef +.skipCry ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret -Audio2_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio2_loopchannel ; no - call Audio2_GetNextMusicByte ; yes +Audio2_sound_call: + cp $fd ; is this command a sound_call? + jp nz, Audio2_sound_loop ; no + call Audio2_GetNextMusicByte push af call Audio2_GetNextMusicByte ld d, a @@ -292,17 +295,17 @@ Audio2_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set 1, [hl] ; set the call flag - jp Audio2_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio2_sound_ret -Audio2_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio2_notetype ; no - call Audio2_GetNextMusicByte ; yes +Audio2_sound_loop: + cp $fe ; is this command a sound_loop? + jp nz, Audio2_note_type ; no + call Audio2_GetNextMusicByte ld e, a and a jr z, .infiniteLoop - ld b, $0 + ld b, 0 ld hl, wChannelLoopCounters add hl, bc ld a, [hl] @@ -312,7 +315,7 @@ Audio2_loopchannel: ld [hl], a call Audio2_GetNextMusicByte ; skip pointer call Audio2_GetNextMusicByte - jp Audio2_endchannel + jp Audio2_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -331,13 +334,13 @@ Audio2_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_notetype: +Audio2_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio2_toggleperfectpitch ; no - ld a, d ; yes + cp $d0 ; is this command a note_type? + jp nz, Audio2_toggle_perfect_pitch ; no + ld a, d and $f ld b, $0 ld hl, wChannelNoteSpeeds @@ -352,15 +355,15 @@ Audio2_notetype: cp Ch3 jr z, .musicChannel3 cp Ch7 - jr nz, .notChannel3 + jr nz, .skipChannel3 ld hl, wSfxWaveInstrument - jr .sfxChannel3 + jr .channel3 .musicChannel3 ld hl, wMusicWaveInstrument -.sfxChannel3 +.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 @@ -369,31 +372,31 @@ Audio2_notetype: ; if channel 3, store high nibble as volume ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 +.skipChannel3 + ld b, 0 ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_toggleperfectpitch: +Audio2_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? + cp $e8 ; is this command a toggle_perfect_pitch? jr nz, Audio2_vibrato ; no - ld b, $0 ; yes + ld b, 0 ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio2_endchannel + jp Audio2_sound_ret Audio2_vibrato: cp $ea ; is this command a vibrato? - jr nz, Audio2_pitchbend ; no - call Audio2_GetNextMusicByte ; yes - ld b, $0 + jr nz, Audio2_pitch_slide ; no + call Audio2_GetNextMusicByte + ld b, 0 ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay @@ -402,9 +405,16 @@ Audio2_vibrato: ld [hl], a ; store delay call Audio2_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 b, 0 ld hl, wChannelVibratoExtents add hl, bc srl a @@ -412,7 +422,13 @@ Audio2_vibrato: 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 @@ -420,17 +436,18 @@ Audio2_vibrato: add hl, bc swap a or d - ld [hl], a ; store depth as both high and low nibbles - jp Audio2_endchannel + ld [hl], a -Audio2_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio2_duty ; no - call Audio2_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelPitchBendLengthModifiers + jp Audio2_sound_ret + +Audio2_pitch_slide: + cp $eb ; is this command a pitch_slide? + jr nz, Audio2_duty_cycle ; no + call Audio2_GetNextMusicByte + ld b, 0 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc - ld [hl], a ; store first param + ld [hl], a call Audio2_GetNextMusicByte ld d, a and $f0 @@ -438,39 +455,39 @@ Audio2_pitchbend: ld b, a ld a, d and $f - call Audio2_22017 - ld b, $0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + call Audio2_CalculateFrequency + ld b, 0 + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld [hl], d + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 + ld [hl], e + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 4, [hl] ; set pitchbend flag + set BIT_PITCH_SLIDE_ON, [hl] call Audio2_GetNextMusicByte ld d, a - jp Audio2_notelength + jp Audio2_note_length -Audio2_duty: - cp $ec ; is this command a duty? +Audio2_duty_cycle: + cp $ec ; is this command a duty_cycle? jr nz, Audio2_tempo ; no - call Audio2_GetNextMusicByte ; yes + call Audio2_GetNextMusicByte rrca rrca and $c0 - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio2_endchannel + ld [hl], a ; store duty cycle + jp Audio2_sound_ret Audio2_tempo: cp $ed ; is this command a tempo? - jr nz, Audio2_stereopanning ; no - ld a, c ; yes + jr nz, Audio2_stereo_panning ; no + ld a, c cp Ch5 jr nc, .sfxChannel call Audio2_GetNextMusicByte @@ -494,20 +511,20 @@ Audio2_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_stereopanning: - cp $ee ; is this command a stereopanning? +Audio2_stereo_panning: + cp $ee ; is this command a stereo_panning? jr nz, Audio2_unknownmusic0xef ; no - call Audio2_GetNextMusicByte ; yes + call Audio2_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio2_endchannel + jp Audio2_sound_ret ; this appears to never be used Audio2_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio2_dutycycle ; no - call Audio2_GetNextMusicByte ; yes + jr nz, Audio2_duty_cycle_pattern ; no + call Audio2_GetNextMusicByte push bc call Audio2_PlaySound pop bc @@ -519,124 +536,141 @@ Audio2_unknownmusic0xef: xor a ld [wChannelSoundIDs + Ch8], a .skip - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_dutycycle: - cp $fc ; is this command a dutycycle? +Audio2_duty_cycle_pattern: + cp $fc ; is this command a duty_cycle_pattern? jr nz, Audio2_volume ; no - call Audio2_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelDutyCycles + call Audio2_GetNextMusicByte + ld b, 0 + ld hl, wChannelDutyCyclePatterns add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties + ld [hl], a ; store full pattern + and %11000000 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set 6, [hl] ; set dutycycle flag - jp Audio2_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio2_sound_ret Audio2_volume: cp $f0 ; is this command a volume? - jr nz, Audio2_executemusic ; no - call Audio2_GetNextMusicByte ; yes + jr nz, Audio2_execute_music ; no + call Audio2_GetNextMusicByte ld [rNR50], a ; store volume - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_executemusic: - cp $f8 ; is this command an executemusic? +Audio2_execute_music: + cp $f8 ; is this command an execute_music? jr nz, Audio2_octave ; no - ld b, $0 ; yes + ld b, $0 ld hl, wChannelFlags2 add hl, bc - set 0, [hl] - jp Audio2_endchannel + set BIT_EXECUTE_MUSIC, [hl] + jp Audio2_sound_ret Audio2_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio2_sfxnote ; no - ld hl, wChannelOctaves ; yes - ld b, $0 + jr nz, Audio2_sfx_note ; no + ld hl, wChannelOctaves + ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio2_endchannel + jp Audio2_sound_ret -; sfxnote is either squarenote or noisenote depending on the channel -Audio2_sfxnote: - cp $20 ; is this command an sfxnote? - jr nz, Audio2_pitchenvelope ; no +; sfx_note is either square_note or noise_note depending on the channel +Audio2_sfx_note: + cp $20 ; is this command a sfx_note? + jr nz, Audio2_pitch_sweep ld a, c cp Ch4 ; is this a noise or sfx channel? - jr c, Audio2_pitchenvelope ; no - ld b, $0 + jr c, Audio2_pitch_sweep ; no + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio2_pitchenvelope ; no - call Audio2_notelength + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio2_pitch_sweep ; yes + call Audio2_note_length + +; This code seems to do the same thing as what Audio2_ApplyDutyCycleAndSoundLength +; does below. ld d, a - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a - ld b, $1 - call Audio2_21ff7 + ld b, REG_DUTY_SOUND_LEN + call Audio2_GetRegisterPointer ld [hl], d + call Audio2_GetNextMusicByte ld d, a - ld b, $2 - call Audio2_21ff7 + ld b, REG_VOLUME_ENVELOPE + call Audio2_GetRegisterPointer ld [hl], d call Audio2_GetNextMusicByte ld e, a ld a, c cp Ch8 - 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 Audio2_GetNextMusicByte pop de -.sfxNoiseChannel +.skip ld d, a push de - call Audio2_21daa - call Audio2_21d79 + call Audio2_ApplyDutyCycleAndSoundLength + call Audio2_EnableChannelOutput pop de - call Audio2_21dcc + call Audio2_ApplyWavePatternAndFrequency ret -Audio2_pitchenvelope: +Audio2_pitch_sweep: ld a, c cp Ch5 jr c, Audio2_note ; if not a sfx ld a, d - cp $10 ; is this command a pitchenvelope? + cp $10 ; is this command a pitch_sweep? jr nz, Audio2_note ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio2_note ; no - call Audio2_GetNextMusicByte ; yes + call Audio2_GetNextMusicByte ld [rNR10], a - jp Audio2_endchannel + jp Audio2_sound_ret Audio2_note: ld a, c cp Ch4 - jr nz, Audio2_notelength ; if not noise channel + jr nz, Audio2_note_length ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Audio2_dnote ; yes - jr nc, Audio2_notelength ; no + jr z, .dnote + jr nc, Audio2_note_length ; no + + ; this executes when on the noise channel and + ; the command id is less than $b0 + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a dnote command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -645,38 +679,38 @@ Audio2_note: ld a, b push de push bc - jr asm_21c7e + jr .playDnote -Audio2_dnote: +.dnote ld a, d and $f push af push bc call Audio2_GetNextMusicByte ; get dnote instrument -asm_21c7e +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_21c89 + jr nz, .skipDnote ld a, d call Audio2_PlaySound -.asm_21c89 +.skipDnote pop bc pop de -Audio2_notelength: +Audio2_note_length: ld a, d push af and $f inc a - ld b, $0 - ld e, a ; store note length (in 16ths) + ld b, 0 + ld e, a ; store note length (in 16ths) ld d, b ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b - call Audio2_22006 + call Audio2_MultiplyAdd ld a, c cp Ch5 jr nc, .sfxChannel @@ -690,20 +724,20 @@ Audio2_notelength: ld e, $0 cp Ch8 jr z, .skip ; if noise channel - call Audio2_21e2f + call Audio2_SetSfxTempo ld a, [wSfxTempo] ld d, a ld a, [wSfxTempo + 1] ld e, a .skip - ld a, l - ld b, $0 + ld a, l ; a = note_length * note_speed + ld b, 0 ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] - call Audio2_22006 + call Audio2_MultiplyAdd ld e, l - ld d, h + ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e @@ -713,192 +747,198 @@ Audio2_notelength: ld [hl], a ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio2_notepitch + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, Audio2_note_pitch ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr z, Audio2_notepitch + bit BIT_NOISE_OR_SFX, [hl] + jr z, Audio2_note_pitch pop hl ret -Audio2_notepitch: +Audio2_note_pitch: pop af and $f0 cp $c0 ; compare to rest jr nz, .notRest ld a, c cp Ch5 - jr nc, .sfxChannel + jr nc, .next +; If this isn't an SFX channel, try the corresponding SFX channel. ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a jr nz, .done ; fall through -.sfxChannel +.next ld a, c cp Ch3 - jr z, .musicChannel3 + jr z, .channel3 cp Ch7 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_222de + jr nz, .notChannel3 +.channel3 + ld b, 0 + ld hl, Audio2_HWChannelDisableMasks add hl, bc ld a, [rNR51] and [hl] - ld [rNR51], a + ld [rNR51], a ; disable hardware channel 3's output jr .done -.notSfxChannel3 - ld b, $2 - call Audio2_21ff7 - ld a, $8 +.notChannel3 + ld b, REG_VOLUME_ENVELOPE + call Audio2_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 b, 0 ld hl, wChannelOctaves add hl, bc ld b, [hl] - call Audio2_22017 - ld b, $0 + call Audio2_CalculateFrequency + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] - jr z, .asm_21d39 - call Audio2_21f4e -.asm_21d39 + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio2_InitPitchSlideVars +.skipPitchSlide push de ld a, c cp Ch5 - jr nc, .skip ; if sfx channel + jr nc, .sfxChannel ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. ld hl, wChannelSoundIDs + Ch5 - ld d, $0 + ld d, 0 ld e, a add hl, de ld a, [hl] and a - jr nz, .asm_21d4c - jr .skip -.asm_21d4c + jr nz, .noSfx + jr .sfxChannel +.noSfx pop de ret -.skip - ld b, $0 +.sfxChannel + ld b, 0 ld hl, wChannelVolumes add hl, bc ld d, [hl] - ld b, $2 - call Audio2_21ff7 + ld b, REG_VOLUME_ENVELOPE + call Audio2_GetRegisterPointer ld [hl], d - call Audio2_21daa - call Audio2_21d79 + call Audio2_ApplyDutyCycleAndSoundLength + call Audio2_EnableChannelOutput pop de ld b, $0 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 toggle_perfect_pitch been used? + jr z, .skipFrequencyInc + inc e ; if yes, increment the frequency by 1 + jr nc, .skipFrequencyInc inc d -.skip2 +.skipFrequencyInc ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e - call Audio2_21dcc + call Audio2_ApplyWavePatternAndFrequency ret -Audio2_21d79: - ld b, $0 - ld hl, Unknown_222e6 +Audio2_EnableChannelOutput: + ld b, 0 + ld hl, Audio2_HWChannelEnableMasks add hl, bc ld a, [rNR51] - or [hl] + or [hl] ; set this channel's bits ld d, a ld a, c cp Ch8 - jr z, .sfxNoiseChannel + jr z, .noiseChannelOrNoSfx cp Ch5 jr nc, .skip ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a jr nz, .skip -.sfxNoiseChannel +.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, Unknown_222e6 + ld hl, Audio2_HWChannelEnableMasks add hl, bc and [hl] ld d, a ld a, [rNR51] - ld hl, Unknown_222de + ld hl, Audio2_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 [rNR51], a ret -Audio2_21daa: - ld b, $0 - ld hl, wChannelNoteDelayCounters +Audio2_ApplyDutyCycleAndSoundLength: + ld b, 0 + ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c cp Ch3 - jr z, .channel3 ; if music channel 3 + jr z, .skipDuty ; if music channel 3 cp Ch7 - jr z, .channel3 ; if sfx channel 3 + jr z, .skipDuty ; if sfx channel 3 +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a -.channel3 - ld b, $1 - call Audio2_21ff7 +.skipDuty + ld b, REG_DUTY_SOUND_LEN + call Audio2_GetRegisterPointer ld [hl], d ret -Audio2_21dcc: +Audio2_ApplyWavePatternAndFrequency: ld a, c cp Ch3 jr z, .channel3 cp Ch7 - jr nz, .notSfxChannel3 + jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument cp Ch3 - jr z, .musicChannel3 + jr z, .next ld de, wSfxWaveInstrument -.musicChannel3 +.next ld a, [de] add a - ld d, $0 + ld d, 0 ld e, a ld hl, Audio2_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 a, $0 ; stop hardware channel 3 ld [rNR30], a .loop ld a, [de] @@ -908,196 +948,207 @@ Audio2_21dcc: dec b and a jr nz, .loop - ld a, $80 + 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 Audio2_21ff7 - ld [hl], e + ld b, REG_FREQUENCY_LO + call Audio2_GetRegisterPointer + ld [hl], e ; store frequency low byte inc hl - ld [hl], d + ld [hl], d ; store frequency high byte + ; --- this section is only present in this copy of the sound engine ld a, c cp Ch5 jr c, .musicChannel - call Audio2_21e56 + call Audio2_ApplyFrequencyModifier .musicChannel + ; --- ret -Audio2_21e19: +; --- this section is only present in this copy of the sound engine +; unused +Audio2_ResetCryModifiers: ld a, c cp Ch5 - jr nz, .asm_21e2e + jr nz, .skip ld a, [wLowHealthAlarm] bit 7, a - jr z, .asm_21e2e + jr z, .skip xor a ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a -.asm_21e2e +.skip ret +; --- -Audio2_21e2f: - call Audio2_21e8b - jr c, .asm_21e39 - call Audio2_21e9f - jr nc, .asm_21e4c -.asm_21e39 - ld d, $0 +Audio2_SetSfxTempo: + call Audio2_IsCry + jr c, .skipCryCheck + call Audio2_IsBattleSFX + jr nc, .notCry +.skipCryCheck + ld d, 0 ld a, [wTempoModifier] add $80 - jr nc, .asm_21e43 + jr nc, .next inc d -.asm_21e43 +.next ld [wSfxTempo + 1], a ld a, d ld [wSfxTempo], a - jr .asm_21e55 -.asm_21e4c + jr .done +.notCry xor a ld [wSfxTempo + 1], a ld a, $1 ld [wSfxTempo], a -.asm_21e55 +.done ret -Audio2_21e56: - call Audio2_21e8b - jr c, .asm_21e60 - call Audio2_21e9f - jr nc, .asm_21e6c -.asm_21e60 +Audio2_ApplyFrequencyModifier: + call Audio2_IsCry + jr c, .skipCryCheck + call Audio2_IsBattleSFX + jr nc, .done +.skipCryCheck +; if playing a cry, add the cry's frequency modifier ld a, [wFrequencyModifier] add e - jr nc, .asm_21e67 + jr nc, .noCarry inc d -.asm_21e67 +.noCarry dec hl ld e, a ld [hl], e inc hl ld [hl], d -.asm_21e6c +.done ret -Audio2_21e6d: - call Audio2_21e8b - jr nc, .asm_21e88 +Audio2_GoBackOneCommandIfCry: + call Audio2_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_21e88 +.done scf ccf ret -Audio2_21e8b: +Audio2_IsCry: +; Returns whether the currently playing audio is a cry in carry. ld a, [wChannelSoundIDs + Ch5] - cp $14 - jr nc, .asm_21e94 - jr .asm_21e9a -.asm_21e94 - cp $86 - jr z, .asm_21e9a - jr c, .asm_21e9d -.asm_21e9a + 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_21e9d +.yes scf ret -Audio2_21e9f: +; --- this section is only present in this copy of the sound engine +Audio2_IsBattleSFX: +; Returns whether the currently playing audio is a cry in carry. ld a, [wChannelSoundIDs + Ch8] ld b, a ld a, [wChannelSoundIDs + Ch5] or b - cp $9d - jr nc, .asm_21ead - jr .asm_21eb3 -.asm_21ead - cp $ea - jr z, .asm_21eb3 - jr c, .asm_21eb6 -.asm_21eb3 + cp BATTLE_SFX_START + jr nc, .next + jr .no +.next + cp BATTLE_SFX_END + jr z, .no + jr c, .yes +.no scf ccf ret -.asm_21eb6 +.yes scf ret +; --- -Audio2_ApplyPitchBend: +Audio2_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit 5, [hl] - jp nz, .asm_21eff - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + bit BIT_PITCH_SLIDE_DECREASING, [hl] + jp nz, .frequencyDecreasing +; frequency increasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart 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, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d - jp c, .asm_21f45 - jr nz, .asm_21f32 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jp c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e - jp c, .asm_21f45 - jr .asm_21f32 -.asm_21eff - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jp c, .reachedTargetFrequency + jr .applyUpdatedFrequency +.frequencyDecreasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1105,7 +1156,7 @@ Audio2_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1116,129 +1167,140 @@ Audio2_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] - jr c, .asm_21f45 - jr nz, .asm_21f32 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jr c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] - jr c, .asm_21f45 -.asm_21f32 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jr c, .reachedTargetFrequency +.applyUpdatedFrequency + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld b, $3 - call Audio2_21ff7 + ld b, REG_FREQUENCY_LO + call Audio2_GetRegisterPointer ld a, e ld [hli], a ld [hl], d ret -.asm_21f45 +.reachedTargetFrequency +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio2_21f4e: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio2_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] - jr nc, .asm_21f66 - ld a, $1 -.asm_21f66 + jr nc, .next + ld a, 1 +.next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] - jr c, .asm_21f82 + jr c, .targetFrequencyGreater ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 5, [hl] - jr .asm_21fa5 -.asm_21f82 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + set BIT_PITCH_SLIDE_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, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes 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, wChannelPitchBendTargetFrequencyHighBytes + + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - res 5, [hl] -.asm_21fa5 - ld hl, wChannelPitchBendLengthModifiers + res BIT_PITCH_SLIDE_DECREASING, [hl] + +.next2 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc -.asm_21fa9 +.divideLoop inc b ld a, e sub [hl] ld e, a - jr nc, .asm_21fa9 + jr nc, .divideLoop ld a, d and a - jr z, .asm_21fb7 + jr z, .doneDividing dec a ld d, a - jr .asm_21fa9 -.asm_21fb7 - ld a, e + jr .divideLoop +.doneDividing + ld a, e ; a = remainder - dividend add [hl] - ld d, b - ld b, $0 - ld hl, wChannelPitchBendFrequencySteps + ld d, b ; d = quotient + 1 + ld b, 0 + ld hl, wChannelPitchSlideFrequencySteps add hl, bc - ld [hl], d - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld [hl], d ; store quotient + 1 + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld [hl], a ; store remainder - dividend + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc - ld [hl], a + ld [hl], a ; store remainder - dividend ret -Audio2_ApplyDutyCycle: - ld b, $0 - ld hl, wChannelDutyCycles +Audio2_ApplyDutyCyclePattern: + ld b, 0 + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1246,8 +1308,8 @@ Audio2_ApplyDutyCycle: ld [hl], a and $c0 ld d, a - ld b, $1 - call Audio2_21ff7 + ld b, REG_DUTY_SOUND_LEN + call Audio2_GetRegisterPointer ld a, [hl] and $3f or d @@ -1255,7 +1317,7 @@ Audio2_ApplyDutyCycle: ret Audio2_GetNextMusicByte: - ld d, $0 + ld d, 0 ld a, c add a ld e, a @@ -1272,9 +1334,10 @@ Audio2_GetNextMusicByte: ld [hl], d ret -Audio2_21ff7: +Audio2_GetRegisterPointer: +; hl = address of hardware sound register b for software channel c ld a, c - ld hl, Unknown_222d6 + ld hl, Audio2_HWChannelBaseAddresses add l jr nc, .noCarry inc h @@ -1286,13 +1349,14 @@ Audio2_21ff7: ld h, $ff ret -Audio2_22006: - ld h, $0 +Audio2_MultiplyAdd: +; 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 @@ -1301,8 +1365,9 @@ Audio2_22006: .done ret -Audio2_22017: - ld h, $0 +Audio2_CalculateFrequency: +; return the frequency for note a, octave b in de + ld h, 0 ld l, a add hl, hl ld d, h @@ -1314,14 +1379,14 @@ Audio2_22017: ld d, [hl] ld a, b .loop - cp Ch8 + 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 @@ -1329,14 +1394,15 @@ Audio2_22017: Audio2_PlaySound:: ld [wSoundID], a cp $ff - jp z, Audio2_221f3 - cp $e9 - jp z, Audio2_2210d - jp c, Audio2_2210d + jp z, .stopAllAudio + cp MAX_SFX_ID_2 + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_2204c - jp nc, Audio2_2210d -.asm_2204c + jr z, .playMusic + jp nc, .playSfx + +.playMusic xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1345,53 +1411,53 @@ Audio2_PlaySound:: ld [wSfxWaveInstrument], a ld d, $8 ld hl, wChannelReturnAddresses - call FillAudioRAM2 + call .FillMem ld hl, wChannelCommandPointers - call FillAudioRAM2 + call .FillMem ld d, $4 ld hl, wChannelSoundIDs - call FillAudioRAM2 + call .FillMem ld hl, wChannelFlags1 - call FillAudioRAM2 - ld hl, wChannelDuties - call FillAudioRAM2 + call .FillMem ld hl, wChannelDutyCycles - call FillAudioRAM2 + call .FillMem + ld hl, wChannelDutyCyclePatterns + call .FillMem ld hl, wChannelVibratoDelayCounters - call FillAudioRAM2 + call .FillMem ld hl, wChannelVibratoExtents - call FillAudioRAM2 + call .FillMem ld hl, wChannelVibratoRates - call FillAudioRAM2 + call .FillMem ld hl, wChannelFrequencyLowBytes - call FillAudioRAM2 + call .FillMem ld hl, wChannelVibratoDelayCounterReloadValues - call FillAudioRAM2 + call .FillMem ld hl, wChannelFlags2 - call FillAudioRAM2 - ld hl, wChannelPitchBendLengthModifiers - call FillAudioRAM2 - ld hl, wChannelPitchBendFrequencySteps - call FillAudioRAM2 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - call FillAudioRAM2 + call .FillMem + ld hl, wChannelPitchSlideLengthModifiers + call .FillMem + ld hl, wChannelPitchSlideFrequencySteps + call .FillMem + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyLowBytes + call .FillMem ld a, $1 ld hl, wChannelLoopCounters - call FillAudioRAM2 + call .FillMem ld hl, wChannelNoteDelayCounters - call FillAudioRAM2 + call .FillMem ld hl, wChannelNoteSpeeds - call FillAudioRAM2 + call .FillMem ld [wMusicTempo], a ld a, $ff ld [wStereoPanning], a @@ -1399,7 +1465,7 @@ Audio2_PlaySound:: ld [rNR50], a ld a, $8 ld [rNR10], a - ld a, $0 + ld a, 0 ld [rNR51], a xor a ld [rNR30], a @@ -1407,12 +1473,12 @@ Audio2_PlaySound:: ld [rNR30], a ld a, $77 ld [rNR50], a - jp Audio2_2224e + jp .playSoundCommon -Audio2_2210d: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1427,13 +1493,13 @@ Audio2_2210d: rlca rlca ld c, a -.asm_22126 +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 + ld b, 0 ld a, [wSfxHeaderPointer] ld h, a ld a, [wSfxHeaderPointer + 1] @@ -1442,32 +1508,32 @@ Audio2_2210d: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_22162 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_22159 + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_22152 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_22152 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_22162 - jr c, .asm_22162 -.asm_22159 + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_22162 - jr c, .asm_22162 + jr z, .playChannel + jr c, .playChannel ret -.asm_22162 +.playChannel xor a push de ld h, d @@ -1490,10 +1556,10 @@ Audio2_2210d: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -1511,28 +1577,28 @@ Audio2_2210d: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -1549,35 +1615,35 @@ Audio2_2210d: add hl, de ld [hl], a ld a, e - cp $4 - jr nz, .asm_221ea + cp Ch5 + jr nz, .skipSweepDisable ld a, $8 - ld [rNR10], a -.asm_221ea + ld [rNR10], a ; sweep off +.skipSweepDisable ld a, c and a - jp z, Audio2_2224e + jp z, .playSoundCommon dec c - jp .asm_22126 + jp .sfxChannelLoop -Audio2_221f3: +.stopAllAudio ld a, $80 - ld [rNR52], a - ld [rNR30], a + ld [rNR52], a ; sound hardware on + ld [rNR30], a ; wave playback on xor a - ld [rNR51], a - ld [rNR32], a + ld [rNR51], a ; no sound output + ld [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [rNR10], a - ld [rNR12], a - ld [rNR22], a - ld [rNR42], 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 [rNR14], a + ld [rNR14], a ; counter mode ld [rNR24], a ld [rNR44], a ld a, $77 - ld [rNR50], a + ld [rNR50], a ; full volume xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1588,11 +1654,11 @@ Audio2_221f3: ld [wSfxWaveInstrument], a ld d, $a0 ld hl, wChannelCommandPointers - call FillAudioRAM2 + call .FillMem ld a, $1 ld d, $18 ld hl, wChannelNoteDelayCounters - call FillAudioRAM2 + call .FillMem ld [wMusicTempo], a ld [wSfxTempo], a ld a, $ff @@ -1600,7 +1666,7 @@ Audio2_221f3: ret ; fills d bytes at hl with a -FillAudioRAM2: +.FillMem ld b, d .loop ld [hli], a @@ -1608,11 +1674,11 @@ FillAudioRAM2: jr nz, .loop ret -Audio2_2224e: +.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 @@ -1632,31 +1698,31 @@ Audio2_2224e: ld b, c inc b inc de - ld c, $0 -.asm_22270 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_22278 + jr z, .next inc c inc hl inc hl - jr .asm_22270 -.asm_22278 + jr .commandPointerLoop +.next push hl push bc push af - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc ld a, [wSoundID] ld [hl], a pop af - cp $3 - jr c, .asm_22291 + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_22291 + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -1671,52 +1737,53 @@ Audio2_2224e: and a ld a, [de] inc de - jr nz, .asm_22270 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_222aa - jr .asm_222d4 -.asm_222aa + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_222d4 - jr c, .asm_222b5 - jr .asm_222d4 -.asm_222b5 + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer - ld de, Noise2_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio2_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_222d4 + jr nz, .done ld a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a -.asm_222d4 + ld [rNR50], a ; full volume +.done ret -Noise2_endchannel: +Audio2_CryRet: sound_ret -Unknown_222d6: - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 +Audio2_HWChannelBaseAddresses: +; 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_222de: - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 +Audio2_HWChannelDisableMasks: + 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_222e6: - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 +Audio2_HWChannelEnableMasks: + 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 Audio2_Pitches: dw $F82C ; C_ @@ -1731,5 +1798,3 @@ Audio2_Pitches: dw $FB58 ; A_ dw $FB9B ; A# dw $FBDA ; B_ - - diff --git a/audio/engine_3.asm b/audio/engine_3.asm index cf435740..f329c0c3 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -3,7 +3,7 @@ Audio3_UpdateMusic:: ld c, Ch1 .loop - ld b, $0 + ld b, 0 ld hl, wChannelSoundIDs add hl, bc ld a, [hl] @@ -19,7 +19,7 @@ Audio3_UpdateMusic:: jr nz, .nextChannel set 7, a ld [wMuteAudioAndPauseMusic], a - xor a + xor a ; disable all channels' output ld [rNR51], a ld [rNR30], a ld a, $80 @@ -36,18 +36,12 @@ Audio3_UpdateMusic:: ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wChannelFlags1: -; 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 Audio3_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] - cp $1 ; if delay is 1, play next note + cp $1 ; if the delay is 1, play next note jp z, Audio3_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a @@ -63,36 +57,36 @@ Audio3_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit 6, [hl] ; dutycycle + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio3_ApplyDutyCycle + call Audio3_ApplyDutyCyclePattern .checkForExecuteMusic - ld b, $0 + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, .checkForPitchBend + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato -.checkForPitchBend + bit BIT_NOISE_OR_SFX, [hl] + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] ; pitchbend + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio3_ApplyPitchBend + jp Audio3_ApplyPitchSlide .checkVibratoDelay - ld hl, wChannelVibratoDelayCounters ; 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 +.skipPitchSlideVibrato ret .checkForVibrato - ld hl, wChannelVibratoExtents ; vibrato rate + ld hl, wChannelVibratoExtents add hl, bc ld a, [hl] and a @@ -105,33 +99,35 @@ Audio3_ApplyMusicAffects: 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], a ; reload the counter ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch 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,63 +136,66 @@ Audio3_ApplyMusicAffects: ld a, $ff .done ld d, a - ld b, $3 - call Audio3_7d8ac + ld b, REG_FREQUENCY_LO + call Audio3_GetRegisterPointer ld [hl], d ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio3_PlayNextNote: +; reload the vibrato delay counter ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] - call Audio3_endchannel + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] + call Audio3_sound_ret ret -Audio3_endchannel: +Audio3_sound_ret: call Audio3_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio3_callchannel ; no - ld b, $0 ; yes + cp $ff ; is this command a sound_ret? + jp nz, Audio3_sound_call ; no + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 1, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c cp Ch4 jr nc, .noiseOrSfxChannel - jr .asm_7d2b3 + jr .disableChannelOutput .noiseOrSfxChannel - res 2, [hl] + res BIT_NOISE_OR_SFX, [hl] ld hl, wChannelFlags2 add hl, bc - res 0, [hl] + res BIT_EXECUTE_MUSIC, [hl] cp Ch7 - jr nz, .notSfxChannel3 + jr nz, .skipSfxChannel3 +; restart hardware channel 3 (wave channel) output ld a, $0 ld [rNR30], a ld a, $80 ld [rNR30], a -.notSfxChannel3 - jr nz, .asm_7d296 +.skipSfxChannel3 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_7d296 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a - jr .asm_7d2b3 -.asm_7d296 - jr .asm_7d2bc + jr .disableChannelOutput +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -216,45 +215,45 @@ Audio3_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio3_endchannel -.asm_7d2b3 - ld hl, Unknown_7db93 + jp Audio3_sound_ret +.disableChannelOutput + ld hl, Audio3_HWChannelDisableMasks add hl, bc ld a, [rNR51] and [hl] ld [rNR51], a -.asm_7d2bc +.afterDisable ld a, [wChannelSoundIDs + Ch5] - cp $14 - jr nc, .asm_7d2c5 - jr .asm_7d2e2 -.asm_7d2c5 + cp CRY_SFX_START + jr nc, .maybeCry + jr .skipCry +.maybeCry ld a, [wChannelSoundIDs + Ch5] - cp $86 - jr z, .asm_7d2e2 - jr c, .asm_7d2d0 - jr .asm_7d2e2 -.asm_7d2d0 + cp CRY_SFX_END + jr z, .skipCry + jr c, .cry + jr .skipCry +.cry ld a, c cp Ch5 - jr z, .asm_7d2d9 - call Audio3_7d73b + jr z, .skipRewind + call Audio3_GoBackOneCommandIfCry ret c -.asm_7d2d9 +.skipRewind ld a, [wSavedVolume] ld [rNR50], a xor a ld [wSavedVolume], a -.asm_7d2e2 +.skipCry ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret -Audio3_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio3_loopchannel ; no - call Audio3_GetNextMusicByte ; yes +Audio3_sound_call: + cp $fd ; is this command a sound_call? + jp nz, Audio3_sound_loop ; no + call Audio3_GetNextMusicByte push af call Audio3_GetNextMusicByte ld d, a @@ -285,27 +284,27 @@ Audio3_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set 1, [hl] ; set the call flag - jp Audio3_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio3_sound_ret -Audio3_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio3_notetype ; no - call Audio3_GetNextMusicByte ; yes +Audio3_sound_loop: + cp $fe ; is this command a sound_loop? + jp nz, Audio3_note_type ; no + call Audio3_GetNextMusicByte ld e, a and a jr z, .infiniteLoop - ld b, $0 + ld b, 0 ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e jr nz, .loopAgain - ld a, $1 ; if no more loops to make + ld a, $1 ; if no more loops to make, ld [hl], a call Audio3_GetNextMusicByte ; skip pointer call Audio3_GetNextMusicByte - jp Audio3_endchannel + jp Audio3_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -324,13 +323,13 @@ Audio3_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_notetype: +Audio3_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio3_toggleperfectpitch ; no - ld a, d ; yes + cp $d0 ; is this command a note_type? + jp nz, Audio3_toggle_perfect_pitch ; no + ld a, d and $f ld b, $0 ld hl, wChannelNoteSpeeds @@ -345,15 +344,15 @@ Audio3_notetype: cp Ch3 jr z, .musicChannel3 cp Ch7 - jr nz, .notChannel3 + jr nz, .skipChannel3 ld hl, wSfxWaveInstrument - jr .sfxChannel3 + jr .channel3 .musicChannel3 ld hl, wMusicWaveInstrument -.sfxChannel3 +.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,31 +361,31 @@ Audio3_notetype: ; if channel 3, store high nibble as volume ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 +.skipChannel3 + ld b, 0 ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_toggleperfectpitch: +Audio3_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? + cp $e8 ; is this command a toggle_perfect_pitch? jr nz, Audio3_vibrato ; no - ld b, $0 ; yes + ld b, 0 ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio3_endchannel + jp Audio3_sound_ret Audio3_vibrato: cp $ea ; is this command a vibrato? - jr nz, Audio3_pitchbend ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 + jr nz, Audio3_pitch_slide ; no + call Audio3_GetNextMusicByte + ld b, 0 ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay @@ -395,9 +394,16 @@ Audio3_vibrato: ld [hl], a ; store delay call Audio3_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 b, 0 ld hl, wChannelVibratoExtents add hl, bc srl a @@ -405,7 +411,13 @@ Audio3_vibrato: 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 @@ -413,17 +425,18 @@ Audio3_vibrato: add hl, bc swap a or d - ld [hl], a ; store depth as both high and low nibbles - jp Audio3_endchannel + ld [hl], a -Audio3_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio3_duty ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelPitchBendLengthModifiers + jp Audio3_sound_ret + +Audio3_pitch_slide: + cp $eb ; is this command a pitch_slide? + jr nz, Audio3_duty_cycle ; no + call Audio3_GetNextMusicByte + ld b, 0 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc - ld [hl], a ; store first param + ld [hl], a call Audio3_GetNextMusicByte ld d, a and $f0 @@ -431,39 +444,39 @@ Audio3_pitchbend: ld b, a ld a, d and $f - call Audio3_7d8cc - ld b, $0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + call Audio3_CalculateFrequency + ld b, 0 + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld [hl], d + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 + ld [hl], e + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 4, [hl] ; set pitchbend flag + set BIT_PITCH_SLIDE_ON, [hl] call Audio3_GetNextMusicByte ld d, a - jp Audio3_notelength + jp Audio3_note_length -Audio3_duty: - cp $ec ; is this command a duty? +Audio3_duty_cycle: + cp $ec ; is this command a duty_cycle? jr nz, Audio3_tempo ; no - call Audio3_GetNextMusicByte ; yes + call Audio3_GetNextMusicByte rrca rrca and $c0 - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio3_endchannel + ld [hl], a ; store duty cycle + jp Audio3_sound_ret Audio3_tempo: cp $ed ; is this command a tempo? - jr nz, Audio3_stereopanning ; no - ld a, c ; yes + jr nz, Audio3_stereo_panning ; no + ld a, c cp Ch5 jr nc, .sfxChannel call Audio3_GetNextMusicByte @@ -487,20 +500,20 @@ Audio3_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_stereopanning: - cp $ee ; is this command a stereopanning? +Audio3_stereo_panning: + cp $ee ; is this command a stereo_panning? jr nz, Audio3_unknownmusic0xef ; no - call Audio3_GetNextMusicByte ; yes + call Audio3_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio3_endchannel + jp Audio3_sound_ret ; this appears to never be used Audio3_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio3_dutycycle ; no - call Audio3_GetNextMusicByte ; yes + jr nz, Audio3_duty_cycle_pattern ; no + call Audio3_GetNextMusicByte push bc call Audio3_PlaySound pop bc @@ -512,124 +525,141 @@ Audio3_unknownmusic0xef: xor a ld [wChannelSoundIDs + Ch8], a .skip - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_dutycycle: - cp $fc ; is this command a dutycycle? +Audio3_duty_cycle_pattern: + cp $fc ; is this command a duty_cycle_pattern? jr nz, Audio3_volume ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelDutyCycles + call Audio3_GetNextMusicByte + ld b, 0 + ld hl, wChannelDutyCyclePatterns add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties + ld [hl], a ; store full pattern + and %11000000 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set 6, [hl] ; set duty flag - jp Audio3_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio3_sound_ret Audio3_volume: cp $f0 ; is this command a volume? - jr nz, Audio3_executemusic ; no - call Audio3_GetNextMusicByte ; yes + jr nz, Audio3_execute_music ; no + call Audio3_GetNextMusicByte ld [rNR50], a ; store volume - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_executemusic: - cp $f8 ; is this command an executemusic? +Audio3_execute_music: + cp $f8 ; is this command an execute_music? jr nz, Audio3_octave ; no - ld b, $0 ; yes + ld b, $0 ld hl, wChannelFlags2 add hl, bc - set 0, [hl] - jp Audio3_endchannel + set BIT_EXECUTE_MUSIC, [hl] + jp Audio3_sound_ret Audio3_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio3_sfxnote ; no - ld hl, wChannelOctaves ; yes - ld b, $0 + jr nz, Audio3_sfx_note ; no + ld hl, wChannelOctaves + ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio3_endchannel + jp Audio3_sound_ret -; sfxnote is either squarenote or noisenote depending on the channel -Audio3_sfxnote: - cp $20 ; is this command an sfxnote? - jr nz, Audio3_pitchenvelope ; no +; sfx_note is either square_note or noise_note depending on the channel +Audio3_sfx_note: + cp $20 ; is this command a sfx_note? + jr nz, Audio3_pitch_sweep ld a, c cp Ch4 ; is this a noise or sfx channel? - jr c, Audio3_pitchenvelope ; no - ld b, $0 + jr c, Audio3_pitch_sweep ; no + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio3_pitchenvelope ; no - call Audio3_notelength ; yes + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio3_pitch_sweep ; yes + call Audio3_note_length + +; This code seems to do the same thing as what Audio3_ApplyDutyCycleAndSoundLength +; does below. ld d, a - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a - ld b, $1 - call Audio3_7d8ac + ld b, REG_DUTY_SOUND_LEN + call Audio3_GetRegisterPointer ld [hl], d + call Audio3_GetNextMusicByte ld d, a - ld b, $2 - call Audio3_7d8ac + ld b, REG_VOLUME_ENVELOPE + call Audio3_GetRegisterPointer ld [hl], d call Audio3_GetNextMusicByte ld e, a ld a, c cp Ch8 - 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 Audio3_GetNextMusicByte pop de -.sfxNoiseChannel +.skip ld d, a push de - call Audio3_7d69d - call Audio3_7d66c + call Audio3_ApplyDutyCycleAndSoundLength + call Audio3_EnableChannelOutput pop de - call Audio3_7d6bf + call Audio3_ApplyWavePatternAndFrequency ret -Audio3_pitchenvelope: +Audio3_pitch_sweep: ld a, c cp Ch5 jr c, Audio3_note ; if not a sfx ld a, d - cp $10 ; is this command an pitchenvelope? + cp $10 ; is this command a pitch_sweep? jr nz, Audio3_note ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio3_note ; no - call Audio3_GetNextMusicByte ; yes + call Audio3_GetNextMusicByte ld [rNR10], a - jp Audio3_endchannel + jp Audio3_sound_ret Audio3_note: ld a, c cp Ch4 - jr nz, Audio3_notelength ; if not noise channel + jr nz, Audio3_note_length ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Audio3_dnote ; yes - jr nc, Audio3_notelength ; no + jr z, .dnote + jr nc, Audio3_note_length ; no + + ; this executes when on the noise channel and + ; the command id is less than $b0 + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a dnote command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -638,38 +668,38 @@ Audio3_note: ld a, b push de push bc - jr asm_7d571 + jr .playDnote -Audio3_dnote: +.dnote ld a, d and $f push af push bc call Audio3_GetNextMusicByte ; get dnote instrument -asm_7d571 +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_7d57c + jr nz, .skipDnote ld a, d call Audio3_PlaySound -.asm_7d57c +.skipDnote pop bc pop de -Audio3_notelength: +Audio3_note_length: ld a, d 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, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b - call Audio3_7d8bb + call Audio3_MultiplyAdd ld a, c cp Ch5 jr nc, .sfxChannel @@ -683,20 +713,20 @@ Audio3_notelength: ld e, $0 cp Ch8 jr z, .skip ; if noise channel - call Audio3_7d707 + call Audio3_SetSfxTempo ld a, [wSfxTempo] ld d, a ld a, [wSfxTempo + 1] ld e, a .skip - ld a, l - ld b, $0 + ld a, l ; a = note_length * note_speed + ld b, 0 ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] - call Audio3_7d8bb + call Audio3_MultiplyAdd ld e, l - ld d, h + ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e @@ -706,192 +736,198 @@ Audio3_notelength: ld [hl], a ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio3_notepitch + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, Audio3_note_pitch ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr z, Audio3_notepitch + bit BIT_NOISE_OR_SFX, [hl] + jr z, Audio3_note_pitch pop hl ret -Audio3_notepitch: +Audio3_note_pitch: pop af and $f0 cp $c0 ; compare to rest jr nz, .notRest ld a, c cp Ch5 - jr nc, .sfxChannel + jr nc, .next +; If this isn't an SFX channel, try the corresponding SFX channel. ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a - jr nz, .quit + jr nz, .done ; fall through -.sfxChannel +.next ld a, c cp Ch3 - jr z, .musicChannel3 + jr z, .channel3 cp Ch7 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_7db93 + jr nz, .notChannel3 +.channel3 + ld b, 0 + ld hl, Audio3_HWChannelDisableMasks add hl, bc ld a, [rNR51] and [hl] - ld [rNR51], a - jr .quit -.notSfxChannel3 - ld b, $2 - call Audio3_7d8ac - ld a, $8 + ld [rNR51], a ; disable hardware channel 3's output + jr .done +.notChannel3 + ld b, REG_VOLUME_ENVELOPE + call Audio3_GetRegisterPointer + ld a, $8 ; fade in sound ld [hli], a inc hl - ld a, $80 + ld a, $80 ; restart sound ld [hl], a -.quit +.done ret .notRest swap a - ld b, $0 + ld b, 0 ld hl, wChannelOctaves add hl, bc ld b, [hl] - call Audio3_7d8cc - ld b, $0 + call Audio3_CalculateFrequency + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] - jr z, .asm_7d62c - call Audio3_7d803 -.asm_7d62c + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio3_InitPitchSlideVars +.skipPitchSlide push de ld a, c cp Ch5 - jr nc, .skip ; if sfx Channel + jr nc, .sfxChannel ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. ld hl, wChannelSoundIDs + Ch5 - ld d, $0 + ld d, 0 ld e, a add hl, de ld a, [hl] and a - jr nz, .done - jr .skip -.done + jr nz, .noSfx + jr .sfxChannel +.noSfx pop de ret -.skip - ld b, $0 +.sfxChannel + ld b, 0 ld hl, wChannelVolumes add hl, bc ld d, [hl] - ld b, $2 - call Audio3_7d8ac + ld b, REG_VOLUME_ENVELOPE + call Audio3_GetRegisterPointer ld [hl], d - call Audio3_7d69d - call Audio3_7d66c + call Audio3_ApplyDutyCycleAndSoundLength + call Audio3_EnableChannelOutput pop de ld b, $0 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 toggle_perfect_pitch been used? + jr z, .skipFrequencyInc + inc e ; if yes, increment the frequency by 1 + jr nc, .skipFrequencyInc inc d -.skip2 +.skipFrequencyInc ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e - call Audio3_7d6bf + call Audio3_ApplyWavePatternAndFrequency ret -Audio3_7d66c: - ld b, $0 - ld hl, Unknown_7db9b +Audio3_EnableChannelOutput: + ld b, 0 + ld hl, Audio3_HWChannelEnableMasks add hl, bc ld a, [rNR51] - or [hl] + or [hl] ; set this channel's bits ld d, a ld a, c cp Ch8 - jr z, .sfxNoiseChannel + jr z, .noiseChannelOrNoSfx cp Ch5 jr nc, .skip ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a jr nz, .skip -.sfxNoiseChannel +.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, Unknown_7db9b + ld hl, Audio3_HWChannelEnableMasks add hl, bc and [hl] ld d, a ld a, [rNR51] - ld hl, Unknown_7db93 + ld hl, Audio3_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 [rNR51], a ret -Audio3_7d69d: - ld b, $0 - ld hl, wChannelNoteDelayCounters +Audio3_ApplyDutyCycleAndSoundLength: + ld b, 0 + ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c cp Ch3 - jr z, .channel3 ; if music channel 3 + jr z, .skipDuty ; if music channel 3 cp Ch7 - jr z, .channel3 ; if sfx channel 3 + jr z, .skipDuty ; if sfx channel 3 +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a -.channel3 - ld b, $1 - call Audio3_7d8ac +.skipDuty + ld b, REG_DUTY_SOUND_LEN + call Audio3_GetRegisterPointer ld [hl], d ret -Audio3_7d6bf: +Audio3_ApplyWavePatternAndFrequency: ld a, c cp Ch3 jr z, .channel3 cp Ch7 - jr nz, .notSfxChannel3 + jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument cp Ch3 - jr z, .musicChannel3 + jr z, .next ld de, wSfxWaveInstrument -.musicChannel3 +.next ld a, [de] add a - ld d, $0 + ld d, 0 ld e, a ld hl, Audio3_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 a, $0 ; stop hardware channel 3 ld [rNR30], a .loop ld a, [de] @@ -901,152 +937,155 @@ Audio3_7d6bf: dec b and a jr nz, .loop - ld a, $80 + 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 Audio3_7d8ac - ld [hl], e + ld b, REG_FREQUENCY_LO + call Audio3_GetRegisterPointer + ld [hl], e ; store frequency low byte inc hl - ld [hl], d - call Audio3_7d729 + ld [hl], d ; store frequency high byte + call Audio3_ApplyFrequencyModifier ret -Audio3_7d707: - call Audio3_7d759 - jr nc, .asm_7d71f - ld d, $0 +Audio3_SetSfxTempo: + call Audio3_IsCry + jr nc, .notCry + ld d, 0 ld a, [wTempoModifier] add $80 - jr nc, .asm_7d716 + jr nc, .next inc d -.asm_7d716 +.next ld [wSfxTempo + 1], a ld a, d ld [wSfxTempo], a - jr .asm_7d728 -.asm_7d71f + jr .done +.notCry xor a ld [wSfxTempo + 1], a ld a, $1 ld [wSfxTempo], a -.asm_7d728 +.done ret -Audio3_7d729: - call Audio3_7d759 - jr nc, .asm_7d73a +Audio3_ApplyFrequencyModifier: + call Audio3_IsCry + jr nc, .done +; if playing a cry, add the cry's frequency modifier ld a, [wFrequencyModifier] add e - jr nc, .asm_7d735 + jr nc, .noCarry inc d -.asm_7d735 +.noCarry dec hl ld e, a ld [hl], e inc hl ld [hl], d -.asm_7d73a +.done ret -Audio3_7d73b: - call Audio3_7d759 - jr nc, .asm_7d756 +Audio3_GoBackOneCommandIfCry: + call Audio3_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_7d756 +.done scf ccf ret -Audio3_7d759: +Audio3_IsCry: +; Returns whether the currently playing audio is a cry in carry. ld a, [wChannelSoundIDs + Ch5] - cp $14 - jr nc, .asm_7d762 - jr .asm_7d768 -.asm_7d762 - cp $86 - jr z, .asm_7d768 - jr c, .asm_7d76b -.asm_7d768 + 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_7d76b +.yes scf ret -Audio3_ApplyPitchBend: +Audio3_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit 5, [hl] - jp nz, .asm_7d7b4 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + bit BIT_PITCH_SLIDE_DECREASING, [hl] + jp nz, .frequencyDecreasing +; frequency increasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart 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, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d - jp c, .asm_7d7fa - jr nz, .asm_7d7e7 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jp c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e - jp c, .asm_7d7fa - jr .asm_7d7e7 -.asm_7d7b4 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jp c, .reachedTargetFrequency + jr .applyUpdatedFrequency +.frequencyDecreasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1054,7 +1093,7 @@ Audio3_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1065,129 +1104,140 @@ Audio3_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] - jr c, .asm_7d7fa - jr nz, .asm_7d7e7 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jr c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] - jr c, .asm_7d7fa -.asm_7d7e7 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jr c, .reachedTargetFrequency +.applyUpdatedFrequency + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld b, $3 - call Audio3_7d8ac + ld b, REG_FREQUENCY_LO + call Audio3_GetRegisterPointer ld a, e ld [hli], a ld [hl], d ret -.asm_7d7fa +.reachedTargetFrequency +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio3_7d803: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio3_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] - jr nc, .asm_7d81b - ld a, $1 -.asm_7d81b + jr nc, .next + ld a, 1 +.next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] - jr c, .asm_7d837 + jr c, .targetFrequencyGreater ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 5, [hl] - jr .asm_7d85a -.asm_7d837 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + set BIT_PITCH_SLIDE_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, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes 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, wChannelPitchBendTargetFrequencyHighBytes + + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - res 5, [hl] -.asm_7d85a - ld hl, wChannelPitchBendLengthModifiers + res BIT_PITCH_SLIDE_DECREASING, [hl] + +.next2 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc -.asm_7d85e +.divideLoop inc b ld a, e sub [hl] ld e, a - jr nc, .asm_7d85e + jr nc, .divideLoop ld a, d and a - jr z, .asm_7d86c + jr z, .doneDividing dec a ld d, a - jr .asm_7d85e -.asm_7d86c - ld a, e + jr .divideLoop +.doneDividing + ld a, e ; a = remainder - dividend add [hl] - ld d, b - ld b, $0 - ld hl, wChannelPitchBendFrequencySteps + ld d, b ; d = quotient + 1 + ld b, 0 + ld hl, wChannelPitchSlideFrequencySteps add hl, bc - ld [hl], d - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld [hl], d ; store quotient + 1 + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld [hl], a ; store remainder - dividend + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc - ld [hl], a + ld [hl], a ; store remainder - dividend ret -Audio3_ApplyDutyCycle: - ld b, $0 - ld hl, wChannelDutyCycles +Audio3_ApplyDutyCyclePattern: + ld b, 0 + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1195,8 +1245,8 @@ Audio3_ApplyDutyCycle: ld [hl], a and $c0 ld d, a - ld b, $1 - call Audio3_7d8ac + ld b, REG_DUTY_SOUND_LEN + call Audio3_GetRegisterPointer ld a, [hl] and $3f or d @@ -1204,7 +1254,7 @@ Audio3_ApplyDutyCycle: ret Audio3_GetNextMusicByte: - ld d, $0 + ld d, 0 ld a, c add a ld e, a @@ -1221,9 +1271,10 @@ Audio3_GetNextMusicByte: ld [hl], d ret -Audio3_7d8ac: +Audio3_GetRegisterPointer: +; hl = address of hardware sound register b for software channel c ld a, c - ld hl, Unknown_7db8b + ld hl, Audio3_HWChannelBaseAddresses add l jr nc, .noCarry inc h @@ -1235,13 +1286,14 @@ Audio3_7d8ac: ld h, $ff ret -Audio3_7d8bb: - ld h, $0 +Audio3_MultiplyAdd: +; 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 @@ -1250,8 +1302,9 @@ Audio3_7d8bb: .done ret -Audio3_7d8cc: - ld h, $0 +Audio3_CalculateFrequency: +; return the frequency for note a, octave b in de + ld h, 0 ld l, a add hl, hl ld d, h @@ -1263,14 +1316,14 @@ Audio3_7d8cc: 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 @@ -1278,14 +1331,15 @@ Audio3_7d8cc: Audio3_PlaySound:: ld [wSoundID], a cp $ff - jp z, Audio3_7daa8 - cp $c2 - jp z, Audio3_7d9c2 - jp c, Audio3_7d9c2 + jp z, .stopAllAudio + cp MAX_SFX_ID_3 + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_7d901 - jp nc, Audio3_7d9c2 -.asm_7d901 + jr z, .playMusic + jp nc, .playSfx + +.playMusic xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1294,53 +1348,53 @@ Audio3_PlaySound:: ld [wSfxWaveInstrument], a ld d, $8 ld hl, wChannelReturnAddresses - call FillAudioRAM3 + call .FillMem ld hl, wChannelCommandPointers - call FillAudioRAM3 + call .FillMem ld d, $4 ld hl, wChannelSoundIDs - call FillAudioRAM3 + call .FillMem ld hl, wChannelFlags1 - call FillAudioRAM3 - ld hl, wChannelDuties - call FillAudioRAM3 + call .FillMem ld hl, wChannelDutyCycles - call FillAudioRAM3 + call .FillMem + ld hl, wChannelDutyCyclePatterns + call .FillMem ld hl, wChannelVibratoDelayCounters - call FillAudioRAM3 + call .FillMem ld hl, wChannelVibratoExtents - call FillAudioRAM3 + call .FillMem ld hl, wChannelVibratoRates - call FillAudioRAM3 + call .FillMem ld hl, wChannelFrequencyLowBytes - call FillAudioRAM3 + call .FillMem ld hl, wChannelVibratoDelayCounterReloadValues - call FillAudioRAM3 + call .FillMem ld hl, wChannelFlags2 - call FillAudioRAM3 - ld hl, wChannelPitchBendLengthModifiers - call FillAudioRAM3 - ld hl, wChannelPitchBendFrequencySteps - call FillAudioRAM3 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - call FillAudioRAM3 + call .FillMem + ld hl, wChannelPitchSlideLengthModifiers + call .FillMem + ld hl, wChannelPitchSlideFrequencySteps + call .FillMem + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyLowBytes + call .FillMem ld a, $1 ld hl, wChannelLoopCounters - call FillAudioRAM3 + call .FillMem ld hl, wChannelNoteDelayCounters - call FillAudioRAM3 + call .FillMem ld hl, wChannelNoteSpeeds - call FillAudioRAM3 + call .FillMem ld [wMusicTempo], a ld a, $ff ld [wStereoPanning], a @@ -1348,7 +1402,7 @@ Audio3_PlaySound:: ld [rNR50], a ld a, $8 ld [rNR10], a - ld a, $0 + ld a, 0 ld [rNR51], a xor a ld [rNR30], a @@ -1356,12 +1410,12 @@ Audio3_PlaySound:: ld [rNR30], a ld a, $77 ld [rNR50], a - jp Audio3_7db03 + jp .playSoundCommon -Audio3_7d9c2: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1376,13 +1430,13 @@ Audio3_7d9c2: rlca rlca ld c, a -.asm_7d9db +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 + ld b, 0 ld a, [wSfxHeaderPointer] ld h, a ld a, [wSfxHeaderPointer + 1] @@ -1391,32 +1445,32 @@ Audio3_7d9c2: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_7da17 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_7da0e + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_7da07 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_7da07 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_7da17 - jr c, .asm_7da17 -.asm_7da0e + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_7da17 - jr c, .asm_7da17 + jr z, .playChannel + jr c, .playChannel ret -.asm_7da17 +.playChannel xor a push de ld h, d @@ -1439,10 +1493,10 @@ Audio3_7d9c2: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -1460,28 +1514,28 @@ Audio3_7d9c2: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -1498,35 +1552,35 @@ Audio3_7d9c2: add hl, de ld [hl], a ld a, e - cp $4 - jr nz, .asm_7da9f + cp Ch5 + jr nz, .skipSweepDisable ld a, $8 - ld [rNR10], a -.asm_7da9f + ld [rNR10], a ; sweep off +.skipSweepDisable ld a, c and a - jp z, Audio3_7db03 + jp z, .playSoundCommon dec c - jp .asm_7d9db + jp .sfxChannelLoop -Audio3_7daa8: +.stopAllAudio ld a, $80 - ld [rNR52], a - ld [rNR30], a + ld [rNR52], a ; sound hardware on + ld [rNR30], a ; wave playback on xor a - ld [rNR51], a - ld [rNR32], a + ld [rNR51], a ; no sound output + ld [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [rNR10], a - ld [rNR12], a - ld [rNR22], a - ld [rNR42], 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 [rNR14], a + ld [rNR14], a ; counter mode ld [rNR24], a ld [rNR44], a ld a, $77 - ld [rNR50], a + ld [rNR50], a ; full volume xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1537,11 +1591,11 @@ Audio3_7daa8: ld [wSfxWaveInstrument], a ld d, $a0 ld hl, wChannelCommandPointers - call FillAudioRAM3 + call .FillMem ld a, $1 ld d, $18 ld hl, wChannelNoteDelayCounters - call FillAudioRAM3 + call .FillMem ld [wMusicTempo], a ld [wSfxTempo], a ld a, $ff @@ -1549,7 +1603,7 @@ Audio3_7daa8: ret ; fills d bytes at hl with a -FillAudioRAM3: +.FillMem ld b, d .loop ld [hli], a @@ -1557,11 +1611,11 @@ FillAudioRAM3: jr nz, .loop ret -Audio3_7db03: +.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 @@ -1581,31 +1635,31 @@ Audio3_7db03: ld b, c inc b inc de - ld c, $0 -.asm_7db25 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_7db2d + jr z, .next inc c inc hl inc hl - jr .asm_7db25 -.asm_7db2d + jr .commandPointerLoop +.next push hl push bc push af - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc ld a, [wSoundID] ld [hl], a pop af - cp $3 - jr c, .asm_7db46 + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_7db46 + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -1620,52 +1674,53 @@ Audio3_7db03: and a ld a, [de] inc de - jr nz, .asm_7db25 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_7db5f - jr .asm_7db89 -.asm_7db5f + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_7db89 - jr c, .asm_7db6a - jr .asm_7db89 -.asm_7db6a + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer - ld de, Noise3_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio3_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_7db89 + jr nz, .done ld a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a -.asm_7db89 + ld [rNR50], a ; full volume +.done ret -Noise3_endchannel: +Audio3_CryRet: sound_ret -Unknown_7db8b: - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 +Audio3_HWChannelBaseAddresses: +; 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_7db93: - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 +Audio3_HWChannelDisableMasks: + 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_7db9b: - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 +Audio3_HWChannelEnableMasks: + 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 Audio3_Pitches: dw $F82C ; C_ @@ -1680,5 +1735,3 @@ Audio3_Pitches: dw $FB58 ; A_ dw $FB9B ; A# dw $FBDA ; B_ - - diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm index 7f1f4598..d1f9f795 100644 --- a/audio/music/yellow/meetjessiejames.asm +++ b/audio/music/yellow/meetjessiejames.asm @@ -306,4 +306,3 @@ Music_MeetJessieJames_branch_83235:: note E_, 1 rest 1 sound_loop 0, Music_MeetJessieJames_branch_83235 - sound_ret diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 9cf72b26..de91352e 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -20,19 +20,27 @@ REG_DUTY_SOUND_LEN EQU 1 REG_VOLUME_ENVELOPE EQU 2 REG_FREQUENCY_LO EQU 3 -MAX_SFX_ID EQU $B9 +MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA" +MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE" +MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR" -CRY_SFX_START EQU $14 -CRY_SFX_END EQU $86 +NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01" +NOISE_INSTRUMENTS_END EQUS "SFX_NOISE_INSTRUMENT19 + 1" + +CRY_SFX_START EQUS "SFX_CRY_00" +CRY_SFX_END EQUS "SFX_CRY_25 + 3" + +BATTLE_SFX_START EQUS "SFX_PECK" +BATTLE_SFX_END EQUS "SFX_SILPH_SCOPE + 1" ; 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 +BIT_PERFECT_PITCH EQU 0 ; controlled by toggle_perfect_pitch command +BIT_SOUND_CALL EQU 1 ; if in sound 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_SLIDE_ON EQU 4 ; if pitch slide is active +BIT_PITCH_SLIDE_DECREASING EQU 5 ; if the pitch slide frequency is decreasing (instead of increasing) +BIT_ROTATE_DUTY_CYCLE EQU 6 ; if rotating duty cycle ; wChannelFlags2 constant (only has one flag) BIT_EXECUTE_MUSIC EQU 0 ; if in execute music diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index a4cd6c3b..a2282445 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -86,6 +86,14 @@ dnote: MACRO db \1 ENDM +;format: instrument [1, 3-10], length (in 16ths) +; like dnote but one 1 byte instead of 2 +; can only be used with instruments 1-10, excluding 2 +; unused +dnote_short: MACRO + db (\1 << 4) | (\2 - 1) +ENDM + ;format: length (in 16ths) rest: MACRO db $C0 | (\1 - 1) diff --git a/wram.asm b/wram.asm index 75331a61..95c6a8e5 100755 --- a/wram.asm +++ b/wram.asm @@ -101,10 +101,10 @@ wChannelFlags1:: ; c02e wChannelFlags2:: ; c036 ds 8 -wChannelDuties:: ; c03e +wChannelDutyCycles:: ; c03e ds 8 -wChannelDutyCycles:: ; c046 +wChannelDutyCyclePatterns:: ; c046 ds 8 wChannelVibratoDelayCounters:: ; c04e @@ -126,28 +126,28 @@ wChannelVibratoDelayCounterReloadValues:: ; c06e ; delay of the beginning of the vibrato from the start of the note ds 8 -wChannelPitchBendLengthModifiers:: ; c076 +wChannelPitchSlideLengthModifiers:: ; c076 ds 8 -wChannelPitchBendFrequencySteps:: ; c07e +wChannelPitchSlideFrequencySteps:: ; c07e ds 8 -wChannelPitchBendFrequencyStepsFractionalPart:: ; c086 +wChannelPitchSlideFrequencyStepsFractionalPart:: ; c086 ds 8 -wChannelPitchBendCurrentFrequencyFractionalPart:: ; c08e +wChannelPitchSlideCurrentFrequencyFractionalPart:: ; c08e ds 8 -wChannelPitchBendCurrentFrequencyHighBytes:: ; c096 +wChannelPitchSlideCurrentFrequencyHighBytes:: ; c096 ds 8 -wChannelPitchBendCurrentFrequencyLowBytes:: ; c09e +wChannelPitchSlideCurrentFrequencyLowBytes:: ; c09e ds 8 -wChannelPitchBendTargetFrequencyHighBytes:: ; c0a6 +wChannelPitchSlideTargetFrequencyHighBytes:: ; c0a6 ds 8 -wChannelPitchBendTargetFrequencyLowBytes:: ; c0ae +wChannelPitchSlideTargetFrequencyLowBytes:: ; c0ae ds 8 wChannelNoteDelayCounters:: ; c0b6 -- cgit v1.2.3 From 8b0cd72a6095db7f1639dae81c3d8eefd5b814d8 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 18 Aug 2019 21:43:15 -0500 Subject: Finish cleaning up audio macro arguments and descriptions break up arguments for stereo_panning and duty_cycle_pattern note_type fade is signed properly document arguments for vibrato, tempo, pitch_slide etc --- audio/music/bikeriding.asm | 2 +- audio/music/celadon.asm | 2 +- audio/music/defeatedgymleader.asm | 4 +-- audio/music/dungeon1.asm | 10 +++--- audio/music/dungeon2.asm | 2 +- audio/music/finalbattle.asm | 10 +++--- audio/music/gymleaderbattle.asm | 2 +- audio/music/indigoplateau.asm | 6 ++-- audio/music/introbattle.asm | 6 ++-- audio/music/jigglypuffsong.asm | 4 +-- audio/music/meeteviltrainer.asm | 6 ++-- audio/music/pkmnhealed.asm | 10 +++--- audio/music/pokemontower.asm | 2 +- audio/music/routes3.asm | 2 +- audio/music/routes4.asm | 6 ++-- audio/music/safarizone.asm | 8 ++--- audio/music/silphco.asm | 16 ++++----- audio/music/titlescreen.asm | 12 +++---- audio/music/trainerbattle.asm | 4 +-- audio/music/wildbattle.asm | 8 ++--- audio/sfx/battle_27.asm | 2 +- audio/sfx/battle_28.asm | 2 +- audio/sfx/battle_29.asm | 2 +- audio/sfx/battle_2a.asm | 4 +-- audio/sfx/battle_2b.asm | 2 +- audio/sfx/battle_2c.asm | 4 +-- audio/sfx/battle_2e.asm | 2 +- audio/sfx/battle_2f.asm | 4 +-- audio/sfx/battle_34.asm | 4 +-- audio/sfx/battle_36.asm | 2 +- audio/sfx/cry00_1.asm | 4 +-- audio/sfx/cry00_2.asm | 4 +-- audio/sfx/cry00_3.asm | 4 +-- audio/sfx/cry01_1.asm | 4 +-- audio/sfx/cry01_2.asm | 4 +-- audio/sfx/cry01_3.asm | 4 +-- audio/sfx/cry02_1.asm | 2 +- audio/sfx/cry02_2.asm | 2 +- audio/sfx/cry02_3.asm | 2 +- audio/sfx/cry03_1.asm | 4 +-- audio/sfx/cry03_2.asm | 4 +-- audio/sfx/cry03_3.asm | 4 +-- audio/sfx/cry04_1.asm | 4 +-- audio/sfx/cry04_2.asm | 4 +-- audio/sfx/cry04_3.asm | 4 +-- audio/sfx/cry05_1.asm | 4 +-- audio/sfx/cry05_2.asm | 4 +-- audio/sfx/cry05_3.asm | 4 +-- audio/sfx/cry06_1.asm | 2 +- audio/sfx/cry06_2.asm | 2 +- audio/sfx/cry06_3.asm | 2 +- audio/sfx/cry07_1.asm | 4 +-- audio/sfx/cry07_2.asm | 4 +-- audio/sfx/cry07_3.asm | 4 +-- audio/sfx/cry08_1.asm | 4 +-- audio/sfx/cry08_2.asm | 4 +-- audio/sfx/cry08_3.asm | 4 +-- audio/sfx/cry09_1.asm | 8 ++--- audio/sfx/cry09_2.asm | 8 ++--- audio/sfx/cry09_3.asm | 8 ++--- audio/sfx/cry0a_1.asm | 4 +-- audio/sfx/cry0a_2.asm | 4 +-- audio/sfx/cry0a_3.asm | 4 +-- audio/sfx/cry0b_1.asm | 4 +-- audio/sfx/cry0b_2.asm | 4 +-- audio/sfx/cry0b_3.asm | 4 +-- audio/sfx/cry0c_1.asm | 4 +-- audio/sfx/cry0c_2.asm | 4 +-- audio/sfx/cry0c_3.asm | 4 +-- audio/sfx/cry0d_1.asm | 4 +-- audio/sfx/cry0d_2.asm | 4 +-- audio/sfx/cry0d_3.asm | 4 +-- audio/sfx/cry0e_1.asm | 4 +-- audio/sfx/cry0e_2.asm | 4 +-- audio/sfx/cry0e_3.asm | 4 +-- audio/sfx/cry0f_1.asm | 4 +-- audio/sfx/cry0f_2.asm | 4 +-- audio/sfx/cry0f_3.asm | 4 +-- audio/sfx/cry10_1.asm | 4 +-- audio/sfx/cry10_2.asm | 4 +-- audio/sfx/cry10_3.asm | 4 +-- audio/sfx/cry11_1.asm | 4 +-- audio/sfx/cry11_2.asm | 4 +-- audio/sfx/cry11_3.asm | 4 +-- audio/sfx/cry12_1.asm | 4 +-- audio/sfx/cry12_2.asm | 4 +-- audio/sfx/cry12_3.asm | 4 +-- audio/sfx/cry13_1.asm | 4 +-- audio/sfx/cry13_2.asm | 4 +-- audio/sfx/cry13_3.asm | 4 +-- audio/sfx/cry14_1.asm | 4 +-- audio/sfx/cry14_2.asm | 4 +-- audio/sfx/cry14_3.asm | 4 +-- audio/sfx/cry15_1.asm | 4 +-- audio/sfx/cry15_2.asm | 4 +-- audio/sfx/cry15_3.asm | 4 +-- audio/sfx/cry16_1.asm | 4 +-- audio/sfx/cry16_2.asm | 4 +-- audio/sfx/cry16_3.asm | 4 +-- audio/sfx/cry17_1.asm | 4 +-- audio/sfx/cry17_2.asm | 4 +-- audio/sfx/cry17_3.asm | 4 +-- audio/sfx/cry18_1.asm | 4 +-- audio/sfx/cry18_2.asm | 4 +-- audio/sfx/cry18_3.asm | 4 +-- audio/sfx/cry19_1.asm | 4 +-- audio/sfx/cry19_2.asm | 4 +-- audio/sfx/cry19_3.asm | 4 +-- audio/sfx/cry1a_1.asm | 4 +-- audio/sfx/cry1a_2.asm | 4 +-- audio/sfx/cry1a_3.asm | 4 +-- audio/sfx/cry1b_1.asm | 4 +-- audio/sfx/cry1b_2.asm | 4 +-- audio/sfx/cry1b_3.asm | 4 +-- audio/sfx/cry1c_1.asm | 4 +-- audio/sfx/cry1c_2.asm | 4 +-- audio/sfx/cry1c_3.asm | 4 +-- audio/sfx/cry1d_1.asm | 4 +-- audio/sfx/cry1d_2.asm | 4 +-- audio/sfx/cry1d_3.asm | 4 +-- audio/sfx/cry1e_1.asm | 4 +-- audio/sfx/cry1e_2.asm | 4 +-- audio/sfx/cry1e_3.asm | 4 +-- audio/sfx/cry1f_1.asm | 4 +-- audio/sfx/cry1f_2.asm | 4 +-- audio/sfx/cry1f_3.asm | 4 +-- audio/sfx/cry20_1.asm | 4 +-- audio/sfx/cry20_2.asm | 4 +-- audio/sfx/cry20_3.asm | 4 +-- audio/sfx/cry21_1.asm | 4 +-- audio/sfx/cry21_2.asm | 4 +-- audio/sfx/cry21_3.asm | 4 +-- audio/sfx/cry22_1.asm | 4 +-- audio/sfx/cry22_2.asm | 4 +-- audio/sfx/cry22_3.asm | 4 +-- audio/sfx/cry23_1.asm | 4 +-- audio/sfx/cry23_2.asm | 4 +-- audio/sfx/cry23_3.asm | 4 +-- audio/sfx/cry24_1.asm | 4 +-- audio/sfx/cry24_2.asm | 4 +-- audio/sfx/cry24_3.asm | 4 +-- audio/sfx/cry25_1.asm | 4 +-- audio/sfx/cry25_2.asm | 4 +-- audio/sfx/cry25_3.asm | 4 +-- audio/sfx/psybeam.asm | 4 +-- audio/sfx/shooting_star.asm | 2 +- audio/sfx/unused_1.asm | 4 +-- audio/sfx/unused_2.asm | 4 +-- audio/sfx/unused_3.asm | 4 +-- macros/audio_macros.asm | 69 ++++++++++++++++++++++++++++----------- 150 files changed, 362 insertions(+), 331 deletions(-) diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 43c8618e..ef293f54 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -114,7 +114,7 @@ Music_BikeRiding_branch_7dbc9:: note B_, 1 octave 4 note C_, 4 - note_type 12, 3, 13 + note_type 12, 3, -5 note C_, 4 note_type 12, 11, 4 note F_, 6 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index b64fc6dd..5f03fc51 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -3,7 +3,7 @@ Music_Celadon_Ch1:: volume 7, 7 duty_cycle 3 toggle_perfect_pitch - note_type 12, 2, 15 + note_type 12, 2, -7 rest 8 octave 3 note D_, 8 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 94c9eae3..159bf42b 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -287,7 +287,7 @@ Music_DefeatedGymLeader_branch_23d84:: note G_, 6 note E_, 1 note G_, 1 - note_type 12, 6, 15 + note_type 12, 6, -7 octave 4 note C#, 8 note_type 12, 12, 7 @@ -318,7 +318,7 @@ Music_DefeatedGymLeader_branch_23d84:: note B_, 6 note G#, 1 note B_, 1 - note_type 12, 4, 15 + note_type 12, 4, -7 octave 4 note E_, 8 note_type 12, 11, 0 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index 996a3ea6..76b8d168 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -4,12 +4,12 @@ Music_Dungeon1_Ch1:: duty_cycle 3 toggle_perfect_pitch vibrato 10, 1, 4 - note_type 12, 4, 13 + note_type 12, 4, -5 rest 8 - stereo_panning 237 + stereo_panning %1110, %1101 octave 4 note F#, 8 - stereo_panning 255 + stereo_panning %1111, %1111 Music_Dungeon1_branch_7dee5:: note_type 12, 11, 2 @@ -229,10 +229,10 @@ Music_Dungeon1_branch_7dfd5:: Music_Dungeon1_Ch2:: vibrato 11, 1, 5 duty_cycle 3 - note_type 12, 0, 15 + note_type 12, 0, -7 octave 4 note G#, 8 - note_type 12, 4, 13 + note_type 12, 4, -5 octave 5 note D_, 8 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 86cb7ad2..e213e2a4 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -52,7 +52,7 @@ Music_Dungeon2_branch_7e892:: note A_, 4 note F#, 2 sound_loop 2, Music_Dungeon2_branch_7e892 - note_type 12, 1, 15 + note_type 12, 1, -7 octave 3 note E_, 16 note C_, 16 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 19fc01e5..6dec6bbb 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -147,7 +147,7 @@ Music_FinalBattle_branch_23429:: note F_, 4 note F#, 12 note A#, 4 - note_type 12, 5, 14 + note_type 12, 5, -6 note B_, 12 note_type 12, 11, 2 note E_, 3 @@ -475,7 +475,7 @@ Music_FinalBattle_Ch2:: octave 4 note E_, 1 note E_, 3 - note_type 12, 4, 10 + note_type 12, 4, -2 octave 3 note G#, 4 @@ -634,7 +634,7 @@ Music_FinalBattle_branch_235e6:: note F#, 12 note_type 12, 12, 7 note F#, 4 - note_type 12, 1, 15 + note_type 12, 1, -7 octave 3 note F#, 8 note_type 12, 9, 0 @@ -686,7 +686,7 @@ Music_FinalBattle_branch_235e6:: note_type 12, 12, 7 octave 4 note D_, 8 - note_type 12, 4, 12 + note_type 12, 4, -4 note C_, 8 note_type 12, 13, 7 note E_, 8 @@ -696,7 +696,7 @@ Music_FinalBattle_branch_235e6:: note B_, 8 note A#, 4 note B_, 12 - note_type 12, 5, 13 + note_type 12, 5, -5 octave 4 note D_, 8 note_type 12, 12, 0 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index cebda01b..5befd665 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -779,7 +779,7 @@ Music_GymLeaderBattle_branch_225e0:: note_type 12, 11, 0 octave 3 note B_, 16 - note_type 12, 3, 15 + note_type 12, 3, -7 octave 4 note F#, 16 note_type 12, 12, 3 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index d237a329..d341ecd6 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -68,7 +68,7 @@ Music_IndigoPlateau_branch_a605:: note_type 12, 11, 7 octave 3 note F_, 8 - note_type 12, 4, 14 + note_type 12, 4, -6 octave 2 note A#, 8 sound_loop 0, Music_IndigoPlateau_branch_a605 @@ -95,7 +95,7 @@ Music_IndigoPlateau_Ch2:: note D_, 8 note D_, 8 note D_, 4 - note_type 12, 5, 10 + note_type 12, 5, -2 note D#, 4 Music_IndigoPlateau_branch_a673:: @@ -129,7 +129,7 @@ Music_IndigoPlateau_branch_a673:: note D_, 8 octave 4 note C_, 8 - note_type 12, 4, 13 + note_type 12, 4, -5 octave 4 note D#, 8 sound_loop 0, Music_IndigoPlateau_branch_a673 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index fdea3ee1..b2709b76 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -42,7 +42,7 @@ Music_IntroBattle_Ch1:: octave 2 note A_, 2 note A_, 2 - note_type 12, 2, 9 + note_type 12, 2, -1 octave 3 note G_, 4 note_type 12, 11, 0 @@ -52,7 +52,7 @@ Music_IntroBattle_Ch1:: note_type 12, 11, 7 octave 3 note F_, 8 - note_type 12, 4, 15 + note_type 12, 4, -7 octave 2 note F_, 8 note_type 12, 11, 1 @@ -157,7 +157,7 @@ Music_IntroBattle_Ch2:: note_type 12, 12, 5 octave 4 note C#, 4 - note_type 12, 2, 15 + note_type 12, 2, -7 note D_, 16 note_type 12, 12, 1 octave 5 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 3c0d5234..d8995fbd 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -3,7 +3,7 @@ Music_JigglypuffSong_Ch1:: volume 7, 7 vibrato 8, 2, 4 duty_cycle 2 - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 toggle_perfect_pitch note_type 13, 6, 7 octave 4 @@ -24,7 +24,7 @@ Music_JigglypuffSong_Ch1:: Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 duty_cycle 2 - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 note_type 12, 10, 7 octave 4 note E_, 8 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index eb4f05ae..eb7b5944 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -8,7 +8,7 @@ Music_MeetEvilTrainer_Ch1:: octave 3 note D_, 2 note C#, 2 - note_type 12, 4, 15 + note_type 12, 4, -7 note D_, 4 Music_MeetEvilTrainer_branch_7f6ae:: @@ -42,7 +42,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: note B_, 4 note B_, 4 note B_, 4 - note_type 12, 4, 15 + note_type 12, 4, -7 note A#, 4 note_type 12, 12, 2 note G_, 2 @@ -54,7 +54,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: note B_, 4 note B_, 4 note B_, 4 - note_type 12, 3, 15 + note_type 12, 3, -7 note A#, 4 note_type 12, 12, 2 sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index f3b78d38..2fe9e4ce 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -5,16 +5,16 @@ Music_PkmnHealed_Ch1:: toggle_perfect_pitch note_type 12, 8, 1 rest 2 - pitch_slide 0, 75 + pitch_slide 1, 4, B_ note B_, 2 - pitch_slide 0, 84 + pitch_slide 1, 3, E_ note B_, 2 - pitch_slide 0, 68 + pitch_slide 1, 4, E_ note E_, 2 rest 4 - pitch_slide 0, 59 + pitch_slide 1, 5, B_ note E_, 4 - pitch_slide 0, 75 + pitch_slide 1, 4, B_ note B_, 4 sound_ret diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 8f78c613..ef3a3b88 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -236,7 +236,7 @@ Music_PokemonTower_branch_7f0ee:: note A_, 4 note G#, 4 note F#, 4 - note_type 12, 2, 15 + note_type 12, 2, -7 octave 5 note D_, 16 note_type 12, 12, 0 diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index 0cd4e769..d83ec8c0 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -69,7 +69,7 @@ Music_Routes3_branch_9fc3:: note A_, 4 note F_, 4 note A_, 4 - note_type 8, 4, 15 + note_type 8, 4, -7 note A_, 12 note_type 8, 9, 0 note F_, 12 diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 41bc9e04..962cd36b 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -9,7 +9,7 @@ Music_Routes4_Ch1:: note G#, 4 note G#, 4 note G#, 4 - note_type 12, 7, 15 + note_type 12, 7, -7 note G#, 4 note_type 12, 10, 2 note G#, 4 @@ -223,7 +223,7 @@ Music_Routes4_branch_a325:: note G#, 6 note_type 12, 7, 0 note G#, 6 - note_type 12, 6, 15 + note_type 12, 6, -7 note G#, 6 note_type 12, 12, 7 note G#, 4 @@ -233,7 +233,7 @@ Music_Routes4_branch_a325:: note F#, 4 note_type 8, 9, 0 note F#, 6 - note_type 8, 7, 15 + note_type 8, 7, -7 note F#, 6 duty_cycle 0 note_type 8, 9, 0 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 083d077a..0ca2f71a 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -6,13 +6,13 @@ Music_SafariZone_Ch1:: duty_cycle 2 note_type 12, 9, 2 octave 3 - pitch_slide 0, 73 + pitch_slide 1, 4, A_ note C_, 1 - pitch_slide 0, 73 + pitch_slide 1, 4, A_ note G_, 1 - pitch_slide 0, 73 + pitch_slide 1, 4, A_ note C_, 1 - pitch_slide 0, 73 + pitch_slide 1, 4, A_ note G_, 1 rest 4 duty_cycle 3 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 58af9209..3c7512ba 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -292,7 +292,7 @@ Music_SilphCo_branch_7f26d:: note A#, 1 octave 3 note C_, 1 - note_type 6, 3, 15 + note_type 6, 3, -7 note C_, 16 note_type 6, 10, 0 note C_, 11 @@ -303,7 +303,7 @@ Music_SilphCo_branch_7f26d:: note G#, 1 note F#, 1 note E_, 1 - note_type 6, 3, 15 + note_type 6, 3, -7 note E_, 16 note_type 6, 9, 0 note E_, 11 @@ -314,7 +314,7 @@ Music_SilphCo_branch_7f26d:: octave 3 note C_, 1 note D_, 1 - note_type 6, 3, 15 + note_type 6, 3, -7 note D_, 16 note_type 6, 10, 7 note D_, 11 @@ -477,7 +477,7 @@ Music_SilphCo_branch_7f42e:: note D_, 8 note D#, 8 duty_cycle 3 - note_type 6, 6, 15 + note_type 6, 6, -7 note E_, 16 note_type 6, 12, 0 note B_, 16 @@ -528,7 +528,7 @@ Music_SilphCo_branch_7f42e:: note F_, 8 note_type 6, 11, 7 note F_, 8 - note_type 6, 8, 10 + note_type 6, 8, -2 note F_, 4 note_type 6, 12, 4 duty_cycle 3 @@ -539,7 +539,7 @@ Music_SilphCo_branch_7f42e:: note F#, 8 note_type 6, 11, 0 note F#, 8 - note_type 6, 9, 9 + note_type 6, 9, -1 note F#, 4 note_type 6, 12, 4 note F#, 4 @@ -547,7 +547,7 @@ Music_SilphCo_branch_7f42e:: note F#, 4 note_type 6, 9, 0 note G_, 12 - note_type 6, 5, 9 + note_type 6, 5, -1 note G_, 8 note_type 6, 12, 4 note G_, 4 @@ -766,7 +766,7 @@ Music_SilphCo_branch_7f42e:: note_type 6, 8, 3 note G_, 2 rest 6 - note_type 6, 4, 15 + note_type 6, 4, -7 note G#, 8 note_type 6, 11, 4 note G_, 2 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index c12bd1de..b814cba3 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -237,7 +237,7 @@ Music_TitleScreen_branch_7e594:: note G_, 8 vibrato 16, 2, 6 duty_cycle 3 - note_type 12, 0, 11 + note_type 12, 0, -3 note G_, 8 note_type 12, 14, 7 note A_, 8 @@ -383,14 +383,14 @@ Music_TitleScreen_branch_7e664:: note A_, 3 sound_call Music_TitleScreen_branch_7e6e5 octave 5 - pitch_slide 0, 66 + pitch_slide 1, 4, D_ note D_, 4 rest 4 octave 6 - pitch_slide 0, 50 + pitch_slide 1, 5, D_ note D_, 4 octave 5 - pitch_slide 0, 66 + pitch_slide 1, 4, D_ note D_, 4 rest 2 note_type 8, 1, 0 @@ -400,11 +400,11 @@ Music_TitleScreen_branch_7e664:: note C#, 4 sound_call Music_TitleScreen_branch_7e6e5 octave 6 - pitch_slide 0, 50 + pitch_slide 1, 5, D_ note D_, 4 rest 4 octave 5 - pitch_slide 0, 66 + pitch_slide 1, 4, D_ note D_, 4 rest 6 note_type 8, 1, 0 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 17e82ea9..ba5d6d1b 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -735,7 +735,7 @@ Music_TrainerBattle_branch_22bfc:: note C_, 8 note_type 12, 3, 0 note C_, 8 - note_type 12, 4, 14 + note_type 12, 4, -6 note C_, 8 note_type 12, 12, 7 note C_, 8 @@ -827,7 +827,7 @@ Music_TrainerBattle_branch_22bfc:: note B_, 8 note_type 12, 6, 0 note B_, 8 - note_type 12, 6, 9 + note_type 12, 6, -1 note B_, 6 note_type 12, 9, 6 note B_, 6 diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index 582b55eb..f7cfab14 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -50,7 +50,7 @@ Music_WildBattle_Ch1:: note C#, 14 note E_, 6 note D#, 10 - note_type 12, 4, 15 + note_type 12, 4, -7 note C#, 10 note_type 12, 11, 1 note G_, 6 @@ -279,7 +279,7 @@ Music_WildBattle_branch_230e0:: note_type 12, 11, 7 octave 4 note C_, 16 - note_type 12, 3, 15 + note_type 12, 3, -7 note G_, 16 note_type 12, 11, 5 octave 3 @@ -416,7 +416,7 @@ Music_WildBattle_branch_23225:: note G#, 16 note_type 12, 11, 0 note G#, 16 - note_type 12, 4, 14 + note_type 12, 4, -6 note G_, 16 note_type 12, 12, 7 note G_, 16 @@ -438,7 +438,7 @@ Music_WildBattle_branch_23225:: note F_, 8 note_type 12, 12, 0 note G_, 16 - note_type 12, 3, 15 + note_type 12, 3, -7 octave 5 note C_, 16 note_type 12, 12, 5 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 19ce5bf7..1b505811 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -10,7 +10,7 @@ SFX_Battle_27_branch_2062a: SFX_Battle_27_Ch6: - duty_cycle_pattern 179 + duty_cycle_pattern 2, 3, 0, 3 square_note 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 38646a09..467e411d 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -7,7 +7,7 @@ SFX_Battle_28_Ch5: SFX_Battle_28_Ch6: - duty_cycle_pattern 179 + duty_cycle_pattern 2, 3, 0, 3 square_note 0, 14, 1, 1985 square_note 0, 14, 1, 1793 sound_loop 12, SFX_Battle_28_Ch6 diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index f0d27ca7..c3999ec8 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,5 +1,5 @@ SFX_Battle_29_Ch5: - duty_cycle_pattern 201 + duty_cycle_pattern 3, 0, 2, 1 square_note 11, 15, 3, 288 square_note 9, 13, 3, 336 sound_loop 5, SFX_Battle_29_Ch5 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index ea4196a8..1faf2dda 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,5 +1,5 @@ SFX_Battle_2A_Ch5: - duty_cycle_pattern 57 + duty_cycle_pattern 0, 3, 2, 1 square_note 4, 15, 4, 1536 square_note 3, 12, 4, 1280 square_note 5, 11, 5, 1536 @@ -10,7 +10,7 @@ SFX_Battle_2A_Ch5: SFX_Battle_2A_Ch6: - duty_cycle_pattern 141 + duty_cycle_pattern 2, 0, 3, 1 square_note 5, 14, 4, 1504 square_note 4, 11, 4, 1248 square_note 6, 10, 5, 1512 diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index b9b20d1d..d60a96f6 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,5 +1,5 @@ SFX_Battle_2B_Ch5: - duty_cycle_pattern 210 + duty_cycle_pattern 3, 1, 0, 2 square_note 3, 8, 1, 768 square_note 3, 12, 1, 1024 square_note 3, 15, 1, 1280 diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index c6d47413..7530210f 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,5 +1,5 @@ SFX_Battle_2C_Ch5: - duty_cycle_pattern 57 + duty_cycle_pattern 0, 3, 2, 1 square_note 15, 15, 4, 1280 square_note 15, 12, 4, 1024 square_note 15, 14, 2, 1472 @@ -8,7 +8,7 @@ SFX_Battle_2C_Ch5: SFX_Battle_2C_Ch6: - duty_cycle_pattern 141 + duty_cycle_pattern 2, 0, 3, 1 square_note 7, 14, 4, 1072 square_note 15, 11, 4, 816 square_note 15, 10, 2, 1080 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index c509b8d5..ab5665fa 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -9,7 +9,7 @@ SFX_Battle_2E_Ch5: SFX_Battle_2E_Ch6: - duty_cycle_pattern 179 + duty_cycle_pattern 2, 3, 0, 3 square_note 2, 14, 1, 770 square_note 3, 14, 1, 2034 square_note 4, 14, 1, 1538 diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index a3138abb..dd80e599 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,5 +1,5 @@ SFX_Battle_2F_Ch5: - duty_cycle_pattern 43 + duty_cycle_pattern 0, 2, 2, 3 square_note 3, 15, 1, 2032 square_note 4, 15, 2, 512 sound_loop 8, SFX_Battle_2F_Ch5 @@ -7,7 +7,7 @@ SFX_Battle_2F_Ch5: SFX_Battle_2F_Ch6: - duty_cycle_pattern 179 + duty_cycle_pattern 2, 3, 0, 3 square_note 4, 14, 2, 514 square_note 4, 14, 1, 2018 sound_loop 9, SFX_Battle_2F_Ch6 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 4abbdbc3..654049e4 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,5 +1,5 @@ SFX_Battle_34_Ch5: - duty_cycle_pattern 237 + duty_cycle_pattern 3, 2, 3, 1 square_note 8, 15, -7, 1016 square_note 15, 15, -7, 1024 square_note 15, 15, 3, 1024 @@ -7,7 +7,7 @@ SFX_Battle_34_Ch5: SFX_Battle_34_Ch6: - duty_cycle_pattern 180 + duty_cycle_pattern 2, 3, 1, 0 square_note 8, 14, -7, 960 square_note 15, 14, -7, 960 square_note 15, 14, 3, 960 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 2fd40bd3..773bf753 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -21,7 +21,7 @@ SFX_Battle_36_branch_20930: SFX_Battle_36_Ch6: - duty_cycle_pattern 179 + duty_cycle_pattern 2, 3, 0, 3 square_note 2, 15, 1, 1921 square_note 2, 15, 1, 1793 square_note 2, 15, 1, 1937 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 087ea06f..22a41634 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,5 +1,5 @@ SFX_Cry00_1_Ch5: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 4, 15, 3, 1816 square_note 15, 14, 5, 1944 square_note 8, 9, 1, 1880 @@ -7,7 +7,7 @@ SFX_Cry00_1_Ch5: SFX_Cry00_1_Ch6: - duty_cycle_pattern 160 + duty_cycle_pattern 2, 2, 0, 0 square_note 5, 11, 3, 1800 square_note 15, 12, 5, 1928 square_note 8, 7, 1, 1864 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index 0469948a..97d17e8f 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,5 +1,5 @@ SFX_Cry00_2_Ch5: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 4, 15, 3, 1816 square_note 15, 14, 5, 1944 square_note 8, 9, 1, 1880 @@ -7,7 +7,7 @@ SFX_Cry00_2_Ch5: SFX_Cry00_2_Ch6: - duty_cycle_pattern 160 + duty_cycle_pattern 2, 2, 0, 0 square_note 5, 11, 3, 1800 square_note 15, 12, 5, 1928 square_note 8, 7, 1, 1864 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index f0389adf..e332c35e 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,5 +1,5 @@ SFX_Cry00_3_Ch5: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 4, 15, 3, 1816 square_note 15, 14, 5, 1944 square_note 8, 9, 1, 1880 @@ -7,7 +7,7 @@ SFX_Cry00_3_Ch5: SFX_Cry00_3_Ch6: - duty_cycle_pattern 160 + duty_cycle_pattern 2, 2, 0, 0 square_note 5, 11, 3, 1800 square_note 15, 12, 5, 1928 square_note 8, 7, 1, 1864 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 4f4ec4fa..cb35392b 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,5 +1,5 @@ SFX_Cry01_1_Ch5: - duty_cycle_pattern 160 + duty_cycle_pattern 2, 2, 0, 0 square_note 4, 15, 3, 1536 square_note 8, 13, 5, 1888 square_note 3, 14, 2, 1824 @@ -8,7 +8,7 @@ SFX_Cry01_1_Ch5: SFX_Cry01_1_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 5, 11, 3, 1777 square_note 7, 12, 5, 1874 square_note 3, 10, 2, 1809 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 55be1d01..449adac7 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,5 +1,5 @@ SFX_Cry01_2_Ch5: - duty_cycle_pattern 160 + duty_cycle_pattern 2, 2, 0, 0 square_note 4, 15, 3, 1536 square_note 8, 13, 5, 1888 square_note 3, 14, 2, 1824 @@ -8,7 +8,7 @@ SFX_Cry01_2_Ch5: SFX_Cry01_2_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 5, 11, 3, 1777 square_note 7, 12, 5, 1874 square_note 3, 10, 2, 1809 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index f89ed321..ef8e5e8c 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,5 +1,5 @@ SFX_Cry01_3_Ch5: - duty_cycle_pattern 160 + duty_cycle_pattern 2, 2, 0, 0 square_note 4, 15, 3, 1536 square_note 8, 13, 5, 1888 square_note 3, 14, 2, 1824 @@ -8,7 +8,7 @@ SFX_Cry01_3_Ch5: SFX_Cry01_3_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 5, 11, 3, 1777 square_note 7, 12, 5, 1874 square_note 3, 10, 2, 1809 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index c1eeac36..3db37e97 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -7,7 +7,7 @@ SFX_Cry02_1_Ch5: SFX_Cry02_1_Ch6: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 7, 9, 5, 1089 square_note 2, 8, 1, 1313 square_note 8, 6, 1, 1306 diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index f3718e57..a623e071 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -7,7 +7,7 @@ SFX_Cry02_2_Ch5: SFX_Cry02_2_Ch6: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 7, 9, 5, 1089 square_note 2, 8, 1, 1313 square_note 8, 6, 1, 1306 diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 2334ae7f..4e0861d1 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -7,7 +7,7 @@ SFX_Cry02_3_Ch5: SFX_Cry02_3_Ch6: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 7, 9, 5, 1089 square_note 2, 8, 1, 1313 square_note 8, 6, 1, 1306 diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 5cb3de34..cb58c394 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,5 +1,5 @@ SFX_Cry03_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 7, 1544 square_note 6, 14, 6, 1536 square_note 6, 13, 7, 1520 @@ -11,7 +11,7 @@ SFX_Cry03_1_Ch5: SFX_Cry03_1_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 12, 7, 1284 square_note 6, 10, 6, 1282 square_note 6, 9, 7, 1265 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 208492c1..2813ce1a 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,5 +1,5 @@ SFX_Cry03_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 7, 1544 square_note 6, 14, 6, 1536 square_note 6, 13, 7, 1520 @@ -11,7 +11,7 @@ SFX_Cry03_2_Ch5: SFX_Cry03_2_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 12, 7, 1284 square_note 6, 10, 6, 1282 square_note 6, 9, 7, 1265 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 11ed4afa..ae561a7a 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,5 +1,5 @@ SFX_Cry03_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 7, 1544 square_note 6, 14, 6, 1536 square_note 6, 13, 7, 1520 @@ -11,7 +11,7 @@ SFX_Cry03_3_Ch5: SFX_Cry03_3_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 12, 7, 1284 square_note 6, 10, 6, 1282 square_note 6, 9, 7, 1265 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 7099c7cb..24662192 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,5 +1,5 @@ SFX_Cry04_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 7, 1696 square_note 8, 14, 6, 1700 square_note 4, 13, 6, 1696 @@ -11,7 +11,7 @@ SFX_Cry04_1_Ch5: SFX_Cry04_1_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 4, 14, 7, 1537 square_note 8, 13, 6, 1539 square_note 4, 12, 6, 1537 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index f2f2a0c7..f18fd9cd 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,5 +1,5 @@ SFX_Cry04_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 7, 1696 square_note 8, 14, 6, 1700 square_note 4, 13, 6, 1696 @@ -11,7 +11,7 @@ SFX_Cry04_2_Ch5: SFX_Cry04_2_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 4, 14, 7, 1537 square_note 8, 13, 6, 1539 square_note 4, 12, 6, 1537 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 9e155fb4..718af40f 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,5 +1,5 @@ SFX_Cry04_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 7, 1696 square_note 8, 14, 6, 1700 square_note 4, 13, 6, 1696 @@ -11,7 +11,7 @@ SFX_Cry04_3_Ch5: SFX_Cry04_3_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 4, 14, 7, 1537 square_note 8, 13, 6, 1539 square_note 4, 12, 6, 1537 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 8db2db6a..1c3fce20 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,5 +1,5 @@ SFX_Cry05_1_Ch5: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 6, 14, 2, 1280 square_note 6, 14, 3, 1408 square_note 6, 13, 3, 1392 @@ -8,7 +8,7 @@ SFX_Cry05_1_Ch5: SFX_Cry05_1_Ch6: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 6, 14, 2, 1154 square_note 6, 13, 3, 1281 square_note 6, 11, 2, 1250 diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index d9fe5208..53f076f2 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,5 +1,5 @@ SFX_Cry05_2_Ch5: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 6, 14, 2, 1280 square_note 6, 14, 3, 1408 square_note 6, 13, 3, 1392 @@ -8,7 +8,7 @@ SFX_Cry05_2_Ch5: SFX_Cry05_2_Ch6: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 6, 14, 2, 1154 square_note 6, 13, 3, 1281 square_note 6, 11, 2, 1250 diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 57479f06..2d5b02b8 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,5 +1,5 @@ SFX_Cry05_3_Ch5: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 6, 14, 2, 1280 square_note 6, 14, 3, 1408 square_note 6, 13, 3, 1392 @@ -8,7 +8,7 @@ SFX_Cry05_3_Ch5: SFX_Cry05_3_Ch6: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 6, 14, 2, 1154 square_note 6, 13, 3, 1281 square_note 6, 11, 2, 1250 diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index 5b184121..03b75b0a 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,5 +1,5 @@ SFX_Cry06_1_Ch5: - duty_cycle_pattern 250 + duty_cycle_pattern 3, 3, 2, 2 square_note 6, 8, 3, 583 square_note 15, 6, 2, 550 square_note 4, 5, 2, 581 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 3d32921b..6ddbfeb0 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,5 +1,5 @@ SFX_Cry06_2_Ch5: - duty_cycle_pattern 250 + duty_cycle_pattern 3, 3, 2, 2 square_note 6, 8, 3, 583 square_note 15, 6, 2, 550 square_note 4, 5, 2, 581 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index c847b1ab..d509053b 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,5 +1,5 @@ SFX_Cry06_3_Ch5: - duty_cycle_pattern 250 + duty_cycle_pattern 3, 3, 2, 2 square_note 6, 8, 3, 583 square_note 15, 6, 2, 550 square_note 4, 5, 2, 581 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index 5918d4d8..3733e746 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,5 +1,5 @@ SFX_Cry07_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 3, 1760 square_note 15, 14, 4, 1600 square_note 8, 12, 1, 1568 @@ -7,7 +7,7 @@ SFX_Cry07_1_Ch5: SFX_Cry07_1_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 3, 12, 3, 1667 square_note 14, 11, 4, 1538 square_note 8, 10, 1, 1537 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index fcd82c8d..6a134397 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,5 +1,5 @@ SFX_Cry07_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 3, 1760 square_note 15, 14, 4, 1600 square_note 8, 12, 1, 1568 @@ -7,7 +7,7 @@ SFX_Cry07_2_Ch5: SFX_Cry07_2_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 3, 12, 3, 1667 square_note 14, 11, 4, 1538 square_note 8, 10, 1, 1537 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index a92dd02b..a8b60f38 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,5 +1,5 @@ SFX_Cry07_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 3, 1760 square_note 15, 14, 4, 1600 square_note 8, 12, 1, 1568 @@ -7,7 +7,7 @@ SFX_Cry07_3_Ch5: SFX_Cry07_3_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 3, 12, 3, 1667 square_note 14, 11, 4, 1538 square_note 8, 10, 1, 1537 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 044f4add..92f17fa8 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,5 +1,5 @@ SFX_Cry08_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 6, 1381 square_note 10, 14, 4, 1404 square_note 3, 12, 2, 1372 @@ -8,7 +8,7 @@ SFX_Cry08_1_Ch5: SFX_Cry08_1_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 14, 13, 6, 1283 square_note 9, 11, 4, 1307 square_note 4, 9, 2, 1274 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 50da09d9..53ac2891 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,5 +1,5 @@ SFX_Cry08_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 6, 1381 square_note 10, 14, 4, 1404 square_note 3, 12, 2, 1372 @@ -8,7 +8,7 @@ SFX_Cry08_2_Ch5: SFX_Cry08_2_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 14, 13, 6, 1283 square_note 9, 11, 4, 1307 square_note 4, 9, 2, 1274 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index b18c8b75..81bcf360 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,5 +1,5 @@ SFX_Cry08_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 6, 1381 square_note 10, 14, 4, 1404 square_note 3, 12, 2, 1372 @@ -8,7 +8,7 @@ SFX_Cry08_3_Ch5: SFX_Cry08_3_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 14, 13, 6, 1283 square_note 9, 11, 4, 1307 square_note 4, 9, 2, 1274 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 02206052..f8c600bd 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,9 +1,9 @@ SFX_Cry09_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1952 square_note 6, 14, 6, 1955 square_note 10, 15, 4, 1952 - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 10, 15, 6, 2008 square_note 4, 14, 3, 2007 square_note 15, 15, 2, 2008 @@ -11,12 +11,12 @@ SFX_Cry09_1_Ch5: SFX_Cry09_1_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 2, 0, 8, 0 square_note 15, 10, 7, 1697 square_note 6, 8, 6, 1698 square_note 10, 7, 4, 1697 - duty_cycle_pattern 95 + duty_cycle_pattern 1, 1, 3, 3 square_note 10, 7, 6, 1750 square_note 4, 8, 3, 1753 square_note 15, 10, 2, 1751 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 545a77cc..12965e07 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,9 +1,9 @@ SFX_Cry09_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1952 square_note 6, 14, 6, 1955 square_note 10, 15, 4, 1952 - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 10, 15, 6, 2008 square_note 4, 14, 3, 2007 square_note 15, 15, 2, 2008 @@ -11,12 +11,12 @@ SFX_Cry09_2_Ch5: SFX_Cry09_2_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 2, 0, 8, 0 square_note 15, 10, 7, 1697 square_note 6, 8, 6, 1698 square_note 10, 7, 4, 1697 - duty_cycle_pattern 95 + duty_cycle_pattern 1, 1, 3, 3 square_note 10, 7, 6, 1750 square_note 4, 8, 3, 1753 square_note 15, 10, 2, 1751 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index d842066c..2c85d750 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,9 +1,9 @@ SFX_Cry09_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1952 square_note 6, 14, 6, 1955 square_note 10, 15, 4, 1952 - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 10, 15, 6, 2008 square_note 4, 14, 3, 2007 square_note 15, 15, 2, 2008 @@ -11,12 +11,12 @@ SFX_Cry09_3_Ch5: SFX_Cry09_3_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 2, 0, 8, 0 square_note 15, 10, 7, 1697 square_note 6, 8, 6, 1698 square_note 10, 7, 4, 1697 - duty_cycle_pattern 95 + duty_cycle_pattern 1, 1, 3, 3 square_note 10, 7, 6, 1750 square_note 4, 8, 3, 1753 square_note 15, 10, 2, 1751 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index fa1a0c31..bcb71844 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,5 +1,5 @@ SFX_Cry0A_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 8, 15, 7, 1760 square_note 6, 14, 6, 1765 square_note 3, 15, 4, 1760 @@ -11,7 +11,7 @@ SFX_Cry0A_1_Ch5: SFX_Cry0A_1_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 3, 0, 8, 0 square_note 8, 10, 7, 1697 square_note 6, 8, 6, 1699 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index af07ff25..fb365e91 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,5 +1,5 @@ SFX_Cry0A_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 8, 15, 7, 1760 square_note 6, 14, 6, 1765 square_note 3, 15, 4, 1760 @@ -11,7 +11,7 @@ SFX_Cry0A_2_Ch5: SFX_Cry0A_2_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 3, 0, 8, 0 square_note 8, 10, 7, 1697 square_note 6, 8, 6, 1699 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index f0bb527a..bf6dfcf1 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,5 +1,5 @@ SFX_Cry0A_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 8, 15, 7, 1760 square_note 6, 14, 6, 1765 square_note 3, 15, 4, 1760 @@ -11,7 +11,7 @@ SFX_Cry0A_3_Ch5: SFX_Cry0A_3_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 3, 0, 8, 0 square_note 8, 10, 7, 1697 square_note 6, 8, 6, 1699 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 9b2104aa..51e445ab 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,5 +1,5 @@ SFX_Cry0B_1_Ch5: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 4, 15, 1, 1792 square_note 4, 14, 1, 1920 square_note 4, 13, 1, 1856 @@ -14,7 +14,7 @@ SFX_Cry0B_1_Ch5: SFX_Cry0B_1_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 12, 0, 8, 0 square_note 4, 15, 1, 1793 square_note 4, 14, 1, 1922 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 37e17243..68cb0ba6 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,5 +1,5 @@ SFX_Cry0B_2_Ch5: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 4, 15, 1, 1792 square_note 4, 14, 1, 1920 square_note 4, 13, 1, 1856 @@ -14,7 +14,7 @@ SFX_Cry0B_2_Ch5: SFX_Cry0B_2_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 12, 0, 8, 0 square_note 4, 15, 1, 1793 square_note 4, 14, 1, 1922 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index 9e788f53..3328a8b6 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,5 +1,5 @@ SFX_Cry0B_3_Ch5: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 4, 15, 1, 1792 square_note 4, 14, 1, 1920 square_note 4, 13, 1, 1856 @@ -14,7 +14,7 @@ SFX_Cry0B_3_Ch5: SFX_Cry0B_3_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 12, 0, 8, 0 square_note 4, 15, 1, 1793 square_note 4, 14, 1, 1922 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 67f30936..a59f9e8d 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,5 +1,5 @@ SFX_Cry0C_1_Ch5: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 8, 15, 5, 1536 square_note 2, 13, 2, 1592 square_note 2, 12, 2, 1584 @@ -13,7 +13,7 @@ SFX_Cry0C_1_Ch5: SFX_Cry0C_1_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 12, 12, 3, 1472 square_note 3, 11, 1, 1529 square_note 2, 10, 1, 1521 diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index dd1a90c1..5be195a9 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,5 +1,5 @@ SFX_Cry0C_2_Ch5: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 8, 15, 5, 1536 square_note 2, 13, 2, 1592 square_note 2, 12, 2, 1584 @@ -13,7 +13,7 @@ SFX_Cry0C_2_Ch5: SFX_Cry0C_2_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 12, 12, 3, 1472 square_note 3, 11, 1, 1529 square_note 2, 10, 1, 1521 diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 024bab85..f75f7a64 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,5 +1,5 @@ SFX_Cry0C_3_Ch5: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 8, 15, 5, 1536 square_note 2, 13, 2, 1592 square_note 2, 12, 2, 1584 @@ -13,7 +13,7 @@ SFX_Cry0C_3_Ch5: SFX_Cry0C_3_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 12, 12, 3, 1472 square_note 3, 11, 1, 1529 square_note 2, 10, 1, 1521 diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index ac9963f2..3bd1c4e5 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,5 +1,5 @@ SFX_Cry0D_1_Ch5: - duty_cycle_pattern 136 + duty_cycle_pattern 2, 0, 2, 0 square_note 5, 15, 2, 1616 square_note 9, 13, 1, 1632 square_note 5, 14, 2, 1554 @@ -11,7 +11,7 @@ SFX_Cry0D_1_Ch5: SFX_Cry0D_1_Ch6: - duty_cycle_pattern 64 + duty_cycle_pattern 1, 0, 0, 0 square_note 4, 0, 8, 0 square_note 5, 15, 2, 1617 square_note 9, 13, 1, 1633 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 8c6dd050..1c57d5dc 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,5 +1,5 @@ SFX_Cry0D_2_Ch5: - duty_cycle_pattern 136 + duty_cycle_pattern 2, 0, 2, 0 square_note 5, 15, 2, 1616 square_note 9, 13, 1, 1632 square_note 5, 14, 2, 1554 @@ -11,7 +11,7 @@ SFX_Cry0D_2_Ch5: SFX_Cry0D_2_Ch6: - duty_cycle_pattern 64 + duty_cycle_pattern 1, 0, 0, 0 square_note 4, 0, 8, 0 square_note 5, 15, 2, 1617 square_note 9, 13, 1, 1633 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 487faa53..be354add 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,5 +1,5 @@ SFX_Cry0D_3_Ch5: - duty_cycle_pattern 136 + duty_cycle_pattern 2, 0, 2, 0 square_note 5, 15, 2, 1616 square_note 9, 13, 1, 1632 square_note 5, 14, 2, 1554 @@ -11,7 +11,7 @@ SFX_Cry0D_3_Ch5: SFX_Cry0D_3_Ch6: - duty_cycle_pattern 64 + duty_cycle_pattern 1, 0, 0, 0 square_note 4, 0, 8, 0 square_note 5, 15, 2, 1617 square_note 9, 13, 1, 1633 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 3067b15a..183280e2 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,5 +1,5 @@ SFX_Cry0E_1_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 4, 14, 1, 1792 square_note 4, 15, 2, 1920 square_note 2, 9, 2, 1856 @@ -8,7 +8,7 @@ SFX_Cry0E_1_Ch5: SFX_Cry0E_1_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 11, 1, 1761 square_note 3, 12, 2, 1761 square_note 3, 6, 2, 1665 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index b3849fc5..905adbb3 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,5 +1,5 @@ SFX_Cry0E_2_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 4, 14, 1, 1792 square_note 4, 15, 2, 1920 square_note 2, 9, 2, 1856 @@ -8,7 +8,7 @@ SFX_Cry0E_2_Ch5: SFX_Cry0E_2_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 11, 1, 1761 square_note 3, 12, 2, 1761 square_note 3, 6, 2, 1665 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 493f91e2..a17dc577 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,5 +1,5 @@ SFX_Cry0E_3_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 4, 14, 1, 1792 square_note 4, 15, 2, 1920 square_note 2, 9, 2, 1856 @@ -8,7 +8,7 @@ SFX_Cry0E_3_Ch5: SFX_Cry0E_3_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 11, 1, 1761 square_note 3, 12, 2, 1761 square_note 3, 6, 2, 1665 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 9dbef1fb..2cf79d6d 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,5 +1,5 @@ SFX_Cry0F_1_Ch5: - duty_cycle_pattern 241 + duty_cycle_pattern 3, 3, 0, 1 square_note 4, 15, 7, 1984 square_note 12, 14, 6, 1986 square_note 6, 11, 5, 1664 @@ -10,7 +10,7 @@ SFX_Cry0F_1_Ch5: SFX_Cry0F_1_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 3, 12, 7, 1921 square_note 12, 11, 6, 1920 square_note 6, 10, 5, 1601 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 7de545a4..39f70bfe 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,5 +1,5 @@ SFX_Cry0F_2_Ch5: - duty_cycle_pattern 241 + duty_cycle_pattern 3, 3, 0, 1 square_note 4, 15, 7, 1984 square_note 12, 14, 6, 1986 square_note 6, 11, 5, 1664 @@ -10,7 +10,7 @@ SFX_Cry0F_2_Ch5: SFX_Cry0F_2_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 3, 12, 7, 1921 square_note 12, 11, 6, 1920 square_note 6, 10, 5, 1601 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 0d3d68b0..f96df482 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,5 +1,5 @@ SFX_Cry0F_3_Ch5: - duty_cycle_pattern 241 + duty_cycle_pattern 3, 3, 0, 1 square_note 4, 15, 7, 1984 square_note 12, 14, 6, 1986 square_note 6, 11, 5, 1664 @@ -10,7 +10,7 @@ SFX_Cry0F_3_Ch5: SFX_Cry0F_3_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 3, 12, 7, 1921 square_note 12, 11, 6, 1920 square_note 6, 10, 5, 1601 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index bcaa75ac..dc8d2b71 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,5 +1,5 @@ SFX_Cry10_1_Ch5: - duty_cycle_pattern 201 + duty_cycle_pattern 3, 0, 2, 1 square_note 8, 15, 7, 1664 square_note 2, 15, 7, 1632 square_note 1, 14, 7, 1600 @@ -12,7 +12,7 @@ SFX_Cry10_1_Ch5: SFX_Cry10_1_Ch6: - duty_cycle_pattern 121 + duty_cycle_pattern 1, 3, 2, 1 square_note 10, 14, 7, 1666 square_note 2, 14, 7, 1634 square_note 1, 13, 7, 1602 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 12c8322e..f026f7c1 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,5 +1,5 @@ SFX_Cry10_2_Ch5: - duty_cycle_pattern 201 + duty_cycle_pattern 3, 0, 2, 1 square_note 8, 15, 7, 1664 square_note 2, 15, 7, 1632 square_note 1, 14, 7, 1600 @@ -12,7 +12,7 @@ SFX_Cry10_2_Ch5: SFX_Cry10_2_Ch6: - duty_cycle_pattern 121 + duty_cycle_pattern 1, 3, 2, 1 square_note 10, 14, 7, 1666 square_note 2, 14, 7, 1634 square_note 1, 13, 7, 1602 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index ac7b4655..4b494b60 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,5 +1,5 @@ SFX_Cry10_3_Ch5: - duty_cycle_pattern 201 + duty_cycle_pattern 3, 0, 2, 1 square_note 8, 15, 7, 1664 square_note 2, 15, 7, 1632 square_note 1, 14, 7, 1600 @@ -12,7 +12,7 @@ SFX_Cry10_3_Ch5: SFX_Cry10_3_Ch6: - duty_cycle_pattern 121 + duty_cycle_pattern 1, 3, 2, 1 square_note 10, 14, 7, 1666 square_note 2, 14, 7, 1634 square_note 1, 13, 7, 1602 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index 5616317e..09fa8123 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,5 +1,5 @@ SFX_Cry11_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1952 square_note 8, 14, 6, 1956 square_note 4, 13, 6, 1952 @@ -11,7 +11,7 @@ SFX_Cry11_1_Ch5: SFX_Cry11_1_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 0, 8, 0 square_note 6, 10, 7, 1857 square_note 8, 8, 6, 1859 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 9ff4396d..b51b01c1 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,5 +1,5 @@ SFX_Cry11_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1952 square_note 8, 14, 6, 1956 square_note 4, 13, 6, 1952 @@ -11,7 +11,7 @@ SFX_Cry11_2_Ch5: SFX_Cry11_2_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 0, 8, 0 square_note 6, 10, 7, 1857 square_note 8, 8, 6, 1859 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 43b95fe8..1a8b0c10 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,5 +1,5 @@ SFX_Cry11_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1952 square_note 8, 14, 6, 1956 square_note 4, 13, 6, 1952 @@ -11,7 +11,7 @@ SFX_Cry11_3_Ch5: SFX_Cry11_3_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 4, 0, 8, 0 square_note 6, 10, 7, 1857 square_note 8, 8, 6, 1859 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index c87d178d..d2ee5f6e 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,5 +1,5 @@ SFX_Cry12_1_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 12, 15, 2, 1088 square_note 15, 14, 3, 1184 square_note 4, 13, 2, 1168 @@ -8,7 +8,7 @@ SFX_Cry12_1_Ch5: SFX_Cry12_1_Ch6: - duty_cycle_pattern 238 + duty_cycle_pattern 3, 2, 3, 2 square_note 11, 13, 2, 1080 square_note 14, 12, 6, 1176 square_note 3, 11, 2, 1160 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 921b27be..8a4afa2a 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,5 +1,5 @@ SFX_Cry12_2_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 12, 15, 2, 1088 square_note 15, 14, 3, 1184 square_note 4, 13, 2, 1168 @@ -8,7 +8,7 @@ SFX_Cry12_2_Ch5: SFX_Cry12_2_Ch6: - duty_cycle_pattern 238 + duty_cycle_pattern 3, 2, 3, 2 square_note 11, 13, 2, 1080 square_note 14, 12, 6, 1176 square_note 3, 11, 2, 1160 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 98569ea8..b114cdf4 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,5 +1,5 @@ SFX_Cry12_3_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 12, 15, 2, 1088 square_note 15, 14, 3, 1184 square_note 4, 13, 2, 1168 @@ -8,7 +8,7 @@ SFX_Cry12_3_Ch5: SFX_Cry12_3_Ch6: - duty_cycle_pattern 238 + duty_cycle_pattern 3, 2, 3, 2 square_note 11, 13, 2, 1080 square_note 14, 12, 6, 1176 square_note 3, 11, 2, 1160 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 6392f327..7ba33d8d 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,5 +1,5 @@ SFX_Cry13_1_Ch5: - duty_cycle_pattern 51 + duty_cycle_pattern 0, 3, 0, 3 square_note 15, 15, 6, 1472 square_note 8, 14, 3, 1468 square_note 6, 13, 2, 1488 @@ -10,7 +10,7 @@ SFX_Cry13_1_Ch5: SFX_Cry13_1_Ch6: - duty_cycle_pattern 153 + duty_cycle_pattern 2, 1, 2, 1 square_note 14, 12, 6, 1201 square_note 7, 12, 3, 1197 square_note 5, 11, 2, 1217 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 0247bc39..31ba80a1 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,5 +1,5 @@ SFX_Cry13_2_Ch5: - duty_cycle_pattern 51 + duty_cycle_pattern 0, 3, 0, 3 square_note 15, 15, 6, 1472 square_note 8, 14, 3, 1468 square_note 6, 13, 2, 1488 @@ -10,7 +10,7 @@ SFX_Cry13_2_Ch5: SFX_Cry13_2_Ch6: - duty_cycle_pattern 153 + duty_cycle_pattern 2, 1, 2, 1 square_note 14, 12, 6, 1201 square_note 7, 12, 3, 1197 square_note 5, 11, 2, 1217 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index 99871861..8ca4cb0b 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,5 +1,5 @@ SFX_Cry13_3_Ch5: - duty_cycle_pattern 51 + duty_cycle_pattern 0, 3, 0, 3 square_note 15, 15, 6, 1472 square_note 8, 14, 3, 1468 square_note 6, 13, 2, 1488 @@ -10,7 +10,7 @@ SFX_Cry13_3_Ch5: SFX_Cry13_3_Ch6: - duty_cycle_pattern 153 + duty_cycle_pattern 2, 1, 2, 1 square_note 14, 12, 6, 1201 square_note 7, 12, 3, 1197 square_note 5, 11, 2, 1217 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index 99d8d8d3..d892918f 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,5 +1,5 @@ SFX_Cry14_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 8, 14, 4, 1936 square_note 15, 15, 5, 1984 square_note 8, 13, 1, 2008 @@ -7,7 +7,7 @@ SFX_Cry14_1_Ch5: SFX_Cry14_1_Ch6: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 10, 12, 4, 1905 square_note 15, 11, 6, 1954 square_note 8, 10, 1, 1975 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 28062bc7..040bfe10 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,5 +1,5 @@ SFX_Cry14_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 8, 14, 4, 1936 square_note 15, 15, 5, 1984 square_note 8, 13, 1, 2008 @@ -7,7 +7,7 @@ SFX_Cry14_2_Ch5: SFX_Cry14_2_Ch6: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 10, 12, 4, 1905 square_note 15, 11, 6, 1954 square_note 8, 10, 1, 1975 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index 81bd63ca..142707c5 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,5 +1,5 @@ SFX_Cry14_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 8, 14, 4, 1936 square_note 15, 15, 5, 1984 square_note 8, 13, 1, 2008 @@ -7,7 +7,7 @@ SFX_Cry14_3_Ch5: SFX_Cry14_3_Ch6: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 10, 12, 4, 1905 square_note 15, 11, 6, 1954 square_note 8, 10, 1, 1975 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index aaa6656e..473d46cb 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,5 +1,5 @@ SFX_Cry15_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 3, 1920 square_note 15, 14, 7, 1792 square_note 8, 13, 3, 1808 @@ -10,7 +10,7 @@ SFX_Cry15_1_Ch5: SFX_Cry15_1_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 6, 12, 3, 1793 square_note 14, 11, 7, 1665 square_note 7, 11, 3, 1682 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 77ac9ffb..82398789 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,5 +1,5 @@ SFX_Cry15_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 3, 1920 square_note 15, 14, 7, 1792 square_note 8, 13, 3, 1808 @@ -10,7 +10,7 @@ SFX_Cry15_2_Ch5: SFX_Cry15_2_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 6, 12, 3, 1793 square_note 14, 11, 7, 1665 square_note 7, 11, 3, 1682 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 2e6a9d71..dcd6683b 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,5 +1,5 @@ SFX_Cry15_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 4, 15, 3, 1920 square_note 15, 14, 7, 1792 square_note 8, 13, 3, 1808 @@ -10,7 +10,7 @@ SFX_Cry15_3_Ch5: SFX_Cry15_3_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 6, 12, 3, 1793 square_note 14, 11, 7, 1665 square_note 7, 11, 3, 1682 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index e0bf7c61..410ec4ad 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,5 +1,5 @@ SFX_Cry16_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 13, 7, 1920 square_note 4, 14, 6, 1952 square_note 15, 13, 2, 1856 @@ -7,7 +7,7 @@ SFX_Cry16_1_Ch5: SFX_Cry16_1_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 15, 12, 7, 1875 square_note 5, 11, 6, 1906 square_note 15, 12, 2, 1809 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index da03950f..a91355a6 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,5 +1,5 @@ SFX_Cry16_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 13, 7, 1920 square_note 4, 14, 6, 1952 square_note 15, 13, 2, 1856 @@ -7,7 +7,7 @@ SFX_Cry16_2_Ch5: SFX_Cry16_2_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 15, 12, 7, 1875 square_note 5, 11, 6, 1906 square_note 15, 12, 2, 1809 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index 248163fe..838a4241 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,5 +1,5 @@ SFX_Cry16_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 13, 7, 1920 square_note 4, 14, 6, 1952 square_note 15, 13, 2, 1856 @@ -7,7 +7,7 @@ SFX_Cry16_3_Ch5: SFX_Cry16_3_Ch6: - duty_cycle_pattern 90 + duty_cycle_pattern 1, 1, 2, 2 square_note 15, 12, 7, 1875 square_note 5, 11, 6, 1906 square_note 15, 12, 2, 1809 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 699de068..dcfde2bc 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,5 +1,5 @@ SFX_Cry17_1_Ch5: - duty_cycle_pattern 15 + duty_cycle_pattern 0, 0, 3, 3 square_note 15, 15, 7, 1280 square_note 15, 14, 7, 1288 square_note 8, 11, 4, 1152 @@ -8,7 +8,7 @@ SFX_Cry17_1_Ch5: SFX_Cry17_1_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 14, 13, 7, 1153 square_note 14, 12, 7, 1161 square_note 10, 11, 4, 1025 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index 2f143097..f2b1f366 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,5 +1,5 @@ SFX_Cry17_2_Ch5: - duty_cycle_pattern 15 + duty_cycle_pattern 0, 0, 3, 3 square_note 15, 15, 7, 1280 square_note 15, 14, 7, 1288 square_note 8, 11, 4, 1152 @@ -8,7 +8,7 @@ SFX_Cry17_2_Ch5: SFX_Cry17_2_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 14, 13, 7, 1153 square_note 14, 12, 7, 1161 square_note 10, 11, 4, 1025 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 32bee883..dabb4dbc 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,5 +1,5 @@ SFX_Cry17_3_Ch5: - duty_cycle_pattern 15 + duty_cycle_pattern 0, 0, 3, 3 square_note 15, 15, 7, 1280 square_note 15, 14, 7, 1288 square_note 8, 11, 4, 1152 @@ -8,7 +8,7 @@ SFX_Cry17_3_Ch5: SFX_Cry17_3_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 14, 13, 7, 1153 square_note 14, 12, 7, 1161 square_note 10, 11, 4, 1025 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index d326c2c3..c67f03d1 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,5 +1,5 @@ SFX_Cry18_1_Ch5: - duty_cycle_pattern 80 + duty_cycle_pattern 1, 1, 0, 0 square_note 10, 15, 5, 1664 square_note 3, 14, 2, 1696 square_note 3, 15, 2, 1728 @@ -12,7 +12,7 @@ SFX_Cry18_1_Ch5: SFX_Cry18_1_Ch6: - duty_cycle_pattern 15 + duty_cycle_pattern 0, 0, 3, 3 square_note 9, 13, 5, 1585 square_note 3, 13, 2, 1618 square_note 3, 14, 2, 1649 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 1a81e1d3..55be1c3f 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,5 +1,5 @@ SFX_Cry18_2_Ch5: - duty_cycle_pattern 80 + duty_cycle_pattern 1, 1, 0, 0 square_note 10, 15, 5, 1664 square_note 3, 14, 2, 1696 square_note 3, 15, 2, 1728 @@ -12,7 +12,7 @@ SFX_Cry18_2_Ch5: SFX_Cry18_2_Ch6: - duty_cycle_pattern 15 + duty_cycle_pattern 0, 0, 3, 3 square_note 9, 13, 5, 1585 square_note 3, 13, 2, 1618 square_note 3, 14, 2, 1649 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 7ca9f2c6..cc0db3ec 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,5 +1,5 @@ SFX_Cry18_3_Ch5: - duty_cycle_pattern 80 + duty_cycle_pattern 1, 1, 0, 0 square_note 10, 15, 5, 1664 square_note 3, 14, 2, 1696 square_note 3, 15, 2, 1728 @@ -12,7 +12,7 @@ SFX_Cry18_3_Ch5: SFX_Cry18_3_Ch6: - duty_cycle_pattern 15 + duty_cycle_pattern 0, 0, 3, 3 square_note 9, 13, 5, 1585 square_note 3, 13, 2, 1618 square_note 3, 14, 2, 1649 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 6309f902..eca89a1c 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,5 +1,5 @@ SFX_Cry19_1_Ch5: - duty_cycle_pattern 27 + duty_cycle_pattern 0, 1, 2, 3 square_note 7, 13, 2, 1856 square_note 15, 14, 5, 1888 square_note 15, 12, 1, 1840 @@ -7,7 +7,7 @@ SFX_Cry19_1_Ch5: SFX_Cry19_1_Ch6: - duty_cycle_pattern 129 + duty_cycle_pattern 2, 0, 0, 1 square_note 2, 12, 2, 1793 square_note 4, 12, 2, 1800 square_note 15, 13, 7, 1857 diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index e838612b..3a7d51fd 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,5 +1,5 @@ SFX_Cry19_2_Ch5: - duty_cycle_pattern 27 + duty_cycle_pattern 0, 1, 2, 3 square_note 7, 13, 2, 1856 square_note 15, 14, 5, 1888 square_note 15, 12, 1, 1840 @@ -7,7 +7,7 @@ SFX_Cry19_2_Ch5: SFX_Cry19_2_Ch6: - duty_cycle_pattern 129 + duty_cycle_pattern 2, 0, 0, 1 square_note 2, 12, 2, 1793 square_note 4, 12, 2, 1800 square_note 15, 13, 7, 1857 diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 51c113b6..965e6cf0 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,5 +1,5 @@ SFX_Cry19_3_Ch5: - duty_cycle_pattern 27 + duty_cycle_pattern 0, 1, 2, 3 square_note 7, 13, 2, 1856 square_note 15, 14, 5, 1888 square_note 15, 12, 1, 1840 @@ -7,7 +7,7 @@ SFX_Cry19_3_Ch5: SFX_Cry19_3_Ch6: - duty_cycle_pattern 129 + duty_cycle_pattern 2, 0, 0, 1 square_note 2, 12, 2, 1793 square_note 4, 12, 2, 1800 square_note 15, 13, 7, 1857 diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 3209263a..f319878a 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,5 +1,5 @@ SFX_Cry1A_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1856 square_note 12, 14, 6, 1860 square_note 6, 13, 5, 1872 @@ -10,7 +10,7 @@ SFX_Cry1A_1_Ch5: SFX_Cry1A_1_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 6, 12, 7, 1793 square_note 11, 11, 6, 1794 square_note 6, 10, 5, 1809 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index a8dca4fc..64fd0674 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,5 +1,5 @@ SFX_Cry1A_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1856 square_note 12, 14, 6, 1860 square_note 6, 13, 5, 1872 @@ -10,7 +10,7 @@ SFX_Cry1A_2_Ch5: SFX_Cry1A_2_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 6, 12, 7, 1793 square_note 11, 11, 6, 1794 square_note 6, 10, 5, 1809 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 0fc9574d..a55f0dcf 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,5 +1,5 @@ SFX_Cry1A_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1856 square_note 12, 14, 6, 1860 square_note 6, 13, 5, 1872 @@ -10,7 +10,7 @@ SFX_Cry1A_3_Ch5: SFX_Cry1A_3_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 6, 12, 7, 1793 square_note 11, 11, 6, 1794 square_note 6, 10, 5, 1809 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 8a228ec3..0070a0f1 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,5 +1,5 @@ SFX_Cry1B_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1728 square_note 15, 14, 7, 1792 square_note 4, 15, 4, 1776 @@ -9,7 +9,7 @@ SFX_Cry1B_1_Ch5: SFX_Cry1B_1_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 7, 14, 6, 1665 square_note 14, 13, 5, 1729 square_note 4, 12, 4, 1713 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 97f85337..9453ce9b 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,5 +1,5 @@ SFX_Cry1B_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1728 square_note 15, 14, 7, 1792 square_note 4, 15, 4, 1776 @@ -9,7 +9,7 @@ SFX_Cry1B_2_Ch5: SFX_Cry1B_2_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 7, 14, 6, 1665 square_note 14, 13, 5, 1729 square_note 4, 12, 4, 1713 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 27b7f633..f6a1d76a 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,5 +1,5 @@ SFX_Cry1B_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 7, 1728 square_note 15, 14, 7, 1792 square_note 4, 15, 4, 1776 @@ -9,7 +9,7 @@ SFX_Cry1B_3_Ch5: SFX_Cry1B_3_Ch6: - duty_cycle_pattern 10 + duty_cycle_pattern 0, 0, 2, 2 square_note 7, 14, 6, 1665 square_note 14, 13, 5, 1729 square_note 4, 12, 4, 1713 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 50e29a0e..929835a5 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,5 +1,5 @@ SFX_Cry1C_1_Ch5: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 7, 13, 6, 2017 square_note 6, 12, 6, 2018 square_note 9, 13, 6, 2017 @@ -12,7 +12,7 @@ SFX_Cry1C_1_Ch5: SFX_Cry1C_1_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 6, 12, 3, 1993 square_note 6, 11, 3, 1991 square_note 10, 12, 4, 1987 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index e73f557c..c9f23916 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,5 +1,5 @@ SFX_Cry1C_2_Ch5: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 7, 13, 6, 2017 square_note 6, 12, 6, 2018 square_note 9, 13, 6, 2017 @@ -12,7 +12,7 @@ SFX_Cry1C_2_Ch5: SFX_Cry1C_2_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 6, 12, 3, 1993 square_note 6, 11, 3, 1991 square_note 10, 12, 4, 1987 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 282804b2..7b18f038 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,5 +1,5 @@ SFX_Cry1C_3_Ch5: - duty_cycle_pattern 245 + duty_cycle_pattern 3, 3, 1, 1 square_note 7, 13, 6, 2017 square_note 6, 12, 6, 2018 square_note 9, 13, 6, 2017 @@ -12,7 +12,7 @@ SFX_Cry1C_3_Ch5: SFX_Cry1C_3_Ch6: - duty_cycle_pattern 68 + duty_cycle_pattern 1, 0, 1, 0 square_note 6, 12, 3, 1993 square_note 6, 11, 3, 1991 square_note 10, 12, 4, 1987 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 97fd2d31..a532ec5c 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,5 +1,5 @@ SFX_Cry1D_1_Ch5: - duty_cycle_pattern 244 + duty_cycle_pattern 3, 3, 1, 0 square_note 15, 15, 0, 1797 square_note 10, 14, 0, 1792 square_note 6, 11, 4, 1808 @@ -10,7 +10,7 @@ SFX_Cry1D_1_Ch5: SFX_Cry1D_1_Ch6: - duty_cycle_pattern 34 + duty_cycle_pattern 0, 2, 0, 2 square_note 15, 11, 0, 1731 square_note 10, 10, 0, 1729 square_note 6, 8, 4, 1746 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 5fc0a453..c919ba1e 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,5 +1,5 @@ SFX_Cry1D_2_Ch5: - duty_cycle_pattern 244 + duty_cycle_pattern 3, 3, 1, 0 square_note 15, 15, 0, 1797 square_note 10, 14, 0, 1792 square_note 6, 11, 4, 1808 @@ -10,7 +10,7 @@ SFX_Cry1D_2_Ch5: SFX_Cry1D_2_Ch6: - duty_cycle_pattern 34 + duty_cycle_pattern 0, 2, 0, 2 square_note 15, 11, 0, 1731 square_note 10, 10, 0, 1729 square_note 6, 8, 4, 1746 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index f86dd102..47e38997 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,5 +1,5 @@ SFX_Cry1D_3_Ch5: - duty_cycle_pattern 244 + duty_cycle_pattern 3, 3, 1, 0 square_note 15, 15, 0, 1797 square_note 10, 14, 0, 1792 square_note 6, 11, 4, 1808 @@ -10,7 +10,7 @@ SFX_Cry1D_3_Ch5: SFX_Cry1D_3_Ch6: - duty_cycle_pattern 34 + duty_cycle_pattern 0, 2, 0, 2 square_note 15, 11, 0, 1731 square_note 10, 10, 0, 1729 square_note 6, 8, 4, 1746 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index c3106e7b..19634a5e 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,5 +1,5 @@ SFX_Cry1E_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 2, 1536 square_note 6, 14, 2, 1600 square_note 6, 13, 2, 1664 @@ -12,7 +12,7 @@ SFX_Cry1E_1_Ch5: SFX_Cry1E_1_Ch6: - duty_cycle_pattern 17 + duty_cycle_pattern 0, 1, 0, 1 square_note 3, 0, 8, 1 square_note 6, 12, 2, 1473 square_note 6, 11, 2, 1538 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 1c904ce4..74004489 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,5 +1,5 @@ SFX_Cry1E_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 2, 1536 square_note 6, 14, 2, 1600 square_note 6, 13, 2, 1664 @@ -12,7 +12,7 @@ SFX_Cry1E_2_Ch5: SFX_Cry1E_2_Ch6: - duty_cycle_pattern 17 + duty_cycle_pattern 0, 1, 0, 1 square_note 3, 0, 8, 1 square_note 6, 12, 2, 1473 square_note 6, 11, 2, 1538 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 6fae812c..357c2f71 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,5 +1,5 @@ SFX_Cry1E_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 6, 15, 2, 1536 square_note 6, 14, 2, 1600 square_note 6, 13, 2, 1664 @@ -12,7 +12,7 @@ SFX_Cry1E_3_Ch5: SFX_Cry1E_3_Ch6: - duty_cycle_pattern 17 + duty_cycle_pattern 0, 1, 0, 1 square_note 3, 0, 8, 1 square_note 6, 12, 2, 1473 square_note 6, 11, 2, 1538 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 63148b92..1f5b3a8d 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,5 +1,5 @@ SFX_Cry1F_1_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 3, 15, 4, 1601 square_note 13, 13, 6, 1825 square_note 8, 15, 4, 1817 @@ -8,7 +8,7 @@ SFX_Cry1F_1_Ch5: SFX_Cry1F_1_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 4, 15, 4, 1408 square_note 14, 14, 6, 1760 square_note 8, 13, 5, 1752 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 868975f8..99f3a056 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,5 +1,5 @@ SFX_Cry1F_2_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 3, 15, 4, 1601 square_note 13, 13, 6, 1825 square_note 8, 15, 4, 1817 @@ -8,7 +8,7 @@ SFX_Cry1F_2_Ch5: SFX_Cry1F_2_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 4, 15, 4, 1408 square_note 14, 14, 6, 1760 square_note 8, 13, 5, 1752 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index cc5a6192..c9cf5441 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,5 +1,5 @@ SFX_Cry1F_3_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 3, 15, 4, 1601 square_note 13, 13, 6, 1825 square_note 8, 15, 4, 1817 @@ -8,7 +8,7 @@ SFX_Cry1F_3_Ch5: SFX_Cry1F_3_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 4, 15, 4, 1408 square_note 14, 14, 6, 1760 square_note 8, 13, 5, 1752 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 888aeb61..15a160ae 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,5 +1,5 @@ SFX_Cry20_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 13, 15, 1, 1297 square_note 13, 14, 1, 1301 square_note 13, 14, 1, 1297 @@ -8,7 +8,7 @@ SFX_Cry20_1_Ch5: SFX_Cry20_1_Ch6: - duty_cycle_pattern 21 + duty_cycle_pattern 0, 1, 1, 1 square_note 12, 14, 1, 1292 square_note 12, 13, 1, 1296 square_note 14, 12, 1, 1292 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index ed22a3f0..281e478c 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,5 +1,5 @@ SFX_Cry20_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 13, 15, 1, 1297 square_note 13, 14, 1, 1301 square_note 13, 14, 1, 1297 @@ -8,7 +8,7 @@ SFX_Cry20_2_Ch5: SFX_Cry20_2_Ch6: - duty_cycle_pattern 21 + duty_cycle_pattern 0, 1, 1, 1 square_note 12, 14, 1, 1292 square_note 12, 13, 1, 1296 square_note 14, 12, 1, 1292 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 6295e936..8191ca6e 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,5 +1,5 @@ SFX_Cry20_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 13, 15, 1, 1297 square_note 13, 14, 1, 1301 square_note 13, 14, 1, 1297 @@ -8,7 +8,7 @@ SFX_Cry20_3_Ch5: SFX_Cry20_3_Ch6: - duty_cycle_pattern 21 + duty_cycle_pattern 0, 1, 1, 1 square_note 12, 14, 1, 1292 square_note 12, 13, 1, 1296 square_note 14, 12, 1, 1292 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index d9df1eca..2cf517a8 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,5 +1,5 @@ SFX_Cry21_1_Ch5: - duty_cycle_pattern 27 + duty_cycle_pattern 0, 1, 2, 3 square_note 3, 15, 3, 1380 square_note 2, 14, 2, 1348 square_note 5, 13, 1, 1314 @@ -12,7 +12,7 @@ SFX_Cry21_1_Ch5: SFX_Cry21_1_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 3, 13, 3, 1376 square_note 2, 12, 2, 1344 square_note 5, 12, 1, 1312 diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index f506e124..8136de63 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,5 +1,5 @@ SFX_Cry21_2_Ch5: - duty_cycle_pattern 27 + duty_cycle_pattern 0, 1, 2, 3 square_note 3, 15, 3, 1380 square_note 2, 14, 2, 1348 square_note 5, 13, 1, 1314 @@ -12,7 +12,7 @@ SFX_Cry21_2_Ch5: SFX_Cry21_2_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 3, 13, 3, 1376 square_note 2, 12, 2, 1344 square_note 5, 12, 1, 1312 diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index c93a4784..d829f9f2 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,5 +1,5 @@ SFX_Cry21_3_Ch5: - duty_cycle_pattern 27 + duty_cycle_pattern 0, 1, 2, 3 square_note 3, 15, 3, 1380 square_note 2, 14, 2, 1348 square_note 5, 13, 1, 1314 @@ -12,7 +12,7 @@ SFX_Cry21_3_Ch5: SFX_Cry21_3_Ch6: - duty_cycle_pattern 204 + duty_cycle_pattern 3, 0, 3, 0 square_note 3, 13, 3, 1376 square_note 2, 12, 2, 1344 square_note 5, 12, 1, 1312 diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 72ea2db3..dd910103 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,5 +1,5 @@ SFX_Cry22_1_Ch5: - duty_cycle_pattern 17 + duty_cycle_pattern 0, 1, 0, 1 square_note 2, 3, -5, 897 square_note 7, 15, 5, 1537 square_note 1, 12, 2, 1153 @@ -8,7 +8,7 @@ SFX_Cry22_1_Ch5: SFX_Cry22_1_Ch6: - duty_cycle_pattern 238 + duty_cycle_pattern 3, 2, 3, 2 square_note 2, 3, -6, 1456 square_note 7, 13, 5, 1885 square_note 1, 11, 2, 1712 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 9492f818..43e09d67 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,5 +1,5 @@ SFX_Cry22_2_Ch5: - duty_cycle_pattern 17 + duty_cycle_pattern 0, 1, 0, 1 square_note 2, 3, -5, 897 square_note 7, 15, 5, 1537 square_note 1, 12, 2, 1153 @@ -8,7 +8,7 @@ SFX_Cry22_2_Ch5: SFX_Cry22_2_Ch6: - duty_cycle_pattern 238 + duty_cycle_pattern 3, 2, 3, 2 square_note 2, 3, -6, 1456 square_note 7, 13, 5, 1885 square_note 1, 11, 2, 1712 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 55cce857..397edba1 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,5 +1,5 @@ SFX_Cry22_3_Ch5: - duty_cycle_pattern 17 + duty_cycle_pattern 0, 1, 0, 1 square_note 2, 3, -5, 897 square_note 7, 15, 5, 1537 square_note 1, 12, 2, 1153 @@ -8,7 +8,7 @@ SFX_Cry22_3_Ch5: SFX_Cry22_3_Ch6: - duty_cycle_pattern 238 + duty_cycle_pattern 3, 2, 3, 2 square_note 2, 3, -6, 1456 square_note 7, 13, 5, 1885 square_note 1, 11, 2, 1712 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index bd93eb67..5aeafe0f 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,5 +1,5 @@ SFX_Cry23_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1984 square_note 6, 14, 4, 1985 square_note 10, 15, 6, 1984 @@ -9,7 +9,7 @@ SFX_Cry23_1_Ch5: SFX_Cry23_1_Ch6: - duty_cycle_pattern 95 + duty_cycle_pattern 1, 1, 3, 3 square_note 15, 9, 7, 1921 square_note 6, 8, 4, 1920 square_note 10, 9, 6, 1921 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 78932fd9..04e4136b 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,5 +1,5 @@ SFX_Cry23_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1984 square_note 6, 14, 4, 1985 square_note 10, 15, 6, 1984 @@ -9,7 +9,7 @@ SFX_Cry23_2_Ch5: SFX_Cry23_2_Ch6: - duty_cycle_pattern 95 + duty_cycle_pattern 1, 1, 3, 3 square_note 15, 9, 7, 1921 square_note 6, 8, 4, 1920 square_note 10, 9, 6, 1921 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 14b52850..418e69bb 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,5 +1,5 @@ SFX_Cry23_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1984 square_note 6, 14, 4, 1985 square_note 10, 15, 6, 1984 @@ -9,7 +9,7 @@ SFX_Cry23_3_Ch5: SFX_Cry23_3_Ch6: - duty_cycle_pattern 95 + duty_cycle_pattern 1, 1, 3, 3 square_note 15, 9, 7, 1921 square_note 6, 8, 4, 1920 square_note 10, 9, 6, 1921 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 36654731..7e992707 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,5 +1,5 @@ SFX_Cry24_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1664 square_note 10, 14, 6, 1668 square_note 15, 13, 7, 1680 @@ -12,7 +12,7 @@ SFX_Cry24_1_Ch5: SFX_Cry24_1_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 15, 11, 7, 1601 square_note 10, 9, 6, 1602 square_note 15, 10, 7, 1617 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index b23a020e..d845f6ed 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,5 +1,5 @@ SFX_Cry24_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1664 square_note 10, 14, 6, 1668 square_note 15, 13, 7, 1680 @@ -12,7 +12,7 @@ SFX_Cry24_2_Ch5: SFX_Cry24_2_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 15, 11, 7, 1601 square_note 10, 9, 6, 1602 square_note 15, 10, 7, 1617 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 6a9d5bf6..e8c1f24e 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,5 +1,5 @@ SFX_Cry24_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 15, 7, 1664 square_note 10, 14, 6, 1668 square_note 15, 13, 7, 1680 @@ -12,7 +12,7 @@ SFX_Cry24_3_Ch5: SFX_Cry24_3_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 15, 11, 7, 1601 square_note 10, 9, 6, 1602 square_note 15, 10, 7, 1617 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index 670cbaae..64d59389 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,5 +1,5 @@ SFX_Cry25_1_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 6, 15, 4, 1856 square_note 15, 14, 3, 1840 square_note 4, 15, 4, 1856 @@ -9,7 +9,7 @@ SFX_Cry25_1_Ch5: SFX_Cry25_1_Ch6: - duty_cycle_pattern 119 + duty_cycle_pattern 1, 3, 1, 3 square_note 6, 12, 3, 1810 square_note 15, 11, 3, 1796 square_note 3, 12, 3, 1810 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 6b52d9bf..8ed47006 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,5 +1,5 @@ SFX_Cry25_2_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 6, 15, 4, 1856 square_note 15, 14, 3, 1840 square_note 4, 15, 4, 1856 @@ -9,7 +9,7 @@ SFX_Cry25_2_Ch5: SFX_Cry25_2_Ch6: - duty_cycle_pattern 119 + duty_cycle_pattern 1, 3, 1, 3 square_note 6, 12, 3, 1810 square_note 15, 11, 3, 1796 square_note 3, 12, 3, 1810 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index 22ce220d..f9800dc8 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,5 +1,5 @@ SFX_Cry25_3_Ch5: - duty_cycle_pattern 165 + duty_cycle_pattern 2, 2, 1, 1 square_note 6, 15, 4, 1856 square_note 15, 14, 3, 1840 square_note 4, 15, 4, 1856 @@ -9,7 +9,7 @@ SFX_Cry25_3_Ch5: SFX_Cry25_3_Ch6: - duty_cycle_pattern 119 + duty_cycle_pattern 1, 3, 1, 3 square_note 6, 12, 3, 1810 square_note 15, 11, 3, 1796 square_note 3, 12, 3, 1810 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 3142fca5..2b94cf6d 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,5 +1,5 @@ SFX_Psybeam_Ch5: - duty_cycle_pattern 161 + duty_cycle_pattern 2, 2, 0, 1 square_note 10, 15, 1, 1600 square_note 10, 15, 3, 1664 square_note 10, 15, 2, 1568 @@ -9,7 +9,7 @@ SFX_Psybeam_Ch5: SFX_Psybeam_Ch6: - duty_cycle_pattern 179 + duty_cycle_pattern 2, 3, 0, 3 square_note 10, 15, 3, 1393 square_note 7, 14, 3, 1329 square_note 10, 15, 1, 1361 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 796400a4..2a125987 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,5 +1,5 @@ SFX_Shooting_Star_Ch5: - duty_cycle_pattern 228 + duty_cycle_pattern 3, 2, 1, 0 pitch_sweep 2, -7 square_note 4, 4, 0, 2016 square_note 4, 6, 0, 2016 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index 6b237950..b7a8b4a0 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,5 +1,5 @@ SFX_Unused_1_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 14, 0, 1920 square_note 15, 15, 0, 1924 square_note 15, 12, 3, 1504 @@ -10,7 +10,7 @@ SFX_Unused_1_Ch5: SFX_Unused_1_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 square_note 15, 9, 3, 1457 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index 0a8fa9d9..7a050ea4 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,5 +1,5 @@ SFX_Unused_2_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 14, 0, 1920 square_note 15, 15, 0, 1924 square_note 15, 12, 3, 1504 @@ -10,7 +10,7 @@ SFX_Unused_2_Ch5: SFX_Unused_2_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 square_note 15, 9, 3, 1457 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index 3710e797..a204fc10 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,5 +1,5 @@ SFX_Unused_3_Ch5: - duty_cycle_pattern 240 + duty_cycle_pattern 3, 3, 0, 0 square_note 15, 14, 0, 1920 square_note 15, 15, 0, 1924 square_note 15, 12, 3, 1504 @@ -10,7 +10,7 @@ SFX_Unused_3_Ch5: SFX_Unused_3_Ch6: - duty_cycle_pattern 5 + duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 square_note 15, 9, 3, 1457 diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index a2282445..620b61ad 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -30,17 +30,22 @@ audio_header: MACRO ENDC ENDM -;format: length [0, 7], pitch change [-7, 7] +; arguments: length [0, 7], pitch change [-7, 7] +; length: length of time between pitch shifts +; pitch change: positive value means increase in pitch, negative value means decrease in pitch +; small magnitude means quick change, large magnitude means slow change pitch_sweep: MACRO db $10 - IF \2 > 0 - db (\1 << 4) | \2 - ELSE + IF \2 <= 0 db (\1 << 4) | (%1000 | (\2 * -1)) + ELSE + db (\1 << 4) | \2 ENDC ENDM -;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency +; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency +; fade: positive value means decrease in volume, negative value means increase in volume +; small magnitude means quick change, large magnitude means slow change square_note: MACRO db $20 | \1 IF \3 < 0 @@ -51,7 +56,9 @@ square_note: MACRO dw \4 ENDM -;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency +; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency +; fade: positive value means decrease in volume, negative value means increase in volume +; small magnitude means quick change, large magnitude means slow change noise_note: MACRO db $20 | \1 IF \3 < 0 @@ -75,18 +82,18 @@ A_ EQU $9 A# EQU $A B_ EQU $B -;format: pitch, length (in 16ths) +; arguments: pitch, length [1, 16] note: MACRO db (\1 << 4) | (\2 - 1) ENDM -;format: instrument, length (in 16ths) +; arguments: instrument [1, 19], length [1, 16] dnote: MACRO db $B0 | (\2 - 1) db \1 ENDM -;format: instrument [1, 3-10], length (in 16ths) +; arguments: instrument, length [1, 16] ; like dnote but one 1 byte instead of 2 ; can only be used with instruments 1-10, excluding 2 ; unused @@ -94,79 +101,103 @@ dnote_short: MACRO db (\1 << 4) | (\2 - 1) ENDM -;format: length (in 16ths) +; arguments: length [1, 16] rest: MACRO db $C0 | (\1 - 1) ENDM -;format: speed, volume, fade +; arguments: speed [0, 15], volume [0, 15], fade [-7, 7] +; fade: positive value means decrease in volume, negative value means increase in volume +; small magnitude means quick change, large magnitude means slow change note_type: MACRO db $D0 | \1 - db (\2 << 4) | \3 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC ENDM +; arguments: speed [0, 15] dspeed: MACRO db $D0 | \1 ENDM +; arguments: octave [1, 8] octave: MACRO db $E8 - \1 ENDM +; when enabled, effective frequency used is incremented by 1 toggle_perfect_pitch: MACRO db $E8 ENDM -;format: vibrato delay, rate, depth +; arguments: delay [0, 255], depth [0, 15], rate [0, 15] +; delay: time delay until vibrato effect begins +; depth: amplitude of vibrato wave +; rate: frequency of vibrato wave vibrato: MACRO db $EA db \1 db (\2 << 4) | \3 ENDM +; arguments: length [1, 256], octave [1, 8], pitch pitch_slide: MACRO db $EB - db \1 - db \2 + db \1 - 1 + db ((8 - \2) << 4) | \3 ENDM +; arguments: duty cycle [0, 3] (12.5%, 25%, 50%, 75%) duty_cycle: MACRO db $EC db \1 ENDM +; arguments: tempo [0, $ffff] +; used to calculate note delay counters +; so a smaller value means music plays faster +; ideally should be set to $100 or less to guarantee no overflow +; if larger than $100, large note speed or note length values might cause overflow +; stored in big endian tempo: MACRO db $ED db \1 / $100 db \1 % $100 ENDM +; arguments: left output enable mask, right output enable mask stereo_panning: MACRO db $EE - db \1 + db (\1 << 4) | \2 ENDM +; arguments: left master volume [0, 7], right master volume [0, 7] volume: MACRO db $F0 db (\1 << 4) | \2 ENDM +; when enabled, the sfx data is interpreted as music data execute_music: MACRO db $F8 ENDM +; arguments: duty cycle 1, duty cycle 2, duty cycle 3, duty cycle 4 duty_cycle_pattern: MACRO db $FC - db \1 + db \1 << 6 | \2 << 4 | \3 << 2 | \4 ENDM -;format: address +; arguments: address sound_call: MACRO db $FD dw \1 ENDM -;format: count, address +; arguments: count, address sound_loop: MACRO db $FE db \1 -- cgit v1.2.3 From 44b9a240d4b2dd28737fa7aff37fb7d0582b25d6 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 25 Aug 2019 09:57:50 -0500 Subject: Make pitch_sweep pitch change argument consistent with the other signed magnitude arguments --- audio/sfx/arrow_tiles_1.asm | 2 +- audio/sfx/arrow_tiles_3.asm | 2 +- audio/sfx/ball_poof.asm | 2 +- audio/sfx/battle_09.asm | 2 +- audio/sfx/battle_1e.asm | 2 +- audio/sfx/battle_24.asm | 2 +- audio/sfx/battle_32.asm | 2 +- audio/sfx/collision_1.asm | 2 +- audio/sfx/collision_3.asm | 2 +- audio/sfx/denied_1.asm | 2 +- audio/sfx/denied_3.asm | 2 +- audio/sfx/dex_page_added.asm | 2 +- audio/sfx/faint_fall.asm | 2 +- audio/sfx/faint_thud.asm | 2 +- audio/sfx/heal_ailment_1.asm | 2 +- audio/sfx/heal_ailment_2.asm | 2 +- audio/sfx/heal_ailment_3.asm | 2 +- audio/sfx/heal_hp_1.asm | 2 +- audio/sfx/heal_hp_2.asm | 2 +- audio/sfx/heal_hp_3.asm | 2 +- audio/sfx/healing_machine_1.asm | 2 +- audio/sfx/healing_machine_3.asm | 2 +- audio/sfx/intro_hip.asm | 2 +- audio/sfx/intro_hop.asm | 2 +- audio/sfx/ledge_1.asm | 2 +- audio/sfx/ledge_3.asm | 2 +- audio/sfx/poisoned_1.asm | 2 +- audio/sfx/poisoned_3.asm | 2 +- audio/sfx/psychic_m.asm | 2 +- audio/sfx/shooting_star.asm | 2 +- audio/sfx/shrink_1.asm | 2 +- audio/sfx/shrink_3.asm | 2 +- audio/sfx/teleport_enter1_1.asm | 2 +- audio/sfx/teleport_enter1_3.asm | 2 +- audio/sfx/teleport_exit1_1.asm | 2 +- audio/sfx/teleport_exit1_3.asm | 2 +- audio/sfx/teleport_exit2_1.asm | 2 +- audio/sfx/teleport_exit2_3.asm | 2 +- audio/sfx/tink_1.asm | 2 +- audio/sfx/tink_2.asm | 2 +- audio/sfx/tink_3.asm | 2 +- audio/sfx/trade_machine_1.asm | 2 +- audio/sfx/trade_machine_3.asm | 2 +- audio/sfx/withdraw_deposit_1.asm | 2 +- audio/sfx/withdraw_deposit_3.asm | 2 +- macros/audio_macros.asm | 7 ++++++- 46 files changed, 51 insertions(+), 46 deletions(-) diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 0ab4cbe2..30d12c8b 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -2,5 +2,5 @@ SFX_Arrow_Tiles_1_Ch5: duty_cycle 0 pitch_sweep 1, 7 square_note 15, 13, 2, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 787e431d..81c1774a 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -2,5 +2,5 @@ SFX_Arrow_Tiles_3_Ch5: duty_cycle 0 pitch_sweep 1, 7 square_note 15, 13, 2, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 9503c570..396adf44 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -2,7 +2,7 @@ SFX_Ball_Poof_Ch5: duty_cycle 2 pitch_sweep 1, 6 square_note 15, 15, 2, 1024 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index ef3cf017..7a61373b 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -2,5 +2,5 @@ SFX_Battle_09_Ch5: duty_cycle 1 pitch_sweep 9, 7 square_note 15, 15, 2, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index ff4b0cbc..26820e8d 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -4,7 +4,7 @@ SFX_Battle_1E_Ch5: square_note 4, 15, 2, 512 pitch_sweep 2, 2 square_note 8, 14, 2, 512 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 5b6c8e56..f99cf59a 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -2,7 +2,7 @@ SFX_Battle_24_Ch5: duty_cycle 1 pitch_sweep 9, 7 square_note 15, 15, 2, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 53dfac32..c906dcac 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -2,7 +2,7 @@ SFX_Battle_32_Ch5: duty_cycle 2 pitch_sweep 10, -7 square_note 8, 15, 1, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index a6303265..70eb33ae 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -2,5 +2,5 @@ SFX_Collision_1_Ch5: duty_cycle 2 pitch_sweep 5, -2 square_note 15, 15, 1, 768 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index ae68314a..8b557bcc 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -2,5 +2,5 @@ SFX_Collision_3_Ch5: duty_cycle 2 pitch_sweep 5, -2 square_note 15, 15, 1, 768 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index fe822270..2c132003 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -2,7 +2,7 @@ SFX_Denied_1_Ch5: duty_cycle 3 pitch_sweep 5, -2 square_note 4, 15, 0, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 square_note 4, 0, 0, 0 square_note 15, 15, 0, 1280 square_note 1, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 51b98de4..56a0753f 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -2,7 +2,7 @@ SFX_Denied_3_Ch5: duty_cycle 3 pitch_sweep 5, -2 square_note 4, 15, 0, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 square_note 4, 0, 0, 0 square_note 15, 15, 0, 1280 square_note 1, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 147c3eb7..555b3beb 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -4,7 +4,7 @@ SFX_Dex_Page_Added_Ch5: square_note 15, 15, 0, 1264 pitch_sweep 1, 7 square_note 15, 15, 2, 1616 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index 6ce363e0..47f45037 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -2,5 +2,5 @@ SFX_Faint_Fall_Ch5: duty_cycle 1 pitch_sweep 10, -7 square_note 15, 15, 2, 1920 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index d7449c84..527e027f 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,6 +1,6 @@ SFX_Faint_Thud_Ch5: square_note 15, 13, 1, 512 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index a14afe1a..88a92881 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -5,5 +5,5 @@ SFX_Heal_Ailment_1_Ch5: square_note 4, 15, 2, 1536 pitch_sweep 1, 7 square_note 15, 15, 2, 1536 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 81171c12..6e3e68d9 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -5,5 +5,5 @@ SFX_Heal_Ailment_2_Ch5: square_note 4, 15, 2, 1536 pitch_sweep 1, 7 square_note 15, 15, 2, 1536 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index b1a0a570..660d9abe 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -5,5 +5,5 @@ SFX_Heal_Ailment_3_Ch5: square_note 4, 15, 2, 1536 pitch_sweep 1, 7 square_note 15, 15, 2, 1536 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index f6413962..8dafb807 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -3,5 +3,5 @@ SFX_Heal_HP_1_Ch5: pitch_sweep 1, 7 square_note 15, 15, 0, 1264 square_note 15, 15, 2, 1616 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index c784c174..9eef9472 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -3,5 +3,5 @@ SFX_Heal_HP_2_Ch5: pitch_sweep 1, 7 square_note 15, 15, 0, 1264 square_note 15, 15, 2, 1616 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index 7ca9d73b..22651532 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -3,5 +3,5 @@ SFX_Heal_HP_3_Ch5: pitch_sweep 1, 7 square_note 15, 15, 0, 1264 square_note 15, 15, 2, 1616 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 59d3f21a..9350ffd3 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -4,6 +4,6 @@ SFX_Healing_Machine_1_Ch5: square_note 4, 15, 2, 1280 pitch_sweep 2, 2 square_note 2, 15, 1, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 square_note 1, 0, 0, 0 sound_ret diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index 3078dba5..5df3856b 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -4,6 +4,6 @@ SFX_Healing_Machine_3_Ch5: square_note 4, 15, 2, 1280 pitch_sweep 2, 2 square_note 2, 15, 1, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 square_note 1, 0, 0, 0 sound_ret diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 47e37c21..3d0f6642 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -2,5 +2,5 @@ SFX_Intro_Hip_Ch5: duty_cycle 2 pitch_sweep 2, 6 square_note 12, 12, 2, 1856 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 1bee7a5c..9c7c1ad6 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -2,5 +2,5 @@ SFX_Intro_Hop_Ch5: duty_cycle 2 pitch_sweep 2, 6 square_note 12, 12, 2, 1664 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 6cfb4d26..dd798f40 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -2,5 +2,5 @@ SFX_Ledge_1_Ch5: duty_cycle 2 pitch_sweep 9, 5 square_note 15, 15, 2, 1024 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 97627116..c218ee1b 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -2,5 +2,5 @@ SFX_Ledge_3_Ch5: duty_cycle 2 pitch_sweep 9, 5 square_note 15, 15, 2, 1024 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 2c922df7..6827147c 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -4,5 +4,5 @@ SFX_Poisoned_1_Ch5: square_note 4, 15, 2, 1536 sound_loop 4, SFX_Poisoned_1_Ch5 square_note 15, 15, 3, 1536 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index 2c0b58cc..fa1808c3 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -4,5 +4,5 @@ SFX_Poisoned_3_Ch5: square_note 4, 15, 2, 1536 sound_loop 4, SFX_Poisoned_3_Ch5 square_note 15, 15, 3, 1536 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index c6e11d42..ff0ab384 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -7,7 +7,7 @@ SFX_Psychic_M_Ch5: square_note 8, 12, 4, 1984 square_note 15, 12, 4, 1985 square_note 15, 15, 2, 1984 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 2a125987..cbef7398 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -10,5 +10,5 @@ SFX_Shooting_Star_Ch5: square_note 8, 6, 0, 2016 square_note 8, 3, 0, 2016 square_note 15, 1, 2, 2016 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index ae869564..912dd3f9 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -6,5 +6,5 @@ SFX_Shrink_1_Ch5: square_note 15, 8, 7, 1280 square_note 15, 4, 7, 1152 square_note 15, 1, 7, 1024 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index b944680f..88da25c2 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -6,5 +6,5 @@ SFX_Shrink_3_Ch5: square_note 15, 8, 7, 1280 square_note 15, 4, 7, 1152 square_note 15, 1, 7, 1024 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 4f99dae1..eddaffa6 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -6,5 +6,5 @@ SFX_Teleport_Enter1_1_Ch5: square_note 15, 8, 7, 1536 square_note 15, 4, 7, 1408 square_note 15, 1, 7, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index c6502a29..fc185621 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -6,5 +6,5 @@ SFX_Teleport_Enter1_3_Ch5: square_note 15, 8, 7, 1536 square_note 15, 4, 7, 1408 square_note 15, 1, 7, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index b2511b1f..5e27525e 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -6,5 +6,5 @@ SFX_Teleport_Exit1_1_Ch5: square_note 15, 8, 7, 1536 square_note 15, 4, 7, 1664 square_note 15, 1, 7, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 6a3b2d96..350da576 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -6,5 +6,5 @@ SFX_Teleport_Exit1_3_Ch5: square_note 15, 8, 7, 1536 square_note 15, 4, 7, 1664 square_note 15, 1, 7, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 23a6ea85..a2a36942 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -2,5 +2,5 @@ SFX_Teleport_Exit2_1_Ch5: duty_cycle 1 pitch_sweep 1, 6 square_note 15, 13, 2, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 178a4d78..70d809c3 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -2,5 +2,5 @@ SFX_Teleport_Exit2_3_Ch5: duty_cycle 1 pitch_sweep 1, 6 square_note 15, 13, 2, 1280 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 4e471fab..7d56a081 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -4,5 +4,5 @@ SFX_Tink_1_Ch5: square_note 4, 15, 2, 512 pitch_sweep 2, 2 square_note 8, 14, 2, 512 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index 077d93be..94aa8929 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -4,5 +4,5 @@ SFX_Tink_2_Ch5: square_note 4, 15, 2, 512 pitch_sweep 2, 2 square_note 8, 14, 2, 512 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index e06ed62e..1134fdc4 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -4,5 +4,5 @@ SFX_Tink_3_Ch5: square_note 4, 15, 2, 512 pitch_sweep 2, 2 square_note 8, 14, 2, 512 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 050182b7..f09982eb 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -3,5 +3,5 @@ SFX_Trade_Machine_1_Ch5: pitch_sweep 1, 5 square_note 15, 15, 0, 1264 square_note 15, 15, 2, 1616 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index d14fc4c1..a85b717e 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -3,5 +3,5 @@ SFX_Trade_Machine_3_Ch5: pitch_sweep 1, 5 square_note 15, 15, 0, 1264 square_note 15, 15, 2, 1616 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 9c4f2868..c7ab2447 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -8,5 +8,5 @@ SFX_Withdraw_Deposit_1_Ch5: square_note 4, 15, 2, 1792 pitch_sweep 2, 2 square_note 15, 14, 2, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index cd881753..568f3230 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -8,5 +8,5 @@ SFX_Withdraw_Deposit_3_Ch5: square_note 4, 15, 2, 1792 pitch_sweep 2, 2 square_note 15, 14, 2, 1792 - pitch_sweep 0, 0 + pitch_sweep 0, 8 sound_ret diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 620b61ad..643114da 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -32,11 +32,13 @@ ENDM ; arguments: length [0, 7], pitch change [-7, 7] ; length: length of time between pitch shifts +; sometimes used with a value >7 in which case the MSB is ignored ; pitch change: positive value means increase in pitch, negative value means decrease in pitch ; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 pitch_sweep: MACRO db $10 - IF \2 <= 0 + IF \2 < 0 db (\1 << 4) | (%1000 | (\2 * -1)) ELSE db (\1 << 4) | \2 @@ -46,6 +48,7 @@ ENDM ; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency ; fade: positive value means decrease in volume, negative value means increase in volume ; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 square_note: MACRO db $20 | \1 IF \3 < 0 @@ -59,6 +62,7 @@ ENDM ; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency ; fade: positive value means decrease in volume, negative value means increase in volume ; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 noise_note: MACRO db $20 | \1 IF \3 < 0 @@ -109,6 +113,7 @@ ENDM ; arguments: speed [0, 15], volume [0, 15], fade [-7, 7] ; fade: positive value means decrease in volume, negative value means increase in volume ; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 note_type: MACRO db $D0 | \1 IF \3 < 0 -- cgit v1.2.3 From f4cc5663b2e3e044a8c961d32e0622df331d87bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Urs-Bj=C3=B6rn=20Schmidt?= Date: Sun, 25 Aug 2019 22:31:28 +0200 Subject: Fixed some wrong wram addresses within comments. --- wram.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wram.asm b/wram.asm index 75331a61..9cb7c8ea 100755 --- a/wram.asm +++ b/wram.asm @@ -1319,7 +1319,7 @@ wAIItem:: ; cf05 ; the item that the AI used ds 1 -wUsedItemOnWhichPokemon:: ; cf05 +wUsedItemOnWhichPokemon:: ; cf06 ds 1 wAnimSoundID:: ; cf07 @@ -1767,7 +1767,7 @@ wPlayerNumHits:: ; d074 wPlayerBideAccumulatedDamage:: ; d074 ; the amount of damage accumulated by the player while biding (2 bytes) -wUnknownSerialCounter2:: ; d075 +wUnknownSerialCounter2:: ; d074 ; 2 bytes ds 4 @@ -3082,7 +3082,7 @@ wCardKeyDoorX:: ; d740 wFirstLockTrashCanIndex:: ; d743 ds 1 -wSecondLockTrashCanIndex:: ; d743 +wSecondLockTrashCanIndex:: ; d744 ds 1 ds 2 -- cgit v1.2.3 From 362bba7642431d87371cb86c9442e7636fcd287b Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 3 Sep 2019 22:36:02 -0500 Subject: Rename dnote to drum_note and dspeed to drum_speed --- audio/engine_1.asm | 10 +- audio/engine_2.asm | 10 +- audio/engine_3.asm | 10 +- audio/music/bikeriding.asm | 30 +-- audio/music/cinnabarmansion.asm | 32 +-- audio/music/cities1.asm | 88 ++++----- audio/music/dungeon1.asm | 66 +++---- audio/music/dungeon2.asm | 18 +- audio/music/dungeon3.asm | 2 +- audio/music/indigoplateau.asm | 134 ++++++------- audio/music/introbattle.asm | 188 +++++++++--------- audio/music/lavender.asm | 6 +- audio/music/museumguy.asm | 128 ++++++------ audio/music/routes1.asm | 110 +++++------ audio/music/routes2.asm | 160 +++++++-------- audio/music/routes3.asm | 310 ++++++++++++++--------------- audio/music/routes4.asm | 334 ++++++++++++++++---------------- audio/music/titlescreen.asm | 284 +++++++++++++-------------- audio/music/vermilion.asm | 52 ++--- audio/music/yellow/yellowunusedsong.asm | 236 +++++++++++----------- macros/audio_macros.asm | 8 +- 21 files changed, 1108 insertions(+), 1108 deletions(-) diff --git a/audio/engine_1.asm b/audio/engine_1.asm index a8389819..11962d55 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -647,8 +647,8 @@ Audio1_note: jr nz, Audio1_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, .dnote + cp $b0 ; is this command a drum_note? + jr z, .drum_note jr nc, Audio1_note_length ; no ; this executes when on the noise channel and @@ -657,7 +657,7 @@ Audio1_note: ; and the lower nybble is the length minus 1 (0-15) ; however, this doesn't work for instrument #2 because the command id ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a dnote command that is only 1 byte + ; this essentially acts like a drum_note command that is only 1 byte ; instead of 2 and can only be used with instruments 1 and 3 through 10 ; this is unused by the game swap a @@ -670,12 +670,12 @@ Audio1_note: push bc jr .playDnote -.dnote +.drum_note ld a, d and $f push af push bc - call Audio1_GetNextMusicByte ; get dnote instrument + call Audio1_GetNextMusicByte ; get drum_note instrument .playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] diff --git a/audio/engine_2.asm b/audio/engine_2.asm index df719c67..026ade7c 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -658,8 +658,8 @@ Audio2_note: jr nz, Audio2_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, .dnote + cp $b0 ; is this command a drum_note? + jr z, .drum_note jr nc, Audio2_note_length ; no ; this executes when on the noise channel and @@ -668,7 +668,7 @@ Audio2_note: ; and the lower nybble is the length minus 1 (0-15) ; however, this doesn't work for instrument #2 because the command id ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a dnote command that is only 1 byte + ; this essentially acts like a drum_note command that is only 1 byte ; instead of 2 and can only be used with instruments 1 and 3 through 10 ; this is unused by the game swap a @@ -681,12 +681,12 @@ Audio2_note: push bc jr .playDnote -.dnote +.drum_note ld a, d and $f push af push bc - call Audio2_GetNextMusicByte ; get dnote instrument + call Audio2_GetNextMusicByte ; get drum_note instrument .playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] diff --git a/audio/engine_3.asm b/audio/engine_3.asm index f329c0c3..4085dd3c 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -647,8 +647,8 @@ Audio3_note: jr nz, Audio3_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, .dnote + cp $b0 ; is this command a drum_note? + jr z, .drum_note jr nc, Audio3_note_length ; no ; this executes when on the noise channel and @@ -657,7 +657,7 @@ Audio3_note: ; and the lower nybble is the length minus 1 (0-15) ; however, this doesn't work for instrument #2 because the command id ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a dnote command that is only 1 byte + ; this essentially acts like a drum_note command that is only 1 byte ; instead of 2 and can only be used with instruments 1 and 3 through 10 ; this is unused by the game swap a @@ -670,12 +670,12 @@ Audio3_note: push bc jr .playDnote -.dnote +.drum_note ld a, d and $f push af push bc - call Audio3_GetNextMusicByte ; get dnote instrument + call Audio3_GetNextMusicByte ; get drum_note instrument .playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index ef293f54..302e5cf9 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -644,7 +644,7 @@ Music_BikeRiding_branch_7dd17:: Music_BikeRiding_Ch4:: - dspeed 12 + drum_speed 12 rest 2 Music_BikeRiding_branch_7de6a:: @@ -671,34 +671,34 @@ Music_BikeRiding_branch_7de6a:: Music_BikeRiding_branch_7dea7:: rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 sound_ret Music_BikeRiding_branch_7deb4:: rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 - dnote 16, 2 - dnote 16, 2 + drum_note 16, 2 + drum_note 16, 2 + drum_note 16, 2 sound_ret Music_BikeRiding_branch_7dec2:: rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 1 - dnote 16, 1 + drum_note 16, 1 + drum_note 16, 1 sound_ret diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 165c4e98..ac6c08c3 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -144,29 +144,29 @@ Music_CinnabarMansion_branch_7ed80:: Music_CinnabarMansion_Ch4:: - dspeed 6 + drum_speed 6 rest 16 rest 16 rest 16 rest 16 Music_CinnabarMansion_branch_7edb5:: - dnote 12, 2 - dnote 12, 2 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 - dnote 14, 4 - dnote 12, 2 - dnote 12, 2 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 14, 4 + drum_note 12, 2 + drum_note 12, 2 rest 2 rest 10 rest 8 - dnote 14, 8 + drum_note 14, 8 sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 006546ef..00ca3b5f 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -580,7 +580,7 @@ Music_Cities1_branch_acce:: Music_Cities1_Ch4:: - dspeed 12 + drum_speed 12 sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: @@ -591,67 +591,67 @@ Music_Cities1_branch_acf3:: sound_call Music_Cities1_branch_ad36 sound_call Music_Cities1_branch_ad5f sound_call Music_Cities1_branch_ad52 - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 sound_call Music_Cities1_branch_ad6e sound_call Music_Cities1_branch_ad5f sound_call Music_Cities1_branch_ad52 sound_call Music_Cities1_branch_ad6e sound_call Music_Cities1_branch_ad52 - dnote 6, 6 - dnote 6, 6 - dnote 7, 2 - dnote 6, 2 - dnote 6, 6 - dnote 6, 6 - dnote 6, 4 - dnote 6, 6 - dnote 8, 6 - dnote 8, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 6 + drum_note 8, 6 + drum_note 8, 4 sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - dnote 8, 6 - dnote 8, 6 - dnote 8, 4 - dnote 8, 6 - dnote 8, 6 - dnote 8, 2 - dnote 8, 2 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 2 + drum_note 8, 2 sound_ret Music_Cities1_branch_ad45:: - dnote 8, 6 - dnote 8, 6 - dnote 8, 4 - dnote 8, 6 - dnote 8, 6 - dnote 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 sound_ret Music_Cities1_branch_ad52:: - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 sound_ret Music_Cities1_branch_ad5f:: - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 - dnote 6, 6 - dnote 6, 6 - dnote 7, 2 - dnote 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 sound_ret Music_Cities1_branch_ad6e:: - dnote 6, 6 - dnote 6, 6 - dnote 7, 2 - dnote 7, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 7, 2 sound_ret diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index 76b8d168..49c6f89c 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -597,27 +597,27 @@ Music_Dungeon1_branch_7e177:: Music_Dungeon1_Ch4:: - dspeed 12 + drum_speed 12 rest 14 - dnote 12, 1 - dnote 12, 1 + drum_note 12, 1 + drum_note 12, 1 Music_Dungeon1_branch_7e190:: sound_call Music_Dungeon1_branch_7e1f1 sound_loop 3, Music_Dungeon1_branch_7e190 - dnote 13, 4 - dnote 12, 4 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 Music_Dungeon1_branch_7e1a1:: sound_call Music_Dungeon1_branch_7e1f1 sound_loop 3, Music_Dungeon1_branch_7e1a1 - dnote 13, 4 - dnote 12, 4 - dnote 13, 4 - dnote 13, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 13, 4 Music_Dungeon1_branch_7e1b0:: sound_call Music_Dungeon1_branch_7e1fa @@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba:: sound_call Music_Dungeon1_branch_7e1fa sound_loop 3, Music_Dungeon1_branch_7e1ba sound_call Music_Dungeon1_branch_7e202 - dnote 9, 4 - dnote 10, 4 - dnote 10, 4 + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 rest 2 - dnote 9, 2 - dnote 13, 4 + drum_note 9, 2 + drum_note 13, 4 Music_Dungeon1_branch_7e1cf:: rest 16 @@ -643,33 +643,33 @@ Music_Dungeon1_branch_7e1cf:: Music_Dungeon1_branch_7e1d5:: sound_call Music_Dungeon1_branch_7e1fa sound_loop 3, Music_Dungeon1_branch_7e1d5 - dnote 12, 4 - dnote 12, 4 - dnote 12, 4 + drum_note 12, 4 + drum_note 12, 4 + drum_note 12, 4 rest 2 - dnote 12, 1 - dnote 12, 1 + drum_note 12, 1 + drum_note 12, 1 sound_call Music_Dungeon1_branch_7e1f1 sound_call Music_Dungeon1_branch_7e1f1 sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - dnote 13, 4 - dnote 12, 4 - dnote 13, 4 - dnote 12, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 sound_ret Music_Dungeon1_branch_7e1fa:: - dnote 12, 1 - dnote 12, 1 + drum_note 12, 1 + drum_note 12, 1 rest 10 - dnote 14, 4 + drum_note 14, 4 sound_ret Music_Dungeon1_branch_7e202:: - dnote 9, 4 - dnote 10, 4 - dnote 10, 4 - dnote 11, 4 + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 11, 4 sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index e213e2a4..2167bfd7 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -303,15 +303,15 @@ Music_Dungeon2_branch_7e9d1:: Music_Dungeon2_Ch4:: - dspeed 12 + drum_speed 12 Music_Dungeon2_branch_7e9dd:: - dnote 12, 4 - dnote 13, 4 - dnote 12, 4 - dnote 10, 4 - dnote 12, 4 - dnote 13, 4 - dnote 11, 4 - dnote 9, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 10, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 11, 4 + drum_note 9, 4 sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index a72dea34..81b2ead8 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -711,7 +711,7 @@ Music_Dungeon3_Ch3:: Music_Dungeon3_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index d341ecd6..cc3c2cef 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -226,19 +226,19 @@ Music_IndigoPlateau_branch_a6fe:: Music_IndigoPlateau_Ch4:: - dspeed 6 - dnote 17, 16 - dnote 17, 16 - dnote 17, 16 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 + drum_speed 6 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 Music_IndigoPlateau_branch_a728:: sound_call Music_IndigoPlateau_branch_a791 @@ -255,67 +255,67 @@ Music_IndigoPlateau_branch_a728:: sound_call Music_IndigoPlateau_branch_a7a8 sound_call Music_IndigoPlateau_branch_a77e sound_call Music_IndigoPlateau_branch_a7a8 - dnote 17, 16 - dnote 17, 8 - dnote 18, 8 - dnote 17, 16 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 + drum_note 17, 16 + drum_note 17, 8 + drum_note 18, 8 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 18, 4 - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 19, 2 - dnote 18, 2 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 2 + drum_note 18, 2 sound_ret Music_IndigoPlateau_branch_a791:: - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 18, 4 - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 sound_ret Music_IndigoPlateau_branch_a7a8:: - dnote 17, 4 - dnote 18, 4 - dnote 17, 4 - dnote 18, 4 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index b2709b76..681631f6 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -230,100 +230,100 @@ Music_IntroBattle_Ch3:: Music_IntroBattle_Ch4:: - dspeed 6 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 16 - dnote 17, 16 - dnote 17, 16 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 16 - dnote 17, 16 - dnote 17, 2 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 2 rest 16 rest 14 sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 5d9d2ba5..70fff2e5 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -187,13 +187,13 @@ Music_Lavender_branch_bbb9:: Music_Lavender_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 rest 16 Music_Lavender_branch_bc26:: - dnote 7, 8 - dnote 7, 8 + drum_note 7, 8 + drum_note 7, 8 sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 54517752..60ebd553 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -262,76 +262,76 @@ Music_MuseumGuy_branch_aec1:: Music_MuseumGuy_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 rest 16 rest 16 rest 14 - dspeed 6 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_MuseumGuy_branch_aee1:: - dnote 17, 4 - dnote 17, 6 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 17, 6 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 17, 6 - dnote 17, 2 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 6 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 17, 2 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 6 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index 29d0d5ac..cdefb6ee 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -310,95 +310,95 @@ Music_Routes1_branch_9cdd:: Music_Routes1_Ch4:: - dspeed 12 + drum_speed 12 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 sound_loop 0, Music_Routes1_Ch4 sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 94098fc6..e6782df3 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -325,101 +325,101 @@ Music_Routes2_branch_9e9e:: Music_Routes2_Ch4:: - dspeed 12 - dnote 3, 2 + drum_speed 12 + drum_note 3, 2 rest 2 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 - dnote 3, 3 - dspeed 12 - dnote 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_speed 12 + drum_note 3, 1 rest 3 - dnote 3, 2 + drum_note 3, 2 rest 2 - dnote 3, 2 + drum_note 3, 2 rest 4 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - rest 2 - dnote 3, 2 - rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 - dnote 3, 3 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - dnote 3, 1 + drum_speed 12 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - dnote 3, 1 + drum_speed 12 + drum_note 3, 1 rest 3 - dnote 3, 2 + drum_note 3, 2 rest 2 - dnote 3, 2 + drum_note 3, 2 rest 4 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dnote 3, 3 - dnote 3, 3 - dnote 3, 3 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 3 rest 3 - dspeed 12 - dnote 3, 1 + drum_speed 12 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dnote 3, 3 + drum_note 3, 3 rest 3 sound_loop 0, Music_Routes2_Ch4 sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index d83ec8c0..26a41590 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -355,161 +355,161 @@ Music_Routes3_branch_a0a3:: Music_Routes3_Ch4:: - dspeed 6 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 18, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes3_branch_a17a:: - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 17, 10 - dnote 19, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 19, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 10 - dnote 19, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 10 - dnote 19, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 19, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 962cd36b..50679f54 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -507,175 +507,175 @@ Music_Routes4_branch_a3d7:: Music_Routes4_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 12 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes4_branch_a4a8:: - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 18, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 18, 1 - dnote 18, 1 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 18, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b814cba3..a70b2761 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -460,218 +460,218 @@ Music_TitleScreen_branch_7e6e5:: Music_TitleScreen_Ch4:: - dspeed 6 + drum_speed 6 rest 4 - dnote 3, 1 - dnote 3, 1 - dnote 4, 1 - dnote 4, 1 - dspeed 12 - dnote 2, 1 - rest 3 - dnote 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 2, 1 + rest 3 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dspeed 8 - dnote 3, 2 - dnote 4, 2 - dnote 2, 2 - dnote 3, 2 - dnote 2, 2 - dnote 1, 2 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 1, 2 Music_TitleScreen_branch_7e716:: - dspeed 12 - dnote 2, 1 + drum_speed 12 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e834 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 1 - dnote 3, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dnote 2, 1 + drum_note 2, 1 rest 1 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dspeed 6 - dnote 3, 1 - dnote 3, 1 - dnote 4, 1 - dnote 4, 1 - dspeed 12 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - dnote 3, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - dnote 4, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 4, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 rest 1 - dspeed 6 - dnote 3, 1 - dnote 3, 1 - dnote 4, 1 - dnote 4, 1 - dspeed 12 - dnote 1, 1 - rest 3 - dnote 2, 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 1, 1 + rest 3 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 1, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 4, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 1 rest 1 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - dnote 5, 1 + drum_note 5, 1 rest 5 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 - dnote 2, 1 - dnote 1, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dnote 1, 1 + drum_note 1, 1 rest 1 - dspeed 8 - dnote 2, 4 - dnote 3, 4 - dnote 1, 4 - dspeed 12 - dnote 5, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 1, 4 + drum_speed 12 + drum_note 5, 1 rest 5 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 1, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 1, 1 rest 1 - dnote 3, 1 - dnote 2, 1 - dspeed 8 - dnote 2, 4 - dnote 3, 4 - dnote 2, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 2, 4 sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 sound_ret Music_TitleScreen_branch_7e842:: - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index d45a2b1d..2788cde9 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -283,23 +283,23 @@ Music_Vermilion_branch_baa8:: Music_Vermilion_Ch4:: - dspeed 12 + drum_speed 12 Music_Vermilion_branch_bb0e:: sound_call Music_Vermilion_branch_bb3f - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 sound_loop 4, Music_Vermilion_branch_bb0e sound_call Music_Vermilion_branch_bb3f sound_call Music_Vermilion_branch_bb3f @@ -308,16 +308,16 @@ Music_Vermilion_branch_bb0e:: sound_loop 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 sound_ret diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm index 111c182d..f1e4d18f 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellow/yellowunusedsong.asm @@ -203,124 +203,124 @@ Music_YellowUnusedSong_branch_83075:: Music_YellowUnusedSong_Ch4:: - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 4 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 Music_YellowUnusedSong_branch_830c3:: - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 sound_loop 0, Music_YellowUnusedSong_branch_830c3 diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 643114da..95b9ecbc 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -92,16 +92,16 @@ note: MACRO ENDM ; arguments: instrument [1, 19], length [1, 16] -dnote: MACRO +drum_note: MACRO db $B0 | (\2 - 1) db \1 ENDM ; arguments: instrument, length [1, 16] -; like dnote but one 1 byte instead of 2 +; like drum_note but one 1 byte instead of 2 ; can only be used with instruments 1-10, excluding 2 ; unused -dnote_short: MACRO +drum_note_short: MACRO db (\1 << 4) | (\2 - 1) ENDM @@ -124,7 +124,7 @@ note_type: MACRO ENDM ; arguments: speed [0, 15] -dspeed: MACRO +drum_speed: MACRO db $D0 | \1 ENDM -- cgit v1.2.3 From 8d2afb7c1324adf6f6b70637a8300073c0a2cb81 Mon Sep 17 00:00:00 2001 From: deak311andris Date: Thu, 3 Oct 2019 15:19:30 +0200 Subject: OaksLab deobfuscation --- scripts/OaksLab.asm | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 364b157b..73d9f4ab 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -201,9 +201,9 @@ OaksLabScript8: ld de, .MiddleBallMovement1 ld a, [wYCoord] cp $4 ; is the player standing below the table? - jr z, .asm_1ccf3 + jr z, .moveBlue ld de, .MiddleBallMovement2 - jr .asm_1ccf3 + jr .moveBlue .MiddleBallMovement1 db NPC_MOVEMENT_DOWN @@ -225,9 +225,9 @@ OaksLabScript8: ld de, .RightBallMovement1 ld a, [wYCoord] cp $4 ; is the player standing below the table? - jr z, .asm_1ccf3 + jr z, .moveBlue ld de, .RightBallMovement2 - jr .asm_1ccf3 + jr .moveBlue .RightBallMovement1 db NPC_MOVEMENT_DOWN @@ -251,7 +251,7 @@ OaksLabScript8: ld de, .LeftBallMovement1 ld a, [wXCoord] cp $9 ; is the player standing to the right of the table? - jr nz, .asm_1ccf3 + jr nz, .moveBlue push hl ld a, $1 ld [H_SPRITEINDEX], a @@ -270,7 +270,7 @@ OaksLabScript8: ld [hl], $9 ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that pop hl - jr .asm_1ccf3 + jr .moveBlue .LeftBallMovement1 db NPC_MOVEMENT_DOWN @@ -279,7 +279,7 @@ OaksLabScript8: db NPC_MOVEMENT_RIGHT db $FF -.asm_1ccf3 +.moveBlue ld a, $1 ld [H_SPRITEINDEX], a call MoveSprite @@ -304,17 +304,17 @@ OaksLabScript9: call DisplayTextID ld a, [wRivalStarterBallSpriteIndex] cp $2 - jr nz, .asm_1cd28 + jr nz, .rivalDidNotChoseBall1 ld a, HS_STARTER_BALL_1 - jr .asm_1cd32 -.asm_1cd28 + jr .hideBallAndContinue +.rivalDidNotChoseBall1 cp $3 - jr nz, .asm_1cd30 + jr nz, .rivalChoseBall3 ld a, HS_STARTER_BALL_2 - jr .asm_1cd32 -.asm_1cd30 + jr .hideBallAndContinue +.rivalChoseBall3 ld a, HS_STARTER_BALL_3 -.asm_1cd32 +.hideBallAndContinue ld [wMissableObjectIndex], a predef HideObject call Delay3 @@ -473,7 +473,7 @@ OaksLabScript13: OaksLabScript14: ld a, [wd730] bit 0, a - jr nz, .asm_1ce8c + jr nz, .checkRivalPosition ld a, HS_OAKS_LAB_RIVAL ld [wMissableObjectIndex], a predef HideObject @@ -484,21 +484,21 @@ OaksLabScript14: ld [wOaksLabCurScript], a jr .done ; make the player keep facing the rival as he walks away -.asm_1ce8c +.checkRivalPosition ld a, [wNPCNumScriptedSteps] cp $5 - jr nz, .asm_1cea8 + jr nz, .turnPlayerDown ld a, [wXCoord] cp $4 - jr nz, .asm_1cea1 + jr nz, .turnPlayerLeft ld a, SPRITE_FACING_RIGHT ld [wSpriteStateData1 + 9], a jr .done -.asm_1cea1 +.turnPlayerLeft ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + 9], a jr .done -.asm_1cea8 +.turnPlayerDown cp $4 ret nz xor a ; ld a, SPRITE_FACING_DOWN @@ -767,17 +767,17 @@ OaksLabText1: jr nz, .asm_1d0de ld hl, OaksLabGaryText1 call PrintText - jr .asm_1d0f0 + jr .done .asm_1d0de bit 2, a jr nz, .asm_1d0ea ld hl, OaksLabText40 call PrintText - jr .asm_1d0f0 + jr .done .asm_1d0ea ld hl, OaksLabText41 call PrintText -.asm_1d0f0 +.done jp TextScriptEnd OaksLabGaryText1: -- cgit v1.2.3 From 2e45c2946a3cf7ba18de6b9d6fc4549165666864 Mon Sep 17 00:00:00 2001 From: deak311andris Date: Mon, 7 Oct 2019 07:23:57 +0200 Subject: Deobfuscate gyms consistently --- scripts/CeladonGym.asm | 18 +++++++++--------- scripts/CeruleanGym.asm | 18 +++++++++--------- scripts/CinnabarGym.asm | 12 ++++++------ scripts/FuchsiaGym.asm | 18 +++++++++--------- scripts/OaksLab.asm | 8 ++++---- scripts/PewterGym.asm | 18 +++++++++--------- scripts/SaffronGym.asm | 18 +++++++++--------- scripts/VermilionGym.asm | 26 +++++++++++++------------- scripts/ViridianGym.asm | 18 +++++++++--------- 9 files changed, 77 insertions(+), 77 deletions(-) diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 8ceb36ee..50c02196 100755 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -54,12 +54,12 @@ CeladonGymText_48963: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM21 - jr .asm_4898c + jr .gymVictory .BagFull ld a, $b ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_4898c +.gymVictory ld hl, wObtainedBadges set 3, [hl] ld hl, wBeatGymFlags @@ -151,17 +151,17 @@ CeladonGymTrainerHeader6: CeladonGymText1: TX_ASM CheckEvent EVENT_BEAT_ERIKA - jr z, .asm_48a2d + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM21 - jr nz, .asm_48a25 + jr nz, .afterVictory call z, CeladonGymText_48963 call DisableWaitingAfterTextDisplay - jr .asm_48a5b -.asm_48a25 + jr .done +.afterVictory ld hl, CeladonGymText_48a68 call PrintText - jr .asm_48a5b -.asm_48a2d + jr .done +.beginBattle ld hl, CeladonGymText_48a5e call PrintText ld hl, wd72d @@ -179,7 +179,7 @@ CeladonGymText1: ld a, $3 ld [wCeladonGymCurScript], a ld [wCurMapScript], a -.asm_48a5b +.done jp TextScriptEnd CeladonGymText_48a5e: diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 7d152b4f..c4aaf7de 100755 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -54,12 +54,12 @@ CeruleanGymScript_5c70d: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 - jr .asm_5c736 + jr .gymVictory .BagFull ld a, $7 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5c736 +.gymVictory ld hl, wObtainedBadges set 1, [hl] ld hl, wBeatGymFlags @@ -102,17 +102,17 @@ CeruleanGymTrainerHeader1: CeruleanGymText1: TX_ASM CheckEvent EVENT_BEAT_MISTY - jr z, .asm_5c78d + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM11 - jr nz, .asm_5c785 + jr nz, .afterVictory call z, CeruleanGymScript_5c70d call DisableWaitingAfterTextDisplay - jr .asm_5c7bb -.asm_5c785 + jr .done +.afterVictory ld hl, CeruleanGymText_5c7c3 call PrintText - jr .asm_5c7bb -.asm_5c78d + jr .done +.beginBattle ld hl, CeruleanGymText_5c7be call PrintText ld hl, wd72d @@ -131,7 +131,7 @@ CeruleanGymText1: ld [hJoyHeld], a ld a, $3 ld [wCeruleanGymCurScript], a -.asm_5c7bb +.done jp TextScriptEnd CeruleanGymText_5c7be: diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 295bd63d..f8be5823 100755 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -151,12 +151,12 @@ CinnabarGymScript3_75857: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM38 - jr .asm_75880 + jr .gymVictory .BagFull ld a, $c ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_75880 +.gymVictory ld hl, wObtainedBadges set 6, [hl] ld hl, wBeatGymFlags @@ -207,17 +207,17 @@ CinnabarGymScript_758b7: CinnabarGymText1: TX_ASM CheckEvent EVENT_BEAT_BLAINE - jr z, .asm_d9332 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM38 - jr nz, .asm_3012f + jr nz, .afterVictory call z, CinnabarGymScript3_75857 call DisableWaitingAfterTextDisplay jp TextScriptEnd -.asm_3012f +.afterVictory ld hl, BlaineFireBlastText call PrintText jp TextScriptEnd -.asm_d9332 +.beginBattle ld hl, BlaineBattleText call PrintText ld hl, BlaineEndBattleText diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index c856c93b..15f016af 100755 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -54,12 +54,12 @@ FuchsiaGymScript3_75497: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM06 - jr .asm_754c0 + jr .gymVictory .BagFull ld a, $b ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_754c0 +.gymVictory ld hl, wObtainedBadges set 4, [hl] ld hl, wBeatGymFlags @@ -142,17 +142,17 @@ FuchsiaGymTrainerHeader5: FuchsiaGymText1: TX_ASM CheckEvent EVENT_BEAT_KOGA - jr z, .asm_181b6 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM06 - jr nz, .asm_adc3b + jr nz, .afterVictory call z, FuchsiaGymScript3_75497 call DisableWaitingAfterTextDisplay - jr .asm_e84c6 -.asm_adc3b + jr .done +.afterVictory ld hl, KogaExplainToxicText call PrintText - jr .asm_e84c6 -.asm_181b6 + jr .done +.beginBattle ld hl, KogaBeforeBattleText call PrintText ld hl, wd72d @@ -171,7 +171,7 @@ FuchsiaGymText1: ld [hJoyHeld], a ld a, $3 ld [wFuchsiaGymCurScript], a -.asm_e84c6 +.done jp TextScriptEnd KogaBeforeBattleText: diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 73d9f4ab..11abdf65 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -764,17 +764,17 @@ OaksLab_TextPointers2: OaksLabText1: TX_ASM CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 - jr nz, .asm_1d0de + jr nz, .beforeChooseMon ld hl, OaksLabGaryText1 call PrintText jr .done -.asm_1d0de +.beforeChooseMon bit 2, a - jr nz, .asm_1d0ea + jr nz, .afterChooseMon ld hl, OaksLabText40 call PrintText jr .done -.asm_1d0ea +.afterChooseMon ld hl, OaksLabText41 call PrintText .done diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 6dd24b08..cf02b141 100755 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -54,12 +54,12 @@ PewterGymScript_5c3df: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM34 - jr .asm_5c408 + jr .gymVictory .BagFull ld a, $6 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5c408 +.gymVictory ld hl, wObtainedBadges set 0, [hl] ld hl, wBeatGymFlags @@ -101,17 +101,17 @@ PewterGymTrainerHeader0: PewterGymText1: TX_ASM CheckEvent EVENT_BEAT_BROCK - jr z, .asm_5c46a + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM34 - jr nz, .asm_5c462 + jr nz, .gymVictory call z, PewterGymScript_5c3df call DisableWaitingAfterTextDisplay - jr .asm_5c49b -.asm_5c462 + jr .done +.gymVictory ld hl, PewterGymText_5c4a3 call PrintText - jr .asm_5c49b -.asm_5c46a + jr .done +.beginBattle ld hl, PewterGymText_5c49e call PrintText ld hl, wd72d @@ -131,7 +131,7 @@ PewterGymText1: ld a, $3 ld [wPewterGymCurScript], a ld [wCurMapScript], a -.asm_5c49b +.done jp TextScriptEnd PewterGymText_5c49e: diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index e51763e5..0539d613 100755 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -54,12 +54,12 @@ SaffronGymText_5d068: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM46 - jr .asm_5d091 + jr .gymVictory .BagFull ld a, $c ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5d091 +.gymVictory ld hl, wObtainedBadges set 5, [hl] ld hl, wBeatGymFlags @@ -152,17 +152,17 @@ SaffronGymTrainerHeader6: SaffronGymText1: TX_ASM CheckEvent EVENT_BEAT_SABRINA - jr z, .asm_5d134 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM46 - jr nz, .asm_5d12c + jr nz, .afterVictory call z, SaffronGymText_5d068 call DisableWaitingAfterTextDisplay - jr .asm_5d15f -.asm_5d12c + jr .done +.afterVictory ld hl, SaffronGymText_5d16e call PrintText - jr .asm_5d15f -.asm_5d134 + jr .done +.beginBattle ld hl, SaffronGymText_5d162 call PrintText ld hl, wd72d @@ -179,7 +179,7 @@ SaffronGymText1: ld [wGymLeaderNo], a ld a, $3 ld [wSaffronGymCurScript], a -.asm_5d15f +.done jp TextScriptEnd SaffronGymText_5d162: diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 5755628c..4c17a8ce 100755 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -29,14 +29,14 @@ Gym3LeaderName: VermilionGymScript_5ca6d: CheckEvent EVENT_2ND_LOCK_OPENED - jr nz, .asm_5ca78 + jr nz, .doorsOpen ld a, $24 - jr .asm_5ca7f -.asm_5ca78 + jr .replaceTile +.doorsOpen ld a, SFX_GO_INSIDE call PlaySound ld a, $5 -.asm_5ca7f +.replaceTile ld [wNewTileBlockID], a lb bc, 2, 2 predef_jump ReplaceTileBlock @@ -73,12 +73,12 @@ VermilionGymScript_5caaa: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM24 - jr .asm_5cad3 + jr .gymVictory .BagFull ld a, $8 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5cad3 +.gymVictory ld hl, wObtainedBadges set 2, [hl] ld hl, wBeatGymFlags @@ -131,17 +131,17 @@ VermilionGymTrainerHeader2: VermilionGymText1: TX_ASM CheckEvent EVENT_BEAT_LT_SURGE - jr z, .asm_5cb39 + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM24 - jr nz, .asm_5cb31 + jr nz, .afterBeat call z, VermilionGymScript_5caaa call DisableWaitingAfterTextDisplay - jr .asm_5cb6a -.asm_5cb31 + jr .done +.afterBeat ld hl, VermilionGymText_5cb72 call PrintText - jr .asm_5cb6a -.asm_5cb39 + jr .done +.beforeBeat ld hl, VermilionGymText_5cb6d call PrintText ld hl, wd72d @@ -161,7 +161,7 @@ VermilionGymText1: ld a, $3 ld [wVermilionGymCurScript], a ld [wCurMapScript], a -.asm_5cb6a +.done jp TextScriptEnd VermilionGymText_5cb6d: diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index 44966fef..b0f94b9d 100755 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -148,12 +148,12 @@ ViridianGymScript3_74995: ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM27 - jr .asm_749be + jr .gymVictory .BagFull ld a, $e ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_749be +.gymVictory ld hl, wObtainedBadges set 7, [hl] ld hl, wBeatGymFlags @@ -261,13 +261,13 @@ ViridianGymTrainerHeader7: ViridianGymText1: TX_ASM CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr z, .asm_6de66 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM27 - jr nz, .asm_9fc95 + jr nz, .afterVictory call z, ViridianGymScript3_74995 call DisableWaitingAfterTextDisplay - jr .asm_6dff7 -.asm_9fc95 + jr .done +.afterVictory ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, ViridianGymText_74ad9 @@ -279,8 +279,8 @@ ViridianGymText1: call UpdateSprites call Delay3 call GBFadeInFromBlack - jr .asm_6dff7 -.asm_6de66 + jr .done +.beginBattle ld hl, ViridianGymText_74ace call PrintText ld hl, wd72d @@ -297,7 +297,7 @@ ViridianGymText1: ld [wGymLeaderNo], a ld a, $3 ld [wViridianGymCurScript], a -.asm_6dff7 +.done jp TextScriptEnd ViridianGymText_74ace: -- cgit v1.2.3 From 1aa28afad421b0b5725e0d7302a7f091dd7df40d Mon Sep 17 00:00:00 2001 From: deak311andris Date: Mon, 7 Oct 2019 15:45:45 +0200 Subject: Deobfuscate Viridian City --- scripts/ViridianCity.asm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index b70927b2..643431a4 100755 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -19,10 +19,10 @@ ViridianCityScript_1900b: ret nz ld a, [wObtainedBadges] cp %01111111 - jr nz, .asm_1901e + jr nz, .gymClosed SetEvent EVENT_VIRIDIAN_GYM_OPEN ret -.asm_1901e +.gymClosed ld a, [wYCoord] cp $8 ret nz @@ -150,11 +150,11 @@ ViridianCityText2: ld a, [wObtainedBadges] cp %01111111 ld hl, ViridianCityText_19127 - jr z, .asm_ae9fe + jr z, .printAndDone CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr nz, .asm_ae9fe + jr nz, .printAndDone ld hl, ViridianCityText_19122 -.asm_ae9fe +.printAndDone call PrintText jp TextScriptEnd @@ -173,14 +173,14 @@ ViridianCityText3: call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_6dfea + jr nz, .no ld hl, ViridianCityText_19157 call PrintText - jr .asm_d611f -.asm_6dfea + jr .done +.no ld hl, ViridianCityText_19152 call PrintText -.asm_d611f +.done jp TextScriptEnd ViridianCityText_1914d: @@ -198,14 +198,14 @@ ViridianCityText_19157: ViridianCityText4: TX_ASM CheckEvent EVENT_GOT_POKEDEX - jr nz, .asm_83894 + jr nz, .gotPokedex ld hl, ViridianCityText_19175 call PrintText - jr .asm_700a6 -.asm_83894 + jr .done +.gotPokedex ld hl, ViridianCityText_1917a call PrintText -.asm_700a6 +.done jp TextScriptEnd ViridianCityText_19175: @@ -232,7 +232,7 @@ ViridianCityText_19191: ViridianCityText6: TX_ASM CheckEvent EVENT_GOT_TM42 - jr nz, .asm_4e5a0 + jr nz, .gotTm42 ld hl, ViridianCityText_191ca call PrintText lb bc, TM_42, 1 @@ -241,15 +241,15 @@ ViridianCityText6: ld hl, ReceivedTM42Text call PrintText SetEvent EVENT_GOT_TM42 - jr .asm_3c73c + jr .done .BagFull ld hl, TM42NoRoomText call PrintText - jr .asm_3c73c -.asm_4e5a0 + jr .done +.gotTm42 ld hl, TM42Explanation call PrintText -.asm_3c73c +.done jp TextScriptEnd ViridianCityText_191ca: @@ -278,16 +278,16 @@ ViridianCityText7: call YesNoChoice ld a, [wCurrentMenuItem] and a - jr z, .asm_42f68 + jr z, .hurry ld hl, ViridianCityText_1920f call PrintText ld a, $1 ld [wViridianCityCurScript], a - jr .asm_2413a -.asm_42f68 + jr .done +.hurry ld hl, ViridianCityText_19214 call PrintText -.asm_2413a +.done jp TextScriptEnd ViridianCityText_1920a: -- cgit v1.2.3 From 71090c13497946b739cd13f80d31ee13b464e9e6 Mon Sep 17 00:00:00 2001 From: deak311andris Date: Mon, 7 Oct 2019 15:53:27 +0200 Subject: Deobfuscate Pewter city --- scripts/PewterCity.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index dcc449c1..18296675 100755 --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm @@ -207,11 +207,11 @@ PewterCityText3: call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_193c9 + jr nz, .playerDidNotGoIntoMuseum ld hl, PewterCityText_193f6 call PrintText - jr .asm_193ee -.asm_193c9 + jr .done +.playerDidNotGoIntoMuseum ld hl, PewterCityText_193fb call PrintText xor a @@ -227,7 +227,7 @@ PewterCityText3: call GetSpritePosition2 ld a, $1 ld [wPewterCityCurScript], a -.asm_193ee +.done jp TextScriptEnd PewterCityText_193f1: @@ -253,14 +253,14 @@ PewterCityText4: call YesNoChoice ld a, [wCurrentMenuItem] cp $0 - jr nz, .asm_1941e + jr nz, .playerDoesNotKnow ld hl, PewterCityText_1942c call PrintText - jr .asm_19424 -.asm_1941e + jr .done +.playerDoesNotKnow ld hl, PewterCityText_19431 call PrintText -.asm_19424 +.done jp TextScriptEnd PewterCityText_19427: -- cgit v1.2.3 From d8605df73d52abd60256838d33d167bd953c31b6 Mon Sep 17 00:00:00 2001 From: Thomas Winwood Date: Sat, 23 Nov 2019 19:47:46 +0000 Subject: Use percent macro for trainer AI packages --- engine/battle/trainer_ai.asm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 6f699b9c..ac6c1a72 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -421,28 +421,28 @@ TrainerAIPointers: dbw 1,LanceAI ; lance JugglerAI: - cp $40 + cp 25 percent + 1 ret nc jp AISwitchIfEnoughMons BlackbeltAI: - cp $20 + cp 13 percent - 1 ret nc jp AIUseXAttack GiovanniAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseGuardSpec CooltrainerMAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXAttack CooltrainerFAI: - cp $40 - ld a, $A + cp 25 percent + 1 + ld a, 10 call AICheckIfHPBelowFraction jp c, AIUseHyperPotion ld a, 5 @@ -458,43 +458,43 @@ BrockAI: jp AIUseFullHeal MistyAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend LtSurgeAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXSpeed ErikaAI: - cp $80 + cp 50 percent + 1 ret nc - ld a, $A + ld a, 10 call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion KogaAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXAttack BlaineAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseSuperPotion SabrinaAI: - cp $40 + cp 25 percent + 1 ret nc - ld a, $A + ld a, 10 call AICheckIfHPBelowFraction ret nc jp AIUseHyperPotion Sony2AI: - cp $20 + cp 13 percent - 1 ret nc ld a, 5 call AICheckIfHPBelowFraction @@ -502,7 +502,7 @@ Sony2AI: jp AIUsePotion Sony3AI: - cp $20 + cp 13 percent - 1 ret nc ld a, 5 call AICheckIfHPBelowFraction @@ -510,7 +510,7 @@ Sony3AI: jp AIUseFullRestore LoreleiAI: - cp $80 + cp 50 percent + 1 ret nc ld a, 5 call AICheckIfHPBelowFraction @@ -518,14 +518,14 @@ LoreleiAI: jp AIUseSuperPotion BrunoAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend AgathaAI: - cp $14 + cp 8 percent jp c, AISwitchIfEnoughMons - cp $80 + cp 50 percent + 1 ret nc ld a, 4 call AICheckIfHPBelowFraction @@ -533,7 +533,7 @@ AgathaAI: jp AIUseSuperPotion LanceAI: - cp $80 + cp 50 percent + 1 ret nc ld a, 5 call AICheckIfHPBelowFraction -- cgit v1.2.3 From 6348ed24fedcae15cd4629bdcddea542d6c44712 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 11 Dec 2019 21:00:38 +0100 Subject: New Discord invite link Something something community. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af6868d1..49503a3e 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,5 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). [pokeruby]: https://github.com/pret/pokeruby [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald -[Discord]: https://discord.gg/6EuWgX9 +[Discord]: https://discord.gg/d5dubZ3 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret -- cgit v1.2.3 From 1682aeb62a4abffa212705fe5aa139f1f8e562ee Mon Sep 17 00:00:00 2001 From: Akatsuki-py Date: Fri, 1 May 2020 02:27:49 +0900 Subject: Fix comment from Y pos to X pos --- engine/overworld/movement.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index b561df7d..f272f497 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -702,7 +702,7 @@ GetTileSpriteStandsOn: ld c, a ld b, $0 inc l - ld a, [hl] ; c1x6: screen Y position + ld a, [hl] ; c1x6: screen X position srl a srl a srl a ; screen X tile -- cgit v1.2.3 From b6aa26ffa4629e027ae0384c85ebeb9bc5635728 Mon Sep 17 00:00:00 2001 From: Matt <5638426+mattbruv@users.noreply.github.com> Date: Sun, 3 May 2020 02:00:01 -0400 Subject: label hardcoded HRAM address, start documenting Vermilion --- scripts/VermilionCity.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 1ac81521..780b9975 100755 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -8,14 +8,14 @@ VermilionCity_Script: pop hl bit 5, [hl] res 5, [hl] - call nz, VermilionCityScript_197c0 + call nz, .setFirstLockTrashCanIndex ld hl, VermilionCity_ScriptPointers ld a, [wVermilionCityCurScript] jp CallFunctionInTable -VermilionCityScript_197c0: +.setFirstLockTrashCanIndex call Random - ld a, [$ffd4] + ld a, [hRandomSub] and $e ld [wFirstLockTrashCanIndex], a ret -- cgit v1.2.3 From 6ec4b00b522e6f966475fc2d911712be1dcf5b6a Mon Sep 17 00:00:00 2001 From: Matt <5638426+mattbruv@users.noreply.github.com> Date: Sun, 3 May 2020 14:25:01 -0400 Subject: clean up vermilion labels --- pokered.sn1 | Bin 0 -> 69955 bytes scripts/VermilionCity.asm | 56 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 pokered.sn1 diff --git a/pokered.sn1 b/pokered.sn1 new file mode 100644 index 00000000..7ff6d501 Binary files /dev/null and b/pokered.sn1 differ diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 780b9975..47be222d 100755 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -4,7 +4,7 @@ VermilionCity_Script: bit 6, [hl] res 6, [hl] push hl - call nz, VermilionCityScript_197cb + call nz, .initCityScript pop hl bit 5, [hl] res 5, [hl] @@ -20,7 +20,7 @@ VermilionCity_Script: ld [wFirstLockTrashCanIndex], a ret -VermilionCityScript_197cb: +.initCityScript CheckEventHL EVENT_SS_ANNE_LEFT ret z CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT @@ -41,7 +41,7 @@ VermilionCityScript0: ld a, [wSpriteStateData1 + 9] and a ; cp SPRITE_FACING_DOWN ret nz - ld hl, CoordsData_19823 + ld hl, SSAnneTicketCheckCoords call ArePlayerCoordsInArray ret nc xor a @@ -51,13 +51,13 @@ VermilionCityScript0: ld [hSpriteIndexOrTextID], a call DisplayTextID CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_19810 + jr nz, .shipHasDeparted ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a ret nz -.asm_19810 +.shipHasDeparted ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 @@ -67,12 +67,12 @@ VermilionCityScript0: ld [wVermilionCityCurScript], a ret -CoordsData_19823: - db $1e,$12 +SSAnneTicketCheckCoords: + db $1e,$12 ; y, x db $ff VermilionCityScript4: - ld hl, CoordsData_19823 + ld hl, SSAnneTicketCheckCoords call ArePlayerCoordsInArray ret c ld a, $0 @@ -135,14 +135,14 @@ VermilionCityText1: VermilionCityText2: TX_ASM CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_1989e + jr nz, .shipHasDeparted ld hl, VermilionCityText_198a7 call PrintText - jr .asm_198a4 -.asm_1989e + jr .end +.shipHasDeparted ld hl, VermilionCityText_198ac call PrintText -.asm_198a4 +.end jp TextScriptEnd VermilionCityText_198a7: @@ -156,43 +156,43 @@ VermilionCityText_198ac: VermilionCityText3: TX_ASM CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_198f6 + jr nz, .shipHasDeparted ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_RIGHT - jr z, .asm_198c8 - ld hl, VermilionCityCoords1 + jr z, .greetPlayer + ld hl, .inFrontOfOrBehindGuardCoords call ArePlayerCoordsInArray - jr nc, .asm_198d0 -.asm_198c8 + jr nc, .greetPlayerAndCheckTicket +.greetPlayer ld hl, SSAnneWelcomeText4 call PrintText - jr .asm_198fc -.asm_198d0 + jr .end +.greetPlayerAndCheckTicket ld hl, SSAnneWelcomeText9 call PrintText ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a - jr nz, .asm_198e9 + jr nz, .playerHasTicket ld hl, SSAnneNoTicketText call PrintText - jr .asm_198fc -.asm_198e9 + jr .end +.playerHasTicket ld hl, SSAnneFlashedTicketText call PrintText ld a, $4 ld [wVermilionCityCurScript], a - jr .asm_198fc -.asm_198f6 + jr .end +.shipHasDeparted ld hl, SSAnneNotHereText call PrintText -.asm_198fc +.end jp TextScriptEnd -VermilionCityCoords1: - db $1d,$13 - db $1f,$13 +.inFrontOfOrBehindGuardCoords + db $1d,$13 ; y, x of tile in front of guard + db $1f,$13 ; y, x of tile behind guard db $ff SSAnneWelcomeText4: -- cgit v1.2.3 From 8210dca8e50ed565fa20d1d625041fb382102205 Mon Sep 17 00:00:00 2001 From: Matt <5638426+mattbruv@users.noreply.github.com> Date: Sun, 3 May 2020 14:41:11 -0400 Subject: label npc conditional text --- scripts/VermilionCity.asm | 12 ++++++------ text/maps/VermilionCity.asm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 47be222d..b253fea6 100755 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -136,21 +136,21 @@ VermilionCityText2: TX_ASM CheckEvent EVENT_SS_ANNE_LEFT jr nz, .shipHasDeparted - ld hl, VermilionCityText_198a7 + ld hl, VermilionCityTextDidYouSee call PrintText jr .end .shipHasDeparted - ld hl, VermilionCityText_198ac + ld hl, VermilionCityTextSSAnneDeparted call PrintText .end jp TextScriptEnd -VermilionCityText_198a7: - TX_FAR _VermilionCityText_198a7 +VermilionCityTextDidYouSee: + TX_FAR _VermilionCityTextDidYouSee db "@" -VermilionCityText_198ac: - TX_FAR _VermilionCityText_198ac +VermilionCityTextSSAnneDeparted: + TX_FAR _VermilionCityTextSSAnneDeparted db "@" VermilionCityText3: diff --git a/text/maps/VermilionCity.asm b/text/maps/VermilionCity.asm index b060a123..1cbc535c 100644 --- a/text/maps/VermilionCity.asm +++ b/text/maps/VermilionCity.asm @@ -7,13 +7,13 @@ _VermilionCityText1:: cont "toxic sludge!" done -_VermilionCityText_198a7:: +_VermilionCityTextDidYouSee:: text "Did you see S.S." line "ANNE moored in" cont "the harbor?" done -_VermilionCityText_198ac:: +_VermilionCityTextSSAnneDeparted:: text "So, S.S.ANNE has" line "departed!" -- cgit v1.2.3 From 1978a37e19d4cce2c97dac1b90fc099eeede5d8d Mon Sep 17 00:00:00 2001 From: Matt <5638426+mattbruv@users.noreply.github.com> Date: Tue, 5 May 2020 21:28:19 -0400 Subject: document vermilion gym --- scripts/VermilionGym.asm | 96 ++++++++++++++++++++++---------------------- text/maps/VermilionGym.asm | 2 +- text/maps/VermilionGym_2.asm | 8 ++-- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 4c17a8ce..0c95c6ed 100755 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -3,11 +3,11 @@ VermilionGym_Script: bit 5, [hl] res 5, [hl] push hl - call nz, VermilionGymScript_5ca4c + call nz, VermilionGymLoadName pop hl bit 6, [hl] res 6, [hl] - call nz, VermilionGymScript_5ca6d + call nz, VermilionGymSetDoorTile call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 ld de, VermilionGym_ScriptPointers @@ -16,7 +16,7 @@ VermilionGym_Script: ld [wVermilionGymCurScript], a ret -VermilionGymScript_5ca4c: +VermilionGymLoadName: ld hl, Gym3CityName ld de, Gym3LeaderName jp LoadGymLeaderAndCityName @@ -27,21 +27,21 @@ Gym3CityName: Gym3LeaderName: db "LT.SURGE@" -VermilionGymScript_5ca6d: +VermilionGymSetDoorTile: CheckEvent EVENT_2ND_LOCK_OPENED jr nz, .doorsOpen - ld a, $24 + ld a, $24 ; double door tile ID jr .replaceTile .doorsOpen ld a, SFX_GO_INSIDE call PlaySound - ld a, $5 + ld a, $5 ; clear floor tile ID .replaceTile ld [wNewTileBlockID], a lb bc, 2, 2 predef_jump ReplaceTileBlock -VermilionGymScript_5ca8a: +VermilionGymResetScripts: xor a ld [wJoyIgnore], a ld [wVermilionGymCurScript], a @@ -52,16 +52,16 @@ VermilionGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw VermilionGymScript3 + dw VermilionGymLTSurgePostBattle -VermilionGymScript3: +VermilionGymLTSurgePostBattle: ld a, [wIsInBattle] - cp $ff - jp z, VermilionGymScript_5ca8a + cp $ff ; did we lose? + jp z, VermilionGymResetScripts ld a, $f0 ld [wJoyIgnore], a -VermilionGymScript_5caaa: +VermilionGymReceiveTM24: ld a, $6 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -87,17 +87,17 @@ VermilionGymScript_5caaa: ; deactivate gym trainers SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2 - jp VermilionGymScript_5ca8a + jp VermilionGymResetScripts VermilionGym_TextPointers: - dw VermilionGymText1 - dw VermilionGymText2 - dw VermilionGymText3 - dw VermilionGymText4 - dw VermilionGymText5 - dw VermilionGymText6 - dw VermilionGymText7 - dw VermilionGymText8 + dw LTSurgeText + dw VermilionGymTrainerText1 + dw VermilionGymTrainerText2 + dw VermilionGymTrainerText3 + dw VermilionGymFanText + dw LTSurgeThunderbadgeInfoText + dw ReceivedTM24Text + dw TM24NoRoomText VermilionGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 @@ -128,21 +128,21 @@ VermilionGymTrainerHeader2: db $ff -VermilionGymText1: +LTSurgeText: TX_ASM CheckEvent EVENT_BEAT_LT_SURGE jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM24 jr nz, .afterBeat - call z, VermilionGymScript_5caaa + call z, VermilionGymReceiveTM24 call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, VermilionGymText_5cb72 + ld hl, LTSurgePostBattleAdviceText call PrintText jr .done .beforeBeat - ld hl, VermilionGymText_5cb6d + ld hl, LTSurgePreBattleText call PrintText ld hl, wd72d set 6, [hl] @@ -158,31 +158,31 @@ VermilionGymText1: ld [wGymLeaderNo], a xor a ld [hJoyHeld], a - ld a, $3 + ld a, $3 ; set script index to LT Surge post-battle script ld [wVermilionGymCurScript], a ld [wCurMapScript], a .done jp TextScriptEnd -VermilionGymText_5cb6d: - TX_FAR _VermilionGymText_5cb6d +LTSurgePreBattleText: + TX_FAR _LTSurgePreBattleText db "@" -VermilionGymText_5cb72: - TX_FAR _VermilionGymText_5cb72 +LTSurgePostBattleAdviceText: + TX_FAR _LTSurgePostBattleAdviceText db "@" -VermilionGymText6: - TX_FAR _VermilionGymText_5cb77 +LTSurgeThunderbadgeInfoText: + TX_FAR _LTSurgeThunderbadgeInfoText db "@" -VermilionGymText7: +ReceivedTM24Text: TX_FAR _ReceivedTM24Text TX_SFX_KEY_ITEM TX_FAR _TM24ExplanationText db "@" -VermilionGymText8: +TM24NoRoomText: TX_FAR _TM24NoRoomText db "@" @@ -190,7 +190,7 @@ ReceivedThunderbadgeText: TX_FAR _ReceivedThunderbadgeText db "@" -VermilionGymText2: +VermilionGymTrainerText1: TX_ASM ld hl, VermilionGymTrainerHeader0 call TalkToTrainer @@ -208,7 +208,7 @@ VermilionGymAfterBattleText1: TX_FAR _VermilionGymAfterBattleText1 db "@" -VermilionGymText3: +VermilionGymTrainerText2: TX_ASM ld hl, VermilionGymTrainerHeader1 call TalkToTrainer @@ -226,7 +226,7 @@ VermilionGymAfterBattleText2: TX_FAR _VermilionGymAfterBattleText2 db "@" -VermilionGymText4: +VermilionGymTrainerText3: TX_ASM ld hl, VermilionGymTrainerHeader2 call TalkToTrainer @@ -244,24 +244,24 @@ VermilionGymAfterBattleText3: TX_FAR _VermilionGymAfterBattleText3 db "@" -VermilionGymText5: +VermilionGymFanText: TX_ASM ld a, [wBeatGymFlags] bit 2, a - jr nz, .asm_5cbeb - ld hl, VermilionGymText_5cbf4 + jr nz, .afterBeat + ld hl, VermilionGymFanPreBattleText call PrintText - jr .asm_5cbf1 -.asm_5cbeb - ld hl, VermilionGymText_5cbf9 + jr .done +.afterBeat + ld hl, VermilionGymFanPostBattleText call PrintText -.asm_5cbf1 +.done jp TextScriptEnd -VermilionGymText_5cbf4: - TX_FAR _VermilionGymText_5cbf4 +VermilionGymFanPreBattleText: + TX_FAR _VermilionGymFanPreBattleText db "@" -VermilionGymText_5cbf9: - TX_FAR _VermilionGymText_5cbf9 +VermilionGymFanPostBattleText: + TX_FAR _VermilionGymFanPostBattleText db "@" diff --git a/text/maps/VermilionGym.asm b/text/maps/VermilionGym.asm index f718d899..14e0bcea 100644 --- a/text/maps/VermilionGym.asm +++ b/text/maps/VermilionGym.asm @@ -1,4 +1,4 @@ -_VermilionGymText_5cb6d:: +_LTSurgePreBattleText:: text "Hey, kid! What do" line "you think you're" cont "doing here?" diff --git a/text/maps/VermilionGym_2.asm b/text/maps/VermilionGym_2.asm index 7f645d59..50da9719 100644 --- a/text/maps/VermilionGym_2.asm +++ b/text/maps/VermilionGym_2.asm @@ -1,4 +1,4 @@ -_VermilionGymText_5cb72:: +_LTSurgePostBattleAdviceText:: text "A little word of" line "advice, kid!" @@ -10,7 +10,7 @@ _VermilionGymText_5cb72:: cont "type #MON!" done -_VermilionGymText_5cb77:: +_LTSurgeThunderbadgeInfoText:: text "The THUNDERBADGE" line "cranks up your" cont "#MON's SPEED!" @@ -112,7 +112,7 @@ _VermilionGymAfterBattleText3:: cont "next to it!" done -_VermilionGymText_5cbf4:: +_VermilionGymFanPreBattleText:: text "Yo! Champ in" line "making!" @@ -138,7 +138,7 @@ _VermilionGymText_5cbf4:: cont "get to him!" done -_VermilionGymText_5cbf9:: +_VermilionGymFanPostBattleText:: text "Whew! That match" line "was electric!" done -- cgit v1.2.3 From aa030e96730599d377542c0b30ff164424b7a427 Mon Sep 17 00:00:00 2001 From: Matt <5638426+mattbruv@users.noreply.github.com> Date: Tue, 5 May 2020 21:42:40 -0400 Subject: change input hex to constants --- scripts/VermilionGym.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 0c95c6ed..0af37945 100755 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -58,7 +58,7 @@ VermilionGymLTSurgePostBattle: ld a, [wIsInBattle] cp $ff ; did we lose? jp z, VermilionGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a VermilionGymReceiveTM24: -- cgit v1.2.3 From a13762b7bb482b6da6a596f7aad81a3397128e16 Mon Sep 17 00:00:00 2001 From: akatsuki-py Date: Thu, 21 May 2020 01:26:06 +0900 Subject: add "hMoney + 2" label for $ffa1 --- home.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.asm b/home.asm index 62be4371..199edbaf 100644 --- a/home.asm +++ b/home.asm @@ -1314,7 +1314,7 @@ SubtractAmountPaidFromMoney:: ; adds the amount the player sold to their money AddAmountSoldToMoney:: ld de, wPlayerMoney + 2 - ld hl, $ffa1 ; total price of items + ld hl, hMoney + 2 ; total price of items ld c, 3 ; length of money in bytes predef AddBCDPredef ; add total price to money ld a, MONEY_BOX -- cgit v1.2.3